From 34f33e6bb5b8b04e5aa42ad937eebd9389188ec2 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 24 May 2023 12:27:12 -0400
Subject: [PATCH 001/319] Fix truncated text in header

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

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 1fc08780ad..4840607952 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -532,6 +532,9 @@ onUnmounted(() => {
 				}
 			}
 		}
+		&:not(.collapse) > .tab {
+			--width: max-content !important;
+		}
 
 		> .tab {
 			display: inline-flex;

From 7b86c7087d40c1843c5a592013558c65ca9e0c6f Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 24 May 2023 13:22:53 -0400
Subject: [PATCH 002/319] Fix 'noteOf' text in post title

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

diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index 5b408bdaf7..8e710de471 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -162,12 +162,12 @@ definePageMetadata(
 	computed(() =>
 		note
 			? {
-					title: i18n.t("noteOf", { user: note.user.name }),
+					title: i18n.t("noteOf", { user: note.user.name || note.user.username }),
 					subtitle: new Date(note.createdAt).toLocaleString(),
 					avatar: note.user,
 					path: `/notes/${note.id}`,
 					share: {
-						title: i18n.t("noteOf", { user: note.user.name }),
+						title: i18n.t("noteOf", { user: note.user.name || note.user.username }),
 						text: note.text,
 					},
 			  }

From b531145270807d552556433dc128d1b2cc767f54 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 24 May 2023 14:00:18 -0400
Subject: [PATCH 003/319] Add 'View on remote server' to right click menu

---
 packages/client/src/components/MkNote.vue    | 17 ++++++++++++-----
 packages/client/src/components/MkNoteSub.vue | 19 +++++++++++++------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 7d7f0e71e3..99c3fe0183 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -401,20 +401,20 @@ function onContextmenu(ev: MouseEvent): void {
 						os.pageWindow(notePage(appearNote));
 					},
 				},
-				{
+				notePage(appearNote) != location.pathname ? {
 					icon: "ph-arrows-out-simple ph-bold ph-lg",
 					text: i18n.ts.showInPage,
 					action: () => {
 						router.push(notePage(appearNote), "forcePage");
 					},
-				},
+				} : undefined,
 				null,
 				{
+					type: "a",
 					icon: "ph-arrow-square-out ph-bold ph-lg",
 					text: i18n.ts.openInNewTab,
-					action: () => {
-						window.open(notePage(appearNote), "_blank");
-					},
+					href: notePage(appearNote),
+					target: "_blank",
 				},
 				{
 					icon: "ph-link-simple ph-bold ph-lg",
@@ -423,6 +423,13 @@ function onContextmenu(ev: MouseEvent): void {
 						copyToClipboard(`${url}${notePage(appearNote)}`);
 					},
 				},
+				note.user.host != null ? {
+					type: "a",
+					icon: "ph-arrow-square-up-right ph-bold ph-lg",
+					text: i18n.ts.showOnRemote,
+					href: note.url ?? note.uri ?? "",
+					target: "_blank",
+				} : undefined,
 			],
 			ev
 		);
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 77046dcbad..72f6473e7e 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -337,7 +337,7 @@ function onContextmenu(ev: MouseEvent): void {
 	} else {
 		os.contextMenu(
 			[
-				{
+			{
 					type: "label",
 					text: notePage(appearNote),
 				},
@@ -348,20 +348,20 @@ function onContextmenu(ev: MouseEvent): void {
 						os.pageWindow(notePage(appearNote));
 					},
 				},
-				{
+				notePage(appearNote) != location.pathname ? {
 					icon: "ph-arrows-out-simple ph-bold ph-lg",
 					text: i18n.ts.showInPage,
 					action: () => {
 						router.push(notePage(appearNote), "forcePage");
 					},
-				},
+				} : undefined,
 				null,
 				{
+					type: "a",
 					icon: "ph-arrow-square-out ph-bold ph-lg",
 					text: i18n.ts.openInNewTab,
-					action: () => {
-						window.open(notePage(appearNote), "_blank");
-					},
+					href: notePage(appearNote),
+					target: "_blank",
 				},
 				{
 					icon: "ph-link-simple ph-bold ph-lg",
@@ -370,6 +370,13 @@ function onContextmenu(ev: MouseEvent): void {
 						copyToClipboard(`${url}${notePage(appearNote)}`);
 					},
 				},
+				note.user.host != null ? {
+					type: "a",
+					icon: "ph-arrow-square-up-right ph-bold ph-lg",
+					text: i18n.ts.showOnRemote,
+					href: note.url ?? note.uri ?? "",
+					target: "_blank",
+				} : undefined,
 			],
 			ev
 		);

From 208c7d380aea4c02e86ea89199e69118a1af27b9 Mon Sep 17 00:00:00 2001
From: April John <waterdev@galaxycrow.de>
Date: Wed, 24 May 2023 20:21:15 +0200
Subject: [PATCH 004/319] update post import

---
 packages/backend/src/queue/initialize.ts                 | 2 ++
 .../backend/src/queue/processors/db/import-masto-post.ts | 9 +++++++--
 packages/backend/src/queue/queues.ts                     | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/queue/initialize.ts b/packages/backend/src/queue/initialize.ts
index d7945d5dad..0686fe9cd3 100644
--- a/packages/backend/src/queue/initialize.ts
+++ b/packages/backend/src/queue/initialize.ts
@@ -19,6 +19,8 @@ export function initialize<T>(name: string, limitPerSec = -1) {
 				  }
 				: undefined,
 		settings: {
+			stalledInterval: 60,
+			maxStalledCount: 2,
 			backoffStrategies: {
 				apBackoff,
 			},
diff --git a/packages/backend/src/queue/processors/db/import-masto-post.ts b/packages/backend/src/queue/processors/db/import-masto-post.ts
index 564071d3bb..317ba7b1bd 100644
--- a/packages/backend/src/queue/processors/db/import-masto-post.ts
+++ b/packages/backend/src/queue/processors/db/import-masto-post.ts
@@ -20,9 +20,11 @@ export async function importMastoPost(
 	}
 	const post = job.data.post;
 	let reply: Note | null = null;
+	job.progress(20);
 	if (post.object.inReplyTo != null) {
 		reply = await resolveNote(post.object.inReplyTo);
 	}
+	job.progress(40);
 	if (post.directMessage) {
 		done();
 		return;
@@ -33,13 +35,14 @@ export async function importMastoPost(
 			return;
 		}
 	}
+	job.progress(60);
 	let text;
 	try {
 		text = htmlToMfm(post.object.content, post.object.tag);
 	} catch (e) {
 		throw e;
 	}
-
+	job.progress(80);
 	const note = await create(user, {
 		createdAt: new Date(post.object.published),
 		files: undefined,
@@ -56,6 +59,8 @@ export async function importMastoPost(
 		apHashtags: undefined,
 		apEmojis: undefined,
 	});
-	logger.succ("Imported");
+	job.progress(100);
 	done();
+
+	logger.succ("Imported");
 }
diff --git a/packages/backend/src/queue/queues.ts b/packages/backend/src/queue/queues.ts
index 6d7fffcb30..6b0eb2de42 100644
--- a/packages/backend/src/queue/queues.ts
+++ b/packages/backend/src/queue/queues.ts
@@ -20,7 +20,7 @@ export const inboxQueue = initializeQueue<InboxJobData>(
 	"inbox",
 	config.inboxJobPerSec || 16,
 );
-export const dbQueue = initializeQueue<DbJobData>("db");
+export const dbQueue = initializeQueue<DbJobData>("db", 256);
 export const objectStorageQueue =
 	initializeQueue<ObjectStorageJobData>("objectStorage");
 export const webhookDeliverQueue = initializeQueue<WebhookDeliverJobData>(

From 3ac0946019465e41dc566d14478c4ca6b1bf4307 Mon Sep 17 00:00:00 2001
From: April John <waterdev@galaxycrow.de>
Date: Wed, 24 May 2023 21:03:37 +0200
Subject: [PATCH 005/319] update inbox import timeout

---
 packages/backend/src/queue/index.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/backend/src/queue/index.ts b/packages/backend/src/queue/index.ts
index 1b50f35287..a84a446fe7 100644
--- a/packages/backend/src/queue/index.ts
+++ b/packages/backend/src/queue/index.ts
@@ -348,6 +348,8 @@ export function createImportMastoPostJob(
 		{
 			removeOnComplete: true,
 			removeOnFail: true,
+			attempts: config.inboxJobMaxAttempts || 8,
+			timeout: 60 * 1000, // 1min
 		},
 	);
 }

From af3f36f0637feb193c6445434af9adb3a3ab6781 Mon Sep 17 00:00:00 2001
From: Essem <smswessem@gmail.com>
Date: Wed, 24 May 2023 14:40:11 -0500
Subject: [PATCH 006/319] Hide security key section if TOTP is disabled This
 should prevent some unintended behavior (and 500 errors) for now.

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

diff --git a/packages/client/src/pages/settings/2fa.vue b/packages/client/src/pages/settings/2fa.vue
index 4d856c86ca..a1af86b698 100644
--- a/packages/client/src/pages/settings/2fa.vue
+++ b/packages/client/src/pages/settings/2fa.vue
@@ -10,7 +10,7 @@
 			<MkButton @click="unregister">{{ i18n.ts.unregister }}</MkButton>
 		</template>
 
-		<template v-if="supportsCredentials">
+		<template v-if="supportsCredentials && $i.twoFactorEnabled">
 			<hr class="totp-method-sep" />
 
 			<h2 class="heading">{{ i18n.ts.securityKey }}</h2>

From 54777fc12f9f833209bd8587ca8371ed91e0628e Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 24 May 2023 17:40:16 -0400
Subject: [PATCH 007/319] Display replies by same author first

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

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 774a10fc6c..b3d22d7acd 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -82,7 +82,7 @@
 			:key="note.id"
 			:note="note"
 			class="reply"
-			:conversation="directQuotes"
+			:conversation="replies"
 			:detailedView="true"
 		/>
 		<MkLoading v-else-if="tab === 'quotes' && directQuotes.length > 0" />
@@ -357,6 +357,12 @@ os.api("notes/children", {
 	limit: 30,
 	depth: 12,
 }).then((res) => {
+	res = res.reduce((acc, note) => {
+		if (note.userId == appearNote.userId) {
+			return [...acc, note];
+		}
+		return [note, ...acc];
+	}, []);
 	replies.value = res;
 	directReplies = res
 		.filter((note) => note.replyId === appearNote.id)

From b70139f2bb9ca2e58bac47e1aadeedf2924f6ce6 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 24 May 2023 19:33:59 -0400
Subject: [PATCH 008/319] little refactor

---
 .../backend/src/server/web/views/base.pug     |  2 +-
 packages/client/src/init.ts                   | 16 +-------
 packages/client/src/ui/universal.vue          | 37 +++++++++----------
 3 files changed, 20 insertions(+), 35 deletions(-)

diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug
index b5841883bd..91f4d6606f 100644
--- a/packages/backend/src/server/web/views/base.pug
+++ b/packages/backend/src/server/web/views/base.pug
@@ -31,7 +31,7 @@ html
 		meta(name='theme-color-orig' content= themeColor || '#31748f')
 		meta(property='twitter:card' content='summary')
 		meta(property='og:site_name' content= instanceName || 'Calckey')
-		meta(name='viewport' content='width=device-width, initial-scale=1')
+		meta(name='viewport' content='width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no')
 		link(rel='icon' href= icon || `/favicon.ico?${ timestamp }`)
 		link(rel='apple-touch-icon' href= icon || `/apple-touch-icon.png?${ timestamp }`)
 		link(rel='manifest' href='/manifest.json')
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index 43a92a3163..7a004688d6 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -104,17 +104,6 @@ import { getAccountFromId } from "@/scripts/get-account-from-id";
 	});
 	//#endregion
 
-	// If mobile, insert the viewport meta tag
-	if (["smartphone", "tablet"].includes(deviceKind)) {
-		const viewport = document.getElementsByName("viewport").item(0);
-		viewport.setAttribute(
-			"content",
-			`${viewport.getAttribute(
-				"content",
-			)}, minimum-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover`,
-		);
-	}
-
 	//#region Set lang attr
 	const html = document.documentElement;
 	html.setAttribute("lang", lang);
@@ -311,12 +300,11 @@ import { getAccountFromId } from "@/scripts/get-account-from-id";
 	if (ColdDeviceStorage.get("syncDeviceDarkMode")) {
 		defaultStore.set("darkMode", isDeviceDarkmode());
 	}
-
-	window.matchMedia("(prefers-color-scheme: dark)").addListener((mql) => {
+	window.matchMedia("(prefers-color-scheme: dark)").onchange = (mql) => {
 		if (ColdDeviceStorage.get("syncDeviceDarkMode")) {
 			defaultStore.set("darkMode", mql.matches);
 		}
-	});
+	};
 	//#endregion
 
 	fetchInstanceMetaPromise.then(() => {
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 5b61c1b2c8..3784ef8af3 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -15,10 +15,7 @@
 				:style="{ background: pageMetadata?.value?.bg }"
 				@contextmenu.stop="onContextmenu"
 			>
-				<div :class="$style.content">
-					<RouterView />
-				</div>
-				<div :class="$style.spacer"></div>
+				<RouterView />
 			</main>
 		</MkStickyContainer>
 
@@ -173,6 +170,7 @@ import type { PageMetadata } from "@/scripts/page-metadata";
 import { instanceName, ui } from "@/config";
 import { StickySidebar } from "@/scripts/sticky-sidebar";
 import XDrawerMenu from "@/ui/_common_/navbar-for-mobile.vue";
+import XSidebar from "@/ui/_common_/navbar.vue";
 import * as os from "@/os";
 import { defaultStore } from "@/store";
 import { navbarItemDef } from "@/navbar";
@@ -186,7 +184,6 @@ import {
 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")
 );
@@ -462,6 +459,11 @@ console.log(mainRouter.currentRoute.value.name);
 	&.isMobile {
 		--stickyBottom: 6rem;
 	}
+	&:not(.isMobile) {
+		> .contents {
+			border-right: .5px solid var(--divider);
+		}
+	}
 	&.wallpaper {
 		background: var(--wallpaperOverlay);
 	}
@@ -470,6 +472,10 @@ console.log(mainRouter.currentRoute.value.name);
 		justify-content: center;
 		&:not(.isMobile) {
 			--navBg: transparent;
+			> .contents {
+				border-inline: .5px solid var(--divider);
+				margin-inline: -1px;
+			}
 		}
 
 		> :deep(.sidebar:not(.iconOnly)) {
@@ -545,18 +551,19 @@ console.log(mainRouter.currentRoute.value.name);
 		}
 	}
 
-	> .sidebar {
-		border-right: solid 0.5px var(--divider);
-	}
-
 	> .contents {
 		width: 100%;
 		min-width: 0;
+		$widgets-hide-threshold: 1090px;
+		@media (max-width: $widgets-hide-threshold) {
+			padding-bottom: calc(env(safe-area-inset-bottom, 0px) + 96px);
+		}
 	}
 
 	> .widgets {
 		padding: 0 var(--margin);
-		border-left: solid 0.5px var(--divider);
+		width: 300px;
+		box-sizing: content-box;
 
 		@media (max-width: $widgets-hide-threshold) {
 			display: none;
@@ -732,14 +739,4 @@ console.log(mainRouter.currentRoute.value.name);
 	top: 0;
 	left: 0;
 }
-
-.spacer {
-	$widgets-hide-threshold: 1090px;
-
-	height: calc(env(safe-area-inset-bottom, 0px) + 96px);
-
-	@media (min-width: ($widgets-hide-threshold + 1px)) {
-		display: none;
-	}
-}
 </style>

From a9a1c22605181fcf4cc4dd49ca78b43d615cfa66 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 24 May 2023 21:33:49 -0400
Subject: [PATCH 009/319] a

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

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index b3d22d7acd..0e1780b95f 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -625,10 +625,7 @@ onUnmounted(() => {
 			opacity: 1;
 		}
 	}
-
-	&.max-width_500px {
-		font-size: 0.9em;
-	}
+	
 	&.max-width_450px {
 		> .reply-to:first-child {
 			padding-top: 14px;

From 2375d2a8a6ec9864044bf4e18dbfb6b3f57ab070 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Wed, 24 May 2023 21:41:28 -0400
Subject: [PATCH 010/319] hide follow-button label on mobile

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

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 4840607952..67549a6541 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -305,7 +305,10 @@ onUnmounted(() => {
 	box-sizing: border-box;
 	overflow: hidden;
 	@media (max-width: 500px) {
-		padding-inline: 12p;
+		padding-inline: 16px;
+		&.tabs > .buttons > :deep(.follow-button > span) {
+			display: none;
+		}
 	}
 	@media (max-width: 700px) {
 		> .left {
@@ -432,8 +435,6 @@ onUnmounted(() => {
 			text-align: left;
 			font-weight: bold;
 			flex-shrink: 0;
-			margin-right: 1rem;
-
 			> .avatar {
 				$size: 32px;
 				display: inline-block;

From a4f089670d03a8ee92e6f8ea13bc6634c2a4b0db Mon Sep 17 00:00:00 2001
From: Richard <galmt@protonmail.com>
Date: Thu, 25 May 2023 06:54:20 +0000
Subject: [PATCH 011/319] chore: Translated using Weblate (Dutch)

Currently translated at 32.1% (564 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
---
 locales/nl-NL.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index b7555767f1..49b737e918 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -633,3 +633,13 @@ silenceThisInstance: Demp deze server
 silenced: Gedempt
 disablingTimelinesInfo: Beheerders en moderators zullen altijd toegang hebben tot
   alle tijdlijnen, zelfs als deze uitgeschakeld zijn.
+accountSettings: Account Instellingen
+numberOfDays: Aantal dagen
+hideThisNote: Verberg deze post
+dashboard: Dashboard
+accessibility: Toegankelijkheid
+promotion: Gepromoot
+promote: Promoten
+objectStorage: Objectopslag
+useObjectStorage: Gebruik objectopslag
+objectStorageBaseUrl: Basis -URL

From 3f58162cf4f431632335c315f95dea4b17ea484c Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 25 May 2023 15:49:39 -0400
Subject: [PATCH 012/319] Fix polls & own reactions not showing in replies

---
 packages/backend/src/models/repositories/note.ts | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts
index 1310c14b02..6520163550 100644
--- a/packages/backend/src/models/repositories/note.ts
+++ b/packages/backend/src/models/repositories/note.ts
@@ -236,6 +236,12 @@ export const NoteRepository = db.getRepository(Note).extend({
 			uri: note.uri || undefined,
 			url: note.url || undefined,
 			updatedAt: note.updatedAt?.toISOString() || undefined,
+			poll: note.hasPoll ? populatePoll(note, meId) : undefined,
+			...(meId
+				? {
+						myReaction: populateMyReaction(note, meId, options?._hint_),
+					}
+				: {}),
 
 			...(opts.detail
 				? {
@@ -252,14 +258,6 @@ export const NoteRepository = db.getRepository(Note).extend({
 									_hint_: options?._hint_,
 							  })
 							: undefined,
-
-						poll: note.hasPoll ? populatePoll(note, meId) : undefined,
-
-						...(meId
-							? {
-									myReaction: populateMyReaction(note, meId, options?._hint_),
-							  }
-							: {}),
 				  }
 				: {}),
 		});

From b5ffb5af8da38f17c2fe090ffa2cf0833347ee44 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 25 May 2023 15:50:14 -0400
Subject: [PATCH 013/319] fix z-index

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

diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index 5a66224592..9239d44298 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -59,7 +59,7 @@ defineExpose({
 <style lang="scss" scoped>
 ._button {
 	font-weight: 700;
-	z-index: 2;
+	z-index: 5;
 	> span {
 		background: var(--cwBg) !important;
 		color: var(--cwFg);
diff --git a/packages/client/src/components/MkShowMoreButton.vue b/packages/client/src/components/MkShowMoreButton.vue
index 3dd9acb9b0..3ec7086881 100644
--- a/packages/client/src/components/MkShowMoreButton.vue
+++ b/packages/client/src/components/MkShowMoreButton.vue
@@ -41,7 +41,7 @@ defineExpose({
 	bottom: 0;
 	left: 0;
 	width: 100%;
-	z-index: 2;
+	z-index: 5;
 	> span {
 		display: inline-block;
 		background: var(--panel);

From c683ee304e759bd5bad63bf59af3ea4f8f9bb711 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 25 May 2023 16:24:31 -0400
Subject: [PATCH 014/319] tweak

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

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 0e1780b95f..76aa5ba46b 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -569,7 +569,7 @@ onUnmounted(() => {
 			background: var(--panelHighlight);
 			border-radius: var(--radius);
 			opacity: 0;
-			transition: opacity 0.2s;
+			transition: opacity 0.2s, background 0.2s;
 			z-index: -1;
 		}
 		&.reply-to {
@@ -604,6 +604,7 @@ onUnmounted(() => {
 			--panel: var(--panelHighlight);
 			&::before {
 				opacity: 1;
+				background: var(--panelHighlight) !important;
 			}
 		}
 		// @media (pointer: coarse) {
@@ -623,6 +624,7 @@ onUnmounted(() => {
 		&::before {
 			outline: auto;
 			opacity: 1;
+			background: none;
 		}
 	}
 	

From 30beffab7829450c111eb4aa408f9af3b871b75d Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 25 May 2023 19:32:56 -0400
Subject: [PATCH 015/319] Only load timeline in active slide

---
 packages/client/src/pages/timeline.vue | 4 ++++
 packages/client/src/style.scss         | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 187ca36a5a..39ee803bfb 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -44,6 +44,9 @@
 						"
 						@swiper="setSwiperRef"
 						@slide-change="onSlideChange"
+						:touch-angle="25"
+						:threshold="10"
+						:centeredSlides="true"
 					>
 						<swiper-slide
 							v-for="index in timelines"
@@ -51,6 +54,7 @@
 							:virtual-index="index"
 						>
 							<XTimeline
+								v-if="index == timelines[swiperRef.activeIndex]"
 								ref="tl"
 								:key="src"
 								class="tl"
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index fbbae64fed..4b914c4085 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -113,6 +113,10 @@ html, body {
 	padding: 0;
 }
 
+.swiper-slide {
+	height: unset !important;
+}
+
 a {
 	text-decoration: none;
 	cursor: pointer;

From 9c7af415ae3da6b29fad3bc816d188004b080545 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 25 May 2023 19:40:47 -0400
Subject: [PATCH 016/319] apply properties to all swipers

---
 packages/client/src/pages/about.vue           | 2 +-
 packages/client/src/pages/admin-file.vue      | 2 +-
 packages/client/src/pages/channels.vue        | 2 +-
 packages/client/src/pages/explore.vue         | 2 +-
 packages/client/src/pages/gallery/index.vue   | 2 +-
 packages/client/src/pages/instance-info.vue   | 2 +-
 packages/client/src/pages/messaging/index.vue | 2 +-
 packages/client/src/pages/notifications.vue   | 2 +-
 packages/client/src/pages/pages.vue           | 2 +-
 packages/client/src/pages/search.vue          | 2 +-
 packages/client/src/pages/tag.vue             | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index 4b9e62cf80..bb7dc156f3 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -7,7 +7,7 @@
 				:tabs="headerTabs"
 		/></template>
 		<MkSpacer :content-max="600" :margin-min="20">
-			<swiper
+			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/admin-file.vue b/packages/client/src/pages/admin-file.vue
index 7806cf23c0..77e418b75c 100644
--- a/packages/client/src/pages/admin-file.vue
+++ b/packages/client/src/pages/admin-file.vue
@@ -7,7 +7,7 @@
 				:tabs="headerTabs"
 		/></template>
 		<MkSpacer :content-max="600" :margin-min="16" :margin-max="32">
-			<swiper
+			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue
index 61a647d97c..12ac0b6298 100644
--- a/packages/client/src/pages/channels.vue
+++ b/packages/client/src/pages/channels.vue
@@ -7,7 +7,7 @@
 				:tabs="headerTabs"
 		/></template>
 		<MkSpacer :content-max="700">
-			<swiper
+			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index b7f6d3c713..dda387f266 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -8,7 +8,7 @@
 		/></template>
 		<div class="lznhrdub">
 			<MkSpacer :content-max="1200">
-				<swiper
+				<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
 					:modules="[Virtual]"
 					:space-between="20"
 					:virtual="true"
diff --git a/packages/client/src/pages/gallery/index.vue b/packages/client/src/pages/gallery/index.vue
index d4794ffbc0..47582d82bb 100644
--- a/packages/client/src/pages/gallery/index.vue
+++ b/packages/client/src/pages/gallery/index.vue
@@ -8,7 +8,7 @@
 				:display-back-button="true"
 		/></template>
 		<MkSpacer :content-max="1200">
-			<swiper
+			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue
index 83e2ae2664..219ba96da1 100644
--- a/packages/client/src/pages/instance-info.vue
+++ b/packages/client/src/pages/instance-info.vue
@@ -12,7 +12,7 @@
 			:margin-min="16"
 			:margin-max="32"
 		>
-			<swiper
+			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index f18c37cac8..e2adc4a29e 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -8,7 +8,7 @@
 		/></template>
 		<div>
 			<MkSpacer :content-max="800">
-				<swiper
+				<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
 					:modules="[Virtual]"
 					:space-between="20"
 					:virtual="true"
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index 7a61df0ba6..1ace1dbaf7 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -9,7 +9,7 @@
 			/>
 		</template>
 		<MkSpacer :content-max="800">
-			<swiper
+			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/pages.vue b/packages/client/src/pages/pages.vue
index 938c8d2295..f90e3f452f 100644
--- a/packages/client/src/pages/pages.vue
+++ b/packages/client/src/pages/pages.vue
@@ -7,7 +7,7 @@
 				:tabs="headerTabs"
 		/></template>
 		<MkSpacer :content-max="700">
-			<swiper
+			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/search.vue b/packages/client/src/pages/search.vue
index f900caad41..0a767008fa 100644
--- a/packages/client/src/pages/search.vue
+++ b/packages/client/src/pages/search.vue
@@ -8,7 +8,7 @@
 				:display-back-button="true"
 		/></template>
 		<MkSpacer :content-max="800">
-			<swiper
+			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/tag.vue b/packages/client/src/pages/tag.vue
index 600f27efba..690b1ae7f5 100644
--- a/packages/client/src/pages/tag.vue
+++ b/packages/client/src/pages/tag.vue
@@ -8,7 +8,7 @@
 				:display-back-button="true"
 		/></template>
 		<MkSpacer :content-max="800">
-			<swiper
+			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"

From 5d224bf1c63651844d4a1e7a60a47d91e327ddf9 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 25 May 2023 19:42:42 -0400
Subject: [PATCH 017/319] make consistent

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

diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 39ee803bfb..2003591fec 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -32,7 +32,7 @@
 				/>
 			</div> *v-else on next div* -->
 				<div class="tl _block">
-					<swiper
+					<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
 						:modules="[Virtual]"
 						:space-between="20"
 						:virtual="true"
@@ -44,9 +44,6 @@
 						"
 						@swiper="setSwiperRef"
 						@slide-change="onSlideChange"
-						:touch-angle="25"
-						:threshold="10"
-						:centeredSlides="true"
 					>
 						<swiper-slide
 							v-for="index in timelines"

From a534ec5565cda230e996de92d49f63ef6d530d4e Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 25 May 2023 21:27:51 -0400
Subject: [PATCH 018/319] fix z-index

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

diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index fcfbc64ab2..c7dc7dd7ff 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -243,7 +243,7 @@ function focusFooter(ev) {
 </script>
 
 <style lang="scss" scoped>
-:deep(a) {
+:deep(a, button) {
 	position: relative;
 	z-index: 2;
 }

From 911704d6a85da97168038dbd62b7c622860ac53e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 25 May 2023 19:47:10 -0700
Subject: [PATCH 019/319] chore: formatting

---
 package.json                                  |  2 +-
 .../backend/src/models/repositories/note.ts   |  2 +-
 packages/client/src/components/MkNote.vue     | 33 ++++++++++--------
 .../client/src/components/MkNoteDetailed.vue  |  2 +-
 packages/client/src/components/MkNoteSub.vue  | 34 +++++++++++--------
 packages/client/src/pages/about.vue           |  5 ++-
 packages/client/src/pages/admin-file.vue      |  5 ++-
 packages/client/src/pages/channels.vue        |  5 ++-
 packages/client/src/pages/explore.vue         |  5 ++-
 packages/client/src/pages/gallery/index.vue   |  5 ++-
 packages/client/src/pages/instance-info.vue   |  5 ++-
 packages/client/src/pages/messaging/index.vue |  5 ++-
 packages/client/src/pages/note.vue            |  8 +++--
 packages/client/src/pages/notifications.vue   |  5 ++-
 packages/client/src/pages/pages.vue           |  5 ++-
 packages/client/src/pages/search.vue          |  5 ++-
 packages/client/src/pages/tag.vue             |  5 ++-
 packages/client/src/pages/timeline.vue        |  5 ++-
 packages/client/src/ui/universal.vue          |  4 +--
 19 files changed, 96 insertions(+), 49 deletions(-)

diff --git a/package.json b/package.json
index 71efef3670..0a73d633bf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev19",
+	"version": "14.0.0-dev22",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts
index 6520163550..3be4524933 100644
--- a/packages/backend/src/models/repositories/note.ts
+++ b/packages/backend/src/models/repositories/note.ts
@@ -240,7 +240,7 @@ export const NoteRepository = db.getRepository(Note).extend({
 			...(meId
 				? {
 						myReaction: populateMyReaction(note, meId, options?._hint_),
-					}
+				  }
 				: {}),
 
 			...(opts.detail
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 99c3fe0183..021086ca98 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -256,7 +256,6 @@ import { useNoteCapture } from "@/scripts/use-note-capture";
 import { notePage } from "@/filters/note";
 import { deepClone } from "@/scripts/clone";
 
-
 const router = useRouter();
 
 const props = defineProps<{
@@ -401,13 +400,15 @@ function onContextmenu(ev: MouseEvent): void {
 						os.pageWindow(notePage(appearNote));
 					},
 				},
-				notePage(appearNote) != location.pathname ? {
-					icon: "ph-arrows-out-simple ph-bold ph-lg",
-					text: i18n.ts.showInPage,
-					action: () => {
-						router.push(notePage(appearNote), "forcePage");
-					},
-				} : undefined,
+				notePage(appearNote) != location.pathname
+					? {
+							icon: "ph-arrows-out-simple ph-bold ph-lg",
+							text: i18n.ts.showInPage,
+							action: () => {
+								router.push(notePage(appearNote), "forcePage");
+							},
+					  }
+					: undefined,
 				null,
 				{
 					type: "a",
@@ -423,13 +424,15 @@ function onContextmenu(ev: MouseEvent): void {
 						copyToClipboard(`${url}${notePage(appearNote)}`);
 					},
 				},
-				note.user.host != null ? {
-					type: "a",
-					icon: "ph-arrow-square-up-right ph-bold ph-lg",
-					text: i18n.ts.showOnRemote,
-					href: note.url ?? note.uri ?? "",
-					target: "_blank",
-				} : undefined,
+				note.user.host != null
+					? {
+							type: "a",
+							icon: "ph-arrow-square-up-right ph-bold ph-lg",
+							text: i18n.ts.showOnRemote,
+							href: note.url ?? note.uri ?? "",
+							target: "_blank",
+					  }
+					: undefined,
 			],
 			ev
 		);
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 76aa5ba46b..b3aee949ee 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -627,7 +627,7 @@ onUnmounted(() => {
 			background: none;
 		}
 	}
-	
+
 	&.max-width_450px {
 		> .reply-to:first-child {
 			padding-top: 14px;
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 72f6473e7e..37e14b3a4d 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -337,7 +337,7 @@ function onContextmenu(ev: MouseEvent): void {
 	} else {
 		os.contextMenu(
 			[
-			{
+				{
 					type: "label",
 					text: notePage(appearNote),
 				},
@@ -348,13 +348,15 @@ function onContextmenu(ev: MouseEvent): void {
 						os.pageWindow(notePage(appearNote));
 					},
 				},
-				notePage(appearNote) != location.pathname ? {
-					icon: "ph-arrows-out-simple ph-bold ph-lg",
-					text: i18n.ts.showInPage,
-					action: () => {
-						router.push(notePage(appearNote), "forcePage");
-					},
-				} : undefined,
+				notePage(appearNote) != location.pathname
+					? {
+							icon: "ph-arrows-out-simple ph-bold ph-lg",
+							text: i18n.ts.showInPage,
+							action: () => {
+								router.push(notePage(appearNote), "forcePage");
+							},
+					  }
+					: undefined,
 				null,
 				{
 					type: "a",
@@ -370,13 +372,15 @@ function onContextmenu(ev: MouseEvent): void {
 						copyToClipboard(`${url}${notePage(appearNote)}`);
 					},
 				},
-				note.user.host != null ? {
-					type: "a",
-					icon: "ph-arrow-square-up-right ph-bold ph-lg",
-					text: i18n.ts.showOnRemote,
-					href: note.url ?? note.uri ?? "",
-					target: "_blank",
-				} : undefined,
+				note.user.host != null
+					? {
+							type: "a",
+							icon: "ph-arrow-square-up-right ph-bold ph-lg",
+							text: i18n.ts.showOnRemote,
+							href: note.url ?? note.uri ?? "",
+							target: "_blank",
+					  }
+					: undefined,
 			],
 			ev
 		);
diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index bb7dc156f3..3cd6646861 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -7,7 +7,10 @@
 				:tabs="headerTabs"
 		/></template>
 		<MkSpacer :content-max="600" :margin-min="20">
-			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
+			<swiper
+				:touch-angle="25"
+				:threshold="10"
+				:centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/admin-file.vue b/packages/client/src/pages/admin-file.vue
index 77e418b75c..6110886fb7 100644
--- a/packages/client/src/pages/admin-file.vue
+++ b/packages/client/src/pages/admin-file.vue
@@ -7,7 +7,10 @@
 				:tabs="headerTabs"
 		/></template>
 		<MkSpacer :content-max="600" :margin-min="16" :margin-max="32">
-			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
+			<swiper
+				:touch-angle="25"
+				:threshold="10"
+				:centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue
index 12ac0b6298..771dac2996 100644
--- a/packages/client/src/pages/channels.vue
+++ b/packages/client/src/pages/channels.vue
@@ -7,7 +7,10 @@
 				:tabs="headerTabs"
 		/></template>
 		<MkSpacer :content-max="700">
-			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
+			<swiper
+				:touch-angle="25"
+				:threshold="10"
+				:centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index dda387f266..9e26189564 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -8,7 +8,10 @@
 		/></template>
 		<div class="lznhrdub">
 			<MkSpacer :content-max="1200">
-				<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
+				<swiper
+					:touch-angle="25"
+					:threshold="10"
+					:centeredSlides="true"
 					:modules="[Virtual]"
 					:space-between="20"
 					:virtual="true"
diff --git a/packages/client/src/pages/gallery/index.vue b/packages/client/src/pages/gallery/index.vue
index 47582d82bb..5b8bd4512a 100644
--- a/packages/client/src/pages/gallery/index.vue
+++ b/packages/client/src/pages/gallery/index.vue
@@ -8,7 +8,10 @@
 				:display-back-button="true"
 		/></template>
 		<MkSpacer :content-max="1200">
-			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
+			<swiper
+				:touch-angle="25"
+				:threshold="10"
+				:centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue
index 219ba96da1..9103788e06 100644
--- a/packages/client/src/pages/instance-info.vue
+++ b/packages/client/src/pages/instance-info.vue
@@ -12,7 +12,10 @@
 			:margin-min="16"
 			:margin-max="32"
 		>
-			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
+			<swiper
+				:touch-angle="25"
+				:threshold="10"
+				:centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index e2adc4a29e..0e82f06e10 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -8,7 +8,10 @@
 		/></template>
 		<div>
 			<MkSpacer :content-max="800">
-				<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
+				<swiper
+					:touch-angle="25"
+					:threshold="10"
+					:centeredSlides="true"
 					:modules="[Virtual]"
 					:space-between="20"
 					:virtual="true"
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index 8e710de471..e3c0bd7c2d 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -162,12 +162,16 @@ definePageMetadata(
 	computed(() =>
 		note
 			? {
-					title: i18n.t("noteOf", { user: note.user.name || note.user.username }),
+					title: i18n.t("noteOf", {
+						user: note.user.name || note.user.username,
+					}),
 					subtitle: new Date(note.createdAt).toLocaleString(),
 					avatar: note.user,
 					path: `/notes/${note.id}`,
 					share: {
-						title: i18n.t("noteOf", { user: note.user.name || note.user.username }),
+						title: i18n.t("noteOf", {
+							user: note.user.name || note.user.username,
+						}),
 						text: note.text,
 					},
 			  }
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index 1ace1dbaf7..e8695ed266 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -9,7 +9,10 @@
 			/>
 		</template>
 		<MkSpacer :content-max="800">
-			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
+			<swiper
+				:touch-angle="25"
+				:threshold="10"
+				:centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/pages.vue b/packages/client/src/pages/pages.vue
index f90e3f452f..0c042a16d3 100644
--- a/packages/client/src/pages/pages.vue
+++ b/packages/client/src/pages/pages.vue
@@ -7,7 +7,10 @@
 				:tabs="headerTabs"
 		/></template>
 		<MkSpacer :content-max="700">
-			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
+			<swiper
+				:touch-angle="25"
+				:threshold="10"
+				:centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/search.vue b/packages/client/src/pages/search.vue
index 0a767008fa..1bd9770e44 100644
--- a/packages/client/src/pages/search.vue
+++ b/packages/client/src/pages/search.vue
@@ -8,7 +8,10 @@
 				:display-back-button="true"
 		/></template>
 		<MkSpacer :content-max="800">
-			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
+			<swiper
+				:touch-angle="25"
+				:threshold="10"
+				:centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/tag.vue b/packages/client/src/pages/tag.vue
index 690b1ae7f5..81a3e27569 100644
--- a/packages/client/src/pages/tag.vue
+++ b/packages/client/src/pages/tag.vue
@@ -8,7 +8,10 @@
 				:display-back-button="true"
 		/></template>
 		<MkSpacer :content-max="800">
-			<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
+			<swiper
+				:touch-angle="25"
+				:threshold="10"
+				:centeredSlides="true"
 				:modules="[Virtual]"
 				:space-between="20"
 				:virtual="true"
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 2003591fec..b6d8670ae9 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -32,7 +32,10 @@
 				/>
 			</div> *v-else on next div* -->
 				<div class="tl _block">
-					<swiper :touch-angle="25" :threshold="10" :centeredSlides="true"
+					<swiper
+						:touch-angle="25"
+						:threshold="10"
+						:centeredSlides="true"
 						:modules="[Virtual]"
 						:space-between="20"
 						:virtual="true"
diff --git a/packages/client/src/ui/universal.vue b/packages/client/src/ui/universal.vue
index 3784ef8af3..eb2857b2f5 100644
--- a/packages/client/src/ui/universal.vue
+++ b/packages/client/src/ui/universal.vue
@@ -461,7 +461,7 @@ console.log(mainRouter.currentRoute.value.name);
 	}
 	&:not(.isMobile) {
 		> .contents {
-			border-right: .5px solid var(--divider);
+			border-right: 0.5px solid var(--divider);
 		}
 	}
 	&.wallpaper {
@@ -473,7 +473,7 @@ console.log(mainRouter.currentRoute.value.name);
 		&:not(.isMobile) {
 			--navBg: transparent;
 			> .contents {
-				border-inline: .5px solid var(--divider);
+				border-inline: 0.5px solid var(--divider);
 				margin-inline: -1px;
 			}
 		}

From d373e7be25ada40dfa648ec2b17429a9dddd4f6b Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Thu, 25 May 2023 22:51:14 -0400
Subject: [PATCH 020/319] Fix reply and quote icons

past me was really dumb wth
---
 .../client/src/components/MkNoteDetailed.vue  |  2 +
 packages/client/src/components/MkNoteSub.vue  |  4 +-
 .../src/components/MkSubNoteContent.vue       | 48 +++++++++----------
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index b3aee949ee..600a42494f 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -71,6 +71,7 @@
 			class="reply"
 			:conversation="replies"
 			:detailedView="true"
+			:parentId="appearNote.id"
 		/>
 		<MkLoading
 			v-else-if="tab === 'replies' && appearNote.repliesCount > 0"
@@ -84,6 +85,7 @@
 			class="reply"
 			:conversation="replies"
 			:detailedView="true"
+			:parentId="appearNote.id"
 		/>
 		<MkLoading v-else-if="tab === 'quotes' && directQuotes.length > 0" />
 
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 37e14b3a4d..f98dfcb593 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -28,7 +28,7 @@
 					<MkSubNoteContent
 						class="text"
 						:note="note"
-						:parentId="appearNote.parentId"
+						:parentId="parentId"
 						:conversation="conversation"
 						@focusfooter="footerEl.focus()"
 					/>
@@ -140,7 +140,7 @@
 				:conversation="conversation"
 				:depth="replies.length == 1 ? depth : depth + 1"
 				:replyLevel="replyLevel + 1"
-				:parentId="appearNote.replyId"
+				:parentId="appearNote.id"
 				:detailedView="detailedView"
 			/>
 			<div v-else-if="replies.length > 0" class="more">
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index c7dc7dd7ff..cd908420a4 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -1,27 +1,26 @@
 <template>
 	<p v-if="note.cw != null" class="cw">
 		<MkA
-			v-if="!detailed && note.replyId"
-			:to="`#${note.replyId}`"
+			v-if="
+				conversation &&
+				note.renoteId == parentId
+			"
+			:to="`#${parentId}`"
 			behavior="browser"
 			class="reply-icon"
 			@click.stop
 		>
-			<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
+			<i class="ph-quotes ph-bold ph-lg"></i>
 		</MkA>
 		<MkA
-			v-if="
-				conversation &&
-				note.renoteId &&
-				note.renoteId != parentId &&
-				!note.replyId
-			"
-			:to="`/notes/${note.renoteId}`"
+			v-else-if="!detailed && note.replyId"
+			:to="`#${note.replyId}`"
+			behavior="browser"
 			v-tooltip="i18n.ts.jumpToPrevious"
 			class="reply-icon"
 			@click.stop
 		>
-			<i class="ph-quotes ph-bold ph-lg"></i>
+			<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
 		</MkA>
 		<Mfm
 			v-if="note.cw != ''"
@@ -68,7 +67,19 @@
 				>
 				<template v-if="!note.cw">
 					<MkA
-						v-if="!detailed && note.replyId"
+						v-if="
+							conversation &&
+							note.renoteId == parentId
+						"
+						:to="`#${parentId}`"
+						behavior="browser"
+						class="reply-icon"
+						@click.stop
+					>
+						<i class="ph-quotes ph-bold ph-lg"></i>
+					</MkA>
+					<MkA
+						v-else-if="!detailed && note.replyId"
 						:to="`#${note.replyId}`"
 						behavior="browser"
 						v-tooltip="i18n.ts.jumpToPrevious"
@@ -77,19 +88,6 @@
 					>
 						<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"

From 406901236bd30c44281b62c50832e383254d7290 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 25 May 2023 20:05:19 -0700
Subject: [PATCH 021/319] fix: :lipstick: margin on expand tweet button

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

diff --git a/packages/client/src/components/MkUrlPreview.vue b/packages/client/src/components/MkUrlPreview.vue
index fe0684f6d0..8421fab5af 100644
--- a/packages/client/src/components/MkUrlPreview.vue
+++ b/packages/client/src/components/MkUrlPreview.vue
@@ -92,7 +92,7 @@
 				</article>
 			</component>
 		</transition>
-		<div v-if="tweetId" class="expandTweet">
+		<div v-if="tweetId" class="expand-tweet">
 			<MkButton mini rounded @click="tweetExpanded = true">
 				<i class="ph-twitter-logo ph-bold ph-lg"></i>
 				{{ i18n.ts.expandTweet }}
@@ -226,6 +226,10 @@ onUnmounted(() => {
 }
 
 .mk-url-preview {
+	> .expand-tweet {
+		margin-top: 1rem;
+	}
+
 	&.max-width_400px {
 		> .link {
 			font-size: 12px;

From 0f40c2ea2597930268d74ab8c993719d2f64cf62 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 26 May 2023 12:28:31 +0900
Subject: [PATCH 022/319] fix style

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

diff --git a/packages/client/src/components/MkStarButtonNoEmoji.vue b/packages/client/src/components/MkStarButtonNoEmoji.vue
index e67599ac29..e76bc09ffc 100644
--- a/packages/client/src/components/MkStarButtonNoEmoji.vue
+++ b/packages/client/src/components/MkStarButtonNoEmoji.vue
@@ -35,7 +35,7 @@
 			></i>
 		</span>
 		<template v-if="count > 0"
-			><p :class="$style.count">{{ count }}</p></template
+			><p class="count">{{ count }}</p></template
 		>
 	</button>
 </template>

From e1462133f63adc71ffa27378f3e810f98985a512 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 25 May 2023 20:42:14 -0700
Subject: [PATCH 023/319] chore: format

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

diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index cd908420a4..f3669f422a 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -1,10 +1,7 @@
 <template>
 	<p v-if="note.cw != null" class="cw">
 		<MkA
-			v-if="
-				conversation &&
-				note.renoteId == parentId
-			"
+			v-if="conversation && note.renoteId == parentId"
 			:to="`#${parentId}`"
 			behavior="browser"
 			class="reply-icon"
@@ -67,10 +64,7 @@
 				>
 				<template v-if="!note.cw">
 					<MkA
-						v-if="
-							conversation &&
-							note.renoteId == parentId
-						"
+						v-if="conversation && note.renoteId == parentId"
 						:to="`#${parentId}`"
 						behavior="browser"
 						class="reply-icon"

From 8783cf0adfc7018ac1053d0ec1cd5df1517229ca Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 25 May 2023 21:46:45 -0700
Subject: [PATCH 024/319] chore: rebase to v13 MkFolder

Co-authored-by: Syuilo <syuilotan@yahoo.co.jp>
---
 packages/client/src/components/MkFolder.vue | 409 ++++++++++++--------
 1 file changed, 237 insertions(+), 172 deletions(-)

diff --git a/packages/client/src/components/MkFolder.vue b/packages/client/src/components/MkFolder.vue
index 3ef54d920a..280d52984c 100644
--- a/packages/client/src/components/MkFolder.vue
+++ b/packages/client/src/components/MkFolder.vue
@@ -1,195 +1,260 @@
 <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 ref="rootEl" :class="$style.root" role="group" :aria-expanded="opened">
+		<MkStickyContainer>
+			<template #header>
+				<div
+					:class="[$style.header, { [$style.opened]: opened }]"
+					class="_button"
+					role="button"
+					data-cy-folder-header
+					@click="toggle"
+				>
+					<div :class="$style.headerIcon">
+						<slot name="icon"></slot>
+					</div>
+					<div :class="$style.headerText">
+						<div :class="$style.headerTextMain">
+							<MkCondensedLine :minScale="2 / 3"
+								><slot name="label"></slot
+							></MkCondensedLine>
+						</div>
+						<div :class="$style.headerTextSub">
+							<slot name="caption"></slot>
+						</div>
+					</div>
+					<div :class="$style.headerRight">
+						<span :class="$style.headerRightText"
+							><slot name="suffix"></slot
+						></span>
+						<i v-if="opened" class="ti ti-chevron-up icon"></i>
+						<i v-else class="ti ti-chevron-down icon"></i>
+					</div>
+				</div>
+			</template>
+
+			<div
+				v-if="openedAtLeastOnce"
+				:class="[$style.body, { [$style.bgSame]: bgSame }]"
+				:style="{
+					maxHeight: maxHeight ? `${maxHeight}px` : null,
+					overflow: maxHeight ? `auto` : null,
+				}"
+				:aria-hidden="!opened"
+			>
+				<Transition
+					:enterActiveClass="
+						defaultStore.state.animation
+							? $style.transition_toggle_enterActive
+							: ''
+					"
+					:leaveActiveClass="
+						defaultStore.state.animation
+							? $style.transition_toggle_leaveActive
+							: ''
+					"
+					:enterFromClass="
+						defaultStore.state.animation
+							? $style.transition_toggle_enterFrom
+							: ''
+					"
+					:leaveToClass="
+						defaultStore.state.animation
+							? $style.transition_toggle_leaveTo
+							: ''
+					"
+					@enter="enter"
+					@afterEnter="afterEnter"
+					@leave="leave"
+					@afterLeave="afterLeave"
+				>
+					<KeepAlive>
+						<div v-show="opened">
+							<MkSpacer :marginMin="14" :marginMax="22">
+								<slot></slot>
+							</MkSpacer>
+						</div>
+					</KeepAlive>
+				</Transition>
 			</div>
-		</transition>
+		</MkStickyContainer>
 	</div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from "vue";
-import tinycolor from "tinycolor2";
+<script lang="ts" setup>
+import { nextTick, onMounted } from "vue";
+import { defaultStore } from "@/store";
 
-const localStoragePrefix = "ui:folder:";
+const props = withDefaults(
+	defineProps<{
+		defaultOpen?: boolean;
+		maxHeight?: number | null;
+	}>(),
+	{
+		defaultOpen: false,
+		maxHeight: null,
+	}
+);
 
-export default defineComponent({
-	props: {
-		expanded: {
-			type: Boolean,
-			required: false,
-			default: true,
-		},
-		persistKey: {
-			type: String,
-			required: false,
-			default: null,
-		},
-	},
-	data() {
-		return {
-			bg: null,
-			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"
-				);
-			}
-		},
-	},
-	mounted() {
-		function getParentBg(el: Element | null): string {
-			if (el == null || el.tagName === "BODY") return "var(--bg)";
-			const bg = el.style.background || el.style.backgroundColor;
-			if (bg) {
-				return bg;
-			} else {
-				return getParentBg(el.parentElement);
-			}
-		}
-		const rawBg = getParentBg(this.$el);
-		const bg = tinycolor(
-			rawBg.startsWith("var(")
-				? getComputedStyle(document.documentElement).getPropertyValue(
-						rawBg.slice(4, -1)
-				  )
-				: rawBg
-		);
-		bg.setAlpha(0.85);
-		this.bg = bg.toRgbString();
-	},
-	methods: {
-		toggleContent(show: boolean) {
-			this.showBody = show;
-		},
+const getBgColor = (el: HTMLElement) => {
+	const style = window.getComputedStyle(el);
+	if (
+		style.backgroundColor &&
+		!["rgba(0, 0, 0, 0)", "rgba(0,0,0,0)", "transparent"].includes(
+			style.backgroundColor
+		)
+	) {
+		return style.backgroundColor;
+	} else {
+		return el.parentElement ? getBgColor(el.parentElement) : "transparent";
+	}
+};
 
-		enter(el) {
-			const elementHeight = el.getBoundingClientRect().height;
-			el.style.height = 0;
-			el.offsetHeight; // reflow
-			el.style.height = elementHeight + "px";
-		},
-		afterEnter(el) {
-			el.style.height = null;
-		},
-		leave(el) {
-			const elementHeight = el.getBoundingClientRect().height;
-			el.style.height = elementHeight + "px";
-			el.offsetHeight; // reflow
-			el.style.height = 0;
-		},
-		afterLeave(el) {
-			el.style.height = null;
-		},
-	},
+let rootEl = $shallowRef<HTMLElement>();
+let bgSame = $ref(false);
+let opened = $ref(props.defaultOpen);
+let openedAtLeastOnce = $ref(props.defaultOpen);
+
+function enter(el) {
+	const elementHeight = el.getBoundingClientRect().height;
+	el.style.height = 0;
+	el.offsetHeight; // reflow
+	el.style.height =
+		Math.min(elementHeight, props.maxHeight ?? Infinity) + "px";
+}
+
+function afterEnter(el) {
+	el.style.height = null;
+}
+
+function leave(el) {
+	const elementHeight = el.getBoundingClientRect().height;
+	el.style.height = elementHeight + "px";
+	el.offsetHeight; // reflow
+	el.style.height = 0;
+}
+
+function afterLeave(el) {
+	el.style.height = null;
+}
+
+function toggle() {
+	if (!opened) {
+		openedAtLeastOnce = true;
+	}
+
+	nextTick(() => {
+		opened = !opened;
+	});
+}
+
+onMounted(() => {
+	const computedStyle = getComputedStyle(document.documentElement);
+	const parentBg = getBgColor(rootEl.parentElement);
+	const myBg = computedStyle.getPropertyValue("--panel");
+	bgSame = parentBg === myBg;
 });
 </script>
 
-<style lang="scss" scoped>
-.folder-toggle-enter-active,
-.folder-toggle-leave-active {
-	overflow-y: hidden;
-	transition: opacity 0.5s, height 0.5s !important;
+<style lang="scss" module>
+.transition_toggle_enterActive,
+.transition_toggle_leaveActive {
+	overflow-y: clip;
+	transition: opacity 0.3s, height 0.3s, transform 0.3s !important;
 }
-.folder-toggle-enter-from {
-	opacity: 0;
-}
-.folder-toggle-leave-to {
+.transition_toggle_enterFrom,
+.transition_toggle_leaveTo {
 	opacity: 0;
 }
 
-.ssazuxis {
-	position: relative;
+.root {
+	display: block;
+}
 
-	> header {
-		display: flex;
-		position: relative;
-		z-index: 10;
-		position: sticky;
-		top: var(--stickyTop, 0px);
-		padding: var(--x-padding);
-		-webkit-backdrop-filter: var(--blur, blur(8px));
-		backdrop-filter: var(--blur, blur(20px));
-		margin-inline: -12px;
-		padding-inline: 12px;
-		mask: linear-gradient(
-			to right,
-			transparent,
-			black 12px calc(100% - 12px),
-			transparent
-		);
-		-webkit-mask: linear-gradient(
-			to right,
-			transparent,
-			black 12px calc(100% - 12px),
-			transparent
-		);
+.header {
+	display: flex;
+	align-items: center;
+	width: 100%;
+	box-sizing: border-box;
+	padding: 9px 12px 9px 12px;
+	background: var(--buttonBg);
+	-webkit-backdrop-filter: var(--blur, blur(15px));
+	backdrop-filter: var(--blur, blur(15px));
+	border-radius: 6px;
+	transition: border-radius 0.3s;
 
-		> .title {
-			margin: 0;
-			padding: 12px 16px 12px 0;
-
-			> i {
-				margin-right: 6px;
-			}
-
-			&:empty {
-				display: none;
-			}
-		}
-
-		> .divider {
-			flex: 1;
-			margin: auto;
-			height: 1px;
-			background: var(--divider);
-		}
-
-		> button {
-			padding: 12px 0 12px 16px;
-		}
+	&:hover {
+		text-decoration: none;
+		background: var(--buttonHoverBg);
 	}
 
-	&.max-width_500px {
-		> header {
-			> .title {
-				padding: 8px 10px 8px 0;
-			}
+	&.active {
+		color: var(--accent);
+		background: var(--buttonHoverBg);
+	}
+
+	&.opened {
+		border-radius: 6px 6px 0 0;
+	}
+}
+
+.headerUpper {
+	display: flex;
+	align-items: center;
+}
+
+.headerLower {
+	color: var(--fgTransparentWeak);
+	font-size: 0.85em;
+	padding-left: 4px;
+}
+
+.headerIcon {
+	margin-right: 0.75em;
+	flex-shrink: 0;
+	text-align: center;
+	opacity: 0.8;
+
+	&:empty {
+		display: none;
+
+		& + .headerText {
+			padding-left: 4px;
 		}
 	}
 }
+
+.headerText {
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	padding-right: 12px;
+}
+
+.headerTextMain {
+}
+
+.headerTextSub {
+	color: var(--fgTransparentWeak);
+	font-size: 0.85em;
+}
+
+.headerRight {
+	margin-left: auto;
+	color: var(--fgTransparentWeak);
+	white-space: nowrap;
+}
+
+.headerRightText:not(:empty) {
+	margin-right: 0.75em;
+}
+
+.body {
+	background: var(--panel);
+	border-radius: 0 0 6px 6px;
+	container-type: inline-size;
+
+	&.bgSame {
+		background: var(--bg);
+	}
+}
 </style>

From afa15e17ef267385735a673522de3b5fa8cb4bd3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 25 May 2023 22:05:43 -0700
Subject: [PATCH 025/319] refactor: make post imports an experiment

---
 .../src/server/api/endpoints/admin/meta.ts     |  3 +++
 .../server/api/endpoints/admin/update-meta.ts  |  1 +
 .../src/server/api/endpoints/i/import-posts.ts | 11 +++++++++++
 .../backend/src/server/api/endpoints/meta.ts   |  1 +
 .../src/server/api/endpoints/notes/edit.ts     | 11 +++++++++++
 .../client/src/pages/admin/experiments.vue     | 18 +++++++++++++++++-
 6 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index dd04b8cad9..24c895cbb3 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -479,6 +479,9 @@ export const meta = {
 					postEditing: {
 						type: "boolean",
 					},
+					postImports: {
+						type: "boolean",
+					},
 				},
 			},
 		},
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 c5d534879e..b967112a5c 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -175,6 +175,7 @@ export const paramDef = {
 			nullable: true,
 			properties: {
 				postEditing: { type: "boolean" },
+				postImports: { type: "boolean" },
 			},
 		},
 	},
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 5f4b99f029..3adba0514e 100644
--- a/packages/backend/src/server/api/endpoints/i/import-posts.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-posts.ts
@@ -3,6 +3,7 @@ import { createImportPostsJob } from "@/queue/index.js";
 import { ApiError } from "../../error.js";
 import { DriveFiles } from "@/models/index.js";
 import { DAY } from "@/const.js";
+import { fetchMeta } from "@/misc/fetch-meta.js";
 
 export const meta = {
 	secure: true,
@@ -23,6 +24,12 @@ export const meta = {
 			code: "EMPTY_FILE",
 			id: "d2f12af1-e7b4-feac-86a3-519548f2728e",
 		},
+
+		importsDisabled: {
+			message: "Post imports are disabled.",
+			code: "IMPORTS_DISABLED",
+			id: " bc9227e4-fb82-11ed-be56-0242ac120002",
+		},
 	},
 } as const;
 
@@ -38,6 +45,10 @@ export const paramDef = {
 export default define(meta, paramDef, async (ps, user) => {
 	const file = await DriveFiles.findOneBy({ id: ps.fileId });
 
+	const instanceMeta = await fetchMeta();
+	if (instanceMeta.experimentalFeatures?.postImports === false)
+		throw new ApiError(meta.errors.importsDisabled);
+
 	if (file == null) throw new ApiError(meta.errors.noSuchFile);
 	if (file.size === 0) throw new ApiError(meta.errors.emptyFile);
 	createImportPostsJob(user, file.id, ps.signatureCheck);
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 2f409eb190..139afc88ba 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -524,6 +524,7 @@ export default define(meta, paramDef, async (ps, me) => {
 			discord: instance.enableDiscordIntegration,
 			serviceWorker: instance.enableServiceWorker,
 			postEditing: instance.experimentalFeatures?.postEditing || false,
+			postImports: instance.experimentalFeatures?.postImports || false,
 			miauth: true,
 		};
 	}
diff --git a/packages/backend/src/server/api/endpoints/notes/edit.ts b/packages/backend/src/server/api/endpoints/notes/edit.ts
index 7cddb7d217..66db6f644f 100644
--- a/packages/backend/src/server/api/endpoints/notes/edit.ts
+++ b/packages/backend/src/server/api/endpoints/notes/edit.ts
@@ -33,6 +33,7 @@ import { renderActivity } from "@/remote/activitypub/renderer/index.js";
 import renderNote from "@/remote/activitypub/renderer/note.js";
 import renderUpdate from "@/remote/activitypub/renderer/update.js";
 import { deliverToRelays } from "@/services/relay.js";
+import { fetchMeta } from "@/misc/fetch-meta.js";
 
 export const meta = {
 	tags: ["notes"],
@@ -138,6 +139,12 @@ export const meta = {
 			code: "NOT_LOCAL_USER",
 			id: "b907f407-2aa0-4283-800b-a2c56290b822",
 		},
+
+		editsDisabled: {
+			message: "Post edits are disabled.",
+			code: "EDITS_DISABLED",
+			id: "99306f00-fb81-11ed-be56-0242ac120002",
+		},
 	},
 } as const;
 
@@ -236,6 +243,10 @@ export const paramDef = {
 export default define(meta, paramDef, async (ps, user) => {
 	if (user.movedToUri != null) throw new ApiError(meta.errors.accountLocked);
 
+	const instanceMeta = await fetchMeta();
+	if (instanceMeta.experimentalFeatures?.postImports === false)
+		throw new ApiError(meta.errors.editsDisabled);
+
 	if (!Users.isLocalUser(user)) {
 		throw new ApiError(meta.errors.notLocalUser);
 	}
diff --git a/packages/client/src/pages/admin/experiments.vue b/packages/client/src/pages/admin/experiments.vue
index 7e37c65769..d655c93796 100644
--- a/packages/client/src/pages/admin/experiments.vue
+++ b/packages/client/src/pages/admin/experiments.vue
@@ -16,12 +16,24 @@
 					<template #label>
 						<i class="ph-pencil-line ph-bold ph-lg"></i>
 						{{ i18n.ts._experiments.enablePostEditing }}
-						<span class="_beta"> {{ i18n.ts.beta }}</span>
 					</template>
 					<template #caption>{{
 						i18n.ts._experiments.postEditingCaption
 					}}</template>
 				</FormSwitch>
+				<FormSwitch
+					v-model="enablePostImports"
+					@update:modelValue="save"
+					class="_formBlock"
+				>
+					<template #label>
+						<i class="ph-pencil-line ph-bold ph-lg"></i>
+						{{ i18n.ts._experiments.enablePostImports }}
+					</template>
+					<template #caption>{{
+						i18n.ts._experiments.postImportsCaption
+					}}</template>
+				</FormSwitch>
 			</FormSuspense>
 		</MkSpacer>
 	</MkStickyContainer>
@@ -38,11 +50,13 @@ import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
 
 let enablePostEditing = $ref(false);
+let enablePostImports = $ref(false);
 let meta = $ref<MetaExperiments | null>(null);
 
 type MetaExperiments = {
 	experimentalFeatures?: {
 		postEditing?: boolean;
+		postImports?: boolean;
 	};
 };
 
@@ -51,12 +65,14 @@ async function init() {
 	if (!meta) return;
 
 	enablePostEditing = meta.experimentalFeatures?.postEditing ?? false;
+	enablePostImports = meta.experimentalFeatures?.postImports ?? false;
 }
 
 function save() {
 	const experiments: MetaExperiments = {
 		experimentalFeatures: {
 			postEditing: enablePostEditing,
+			postImports: enablePostImports,
 		},
 	};
 	os.apiWithDialog("admin/update-meta", experiments).then(() => {

From 5b765eedd51efccf5f0436918dda41298578c7ec Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 25 May 2023 22:06:04 -0700
Subject: [PATCH 026/319] dev23

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

diff --git a/package.json b/package.json
index 0a73d633bf..f664c064fe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev22",
+	"version": "14.0.0-dev23",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 5ecb7815ff135e91ebf20da2777ed62fb9d70652 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 25 May 2023 22:17:19 -0700
Subject: [PATCH 027/319] Revert "chore: rebase to v13 MkFolder"

This reverts commit 8783cf0adfc7018ac1053d0ec1cd5df1517229ca.
---
 packages/client/src/components/MkFolder.vue | 409 ++++++++------------
 1 file changed, 172 insertions(+), 237 deletions(-)

diff --git a/packages/client/src/components/MkFolder.vue b/packages/client/src/components/MkFolder.vue
index 280d52984c..3ef54d920a 100644
--- a/packages/client/src/components/MkFolder.vue
+++ b/packages/client/src/components/MkFolder.vue
@@ -1,260 +1,195 @@
 <template>
-	<div ref="rootEl" :class="$style.root" role="group" :aria-expanded="opened">
-		<MkStickyContainer>
-			<template #header>
-				<div
-					:class="[$style.header, { [$style.opened]: opened }]"
-					class="_button"
-					role="button"
-					data-cy-folder-header
-					@click="toggle"
-				>
-					<div :class="$style.headerIcon">
-						<slot name="icon"></slot>
-					</div>
-					<div :class="$style.headerText">
-						<div :class="$style.headerTextMain">
-							<MkCondensedLine :minScale="2 / 3"
-								><slot name="label"></slot
-							></MkCondensedLine>
-						</div>
-						<div :class="$style.headerTextSub">
-							<slot name="caption"></slot>
-						</div>
-					</div>
-					<div :class="$style.headerRight">
-						<span :class="$style.headerRightText"
-							><slot name="suffix"></slot
-						></span>
-						<i v-if="opened" class="ti ti-chevron-up icon"></i>
-						<i v-else class="ti ti-chevron-down icon"></i>
-					</div>
-				</div>
-			</template>
-
-			<div
-				v-if="openedAtLeastOnce"
-				:class="[$style.body, { [$style.bgSame]: bgSame }]"
-				:style="{
-					maxHeight: maxHeight ? `${maxHeight}px` : null,
-					overflow: maxHeight ? `auto` : null,
-				}"
-				:aria-hidden="!opened"
-			>
-				<Transition
-					:enterActiveClass="
-						defaultStore.state.animation
-							? $style.transition_toggle_enterActive
-							: ''
-					"
-					:leaveActiveClass="
-						defaultStore.state.animation
-							? $style.transition_toggle_leaveActive
-							: ''
-					"
-					:enterFromClass="
-						defaultStore.state.animation
-							? $style.transition_toggle_enterFrom
-							: ''
-					"
-					:leaveToClass="
-						defaultStore.state.animation
-							? $style.transition_toggle_leaveTo
-							: ''
-					"
-					@enter="enter"
-					@afterEnter="afterEnter"
-					@leave="leave"
-					@afterLeave="afterLeave"
-				>
-					<KeepAlive>
-						<div v-show="opened">
-							<MkSpacer :marginMin="14" :marginMax="22">
-								<slot></slot>
-							</MkSpacer>
-						</div>
-					</KeepAlive>
-				</Transition>
+	<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>
-		</MkStickyContainer>
+		</transition>
 	</div>
 </template>
 
-<script lang="ts" setup>
-import { nextTick, onMounted } from "vue";
-import { defaultStore } from "@/store";
+<script lang="ts">
+import { defineComponent } from "vue";
+import tinycolor from "tinycolor2";
 
-const props = withDefaults(
-	defineProps<{
-		defaultOpen?: boolean;
-		maxHeight?: number | null;
-	}>(),
-	{
-		defaultOpen: false,
-		maxHeight: null,
-	}
-);
+const localStoragePrefix = "ui:folder:";
 
-const getBgColor = (el: HTMLElement) => {
-	const style = window.getComputedStyle(el);
-	if (
-		style.backgroundColor &&
-		!["rgba(0, 0, 0, 0)", "rgba(0,0,0,0)", "transparent"].includes(
-			style.backgroundColor
-		)
-	) {
-		return style.backgroundColor;
-	} else {
-		return el.parentElement ? getBgColor(el.parentElement) : "transparent";
-	}
-};
+export default defineComponent({
+	props: {
+		expanded: {
+			type: Boolean,
+			required: false,
+			default: true,
+		},
+		persistKey: {
+			type: String,
+			required: false,
+			default: null,
+		},
+	},
+	data() {
+		return {
+			bg: null,
+			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"
+				);
+			}
+		},
+	},
+	mounted() {
+		function getParentBg(el: Element | null): string {
+			if (el == null || el.tagName === "BODY") return "var(--bg)";
+			const bg = el.style.background || el.style.backgroundColor;
+			if (bg) {
+				return bg;
+			} else {
+				return getParentBg(el.parentElement);
+			}
+		}
+		const rawBg = getParentBg(this.$el);
+		const bg = tinycolor(
+			rawBg.startsWith("var(")
+				? getComputedStyle(document.documentElement).getPropertyValue(
+						rawBg.slice(4, -1)
+				  )
+				: rawBg
+		);
+		bg.setAlpha(0.85);
+		this.bg = bg.toRgbString();
+	},
+	methods: {
+		toggleContent(show: boolean) {
+			this.showBody = show;
+		},
 
-let rootEl = $shallowRef<HTMLElement>();
-let bgSame = $ref(false);
-let opened = $ref(props.defaultOpen);
-let openedAtLeastOnce = $ref(props.defaultOpen);
-
-function enter(el) {
-	const elementHeight = el.getBoundingClientRect().height;
-	el.style.height = 0;
-	el.offsetHeight; // reflow
-	el.style.height =
-		Math.min(elementHeight, props.maxHeight ?? Infinity) + "px";
-}
-
-function afterEnter(el) {
-	el.style.height = null;
-}
-
-function leave(el) {
-	const elementHeight = el.getBoundingClientRect().height;
-	el.style.height = elementHeight + "px";
-	el.offsetHeight; // reflow
-	el.style.height = 0;
-}
-
-function afterLeave(el) {
-	el.style.height = null;
-}
-
-function toggle() {
-	if (!opened) {
-		openedAtLeastOnce = true;
-	}
-
-	nextTick(() => {
-		opened = !opened;
-	});
-}
-
-onMounted(() => {
-	const computedStyle = getComputedStyle(document.documentElement);
-	const parentBg = getBgColor(rootEl.parentElement);
-	const myBg = computedStyle.getPropertyValue("--panel");
-	bgSame = parentBg === myBg;
+		enter(el) {
+			const elementHeight = el.getBoundingClientRect().height;
+			el.style.height = 0;
+			el.offsetHeight; // reflow
+			el.style.height = elementHeight + "px";
+		},
+		afterEnter(el) {
+			el.style.height = null;
+		},
+		leave(el) {
+			const elementHeight = el.getBoundingClientRect().height;
+			el.style.height = elementHeight + "px";
+			el.offsetHeight; // reflow
+			el.style.height = 0;
+		},
+		afterLeave(el) {
+			el.style.height = null;
+		},
+	},
 });
 </script>
 
-<style lang="scss" module>
-.transition_toggle_enterActive,
-.transition_toggle_leaveActive {
-	overflow-y: clip;
-	transition: opacity 0.3s, height 0.3s, transform 0.3s !important;
+<style lang="scss" scoped>
+.folder-toggle-enter-active,
+.folder-toggle-leave-active {
+	overflow-y: hidden;
+	transition: opacity 0.5s, height 0.5s !important;
 }
-.transition_toggle_enterFrom,
-.transition_toggle_leaveTo {
+.folder-toggle-enter-from {
+	opacity: 0;
+}
+.folder-toggle-leave-to {
 	opacity: 0;
 }
 
-.root {
-	display: block;
-}
+.ssazuxis {
+	position: relative;
 
-.header {
-	display: flex;
-	align-items: center;
-	width: 100%;
-	box-sizing: border-box;
-	padding: 9px 12px 9px 12px;
-	background: var(--buttonBg);
-	-webkit-backdrop-filter: var(--blur, blur(15px));
-	backdrop-filter: var(--blur, blur(15px));
-	border-radius: 6px;
-	transition: border-radius 0.3s;
+	> header {
+		display: flex;
+		position: relative;
+		z-index: 10;
+		position: sticky;
+		top: var(--stickyTop, 0px);
+		padding: var(--x-padding);
+		-webkit-backdrop-filter: var(--blur, blur(8px));
+		backdrop-filter: var(--blur, blur(20px));
+		margin-inline: -12px;
+		padding-inline: 12px;
+		mask: linear-gradient(
+			to right,
+			transparent,
+			black 12px calc(100% - 12px),
+			transparent
+		);
+		-webkit-mask: linear-gradient(
+			to right,
+			transparent,
+			black 12px calc(100% - 12px),
+			transparent
+		);
 
-	&:hover {
-		text-decoration: none;
-		background: var(--buttonHoverBg);
+		> .title {
+			margin: 0;
+			padding: 12px 16px 12px 0;
+
+			> i {
+				margin-right: 6px;
+			}
+
+			&:empty {
+				display: none;
+			}
+		}
+
+		> .divider {
+			flex: 1;
+			margin: auto;
+			height: 1px;
+			background: var(--divider);
+		}
+
+		> button {
+			padding: 12px 0 12px 16px;
+		}
 	}
 
-	&.active {
-		color: var(--accent);
-		background: var(--buttonHoverBg);
-	}
-
-	&.opened {
-		border-radius: 6px 6px 0 0;
-	}
-}
-
-.headerUpper {
-	display: flex;
-	align-items: center;
-}
-
-.headerLower {
-	color: var(--fgTransparentWeak);
-	font-size: 0.85em;
-	padding-left: 4px;
-}
-
-.headerIcon {
-	margin-right: 0.75em;
-	flex-shrink: 0;
-	text-align: center;
-	opacity: 0.8;
-
-	&:empty {
-		display: none;
-
-		& + .headerText {
-			padding-left: 4px;
+	&.max-width_500px {
+		> header {
+			> .title {
+				padding: 8px 10px 8px 0;
+			}
 		}
 	}
 }
-
-.headerText {
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	overflow: hidden;
-	padding-right: 12px;
-}
-
-.headerTextMain {
-}
-
-.headerTextSub {
-	color: var(--fgTransparentWeak);
-	font-size: 0.85em;
-}
-
-.headerRight {
-	margin-left: auto;
-	color: var(--fgTransparentWeak);
-	white-space: nowrap;
-}
-
-.headerRightText:not(:empty) {
-	margin-right: 0.75em;
-}
-
-.body {
-	background: var(--panel);
-	border-radius: 0 0 6px 6px;
-	container-type: inline-size;
-
-	&.bgSame {
-		background: var(--bg);
-	}
-}
 </style>

From 870765684a142e219c3b590626186d1f1bda869a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 25 May 2023 22:24:46 -0700
Subject: [PATCH 028/319] locale

---
 locales/en-US.yml                               | 7 +++++--
 packages/client/src/pages/admin/experiments.vue | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 601d99ed02..6fe8bccfc9 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1090,7 +1090,6 @@ preventAiLearningDescription: "Request third-party AI language models not to stu
   \ content you upload, such as posts and images."
 noGraze: "Please disable the \"Graze for Mastodon\" browser extension, as it interferes with Calckey."
 silencedWarning: "This page is showing because these usera are from servers your admin silenced, so they may potentially be spam."
-
 _sensitiveMediaDetection:
   description: "Reduces the effort of server moderation through automatically recognizing\
     \ NSFW media via Machine Learning. This will slightly increase the load on the\
@@ -2017,4 +2016,8 @@ _experiments:
   title: "Experiments"
   enablePostEditing: "Enable post editing"
   postEditingCaption: "Shows the option for users to edit their existing posts via\
-    \ the post options menu"
+    \ the post options menu."
+  enablePostImports: "Enable post imports"
+  postImportsDescription: "Allows users to import their posts from past Calckey,\
+    \ Misskey, Mastodon, Akkoma, and Pleroma accounts. It may cause slowdowns during\
+    \ load if your queue is bottlenecked."
diff --git a/packages/client/src/pages/admin/experiments.vue b/packages/client/src/pages/admin/experiments.vue
index d655c93796..0c9a258cb4 100644
--- a/packages/client/src/pages/admin/experiments.vue
+++ b/packages/client/src/pages/admin/experiments.vue
@@ -27,7 +27,7 @@
 					class="_formBlock"
 				>
 					<template #label>
-						<i class="ph-pencil-line ph-bold ph-lg"></i>
+						<i class="ph-download-simple ph-bold ph-lg"></i>
 						{{ i18n.ts._experiments.enablePostImports }}
 					</template>
 					<template #caption>{{

From ff04e6935dad4793a00ee2f51a7072cd72f51e15 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 26 May 2023 04:27:01 +0000
Subject: [PATCH 029/319] chore: Translated using Weblate (English)

Currently translated at 100.0% (1753 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/en/
---
 locales/en-US.yml | 532 +++++++++++++++++++++++-----------------------
 1 file changed, 267 insertions(+), 265 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 601d99ed02..3508d6e3b1 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1,8 +1,8 @@
 _lang_: "English"
-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"
+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"
@@ -48,8 +48,8 @@ copyLink: "Copy link"
 delete: "Delete"
 deleted: "Deleted"
 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."
 editNote: "Edit note"
 edited: "Edited"
 addToList: "Add to list"
@@ -75,11 +75,11 @@ import: "Import"
 export: "Export"
 files: "Files"
 download: "Download"
-driveFileDeleteConfirm: "Are you sure you want to delete the file \"{name}\"? It will\
-  \ be removed from all posts that contain it as an attachment."
+driveFileDeleteConfirm: "Are you sure you want to delete the file \"{name}\"? It will
+  be removed from all posts that contain it as an attachment."
 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"
@@ -94,8 +94,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"
@@ -155,21 +155,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 server. 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 server. 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? \U0001F63A"
+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."
+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"
@@ -183,10 +183,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 server\
-  \ 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 server if no
+  local user is following that user, so the proxy account will follow instead."
 host: "Host"
 selectUser: "Select a user"
 selectInstance: "Select an server"
@@ -219,22 +219,22 @@ instanceInfo: "Server 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 Servers"
-blockedInstancesDescription: "List the hostnames of the servers that you want to\
-  \ block. Listed servers will no longer be able to communicate with this servers."
+blockedInstancesDescription: "List the hostnames of the servers that you want to block.
+  Listed servers will no longer be able to communicate with this servers."
 silencedInstances: "Silenced Servers"
-silencedInstancesDescription: "List the hostnames of the servers that you want to\
-  \ silence. Accounts in the listed servers are treated as \"Silenced\", can only\
-  \ make follow requests, and cannot mention local accounts if not followed. This\
-  \ will not affect the blocked servers."
+silencedInstancesDescription: "List the hostnames of the servers that you want to
+  silence. Accounts in the listed servers are treated as \"Silenced\", can only make
+  follow requests, and cannot mention local accounts if not followed. This will not
+  affect the blocked servers."
 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"
@@ -285,8 +285,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"
@@ -336,8 +336,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"
@@ -372,8 +372,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"
@@ -385,11 +385,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 server, separated by line breaks."
+pinnedPagesDescription: "Enter the paths of the Pages you want to pin to the top page
+  of this server, separated by line breaks."
 pinnedClipId: "ID of the clip to pin"
 pinnedNotes: "Pinned posts"
 hcaptcha: "hCaptcha"
@@ -400,17 +400,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"
@@ -541,27 +541,26 @@ 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"
@@ -589,9 +588,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"
@@ -599,14 +598,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 server e.g. no longer exists."
+removeAllFollowingDescription: "Executing this unfollows all accounts from {host}.
+  Please run this if the server 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"
@@ -647,14 +646,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"
@@ -668,8 +667,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: "Server Mutes"
 userSaysSomething: "{name} said something"
 userSaysSomethingReason: "{name} said {reason}"
@@ -689,13 +688,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"
@@ -703,15 +702,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 server"
-forwardReportIsAnonymous: "Instead of your account, an anonymous system account will\
-  \ be displayed as reporter at the remote server."
+forwardReportIsAnonymous: "Instead of your account, an anonymous system account will
+  be displayed as reporter at the remote server."
 send: "Send"
 abuseMarkAsResolved: "Mark report as resolved"
 openInNewTab: "Open in new tab"
@@ -729,11 +728,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"
@@ -752,16 +751,15 @@ 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"
@@ -773,8 +771,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"
@@ -789,10 +787,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 Calckey.\n\
-  This 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"
@@ -831,17 +829,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"
@@ -878,15 +876,15 @@ secureMode: "Secure Mode (Authorized Fetch)"
 instanceSecurity: "Server Security"
 secureModeInfo: "When requesting from other servers, do not send back without proof."
 privateMode: "Private Mode"
-privateModeInfo: "When enabled, only whitelisted servers can federate with your\
-  \ server. All posts will be hidden from the public."
+privateModeInfo: "When enabled, only whitelisted servers can federate with your server.
+  All posts will be hidden from the public."
 allowedInstances: "Whitelisted Servers"
-allowedInstancesDescription: "Hosts of servers to be whitelisted for federation,\
-  \ each separated by a new line (only applies in private mode)."
+allowedInstancesDescription: "Hosts of servers to be whitelisted for federation, 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\
-  \ 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"
@@ -903,9 +901,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"
@@ -922,14 +920,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: "Centered"
 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."
@@ -969,16 +967,18 @@ 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: "This account is created and automatically operated by the system. Please do not moderate, edit, delete, or otherwise tamper with this account, or it may break your server."
+isSystemAccount: "This account is created and automatically operated by the system.
+  Please do not moderate, edit, delete, or otherwise tamper with this account, or
+  it may break your server."
 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"
@@ -995,19 +995,19 @@ 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."
-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\
-  \ through Machine Learning where possible. Even if this option is disabled, it may\
-  \ be enabled server-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 server-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"
@@ -1017,27 +1017,27 @@ subscribePushNotification: "Enable push notifications"
 unsubscribePushNotification: "Disable push notifications"
 pushNotificationAlreadySubscribed: "Push notifications are already enabled"
 pushNotificationNotSupported: "Your browser or server does not support push notifications"
-sendPushNotificationReadMessage: "Delete push notifications once the relevant notifications\
-  \ or messages have been read"
+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."
+  \ 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 servers"
-recommendedInstancesDescription: "Recommended servers separated by line breaks to\
-  \ appear in the recommended timeline. Do NOT add `https://`, ONLY the domain."
+recommendedInstancesDescription: "Recommended servers separated 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!"
@@ -1049,62 +1049,63 @@ 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@server.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@server.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@server.com"
-migrationConfirm: "Are you absolutely sure you want to migrate your account 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@server.com"
+migrationConfirm: "Are you absolutely sure you want to migrate your account 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"
-signupsDisabled: "Signups on this server are currently disabled, but you can always\
-  \ sign up at another server! If you have an invitation code for this server, please\
-  \ enter it below."
+signupsDisabled: "Signups on this server are currently disabled, but you can always
+  sign up at another server! If you have an invitation code for this server, please
+  enter it below."
 findOtherInstance: "Find another server"
 apps: "Apps"
 sendModMail: "Send Moderation Notice"
 preventAiLearning: "Prevent AI bot scraping"
-preventAiLearningDescription: "Request third-party AI language models not to study\
-  \ content you upload, such as posts and images."
-noGraze: "Please disable the \"Graze for Mastodon\" browser extension, as it interferes with Calckey."
-silencedWarning: "This page is showing because these usera are from servers your admin silenced, so they may potentially be spam."
+preventAiLearningDescription: "Request third-party AI language models not to study
+  content you upload, such as posts and images."
+noGraze: "Please disable the \"Graze for Mastodon\" browser extension, as it interferes
+  with Calckey."
+silencedWarning: "This page is showing because these users are from servers your admin
+  silenced, so they may potentially be spam."
 
 _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"
@@ -1118,15 +1119,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"
@@ -1134,12 +1135,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\
-    \ server administrator instead."
-  contactAdmin: "This server does not support using email addresses, please contact\
-    \ the server 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
+    server administrator instead."
+  contactAdmin: "This server does not support using email addresses, please contact
+    the server administrator to reset your password instead."
 _gallery:
   my: "My Gallery"
   liked: "Liked Posts"
@@ -1162,15 +1163,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"
@@ -1182,15 +1183,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! \U0001F970"
+  morePatrons: "We also appreciate the support of many other helpers not listed here.
+    Thank you! 🥰"
   patrons: "Calckey patrons"
 _nsfw:
   respect: "Hide NSFW media"
@@ -1202,8 +1203,8 @@ _mfm:
   warn: "MFM may contain rapidly moving or flashy animations"
   alwaysPlay: "Always autoplay all animated 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."
@@ -1222,8 +1223,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)"
@@ -1231,8 +1232,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"
@@ -1278,8 +1279,8 @@ _mfm:
   background: "Background color"
   backgroundDescription: "Change the background color of text."
   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"
@@ -1311,19 +1312,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 servers,\
-    \ including those of users replying to a user from a muted server."
+  instanceMuteDescription: "This will mute any posts/boosts from the listed servers,
+    including those of users replying to a user from a muted server."
   instanceMuteDescription2: "Separate with newlines"
   title: "Hides posts from listed servers."
   heading: "List of servers to be muted"
@@ -1429,31 +1430,32 @@ _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 it's 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 make an {introduction} post or\
-    \ a simple \"Hello world!\""
+  step4_2: "For your first post, some people like to make an {introduction} post or
+    a simple \"Hello world!\""
   step5_1: "Timelines, timelines everywhere!"
   step5_2: "Your server has {timelines} different timelines enabled."
-  step5_3: "The Home {icon} timeline is where you can see posts from the accounts\
-    \ you follow."
-  step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this server."
+  step5_3: "The Home {icon} timeline is where you can see posts from the accounts
+    you follow."
+  step5_4: "The Local {icon} timeline is where you can see posts from everyone else
+    on this server."
   step5_5: "The Social {icon} timeline is a combination of the Home and Local timelines."
-  step5_6: "The Recommended {icon} timeline is where you can see posts from server\
-    \ the admins recommend."
-  step5_7: "The Global {icon} timeline is where you can see posts from every other\
-    \ connected server."
+  step5_6: "The Recommended {icon} timeline is where you can see posts from server
+    the admins recommend."
+  step5_7: "The Global {icon} timeline is where you can see posts from every other
+    connected server."
   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."
-  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."
+  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."
@@ -1464,9 +1466,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"
@@ -1502,8 +1504,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"
@@ -1605,14 +1607,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"
@@ -1930,8 +1932,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"
@@ -2000,10 +2002,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"
@@ -2016,5 +2018,5 @@ _deck:
 _experiments:
   title: "Experiments"
   enablePostEditing: "Enable post editing"
-  postEditingCaption: "Shows the option for users to edit their existing posts via\
-    \ the post options menu"
+  postEditingCaption: "Shows the option for users to edit their existing posts via
+    the post options menu"

From 8ca72cf143dccffa180f277422cac79214fe5ffb Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Fri, 26 May 2023 04:15:19 +0000
Subject: [PATCH 030/319] chore: Translated using Weblate (Japanese)

Currently translated at 98.8% (1732 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ja/
---
 locales/ja-JP.yml | 117 ++++++++++++++++++++++++----------------------
 1 file changed, 61 insertions(+), 56 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 84c894c7a8..e95f73e2fe 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1,7 +1,7 @@
 _lang_: "日本語"
-headlineMisskey: "ずっと無料でオープンソースの非中央集権型ソーシャルメディアプラットフォーム\U0001F680"
-introMisskey: "ようこそ！Calckeyは、オープンソースの非中央集権型ソーシャルメディアプラットフォームです。\nいま起こっていることを共有したり、あなたについて皆に発信しましょう\U0001F4E1\
-  \n「リアクション」機能で、皆の投稿に素早く反応を追加できます\U0001F44D\n新しい世界を探検しよう\U0001F680"
+headlineMisskey: "ずっと無料でオープンソースの非中央集権型ソーシャルメディアプラットフォーム🚀"
+introMisskey: "ようこそ！Calckeyは、オープンソースの非中央集権型ソーシャルメディアプラットフォームです。\nいま起こっていることを共有したり、あなたについて皆に発信しましょう📡\n\
+  「リアクション」機能で、皆の投稿に素早く反応を追加できます👍\n新しい世界を探検しよう🚀"
 monthAndDay: "{month}月 {day}日"
 search: "検索"
 notifications: "通知"
@@ -17,7 +17,7 @@ enterUsername: "ユーザー名を入力"
 renotedBy: "{user}がブースト"
 noNotes: "投稿はありません"
 noNotifications: "通知はありません"
-instance: "インスタンス"
+instance: "サーバー"
 settings: "設定"
 basicSettings: "基本設定"
 otherSettings: "その他の設定"
@@ -33,7 +33,7 @@ uploading: "アップロード中"
 save: "保存"
 users: "ユーザー"
 addUser: "ユーザーを追加"
-addInstance: "インスタンスを追加"
+addInstance: "サーバーを追加"
 favorite: "お気に入り"
 favorites: "お気に入り"
 unfavorite: "お気に入り解除"
@@ -146,7 +146,7 @@ cacheRemoteFiles: "リモートのファイルをキャッシュする"
 cacheRemoteFilesDescription: "この設定を無効にすると、リモートファイルをキャッシュせず直リンクします。サーバーのストレージを節約できますが、サムネイルが生成されないので通信量が増加します。"
 flagAsBot: "Botとして設定"
 flagAsBotDescription: "このアカウントがBotである場合は、この設定をオンにします。オンにすると、反応の連鎖を防ぐためのフラグとして他の開発者に役立ったり、Calckeyのシステム上での扱いがBotに合ったものになります。"
-flagAsCat: "あなたは…猫？\U0001F63A"
+flagAsCat: "あなたは…猫？😺"
 flagAsCatDescription: "このアカウントが猫であることを示す猫モードを有効にするには、このフラグをオンにします。"
 flagSpeakAsCat: "猫語で話す"
 flagSpeakAsCatDescription: "猫モードが有効の場合にオンにすると、あなたの投稿の「な」を「にゃ」に変換します。"
@@ -165,14 +165,14 @@ searchWith: "検索: {q}"
 youHaveNoLists: "リストがありません"
 followConfirm: "{name}をフォローしますか？"
 proxyAccount: "プロキシアカウント"
-proxyAccountDescription: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがインスタンスに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
+proxyAccountDescription: "プロキシアカウントは、特定の条件下でユーザーのリモートフォローを代行するアカウントです。例えば、ユーザーがリモートユーザーをリストに入れたとき、リストに入れられたユーザーを誰もフォローしていないとアクティビティがサーバーに配達されないため、代わりにプロキシアカウントがフォローするようにします。"
 host: "ホスト"
 selectUser: "ユーザーを選択"
-selectInstance: "インスタンスを選択"
+selectInstance: "サーバーを選択"
 recipient: "宛先"
 annotation: "注釈"
 federation: "連合"
-instances: "インスタンス"
+instances: "サーバー"
 registeredAt: "初観測"
 latestRequestSentAt: "直近のリクエスト送信"
 latestRequestReceivedAt: "直近のリクエスト受信"
@@ -182,8 +182,8 @@ charts: "チャート"
 perHour: "1時間ごと"
 perDay: "1日ごと"
 stopActivityDelivery: "アクティビティの配送を停止"
-blockThisInstance: "このインスタンスをブロック"
-silenceThisInstance: "このインスタンスをサイレンス"
+blockThisInstance: "このサーバーをブロック"
+silenceThisInstance: "このサーバーをサイレンス"
 operations: "操作"
 software: "ソフトウェア"
 version: "バージョン"
@@ -194,22 +194,22 @@ jobQueue: "ジョブキュー"
 cpuAndMemory: "CPUとメモリ"
 network: "ネットワーク"
 disk: "ディスク"
-instanceInfo: "インスタンス情報"
+instanceInfo: "サーバー情報"
 statistics: "統計"
 clearQueue: "キューをクリア"
 clearQueueConfirmTitle: "キューをクリアしますか？"
 clearQueueConfirmText: "未配達の投稿は配送されなくなります。通常この操作を行う必要はありません。"
 clearCachedFiles: "キャッシュをクリア"
 clearCachedFilesConfirm: "キャッシュされたリモートファイルをすべて削除しますか？"
-blockedInstances: "ブロックしたインスタンス"
-blockedInstancesDescription: "ブロックしたいインスタンスのホストを改行で区切って設定します。ブロックされたインスタンスは、このインスタンスとやり取りできなくなります。"
-silencedInstances: "サイレンスしたインスタンス"
-silencedInstancesDescription: "サイレンスしたいインスタンスのホストを改行で区切って設定します。サイレンスされたインスタンスに所属するアカウントはすべて「サイレンス」として扱われ、フォローがすべてリクエストになり、フォロワーでないローカルアカウントにはメンションできなくなります。ブロックしたインスタンスには影響しません。"
+blockedInstances: "ブロックしたサーバー"
+blockedInstancesDescription: "ブロックしたいサーバーのホストを改行で区切って設定します。ブロックされたサーバーは、このサーバーとやり取りできなくなります。"
+silencedInstances: "サイレンスしたサーバー"
+silencedInstancesDescription: "サイレンスしたいサーバーのホストを改行で区切って設定します。サイレンスされたサーバーに所属するアカウントはすべて「サイレンス」として扱われ、フォローがすべてリクエストになり、フォロワーでないローカルアカウントにはメンションできなくなります。ブロックしたサーバーには影響しません。"
 muteAndBlock: "ミュートとブロック"
 mutedUsers: "ミュートしたユーザー"
 blockedUsers: "ブロックしたユーザー"
 noUsers: "ユーザーはいません"
-noInstances: "インスタンスはありません"
+noInstances: "サーバーがありません"
 editProfile: "プロフィールを編集"
 noteDeleteConfirm: "この投稿を削除しますか？"
 pinLimitExceeded: "これ以上ピン留めできません"
@@ -229,9 +229,9 @@ all: "全て"
 subscribing: "購読中"
 publishing: "配信中"
 notResponding: "応答なし"
-instanceFollowing: "インスタンスのフォロー"
-instanceFollowers: "インスタンスのフォロワー"
-instanceUsers: "インスタンスのユーザー"
+instanceFollowing: "サーバーのフォロー"
+instanceFollowers: "サーバーのフォロワー"
+instanceUsers: "このサーバーの利用者"
 changePassword: "パスワードを変更"
 security: "セキュリティ"
 retypedNotMatch: "入力が一致しません。"
@@ -322,8 +322,8 @@ unwatch: "ウォッチ解除"
 accept: "許可"
 reject: "拒否"
 normal: "正常"
-instanceName: "インスタンス名"
-instanceDescription: "インスタンスの紹介"
+instanceName: "サーバー名"
+instanceDescription: "サーバーの紹介文"
 maintainerName: "管理者の名前"
 maintainerEmail: "管理者のメールアドレス"
 tosUrl: "利用規約URL"
@@ -354,7 +354,7 @@ basicInfo: "基本情報"
 pinnedUsers: "ピン留めユーザー"
 pinnedUsersDescription: "「みつける」ページなどにピン留めしたいユーザーを改行で区切って記述します。"
 pinnedPages: "ピン留めページ"
-pinnedPagesDescription: "インスタンスのトップページにピン留めしたいページのパスを改行で区切って記述します。"
+pinnedPagesDescription: "サーバーのトップページにピン留めしたいページのパスを改行で区切って記述します。"
 pinnedClipId: "ピン留めするクリップのID"
 pinnedNotes: "ピン留めされた投稿"
 hcaptcha: "hCaptcha"
@@ -377,7 +377,7 @@ notifyAntenna: "新しい投稿を通知する"
 withFileAntenna: "ファイルが添付された投稿のみ"
 enableServiceworker: "ブラウザへのプッシュ通知を有効にする"
 antennaUsersDescription: "ユーザー名を改行で区切って指定します"
-antennaInstancesDescription: "インスタンスを改行で区切って指定します"
+antennaInstancesDescription: "サーバーを改行で区切って指定します"
 caseSensitive: "大文字小文字を区別する"
 withReplies: "返信を含む"
 connectedTo: "次のアカウントに接続されています"
@@ -502,8 +502,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"
@@ -551,7 +551,7 @@ updateRemoteUser: "リモートユーザー情報の更新"
 deleteAllFiles: "すべてのファイルを削除"
 deleteAllFilesConfirm: "すべてのファイルを削除しますか？"
 removeAllFollowing: "フォローを全解除"
-removeAllFollowingDescription: "{host}からのフォローをすべて解除します。そのインスタンスがもう存在しなくなった場合などに実行してください。"
+removeAllFollowingDescription: "{host}からのフォローをすべて解除します。そのサーバーがもう存在しなくなった場合などに実行してください。"
 userSuspended: "このユーザーは凍結されています。"
 userSilenced: "このユーザーはサイレンスされています。"
 yourAccountSuspendedTitle: "アカウントが凍結されています"
@@ -616,7 +616,7 @@ testEmail: "配信テスト"
 wordMute: "ワードミュート"
 regexpError: "正規表現エラー"
 regexpErrorDescription: "{tab}ワードミュートの{line}行目の正規表現にエラーが発生しました:"
-instanceMute: "インスタンスミュート"
+instanceMute: "サーバーミュート"
 userSaysSomething: "{name}が何かを言いました"
 userSaysSomethingReason: "{name}が{reason}と言いました"
 userSaysSomethingReasonReply: "{name}が{reason}を含む投稿に返信しました"
@@ -651,15 +651,15 @@ abuseReported: "内容が送信されました。ご報告ありがとうござ
 reporter: "通報者"
 reporteeOrigin: "通報先"
 reporterOrigin: "通報元"
-forwardReport: "リモートインスタンスに通報を転送する"
-forwardReportIsAnonymous: "リモートインスタンスからはあなたの情報は見れず、匿名のシステムアカウントとして表示されます。"
+forwardReport: "リモートサーバーに通報を転送する"
+forwardReportIsAnonymous: "リモートサーバーからはあなたの情報は見られず、匿名のシステムアカウントとして表示されます。"
 send: "送信"
 abuseMarkAsResolved: "対応済みにする"
 openInNewTab: "新しいタブで開く"
 openInSideView: "サイドビューで開く"
 defaultNavigationBehaviour: "デフォルトのナビゲーション"
 editTheseSettingsMayBreakAccount: "これらの設定を編集するとアカウントが破損する可能性があります。"
-instanceTicker: "投稿のインスタンス情報"
+instanceTicker: "投稿のサーバー情報"
 waitingFor: "{x}を待っています"
 random: "ランダム"
 system: "システム"
@@ -747,7 +747,7 @@ capacity: "容量"
 inUse: "使用中"
 editCode: "コードを編集"
 apply: "適用"
-receiveAnnouncementFromInstance: "インスタンスからのお知らせを受け取る"
+receiveAnnouncementFromInstance: "サーバーからのお知らせを受け取る"
 emailNotification: "メール通知"
 publish: "公開"
 inChannelSearch: "チャンネル内検索"
@@ -775,7 +775,7 @@ active: "アクティブ"
 offline: "オフライン"
 notRecommended: "非推奨"
 botProtection: "Botプロテクション"
-instanceBlocking: "連合ブロック・サイレンス"
+instanceBlocking: "連合の管理"
 selectAccount: "アカウントを選択"
 switchAccount: "アカウントを切り替え"
 enabled: "有効"
@@ -803,12 +803,12 @@ low: "低"
 emailNotConfiguredWarning: "メールアドレスの設定がされていません。"
 ratio: "比率"
 secureMode: "セキュアモード (Authorized Fetch)"
-instanceSecurity: "インスタンスのセキュリティー"
-secureModeInfo: "他のインスタンスからリクエストするときに、証明を付けなければ返送しません。他のインスタンスの設定ファイルでsignToActivityPubGetはtrueにしてください。"
+instanceSecurity: "サーバーのセキュリティー"
+secureModeInfo: "認証情報の無いリモートサーバーからのリクエストに応えません。"
 privateMode: "非公開モード"
-privateModeInfo: "有効にすると、許可したインスタンスのみからリクエストを受け付けます。"
-allowedInstances: "許可されたインスタンス"
-allowedInstancesDescription: "許可したいインスタンスのホストを改行で区切って設定します。非公開モードだけで有効です。"
+privateModeInfo: "有効にすると、許可したサーバーのみからリクエストを受け付けます。"
+allowedInstances: "許可されたサーバー"
+allowedInstancesDescription: "許可したいサーバーのホストを改行で区切って設定します。非公開モードだけで有効です。"
 previewNoteText: "本文をプレビュー"
 customCss: "カスタムCSS"
 customCssWarn: "この設定は必ず知識のある方が行ってください。不適切な設定を行うとクライアントが正常に使用できなくなる恐れがあります。"
@@ -873,8 +873,8 @@ themeColor: "テーマカラー"
 size: "サイズ"
 numberOfColumn: "列の数"
 searchByGoogle: "検索"
-instanceDefaultLightTheme: "インスタンスデフォルトのライトテーマ"
-instanceDefaultDarkTheme: "インスタンスデフォルトのダークテーマ"
+instanceDefaultLightTheme: "サーバーの標準ライトテーマ"
+instanceDefaultDarkTheme: "サーバーの標準ダークテーマ"
 instanceDefaultThemeDescription: "オブジェクト形式のテーマコードを記入します。"
 mutePeriod: "ミュートする期限"
 indefinitely: "無期限"
@@ -896,7 +896,7 @@ check: "チェック"
 driveCapOverrideLabel: "このユーザーのドライブ容量上限を変更"
 driveCapOverrideCaption: "0以下を指定すると解除されます。"
 requireAdminForView: "閲覧するには管理者アカウントでログインしている必要があります。"
-isSystemAccount: "システムにより自動で作成・管理されているアカウントです。"
+isSystemAccount: "システムにより自動で作成・管理されているアカウントです。モデレーション・編集・削除を行うとサーバーの動作が不正になる可能性があるため、操作しないでください。"
 typeToConfirm: "この操作を行うには {x} と入力してください"
 deleteAccount: "アカウント削除"
 document: "ドキュメント"
@@ -923,7 +923,7 @@ cannotUploadBecauseNoFreeSpace: "ドライブの空き容量が無いためア
 cannotUploadBecauseExceedsFileSizeLimit: "ファイルサイズの制限を超えているためアップロードできません。"
 beta: "ベータ"
 enableAutoSensitive: "自動NSFW判定"
-enableAutoSensitiveDescription: "利用可能な場合は、機械学習を利用して自動でメディアにNSFWフラグを設定します。この機能をオフにしても、インスタンスによっては自動で設定されることがあります。"
+enableAutoSensitiveDescription: "利用可能な場合は、機械学習を利用して自動でメディアにNSFWフラグを設定します。この機能をオフにしても、サーバーによっては自動で設定されることがあります。"
 activeEmailValidationDescription: "ユーザーのメールアドレスのバリデーションを、捨てアドかどうかや実際に通信可能かどうかなどを判定しより積極的に行います。オフにすると単に文字列として正しいかどうかのみチェックされます。"
 showAds: "広告を表示する"
 navbar: "ナビゲーションバー"
@@ -934,18 +934,18 @@ pushNotification: "プッシュ通知"
 subscribePushNotification: "プッシュ通知を有効化"
 unsubscribePushNotification: "プッシュ通知を停止する"
 pushNotificationAlreadySubscribed: "プッシュ通知は有効です"
-pushNotificationNotSupported: "ブラウザかサーバーがプッシュ通知に非対応"
+pushNotificationNotSupported: "ブラウザまたはサーバーがプッシュ通知に非対応です"
 sendPushNotificationReadMessage: "通知やメッセージが既読になったらプッシュ通知を削除する"
 sendPushNotificationReadMessageCaption: "「{emptyPushNotificationMessage}」という通知が一瞬表示されるようになります。端末の電池消費量が増加する可能性があります。"
 adminCustomCssWarn: "この設定は、それが何をするものであるかを知っている場合のみ使用してください。不適切な値を入力すると、クライアントが正常に動作しなくなる可能性があります。ユーザー設定でCSSをテストし、正しく動作することを確認してください。"
 customMOTD: "カスタムMOTD(スプラッシュスクリーンメッセージ)"
 customMOTDDescription: "ユーザがページをロード/リロードするたびにランダムに表示される、改行で区切られたMOTD(スプラッシュスクリーン)用のカスタムメッセージ"
 customSplashIcons: "カスタムスプラッシュスクリーンアイコン"
-customSplashIconsDescription: "ユーザがページをロード/リロードするたびにランダムに表示される、改行で区切られたカスタムスプラッシュスクリーンアイコンの\
-  \ URL。画像は静的なURLで、できればすべて192x192にリサイズしてください。"
+customSplashIconsDescription: "ユーザがページをロード/リロードするたびにランダムに表示される、改行で区切られたカスタムスプラッシュスクリーンアイコンの
+  URL。画像は静的なURLで、できればすべて192x192にリサイズしてください。"
 showUpdates: "Calckeyの更新時にポップアップを表示する"
-recommendedInstances: "おすすめインスタンス"
-recommendedInstancesDescription: "おすすめタイムラインに表示するインスタンスを改行区切りで入力してください。`https://`は書かず、ドメインのみを入力してください。"
+recommendedInstances: "おすすめサーバー"
+recommendedInstancesDescription: "おすすめタイムラインに表示するサーバーを改行区切りで入力してください。`https://`は書かず、ドメインのみを入力してください。"
 caption: "自動キャプション"
 splash: "スプラッシュスクリーン"
 updateAvailable: "アップデートがありますよ！"
@@ -957,10 +957,10 @@ migration: "アカウントの引っ越し"
 moveTo: "このアカウントを新しいアカウントに引っ越す"
 moveToLabel: "引っ越し先のアカウント："
 moveAccount: "引っ越し実行！"
-moveAccountDescription: "この操作は取り消せません。まずは引っ越し先のアカウントでこのアカウントに対しエイリアスを作成したことを確認してください。エイリアス作成後、引っ越し先のアカウントをこのように入力してください：@person@instance.com"
+moveAccountDescription: "この操作は取り消せません。まずは引っ越し先のアカウントでこのアカウントに対しエイリアスを作成したことを確認してください。エイリアス作成後、引っ越し先のアカウントをこのように入力してください：@person@server.com"
 moveFrom: "別のアカウントからこのアカウントに引っ越す"
 moveFromLabel: "引っ越し元のアカウント："
-moveFromDescription: "別のアカウントからこのアカウントにフォロワーを引き継いで引っ越したい場合、ここでエイリアスを作成しておく必要があります。必ず引っ越しを実行する前に作成してください！引っ越し元のアカウントをこのように入力してください：@person@instance.com"
+moveFromDescription: "別のアカウントからこのアカウントにフォロワーを引き継いで引っ越したい場合、ここでエイリアスを作成しておく必要があります。必ず引っ越しを実行する前に作成してください！引っ越し元のアカウントをこのように入力してください：@person@server.com"
 migrationConfirm: "本当にこのアカウントを {account} に引っ越しますか？一度引っ越しを行うと取り消せず、二度とこのアカウントを元の状態で使用できなくなります。\n\
   この操作を行う前に引っ越し先のアカウントでエイリアスを作成する必要があります。エイリアスが作成されているか、必ず確認してください。"
 defaultReaction: "リモートとローカルの投稿に対するデフォルトの絵文字リアクション"
@@ -969,9 +969,9 @@ 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マクロを有効にする"
 preventAiLearning: "AIによる学習を防止"
 preventAiLearningDescription: "投稿したノート、添付した画像などのコンテンツを学習の対象にしないようAIに要求します。これはnoaiフラグをHTMLレスポンスに含めることによって実現されます。"
@@ -1058,7 +1058,7 @@ _aboutMisskey:
   source: "ソースコード"
   translation: "Calckeyを翻訳"
   donate: "Calckeyに寄付"
-  morePatrons: "他にも多くの方が支援してくれています。ありがとうございます！ \U0001F970"
+  morePatrons: "他にも多くの方が支援してくれています。ありがとうございます！ 🥰"
   patrons: "支援者"
 _nsfw:
   respect: "閲覧注意のメディアは隠す"
@@ -1073,7 +1073,7 @@ _mfm:
   hashtag: "ハッシュタグ"
   hashtagDescription: "ナンバーサイン + タグで、ハッシュタグを示せます。"
   url: "URL"
-  urlDescription: "URLを示せます。"
+  urlDescription: "URLを表示できます。"
   link: "リンク"
   linkDescription: "文章の特定の範囲を、URLに紐づけられます。"
   bold: "太字"
@@ -1131,9 +1131,9 @@ _mfm:
   plain: "プレーン"
   plainDescription: "内側の構文を全て無効にします。"
   position: 位置
-  stop: MFMアニメーションを停止
+  stop: MFMを停止
   alwaysPlay: MFMアニメーションを自動再生する
-  play: MFMアニメーションを再生
+  play: MFMを再生
   warn: MFMアニメーションは激しい動きを含む可能性があります。
   positionDescription: 位置を指定した値だけずらします。
   foreground: 文字色
@@ -1866,3 +1866,8 @@ edited: 編集済み
 signupsDisabled: 
   現在、このサーバーでは新規登録が一般開放されていません。招待コードをお持ちの場合には、以下の欄に入力してください。招待コードをお持ちでない場合にも、新規登録を開放している他のサーバーには入れますよ！
 findOtherInstance: 他のサーバーを探す
+newer: 新しい投稿
+older: 古い投稿
+accessibility: アクセシビリティ
+jumpToPrevious: 前に戻る
+cw: 閲覧注意

From 02685cad689e5d506455c2977987db0beb500e4c Mon Sep 17 00:00:00 2001
From: Richard <galmt@protonmail.com>
Date: Thu, 25 May 2023 18:56:41 +0000
Subject: [PATCH 031/319] chore: Translated using Weblate (Dutch)

Currently translated at 32.2% (566 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
---
 locales/nl-NL.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index 49b737e918..28ccc11f91 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -643,3 +643,6 @@ promote: Promoten
 objectStorage: Objectopslag
 useObjectStorage: Gebruik objectopslag
 objectStorageBaseUrl: Basis -URL
+objectStorageUseSSLDesc: Schakel dit uit als je geen HTTPS voor je API connecties
+  gebruikt
+objectStorageUseProxy: Verbind over Proxy

From a3f3ccf51459483670b67c3536a8d691bd0e6322 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 26 May 2023 09:13:13 -0400
Subject: [PATCH 032/319] fix font size

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

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 600a42494f..55bae467cd 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -630,6 +630,9 @@ onUnmounted(() => {
 		}
 	}
 
+	&.max-width_500px {
+		font-size: 0.9em;
+	}
 	&.max-width_450px {
 		> .reply-to:first-child {
 			padding-top: 14px;

From 0ffa306e1d8310752eb90ec198466cfc36233dab Mon Sep 17 00:00:00 2001
From: Richard <galmt@protonmail.com>
Date: Fri, 26 May 2023 06:55:15 +0000
Subject: [PATCH 033/319] chore: Translated using Weblate (Dutch)

Currently translated at 32.3% (567 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
---
 locales/nl-NL.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index 28ccc11f91..b4ae05740d 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -646,3 +646,5 @@ objectStorageBaseUrl: Basis -URL
 objectStorageUseSSLDesc: Schakel dit uit als je geen HTTPS voor je API connecties
   gebruikt
 objectStorageUseProxy: Verbind over Proxy
+objectStorageUseProxyDesc: Schakel dit uit als je geen Proxy voor je API connecties
+  gebruikt

From c3456c027a0a479d0a4de0f9bc5e60aedb779c40 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 26 May 2023 16:32:59 +0000
Subject: [PATCH 034/319] hotfix: try catch hasUnreadAntenna

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

diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index 40760e8ee4..5e0b83792d 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -256,7 +256,8 @@ export const UserRepository = db.getRepository(User).extend({
 	},
 
 	async getHasUnreadAntenna(userId: User["id"]): Promise<boolean> {
-		const myAntennas = (await getAntennas()).filter((a) => a.userId === userId);
+		try {
+  const myAntennas = (await getAntennas()).filter((a) => a.userId === userId);
 
 		const unread =
 			myAntennas.length > 0
@@ -266,7 +267,7 @@ export const UserRepository = db.getRepository(User).extend({
 				  })
 				: null;
 
-		return unread != null;
+		return unread != null; } catch(e) { return false; }
 	},
 
 	async getHasUnreadChannel(userId: User["id"]): Promise<boolean> {

From 7609ac4d8818c233bbd94f89cf402aef523909c9 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 26 May 2023 17:02:17 -0400
Subject: [PATCH 035/319] maybe fix blurry text in swiper ?

---
 packages/client/src/pages/about.vue           | 1 +
 packages/client/src/pages/admin-file.vue      | 1 +
 packages/client/src/pages/channels.vue        | 1 +
 packages/client/src/pages/explore.vue         | 1 +
 packages/client/src/pages/gallery/index.vue   | 1 +
 packages/client/src/pages/instance-info.vue   | 1 +
 packages/client/src/pages/messaging/index.vue | 1 +
 packages/client/src/pages/notifications.vue   | 1 +
 packages/client/src/pages/pages.vue           | 1 +
 packages/client/src/pages/search.vue          | 1 +
 packages/client/src/pages/tag.vue             | 1 +
 packages/client/src/pages/timeline.vue        | 1 +
 12 files changed, 12 insertions(+)

diff --git a/packages/client/src/pages/about.vue b/packages/client/src/pages/about.vue
index 3cd6646861..3e951c00b1 100644
--- a/packages/client/src/pages/about.vue
+++ b/packages/client/src/pages/about.vue
@@ -8,6 +8,7 @@
 		/></template>
 		<MkSpacer :content-max="600" :margin-min="20">
 			<swiper
+				:round-lengths="true"
 				:touch-angle="25"
 				:threshold="10"
 				:centeredSlides="true"
diff --git a/packages/client/src/pages/admin-file.vue b/packages/client/src/pages/admin-file.vue
index 6110886fb7..63a8132861 100644
--- a/packages/client/src/pages/admin-file.vue
+++ b/packages/client/src/pages/admin-file.vue
@@ -8,6 +8,7 @@
 		/></template>
 		<MkSpacer :content-max="600" :margin-min="16" :margin-max="32">
 			<swiper
+				:round-lengths="true"
 				:touch-angle="25"
 				:threshold="10"
 				:centeredSlides="true"
diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue
index 771dac2996..d03fb61d5a 100644
--- a/packages/client/src/pages/channels.vue
+++ b/packages/client/src/pages/channels.vue
@@ -8,6 +8,7 @@
 		/></template>
 		<MkSpacer :content-max="700">
 			<swiper
+				:round-lengths="true"
 				:touch-angle="25"
 				:threshold="10"
 				:centeredSlides="true"
diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue
index 9e26189564..9202d78878 100644
--- a/packages/client/src/pages/explore.vue
+++ b/packages/client/src/pages/explore.vue
@@ -9,6 +9,7 @@
 		<div class="lznhrdub">
 			<MkSpacer :content-max="1200">
 				<swiper
+					:round-lengths="true"
 					:touch-angle="25"
 					:threshold="10"
 					:centeredSlides="true"
diff --git a/packages/client/src/pages/gallery/index.vue b/packages/client/src/pages/gallery/index.vue
index 5b8bd4512a..92fb22354b 100644
--- a/packages/client/src/pages/gallery/index.vue
+++ b/packages/client/src/pages/gallery/index.vue
@@ -9,6 +9,7 @@
 		/></template>
 		<MkSpacer :content-max="1200">
 			<swiper
+				:round-lengths="true"
 				:touch-angle="25"
 				:threshold="10"
 				:centeredSlides="true"
diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue
index 9103788e06..73c1051e1f 100644
--- a/packages/client/src/pages/instance-info.vue
+++ b/packages/client/src/pages/instance-info.vue
@@ -13,6 +13,7 @@
 			:margin-max="32"
 		>
 			<swiper
+				:round-lengths="true"
 				:touch-angle="25"
 				:threshold="10"
 				:centeredSlides="true"
diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue
index 0e82f06e10..ba385e3958 100644
--- a/packages/client/src/pages/messaging/index.vue
+++ b/packages/client/src/pages/messaging/index.vue
@@ -9,6 +9,7 @@
 		<div>
 			<MkSpacer :content-max="800">
 				<swiper
+					:round-lengths="true"
 					:touch-angle="25"
 					:threshold="10"
 					:centeredSlides="true"
diff --git a/packages/client/src/pages/notifications.vue b/packages/client/src/pages/notifications.vue
index e8695ed266..bda42a8b4a 100644
--- a/packages/client/src/pages/notifications.vue
+++ b/packages/client/src/pages/notifications.vue
@@ -10,6 +10,7 @@
 		</template>
 		<MkSpacer :content-max="800">
 			<swiper
+				:round-lengths="true"
 				:touch-angle="25"
 				:threshold="10"
 				:centeredSlides="true"
diff --git a/packages/client/src/pages/pages.vue b/packages/client/src/pages/pages.vue
index 0c042a16d3..1724ab27f0 100644
--- a/packages/client/src/pages/pages.vue
+++ b/packages/client/src/pages/pages.vue
@@ -8,6 +8,7 @@
 		/></template>
 		<MkSpacer :content-max="700">
 			<swiper
+				:round-lengths="true"
 				:touch-angle="25"
 				:threshold="10"
 				:centeredSlides="true"
diff --git a/packages/client/src/pages/search.vue b/packages/client/src/pages/search.vue
index 1bd9770e44..e03956cc75 100644
--- a/packages/client/src/pages/search.vue
+++ b/packages/client/src/pages/search.vue
@@ -9,6 +9,7 @@
 		/></template>
 		<MkSpacer :content-max="800">
 			<swiper
+				:round-lengths="true"
 				:touch-angle="25"
 				:threshold="10"
 				:centeredSlides="true"
diff --git a/packages/client/src/pages/tag.vue b/packages/client/src/pages/tag.vue
index 81a3e27569..18561d9648 100644
--- a/packages/client/src/pages/tag.vue
+++ b/packages/client/src/pages/tag.vue
@@ -9,6 +9,7 @@
 		/></template>
 		<MkSpacer :content-max="800">
 			<swiper
+				:round-lengths="true"
 				:touch-angle="25"
 				:threshold="10"
 				:centeredSlides="true"
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index b6d8670ae9..a44f36c55b 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -33,6 +33,7 @@
 			</div> *v-else on next div* -->
 				<div class="tl _block">
 					<swiper
+						:round-lengths="true"
 						:touch-angle="25"
 						:threshold="10"
 						:centeredSlides="true"

From 425f628de3cad5c8bad29533104604ab583fb1a2 Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Fri, 26 May 2023 17:28:42 +0000
Subject: [PATCH 036/319] chore: Translated using Weblate (Catalan)

Currently translated at 100.0% (1753 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
---
 locales/ca-ES.yml | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index f64f70583a..d83b93e573 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -67,7 +67,7 @@ files: "Fitxers"
 download: "Baixa"
 driveFileDeleteConfirm: "Segur que vols eliminar el fitxer «{name}»? S'eliminarà de
   totes les notes que el continguin com a fitxer adjunt."
-unfollowConfirm: "Segur que vols deixar de seguir {name}?"
+unfollowConfirm: "Segur que vols deixar de seguir a {name}?"
 exportRequested: "Has sol·licitat una exportació. Això pot trigar una estona. S'afegirà
   al teu Disc un cop completada."
 importRequested: "Has sol·licitat una importació. Això pot trigar una estona."
@@ -139,7 +139,7 @@ searchByGoogle: "Cercar"
 file: "Fitxers"
 _email:
   _follow:
-    title: "t'ha seguit"
+    title: "Tens un nou seguidor"
   _receiveFollowRequest:
     title: Heu rebut una sol·licitud de seguiment
 _mfm:
@@ -382,7 +382,7 @@ _profile:
   metadataDescription: Fent servir això, podràs mostrar camps d'informació addicionals
     al vostre perfil.
 _exportOrImport:
-  followingList: "Seguint"
+  followingList: "Usuaris que segueixes"
   muteList: "Silencia"
   blockingList: "Bloqueja"
   userLists: "Llistes"
@@ -684,7 +684,7 @@ _pages:
 _notification:
   youWereFollowed: "t'ha seguit"
   _types:
-    follow: "Seguint"
+    follow: "Nous seguidors"
     mention: "Menció"
     renote: "Impulsos"
     quote: "Citar"
@@ -700,7 +700,7 @@ _notification:
   _actions:
     reply: "Respondre"
     renote: "Impulsos"
-    followBack: et va seguir de tornada
+    followBack: t'ha tornat el seguiment
   youGotQuote: "{name} t'ha citat"
   fileUploaded: El fitxer s'ha penjat correctament
   youGotMention: "{nom} t'ha esmentat"
@@ -780,7 +780,7 @@ showOnRemote: Mostra al servidor remot
 wallpaper: Fons de pantalla
 setWallpaper: Estableix fons de pantalla
 removeWallpaper: Elimina el fons de pantalla
-followConfirm: Segur que vols seguir a l'usuari {name}?
+followConfirm: Segur que vols seguir a {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
@@ -1527,7 +1527,7 @@ aiChanMode: Ai-chan a la interfície d'usuari clàssica
 keepCw: Mantenir els avisos de contingut
 pubSub: Comptes Pub/Sub
 lastCommunication: Última comunicació
-breakFollowConfirm: Confirmes que vols eliminar un seguidor?
+breakFollowConfirm: Confirmes que vols eliminar el seguidor?
 itsOn: Activat
 itsOff: Desactivat
 emailRequiredForSignup: Requereix una adreça de correu electrònic per registrar-te
@@ -1586,7 +1586,7 @@ silenceThisInstance: Silencia el servidor
 silencedInstancesDescription: Llista amb els noms dels servidors que vols silenciar.
   Els comptes als servidors silenciats seran tractades com "Silenciades", només poden
   fer sol·licituds de seguiments, i no poden mencionar comptes locals si no les segueixen.
-  Això no afectarà els servidoes bloquejats.
+  Això no afectarà els servidors bloquejats.
 objectStorageEndpointDesc: Deixa això buit si fas servir AWS, S3, d'una altre manera
   específica un "endpoint" com a '<host>' o '<host>:<port>', depend del proveïdor
   que facis servir.
@@ -1674,7 +1674,7 @@ disablePagesScript: Desactivar AiScript a les pàgines
 updateRemoteUser: Actualitzar la informació de l'usuari remot
 deleteAllFiles: Esborrar tots els fitxers
 deleteAllFilesConfirm: Segur que vols esborrar tots els fitxers?
-removeAllFollowing: Deixar de seguir a tots els que segueixis
+removeAllFollowing: Deixar de seguir a tots els usuaris que segueixes
 accentColor: Color principal
 textColor: Color del text
 value: Valor
@@ -1823,7 +1823,7 @@ _channel:
   featured: Tendència
   owned: Propietari
   usersCount: '{n} Participants'
-  following: Seguit
+  following: Seguit per
   notesCount: '{n} Notes'
   nameAndDescription: Nom i descripció
   nameOnly: Només nom
@@ -1874,9 +1874,9 @@ _tutorial:
   step2_2: Proporcionar informació sobre qui sou facilitarà que altres puguin saber
     si volen veure les vostres notes o seguir-vos.
   step3_1: Ara toca seguir a algunes persones!
-  step3_2: "Les teves líneas de temps domèstiques i socials es basen en qui seguiu,
-    així que proveu de seguir un parell de comptes per començar.\nFeu clic al cercle
-    més situat a la part superior dreta d'un perfil per seguir-los."
+  step3_2: "Les teves líneas de temps d'inici i social es basen en qui seguiu, així
+    que proveu de seguir un parell de comptes per començar.\nFeu clic al cercle més
+    situat a la part superior dreta d'un perfil per seguir-los."
   step4_2: A algunes persones els agrada fer una publicació de {introduction} o un
     senzill "Hola món!"
   step5_1: Línies de temps, línies de temps a tot arreu!
@@ -1967,13 +1967,13 @@ _instanceCharts:
   users: Diferència en el nombre d'usuaris
   usersTotal: Nombre acumulat d'usuaris
   notes: Diferència en el nombre de notes
-  ffTotal: Nombre acumulat d'usuaris seguits/seguidors seguits
+  ffTotal: Nombre acumulat d'usuaris que segueixes/et segueixen
   cacheSize: Diferència en la mida de la memòria cau
   cacheSizeTotal: Mida total acumulada de la memòria cau
   files: Diferència en el nombre de fitxers
   filesTotal: Nombre acumulat de fitxers
   notesTotal: Nombre acumulat de notes
-  ff: "Diferència en el nombre d'usuaris seguits/seguidors seguits "
+  ff: "Diferència en el nombre d'usuaris que segueixes/que et segueixen "
 _timelines:
   home: Inici
   local: Local
@@ -2007,7 +2007,7 @@ _auth:
   callback: Tornant a l'aplicació
   denied: Accés denegat
   pleaseGoBack: Si us plau, torneu a l'aplicació
-  copyAsk: Enganxeu el següent codi d'autorització a l'aplicació
+  copyAsk: Posa el següent codi d'autorització a l'aplicació
 _weekday:
   wednesday: Dimecres
   saturday: Dissabte
@@ -2021,7 +2021,7 @@ _messaging:
   dms: Privat
 _antennaSources:
   all: Totes les notes
-  homeTimeline: Notes dels usuaris que segueixes
+  homeTimeline: Publicacions dels usuaris que segueixes
   users: Notes d'usuaris concrets
   userGroup: Notes d'usuaris d'un grup determinat
   userList: Notes d'una llista determinada d'usuaris

From 36fbd0e419220d79ce161b122b163b43d3c1574b Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Fri, 26 May 2023 23:30:27 +0200
Subject: [PATCH 037/319] Add aria live region to message list so they get read
 automatically as they come in

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

diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index 771d590bba..52504a267b 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -28,6 +28,7 @@
 							#default="{ items: messages, fetching: pFetching }"
 						>
 							<XList
+							aria-live="polite"
 								v-if="messages.length > 0"
 								v-slot="{ item: message }"
 								:class="{

From 371794fb3469e06c4407b65e88d68b4460d6161a Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Fri, 26 May 2023 23:38:38 +0200
Subject: [PATCH 038/319] Do the same for the typing list

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

diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index 52504a267b..08f993c107 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -28,7 +28,7 @@
 							#default="{ items: messages, fetching: pFetching }"
 						>
 							<XList
-							aria-live="polite"
+								aria-live="polite"
 								v-if="messages.length > 0"
 								v-slot="{ item: message }"
 								:class="{
@@ -49,7 +49,7 @@
 					</MkPagination>
 				</div>
 				<footer>
-					<div v-if="typers.length > 0" class="typers">
+					<div v-if="typers.length > 0" class="typers" aria-live="polite">
 						<I18n
 							:src="i18n.ts.typingUsers"
 							text-tag="span"

From be6c41d0c5bd4bd7baf67cbed5392c7df7c533be Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Fri, 26 May 2023 23:43:35 +0200
Subject: [PATCH 039/319] Add labels to chat form

---
 packages/client/src/pages/messaging/messaging-room.form.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/pages/messaging/messaging-room.form.vue b/packages/client/src/pages/messaging/messaging-room.form.vue
index 4bc12ce9ad..f6565c25c5 100644
--- a/packages/client/src/pages/messaging/messaging-room.form.vue
+++ b/packages/client/src/pages/messaging/messaging-room.form.vue
@@ -17,16 +17,17 @@
 				{{ file.name }}
 			</div>
 			<div class="buttons">
-				<button class="_button" @click="chooseFile">
+				<button class="_button" @click="chooseFile" :aria-label="i18n.t('attachFile')">
 					<i class="ph-upload ph-bold ph-lg"></i>
 				</button>
-				<button class="_button" @click="insertEmoji">
+				<button class="_button" @click="insertEmoji" :aria-label="i18n.t('chooseEmoji')">
 					<i class="ph-smiley ph-bold ph-lg"></i>
 				</button>
 				<button
 					class="send _button"
 					:disabled="!canSend || sending"
 					:title="i18n.ts.send"
+					:aria-label="i18n.ts.send"
 					@click="send"
 				>
 					<template v-if="!sending"

From c9e5b596c135aac00c677cf34fad7603e3eb415e Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Fri, 26 May 2023 20:05:26 -0400
Subject: [PATCH 040/319] Don't show unlisted posts in antennas

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

diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts
index d011c5fb80..29e2e085ad 100644
--- a/packages/backend/src/server/api/endpoints/antennas/notes.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts
@@ -81,7 +81,8 @@ export default define(meta, paramDef, async (ps, user) => {
 		.leftJoinAndSelect("renote.user", "renoteUser")
 		.leftJoinAndSelect("renoteUser.avatar", "renoteUserAvatar")
 		.leftJoinAndSelect("renoteUser.banner", "renoteUserBanner")
-		.andWhere("antennaNote.antennaId = :antennaId", { antennaId: antenna.id });
+		.andWhere("antennaNote.antennaId = :antennaId", { antennaId: antenna.id })
+		.andWhere("note.visibility != 'home'");
 
 	generateVisibilityQuery(query, user);
 	generateMutedUserQuery(query, user);

From 237e685d4a568bd58ae8d488d243239d572907e4 Mon Sep 17 00:00:00 2001
From: Michael 465537 <michael.465537@gmail.com>
Date: Fri, 26 May 2023 23:57:29 +0000
Subject: [PATCH 041/319] chore: Translated using Weblate (German)

Currently translated at 97.6% (1711 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
---
 locales/de-DE.yml | 87 ++++++++++++++++++++++++-----------------------
 1 file changed, 44 insertions(+), 43 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 8ddba5ae0b..7072c2d3c1 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -235,14 +235,14 @@ default: "Standard"
 defaultValueIs: "Der Standardwert ist: {value}"
 noCustomEmojis: "Es gibt keine benutzerdefinierten Emoji"
 noJobs: "Keine Jobs vorhanden"
-federating: "Wird föderiert"
+federating: "Eine Verknüpfung wird hergestellt"
 blocked: "Blockiert"
 suspended: "suspendiert"
 all: "Alles"
 subscribing: "Registrieren"
 publishing: "Veröffentlichen"
 notResponding: "Antwortet nicht"
-instanceFollowing: "Auf dem Server folgen"
+instanceFollowing: "Dem Server folgen"
 instanceFollowers: "Follower des Servers"
 instanceUsers: "Nutzer dieses Servers"
 changePassword: "Passwort ändern"
@@ -339,8 +339,8 @@ unwatch: "Nicht mehr beobachten"
 accept: "Akzeptieren"
 reject: "Ablehnen"
 normal: "Normal"
-instanceName: "Name des Servers"
-instanceDescription: "Beschreibung des Servers"
+instanceName: "Server-Name"
+instanceDescription: "Server-Beschreibung"
 maintainerName: "Betreiber"
 maintainerEmail: "Betreiber-Email"
 tosUrl: "URL der Nutzungsbedingungen"
@@ -693,9 +693,9 @@ abuseReported: "Deine Meldung wurde versendet. Vielen Dank."
 reporter: "Melder"
 reporteeOrigin: "Herkunft des Gemeldeten"
 reporterOrigin: "Herkunft des Meldenden"
-forwardReport: "Einen Bericht auch an den beteiligten anderen Server weiterleiten"
+forwardReport: "Einen Meldung zusätzlich an den mit-beteiligten Server senden"
 forwardReportIsAnonymous: "Anstelle Ihres Nutzerkontos wird ein anonymes Systemkonto
-  als Berichterstatter auf dem beteiligten anderen Server angezeigt."
+  als Hinweisgeber auf dem mit-beteiligten Server angezeigt."
 send: "Senden"
 abuseMarkAsResolved: "Meldung als gelöst markieren"
 openInNewTab: "In neuem Tab öffnen"
@@ -835,7 +835,7 @@ active: "Aktiv"
 offline: "Offline"
 notRecommended: "Nicht empfohlen"
 botProtection: "Schutz vor Bots"
-instanceBlocking: "Föderierte Blockieren/Stummschalten"
+instanceBlocking: "Verknüpfte Server verwalten"
 selectAccount: "Nutzerkonto auswählen"
 switchAccount: "Konto wechseln"
 enabled: "Aktiviert"
@@ -900,7 +900,7 @@ manageAccounts: "Nutzerkonten verwalten"
 makeReactionsPublic: "Reaktionsverlauf veröffentlichen"
 makeReactionsPublicDescription: "Jeder wird die Liste deiner gesendeten Reaktionen
   einsehen können."
-classic: "Classic"
+classic: "Mittig/zentriert"
 muteThread: "Thread stummschalten"
 unmuteThread: "Threadstummschaltung aufheben"
 ffVisibility: "Sichtbarkeit von Gefolgten/Followern"
@@ -946,14 +946,15 @@ recentNHours: "Die letzten {n} Stunden"
 recentNDays: "Die letzten {n} Tage"
 noEmailServerWarning: "Es ist kein Email-Server konfiguriert."
 thereIsUnresolvedAbuseReportWarning: "Es liegen ungelöste Meldungen vor."
-recommended: "Empfehlung"
+recommended: "Interessantes"
 check: "Kontrolle"
 driveCapOverrideLabel: "Die Cloud-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."
 requireAdminForView: "Melde dich mit einem Administratorkonto an, um dies einzusehen."
-isSystemAccount: "Ein Nutzerkonto, dass durch das System erstellt und automatisch
-  kontrolliert wird."
+isSystemAccount: "Dieses Konto wird vom System erstellt und automatisch verwaltet.
+  Bitte moderieren, bearbeiten, löschen oder manipulieren Sie dieses Konto nicht,
+  da es sonst zu einem Server-Absturz kommen könnte."
 typeToConfirm: "Bitte gib zur Bestätigung {x} ein"
 deleteAccount: "Nutzerkonto löschen"
 document: "Dokumentation"
@@ -1040,9 +1041,9 @@ _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: "Dieser Server unterstützt die Verwendung von Email-Adressen nicht.
-    Kontaktiere bitte den Server-Administrator, um dein Passwort zurücksetzen zu lassen."
+    wende dich bitte an den Server-Administrator."
+  contactAdmin: "Dieser Server unterstützt keine Verwendung von Email-Adressen. Kontaktiere
+    bitte den Server-Administrator, um dein Passwort zurücksetzen zu lassen."
 _gallery:
   my: "Meine Bilder-Galerie"
   liked: "Mit \"Gefällt mir\" markierte Beiträge"
@@ -1229,7 +1230,7 @@ _instanceMute:
     Servers."
   instanceMuteDescription2: "Mit Zeilenumbrüchen trennen"
   title: "Blendet Beiträge von aufgelisteten Servern aus."
-  heading: "Liste der stummzuschaltenden Server"
+  heading: "Liste der Server die stummgeschaltet werden sollen"
 _theme:
   explore: "Farbkombinationen finden"
   install: "Eine Farbkombination installieren"
@@ -1344,21 +1345,19 @@ _tutorial:
   step5_1: "Timelines, Timelines überall!"
   step5_2: "Dein Server hat {timelines} verschiedene Timelines aktiviert."
   step5_3: "Die {icon} Home-Timeline ist die Timeline, in der du die Beiträge der
-    Nutzerkonten sehen kannst, denen du folgst und von jedem anderen auf diesem Server.
-    Solltest du bevorzugen, dass deine Home-Timeline nur Beiträge von den Nutzerkonten
-    enthält, denen du folgst, kannst du das ganz einfach in den Einstellungen ändern!"
-  step5_4: "In der {Icon} Local-Timeline kannst du die Beiträge aller anderen Mitglieder
-    dieses Servers sehen."
-  step5_5: "Die {icon} Social-Timeline zeigt dir ausschließlich Beiträge von Nutzerkonten
-    denen Du folgst."
-  step5_6: "In der {icon} Empfehlungen-Timeline kannst du Beiträge von Servern sehen,
-    die dir von den Server-Administratoren empfohlen/vorgeschlagen werden."
+    Nutzerkonten sehen kannst, denen du folgst."
+  step5_4: "In der {Icon} Local-Timeline kannst du die Beiträge von jedem/jeder sehen
+    der/die auf diesem Server registriert ist."
+  step5_5: "Die Social-Timeline {icon} ist eine Kombination aus der Home-Timeline
+    und der Local-Timeline."
+  step5_6: "In der {icon} \"Interessantes\"-Timeline können sie Beiträge von Servern
+    sehen, die von den Server-Administratoren vorgeschlagen werden."
   step5_7: "In der {icon} Global-Timeline können Sie Beiträge von jedem anderen verbundenen
     Server im fediverse sehen."
   step6_1: "Also, was ist das hier?"
-  step6_2: "Schön, mit Deiner Anmeldung zu Calckey bist Du gleichzeitig einem Portal
-    zum Fediverse beigetreten, einem Netzwerk mit Tausenden von verbundenen Servern
-    (häufig noch als \"Instanzen\" bezeichnet)."
+  step6_2: "Mit Deiner Anmeldung zu Calckey bist Du gleichzeitig einem Portal zum
+    Fediverse beigetreten, einem Netzwerk mit Tausenden von, miteinander verbundenen,
+    Servern."
   step6_3: "Jeder der Server funktioniert auf unterschiedliche Weise, und nicht alle
     Server führen Calckey aus. Dieser jedoch schon! Es ist zu Beginn vielleicht ein
     wenig kompliziert, aber Sie werden in kürzester Zeit den Dreh raus haben."
@@ -1567,7 +1566,7 @@ _timelines:
   local: "Local-TL"
   social: "Social-TL"
   global: "Global-TL"
-  recommended: Empfehlungen
+  recommended: Interessantes
 _pages:
   newPage: "Seite erstellen"
   editPage: "Seite bearbeiten"
@@ -1927,7 +1926,7 @@ _deck:
     direct: "Direktnachrichten"
   renameProfile: Arbeitsbereich umbenennen
   nameAlreadyExists: Der Name für den Arbeitsbereich ist bereits vorhanden.
-enableRecommendedTimeline: Empfohlenen Zeitplan aktivieren
+enableRecommendedTimeline: '"Interessantes"-Timline einschalten'
 secureMode: Sicherer Modus (Autorisierter Abruf)
 instanceSecurity: Serversicherheit
 manageGroups: Gruppen verwalten
@@ -1937,22 +1936,22 @@ 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.
-  Blockierte Server sind nicht betroffen, auch wenn sie hier aufgeführt sind.'
+hiddenTagsDescription: 'Gib hier die Hashtags (ohne #) an, die du vom "Trending and
+  Explore" ausschließen möchtest. Versteckte Hashtags sind immer noch über andere
+  Wege auffindbar.'
 addInstance: Server hinzufügen
 flagSpeakAsCatDescription: Deine Beiträge werden im Katzenmodus nyanisiert
 hiddenTags: Versteckte Hashtags
-antennaInstancesDescription: Nenne einen Servernamen pro Zeile
+antennaInstancesDescription: Nenne einen Server-Namen pro Zeile
 secureModeInfo: Bei Anfragen an andere Server nicht ohne Nachweis zurücksenden.
 renoteMute: Boosts stummschalten
 renoteUnmute: Stummschaltung von Boosts aufheben
 noInstances: Es gibt keine Server
 privateModeInfo: Wenn diese Option aktiviert ist, können nur als vertrauenswürdig
-  eingestufte Server mit deinem Server föderieren. Alle Beiträge werden für die Öffentlichkeit
-  verborgen.
+  eingestufte Server mit diesem Server verknüpft werden. Alle Beiträge werden für
+  die Öffentlichkeit verborgen.
 allowedInstances: Vertrauenswürdige Server
-selectInstance: Wähle einen Server
+selectInstance: Wähle einen Server aus
 silencedInstancesDescription: Liste die Hostnamen der Server auf, die du stummschalten
   möchtest. Nutzerkonten in den aufgelisteten Servern werden als "Stumm" behandelt,
   können nur Follow-Anfragen stellen und können keine lokalen Nutzerkonten erwähnen,
@@ -1967,7 +1966,7 @@ deleted: Gelöscht
 breakFollowConfirm: Sind sie sicher, dass sie eine(n) Follower entfernen möchten?
 unsubscribePushNotification: Push-Benachrichtigungen deaktivieren
 pushNotificationAlreadySubscribed: Push-Benachrichtigungen sind bereits aktiviert
-pushNotificationNotSupported: Dein Browser oder der Server unterstützt keine Push-Benachrichtigungen
+pushNotificationNotSupported: Ihr Browser oder der Server unterstützt keine Push-Benachrichtigungen
 pushNotification: Push-Benachrichtigungen
 subscribePushNotification: Push-Benachrichtigungen aktivieren
 showLocalPosts: 'Zeige lokale Beiträge in:'
@@ -2019,23 +2018,23 @@ adminCustomCssWarn: Diese Einstellung sollte nur verwendet werden, wenn Sie wiss
   mehr normal funktionieren. Bitte stellen Sie sicher, dass Ihr CSS ordnungsgemäß
   funktioniert, indem Sie es in Ihren Benutzereinstellungen testen.
 customMOTD: Benutzerdefinierte Meldung des Tages (Begrüßungsbildschirmmeldungen)
-allowedInstancesDescription: Hosts von Instanzen, die für den Verbund auf die Whitelist
-  gesetzt werden sollen, jeweils durch eine neue Zeile getrennt (gilt nur im privaten
-  Modus).
+allowedInstancesDescription: Hosts von Servern, die für den Verbund auf die Liste
+  vertrauenswürdiger Server gesetzt werden sollen, werden jeweils durch eine neue
+  Zeile getrennt (gilt nur im privaten Modus).
 migration: Migration
 updateAvailable: Es könnte eine Aktualisierung verfügbar sein!
 showAdminUpdates: Anzeigen, dass eine neue Calckey-Version verfügbar ist (nur Administrator)
 customMOTDDescription: Benutzerdefinierte Meldungen für die Meldung des Tages (Begrüßungsbildschirm),
   die durch Zeilenumbrüche getrennt sind und nach dem Zufallsprinzip jedes Mal angezeigt
   werden, wenn ein Benutzer die Seite (neu) lädt.
-recommendedInstancesDescription: Empfohlene Instanzen, die durch Zeilenumbrüche getrennt
-  sind, werden in der empfohlenen Zeitachse angezeigt. Fügen Sie NICHT "https://"
+recommendedInstancesDescription: Empfohlene Server, die durch Zeilenumbrüche getrennt
+  sind, werden in der "Interessantes"-Timeline angezeigt. Fügen Sie NICHT "https://"
   hinzu, sondern NUR die Domain.
 sendModMail: Moderationshinweis senden
 moveFromDescription: 'Dadurch wird ein Alias Ihres alten Nutzerkontos festgelegt,
   sodass Sie von ihrem bisherigen Konto zu diesem Nutzerkonto wechseln können. Tun
   Sie dies, BEVOR Sie von Ihrem bisherigen Nutzerkonto hierhin wechseln. Bitte geben
-  Sie den Namen des Nutzerkontos wie folgt ein: person@server.xyz'
+  Sie den Namen des Nutzerkontos wie folgt ein: @person@server.xyz'
 preventAiLearning: KI gestütztes bot-scraping unterdrücken
 preventAiLearningDescription: Fordern Sie KI-Sprachmodelle von Drittanbietern auf,
   die von Ihnen hochgeladenen Inhalte, wie z. B. Beiträge und Bilder, nicht zu untersuchen.
@@ -2058,3 +2057,5 @@ older: älter
 newer: neuer
 accessibility: Erreichbarkeit
 jumpToPrevious: Zum Vorherigen springen
+silencedWarning: Diese Meldung wird angezeigt, weil diese Nutzer von Servern stammen,
+  die Ihr Administrator abgeschaltet hat, so dass es sich möglicherweise um Spam handelt.

From 98b9caa7bcce0c99d10b51105d5e89a4281ec32b Mon Sep 17 00:00:00 2001
From: Michael 465537 <michael.465537@gmail.com>
Date: Sat, 27 May 2023 00:28:49 +0000
Subject: [PATCH 042/319] chore: Translated using Weblate (German)

Currently translated at 98.1% (1720 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
---
 locales/de-DE.yml | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 7072c2d3c1..fed4d76e3e 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -235,7 +235,7 @@ default: "Standard"
 defaultValueIs: "Der Standardwert ist: {value}"
 noCustomEmojis: "Es gibt keine benutzerdefinierten Emoji"
 noJobs: "Keine Jobs vorhanden"
-federating: "Eine Verknüpfung wird hergestellt"
+federating: "Eine Verbindung zum Server wird hergestellt"
 blocked: "Blockiert"
 suspended: "suspendiert"
 all: "Alles"
@@ -703,7 +703,7 @@ openInSideView: "In Seitenansicht öffnen"
 defaultNavigationBehaviour: "Standardnavigationsverhalten"
 editTheseSettingsMayBreakAccount: "Bei Bearbeitung dieser Einstellungen besteht die
   Gefahr, dein Nutzerkonto zu beschädigen."
-instanceTicker: "Serveranzeige zu Beiträgen"
+instanceTicker: "Zeige zu einem Beitrag den Herkunfts-Server an"
 waitingFor: "Warte auf {x}"
 random: "Zufällig"
 system: "System"
@@ -835,7 +835,7 @@ active: "Aktiv"
 offline: "Offline"
 notRecommended: "Nicht empfohlen"
 botProtection: "Schutz vor Bots"
-instanceBlocking: "Verknüpfte Server verwalten"
+instanceBlocking: "Verbundene Server verwalten"
 selectAccount: "Nutzerkonto auswählen"
 switchAccount: "Konto wechseln"
 enabled: "Aktiviert"
@@ -1352,8 +1352,8 @@ _tutorial:
     und der Local-Timeline."
   step5_6: "In der {icon} \"Interessantes\"-Timeline können sie Beiträge von Servern
     sehen, die von den Server-Administratoren vorgeschlagen werden."
-  step5_7: "In der {icon} Global-Timeline können Sie Beiträge von jedem anderen verbundenen
-    Server im fediverse sehen."
+  step5_7: "In der {icon} Global-Timeline können Sie Beiträge von allen verknüpften
+    Servern aus dem Fediverse sehen."
   step6_1: "Also, was ist das hier?"
   step6_2: "Mit Deiner Anmeldung zu Calckey bist Du gleichzeitig einem Portal zum
     Fediverse beigetreten, einem Netzwerk mit Tausenden von, miteinander verbundenen,
@@ -1896,6 +1896,7 @@ _notification:
     followBack: "folgt dir nun auch"
     reply: "Antworten"
     renote: "Renote"
+  voted: Haben an Ihrer Umfrage teilgenommen
 _deck:
   alwaysShowMainColumn: "Hauptspalte immer zeigen"
   columnAlign: "Spaltenausrichtung"
@@ -1928,7 +1929,7 @@ _deck:
   nameAlreadyExists: Der Name für den Arbeitsbereich ist bereits vorhanden.
 enableRecommendedTimeline: '"Interessantes"-Timline einschalten'
 secureMode: Sicherer Modus (Autorisierter Abruf)
-instanceSecurity: Serversicherheit
+instanceSecurity: Server-Sicherheit
 manageGroups: Gruppen verwalten
 noThankYou: Nein, danke
 privateMode: Privater Modus
@@ -1942,7 +1943,7 @@ hiddenTagsDescription: 'Gib hier die Hashtags (ohne #) an, die du vom "Trending
 addInstance: Server hinzufügen
 flagSpeakAsCatDescription: Deine Beiträge werden im Katzenmodus nyanisiert
 hiddenTags: Versteckte Hashtags
-antennaInstancesDescription: Nenne einen Server-Namen pro Zeile
+antennaInstancesDescription: Geben sie einen Server-Namen pro Zeile ein
 secureModeInfo: Bei Anfragen an andere Server nicht ohne Nachweis zurücksenden.
 renoteMute: Boosts stummschalten
 renoteUnmute: Stummschaltung von Boosts aufheben
@@ -1981,7 +1982,7 @@ moveToLabel: 'Nutzerkonto zu dem sie umziehen:'
 moveAccountDescription: 'Dieser Vorgang kann nicht rückgängig gemacht werden! Stellen
   sie vor dem Umzug dieses Nutzerkontos sicher, dass Sie einen Namen für Ihr neues
   Nutzerkonto eingerichtet haben. Bitte geben sie die Bezeichnung des neuen Nutzerkontos
-  wie folgt ein: @name@instance.xyz'
+  wie folgt ein: @name@server.xyz'
 findOtherInstance: Einen anderen Server finden
 sendPushNotificationReadMessage: Löschung der Push-Benachrichtigungen sobald die entsprechenden
   Benachrichtigungen oder Beiträge gelesen wurden.
@@ -2018,9 +2019,9 @@ adminCustomCssWarn: Diese Einstellung sollte nur verwendet werden, wenn Sie wiss
   mehr normal funktionieren. Bitte stellen Sie sicher, dass Ihr CSS ordnungsgemäß
   funktioniert, indem Sie es in Ihren Benutzereinstellungen testen.
 customMOTD: Benutzerdefinierte Meldung des Tages (Begrüßungsbildschirmmeldungen)
-allowedInstancesDescription: Hosts von Servern, die für den Verbund auf die Liste
-  vertrauenswürdiger Server gesetzt werden sollen, werden jeweils durch eine neue
-  Zeile getrennt (gilt nur im privaten Modus).
+allowedInstancesDescription: Hosts von Servern, die zur Verbindung auf die Liste vertrauenswürdiger
+  Server gesetzt werden sollen, werden jeweils durch eine neue Zeile getrennt eingegeben
+  (gilt nur im privaten Modus).
 migration: Migration
 updateAvailable: Es könnte eine Aktualisierung verfügbar sein!
 showAdminUpdates: Anzeigen, dass eine neue Calckey-Version verfügbar ist (nur Administrator)
@@ -2059,3 +2060,7 @@ accessibility: Erreichbarkeit
 jumpToPrevious: Zum Vorherigen springen
 silencedWarning: Diese Meldung wird angezeigt, weil diese Nutzer von Servern stammen,
   die Ihr Administrator abgeschaltet hat, so dass es sich möglicherweise um Spam handelt.
+_experiments:
+  enablePostEditing: Beitragsbearbeitung einschalten
+noGraze: Bitte deaktivieren Sie die Browsererweiterung "Graze for Mastodon", da sie
+  die Funktion von Calckey stört.

From 3828ef028ce69ea7ed7abacd6a291b940053cd4b Mon Sep 17 00:00:00 2001
From: Michael 465537 <michael.465537@gmail.com>
Date: Sat, 27 May 2023 00:57:31 +0000
Subject: [PATCH 043/319] chore: Translated using Weblate (German)

Currently translated at 98.1% (1720 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
---
 locales/de-DE.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index fed4d76e3e..c89a2d54f3 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -946,7 +946,7 @@ recentNHours: "Die letzten {n} Stunden"
 recentNDays: "Die letzten {n} Tage"
 noEmailServerWarning: "Es ist kein Email-Server konfiguriert."
 thereIsUnresolvedAbuseReportWarning: "Es liegen ungelöste Meldungen vor."
-recommended: "Interessantes"
+recommended: "Admin-Tipps TL"
 check: "Kontrolle"
 driveCapOverrideLabel: "Die Cloud-Drive-Kapazität dieses Nutzers verändern"
 driveCapOverrideCaption: "Gib einen Wert von 0 oder weniger ein, um die Kapazität
@@ -1350,7 +1350,7 @@ _tutorial:
     der/die auf diesem Server registriert ist."
   step5_5: "Die Social-Timeline {icon} ist eine Kombination aus der Home-Timeline
     und der Local-Timeline."
-  step5_6: "In der {icon} \"Interessantes\"-Timeline können sie Beiträge von Servern
+  step5_6: "In der {icon} \"Admin-Tipps\"-Timeline können sie Beiträge von Servern
     sehen, die von den Server-Administratoren vorgeschlagen werden."
   step5_7: "In der {icon} Global-Timeline können Sie Beiträge von allen verknüpften
     Servern aus dem Fediverse sehen."
@@ -1566,9 +1566,9 @@ _timelines:
   local: "Local-TL"
   social: "Social-TL"
   global: "Global-TL"
-  recommended: Interessantes
+  recommended: Admin-Tipps-TL
 _pages:
-  newPage: "Seite erstellen"
+  newPage: "Neue Seite erstellen"
   editPage: "Seite bearbeiten"
   readPage: "Quelltextansicht"
   created: "Seite erfolgreich erstellt"
@@ -1927,7 +1927,7 @@ _deck:
     direct: "Direktnachrichten"
   renameProfile: Arbeitsbereich umbenennen
   nameAlreadyExists: Der Name für den Arbeitsbereich ist bereits vorhanden.
-enableRecommendedTimeline: '"Interessantes"-Timline einschalten'
+enableRecommendedTimeline: '"Admin-Tipps"-Timline einschalten'
 secureMode: Sicherer Modus (Autorisierter Abruf)
 instanceSecurity: Server-Sicherheit
 manageGroups: Gruppen verwalten
@@ -2029,7 +2029,7 @@ customMOTDDescription: Benutzerdefinierte Meldungen für die Meldung des Tages (
   die durch Zeilenumbrüche getrennt sind und nach dem Zufallsprinzip jedes Mal angezeigt
   werden, wenn ein Benutzer die Seite (neu) lädt.
 recommendedInstancesDescription: Empfohlene Server, die durch Zeilenumbrüche getrennt
-  sind, werden in der "Interessantes"-Timeline angezeigt. Fügen Sie NICHT "https://"
+  sind, werden in der "Admin-Tipps"-Timeline angezeigt. Fügen Sie NICHT "https://"
   hinzu, sondern NUR die Domain.
 sendModMail: Moderationshinweis senden
 moveFromDescription: 'Dadurch wird ein Alias Ihres alten Nutzerkontos festgelegt,

From c1f2664e0cb34c1524b596d98d4ebffba32bbfb8 Mon Sep 17 00:00:00 2001
From: Michael 465537 <michael.465537@gmail.com>
Date: Sat, 27 May 2023 10:37:35 +0000
Subject: [PATCH 044/319] chore: Translated using Weblate (German)

Currently translated at 98.1% (1720 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
---
 locales/de-DE.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index c89a2d54f3..5c5a7137b1 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -946,7 +946,7 @@ recentNHours: "Die letzten {n} Stunden"
 recentNDays: "Die letzten {n} Tage"
 noEmailServerWarning: "Es ist kein Email-Server konfiguriert."
 thereIsUnresolvedAbuseReportWarning: "Es liegen ungelöste Meldungen vor."
-recommended: "Admin-Tipps TL"
+recommended: "Empfehlungen TL"
 check: "Kontrolle"
 driveCapOverrideLabel: "Die Cloud-Drive-Kapazität dieses Nutzers verändern"
 driveCapOverrideCaption: "Gib einen Wert von 0 oder weniger ein, um die Kapazität
@@ -1350,7 +1350,7 @@ _tutorial:
     der/die auf diesem Server registriert ist."
   step5_5: "Die Social-Timeline {icon} ist eine Kombination aus der Home-Timeline
     und der Local-Timeline."
-  step5_6: "In der {icon} \"Admin-Tipps\"-Timeline können sie Beiträge von Servern
+  step5_6: "In der {icon} \"Empfehlungen\"-Timeline können sie Beiträge von Servern
     sehen, die von den Server-Administratoren vorgeschlagen werden."
   step5_7: "In der {icon} Global-Timeline können Sie Beiträge von allen verknüpften
     Servern aus dem Fediverse sehen."
@@ -1566,7 +1566,7 @@ _timelines:
   local: "Local-TL"
   social: "Social-TL"
   global: "Global-TL"
-  recommended: Admin-Tipps-TL
+  recommended: Empfehlungen-TL
 _pages:
   newPage: "Neue Seite erstellen"
   editPage: "Seite bearbeiten"
@@ -1927,7 +1927,7 @@ _deck:
     direct: "Direktnachrichten"
   renameProfile: Arbeitsbereich umbenennen
   nameAlreadyExists: Der Name für den Arbeitsbereich ist bereits vorhanden.
-enableRecommendedTimeline: '"Admin-Tipps"-Timline einschalten'
+enableRecommendedTimeline: '"Empfehlungen"-Timline einschalten'
 secureMode: Sicherer Modus (Autorisierter Abruf)
 instanceSecurity: Server-Sicherheit
 manageGroups: Gruppen verwalten
@@ -2029,7 +2029,7 @@ customMOTDDescription: Benutzerdefinierte Meldungen für die Meldung des Tages (
   die durch Zeilenumbrüche getrennt sind und nach dem Zufallsprinzip jedes Mal angezeigt
   werden, wenn ein Benutzer die Seite (neu) lädt.
 recommendedInstancesDescription: Empfohlene Server, die durch Zeilenumbrüche getrennt
-  sind, werden in der "Admin-Tipps"-Timeline angezeigt. Fügen Sie NICHT "https://"
+  sind, werden in der "Empfehlungen"-Timeline angezeigt. Fügen Sie NICHT "https://"
   hinzu, sondern NUR die Domain.
 sendModMail: Moderationshinweis senden
 moveFromDescription: 'Dadurch wird ein Alias Ihres alten Nutzerkontos festgelegt,

From 73d31ec3322c69245001a94afa48d829f66468fe Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 27 May 2023 11:00:10 -0400
Subject: [PATCH 045/319] Fix hide button being not clickable

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

diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index f3669f422a..936e5e8987 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -235,7 +235,7 @@ function focusFooter(ev) {
 </script>
 
 <style lang="scss" scoped>
-:deep(a, button) {
+:deep(a), :deep(button) {
 	position: relative;
 	z-index: 2;
 }

From bfe2de8deab380a5c238d178eed8d711ce026a98 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 28 May 2023 03:10:15 +0900
Subject: [PATCH 046/319] use ph-lock for followers visibility

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

diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index 04d0ba5fba..e0d2a8f4c0 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -44,7 +44,7 @@
 						><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
+						><i class="ph-lock ph-bold ph-lg"></i
 					></span>
 					<span v-if="visibility === 'specified'"
 						><i class="ph-envelope-simple-open ph-bold ph-lg"></i
diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue
index d1999ade74..4a8e329d02 100644
--- a/packages/client/src/components/MkRenoteButton.vue
+++ b/packages/client/src/components/MkRenoteButton.vue
@@ -158,7 +158,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 	} else {
 		buttonActions.push({
 			text: `${i18n.ts.renote} (${i18n.ts._visibility.followers})`,
-			icon: "ph-lock-simple-open ph-bold ph-lg",
+			icon: "ph-lock ph-bold ph-lg",
 			danger: false,
 			action: () => {
 				os.api("notes/create", {
diff --git a/packages/client/src/components/MkVisibility.vue b/packages/client/src/components/MkVisibility.vue
index c5922ba00c..591dc65dae 100644
--- a/packages/client/src/components/MkVisibility.vue
+++ b/packages/client/src/components/MkVisibility.vue
@@ -7,7 +7,7 @@
 		></i>
 		<i
 			v-else-if="note.visibility === 'followers'"
-			class="ph-lock-simple-open ph-bold ph-lg"
+			class="ph-lock ph-bold ph-lg"
 			v-tooltip="i18n.ts._visibility.followers"
 		></i>
 		<i
diff --git a/packages/client/src/components/MkVisibilityPicker.vue b/packages/client/src/components/MkVisibilityPicker.vue
index 753d8bbbae..f4529faa52 100644
--- a/packages/client/src/components/MkVisibilityPicker.vue
+++ b/packages/client/src/components/MkVisibilityPicker.vue
@@ -53,7 +53,7 @@
 				@click="choose('followers')"
 			>
 				<div :class="$style.icon">
-					<i class="ph-lock-simple-open ph-bold ph-lg"></i>
+					<i class="ph-lock ph-bold ph-lg"></i>
 				</div>
 				<div :class="$style.body">
 					<span :class="$style.itemTitle">{{

From 6a64a6e2bca1f0945b21f287b6dea72125c705ad Mon Sep 17 00:00:00 2001
From: Michael 465537 <michael.465537@gmail.com>
Date: Sat, 27 May 2023 18:08:18 +0000
Subject: [PATCH 047/319] chore: Translated using Weblate (German)

Currently translated at 98.1% (1720 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
---
 locales/de-DE.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 5c5a7137b1..42c9907454 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -946,7 +946,7 @@ recentNHours: "Die letzten {n} Stunden"
 recentNDays: "Die letzten {n} Tage"
 noEmailServerWarning: "Es ist kein Email-Server konfiguriert."
 thereIsUnresolvedAbuseReportWarning: "Es liegen ungelöste Meldungen vor."
-recommended: "Empfehlungen TL"
+recommended: "Admin-Selektion"
 check: "Kontrolle"
 driveCapOverrideLabel: "Die Cloud-Drive-Kapazität dieses Nutzers verändern"
 driveCapOverrideCaption: "Gib einen Wert von 0 oder weniger ein, um die Kapazität
@@ -1350,7 +1350,7 @@ _tutorial:
     der/die auf diesem Server registriert ist."
   step5_5: "Die Social-Timeline {icon} ist eine Kombination aus der Home-Timeline
     und der Local-Timeline."
-  step5_6: "In der {icon} \"Empfehlungen\"-Timeline können sie Beiträge von Servern
+  step5_6: "In der {icon} \"Admin-Selektion\"-Timeline können sie Beiträge von Servern
     sehen, die von den Server-Administratoren vorgeschlagen werden."
   step5_7: "In der {icon} Global-Timeline können Sie Beiträge von allen verknüpften
     Servern aus dem Fediverse sehen."
@@ -1566,7 +1566,7 @@ _timelines:
   local: "Local-TL"
   social: "Social-TL"
   global: "Global-TL"
-  recommended: Empfehlungen-TL
+  recommended: Admin-Selektion
 _pages:
   newPage: "Neue Seite erstellen"
   editPage: "Seite bearbeiten"
@@ -1927,7 +1927,7 @@ _deck:
     direct: "Direktnachrichten"
   renameProfile: Arbeitsbereich umbenennen
   nameAlreadyExists: Der Name für den Arbeitsbereich ist bereits vorhanden.
-enableRecommendedTimeline: '"Empfehlungen"-Timline einschalten'
+enableRecommendedTimeline: '"Admin-Selektion"-Timeline einschalten'
 secureMode: Sicherer Modus (Autorisierter Abruf)
 instanceSecurity: Server-Sicherheit
 manageGroups: Gruppen verwalten
@@ -2029,7 +2029,7 @@ customMOTDDescription: Benutzerdefinierte Meldungen für die Meldung des Tages (
   die durch Zeilenumbrüche getrennt sind und nach dem Zufallsprinzip jedes Mal angezeigt
   werden, wenn ein Benutzer die Seite (neu) lädt.
 recommendedInstancesDescription: Empfohlene Server, die durch Zeilenumbrüche getrennt
-  sind, werden in der "Empfehlungen"-Timeline angezeigt. Fügen Sie NICHT "https://"
+  sind, werden in der "Admin-Selektion"-Timeline angezeigt. Fügen Sie NICHT "https://"
   hinzu, sondern NUR die Domain.
 sendModMail: Moderationshinweis senden
 moveFromDescription: 'Dadurch wird ein Alias Ihres alten Nutzerkontos festgelegt,

From 20842732516db3e07661fd7c8e1df9aa539f54ce Mon Sep 17 00:00:00 2001
From: Michael 465537 <michael.465537@gmail.com>
Date: Sat, 27 May 2023 19:08:59 +0000
Subject: [PATCH 048/319] chore: Translated using Weblate (German)

Currently translated at 98.9% (1734 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
---
 locales/de-DE.yml | 74 +++++++++++++++++++++++++++++++----------------
 1 file changed, 49 insertions(+), 25 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 42c9907454..60ab4e5ba8 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -3,7 +3,7 @@ headlineMisskey: "Eine dezentralisierte Open-Source Social Media Plattform, die
   immer gratis bleibt! 🚀"
 introMisskey: "Willkommen! Calckey ist eine dezentralisierte Open-Source Social Media
   Plattform, die für immer gratis bleibt!🚀"
-monthAndDay: "{day}.{month}."
+monthAndDay: "{month}/{day}"
 search: "Suchen"
 notifications: "Benachrichtigungen"
 username: "Nutzername"
@@ -66,7 +66,7 @@ import: "Import"
 export: "Export"
 files: "Dateien"
 download: "Herunterladen"
-driveFileDeleteConfirm: "Möchtest du die Datei „{name}“ wirklich löschen? Es wird
+driveFileDeleteConfirm: "Möchtest du die Datei \"{name}\" wirklich löschen? Es wird
   aus allen Beiträgen entfernt, die die Datei als Anhang enthalten."
 unfollowConfirm: "Bist du dir sicher, daß du {name} nicht mehr folgen möchtest?"
 exportRequested: "Du hast einen Export angefragt. Dies kann etwas Zeit in Anspruch
@@ -150,8 +150,8 @@ settingGuide: "Empfohlene Einstellungen"
 cacheRemoteFiles: "Cache für entfernte Dateien"
 cacheRemoteFilesDescription: "Ist diese Einstellung deaktiviert, so werden Dateien
   von anderen Servern direkt von dort geladen. Hierdurch wird Speicherplatz auf diesem
-  Server eingespart, aber durch die fehlende Generierung von Vorschaubildern mehr
-  Bandbreite benötigt."
+  Server eingespart, aber durch die fehlende Generierung von Vorschaubildern wird
+  mehr Bandbreite benötigt."
 flagAsBot: "Dieses Nutzerkonto als Bot kennzeichnen"
 flagAsBotDescription: "Aktiviere diese Option, falls dieses Nutzerkonto durch ein
   Programm gesteuert wird. Falls aktiviert, agiert es als Flag für andere Entwickler
@@ -166,7 +166,7 @@ autoAcceptFollowed: "Automatisches Genehmigen von Folgeanfragen von Benutzern, d
   Sie folgen"
 addAccount: "Nutzerkonto hinzufügen"
 loginFailed: "Anmeldung fehlgeschlagen"
-showOnRemote: "Ansicht auf dem Herkunftsserver"
+showOnRemote: "Zur Ansicht auf dem Herkunftsserver"
 general: "Allgemein"
 wallpaper: "Hintergrundbild"
 setWallpaper: "Hintergrundbild festlegen"
@@ -242,7 +242,7 @@ all: "Alles"
 subscribing: "Registrieren"
 publishing: "Veröffentlichen"
 notResponding: "Antwortet nicht"
-instanceFollowing: "Dem Server folgen"
+instanceFollowing: "Folgen auf dem Server"
 instanceFollowers: "Follower des Servers"
 instanceUsers: "Nutzer dieses Servers"
 changePassword: "Passwort ändern"
@@ -253,7 +253,7 @@ newPassword: "Neues Passwort"
 newPasswordRetype: "Neues Passwort bestätigen"
 attachFile: "Dateien anhängen"
 more: "Mehr!"
-featured: "Ausgewählt"
+featured: "Besonderheiten"
 usernameOrUserId: "Nutzername oder Nutzer-ID"
 noSuchUser: "Nutzer nicht gefunden"
 lookup: "Suche nach"
@@ -372,8 +372,9 @@ pinnedUsers: "Angeheftete Nutzer"
 pinnedUsersDescription: "Gib durch Leerzeichen getrennte Nutzer an, die an die \"\
   Erkunden\"-Seite angeheftet werden sollen."
 pinnedPages: "Angeheftete Nutzer-Seiten"
-pinnedPagesDescription: "Geben Sie die Pfade der Nutzer-Seiten, getrennt durch Zeilenumbrüche,
-  ein, die Sie an die oberste Startseite dieses Servers anheften möchten."
+pinnedPagesDescription: "Geben Sie die Dateipfade, getrennt durch Zeilenumbrüche,
+  derjenigen Seiten ein, die Sie an die obere Seitenbegrenzung des Servers anpinnen
+  möchten."
 pinnedClipId: "ID des anzuheftenden Clips"
 pinnedNotes: "Angeheftete Beiträge"
 hcaptcha: "hCaptcha"
@@ -585,7 +586,7 @@ deleteAllFiles: "Alle Dateien löschen"
 deleteAllFilesConfirm: "Möchtest du wirklich alle Dateien löschen?"
 removeAllFollowing: "Allen gefolgten Nutzern entfolgen"
 removeAllFollowingDescription: "Wenn Sie dies ausführen, werden alle Konten von {host}
-  entfolgt. Bitte führen Sie dies aus, wenn der Server z.B. nicht mehr existiert."
+  entfolgt. Bitte führen Sie dies aus, wenn der Server beispielsweise nicht mehr existiert."
 userSuspended: "Dieser Nutzer wurde gesperrt."
 userSilenced: "Dieser Nutzer wurde instanzweit stummgeschaltet."
 yourAccountSuspendedTitle: "Dieses Nutzerkonto ist gesperrt"
@@ -922,7 +923,7 @@ overridedDeviceKind: "Gerätetyp"
 smartphone: "Smartphone"
 tablet: "Tablet"
 auto: "Automatisch"
-themeColor: "Farbe der Laufschrift (Ticker)"
+themeColor: "Farbe der Ticker-Laufschrift"
 size: "Größe"
 numberOfColumn: "Spaltenanzahl"
 searchByGoogle: "Suchen"
@@ -958,7 +959,7 @@ isSystemAccount: "Dieses Konto wird vom System erstellt und automatisch verwalte
 typeToConfirm: "Bitte gib zur Bestätigung {x} ein"
 deleteAccount: "Nutzerkonto löschen"
 document: "Dokumentation"
-numberOfPageCache: "Seitencachegröße"
+numberOfPageCache: "Anzahl der zwischengespeicherten Seiten"
 numberOfPageCacheDescription: "Das Erhöhen dieses Caches führt zu einer angenehmerern
   Nutzererfahrung, erhöht aber Serverlast und Arbeitsspeicherauslastung."
 logoutConfirm: "Wirklich abmelden?"
@@ -967,7 +968,7 @@ statusbar: "Statusleiste"
 pleaseSelect: "Wähle eine Option"
 reverse: "Umkehren"
 colored: "Farbig"
-refreshInterval: "Aktualisierungsrate "
+refreshInterval: "Aktualisierungsintervall "
 label: "Beschriftung"
 type: "Art"
 speed: "Geschwindigkeit"
@@ -982,7 +983,7 @@ cannotUploadBecauseInappropriate: "Diese Datei kann nicht hochgeladen werden, da
 cannotUploadBecauseNoFreeSpace: "Die Datei konnte nicht hochgeladen werden, da dein
   Cloud-Drive-Speicherplatz aufgebraucht ist."
 beta: "Beta"
-enableAutoSensitive: "NSFW-Automarkierung"
+enableAutoSensitive: "Selbstständige NSFW-Kennzeichnung"
 enableAutoSensitiveDescription: "Erlaubt, wo möglich, die automatische Erkennung und
   Kennzeichnung von NSFW-Medien durch maschinelles Lernen. Auch wenn diese Option
   deaktiviert ist, kann sie über den Server aktiviert sein."
@@ -1001,7 +1002,7 @@ _sensitiveMediaDetection:
   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"
+  setSensitiveFlagAutomatically: "Als NSFW kennzeichnen"
   setSensitiveFlagAutomaticallyDescription: "Die Resultate der internen Erkennung
     werden beibehalten, auch wenn diese Option deaktiviert ist."
   analyzeVideos: "Videoanalyse aktivieren"
@@ -1056,7 +1057,7 @@ _email:
     title: "Du hast eine Follow-Anfrage erhalten"
 _plugin:
   install: "Plugins installieren"
-  installWarn: "Installiere bitte nur vertrauenswürdige Plugins."
+  installWarn: "Bitte nur vertrauenswürdige Plugins installieren."
   manage: "Plugins verwalten"
 _preferencesBackups:
   list: "Erstellte Backups"
@@ -1097,8 +1098,8 @@ _aboutMisskey:
     Personen sehr. Danke! 🥰"
   patrons: "UnterstützerInnen"
 _nsfw:
-  respect: "Als NSFW markierte Bilder verbergen"
-  ignore: "Als NSFW markierte Bilder nicht verbergen"
+  respect: "Mit NSFW gekennzeichnete Bilder verbergen"
+  ignore: "Mit NSFW gekennzeichnete Bilder nicht verbergen"
   force: "Alle Medien verbergen"
 _mfm:
   cheatSheet: "MFM Spickzettel"
@@ -1183,6 +1184,10 @@ _mfm:
   scaleDescription: Skaliere den Inhalt um einen bestimmten Betrag.
   foregroundDescription: Ändern der Vordergrundfarbe von Text.
   backgroundDescription: Ändern der Hintergrundfarbe von Text
+  play: MFM abspielen
+  stop: MFM anhalten
+  warn: MFM können schnell bewegte oder anderweitig auffallende Animationen enthalten
+  alwaysPlay: Alle animierten MFM immer automatisch abspielen
 _instanceTicker:
   none: "Nie anzeigen"
   remote: "Für Nutzer eines anderen Servers anzeigen"
@@ -1225,7 +1230,7 @@ _wordMute:
   hard: "Schwer"
   mutedNotes: "Stummgeschaltete Beiträge"
 _instanceMute:
-  instanceMuteDescription: "Schaltet alle Beiträge/boosts stumm, die von den gelisteten
+  instanceMuteDescription: "Schaltet alle Beiträge/Boosts stumm, die von den gelisteten
     Servern stammen, inklusive Antworten von Nutzern an einen Nutzer eines stummgeschalteten
     Servers."
   instanceMuteDescription2: "Mit Zeilenumbrüchen trennen"
@@ -1896,7 +1901,9 @@ _notification:
     followBack: "folgt dir nun auch"
     reply: "Antworten"
     renote: "Renote"
-  voted: Haben an Ihrer Umfrage teilgenommen
+  voted: haben an Ihrer Umfrage teilgenommen
+  reacted: hat auf Ihren Beitrag reagiert
+  renoted: hat Ihren Beitrag geteilt
 _deck:
   alwaysShowMainColumn: "Hauptspalte immer zeigen"
   columnAlign: "Spaltenausrichtung"
@@ -1937,9 +1944,9 @@ enableEmojiReactions: Emoji-Reaktionen aktivieren
 flagSpeakAsCat: Wie eine Katze sprechen
 showEmojisInReactionNotifications: Emojis in Reaktionsbenachrichtigungen anzeigen
 userSaysSomethingReason: '{name} sagte {reason}'
-hiddenTagsDescription: 'Gib hier die Hashtags (ohne #) an, die du vom "Trending and
-  Explore" ausschließen möchtest. Versteckte Hashtags sind immer noch über andere
-  Wege auffindbar.'
+hiddenTagsDescription: 'Geben sie hier die Schlagworte (ohne #hashtag) an, die vom
+  "Trending and Explore" ausgeschlossen werden sollen. Versteckte Schlagworte sind
+  immer noch über andere Wege auffindbar.'
 addInstance: Server hinzufügen
 flagSpeakAsCatDescription: Deine Beiträge werden im Katzenmodus nyanisiert
 hiddenTags: Versteckte Hashtags
@@ -1947,7 +1954,7 @@ antennaInstancesDescription: Geben sie einen Server-Namen pro Zeile ein
 secureModeInfo: Bei Anfragen an andere Server nicht ohne Nachweis zurücksenden.
 renoteMute: Boosts stummschalten
 renoteUnmute: Stummschaltung von Boosts aufheben
-noInstances: Es gibt keine Server
+noInstances: Keine Server gefunden
 privateModeInfo: Wenn diese Option aktiviert ist, können nur als vertrauenswürdig
   eingestufte Server mit diesem Server verknüpft werden. Alle Beiträge werden für
   die Öffentlichkeit verborgen.
@@ -2061,6 +2068,23 @@ jumpToPrevious: Zum Vorherigen springen
 silencedWarning: Diese Meldung wird angezeigt, weil diese Nutzer von Servern stammen,
   die Ihr Administrator abgeschaltet hat, so dass es sich möglicherweise um Spam handelt.
 _experiments:
-  enablePostEditing: Beitragsbearbeitung einschalten
+  enablePostEditing: Beitragsbearbeitung ermöglichen
+  title: Funktionstests
+  postEditingCaption: Zeigt die Option für Nutzer an, ihre bestehenden Beiträge über
+    das Menü "Beitragsoptionen" zu bearbeiten
 noGraze: Bitte deaktivieren Sie die Browsererweiterung "Graze for Mastodon", da sie
   die Funktion von Calckey stört.
+indexFrom: Index ab Beitrags-ID (leer lassen, um jeden Beitrag zu indizieren)
+indexNotice: Jetzt wird indiziert. Dies wird wahrscheinlich eine Weile dauern, bitte
+  starten Sie Ihren Server für mindestens eine Stunde nicht neu.
+customKaTeXMacroDescription: "Richten Sie Makros ein, um mathematische Ausdrücke einfach
+  zu schreiben! Die Notation entspricht den LaTeX-Befehlsdefinitionen und wird als\n
+  \\newcommand{\\name}{content} or \\newcommand{\\name}[number of arguments]{content}\n
+  geschrieben.\nZum Beispiel wird\n\\newcommand{\\add}[2]{#1 + #2} \\add{3}{foo} um
+  3 + foo erweitert.\nDie geschweiften Klammern, die den Makronamen umgeben, können
+  in runde oder eckige Klammern geändert werden. Dies hat Auswirkungen auf die Klammern,
+  die für die Argumente verwendet werden. Pro Zeile kann ein (und nur ein) Makro definiert
+  werden, und Sie können die Zeile nicht mitten in der Definition umbrechen. Ungültige
+  Zeilen werden einfach ignoriert. Es werden nur einfache Funktionen zur Substitution
+  von Zeichenketten unterstützt; erweiterte Syntax, wie z. B. bedingte Verzweigungen,
+  können hier nicht verwendet werden."

From 9b0b8a4180ab42cc125b78e7b34fa6499f804c3e Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 27 May 2023 18:38:27 -0400
Subject: [PATCH 049/319] fix

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

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 021086ca98..8e3576dd50 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -424,12 +424,12 @@ function onContextmenu(ev: MouseEvent): void {
 						copyToClipboard(`${url}${notePage(appearNote)}`);
 					},
 				},
-				note.user.host != null
+				appearNote.user.host != null
 					? {
 							type: "a",
 							icon: "ph-arrow-square-up-right ph-bold ph-lg",
 							text: i18n.ts.showOnRemote,
-							href: note.url ?? note.uri ?? "",
+							href: appearNote.url ?? appearNote.uri ?? "",
 							target: "_blank",
 					  }
 					: undefined,
@@ -521,28 +521,28 @@ function setPostExpanded(val: boolean) {
 }
 
 const accessibleLabel = computed(() => {
-	let label = `${props.note.user.username}; `;
-	if (props.note.renote) {
-		label += `${i18n.t("renoted")} ${props.note.renote.user.username}; `;
-		if (props.note.renote.cw) {
-			label += `${i18n.t("cw")}: ${props.note.renote.cw}; `;
+	let label = `${appearNote.user.username}; `;
+	if (appearNote.renote) {
+		label += `${i18n.t("renoted")} ${appearNote.renote.user.username}; `;
+		if (appearNote.renote.cw) {
+			label += `${i18n.t("cw")}: ${appearNote.renote.cw}; `;
 			if (postIsExpanded.value) {
-				label += `${props.note.renote.text}; `;
+				label += `${appearNote.renote.text}; `;
 			}
 		} else {
-			label += `${props.note.renote.text}; `;
+			label += `${appearNote.renote.text}; `;
 		}
 	} else {
-		if (props.note.cw) {
-			label += `${i18n.t("cw")}: ${props.note.cw}; `;
+		if (appearNote.cw) {
+			label += `${i18n.t("cw")}: ${appearNote.cw}; `;
 			if (postIsExpanded.value) {
-				label += `${props.note.text}; `;
+				label += `${appearNote.text}; `;
 			}
 		} else {
-			label += `${props.note.text}; `;
+			label += `${appearNote.text}; `;
 		}
 	}
-	const date = new Date(props.note.createdAt);
+	const date = new Date(appearNote.createdAt);
 	label += `${date.toLocaleTimeString()}`;
 	return label;
 });

From 340be8e35a607aae89333f57b8a8c1b3519a4c2f Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 25 May 2023 00:55:33 +0200
Subject: [PATCH 050/319] Implement Meilisearch Indexing

---
 packages/backend/package.json                 |  1 +
 packages/backend/src/config/types.ts          |  6 ++
 packages/backend/src/db/meilisearch.ts        | 61 ++++++++++++++++
 .../src/server/api/endpoints/notes/search.ts  | 70 ++++++++++++++++++-
 packages/backend/src/services/note/create.ts  |  5 ++
 pnpm-lock.yaml                                | 39 +++++++++--
 6 files changed, 177 insertions(+), 5 deletions(-)
 create mode 100644 packages/backend/src/db/meilisearch.ts

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 96edb7f026..968b0af80c 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -85,6 +85,7 @@
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
+		"meilisearch": "^0.32.4",
 		"mfm-js": "0.23.3",
 		"mime-types": "2.1.35",
 		"multer": "1.4.4-lts.1",
diff --git a/packages/backend/src/config/types.ts b/packages/backend/src/config/types.ts
index 01a98f9f09..b6a449f549 100644
--- a/packages/backend/src/config/types.ts
+++ b/packages/backend/src/config/types.ts
@@ -40,6 +40,12 @@ export type Source = {
 		bucket?: string;
 	};
 
+	meilisearch: {
+		host: string;
+		port: number;
+		apiKey?: string;
+	};
+
 	proxy?: string;
 	proxySmtp?: string;
 	proxyBypassHosts?: string[];
diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
new file mode 100644
index 0000000000..756c092e9b
--- /dev/null
+++ b/packages/backend/src/db/meilisearch.ts
@@ -0,0 +1,61 @@
+import { MeiliSearch } from 'meilisearch';
+import { dbLogger } from "./logger.js";
+
+import config from "@/config/index.js";
+import {Note} from "@/models/entities/note";
+import {normalizeForSearch} from "@/misc/normalize-for-search";
+
+const logger = dbLogger.createSubLogger("meilisearch", "gray", false);
+
+logger.info("Connecting to MeiliSearch");
+
+const hasConfig =
+	config.meilisearch && (config.meilisearch.host || config.meilisearch.port || config.meilisearch.apiKey);
+
+const host = hasConfig ? config.meilisearch.host ?? "localhost" : "";
+const port = hasConfig ? config.meilisearch.port ?? 7700 : 0;
+const auth = hasConfig ? config.meilisearch.apiKey ?? "" : "";
+
+const client = new MeiliSearch({
+	host: 'http://127.0.0.1:7700',
+	apiKey: 'masterKey',
+})
+
+const posts = client.index('posts');
+
+posts.updateSearchableAttributes(['text']);
+
+logger.info("Connected to MeiliSearch");
+
+
+export type MeilisearchNote = {
+	id: string;
+	text: string;
+	userId: string;
+	userHost: string;
+	channelId: string;
+}
+
+export default hasConfig ? {
+	search: (query : string, limit : number, offset : number) => {
+		logger.info(`Searching for ${query}`);
+
+		return posts.search(query, {
+			limit: limit,
+			offset: offset,
+		});
+	},
+	ingestNote: (note : Note) => {
+		logger.info("Indexing note in MeiliSearch: " + note.id);
+
+		return posts.addDocuments([
+			{
+				id: note.id.toString(),
+				text: note.text,
+				userId: note.userId,
+				userHost: note.userHost,
+				channelId: note.channelId,
+			}
+		])
+	},
+} : null;
diff --git a/packages/backend/src/server/api/endpoints/notes/search.ts b/packages/backend/src/server/api/endpoints/notes/search.ts
index 93392acddf..0a6737c9b2 100644
--- a/packages/backend/src/server/api/endpoints/notes/search.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search.ts
@@ -4,6 +4,7 @@ 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 meilisearch, {MeilisearchNote} from "../../../../db/meilisearch.js";
 import define from "../../define.js";
 import { makePaginationQuery } from "../../common/make-pagination-query.js";
 import { generateVisibilityQuery } from "../../common/generate-visibility-query.js";
@@ -62,7 +63,7 @@ export const paramDef = {
 } as const;
 
 export default define(meta, paramDef, async (ps, me) => {
-	if (es == null && sonic == null) {
+	if (es == null && sonic == null && meilisearch == null) {
 		const query = makePaginationQuery(
 			Notes.createQueryBuilder("note"),
 			ps.sinceId,
@@ -171,6 +172,73 @@ export default define(meta, paramDef, async (ps, me) => {
 		}
 
 		return found;
+	} else if(meilisearch) {
+		let start = 0;
+		const chunkSize = 100;
+
+		// Use meilisearch to fetch and step through all search results that could match the requirements
+		const ids = [];
+		while (true) {
+			const results = await meilisearch.search(ps.query, start, chunkSize);
+
+			start += chunkSize;
+
+			if (results.hits.length === 0) {
+				break;
+			}
+
+			const res = results.hits
+				.filter((key) => {
+					let note = key as MeilisearchNote;
+
+					if (ps.userId && note.userId !== ps.userId) {
+						return false;
+					}
+					if (ps.channelId && note.channelId !== ps.channelId) {
+						return false;
+					}
+					if (ps.sinceId && note.id <= ps.sinceId) {
+						return false;
+					}
+					if (ps.untilId && note.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 66c5b8508e..158460421f 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -67,6 +67,7 @@ import type { UserProfile } from "@/models/entities/user-profile.js";
 import { db } from "@/db/postgre.js";
 import { getActiveWebhooks } from "@/misc/webhook-cache.js";
 import { shouldSilenceInstance } from "@/misc/should-block-instance.js";
+import meilisearch from "@/db/meilisearch";
 
 const mutedWordsCache = new Cache<
 	{ userId: UserProfile["userId"]; mutedWords: UserProfile["mutedWords"] }[]
@@ -776,6 +777,10 @@ export async function index(note: Note): Promise<void> {
 			note.text,
 		);
 	}
+
+	if (meilisearch) {
+		await meilisearch.ingestNote(note);
+	}
 }
 
 async function notifyToWatchersOfRenotee(
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 493e9fc062..48a0e498be 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -263,6 +263,9 @@ importers:
       koa-views:
         specifier: 7.0.2
         version: 7.0.2(@types/koa@2.13.5)(ejs@3.1.8)(pug@3.0.2)
+      meilisearch:
+        specifier: ^0.32.4
+        version: 0.32.4
       mfm-js:
         specifier: 0.23.3
         version: 0.23.3
@@ -2819,7 +2822,7 @@ packages:
       '@types/webgl-ext': 0.0.30
       '@webgpu/types': 0.1.16
       long: 4.0.0
-      node-fetch: 2.6.8
+      node-fetch: 2.6.11
       seedrandom: 3.0.5
     transitivePeerDependencies:
       - encoding
@@ -2835,7 +2838,7 @@ packages:
       '@types/webgl-ext': 0.0.30
       '@webgpu/types': 0.1.21
       long: 4.0.0
-      node-fetch: 2.6.8
+      node-fetch: 2.6.11
       seedrandom: 3.0.5
     transitivePeerDependencies:
       - encoding
@@ -2849,7 +2852,7 @@ packages:
     dependencies:
       '@tensorflow/tfjs-core': 3.21.0
       '@types/node-fetch': 2.6.2
-      node-fetch: 2.6.8
+      node-fetch: 2.6.11
       seedrandom: 3.0.5
       string_decoder: 1.3.0
     transitivePeerDependencies:
@@ -2864,7 +2867,7 @@ packages:
     dependencies:
       '@tensorflow/tfjs-core': 4.2.0
       '@types/node-fetch': 2.6.2
-      node-fetch: 2.6.8
+      node-fetch: 2.6.11
       seedrandom: 3.0.5
       string_decoder: 1.3.0
     transitivePeerDependencies:
@@ -5938,6 +5941,14 @@ packages:
       - encoding
     dev: true
 
+  /cross-fetch@3.1.6:
+    resolution: {integrity: sha512-riRvo06crlE8HiqOwIpQhxwdOk4fOeR7FVM/wXoxchFEqMNUjvbs3bfo4OTgMEMHzppd4DxFBDbyySj8Cv781g==}
+    dependencies:
+      node-fetch: 2.6.11
+    transitivePeerDependencies:
+      - encoding
+    dev: false
+
   /cross-spawn@5.1.0:
     resolution: {integrity: sha512-pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==}
     dependencies:
@@ -10386,6 +10397,14 @@ packages:
     engines: {node: '>= 0.6'}
     dev: false
 
+  /meilisearch@0.32.4:
+    resolution: {integrity: sha512-QvPtQ6F2TaqAT9fw072/MDjSCMpQifdtUBFeIk3M5jSnFpeSiv1iwfJWNfP6ByaCgR/s++K1Cqtf9vjcZe7prg==}
+    dependencies:
+      cross-fetch: 3.1.6
+    transitivePeerDependencies:
+      - encoding
+    dev: false
+
   /meow@9.0.0:
     resolution: {integrity: sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==}
     engines: {node: '>=10'}
@@ -10854,6 +10873,18 @@ packages:
     resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
     engines: {node: '>=10.5.0'}
 
+  /node-fetch@2.6.11:
+    resolution: {integrity: sha512-4I6pdBY1EthSqDmJkiNk3JIT8cswwR9nfeW/cPdUagJYEQG7R95WRH74wpz7ma8Gh/9dI9FP+OU+0E4FvtA55w==}
+    engines: {node: 4.x || >=6.0.0}
+    peerDependencies:
+      encoding: ^0.1.0
+    peerDependenciesMeta:
+      encoding:
+        optional: true
+    dependencies:
+      whatwg-url: 5.0.0
+    dev: false
+
   /node-fetch@2.6.7:
     resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
     engines: {node: 4.x || >=6.0.0}

From 7c0509b2f5004c53f501cd8ac4690acc7f732eea Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 25 May 2023 01:06:03 +0200
Subject: [PATCH 051/319] Meilisearch Config

---
 .config/example.yml |  7 +++++++
 docker-compose.yml  | 16 ++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.config/example.yml b/.config/example.yml
index 7d8ba32be6..7f83446a4d 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -82,6 +82,13 @@ redis:
 #  user:
 #  pass:
 
+#   ┌───────────────────────────┐
+#───┘ Meilisearch configuration └─────────────────────────────────────
+#meilisearch:
+#  host: meilisearch
+#  port: 7700
+#  pass:
+
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 5de14d0c8f..e1f9c7224b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,14 +40,18 @@ services:
     volumes:
       - ./db:/var/lib/postgresql/data
 
-  sonic:
-    restart: unless-stopped
-    image: docker.io/valeriansaliou/sonic:v1.4.0
+  meilisearch:
+    container_name: meilisearch
+    image: getmeili/meilisearch:v0.25.2
+    environment:
+      - MEILI_ENV=${MEILI_ENV:-development}
+    ports:
+      - "7700:7700"
     networks:
-      - calcnet
+      - meilisearch
     volumes:
-      - ./sonic:/var/lib/sonic/store
-      - ./sonic/config.cfg:/etc/sonic.cfg
+      - ./data.ms:/data.ms
+    restart: unless-stopped
 
 networks:
   calcnet:

From 4f07c88abb32a6c2c9e53c112fbcfcdc33c045fa Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 25 May 2023 02:19:42 +0200
Subject: [PATCH 052/319] Fix wrong parameter ordering

---
 packages/backend/src/db/meilisearch.ts             |  6 ++++--
 .../src/server/api/endpoints/notes/search.ts       | 14 ++++++--------
 packages/backend/src/services/note/create.ts       |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 756c092e9b..f404b47214 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -17,8 +17,8 @@ const port = hasConfig ? config.meilisearch.port ?? 7700 : 0;
 const auth = hasConfig ? config.meilisearch.apiKey ?? "" : "";
 
 const client = new MeiliSearch({
-	host: 'http://127.0.0.1:7700',
-	apiKey: 'masterKey',
+	host: `http://${host}:${port}`,
+	apiKey: auth,
 })
 
 const posts = client.index('posts');
@@ -39,6 +39,8 @@ export type MeilisearchNote = {
 export default hasConfig ? {
 	search: (query : string, limit : number, offset : number) => {
 		logger.info(`Searching for ${query}`);
+		logger.info(`Limit: ${limit}`);
+		logger.info(`Offset: ${offset}`);
 
 		return posts.search(query, {
 			limit: limit,
diff --git a/packages/backend/src/server/api/endpoints/notes/search.ts b/packages/backend/src/server/api/endpoints/notes/search.ts
index 0a6737c9b2..425414561b 100644
--- a/packages/backend/src/server/api/endpoints/notes/search.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search.ts
@@ -179,7 +179,7 @@ export default define(meta, paramDef, async (ps, me) => {
 		// Use meilisearch to fetch and step through all search results that could match the requirements
 		const ids = [];
 		while (true) {
-			const results = await meilisearch.search(ps.query, start, chunkSize);
+			const results = await meilisearch.search(ps.query, chunkSize, start);
 
 			start += chunkSize;
 
@@ -188,19 +188,17 @@ export default define(meta, paramDef, async (ps, me) => {
 			}
 
 			const res = results.hits
-				.filter((key) => {
-					let note = key as MeilisearchNote;
-
-					if (ps.userId && note.userId !== ps.userId) {
+				.filter((key: MeilisearchNote) => {
+					if (ps.userId && key.userId !== ps.userId) {
 						return false;
 					}
-					if (ps.channelId && note.channelId !== ps.channelId) {
+					if (ps.channelId && key.channelId !== ps.channelId) {
 						return false;
 					}
-					if (ps.sinceId && note.id <= ps.sinceId) {
+					if (ps.sinceId && key.id <= ps.sinceId) {
 						return false;
 					}
-					if (ps.untilId && note.id >= ps.untilId) {
+					if (ps.untilId && key.id >= ps.untilId) {
 						return false;
 					}
 					return true;
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 158460421f..f6285a61d2 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -67,7 +67,7 @@ import type { UserProfile } from "@/models/entities/user-profile.js";
 import { db } from "@/db/postgre.js";
 import { getActiveWebhooks } from "@/misc/webhook-cache.js";
 import { shouldSilenceInstance } from "@/misc/should-block-instance.js";
-import meilisearch from "@/db/meilisearch";
+import meilisearch from "../../db/meilisearch.js";
 
 const mutedWordsCache = new Cache<
 	{ userId: UserProfile["userId"]; mutedWords: UserProfile["mutedWords"] }[]

From a33b548555845504a943c5a9149ac1c8a8fea014 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 25 May 2023 09:53:04 +0200
Subject: [PATCH 053/319] Add Meilisearch widget

---
 packages/backend/src/daemons/server-stats.ts  | 11 ++++
 packages/backend/src/db/meilisearch.ts        | 16 ++++--
 .../src/server/api/endpoints/server-info.ts   | 12 +++++
 .../client/src/widgets/server-metric/disk.vue | 18 +++++++
 .../src/widgets/server-metric/index.vue       |  8 ++-
 .../src/widgets/server-metric/meilisearch.vue | 51 +++++++++++++++++++
 6 files changed, 112 insertions(+), 4 deletions(-)
 create mode 100644 packages/client/src/widgets/server-metric/meilisearch.vue

diff --git a/packages/backend/src/daemons/server-stats.ts b/packages/backend/src/daemons/server-stats.ts
index b0bf1288fd..c7aaea035b 100644
--- a/packages/backend/src/daemons/server-stats.ts
+++ b/packages/backend/src/daemons/server-stats.ts
@@ -1,6 +1,7 @@
 import si from "systeminformation";
 import Xev from "xev";
 import * as osUtils from "os-utils";
+import meilisearch from "../db/meilisearch";
 
 const ev = new Xev();
 
@@ -24,6 +25,7 @@ export default function () {
 		const memStats = await mem();
 		const netStats = await net();
 		const fsStats = await fs();
+		const meilisearchStats = await meilisearchStatus();
 
 		const stats = {
 			cpu: roundCpu(cpu),
@@ -39,6 +41,7 @@ export default function () {
 				r: round(Math.max(0, fsStats.rIO_sec ?? 0)),
 				w: round(Math.max(0, fsStats.wIO_sec ?? 0)),
 			},
+			meilisearch: meilisearchStats
 		};
 		ev.emit("serverStats", stats);
 		log.unshift(stats);
@@ -77,3 +80,11 @@ async function fs() {
 	const data = await si.disksIO().catch(() => ({ rIO_sec: 0, wIO_sec: 0 }));
 	return data || { rIO_sec: 0, wIO_sec: 0 };
 }
+
+async function meilisearchStatus() {
+	if (meilisearch) {
+		return meilisearch.serverStats();
+	} else {
+		return null;
+	}
+}
diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index f404b47214..f3561b8077 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -1,4 +1,4 @@
-import { MeiliSearch } from 'meilisearch';
+import {Health, MeiliSearch, Stats } from 'meilisearch';
 import { dbLogger } from "./logger.js";
 
 import config from "@/config/index.js";
@@ -16,7 +16,7 @@ const host = hasConfig ? config.meilisearch.host ?? "localhost" : "";
 const port = hasConfig ? config.meilisearch.port ?? 7700 : 0;
 const auth = hasConfig ? config.meilisearch.apiKey ?? "" : "";
 
-const client = new MeiliSearch({
+const client : MeiliSearch = new MeiliSearch({
 	host: `http://${host}:${port}`,
 	apiKey: auth,
 })
@@ -58,6 +58,16 @@ export default hasConfig ? {
 				userHost: note.userHost,
 				channelId: note.channelId,
 			}
-		])
+		]);
 	},
+	serverStats: async () => {
+		let health : Health = await client.health();
+		let stats: Stats = await client.getStats();
+
+		return {
+			health: health.status,
+			size: stats.databaseSize,
+			indexed_count: stats.indexes["posts"].numberOfDocuments
+		}
+	}
 } : null;
diff --git a/packages/backend/src/server/api/endpoints/server-info.ts b/packages/backend/src/server/api/endpoints/server-info.ts
index 1ce27e2621..4b2a4078a6 100644
--- a/packages/backend/src/server/api/endpoints/server-info.ts
+++ b/packages/backend/src/server/api/endpoints/server-info.ts
@@ -1,6 +1,7 @@
 import * as os from "node:os";
 import si from "systeminformation";
 import define from "../define.js";
+import meilisearch from "../../../db/meilisearch";
 
 export const meta = {
 	requireCredential: false,
@@ -18,6 +19,7 @@ export const paramDef = {
 export default define(meta, paramDef, async () => {
 	const memStats = await si.mem();
 	const fsStats = await si.fsSize();
+	const meilisearchStats = await meilisearchStatus();
 
 	return {
 		machine: os.hostname(),
@@ -32,5 +34,15 @@ export default define(meta, paramDef, async () => {
 			total: fsStats[0].size,
 			used: fsStats[0].used,
 		},
+		meilisearch: meilisearchStats
+
 	};
 });
+
+async function meilisearchStatus() {
+	if (meilisearch) {
+		return meilisearch.serverStats();
+	} else {
+		return null;
+	}
+}
diff --git a/packages/client/src/widgets/server-metric/disk.vue b/packages/client/src/widgets/server-metric/disk.vue
index 67ea398c16..0457cf7f0e 100644
--- a/packages/client/src/widgets/server-metric/disk.vue
+++ b/packages/client/src/widgets/server-metric/disk.vue
@@ -8,6 +8,12 @@
 			<p>Used: {{ bytes(used, 1) }}</p>
 		</div>
 	</div>
+	<br />
+	<div class="ms_stats">
+		<p>MeiliSearch</p>
+
+	</div>
+
 </template>
 
 <script lang="ts" setup>
@@ -26,6 +32,18 @@ const available = $computed(() => props.meta.fs.total - props.meta.fs.used);
 </script>
 
 <style lang="scss" scoped>
+.ms_stats {
+	padding: 16px;
+
+	> div {
+		> p {
+			&:first-child {
+				font-weight: bold;
+				margin-bottom: 4px;
+			}
+		}
+	}
+}
 .zbwaqsat {
 	display: flex;
 	padding: 16px;
diff --git a/packages/client/src/widgets/server-metric/index.vue b/packages/client/src/widgets/server-metric/index.vue
index 96dd3333d9..8d36819b5a 100644
--- a/packages/client/src/widgets/server-metric/index.vue
+++ b/packages/client/src/widgets/server-metric/index.vue
@@ -38,6 +38,11 @@
 				:connection="connection"
 				:meta="meta"
 			/>
+			<XMeili
+				v-else-if="widgetProps.view === 5"
+				:connection="connection"
+				:meta="meta"
+			/>
 		</div>
 	</MkContainer>
 </template>
@@ -56,6 +61,7 @@ import XNet from "./net.vue";
 import XCpu from "./cpu.vue";
 import XMemory from "./mem.vue";
 import XDisk from "./disk.vue";
+import XMeili from "./meilisearch.vue"
 import MkContainer from "@/components/MkContainer.vue";
 import { GetFormResultType } from "@/scripts/form";
 import * as os from "@/os";
@@ -102,7 +108,7 @@ os.api("server-info", {}).then((res) => {
 });
 
 const toggleView = () => {
-	if (widgetProps.view === 4) {
+	if (widgetProps.view === 5) {
 		widgetProps.view = 0;
 	} else {
 		widgetProps.view++;
diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
new file mode 100644
index 0000000000..aa47eb7b69
--- /dev/null
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -0,0 +1,51 @@
+<template>
+	<div class="ms_stats">
+		<div>
+			<p><i class="ph-file-search ph-bold ph-lg"></i>MeiliSearch</p>
+			<p>Server Status: {{ available }}</p>
+			<p>Total: {{ bytes(total_size, 1) }}</p>
+			<p>Posts Indexed: {{ index_count }}</p>
+		</div>
+	</div>
+	<br />
+	<div class="ms_stats">
+		<p>MeiliSearch</p>
+
+	</div>
+
+</template>
+
+<script lang="ts" setup>
+import {} from "vue";
+import bytes from "@/filters/bytes";
+
+const props = defineProps<{
+	meta: any; // TODO
+}>();
+
+const total_size = $computed(() => props.meta.meilisearch.total);
+const index_count = $computed(() => props.meta.meilisearch.indexed_count);
+const available = $computed(() => props.meta.meilisearch.available);
+</script>
+
+<style lang="scss" scoped>
+.ms_stats {
+	padding: 16px;
+
+	> div {
+		> p {
+			margin: 0;
+			font-size: 0.8em;
+
+			&:first-child {
+				font-weight: bold;
+				margin-bottom: 4px;
+
+				> i {
+					margin-right: 4px;
+				}
+			}
+		}
+	}
+}
+</style>

From c35a640bb1e8748380ad607279979a326a34265f Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 25 May 2023 10:21:29 +0200
Subject: [PATCH 054/319] Fix property names

---
 .../client/src/widgets/server-metric/disk.vue   | 17 -----------------
 .../src/widgets/server-metric/meilisearch.vue   |  4 ++--
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/packages/client/src/widgets/server-metric/disk.vue b/packages/client/src/widgets/server-metric/disk.vue
index 0457cf7f0e..99191e62ad 100644
--- a/packages/client/src/widgets/server-metric/disk.vue
+++ b/packages/client/src/widgets/server-metric/disk.vue
@@ -9,11 +9,6 @@
 		</div>
 	</div>
 	<br />
-	<div class="ms_stats">
-		<p>MeiliSearch</p>
-
-	</div>
-
 </template>
 
 <script lang="ts" setup>
@@ -32,18 +27,6 @@ const available = $computed(() => props.meta.fs.total - props.meta.fs.used);
 </script>
 
 <style lang="scss" scoped>
-.ms_stats {
-	padding: 16px;
-
-	> div {
-		> p {
-			&:first-child {
-				font-weight: bold;
-				margin-bottom: 4px;
-			}
-		}
-	}
-}
 .zbwaqsat {
 	display: flex;
 	padding: 16px;
diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
index aa47eb7b69..e45dceab0e 100644
--- a/packages/client/src/widgets/server-metric/meilisearch.vue
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -23,9 +23,9 @@ const props = defineProps<{
 	meta: any; // TODO
 }>();
 
-const total_size = $computed(() => props.meta.meilisearch.total);
+const total_size = $computed(() => props.meta.meilisearch.size);
 const index_count = $computed(() => props.meta.meilisearch.indexed_count);
-const available = $computed(() => props.meta.meilisearch.available);
+const available = $computed(() => props.meta.meilisearch.health);
 </script>
 
 <style lang="scss" scoped>

From ed16e6cc28bca799a0ebb44860887cbc4cad0229 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 25 May 2023 10:23:59 +0200
Subject: [PATCH 055/319] Import .js files

---
 packages/backend/src/daemons/server-stats.ts             | 2 +-
 packages/backend/src/server/api/endpoints/server-info.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/daemons/server-stats.ts b/packages/backend/src/daemons/server-stats.ts
index c7aaea035b..01b9cdcb4c 100644
--- a/packages/backend/src/daemons/server-stats.ts
+++ b/packages/backend/src/daemons/server-stats.ts
@@ -1,7 +1,7 @@
 import si from "systeminformation";
 import Xev from "xev";
 import * as osUtils from "os-utils";
-import meilisearch from "../db/meilisearch";
+import meilisearch from "../db/meilisearch.js";
 
 const ev = new Xev();
 
diff --git a/packages/backend/src/server/api/endpoints/server-info.ts b/packages/backend/src/server/api/endpoints/server-info.ts
index 4b2a4078a6..3411ba416d 100644
--- a/packages/backend/src/server/api/endpoints/server-info.ts
+++ b/packages/backend/src/server/api/endpoints/server-info.ts
@@ -1,7 +1,7 @@
 import * as os from "node:os";
 import si from "systeminformation";
 import define from "../define.js";
-import meilisearch from "../../../db/meilisearch";
+import meilisearch from "../../../db/meilisearch.js";
 
 export const meta = {
 	requireCredential: false,

From c7c21f5c16780ce4b76b6090b1eec2a738c7806f Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 25 May 2023 10:31:22 +0200
Subject: [PATCH 056/319] remove extra header

---
 packages/client/src/widgets/server-metric/meilisearch.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
index e45dceab0e..182896cc02 100644
--- a/packages/client/src/widgets/server-metric/meilisearch.vue
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -3,16 +3,11 @@
 		<div>
 			<p><i class="ph-file-search ph-bold ph-lg"></i>MeiliSearch</p>
 			<p>Server Status: {{ available }}</p>
-			<p>Total: {{ bytes(total_size, 1) }}</p>
+			<p>Total: {{ bytes(total_size, 2) }}</p>
 			<p>Posts Indexed: {{ index_count }}</p>
 		</div>
 	</div>
 	<br />
-	<div class="ms_stats">
-		<p>MeiliSearch</p>
-
-	</div>
-
 </template>
 
 <script lang="ts" setup>

From 03cd2de8ec286f1c5059550a5b2e1a075985cb99 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 25 May 2023 14:15:13 +0200
Subject: [PATCH 057/319] Add basic advanced search + attachment metadata hints

---
 packages/backend/src/db/meilisearch.ts | 46 ++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index f3561b8077..407565036e 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -3,7 +3,6 @@ import { dbLogger } from "./logger.js";
 
 import config from "@/config/index.js";
 import {Note} from "@/models/entities/note";
-import {normalizeForSearch} from "@/misc/normalize-for-search";
 
 const logger = dbLogger.createSubLogger("meilisearch", "gray", false);
 
@@ -16,7 +15,7 @@ const host = hasConfig ? config.meilisearch.host ?? "localhost" : "";
 const port = hasConfig ? config.meilisearch.port ?? 7700 : 0;
 const auth = hasConfig ? config.meilisearch.apiKey ?? "" : "";
 
-const client : MeiliSearch = new MeiliSearch({
+const client: MeiliSearch = new MeiliSearch({
 	host: `http://${host}:${port}`,
 	apiKey: auth,
 })
@@ -25,6 +24,8 @@ const posts = client.index('posts');
 
 posts.updateSearchableAttributes(['text']);
 
+posts.updateFilterableAttributes(["userId", "userHost", "mediaAttachment"])
+
 logger.info("Connected to MeiliSearch");
 
 
@@ -34,6 +35,7 @@ export type MeilisearchNote = {
 	userId: string;
 	userHost: string;
 	channelId: string;
+	mediaAttachment: string;
 }
 
 export default hasConfig ? {
@@ -42,14 +44,53 @@ export default hasConfig ? {
 		logger.info(`Limit: ${limit}`);
 		logger.info(`Offset: ${offset}`);
 
+		/// Advanced search syntax
+		/// from:user => filter by user + optional domain
+		/// has:image/video/audio/text/file => filter by attachment types
+		/// domain:domain.com => filter by domain
+
+		let constructedFilters: string[] = [];
+
+		let splitSearch = query.split(" ");
+		splitSearch.forEach(term => {
+			if (term.startsWith("has:")) {
+				let fileType = term.slice(4);
+				constructedFilters.push(`mediaAttachment = "${fileType}"`)
+			}
+			if (term.startsWith("from:")) {
+				let user = term.slice(5);
+				constructedFilters.push(`userId = ${user}`)
+			}
+			if (term.startsWith("domain:")) {
+				let domain = term.slice(7);
+				constructedFilters.push(`userHost = ${domain}`)
+			}
+		})
+
 		return posts.search(query, {
 			limit: limit,
 			offset: offset,
+			filter: constructedFilters
 		});
 	},
 	ingestNote: (note : Note) => {
 		logger.info("Indexing note in MeiliSearch: " + note.id);
 
+		let attachmentType = "";
+		if (note.attachedFileTypes.length > 0) {
+			attachmentType = note.attachedFileTypes[0].split("/")[0];
+			switch (attachmentType) {
+				case "image":
+				case "video":
+				case "audio":
+				case "text":
+					break;
+				default:
+					attachmentType = "file"
+					break
+			}
+		}
+
 		return posts.addDocuments([
 			{
 				id: note.id.toString(),
@@ -57,6 +98,7 @@ export default hasConfig ? {
 				userId: note.userId,
 				userHost: note.userHost,
 				channelId: note.channelId,
+				mediaAttachment: attachmentType
 			}
 		]);
 	},

From 9859060c59f0bafc589807497e5287aa860d2702 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 25 May 2023 22:29:47 +0200
Subject: [PATCH 058/319] Add createdAt column, fix username filtering, filter
 advanced search terms correctly

---
 packages/backend/src/db/meilisearch.ts | 43 ++++++++++++++++++++------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 407565036e..49b955672f 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -22,20 +22,21 @@ const client: MeiliSearch = new MeiliSearch({
 
 const posts = client.index('posts');
 
-posts.updateSearchableAttributes(['text']);
+posts.updateSearchableAttributes(['text']).catch((e) => logger.error(`Setting searchable attr failed, searches won't work: ${e}`));
 
-posts.updateFilterableAttributes(["userId", "userHost", "mediaAttachment"])
+posts.updateFilterableAttributes(["userName", "userHost", "mediaAttachment", "createdAt"]).catch((e) => logger.error(`Setting filterable attr failed, advanced searches won't work: ${e}`));
 
 logger.info("Connected to MeiliSearch");
 
-
 export type MeilisearchNote = {
 	id: string;
 	text: string;
 	userId: string;
 	userHost: string;
+	userName: string;
 	channelId: string;
 	mediaAttachment: string;
+	createdAt: number
 }
 
 export default hasConfig ? {
@@ -48,23 +49,43 @@ export default hasConfig ? {
 		/// from:user => filter by user + optional domain
 		/// has:image/video/audio/text/file => filter by attachment types
 		/// domain:domain.com => filter by domain
+		/// before:Date => show posts made before Date
+		/// after: Date => show posts made after Date
+
 
 		let constructedFilters: string[] = [];
 
 		let splitSearch = query.split(" ");
-		splitSearch.forEach(term => {
+
+		// Detect search operators and remove them from the actual query
+		splitSearch.filter(term => {
 			if (term.startsWith("has:")) {
 				let fileType = term.slice(4);
 				constructedFilters.push(`mediaAttachment = "${fileType}"`)
-			}
-			if (term.startsWith("from:")) {
+				return false;
+			} else if (term.startsWith("from:")) {
 				let user = term.slice(5);
-				constructedFilters.push(`userId = ${user}`)
-			}
-			if (term.startsWith("domain:")) {
+				constructedFilters.push(`userName = ${user}`)
+				return false;
+			} else if (term.startsWith("domain:")) {
 				let domain = term.slice(7);
 				constructedFilters.push(`userHost = ${domain}`)
+				return false;
+			} else if (term.startsWith("after:")) {
+				let timestamp = term.slice(6);
+				// Try to parse the timestamp as JavaScript Date
+				let date = Date.parse(timestamp);
+				if (isNaN(date)) return false;
+				constructedFilters.push(`createdAt > ${date}`)
+			} else if (term.startsWith("before:")) {
+				let timestamp = term.slice(7);
+				// Try to parse the timestamp as JavaScript Date
+				let date = Date.parse(timestamp);
+				if (isNaN(date)) return false;
+				constructedFilters.push(`createdAt < ${date}`)
 			}
+
+			return true;
 		})
 
 		return posts.search(query, {
@@ -98,7 +119,9 @@ export default hasConfig ? {
 				userId: note.userId,
 				userHost: note.userHost,
 				channelId: note.channelId,
-				mediaAttachment: attachmentType
+				mediaAttachment: attachmentType,
+				userName: note.user?.username,
+				createdAt: note.createdAt.getTime() / 1000 // division by 1000 is necessary because Node returns in ms-accuracy
 			}
 		]);
 	},

From e6371e4665703aba1a3af684378c85103340e35e Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 25 May 2023 22:37:43 +0200
Subject: [PATCH 059/319] Adjust search term logging + use filtered search
 query

---
 packages/backend/src/db/meilisearch.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 49b955672f..eecbf93e62 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -41,9 +41,6 @@ export type MeilisearchNote = {
 
 export default hasConfig ? {
 	search: (query : string, limit : number, offset : number) => {
-		logger.info(`Searching for ${query}`);
-		logger.info(`Limit: ${limit}`);
-		logger.info(`Offset: ${offset}`);
 
 		/// Advanced search syntax
 		/// from:user => filter by user + optional domain
@@ -88,7 +85,13 @@ export default hasConfig ? {
 			return true;
 		})
 
-		return posts.search(query, {
+		logger.info(`Searching for ${query}`);
+		logger.info(`Limit: ${limit}`);
+		logger.info(`Offset: ${offset}`);
+		logger.info(`Filters: ${constructedFilters}`)
+
+
+		return posts.search(splitSearch.join(" "), {
 			limit: limit,
 			offset: offset,
 			filter: constructedFilters

From 8d08bf3ee4429ff2fab2b2936a100d4c00a5f63f Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 25 May 2023 23:25:52 +0200
Subject: [PATCH 060/319] Add search operators to frontend

---
 packages/client/src/scripts/search.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/packages/client/src/scripts/search.ts b/packages/client/src/scripts/search.ts
index 36646d24f3..54b300e1d9 100644
--- a/packages/client/src/scripts/search.ts
+++ b/packages/client/src/scripts/search.ts
@@ -5,6 +5,13 @@ import { mainRouter } from "@/router";
 export async function search() {
 	const { canceled, result: query } = await os.inputText({
 		title: i18n.ts.search,
+		placeholder: "Enter search terms...",
+		text: "Advanced search operators\n" +
+			"from:user => filter by user\n" +
+			"has:image/video/audio/text/file => filter by attachment types\n" +
+			"domain:domain.com => filter by domain\n" +
+			"before:Date => show posts made before Date\n" +
+			"after:Date => show posts made after Date"
 	});
 	if (canceled || query == null || query === "") return;
 

From 5ae89a69bca2585c84868a32dd75fdcb8432ed8a Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 25 May 2023 23:49:52 +0200
Subject: [PATCH 061/319] Add high performance batch imports

---
 packages/backend/src/db/meilisearch.ts        | 66 +++++++++++--------
 .../processors/background/index-all-notes.ts  | 12 +++-
 packages/backend/src/services/note/create.ts  |  4 +-
 3 files changed, 50 insertions(+), 32 deletions(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index eecbf93e62..abd248e46e 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -97,36 +97,48 @@ export default hasConfig ? {
 			filter: constructedFilters
 		});
 	},
-	ingestNote: (note : Note) => {
-		logger.info("Indexing note in MeiliSearch: " + note.id);
-
-		let attachmentType = "";
-		if (note.attachedFileTypes.length > 0) {
-			attachmentType = note.attachedFileTypes[0].split("/")[0];
-			switch (attachmentType) {
-				case "image":
-				case "video":
-				case "audio":
-				case "text":
-					break;
-				default:
-					attachmentType = "file"
-					break
-			}
+	ingestNote: (note: Note | Note[]) => {
+		if (note instanceof Note) {
+			note = [note];
 		}
 
-		return posts.addDocuments([
-			{
-				id: note.id.toString(),
-				text: note.text,
-				userId: note.userId,
-				userHost: note.userHost,
-				channelId: note.channelId,
-				mediaAttachment: attachmentType,
-				userName: note.user?.username,
-				createdAt: note.createdAt.getTime() / 1000 // division by 1000 is necessary because Node returns in ms-accuracy
+		let indexingBatch: MeilisearchNote[] = [];
+
+		note.forEach(note => {
+
+			let attachmentType = "";
+			if (note.attachedFileTypes.length > 0) {
+				attachmentType = note.attachedFileTypes[0].split("/")[0];
+				switch (attachmentType) {
+					case "image":
+					case "video":
+					case "audio":
+					case "text":
+						break;
+					default:
+						attachmentType = "file"
+						break
+				}
 			}
-		]);
+
+			indexingBatch.push({
+					id: note.id.toString(),
+					text: note.text ? note.text : "",
+					userId: note.userId,
+					userHost: note.userHost ? note.userHost : "",
+					channelId: note.channelId ? note.channelId : "",
+					mediaAttachment: attachmentType,
+					userName: note.user?.username ? note.user.username : "",
+					createdAt: note.createdAt.getTime() / 1000 // division by 1000 is necessary because Node returns in ms-accuracy
+				}
+			)
+		});
+
+		let indexingIDs = indexingBatch.map(note => note.id);
+
+		logger.info("Indexing notes in MeiliSearch: " + indexingIDs.join(","));
+
+		return posts.addDocuments(indexingBatch);
 	},
 	serverStats: async () => {
 		let health : Health = await client.health();
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 03219199d9..9bed4eb731 100644
--- a/packages/backend/src/queue/processors/background/index-all-notes.ts
+++ b/packages/backend/src/queue/processors/background/index-all-notes.ts
@@ -4,7 +4,8 @@ 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";
+import {Note} from "@/models/entities/note.js";
+import meilisearch from "../../../db/meilisearch.js";
 
 const logger = queueLogger.createSubLogger("index-all-notes");
 
@@ -58,11 +59,16 @@ export default async function indexAllNotes(
 
 		for (let i = 0; i < notes.length; i += batch) {
 			const chunk = notes.slice(i, i + batch);
-			await Promise.all(chunk.map((note) => index(note)));
+
+			if (meilisearch) {
+				await meilisearch.ingestNote(chunk)
+			}
+
+			await Promise.all(chunk.map((note) => index(note, true)));
 
 			indexedCount += chunk.length;
 			const pct = (indexedCount / total) * 100;
-			job.update({ indexedCount, cursor, total });
+			job.update({indexedCount, cursor, total});
 			job.progress(+pct.toFixed(1));
 			logger.info(`Indexed notes ${indexedCount}/${total ? total : "?"}`);
 		}
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index f6285a61d2..bd54db7e24 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -749,7 +749,7 @@ async function insertNote(
 	}
 }
 
-export async function index(note: Note): Promise<void> {
+export async function index(note: Note, reindexing: boolean): Promise<void> {
 	if (!note.text) return;
 
 	if (config.elasticsearch && es) {
@@ -778,7 +778,7 @@ export async function index(note: Note): Promise<void> {
 		);
 	}
 
-	if (meilisearch) {
+	if (meilisearch && !reindexing) {
 		await meilisearch.ingestNote(note);
 	}
 }

From 856b05303bb6e1ad6fcc47ab7e1c5403fd9c222e Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 25 May 2023 23:53:08 +0200
Subject: [PATCH 062/319] Fix import

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

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index abd248e46e..d7b89bfc0c 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -2,7 +2,7 @@ import {Health, MeiliSearch, Stats } from 'meilisearch';
 import { dbLogger } from "./logger.js";
 
 import config from "@/config/index.js";
-import {Note} from "@/models/entities/note";
+import {Note} from "@/models/entities/note.js";
 
 const logger = dbLogger.createSubLogger("meilisearch", "gray", false);
 

From dae4f58e4cdc9ba72b0ffd191cd8c05c9a729968 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Fri, 26 May 2023 00:04:07 +0200
Subject: [PATCH 063/319] Specify primary key

---
 packages/backend/src/db/meilisearch.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index d7b89bfc0c..bd0514be01 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -138,7 +138,9 @@ export default hasConfig ? {
 
 		logger.info("Indexing notes in MeiliSearch: " + indexingIDs.join(","));
 
-		return posts.addDocuments(indexingBatch);
+		return posts.addDocuments(indexingBatch, {
+			primaryKey: "id"
+		});
 	},
 	serverStats: async () => {
 		let health : Health = await client.health();

From 62eef2fa677a45c64122dc91c77ececf0f468ce4 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Fri, 26 May 2023 00:33:02 +0200
Subject: [PATCH 064/319] Add parsing of host, fix usernames

---
 packages/backend/src/db/meilisearch.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index bd0514be01..c19e6b1eda 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -3,6 +3,7 @@ import { dbLogger } from "./logger.js";
 
 import config from "@/config/index.js";
 import {Note} from "@/models/entities/note.js";
+import * as url from "url";
 
 const logger = dbLogger.createSubLogger("meilisearch", "gray", false);
 
@@ -121,14 +122,14 @@ export default hasConfig ? {
 				}
 			}
 
-			indexingBatch.push({
+			indexingBatch.push(<MeilisearchNote>{
 					id: note.id.toString(),
 					text: note.text ? note.text : "",
 					userId: note.userId,
-					userHost: note.userHost ? note.userHost : "",
+					userHost: note.userHost !== "" ? note.userHost : url.parse(config.host).host,
 					channelId: note.channelId ? note.channelId : "",
 					mediaAttachment: attachmentType,
-					userName: note.user?.username ? note.user.username : "",
+					userName: note.user?.usernameLower ?? "UNKNOWN",
 					createdAt: note.createdAt.getTime() / 1000 // division by 1000 is necessary because Node returns in ms-accuracy
 				}
 			)

From d9ccf4310f1451d75ea1db68adfaaeaa0f228904 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Fri, 26 May 2023 02:07:34 +0200
Subject: [PATCH 065/319] Load relationships to populate user fields

---
 packages/backend/src/db/meilisearch.ts        | 26 +++++++++++++------
 .../processors/background/index-all-notes.ts  |  1 +
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index c19e6b1eda..acb16e4653 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -1,9 +1,12 @@
-import {Health, MeiliSearch, Stats } from 'meilisearch';
-import { dbLogger } from "./logger.js";
+import {Health, MeiliSearch, Stats} from 'meilisearch';
+import {dbLogger} from "./logger.js";
 
 import config from "@/config/index.js";
 import {Note} from "@/models/entities/note.js";
 import * as url from "url";
+import {User} from "@/models/entities/user.js";
+import {Users} from "@/models/index.js";
+
 
 const logger = dbLogger.createSubLogger("meilisearch", "gray", false);
 
@@ -98,14 +101,21 @@ export default hasConfig ? {
 			filter: constructedFilters
 		});
 	},
-	ingestNote: (note: Note | Note[]) => {
-		if (note instanceof Note) {
-			note = [note];
+	ingestNote: async (ingestNotes: Note | Note[]) => {
+		if (ingestNotes instanceof Note) {
+			ingestNotes = [ingestNotes];
 		}
 
 		let indexingBatch: MeilisearchNote[] = [];
 
-		note.forEach(note => {
+		for (let note of ingestNotes) {
+			if (note.user === undefined) {
+				let user = await Users.findOne({
+					where: {
+						id: note.userId
+					}
+				});
+			}
 
 			let attachmentType = "";
 			if (note.attachedFileTypes.length > 0) {
@@ -129,11 +139,11 @@ export default hasConfig ? {
 					userHost: note.userHost !== "" ? note.userHost : url.parse(config.host).host,
 					channelId: note.channelId ? note.channelId : "",
 					mediaAttachment: attachmentType,
-					userName: note.user?.usernameLower ?? "UNKNOWN",
+					userName: note.user?.username ?? "UNKNOWN",
 					createdAt: note.createdAt.getTime() / 1000 // division by 1000 is necessary because Node returns in ms-accuracy
 				}
 			)
-		});
+		}
 
 		let indexingIDs = indexingBatch.map(note => note.id);
 
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 9bed4eb731..919c29ff7f 100644
--- a/packages/backend/src/queue/processors/background/index-all-notes.ts
+++ b/packages/backend/src/queue/processors/background/index-all-notes.ts
@@ -39,6 +39,7 @@ export default async function indexAllNotes(
 				order: {
 					id: 1,
 				},
+				relations: ["user"]
 			});
 		} catch (e) {
 			logger.error(`Failed to query notes ${e}`);

From 1036ac4e8b8d696b309cf51ef559eb7a2389f8d1 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Fri, 26 May 2023 02:25:22 +0200
Subject: [PATCH 066/319] Actually assign user object to note

---
 packages/backend/src/db/meilisearch.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index acb16e4653..3d2e97692e 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -115,6 +115,7 @@ export default hasConfig ? {
 						id: note.userId
 					}
 				});
+				note.user = user;
 			}
 
 			let attachmentType = "";

From d0bd8b7d4c55f2bf75ed0ebedab391d2cf82326a Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Fri, 26 May 2023 02:31:10 +0200
Subject: [PATCH 067/319] .filter isn't in-place, now reassigning correctly

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

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 3d2e97692e..edd077c03f 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -59,7 +59,7 @@ export default hasConfig ? {
 		let splitSearch = query.split(" ");
 
 		// Detect search operators and remove them from the actual query
-		splitSearch.filter(term => {
+		splitSearch = splitSearch.filter(term => {
 			if (term.startsWith("has:")) {
 				let fileType = term.slice(4);
 				constructedFilters.push(`mediaAttachment = "${fileType}"`)

From 308d0a62a6e6c9f586915d055b90880534682dbc Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Fri, 26 May 2023 02:38:18 +0200
Subject: [PATCH 068/319] Correct logging statement + add missing returns

---
 packages/backend/src/db/meilisearch.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index edd077c03f..25cdc13d4b 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -78,18 +78,20 @@ export default hasConfig ? {
 				let date = Date.parse(timestamp);
 				if (isNaN(date)) return false;
 				constructedFilters.push(`createdAt > ${date}`)
+				return false;
 			} else if (term.startsWith("before:")) {
 				let timestamp = term.slice(7);
 				// Try to parse the timestamp as JavaScript Date
 				let date = Date.parse(timestamp);
 				if (isNaN(date)) return false;
 				constructedFilters.push(`createdAt < ${date}`)
+				return false;
 			}
 
 			return true;
 		})
 
-		logger.info(`Searching for ${query}`);
+		logger.info(`Searching for ${splitSearch.join(" ")}`);
 		logger.info(`Limit: ${limit}`);
 		logger.info(`Offset: ${offset}`);
 		logger.info(`Filters: ${constructedFilters}`)

From ecdec8320fac3931f1ab7069321c92af424ea81b Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Fri, 26 May 2023 02:46:05 +0200
Subject: [PATCH 069/319] Fix apiKey naming in config

---
 .config/example.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/example.yml b/.config/example.yml
index 7f83446a4d..0f2eecf90c 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -87,7 +87,7 @@ redis:
 #meilisearch:
 #  host: meilisearch
 #  port: 7700
-#  pass:
+#  apiKey:
 
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────

From f7a60544b234f629ac3335d9b9de0175d9a0c1e0 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Fri, 26 May 2023 02:51:17 +0200
Subject: [PATCH 070/319] Fix up dockerfile to use 1.0 meili

---
 docker-compose.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e1f9c7224b..9f503c4903 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     depends_on:
       - db
       - redis
-      - sonic
+      - meilisearch
     ports:
       - "3000:3000"
     networks:
@@ -42,15 +42,15 @@ services:
 
   meilisearch:
     container_name: meilisearch
-    image: getmeili/meilisearch:v0.25.2
+    image: getmeili/meilisearch:v1.1.1
     environment:
       - MEILI_ENV=${MEILI_ENV:-development}
     ports:
       - "7700:7700"
     networks:
-      - meilisearch
+      - calcnet
     volumes:
-      - ./data.ms:/data.ms
+      - ./meili_data:/meili_data
     restart: unless-stopped
 
 networks:

From 43813d12b5f7aef918e9e6c9beb56141264f6990 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@noreply.codeberg.org>
Date: Fri, 26 May 2023 01:06:41 +0000
Subject: [PATCH 071/319] Remove indexing logger

---
 packages/backend/src/db/meilisearch.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 25cdc13d4b..2364ac7ba8 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -150,8 +150,6 @@ export default hasConfig ? {
 
 		let indexingIDs = indexingBatch.map(note => note.id);
 
-		logger.info("Indexing notes in MeiliSearch: " + indexingIDs.join(","));
-
 		return posts.addDocuments(indexingBatch, {
 			primaryKey: "id"
 		});

From 274bfcd898231203671dd08457ad404878da48ac Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Fri, 26 May 2023 03:06:41 +0200
Subject: [PATCH 072/319] Lint + formatting

---
 packages/backend/src/daemons/server-stats.ts  |   2 +-
 packages/backend/src/db/meilisearch.ts        | 248 ++++++++++--------
 .../processors/background/index-all-notes.ts  |   8 +-
 .../src/server/api/endpoints/notes/search.ts  |   3 +-
 .../src/server/api/endpoints/server-info.ts   |   3 +-
 packages/client/src/scripts/search.ts         |   5 +-
 .../src/widgets/server-metric/index.vue       |   2 +-
 7 files changed, 144 insertions(+), 127 deletions(-)

diff --git a/packages/backend/src/daemons/server-stats.ts b/packages/backend/src/daemons/server-stats.ts
index 01b9cdcb4c..4227ce6ee2 100644
--- a/packages/backend/src/daemons/server-stats.ts
+++ b/packages/backend/src/daemons/server-stats.ts
@@ -41,7 +41,7 @@ export default function () {
 				r: round(Math.max(0, fsStats.rIO_sec ?? 0)),
 				w: round(Math.max(0, fsStats.wIO_sec ?? 0)),
 			},
-			meilisearch: meilisearchStats
+			meilisearch: meilisearchStats,
 		};
 		ev.emit("serverStats", stats);
 		log.unshift(stats);
diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 2364ac7ba8..75d584f8ad 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -1,4 +1,4 @@
-import {Health, MeiliSearch, Stats} from 'meilisearch';
+import {Health, MeiliSearch, Stats} from "meilisearch";
 import {dbLogger} from "./logger.js";
 
 import config from "@/config/index.js";
@@ -7,13 +7,15 @@ import * as url from "url";
 import {User} from "@/models/entities/user.js";
 import {Users} from "@/models/index.js";
 
-
 const logger = dbLogger.createSubLogger("meilisearch", "gray", false);
 
 logger.info("Connecting to MeiliSearch");
 
 const hasConfig =
-	config.meilisearch && (config.meilisearch.host || config.meilisearch.port || config.meilisearch.apiKey);
+	config.meilisearch &&
+	(config.meilisearch.host ||
+		config.meilisearch.port ||
+		config.meilisearch.apiKey);
 
 const host = hasConfig ? config.meilisearch.host ?? "localhost" : "";
 const port = hasConfig ? config.meilisearch.port ?? 7700 : 0;
@@ -22,13 +24,28 @@ const auth = hasConfig ? config.meilisearch.apiKey ?? "" : "";
 const client: MeiliSearch = new MeiliSearch({
 	host: `http://${host}:${port}`,
 	apiKey: auth,
-})
+});
 
-const posts = client.index('posts');
+const posts = client.index("posts");
 
-posts.updateSearchableAttributes(['text']).catch((e) => logger.error(`Setting searchable attr failed, searches won't work: ${e}`));
+posts
+	.updateSearchableAttributes(["text"])
+	.catch((e) =>
+		logger.error(`Setting searchable attr failed, searches won't work: ${e}`),
+	);
 
-posts.updateFilterableAttributes(["userName", "userHost", "mediaAttachment", "createdAt"]).catch((e) => logger.error(`Setting filterable attr failed, advanced searches won't work: ${e}`));
+posts
+	.updateFilterableAttributes([
+		"userName",
+		"userHost",
+		"mediaAttachment",
+		"createdAt",
+	])
+	.catch((e) =>
+		logger.error(
+			`Setting filterable attr failed, advanced searches won't work: ${e}`,
+		),
+	);
 
 logger.info("Connected to MeiliSearch");
 
@@ -40,128 +57,129 @@ export type MeilisearchNote = {
 	userName: string;
 	channelId: string;
 	mediaAttachment: string;
-	createdAt: number
-}
+	createdAt: number;
+};
 
-export default hasConfig ? {
-	search: (query : string, limit : number, offset : number) => {
+export default hasConfig
+	? {
+		search: (query: string, limit: number, offset: number) => {
+			/// Advanced search syntax
+			/// from:user => filter by user + optional domain
+			/// has:image/video/audio/text/file => filter by attachment types
+			/// domain:domain.com => filter by domain
+			/// before:Date => show posts made before Date
+			/// after: Date => show posts made after Date
 
-		/// Advanced search syntax
-		/// from:user => filter by user + optional domain
-		/// has:image/video/audio/text/file => filter by attachment types
-		/// domain:domain.com => filter by domain
-		/// before:Date => show posts made before Date
-		/// after: Date => show posts made after Date
+			let constructedFilters: string[] = [];
 
+			let splitSearch = query.split(" ");
 
-		let constructedFilters: string[] = [];
-
-		let splitSearch = query.split(" ");
-
-		// Detect search operators and remove them from the actual query
-		splitSearch = splitSearch.filter(term => {
-			if (term.startsWith("has:")) {
-				let fileType = term.slice(4);
-				constructedFilters.push(`mediaAttachment = "${fileType}"`)
-				return false;
-			} else if (term.startsWith("from:")) {
-				let user = term.slice(5);
-				constructedFilters.push(`userName = ${user}`)
-				return false;
-			} else if (term.startsWith("domain:")) {
-				let domain = term.slice(7);
-				constructedFilters.push(`userHost = ${domain}`)
-				return false;
-			} else if (term.startsWith("after:")) {
-				let timestamp = term.slice(6);
-				// Try to parse the timestamp as JavaScript Date
-				let date = Date.parse(timestamp);
-				if (isNaN(date)) return false;
-				constructedFilters.push(`createdAt > ${date}`)
-				return false;
-			} else if (term.startsWith("before:")) {
-				let timestamp = term.slice(7);
-				// Try to parse the timestamp as JavaScript Date
-				let date = Date.parse(timestamp);
-				if (isNaN(date)) return false;
-				constructedFilters.push(`createdAt < ${date}`)
-				return false;
-			}
-
-			return true;
-		})
-
-		logger.info(`Searching for ${splitSearch.join(" ")}`);
-		logger.info(`Limit: ${limit}`);
-		logger.info(`Offset: ${offset}`);
-		logger.info(`Filters: ${constructedFilters}`)
-
-
-		return posts.search(splitSearch.join(" "), {
-			limit: limit,
-			offset: offset,
-			filter: constructedFilters
-		});
-	},
-	ingestNote: async (ingestNotes: Note | Note[]) => {
-		if (ingestNotes instanceof Note) {
-			ingestNotes = [ingestNotes];
-		}
-
-		let indexingBatch: MeilisearchNote[] = [];
-
-		for (let note of ingestNotes) {
-			if (note.user === undefined) {
-				let user = await Users.findOne({
-					where: {
-						id: note.userId
-					}
-				});
-				note.user = user;
-			}
-
-			let attachmentType = "";
-			if (note.attachedFileTypes.length > 0) {
-				attachmentType = note.attachedFileTypes[0].split("/")[0];
-				switch (attachmentType) {
-					case "image":
-					case "video":
-					case "audio":
-					case "text":
-						break;
-					default:
-						attachmentType = "file"
-						break
+			// Detect search operators and remove them from the actual query
+			splitSearch = splitSearch.filter((term) => {
+				if (term.startsWith("has:")) {
+					let fileType = term.slice(4);
+					constructedFilters.push(`mediaAttachment = "${fileType}"`);
+					return false;
+				} else if (term.startsWith("from:")) {
+					let user = term.slice(5);
+					constructedFilters.push(`userName = ${user}`);
+					return false;
+				} else if (term.startsWith("domain:")) {
+					let domain = term.slice(7);
+					constructedFilters.push(`userHost = ${domain}`);
+					return false;
+				} else if (term.startsWith("after:")) {
+					let timestamp = term.slice(6);
+					// Try to parse the timestamp as JavaScript Date
+					let date = Date.parse(timestamp);
+					if (isNaN(date)) return false;
+					constructedFilters.push(`createdAt > ${date}`);
+					return false;
+				} else if (term.startsWith("before:")) {
+					let timestamp = term.slice(7);
+					// Try to parse the timestamp as JavaScript Date
+					let date = Date.parse(timestamp);
+					if (isNaN(date)) return false;
+					constructedFilters.push(`createdAt < ${date}`);
+					return false;
 				}
+
+				return true;
+			});
+
+			logger.info(`Searching for ${splitSearch.join(" ")}`);
+			logger.info(`Limit: ${limit}`);
+			logger.info(`Offset: ${offset}`);
+			logger.info(`Filters: ${constructedFilters}`);
+
+			return posts.search(splitSearch.join(" "), {
+				limit: limit,
+				offset: offset,
+				filter: constructedFilters,
+			});
+		},
+		ingestNote: async (ingestNotes: Note | Note[]) => {
+			if (ingestNotes instanceof Note) {
+				ingestNotes = [ingestNotes];
 			}
 
-			indexingBatch.push(<MeilisearchNote>{
+			let indexingBatch: MeilisearchNote[] = [];
+
+			for (let note of ingestNotes) {
+				if (note.user === undefined) {
+					let user = await Users.findOne({
+						where: {
+							id: note.userId,
+						},
+					});
+					note.user = user;
+				}
+
+				let attachmentType = "";
+				if (note.attachedFileTypes.length > 0) {
+					attachmentType = note.attachedFileTypes[0].split("/")[0];
+					switch (attachmentType) {
+						case "image":
+						case "video":
+						case "audio":
+						case "text":
+							break;
+						default:
+							attachmentType = "file";
+							break;
+					}
+				}
+
+				indexingBatch.push(<MeilisearchNote>{
 					id: note.id.toString(),
 					text: note.text ? note.text : "",
 					userId: note.userId,
-					userHost: note.userHost !== "" ? note.userHost : url.parse(config.host).host,
+					userHost:
+						note.userHost !== ""
+							? note.userHost
+							: url.parse(config.host).host,
 					channelId: note.channelId ? note.channelId : "",
 					mediaAttachment: attachmentType,
 					userName: note.user?.username ?? "UNKNOWN",
-					createdAt: note.createdAt.getTime() / 1000 // division by 1000 is necessary because Node returns in ms-accuracy
-				}
-			)
-		}
+					createdAt: note.createdAt.getTime() / 1000, // division by 1000 is necessary because Node returns in ms-accuracy
+				});
+			}
 
-		let indexingIDs = indexingBatch.map(note => note.id);
+			let indexingIDs = indexingBatch.map((note) => note.id);
 
-		return posts.addDocuments(indexingBatch, {
-			primaryKey: "id"
-		});
-	},
-	serverStats: async () => {
-		let health : Health = await client.health();
-		let stats: Stats = await client.getStats();
+			return posts.addDocuments(indexingBatch, {
+				primaryKey: "id",
+			});
+		},
+		serverStats: async () => {
+			let health: Health = await client.health();
+			let stats: Stats = await client.getStats();
 
-		return {
-			health: health.status,
-			size: stats.databaseSize,
-			indexed_count: stats.indexes["posts"].numberOfDocuments
-		}
+			return {
+				health: health.status,
+				size: stats.databaseSize,
+				indexed_count: stats.indexes["posts"].numberOfDocuments,
+			};
+		},
 	}
-} : null;
+	: null;
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 919c29ff7f..9bc53d2d36 100644
--- a/packages/backend/src/queue/processors/background/index-all-notes.ts
+++ b/packages/backend/src/queue/processors/background/index-all-notes.ts
@@ -3,7 +3,7 @@ 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";
 import meilisearch from "../../../db/meilisearch.js";
 
@@ -33,13 +33,13 @@ export default async function indexAllNotes(
 		try {
 			notes = await Notes.find({
 				where: {
-					...(cursor ? { id: MoreThan(cursor) } : {}),
+					...(cursor ? {id: MoreThan(cursor)} : {}),
 				},
 				take: take,
 				order: {
 					id: 1,
 				},
-				relations: ["user"]
+				relations: ["user"],
 			});
 		} catch (e) {
 			logger.error(`Failed to query notes ${e}`);
@@ -62,7 +62,7 @@ export default async function indexAllNotes(
 			const chunk = notes.slice(i, i + batch);
 
 			if (meilisearch) {
-				await meilisearch.ingestNote(chunk)
+				await meilisearch.ingestNote(chunk);
 			}
 
 			await Promise.all(chunk.map((note) => index(note, true)));
diff --git a/packages/backend/src/server/api/endpoints/notes/search.ts b/packages/backend/src/server/api/endpoints/notes/search.ts
index 425414561b..60f2647084 100644
--- a/packages/backend/src/server/api/endpoints/notes/search.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search.ts
@@ -172,7 +172,7 @@ export default define(meta, paramDef, async (ps, me) => {
 		}
 
 		return found;
-	} else if(meilisearch) {
+	} else if (meilisearch) {
 		let start = 0;
 		const chunkSize = 100;
 
@@ -236,7 +236,6 @@ export default define(meta, paramDef, async (ps, me) => {
 		}
 
 		return found;
-
 	} else {
 		const userQuery =
 			ps.userId != null
diff --git a/packages/backend/src/server/api/endpoints/server-info.ts b/packages/backend/src/server/api/endpoints/server-info.ts
index 3411ba416d..5ba920301c 100644
--- a/packages/backend/src/server/api/endpoints/server-info.ts
+++ b/packages/backend/src/server/api/endpoints/server-info.ts
@@ -34,8 +34,7 @@ export default define(meta, paramDef, async () => {
 			total: fsStats[0].size,
 			used: fsStats[0].used,
 		},
-		meilisearch: meilisearchStats
-
+		meilisearch: meilisearchStats,
 	};
 });
 
diff --git a/packages/client/src/scripts/search.ts b/packages/client/src/scripts/search.ts
index 54b300e1d9..15f916cfc1 100644
--- a/packages/client/src/scripts/search.ts
+++ b/packages/client/src/scripts/search.ts
@@ -6,12 +6,13 @@ export async function search() {
 	const { canceled, result: query } = await os.inputText({
 		title: i18n.ts.search,
 		placeholder: "Enter search terms...",
-		text: "Advanced search operators\n" +
+		text:
+			"Advanced search operators\n" +
 			"from:user => filter by user\n" +
 			"has:image/video/audio/text/file => filter by attachment types\n" +
 			"domain:domain.com => filter by domain\n" +
 			"before:Date => show posts made before Date\n" +
-			"after:Date => show posts made after Date"
+			"after:Date => show posts made after Date",
 	});
 	if (canceled || query == null || query === "") return;
 
diff --git a/packages/client/src/widgets/server-metric/index.vue b/packages/client/src/widgets/server-metric/index.vue
index 8d36819b5a..1eb9f56b8a 100644
--- a/packages/client/src/widgets/server-metric/index.vue
+++ b/packages/client/src/widgets/server-metric/index.vue
@@ -61,7 +61,7 @@ import XNet from "./net.vue";
 import XCpu from "./cpu.vue";
 import XMemory from "./mem.vue";
 import XDisk from "./disk.vue";
-import XMeili from "./meilisearch.vue"
+import XMeili from "./meilisearch.vue";
 import MkContainer from "@/components/MkContainer.vue";
 import { GetFormResultType } from "@/scripts/form";
 import * as os from "@/os";

From 56ddb0555b169f8013562a2ccdffbab769d24ee5 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Fri, 26 May 2023 10:05:46 +0200
Subject: [PATCH 073/319] add sonic back to compose

---
 docker-compose.yml | 42 +++++++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 9f503c4903..bf4e4fb8da 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,21 +40,33 @@ services:
     volumes:
       - ./db:/var/lib/postgresql/data
 
-  meilisearch:
-    container_name: meilisearch
-    image: getmeili/meilisearch:v1.1.1
-    environment:
-      - MEILI_ENV=${MEILI_ENV:-development}
-    ports:
-      - "7700:7700"
-    networks:
-      - calcnet
-    volumes:
-      - ./meili_data:/meili_data
-    restart: unless-stopped
+### Only one of the below should be used.
+### Meilisearch is better overall, but resource-intensive. Sonic is a very light full text search engine.
+
+#  meilisearch:
+#    container_name: meilisearch
+#    image: getmeili/meilisearch:v1.1.1
+#    environment:
+#      - MEILI_ENV=${MEILI_ENV:-development}
+#    ports:
+#      - "7700:7700"
+#    networks:
+#      - calcnet
+#    volumes:
+#      - ./meili_data:/meili_data
+#    restart: unless-stopped
+
+#  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:
-    #  web:
-    #    external:
-    #      name: web
+  #  web:
+  #    external:
+  #      name: web

From 8549b66a3942f440fe5eb70a204286ddc10461f3 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Fri, 26 May 2023 10:12:52 +0200
Subject: [PATCH 074/319] Add ssl option to MeiliSearch config

---
 .config/example.yml                    | 1 +
 packages/backend/src/config/types.ts   | 2 +-
 packages/backend/src/db/meilisearch.ts | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.config/example.yml b/.config/example.yml
index 0f2eecf90c..3b35778fae 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -87,6 +87,7 @@ redis:
 #meilisearch:
 #  host: meilisearch
 #  port: 7700
+#  ssl: false
 #  apiKey:
 
 #   ┌───────────────┐
diff --git a/packages/backend/src/config/types.ts b/packages/backend/src/config/types.ts
index b6a449f549..e61ef85ae9 100644
--- a/packages/backend/src/config/types.ts
+++ b/packages/backend/src/config/types.ts
@@ -39,11 +39,11 @@ export type Source = {
 		collection?: string;
 		bucket?: string;
 	};
-
 	meilisearch: {
 		host: string;
 		port: number;
 		apiKey?: string;
+		ssl: boolean
 	};
 
 	proxy?: string;
diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 75d584f8ad..a58425c548 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -20,9 +20,10 @@ const hasConfig =
 const host = hasConfig ? config.meilisearch.host ?? "localhost" : "";
 const port = hasConfig ? config.meilisearch.port ?? 7700 : 0;
 const auth = hasConfig ? config.meilisearch.apiKey ?? "" : "";
+const ssl = hasConfig ? config.meilisearch.ssl ?? false : false;
 
 const client: MeiliSearch = new MeiliSearch({
-	host: `http://${host}:${port}`,
+	host: `${ssl ? "https" : "http"}://${host}:${port}`,
 	apiKey: auth,
 });
 

From 8790ac4a119cbf3ad66c9d50b45e71d34e80f854 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Fri, 26 May 2023 10:41:16 +0200
Subject: [PATCH 075/319] Remove stray newline

---
 packages/client/src/widgets/server-metric/disk.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/client/src/widgets/server-metric/disk.vue b/packages/client/src/widgets/server-metric/disk.vue
index 99191e62ad..67ea398c16 100644
--- a/packages/client/src/widgets/server-metric/disk.vue
+++ b/packages/client/src/widgets/server-metric/disk.vue
@@ -8,7 +8,6 @@
 			<p>Used: {{ bytes(used, 1) }}</p>
 		</div>
 	</div>
-	<br />
 </template>
 
 <script lang="ts" setup>

From 7e1e42bc473d1c16e4cc68364e9c7ad859fa7d36 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Fri, 26 May 2023 10:41:33 +0200
Subject: [PATCH 076/319] Pin meilisearch library

---
 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 968b0af80c..10153116f3 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -85,7 +85,7 @@
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
-		"meilisearch": "^0.32.4",
+		"meilisearch": "0.32.4",
 		"mfm-js": "0.23.3",
 		"mime-types": "2.1.35",
 		"multer": "1.4.4-lts.1",

From 5dd106e95623cbae53faf9a1639f9d2b79fc8ff8 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Fri, 26 May 2023 10:51:11 +0200
Subject: [PATCH 077/319] i18n strings

---
 locales/en-US.yml                             |  5 +
 packages/client/src/scripts/search.ts         |  2 +-
 .../src/widgets/server-metric/meilisearch.vue | 93 ++++++++++---------
 3 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 6fe8bccfc9..e134a05914 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -5,6 +5,7 @@ introMisskey: "Welcome! Calckey is an open source, decentralized social media pl
   \ that's free forever! \U0001F680"
 monthAndDay: "{month}/{day}"
 search: "Search"
+search_placeholder: "Enter search terms..."
 notifications: "Notifications"
 username: "Username"
 password: "Password"
@@ -1548,6 +1549,10 @@ _widgets:
   userList: "User list"
   _userList:
     chooseList: "Select a list"
+  meiliStatus: "Server Status"
+  meiliSize: "Index size"
+  meiliIndexCount: "Indexed posts"
+
 _cw:
   hide: "Hide"
   show: "Show content"
diff --git a/packages/client/src/scripts/search.ts b/packages/client/src/scripts/search.ts
index 15f916cfc1..c7b8582acc 100644
--- a/packages/client/src/scripts/search.ts
+++ b/packages/client/src/scripts/search.ts
@@ -5,7 +5,7 @@ import { mainRouter } from "@/router";
 export async function search() {
 	const { canceled, result: query } = await os.inputText({
 		title: i18n.ts.search,
-		placeholder: "Enter search terms...",
+		placeholder: i18n.ts.search_placeholder,
 		text:
 			"Advanced search operators\n" +
 			"from:user => filter by user\n" +
diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
index 182896cc02..cb50c03018 100644
--- a/packages/client/src/widgets/server-metric/meilisearch.vue
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -1,46 +1,47 @@
-<template>
-	<div class="ms_stats">
-		<div>
-			<p><i class="ph-file-search ph-bold ph-lg"></i>MeiliSearch</p>
-			<p>Server Status: {{ available }}</p>
-			<p>Total: {{ bytes(total_size, 2) }}</p>
-			<p>Posts Indexed: {{ index_count }}</p>
-		</div>
-	</div>
-	<br />
-</template>
-
-<script lang="ts" setup>
-import {} from "vue";
-import bytes from "@/filters/bytes";
-
-const props = defineProps<{
-	meta: any; // TODO
-}>();
-
-const total_size = $computed(() => props.meta.meilisearch.size);
-const index_count = $computed(() => props.meta.meilisearch.indexed_count);
-const available = $computed(() => props.meta.meilisearch.health);
-</script>
-
-<style lang="scss" scoped>
-.ms_stats {
-	padding: 16px;
-
-	> div {
-		> p {
-			margin: 0;
-			font-size: 0.8em;
-
-			&:first-child {
-				font-weight: bold;
-				margin-bottom: 4px;
-
-				> i {
-					margin-right: 4px;
-				}
-			}
-		}
-	}
-}
-</style>
+<template>
+	<div class="ms_stats">
+		<div>
+			<p><i class="ph-file-search ph-bold ph-lg"></i>MeiliSearch</p>
+			<p>{{ i18n.ts._widgets.meiliStatus }}: {{ available }}</p>
+			<p>{{ i18n.ts._widgets.meiliSize }}: {{ bytes(total_size, 2) }}</p>
+			<p>{{ i18n.ts._widgets.meiliIndexCount }}: {{ index_count }}</p>
+		</div>
+	</div>
+	<br />
+</template>
+
+<script lang="ts" setup>
+import {} from "vue";
+import bytes from "@/filters/bytes";
+import {i18n} from "@/i18n";
+
+const props = defineProps<{
+	meta: any; // TODO
+}>();
+
+const total_size = $computed(() => props.meta.meilisearch.size);
+const index_count = $computed(() => props.meta.meilisearch.indexed_count);
+const available = $computed(() => props.meta.meilisearch.health);
+</script>
+
+<style lang="scss" scoped>
+.ms_stats {
+	padding: 16px;
+
+	> div {
+		> p {
+			margin: 0;
+			font-size: 0.8em;
+
+			&:first-child {
+				font-weight: bold;
+				margin-bottom: 4px;
+
+				> i {
+					margin-right: 4px;
+				}
+			}
+		}
+	}
+}
+</style>

From a9889721ec13d903f0efea5e9289647c208f4c39 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Fri, 26 May 2023 10:55:51 +0200
Subject: [PATCH 078/319] Default meilisearch data response + linting +
 prettyfier

---
 packages/backend/src/daemons/server-stats.ts               | 6 +++++-
 .../src/queue/processors/background/index-all-notes.ts     | 6 +++---
 packages/backend/src/server/api/endpoints/server-info.ts   | 7 +++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/daemons/server-stats.ts b/packages/backend/src/daemons/server-stats.ts
index 4227ce6ee2..2f1dd42ae3 100644
--- a/packages/backend/src/daemons/server-stats.ts
+++ b/packages/backend/src/daemons/server-stats.ts
@@ -85,6 +85,10 @@ async function meilisearchStatus() {
 	if (meilisearch) {
 		return meilisearch.serverStats();
 	} else {
-		return null;
+		return {
+			health: "unconfigured",
+			size: 0,
+			indexed_count: 0,
+		};
 	}
 }
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 9bc53d2d36..646984c938 100644
--- a/packages/backend/src/queue/processors/background/index-all-notes.ts
+++ b/packages/backend/src/queue/processors/background/index-all-notes.ts
@@ -1,8 +1,8 @@
 import type Bull from "bull";
 
-import { queueLogger } from "../../logger.js";
-import { Notes } from "@/models/index.js";
-import { MoreThan } from "typeorm";
+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";
 import meilisearch from "../../../db/meilisearch.js";
diff --git a/packages/backend/src/server/api/endpoints/server-info.ts b/packages/backend/src/server/api/endpoints/server-info.ts
index 5ba920301c..cc9aa91b2a 100644
--- a/packages/backend/src/server/api/endpoints/server-info.ts
+++ b/packages/backend/src/server/api/endpoints/server-info.ts
@@ -34,7 +34,6 @@ export default define(meta, paramDef, async () => {
 			total: fsStats[0].size,
 			used: fsStats[0].used,
 		},
-		meilisearch: meilisearchStats,
 	};
 });
 
@@ -42,6 +41,10 @@ async function meilisearchStatus() {
 	if (meilisearch) {
 		return meilisearch.serverStats();
 	} else {
-		return null;
+		return {
+			health: "unconfigured",
+			size: 0,
+			indexed_count: 0,
+		};
 	}
 }

From b6638a7862d3f042fafecce3a7d34fc60445a5ba Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Fri, 26 May 2023 10:56:14 +0200
Subject: [PATCH 079/319] add semicolon after property

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

diff --git a/packages/backend/src/config/types.ts b/packages/backend/src/config/types.ts
index e61ef85ae9..da0f5571ec 100644
--- a/packages/backend/src/config/types.ts
+++ b/packages/backend/src/config/types.ts
@@ -43,7 +43,7 @@ export type Source = {
 		host: string;
 		port: number;
 		apiKey?: string;
-		ssl: boolean
+		ssl: boolean;
 	};
 
 	proxy?: string;

From 0d414224236bbad5d64d70b5ce4c5d9041d8a953 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Sun, 28 May 2023 02:15:13 +0200
Subject: [PATCH 080/319] Implement follower and following searches

---
 packages/backend/src/db/meilisearch.ts        | 164 +++++++++++++-----
 .../src/server/api/endpoints/notes/search.ts  |   2 +-
 2 files changed, 123 insertions(+), 43 deletions(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index a58425c548..5d294b95dd 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -4,8 +4,8 @@ import {dbLogger} from "./logger.js";
 import config from "@/config/index.js";
 import {Note} from "@/models/entities/note.js";
 import * as url from "url";
-import {User} from "@/models/entities/user.js";
-import {Users} from "@/models/index.js";
+import {ILocalUser, User} from "@/models/entities/user.js";
+import {Followings, Users} from "@/models/index.js";
 
 const logger = dbLogger.createSubLogger("meilisearch", "gray", false);
 
@@ -41,6 +41,7 @@ posts
 		"userHost",
 		"mediaAttachment",
 		"createdAt",
+		"userId",
 	])
 	.catch((e) =>
 		logger.error(
@@ -48,6 +49,14 @@ posts
 		),
 	);
 
+posts
+	.updateSortableAttributes(["createdAt"])
+	.catch((e) =>
+		logger.error(
+			`Setting sortable attr failed, placeholder searches won't sort properly: ${e}`,
+		),
+	);
+
 logger.info("Connected to MeiliSearch");
 
 export type MeilisearchNote = {
@@ -63,60 +72,130 @@ export type MeilisearchNote = {
 
 export default hasConfig
 	? {
-		search: (query: string, limit: number, offset: number) => {
+		search: async (
+			query: string,
+			limit: number,
+			offset: number,
+			userCtx: ILocalUser | null,
+		) => {
 			/// Advanced search syntax
 			/// from:user => filter by user + optional domain
 			/// has:image/video/audio/text/file => filter by attachment types
 			/// domain:domain.com => filter by domain
 			/// before:Date => show posts made before Date
 			/// after: Date => show posts made after Date
+			/// "text" => get posts with exact text between quotes
+			/// filter:following => show results only from users you follow
+			/// filter:followers => show results only from followers
 
 			let constructedFilters: string[] = [];
 
 			let splitSearch = query.split(" ");
 
 			// Detect search operators and remove them from the actual query
-			splitSearch = splitSearch.filter((term) => {
-				if (term.startsWith("has:")) {
-					let fileType = term.slice(4);
-					constructedFilters.push(`mediaAttachment = "${fileType}"`);
-					return false;
-				} else if (term.startsWith("from:")) {
-					let user = term.slice(5);
-					constructedFilters.push(`userName = ${user}`);
-					return false;
-				} else if (term.startsWith("domain:")) {
-					let domain = term.slice(7);
-					constructedFilters.push(`userHost = ${domain}`);
-					return false;
-				} else if (term.startsWith("after:")) {
-					let timestamp = term.slice(6);
-					// Try to parse the timestamp as JavaScript Date
-					let date = Date.parse(timestamp);
-					if (isNaN(date)) return false;
-					constructedFilters.push(`createdAt > ${date}`);
-					return false;
-				} else if (term.startsWith("before:")) {
-					let timestamp = term.slice(7);
-					// Try to parse the timestamp as JavaScript Date
-					let date = Date.parse(timestamp);
-					if (isNaN(date)) return false;
-					constructedFilters.push(`createdAt < ${date}`);
-					return false;
-				}
+			let filteredSearchTerms = (
+				await Promise.all(
+					splitSearch.map(async (term) => {
+						if (term.startsWith("has:")) {
+							let fileType = term.slice(4);
+							constructedFilters.push(`mediaAttachment = "${fileType}"`);
+							return null;
+						} else if (term.startsWith("from:")) {
+							let user = term.slice(5);
+							constructedFilters.push(`userName = ${user}`);
+							return null;
+						} else if (term.startsWith("domain:")) {
+							let domain = term.slice(7);
+							constructedFilters.push(`userHost = ${domain}`);
+							return null;
+						} else if (term.startsWith("after:")) {
+							let timestamp = term.slice(6);
+							// Try to parse the timestamp as JavaScript Date
+							let date = Date.parse(timestamp);
+							if (isNaN(date)) return null;
+							constructedFilters.push(`createdAt > ${date / 1000}`);
+							return null;
+						} else if (term.startsWith("before:")) {
+							let timestamp = term.slice(7);
+							// Try to parse the timestamp as JavaScript Date
+							let date = Date.parse(timestamp);
+							if (isNaN(date)) return null;
+							constructedFilters.push(`createdAt < ${date / 1000}`);
+							return null;
+						} else if (term.startsWith("filter:following")) {
+							// Check if we got a context user
+							if (userCtx) {
+								// Fetch user follows from DB
+								let followedUsers = await Followings.find({
+									where: {
+										followerId: userCtx.id,
+									},
+									select: {
+										followeeId: true,
+									},
+								});
+								let followIDs = followedUsers.map((user) => user.followeeId);
 
-				return true;
-			});
+								if (followIDs.length === 0) return null;
 
-			logger.info(`Searching for ${splitSearch.join(" ")}`);
+								constructedFilters.push(`userId IN [${followIDs.join(",")}]`);
+							} else {
+								logger.warn(
+									"search filtered to follows called without user context",
+								);
+							}
+
+							return null;
+						} else if (term.startsWith("filter:followers")) {
+							// Check if we got a context user
+							if (userCtx) {
+								// Fetch users follows from DB
+								let followedUsers = await Followings.find({
+									where: {
+										followeeId: userCtx.id,
+									},
+									select: {
+										followerId: true,
+									},
+								});
+								let followIDs = followedUsers.map((user) => user.followerId);
+
+								if (followIDs.length === 0) return null;
+
+								constructedFilters.push(`userId IN [${followIDs.join(",")}]`);
+							} else {
+								logger.warn(
+									"search filtered to followers called without user context",
+								);
+							}
+
+							return null;
+						}
+
+						return term;
+					}),
+				)
+			).filter((term) => term !== null);
+
+			let sortRules = [];
+
+			// An empty search term with defined filters means we have a placeholder search => https://www.meilisearch.com/docs/reference/api/search#placeholder-search
+			// These have to be ordered manually, otherwise the *oldest* posts are returned first, which we don't want
+			if (filteredSearchTerms.length === 0 && constructedFilters.length > 0) {
+				sortRules.push("createdAt:desc");
+			}
+
+			logger.info(`Searching for ${filteredSearchTerms.join(" ")}`);
 			logger.info(`Limit: ${limit}`);
 			logger.info(`Offset: ${offset}`);
 			logger.info(`Filters: ${constructedFilters}`);
+			logger.info(`Ordering: ${sortRules}`);
 
-			return posts.search(splitSearch.join(" "), {
+			return posts.search(filteredSearchTerms.join(" "), {
 				limit: limit,
 				offset: offset,
 				filter: constructedFilters,
+				sort: sortRules,
 			});
 		},
 		ingestNote: async (ingestNotes: Note | Note[]) => {
@@ -128,12 +207,11 @@ export default hasConfig
 
 			for (let note of ingestNotes) {
 				if (note.user === undefined) {
-					let user = await Users.findOne({
+					note.user = await Users.findOne({
 						where: {
 							id: note.userId,
 						},
 					});
-					note.user = user;
 				}
 
 				let attachmentType = "";
@@ -166,11 +244,13 @@ export default hasConfig
 				});
 			}
 
-			let indexingIDs = indexingBatch.map((note) => note.id);
-
-			return posts.addDocuments(indexingBatch, {
-				primaryKey: "id",
-			});
+			return posts
+				.addDocuments(indexingBatch, {
+					primaryKey: "id",
+				})
+				.then(() =>
+					console.log(`sent ${indexingBatch.length} posts for indexing`),
+				);
 		},
 		serverStats: async () => {
 			let health: Health = await client.health();
diff --git a/packages/backend/src/server/api/endpoints/notes/search.ts b/packages/backend/src/server/api/endpoints/notes/search.ts
index 60f2647084..3463044701 100644
--- a/packages/backend/src/server/api/endpoints/notes/search.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search.ts
@@ -179,7 +179,7 @@ export default define(meta, paramDef, async (ps, me) => {
 		// Use meilisearch to fetch and step through all search results that could match the requirements
 		const ids = [];
 		while (true) {
-			const results = await meilisearch.search(ps.query, chunkSize, start);
+			const results = await meilisearch.search(ps.query, chunkSize, start, me);
 
 			start += chunkSize;
 

From 9beda9d3621500b1a15ba4a8b4257298a660d2d9 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Sun, 28 May 2023 02:19:57 +0200
Subject: [PATCH 081/319] add advanced search parameters in search popup

---
 packages/client/src/scripts/search.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/scripts/search.ts b/packages/client/src/scripts/search.ts
index c7b8582acc..e405115bfb 100644
--- a/packages/client/src/scripts/search.ts
+++ b/packages/client/src/scripts/search.ts
@@ -12,7 +12,10 @@ export async function search() {
 			"has:image/video/audio/text/file => filter by attachment types\n" +
 			"domain:domain.com => filter by domain\n" +
 			"before:Date => show posts made before Date\n" +
-			"after:Date => show posts made after Date",
+			"after:Date => show posts made after Date\n" +
+			'"text" => get posts with exact text between quotes\n' +
+			"filter:following => show results only from users you follow\n" +
+			"filter:followers => show results only from followers\n",
 	});
 	if (canceled || query == null || query === "") return;
 

From 4fdf331f636db75272d7ab963998fe62c8c173aa Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Sun, 28 May 2023 02:58:20 +0200
Subject: [PATCH 082/319] Fix Meilisearch widget reactivity

---
 .../src/widgets/server-metric/meilisearch.vue | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
index cb50c03018..48bf629b0d 100644
--- a/packages/client/src/widgets/server-metric/meilisearch.vue
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -11,17 +11,32 @@
 </template>
 
 <script lang="ts" setup>
-import {} from "vue";
+import {onBeforeUnmount, onMounted} from "vue";
 import bytes from "@/filters/bytes";
 import {i18n} from "@/i18n";
 
 const props = defineProps<{
-	meta: any; // TODO
+	connection: any;
+	meta: any;
 }>();
 
-const total_size = $computed(() => props.meta.meilisearch.size);
-const index_count = $computed(() => props.meta.meilisearch.indexed_count);
-const available = $computed(() => props.meta.meilisearch.health);
+let total_size: number = $ref(0);
+let index_count: number = $ref(0);
+let available: string = $ref("unavailable");
+
+function onStats(stats) {
+	total_size = stats.meilisearch.size;
+	index_count = stats.meilisearch.indexed_count;
+	available = stats.meilisearch.available;
+}
+
+onMounted(() => {
+	props.connection.on("stats", onStats);
+});
+
+onBeforeUnmount(() => {
+	props.connection.off("stats", onStats);
+});
 </script>
 
 <style lang="scss" scoped>

From 57577ddedb802c2253da406e08e4d6005b5920b9 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Sun, 28 May 2023 03:05:32 +0200
Subject: [PATCH 083/319] use correct stats property

---
 packages/client/src/widgets/server-metric/meilisearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
index 48bf629b0d..403e0154f7 100644
--- a/packages/client/src/widgets/server-metric/meilisearch.vue
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -27,7 +27,7 @@ let available: string = $ref("unavailable");
 function onStats(stats) {
 	total_size = stats.meilisearch.size;
 	index_count = stats.meilisearch.indexed_count;
-	available = stats.meilisearch.available;
+	available = stats.meilisearch.health;
 }
 
 onMounted(() => {

From 8ef68f559cc353eef9ba3bfde558a6fa800340b9 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sat, 27 May 2023 23:24:38 -0400
Subject: [PATCH 084/319] new media list layout

---
 .../src/components/MkImgWithBlurhash.vue      | 68 ++++++-------
 .../client/src/components/MkMediaImage.vue    | 13 +--
 .../client/src/components/MkMediaList.vue     | 97 ++++++++++---------
 .../src/components/MkSubNoteContent.vue       | 57 ++++++-----
 4 files changed, 116 insertions(+), 119 deletions(-)

diff --git a/packages/client/src/components/MkImgWithBlurhash.vue b/packages/client/src/components/MkImgWithBlurhash.vue
index c7652f476c..c1d34ab82d 100644
--- a/packages/client/src/components/MkImgWithBlurhash.vue
+++ b/packages/client/src/components/MkImgWithBlurhash.vue
@@ -1,21 +1,22 @@
 <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>
+	<canvas
+		v-if="!loaded"
+		ref="canvas"
+		:width="size"
+		:height="size"
+		:title="title"
+	/>
+	<img
+		v-if="src"
+		:src="src"
+		:title="title"
+		:type="type"
+		:alt="alt"
+		:class="{ cover }"
+		:style="{ 'object-fit': cover ? 'cover' : null }"
+		loading="lazy"
+		@load="onLoad"
+	/>
 </template>
 
 <script lang="ts" setup>
@@ -64,31 +65,20 @@ onMounted(() => {
 </script>
 
 <style lang="scss" scoped>
-.xubzgfgb {
-	position: relative;
+canvas,
+img {
+	display: block;
 	width: 100%;
 	height: 100%;
+}
 
-	> canvas,
-	> img {
-		display: block;
-		width: 100%;
-		height: 100%;
-	}
+canvas {
+	position: absolute;
+	inset: 0;
+	object-fit: cover;
+}
 
-	> canvas {
-		position: absolute;
-		object-fit: cover;
-	}
-
-	> img {
-		object-fit: contain;
-	}
-
-	&.cover {
-		> img {
-			object-fit: cover;
-		}
-	}
+img {
+	object-fit: contain;
 }
 </style>
diff --git a/packages/client/src/components/MkMediaImage.vue b/packages/client/src/components/MkMediaImage.vue
index 37fe5174b9..74f45c69c7 100644
--- a/packages/client/src/components/MkMediaImage.vue
+++ b/packages/client/src/components/MkMediaImage.vue
@@ -1,7 +1,6 @@
 <template>
 	<button v-if="hide" class="qjewsnkg" @click="hide = false">
 		<ImgWithBlurhash
-			class="bg"
 			:hash="image.blurhash"
 			:title="image.comment"
 			:alt="image.comment"
@@ -82,20 +81,17 @@ watch(
 	all: unset;
 	position: relative;
 
-	> .bg {
-		filter: brightness(0.5);
-	}
-
 	> .text {
-		position: absolute;
-		left: 0;
-		top: 0;
+		position: relative;
 		width: 100%;
 		height: 100%;
 		z-index: 1;
 		display: flex;
 		justify-content: center;
 		align-items: center;
+		padding: 30px;
+		box-sizing: border-box;
+		background: rgba(0,0,0,0.5);
 
 		> .wrapper {
 			display: table-cell;
@@ -112,7 +108,6 @@ watch(
 
 .gqnyydlz {
 	position: relative;
-	//box-shadow: 0 0 0 1px var(--divider) inset;
 	background: var(--bg);
 
 	> .hide {
diff --git a/packages/client/src/components/MkMediaList.vue b/packages/client/src/components/MkMediaList.vue
index 44b05e269d..2001ebf363 100644
--- a/packages/client/src/components/MkMediaList.vue
+++ b/packages/client/src/components/MkMediaList.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="hoawjimk">
+	<div class="hoawjimk files">
 		<XBanner
 			v-for="media in mediaList.filter((media) => !previewable(media))"
 			:key="media.id"
@@ -7,14 +7,16 @@
 		/>
 		<div
 			v-if="mediaList.filter((media) => previewable(media)).length > 0"
-			class="gird-container"
+			class="grid-container"
+			:data-count="
+				mediaList.filter((media) => previewable(media)).length < 5
+				? mediaList.filter((media) => previewable(media)).length
+				: null
+			"
 			:class="{ dmWidth: inDm }"
 		>
 			<div
 				ref="gallery"
-				:data-count="
-					mediaList.filter((media) => previewable(media)).length
-				"
 				@click.stop
 			>
 				<template
@@ -200,7 +202,7 @@ const previewable = (file: misskey.entities.DriveFile): boolean => {
 		max-width: 40rem;
 	}
 
-	> .gird-container {
+	> .grid-container {
 		position: relative;
 		width: 100%;
 		margin-top: 4px;
@@ -208,71 +210,74 @@ const previewable = (file: misskey.entities.DriveFile): boolean => {
 		overflow: hidden;
 		pointer-events: none;
 
-		&:before {
-			content: "";
-			display: block;
+		&[data-count] {
 			padding-top: 56.25%; // 16:9;
+			> div {
+				position: absolute;
+				inset: 0;
+			}
+		}
+
+		&[data-count="1"] > div {
+			grid-template-rows: 1fr;
+		}
+
+		&[data-count="2"] > div {
+			grid-template-columns: 1fr 1fr;
+			grid-template-rows: 1fr;
+		}
+
+		&[data-count="3"] > div {
+			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"] > div {
+			grid-template-columns: 1fr 1fr;
+			grid-template-rows: 1fr 1fr;
+		}
+
+		&:not([data-count]) > div > div {
+			max-height: 300px;
 		}
 
 		> div {
-			position: absolute;
-			top: 0;
-			right: 0;
-			bottom: 0;
-			left: 0;
 			display: grid;
 			grid-gap: 8px;
 
-			> * {
+			> div, > button {
 				overflow: hidden;
 				border-radius: 6px;
 				pointer-events: all;
+				min-height: 50px;
 			}
 
-			&[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) {
+			> :nth-child(1) {
 				grid-column: 1 / 2;
 				grid-row: 1 / 2;
 			}
 
-			> *:nth-child(2) {
+			> :nth-child(2) {
 				grid-column: 2 / 3;
 				grid-row: 1 / 2;
 			}
 
-			> *:nth-child(3) {
+			> :nth-child(3) {
 				grid-column: 1 / 2;
 				grid-row: 2 / 3;
 			}
 
-			> *:nth-child(4) {
+			> :nth-child(4) {
 				grid-column: 2 / 3;
 				grid-row: 2 / 3;
 			}
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 936e5e8987..b2058ab4d0 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -34,6 +34,7 @@
 			:class="{
 				collapsed,
 				isLong,
+				manyImages: note.files.length > 4,
 				showContent: note.cw && !showContent,
 				disableAnim: disableMfm,
 			}"
@@ -96,9 +97,7 @@
 					:to="`/notes/${note.renoteId}`"
 					>{{ i18n.ts.quoteAttached }}: ...</MkA
 				>
-				<div v-if="note.files.length > 0" class="files">
-					<XMediaList :media-list="note.files" />
-				</div>
+				<XMediaList v-if="note.files.length > 0" :media-list="note.files" />
 				<XPoll v-if="note.poll" :note="note" class="poll" />
 				<template v-if="detailed">
 					<MkUrlPreview
@@ -188,11 +187,14 @@ const emit = defineEmits<{
 
 const cwButton = ref<HTMLElement>();
 const showMoreButton = ref<HTMLElement>();
-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)
+		)
+		|| props.note.files.length > 4
+	);
+
 const collapsed = $ref(props.note.cw == null && isLong);
 
 const urls = props.note.text
@@ -285,7 +287,7 @@ function focusFooter(ev) {
 					background: var(--buttonHoverBg);
 				}
 			}
-			> .files {
+			> :deep(.files) {
 				margin-top: 0.4em;
 				margin-bottom: 0.4em;
 			}
@@ -332,27 +334,32 @@ function focusFooter(ev) {
 				-webkit-user-select: none;
 				-moz-user-select: none;
 			}
-			&.collapsed > .body {
+		}
+		&.collapsed {
+			&.manyImages {
+				max-height: calc(9em + 200px);
+			}
+			> .body {
 				box-sizing: border-box;
 			}
-			&.showContent {
-				> .body {
-					min-height: 2em;
-					max-height: 5em;
-					filter: blur(4px);
-					:deep(span) {
-						animation: none !important;
-						transform: none !important;
-					}
-					:deep(img) {
-						filter: blur(12px);
-					}
+		}
+		&.showContent {
+			> .body {
+				min-height: 2em;
+				max-height: 5em;
+				filter: blur(4px);
+				:deep(span) {
+					animation: none !important;
+					transform: none !important;
 				}
-				:deep(.fade) {
-					inset: 0;
-					top: 40px;
+				:deep(img) {
+					filter: blur(12px);
 				}
 			}
+			:deep(.fade) {
+				inset: 0;
+				top: 40px;
+			}
 		}
 
 		&.disableAnim :deep(span) {

From 01de9c0a3b502ed5683971fccaca86f51e438359 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 28 May 2023 00:17:23 -0400
Subject: [PATCH 085/319] Add bottom fade to show less & hide buttons

---
 packages/client/src/components/MkCwButton.vue |  3 ++-
 .../src/components/MkGalleryPostPreview.vue   |  1 +
 .../src/components/MkShowMoreButton.vue       |  6 +++++-
 .../src/components/MkSubNoteContent.vue       | 21 +++++++++++++++++++
 .../src/pages/admin/emoji-edit-dialog.vue     |  1 +
 .../client/src/pages/user/index.photos.vue    |  1 +
 packages/client/src/ui/_common_/upload.vue    |  1 +
 packages/client/src/widgets/photos.vue        |  2 ++
 8 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index 9239d44298..9a709ea76c 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -104,7 +104,8 @@ defineExpose({
 		width: 100%;
 		margin-top: 1em;
 		position: sticky;
-		bottom: var(--stickyBottom);
+		bottom: calc(var(--stickyBottom) - 1em);
+		padding: 20px;
 
 		> span {
 			display: inline-block;
diff --git a/packages/client/src/components/MkGalleryPostPreview.vue b/packages/client/src/components/MkGalleryPostPreview.vue
index f171417f7b..2ef339a8fe 100644
--- a/packages/client/src/components/MkGalleryPostPreview.vue
+++ b/packages/client/src/components/MkGalleryPostPreview.vue
@@ -59,6 +59,7 @@ const props = defineProps<{
 		transition: all 0.5s ease;
 
 		> .img {
+			position: relative;
 			width: 100%;
 			height: 100%;
 			object-fit: cover;
diff --git a/packages/client/src/components/MkShowMoreButton.vue b/packages/client/src/components/MkShowMoreButton.vue
index 3ec7086881..4ad6f0a491 100644
--- a/packages/client/src/components/MkShowMoreButton.vue
+++ b/packages/client/src/components/MkShowMoreButton.vue
@@ -41,6 +41,8 @@ defineExpose({
 	bottom: 0;
 	left: 0;
 	width: 100%;
+	padding: 20px;
+	margin-bottom: -10px;
 	z-index: 5;
 	> span {
 		display: inline-block;
@@ -60,7 +62,9 @@ defineExpose({
 	width: 100%;
 	margin-top: 1em;
 	position: sticky;
-	bottom: var(--stickyBottom);
+	bottom: calc(var(--stickyBottom) - 1em);
+	padding: 20px;
+	z-index: 5;
 
 	> span {
 		display: inline-block;
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index b2058ab4d0..432aa3e50b 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -151,6 +151,7 @@
 				<i class="ph-stop ph-bold"></i> {{ i18n.ts._mfm.stop }}
 			</template>
 		</MkButton>
+		<div v-if="(isLong && !collapsed) || (props.note.cw && showContent)" class="fade"></div>
 	</div>
 </template>
 
@@ -371,5 +372,25 @@ function focusFooter(ev) {
 		margin-left: 0;
 		margin-right: 0.4rem;
 	}
+	> .fade {
+		position: absolute;
+		inset: 0;
+		bottom: -400px;
+		display: flex;
+		align-items: flex-end;
+		z-index: 4;
+		pointer-events: none;
+		&::before {
+			content: "";
+			display: block;
+			height: 100px;
+			position: sticky;
+			bottom: 0;
+			width: 100%;
+			background: var(--panel);
+			mask: linear-gradient(to top, var(--gradient));
+			-webkit-mask: linear-gradient(to top, var(--gradient));
+		}
+	}
 }
 </style>
diff --git a/packages/client/src/pages/admin/emoji-edit-dialog.vue b/packages/client/src/pages/admin/emoji-edit-dialog.vue
index 73c3bab340..053f3d3e72 100644
--- a/packages/client/src/pages/admin/emoji-edit-dialog.vue
+++ b/packages/client/src/pages/admin/emoji-edit-dialog.vue
@@ -114,6 +114,7 @@ async function del() {
 <style lang="scss" scoped>
 .yigymqpb {
 	> .img {
+		position: relative;
 		display: block;
 		height: 64px;
 		margin: 0 auto;
diff --git a/packages/client/src/pages/user/index.photos.vue b/packages/client/src/pages/user/index.photos.vue
index 5b1753560a..77bab8f64f 100644
--- a/packages/client/src/pages/user/index.photos.vue
+++ b/packages/client/src/pages/user/index.photos.vue
@@ -98,6 +98,7 @@ onMounted(() => {
 		grid-gap: 6px;
 
 		> .img {
+			position: relative;
 			height: 128px;
 			border-radius: 6px;
 			overflow: clip;
diff --git a/packages/client/src/ui/_common_/upload.vue b/packages/client/src/ui/_common_/upload.vue
index 272b81ba18..0fde3aa024 100644
--- a/packages/client/src/ui/_common_/upload.vue
+++ b/packages/client/src/ui/_common_/upload.vue
@@ -102,6 +102,7 @@ const zIndex = os.claimZIndex("high");
 	border-top: none;
 }
 .mk-uploader > ol > li > .img {
+	position: relative;
 	display: block;
 	background-size: cover;
 	background-position: center center;
diff --git a/packages/client/src/widgets/photos.vue b/packages/client/src/widgets/photos.vue
index ef160f8c6d..f8f794221d 100644
--- a/packages/client/src/widgets/photos.vue
+++ b/packages/client/src/widgets/photos.vue
@@ -114,6 +114,7 @@ defineExpose<WidgetComponentExpose>({
 	}
 
 	.img {
+		position: relative;
 		border: solid 4px transparent;
 		border-radius: 8px;
 	}
@@ -126,6 +127,7 @@ defineExpose<WidgetComponentExpose>({
 	padding: 8px;
 
 	.img {
+		position: relative;
 		flex: 1 1 33%;
 		width: 33%;
 		height: 80px;

From e208a96e3105e4be5763b3ac9a4077623ed5b434 Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Sun, 28 May 2023 15:19:57 +1000
Subject: [PATCH 086/319] add ability to crop content

---
 locales/de-DE.yml                             |  2 ++
 locales/en-US.yml                             |  2 ++
 packages/client/src/components/mfm.ts         |  8 ++++++++
 packages/client/src/pages/mfm-cheat-sheet.vue | 15 +++++++++++++++
 packages/client/src/scripts/mfm-tags.ts       |  1 +
 5 files changed, 28 insertions(+)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 8ddba5ae0b..2a039af4cf 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -1178,6 +1178,8 @@ _mfm:
   background: Hintergrundfarbe
   positionDescription: Inhalt um einen bestimmten Betrag verschieben.
   position: Position
+  cropDescription: Inhalt zuschneiden.
+  crop: Zuschneiden
   scale: Maßstab
   scaleDescription: Skaliere den Inhalt um einen bestimmten Betrag.
   foregroundDescription: Ändern der Vordergrundfarbe von Text.
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 6fe8bccfc9..84e68ea6bc 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1270,6 +1270,8 @@ _mfm:
   fadeDescription: "Fades content in and out."
   position: "Position"
   positionDescription: "Move content by a specified amount."
+  crop: "Crop"
+  cropDescription: "Crop content."
   scale: "Scale"
   scaleDescription: "Scale content by a specified amount."
   foreground: "Foreground color"
diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index d9d78846e5..650a798324 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -243,6 +243,14 @@ export default defineComponent({
 									style = `transform: translateX(${x}em) translateY(${y}em);`;
 									break;
 								}
+								case "crop": {
+									const top = parseFloat(token.props.args.top ?? "0%");
+									const right = parseFloat(token.props.args.right ?? "0%");
+									const bottom = parseFloat(token.props.args.bottom ?? "0%");
+									const left = parseFloat(token.props.args.left ?? "0%");
+									style = `clip-path: inset(${top} ${right} ${bottom} ${left});`;
+									break;
+								}
 								case "scale": {
 									const x = Math.min(parseFloat(token.props.args.x ?? "1"), 5);
 									const y = Math.min(parseFloat(token.props.args.y ?? "1"), 5);
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index 50bb43fcde..a22d7ce1ec 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -365,6 +365,18 @@
 						</div>
 					</div>
 				</div>
+				<div class="section _block">
+					<div class="title">{{ i18n.ts._mfm.crop }}</div>
+					<div class="content">
+						<p>{{ i18n.ts._mfm.cropDescription }}</p>
+						<div class="preview">
+							<Mfm :text="preview_crop" />
+							<MkTextarea v-model="preview_crop"
+								><span>MFM</span></MkTextarea
+							>
+						</div>
+					</div>
+				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.position }}</div>
 					<div class="content">
@@ -483,6 +495,9 @@ let preview_rotate = $ref(
 let preview_position = $ref(
 	"$[position.y=-1 Positioning]\n$[position.x=-1 Positioning]"
 );
+let preview_crop = $ref(
+	"$[crop.top=50 🍮] $[crop.right=50 🍮] $[crop.bottom=50 🍮] $[crop.left=50 🍮]"
+);
 let preview_scale = $ref(
 	"$[scale.x=1.3 Scaling]\n$[scale.x=1.3,y=2 Scaling]\n$[scale.y=0.3 Tiny scaling]"
 );
diff --git a/packages/client/src/scripts/mfm-tags.ts b/packages/client/src/scripts/mfm-tags.ts
index da0bea8186..2fadcd80ea 100644
--- a/packages/client/src/scripts/mfm-tags.ts
+++ b/packages/client/src/scripts/mfm-tags.ts
@@ -12,6 +12,7 @@ export const MFM_TAGS = [
 	"x4",
 	"scale",
 	"position",
+	"crop",
 	"fg",
 	"bg",
 	"font",

From d8810600bf058b6a7b27c540961824cdb6b80313 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 28 May 2023 10:53:45 -0400
Subject: [PATCH 087/319] tweak

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

diff --git a/packages/client/src/components/MkCwButton.vue b/packages/client/src/components/MkCwButton.vue
index 9a709ea76c..f7fcb1d012 100644
--- a/packages/client/src/components/MkCwButton.vue
+++ b/packages/client/src/components/MkCwButton.vue
@@ -102,7 +102,6 @@ defineExpose({
 	}
 	&.showLess {
 		width: 100%;
-		margin-top: 1em;
 		position: sticky;
 		bottom: calc(var(--stickyBottom) - 1em);
 		padding: 20px;
diff --git a/packages/client/src/components/MkShowMoreButton.vue b/packages/client/src/components/MkShowMoreButton.vue
index 4ad6f0a491..e2d9b7d499 100644
--- a/packages/client/src/components/MkShowMoreButton.vue
+++ b/packages/client/src/components/MkShowMoreButton.vue
@@ -60,7 +60,6 @@ defineExpose({
 }
 .showLess {
 	width: 100%;
-	margin-top: 1em;
 	position: sticky;
 	bottom: calc(var(--stickyBottom) - 1em);
 	padding: 20px;

From d822b74f9e6c7774f50dc76c67ebeb24ff2d5cda Mon Sep 17 00:00:00 2001
From: Richard <galmt@protonmail.com>
Date: Sun, 28 May 2023 09:42:26 +0000
Subject: [PATCH 088/319] chore: Translated using Weblate (Dutch)

Currently translated at 34.2% (601 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
---
 locales/nl-NL.yml | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index b4ae05740d..1d16426117 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -648,3 +648,38 @@ objectStorageUseSSLDesc: Schakel dit uit als je geen HTTPS voor je API connectie
 objectStorageUseProxy: Verbind over Proxy
 objectStorageUseProxyDesc: Schakel dit uit als je geen Proxy voor je API connecties
   gebruikt
+sounds: Geluiden
+lastUsedDate: Laatst gebruikt op
+installedDate: Geautoriseerd op
+sort: Sorteren
+output: Uitvoer
+script: Script
+popout: Pop-out
+descendingOrder: Aflopend
+showInPage: Toon in de pagina
+chooseEmoji: Kies een emoji
+ascendingOrder: Oplopend
+volume: Volume
+masterVolume: Master volume
+details: Details
+unableToProcess: Deze operatie kon niet worden voltooid
+nothing: Niks te zien hier
+scratchpad: Kladblok
+recentUsed: Recentelijk gebruikt
+install: Installeer
+uninstall: Verwijderen
+installedApps: Geautoriseerde Applicaties
+state: Status
+updateRemoteUser: Update externe gebruikersinformatie
+listen: Luister
+none: Geen
+scratchpadDescription: Het kladblok is een omgeving voor AiScript experimenten. Je
+  kan hier schrijven, uitvoeren, en de resultaten bekijken van de interactie met Calckey.
+disablePagesScript: Zet AiScript op Pages uit
+deleteAllFiles: Verwijder alle bestanden
+deleteAllFilesConfirm: Weet je zeker dat je alle bestanden wil verwijderen?
+removeAllFollowing: Ontvolg alle gevolgde gebruikers
+serverLogs: Server logboek
+deleteAll: Verwijder alles
+showFixedPostForm: Toon het post formulier bovenaan de tijdlijn
+newNoteRecived: Er zijn nieuwe posts

From 28d7d0019b809d38597dcdc2c1b0262eed5ad324 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Sun, 28 May 2023 16:35:09 +0000
Subject: [PATCH 089/319] dev26

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

diff --git a/package.json b/package.json
index f664c064fe..2899adf7e3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev23",
+	"version": "14.0.0-dev26",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 19c9f5af68d31fc99ca6e7b30ad9260911783c8c Mon Sep 17 00:00:00 2001
From: Isabell <isa.kiral@gmail.com>
Date: Mon, 29 May 2023 03:31:06 +1000
Subject: [PATCH 090/319] fix: MFM crop percentage parsing

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

diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 650a798324..23a9333485 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -244,11 +244,11 @@ export default defineComponent({
 									break;
 								}
 								case "crop": {
-									const top = parseFloat(token.props.args.top ?? "0%");
-									const right = parseFloat(token.props.args.right ?? "0%");
-									const bottom = parseFloat(token.props.args.bottom ?? "0%");
-									const left = parseFloat(token.props.args.left ?? "0%");
-									style = `clip-path: inset(${top} ${right} ${bottom} ${left});`;
+									const top = parseFloat(token.props.args.top ?? "0");
+									const right = parseFloat(token.props.args.right ?? "0");
+									const bottom = parseFloat(token.props.args.bottom ?? "0");
+									const left = parseFloat(token.props.args.left ?? "0");
+									style = `clip-path: inset(${top}% ${right}% ${bottom}% ${left}%);`;
 									break;
 								}
 								case "scale": {

From cb164d0f0a3527ca04d33e4a4a722a0fd88cbe9b Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 28 May 2023 13:57:25 -0400
Subject: [PATCH 091/319] Hide video controls if player too small

---
 .../client/src/components/MkMediaList.vue     |  9 +--
 .../client/src/components/MkMediaVideo.vue    | 56 +++++++++++++++----
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/packages/client/src/components/MkMediaList.vue b/packages/client/src/components/MkMediaList.vue
index 2001ebf363..901aceeff5 100644
--- a/packages/client/src/components/MkMediaList.vue
+++ b/packages/client/src/components/MkMediaList.vue
@@ -6,13 +6,9 @@
 			:media="media"
 		/>
 		<div
-			v-if="mediaList.filter((media) => previewable(media)).length > 0"
+			v-if="previewableCount > 0"
 			class="grid-container"
-			:data-count="
-				mediaList.filter((media) => previewable(media)).length < 5
-				? mediaList.filter((media) => previewable(media)).length
-				: null
-			"
+			:data-count="previewableCount < 5 ? previewableCount : null"
 			:class="{ dmWidth: inDm }"
 		>
 			<div
@@ -193,6 +189,7 @@ const previewable = (file: misskey.entities.DriveFile): boolean => {
 		FILE_TYPE_BROWSERSAFE.includes(file.type)
 	);
 };
+const previewableCount = props.mediaList.filter((media) => previewable(media)).length;
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/MkMediaVideo.vue b/packages/client/src/components/MkMediaVideo.vue
index 7440fb2cb5..4033cde536 100644
--- a/packages/client/src/components/MkMediaVideo.vue
+++ b/packages/client/src/components/MkMediaVideo.vue
@@ -12,8 +12,9 @@
 			<span>{{ i18n.ts.clickToShow }}</span>
 		</div>
 	</div>
-	<div v-else class="kkjnbbplepmiyuadieoenjgutgcmtsvu">
+	<div v-else class="video" :class="{ mini }">
 		<VuePlyr
+			ref="plyr"
 			:options="{
 				controls: [
 					'play-large',
@@ -40,12 +41,18 @@
 				<source :src="video.url" :type="video.type" />
 			</video>
 		</VuePlyr>
-		<i class="ph-eye-slash ph-bold ph-lg" @click="hide = true"></i>
+		<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 { ref } from "vue";
+import { onMounted, ref } from "vue";
 import VuePlyr from "vue-plyr";
 import type * as misskey from "calckey-js";
 import { defaultStore } from "@/store";
@@ -56,31 +63,47 @@ const props = defineProps<{
 	video: misskey.entities.DriveFile;
 }>();
 
+const plyr = ref();
+const mini = ref(false);
+
 const hide = ref(
 	defaultStore.state.nsfw === "force"
 		? true
 		: props.video.isSensitive && defaultStore.state.nsfw !== "ignore"
 );
+
+onMounted(() => {
+	mini.value = plyr.value.player.media.scrollWidth < 300;
+	if (mini.value) {
+		plyr.value.player.on('play', () => {
+			plyr.value.player.fullscreen.enter();
+		});
+	}
+})
 </script>
 
 <style lang="scss" scoped>
-.kkjnbbplepmiyuadieoenjgutgcmtsvu {
+.video {
 	position: relative;
 	--plyr-color-main: var(--accent);
 
-	> i {
+	> .hide {
 		display: block;
 		position: absolute;
 		border-radius: 6px;
-		background-color: var(--fg);
-		color: var(--accentLighten);
-		font-size: 14px;
-		opacity: 0.5;
-		padding: 3px 6px;
+		background-color: var(--accentedBg);
+		-webkit-backdrop-filter: var(--blur, blur(15px));
+		backdrop-filter: var(--blur, blur(15px));
+		color: var(--accent);
+		font-size: 0.8em;
+		padding: 6px 8px;
 		text-align: center;
-		cursor: pointer;
 		top: 12px;
 		right: 12px;
+
+		> i {
+			display: block;
+		}
 	}
 
 	> video {
@@ -95,6 +118,17 @@ const hide = ref(
 		width: 100%;
 		height: 100%;
 	}
+
+	&.mini {
+		:deep(.plyr:not(:fullscreen)) {
+			min-width: unset !important;
+			.plyr__progress__container,
+			.plyr__volume,
+			[data-plyr="fullscreen"] {
+				display: none;
+			}
+		}
+	}
 }
 
 .icozogqfvdetwohsdglrbswgrejoxbdj {

From a55271b96b0f2de22d8b4cc229d36d799ceb1936 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 28 May 2023 14:35:05 -0400
Subject: [PATCH 092/319] fix

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

diff --git a/packages/client/src/components/MkMediaVideo.vue b/packages/client/src/components/MkMediaVideo.vue
index 4033cde536..29d85d9a3d 100644
--- a/packages/client/src/components/MkMediaVideo.vue
+++ b/packages/client/src/components/MkMediaVideo.vue
@@ -122,6 +122,7 @@ onMounted(() => {
 	&.mini {
 		:deep(.plyr:not(:fullscreen)) {
 			min-width: unset !important;
+			.plyr__control--overlaid,
 			.plyr__progress__container,
 			.plyr__volume,
 			[data-plyr="fullscreen"] {

From b15d84451d9b5561ed1dba535c4bf01923f8185a Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 28 May 2023 15:25:57 -0400
Subject: [PATCH 093/319] fix

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

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index f98dfcb593..f4637948d1 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -435,6 +435,7 @@ function noteClick(e) {
 		}
 
 		> .body {
+			position: relative;
 			flex: 1;
 			min-width: 0;
 			margin: 0 -200px;
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 432aa3e50b..ea09770548 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -390,6 +390,7 @@ function focusFooter(ev) {
 			background: var(--panel);
 			mask: linear-gradient(to top, var(--gradient));
 			-webkit-mask: linear-gradient(to top, var(--gradient));
+			transition: background .2s;
 		}
 	}
 }

From cae7c6b3ca69eef4f087aff87aa0f2e29a295d8b Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 28 May 2023 16:21:00 -0400
Subject: [PATCH 094/319] fix position

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

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 8e3576dd50..af3e1c4eea 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -700,6 +700,7 @@ defineExpose({
 	}
 
 	> .article {
+		position: relative;
 		overflow: clip;
 		padding: 4px 32px 10px;
 		cursor: pointer;

From 34c9c1bd929564a394d943caa699798bac01627c Mon Sep 17 00:00:00 2001
From: Michael 465537 <michael.465537@gmail.com>
Date: Sun, 28 May 2023 21:03:30 +0000
Subject: [PATCH 095/319] chore: Translated using Weblate (German)

Currently translated at 98.9% (1734 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
---
 locales/de-DE.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 60ab4e5ba8..5571f2e94d 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -287,7 +287,7 @@ agreeTo: "Ich stimme {0} zu"
 tos: "Nutzungsbedingungen"
 start: "Beginnen Sie"
 home: "Home"
-remoteUserCaution: "Informationen von Remote-Nutzern können unvollständig sein."
+remoteUserCaution: "Informationen von Nutzern anderer Server sind möglicherweise unvollständig."
 activity: "Aktivität"
 images: "Bilder"
 birthday: "Geburtstag"

From 6ea11668c162b99bfb658eea8265bcb9bb9b5fb3 Mon Sep 17 00:00:00 2001
From: Michael 465537 <michael.465537@gmail.com>
Date: Sun, 28 May 2023 21:32:15 +0000
Subject: [PATCH 096/319] chore: Translated using Weblate (German)

Currently translated at 98.9% (1734 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
---
 locales/de-DE.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 5571f2e94d..9acc8501f4 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -947,7 +947,7 @@ recentNHours: "Die letzten {n} Stunden"
 recentNDays: "Die letzten {n} Tage"
 noEmailServerWarning: "Es ist kein Email-Server konfiguriert."
 thereIsUnresolvedAbuseReportWarning: "Es liegen ungelöste Meldungen vor."
-recommended: "Admin-Selektion"
+recommended: "Admin-Auswahl"
 check: "Kontrolle"
 driveCapOverrideLabel: "Die Cloud-Drive-Kapazität dieses Nutzers verändern"
 driveCapOverrideCaption: "Gib einen Wert von 0 oder weniger ein, um die Kapazität
@@ -1355,7 +1355,7 @@ _tutorial:
     der/die auf diesem Server registriert ist."
   step5_5: "Die Social-Timeline {icon} ist eine Kombination aus der Home-Timeline
     und der Local-Timeline."
-  step5_6: "In der {icon} \"Admin-Selektion\"-Timeline können sie Beiträge von Servern
+  step5_6: "In der {icon} \"Admin-Auswahl\"-Timeline können sie Beiträge von Servern
     sehen, die von den Server-Administratoren vorgeschlagen werden."
   step5_7: "In der {icon} Global-Timeline können Sie Beiträge von allen verknüpften
     Servern aus dem Fediverse sehen."
@@ -1571,7 +1571,7 @@ _timelines:
   local: "Local-TL"
   social: "Social-TL"
   global: "Global-TL"
-  recommended: Admin-Selektion
+  recommended: Admin-Auswahl
 _pages:
   newPage: "Neue Seite erstellen"
   editPage: "Seite bearbeiten"
@@ -1934,7 +1934,7 @@ _deck:
     direct: "Direktnachrichten"
   renameProfile: Arbeitsbereich umbenennen
   nameAlreadyExists: Der Name für den Arbeitsbereich ist bereits vorhanden.
-enableRecommendedTimeline: '"Admin-Selektion"-Timeline einschalten'
+enableRecommendedTimeline: '"Admin-Auswahl"-Timeline einschalten'
 secureMode: Sicherer Modus (Autorisierter Abruf)
 instanceSecurity: Server-Sicherheit
 manageGroups: Gruppen verwalten
@@ -2036,7 +2036,7 @@ customMOTDDescription: Benutzerdefinierte Meldungen für die Meldung des Tages (
   die durch Zeilenumbrüche getrennt sind und nach dem Zufallsprinzip jedes Mal angezeigt
   werden, wenn ein Benutzer die Seite (neu) lädt.
 recommendedInstancesDescription: Empfohlene Server, die durch Zeilenumbrüche getrennt
-  sind, werden in der "Admin-Selektion"-Timeline angezeigt. Fügen Sie NICHT "https://"
+  sind, werden in der "Admin-Auswahl"-Timeline angezeigt. Fügen Sie NICHT "https://"
   hinzu, sondern NUR die Domain.
 sendModMail: Moderationshinweis senden
 moveFromDescription: 'Dadurch wird ein Alias Ihres alten Nutzerkontos festgelegt,

From 18156487d91bb2c7d4ba5588da37ab1f1e84350e Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 28 May 2023 19:14:01 -0400
Subject: [PATCH 097/319] fix: move isRenote check to note.vue

---
 .../client/src/components/MkNoteDetailed.vue  | 64 ++++++++-----------
 packages/client/src/pages/note.vue            | 46 +++++++------
 2 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 55bae467cd..afa51c0ca7 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -17,10 +17,10 @@
 			:note="note"
 			:detailedView="true"
 		/>
-		<MkLoading v-else-if="appearNote.reply" mini />
+		<MkLoading v-else-if="note.reply" mini />
 		<MkNoteSub
-			v-if="appearNote.reply"
-			:note="appearNote.reply"
+			v-if="note.reply"
+			:note="note.reply"
 			class="reply-to"
 			:detailedView="true"
 		/>
@@ -29,21 +29,21 @@
 			ref="noteEl"
 			@contextmenu.stop="onContextmenu"
 			tabindex="-1"
-			:note="appearNote"
+			:note="note"
 			detailedView
 		></MkNote>
 
 		<MkTab v-model="tab" :style="'underline'" @update:modelValue="loadTab">
 			<option value="replies">
 				<!-- <i class="ph-arrow-u-up-left ph-bold ph-lg"></i> -->
-				<span v-if="appearNote.repliesCount > 0" class="count">{{
-					appearNote.repliesCount
+				<span v-if="note.repliesCount > 0" class="count">{{
+					note.repliesCount
 				}}</span>
 				{{ i18n.ts._notification._types.reply }}
 			</option>
-			<option value="renotes" v-if="appearNote.renoteCount > 0">
+			<option value="renotes" v-if="note.renoteCount > 0">
 				<!-- <i class="ph-repeat ph-bold ph-lg"></i> -->
-				<span class="count">{{ appearNote.renoteCount }}</span>
+				<span class="count">{{ note.renoteCount }}</span>
 				{{ i18n.ts._notification._types.renote }}
 			</option>
 			<option value="reactions" v-if="reactionsCount > 0">
@@ -71,10 +71,10 @@
 			class="reply"
 			:conversation="replies"
 			:detailedView="true"
-			:parentId="appearNote.id"
+			:parentId="note.id"
 		/>
 		<MkLoading
-			v-else-if="tab === 'replies' && appearNote.repliesCount > 0"
+			v-else-if="tab === 'replies' && note.repliesCount > 0"
 		/>
 
 		<MkNoteSub
@@ -85,7 +85,7 @@
 			class="reply"
 			:conversation="replies"
 			:detailedView="true"
-			:parentId="appearNote.id"
+			:parentId="note.id"
 		/>
 		<MkLoading v-else-if="tab === 'quotes' && directQuotes.length > 0" />
 
@@ -104,7 +104,7 @@
 		/>
 		<!-- </MkPagination> -->
 		<MkLoading
-			v-else-if="tab === 'renotes' && appearNote.renoteCount > 0"
+			v-else-if="tab === 'renotes' && note.renoteCount > 0"
 		/>
 
 		<div v-if="tab === 'clips' && clips.length > 0" class="_content clips">
@@ -132,7 +132,7 @@
 
 		<MkReactedUsers
 			v-if="tab === 'reactions' && reactionsCount > 0"
-			:note-id="appearNote.id"
+			:note-id="note.id"
 		></MkReactedUsers>
 	</div>
 	<div v-else class="_panel muted" @click="muted.muted = false">
@@ -217,23 +217,11 @@ if (noteViewInterruptors.length > 0) {
 	});
 }
 
-const isRenote =
-	note.renote != null &&
-	note.text == null &&
-	note.fileIds.length === 0 &&
-	note.poll == null;
-
 const el = ref<HTMLElement>();
 const noteEl = $ref();
 const menuButton = ref<HTMLElement>();
-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;
 const showContent = ref(false);
 const isDeleted = ref(false);
 const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
@@ -263,14 +251,14 @@ const keymap = {
 
 useNoteCapture({
 	rootEl: el,
-	note: $$(appearNote),
+	note: $$(note),
 	isDeletedRef: isDeleted,
 });
 
 function reply(viaKeyboard = false): void {
 	pleaseLogin();
 	os.post({
-		reply: appearNote,
+		reply: note,
 		animation: !viaKeyboard,
 	}).then(() => {
 		focus();
@@ -284,7 +272,7 @@ function react(viaKeyboard = false): void {
 		reactButton.value,
 		(reaction) => {
 			os.api("notes/reactions/create", {
-				noteId: appearNote.id,
+				noteId: note.id,
 				reaction: reaction,
 			});
 		},
@@ -355,27 +343,27 @@ function blur() {
 
 directReplies = null;
 os.api("notes/children", {
-	noteId: appearNote.id,
+	noteId: note.id,
 	limit: 30,
 	depth: 12,
 }).then((res) => {
 	res = res.reduce((acc, note) => {
-		if (note.userId == appearNote.userId) {
+		if (note.userId == note.userId) {
 			return [...acc, note];
 		}
 		return [note, ...acc];
 	}, []);
 	replies.value = res;
 	directReplies = res
-		.filter((note) => note.replyId === appearNote.id)
+		.filter((note) => note.replyId === note.id)
 		.reverse();
-	directQuotes = res.filter((note) => note.renoteId === appearNote.id);
+	directQuotes = res.filter((note) => note.renoteId === note.id);
 });
 
 conversation = null;
-if (appearNote.replyId) {
+if (note.replyId) {
 	os.api("notes/conversation", {
-		noteId: appearNote.replyId,
+		noteId: note.replyId,
 		limit: 30,
 	}).then((res) => {
 		conversation = res.reverse();
@@ -385,14 +373,14 @@ if (appearNote.replyId) {
 
 clips = null;
 os.api("notes/clips", {
-	noteId: appearNote.id,
+	noteId: note.id,
 }).then((res) => {
 	clips = res;
 });
 
 // const pagination = {
 // 	endpoint: "notes/renotes",
-// 	noteId: appearNote.id,
+// 	noteId: note.id,
 // 	limit: 10,
 // };
 
@@ -402,7 +390,7 @@ renotes = null;
 function loadTab() {
 	if (tab === "renotes" && !renotes) {
 		os.api("notes/renotes", {
-			noteId: appearNote.id,
+			noteId: note.id,
 			limit: 100,
 		}).then((res) => {
 			renotes = res;
@@ -414,7 +402,7 @@ async function onNoteUpdated(noteData: NoteUpdatedEvent): Promise<void> {
 	const { type, id, body } = noteData;
 
 	let found = -1;
-	if (id === appearNote.id) {
+	if (id === note.id) {
 		found = 0;
 	} else {
 		for (let i = 0; i < replies.value.length; i++) {
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index e3c0bd7c2d..fbb71bd16c 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -13,7 +13,7 @@
 					:name="$store.state.animation ? 'fade' : ''"
 					mode="out-in"
 				>
-					<div v-if="note" class="note">
+					<div v-if="appearNote" class="note">
 						<div v-if="showNext" class="_gap">
 							<XNotes
 								class="_content"
@@ -33,12 +33,12 @@
 							</MkButton>
 							<div class="note _gap">
 								<MkRemoteCaution
-									v-if="note.user.host != null"
-									:href="note.url ?? note.uri"
+									v-if="appearNote.user.host != null"
+									:href="appearNote.url ?? appearNote.uri"
 								/>
 								<XNoteDetailed
-									:key="note.id"
-									v-model:note="note"
+									:key="appearNote.id"
+									v-model:note="appearNote"
 									class="note"
 								/>
 							</div>
@@ -71,7 +71,6 @@
 <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";
@@ -90,15 +89,17 @@ let hasNext = $ref(false);
 let showPrev = $ref(false);
 let showNext = $ref(false);
 let error = $ref();
+let isRenote = $ref(false);
+let appearNote = $ref<null | misskey.entities.Note>();
 
 const prevPagination = {
 	endpoint: "users/notes" as const,
 	limit: 10,
 	params: computed(() =>
-		note
+		appearNote
 			? {
-					userId: note.userId,
-					untilId: note.id,
+					userId: appearNote.userId,
+					untilId: appearNote.id,
 			  }
 			: null
 	),
@@ -109,10 +110,10 @@ const nextPagination = {
 	endpoint: "users/notes" as const,
 	limit: 10,
 	params: computed(() =>
-		note
+		appearNote
 			? {
-					userId: note.userId,
-					sinceId: note.id,
+					userId: appearNote.userId,
+					sinceId: appearNote.id,
 			  }
 			: null
 	),
@@ -129,6 +130,13 @@ function fetchNote() {
 	})
 		.then((res) => {
 			note = res;
+			isRenote =
+				note.renote != null &&
+				note.text == null &&
+				note.fileIds.length === 0 &&
+				note.poll == null;
+			appearNote = isRenote ? (note.renote as misskey.entities.Note) : note;
+			
 			Promise.all([
 				os.api("users/notes", {
 					userId: note.userId,
@@ -160,19 +168,19 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(
 	computed(() =>
-		note
+		appearNote
 			? {
 					title: i18n.t("noteOf", {
-						user: note.user.name || note.user.username,
+						user: appearNote.user.name || appearNote.user.username,
 					}),
-					subtitle: new Date(note.createdAt).toLocaleString(),
-					avatar: note.user,
-					path: `/notes/${note.id}`,
+					subtitle: new Date(appearNote.createdAt).toLocaleString(),
+					avatar: appearNote.user,
+					path: `/notes/${appearNote.id}`,
 					share: {
 						title: i18n.t("noteOf", {
-							user: note.user.name || note.user.username,
+							user: appearNote.user.name || appearNote.user.username,
 						}),
-						text: note.text,
+						text: appearNote.text,
 					},
 			  }
 			: null

From 3acf8de621b382667c7979334544058b2deaee5b Mon Sep 17 00:00:00 2001
From: Free <freeplay@duck.com>
Date: Sun, 28 May 2023 23:17:10 +0000
Subject: [PATCH 098/319] revert 18156487d91bb2c7d4ba5588da37ab1f1e84350e

revert fix: move isRenote check to note.vue
---
 .../client/src/components/MkNoteDetailed.vue  | 64 +++++++++++--------
 packages/client/src/pages/note.vue            | 46 ++++++-------
 2 files changed, 57 insertions(+), 53 deletions(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index afa51c0ca7..55bae467cd 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -17,10 +17,10 @@
 			:note="note"
 			:detailedView="true"
 		/>
-		<MkLoading v-else-if="note.reply" mini />
+		<MkLoading v-else-if="appearNote.reply" mini />
 		<MkNoteSub
-			v-if="note.reply"
-			:note="note.reply"
+			v-if="appearNote.reply"
+			:note="appearNote.reply"
 			class="reply-to"
 			:detailedView="true"
 		/>
@@ -29,21 +29,21 @@
 			ref="noteEl"
 			@contextmenu.stop="onContextmenu"
 			tabindex="-1"
-			:note="note"
+			:note="appearNote"
 			detailedView
 		></MkNote>
 
 		<MkTab v-model="tab" :style="'underline'" @update:modelValue="loadTab">
 			<option value="replies">
 				<!-- <i class="ph-arrow-u-up-left ph-bold ph-lg"></i> -->
-				<span v-if="note.repliesCount > 0" class="count">{{
-					note.repliesCount
+				<span v-if="appearNote.repliesCount > 0" class="count">{{
+					appearNote.repliesCount
 				}}</span>
 				{{ i18n.ts._notification._types.reply }}
 			</option>
-			<option value="renotes" v-if="note.renoteCount > 0">
+			<option value="renotes" v-if="appearNote.renoteCount > 0">
 				<!-- <i class="ph-repeat ph-bold ph-lg"></i> -->
-				<span class="count">{{ note.renoteCount }}</span>
+				<span class="count">{{ appearNote.renoteCount }}</span>
 				{{ i18n.ts._notification._types.renote }}
 			</option>
 			<option value="reactions" v-if="reactionsCount > 0">
@@ -71,10 +71,10 @@
 			class="reply"
 			:conversation="replies"
 			:detailedView="true"
-			:parentId="note.id"
+			:parentId="appearNote.id"
 		/>
 		<MkLoading
-			v-else-if="tab === 'replies' && note.repliesCount > 0"
+			v-else-if="tab === 'replies' && appearNote.repliesCount > 0"
 		/>
 
 		<MkNoteSub
@@ -85,7 +85,7 @@
 			class="reply"
 			:conversation="replies"
 			:detailedView="true"
-			:parentId="note.id"
+			:parentId="appearNote.id"
 		/>
 		<MkLoading v-else-if="tab === 'quotes' && directQuotes.length > 0" />
 
@@ -104,7 +104,7 @@
 		/>
 		<!-- </MkPagination> -->
 		<MkLoading
-			v-else-if="tab === 'renotes' && note.renoteCount > 0"
+			v-else-if="tab === 'renotes' && appearNote.renoteCount > 0"
 		/>
 
 		<div v-if="tab === 'clips' && clips.length > 0" class="_content clips">
@@ -132,7 +132,7 @@
 
 		<MkReactedUsers
 			v-if="tab === 'reactions' && reactionsCount > 0"
-			:note-id="note.id"
+			:note-id="appearNote.id"
 		></MkReactedUsers>
 	</div>
 	<div v-else class="_panel muted" @click="muted.muted = false">
@@ -217,11 +217,23 @@ if (noteViewInterruptors.length > 0) {
 	});
 }
 
+const isRenote =
+	note.renote != null &&
+	note.text == null &&
+	note.fileIds.length === 0 &&
+	note.poll == null;
+
 const el = ref<HTMLElement>();
 const noteEl = $ref();
 const menuButton = ref<HTMLElement>();
+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;
 const showContent = ref(false);
 const isDeleted = ref(false);
 const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
@@ -251,14 +263,14 @@ const keymap = {
 
 useNoteCapture({
 	rootEl: el,
-	note: $$(note),
+	note: $$(appearNote),
 	isDeletedRef: isDeleted,
 });
 
 function reply(viaKeyboard = false): void {
 	pleaseLogin();
 	os.post({
-		reply: note,
+		reply: appearNote,
 		animation: !viaKeyboard,
 	}).then(() => {
 		focus();
@@ -272,7 +284,7 @@ function react(viaKeyboard = false): void {
 		reactButton.value,
 		(reaction) => {
 			os.api("notes/reactions/create", {
-				noteId: note.id,
+				noteId: appearNote.id,
 				reaction: reaction,
 			});
 		},
@@ -343,27 +355,27 @@ function blur() {
 
 directReplies = null;
 os.api("notes/children", {
-	noteId: note.id,
+	noteId: appearNote.id,
 	limit: 30,
 	depth: 12,
 }).then((res) => {
 	res = res.reduce((acc, note) => {
-		if (note.userId == note.userId) {
+		if (note.userId == appearNote.userId) {
 			return [...acc, note];
 		}
 		return [note, ...acc];
 	}, []);
 	replies.value = res;
 	directReplies = res
-		.filter((note) => note.replyId === note.id)
+		.filter((note) => note.replyId === appearNote.id)
 		.reverse();
-	directQuotes = res.filter((note) => note.renoteId === note.id);
+	directQuotes = res.filter((note) => note.renoteId === appearNote.id);
 });
 
 conversation = null;
-if (note.replyId) {
+if (appearNote.replyId) {
 	os.api("notes/conversation", {
-		noteId: note.replyId,
+		noteId: appearNote.replyId,
 		limit: 30,
 	}).then((res) => {
 		conversation = res.reverse();
@@ -373,14 +385,14 @@ if (note.replyId) {
 
 clips = null;
 os.api("notes/clips", {
-	noteId: note.id,
+	noteId: appearNote.id,
 }).then((res) => {
 	clips = res;
 });
 
 // const pagination = {
 // 	endpoint: "notes/renotes",
-// 	noteId: note.id,
+// 	noteId: appearNote.id,
 // 	limit: 10,
 // };
 
@@ -390,7 +402,7 @@ renotes = null;
 function loadTab() {
 	if (tab === "renotes" && !renotes) {
 		os.api("notes/renotes", {
-			noteId: note.id,
+			noteId: appearNote.id,
 			limit: 100,
 		}).then((res) => {
 			renotes = res;
@@ -402,7 +414,7 @@ async function onNoteUpdated(noteData: NoteUpdatedEvent): Promise<void> {
 	const { type, id, body } = noteData;
 
 	let found = -1;
-	if (id === note.id) {
+	if (id === appearNote.id) {
 		found = 0;
 	} else {
 		for (let i = 0; i < replies.value.length; i++) {
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index fbb71bd16c..e3c0bd7c2d 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -13,7 +13,7 @@
 					:name="$store.state.animation ? 'fade' : ''"
 					mode="out-in"
 				>
-					<div v-if="appearNote" class="note">
+					<div v-if="note" class="note">
 						<div v-if="showNext" class="_gap">
 							<XNotes
 								class="_content"
@@ -33,12 +33,12 @@
 							</MkButton>
 							<div class="note _gap">
 								<MkRemoteCaution
-									v-if="appearNote.user.host != null"
-									:href="appearNote.url ?? appearNote.uri"
+									v-if="note.user.host != null"
+									:href="note.url ?? note.uri"
 								/>
 								<XNoteDetailed
-									:key="appearNote.id"
-									v-model:note="appearNote"
+									:key="note.id"
+									v-model:note="note"
 									class="note"
 								/>
 							</div>
@@ -71,6 +71,7 @@
 <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";
@@ -89,17 +90,15 @@ let hasNext = $ref(false);
 let showPrev = $ref(false);
 let showNext = $ref(false);
 let error = $ref();
-let isRenote = $ref(false);
-let appearNote = $ref<null | misskey.entities.Note>();
 
 const prevPagination = {
 	endpoint: "users/notes" as const,
 	limit: 10,
 	params: computed(() =>
-		appearNote
+		note
 			? {
-					userId: appearNote.userId,
-					untilId: appearNote.id,
+					userId: note.userId,
+					untilId: note.id,
 			  }
 			: null
 	),
@@ -110,10 +109,10 @@ const nextPagination = {
 	endpoint: "users/notes" as const,
 	limit: 10,
 	params: computed(() =>
-		appearNote
+		note
 			? {
-					userId: appearNote.userId,
-					sinceId: appearNote.id,
+					userId: note.userId,
+					sinceId: note.id,
 			  }
 			: null
 	),
@@ -130,13 +129,6 @@ function fetchNote() {
 	})
 		.then((res) => {
 			note = res;
-			isRenote =
-				note.renote != null &&
-				note.text == null &&
-				note.fileIds.length === 0 &&
-				note.poll == null;
-			appearNote = isRenote ? (note.renote as misskey.entities.Note) : note;
-			
 			Promise.all([
 				os.api("users/notes", {
 					userId: note.userId,
@@ -168,19 +160,19 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(
 	computed(() =>
-		appearNote
+		note
 			? {
 					title: i18n.t("noteOf", {
-						user: appearNote.user.name || appearNote.user.username,
+						user: note.user.name || note.user.username,
 					}),
-					subtitle: new Date(appearNote.createdAt).toLocaleString(),
-					avatar: appearNote.user,
-					path: `/notes/${appearNote.id}`,
+					subtitle: new Date(note.createdAt).toLocaleString(),
+					avatar: note.user,
+					path: `/notes/${note.id}`,
 					share: {
 						title: i18n.t("noteOf", {
-							user: appearNote.user.name || appearNote.user.username,
+							user: note.user.name || note.user.username,
 						}),
-						text: appearNote.text,
+						text: note.text,
 					},
 			  }
 			: null

From 91e5389f866723be735f0ff7a2e4e9007504a9d8 Mon Sep 17 00:00:00 2001
From: TalonTheDragon <talon@iamtalon.me>
Date: Mon, 29 May 2023 01:48:24 +0200
Subject: [PATCH 099/319] Add labels to dialog OK and Close buttons

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

diff --git a/packages/client/src/components/MkModalWindow.vue b/packages/client/src/components/MkModalWindow.vue
index 40325dfa10..9406d8d4dd 100644
--- a/packages/client/src/components/MkModalWindow.vue
+++ b/packages/client/src/components/MkModalWindow.vue
@@ -26,6 +26,7 @@
 				<div ref="headerEl" class="header">
 					<button
 						v-if="withOkButton"
+						:aria-label="i18n.t('close')"
 						class="_button"
 						@click="$emit('close')"
 					>
@@ -36,6 +37,7 @@
 					</span>
 					<button
 						v-if="!withOkButton"
+						:aria-label="i18n.t('close')"
 						class="_button"
 						@click="$emit('close')"
 					>
@@ -43,6 +45,7 @@
 					</button>
 					<button
 						v-if="withOkButton"
+						:aria-label="i18n.t('ok')"
 						class="_button"
 						:disabled="okButtonDisabled"
 						@click="$emit('ok')"
@@ -61,6 +64,7 @@
 <script lang="ts" setup>
 import { FocusTrap } from "focus-trap-vue";
 import MkModal from "./MkModal.vue";
+import { i18n } from "@/i18n";
 
 const props = withDefaults(
 	defineProps<{

From 56359f0c2d2d361e1e077f99fd375c745dd01ebe Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 28 May 2023 20:20:53 -0400
Subject: [PATCH 100/319] fix: move isRenote check to note.vue

---
 .../client/src/components/MkNoteDetailed.vue  | 70 ++++++++-----------
 packages/client/src/pages/note.vue            | 46 +++++++-----
 2 files changed, 56 insertions(+), 60 deletions(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 55bae467cd..8801e39556 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -17,10 +17,10 @@
 			:note="note"
 			:detailedView="true"
 		/>
-		<MkLoading v-else-if="appearNote.reply" mini />
+		<MkLoading v-else-if="note.reply" mini />
 		<MkNoteSub
-			v-if="appearNote.reply"
-			:note="appearNote.reply"
+			v-if="note.reply"
+			:note="note.reply"
 			class="reply-to"
 			:detailedView="true"
 		/>
@@ -29,21 +29,21 @@
 			ref="noteEl"
 			@contextmenu.stop="onContextmenu"
 			tabindex="-1"
-			:note="appearNote"
+			:note="note"
 			detailedView
 		></MkNote>
 
 		<MkTab v-model="tab" :style="'underline'" @update:modelValue="loadTab">
 			<option value="replies">
 				<!-- <i class="ph-arrow-u-up-left ph-bold ph-lg"></i> -->
-				<span v-if="appearNote.repliesCount > 0" class="count">{{
-					appearNote.repliesCount
+				<span v-if="note.repliesCount > 0" class="count">{{
+					note.repliesCount
 				}}</span>
 				{{ i18n.ts._notification._types.reply }}
 			</option>
-			<option value="renotes" v-if="appearNote.renoteCount > 0">
+			<option value="renotes" v-if="note.renoteCount > 0">
 				<!-- <i class="ph-repeat ph-bold ph-lg"></i> -->
-				<span class="count">{{ appearNote.renoteCount }}</span>
+				<span class="count">{{ note.renoteCount }}</span>
 				{{ i18n.ts._notification._types.renote }}
 			</option>
 			<option value="reactions" v-if="reactionsCount > 0">
@@ -71,10 +71,10 @@
 			class="reply"
 			:conversation="replies"
 			:detailedView="true"
-			:parentId="appearNote.id"
+			:parentId="note.id"
 		/>
 		<MkLoading
-			v-else-if="tab === 'replies' && appearNote.repliesCount > 0"
+			v-else-if="tab === 'replies' && note.repliesCount > 0"
 		/>
 
 		<MkNoteSub
@@ -85,7 +85,7 @@
 			class="reply"
 			:conversation="replies"
 			:detailedView="true"
-			:parentId="appearNote.id"
+			:parentId="note.id"
 		/>
 		<MkLoading v-else-if="tab === 'quotes' && directQuotes.length > 0" />
 
@@ -104,7 +104,7 @@
 		/>
 		<!-- </MkPagination> -->
 		<MkLoading
-			v-else-if="tab === 'renotes' && appearNote.renoteCount > 0"
+			v-else-if="tab === 'renotes' && note.renoteCount > 0"
 		/>
 
 		<div v-if="tab === 'clips' && clips.length > 0" class="_content clips">
@@ -132,7 +132,7 @@
 
 		<MkReactedUsers
 			v-if="tab === 'reactions' && reactionsCount > 0"
-			:note-id="appearNote.id"
+			:note-id="note.id"
 		></MkReactedUsers>
 	</div>
 	<div v-else class="_panel muted" @click="muted.muted = false">
@@ -217,23 +217,11 @@ if (noteViewInterruptors.length > 0) {
 	});
 }
 
-const isRenote =
-	note.renote != null &&
-	note.text == null &&
-	note.fileIds.length === 0 &&
-	note.poll == null;
-
 const el = ref<HTMLElement>();
 const noteEl = $ref();
 const menuButton = ref<HTMLElement>();
-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;
 const showContent = ref(false);
 const isDeleted = ref(false);
 const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
@@ -263,14 +251,14 @@ const keymap = {
 
 useNoteCapture({
 	rootEl: el,
-	note: $$(appearNote),
+	note: $$(note),
 	isDeletedRef: isDeleted,
 });
 
 function reply(viaKeyboard = false): void {
 	pleaseLogin();
 	os.post({
-		reply: appearNote,
+		reply: note,
 		animation: !viaKeyboard,
 	}).then(() => {
 		focus();
@@ -284,7 +272,7 @@ function react(viaKeyboard = false): void {
 		reactButton.value,
 		(reaction) => {
 			os.api("notes/reactions/create", {
-				noteId: appearNote.id,
+				noteId: note.id,
 				reaction: reaction,
 			});
 		},
@@ -355,27 +343,27 @@ function blur() {
 
 directReplies = null;
 os.api("notes/children", {
-	noteId: appearNote.id,
+	noteId: note.id,
 	limit: 30,
 	depth: 12,
 }).then((res) => {
-	res = res.reduce((acc, note) => {
-		if (note.userId == appearNote.userId) {
-			return [...acc, note];
+	res = res.reduce((acc, resNote) => {
+		if (resNote.userId == note.userId) {
+			return [...acc, resNote];
 		}
-		return [note, ...acc];
+		return [resNote, ...acc];
 	}, []);
 	replies.value = res;
 	directReplies = res
-		.filter((note) => note.replyId === appearNote.id)
+		.filter((resNote) => resNote.replyId === note.id)
 		.reverse();
-	directQuotes = res.filter((note) => note.renoteId === appearNote.id);
+	directQuotes = res.filter((resNote) => resNote.renoteId === note.id);
 });
 
 conversation = null;
-if (appearNote.replyId) {
+if (note.replyId) {
 	os.api("notes/conversation", {
-		noteId: appearNote.replyId,
+		noteId: note.replyId,
 		limit: 30,
 	}).then((res) => {
 		conversation = res.reverse();
@@ -385,14 +373,14 @@ if (appearNote.replyId) {
 
 clips = null;
 os.api("notes/clips", {
-	noteId: appearNote.id,
+	noteId: note.id,
 }).then((res) => {
 	clips = res;
 });
 
 // const pagination = {
 // 	endpoint: "notes/renotes",
-// 	noteId: appearNote.id,
+// 	noteId: note.id,
 // 	limit: 10,
 // };
 
@@ -402,7 +390,7 @@ renotes = null;
 function loadTab() {
 	if (tab === "renotes" && !renotes) {
 		os.api("notes/renotes", {
-			noteId: appearNote.id,
+			noteId: note.id,
 			limit: 100,
 		}).then((res) => {
 			renotes = res;
@@ -414,7 +402,7 @@ async function onNoteUpdated(noteData: NoteUpdatedEvent): Promise<void> {
 	const { type, id, body } = noteData;
 
 	let found = -1;
-	if (id === appearNote.id) {
+	if (id === note.id) {
 		found = 0;
 	} else {
 		for (let i = 0; i < replies.value.length; i++) {
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index e3c0bd7c2d..fbb71bd16c 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -13,7 +13,7 @@
 					:name="$store.state.animation ? 'fade' : ''"
 					mode="out-in"
 				>
-					<div v-if="note" class="note">
+					<div v-if="appearNote" class="note">
 						<div v-if="showNext" class="_gap">
 							<XNotes
 								class="_content"
@@ -33,12 +33,12 @@
 							</MkButton>
 							<div class="note _gap">
 								<MkRemoteCaution
-									v-if="note.user.host != null"
-									:href="note.url ?? note.uri"
+									v-if="appearNote.user.host != null"
+									:href="appearNote.url ?? appearNote.uri"
 								/>
 								<XNoteDetailed
-									:key="note.id"
-									v-model:note="note"
+									:key="appearNote.id"
+									v-model:note="appearNote"
 									class="note"
 								/>
 							</div>
@@ -71,7 +71,6 @@
 <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";
@@ -90,15 +89,17 @@ let hasNext = $ref(false);
 let showPrev = $ref(false);
 let showNext = $ref(false);
 let error = $ref();
+let isRenote = $ref(false);
+let appearNote = $ref<null | misskey.entities.Note>();
 
 const prevPagination = {
 	endpoint: "users/notes" as const,
 	limit: 10,
 	params: computed(() =>
-		note
+		appearNote
 			? {
-					userId: note.userId,
-					untilId: note.id,
+					userId: appearNote.userId,
+					untilId: appearNote.id,
 			  }
 			: null
 	),
@@ -109,10 +110,10 @@ const nextPagination = {
 	endpoint: "users/notes" as const,
 	limit: 10,
 	params: computed(() =>
-		note
+		appearNote
 			? {
-					userId: note.userId,
-					sinceId: note.id,
+					userId: appearNote.userId,
+					sinceId: appearNote.id,
 			  }
 			: null
 	),
@@ -129,6 +130,13 @@ function fetchNote() {
 	})
 		.then((res) => {
 			note = res;
+			isRenote =
+				note.renote != null &&
+				note.text == null &&
+				note.fileIds.length === 0 &&
+				note.poll == null;
+			appearNote = isRenote ? (note.renote as misskey.entities.Note) : note;
+			
 			Promise.all([
 				os.api("users/notes", {
 					userId: note.userId,
@@ -160,19 +168,19 @@ const headerTabs = $computed(() => []);
 
 definePageMetadata(
 	computed(() =>
-		note
+		appearNote
 			? {
 					title: i18n.t("noteOf", {
-						user: note.user.name || note.user.username,
+						user: appearNote.user.name || appearNote.user.username,
 					}),
-					subtitle: new Date(note.createdAt).toLocaleString(),
-					avatar: note.user,
-					path: `/notes/${note.id}`,
+					subtitle: new Date(appearNote.createdAt).toLocaleString(),
+					avatar: appearNote.user,
+					path: `/notes/${appearNote.id}`,
 					share: {
 						title: i18n.t("noteOf", {
-							user: note.user.name || note.user.username,
+							user: appearNote.user.name || appearNote.user.username,
 						}),
-						text: note.text,
+						text: appearNote.text,
 					},
 			  }
 			: null

From eeb4a41d6c70b06847fcf1ee12fa0ed467befdda Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Sun, 28 May 2023 20:31:00 -0400
Subject: [PATCH 101/319] add channel federation warn

---
 locales/en-US.yml                      | 1 +
 packages/client/src/pages/channels.vue | 2 ++
 packages/client/src/style.scss         | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 84e68ea6bc..89bf10c9f1 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -685,6 +685,7 @@ logs: "Logs"
 delayed: "Delayed"
 database: "Database"
 channel: "Channels"
+channelFederationWarn: "Channels do not yet federate to other servers"
 create: "Create"
 notificationSetting: "Notification settings"
 notificationSettingDesc: "Select the types of notification to display."
diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue
index d03fb61d5a..c1e34ea444 100644
--- a/packages/client/src/pages/channels.vue
+++ b/packages/client/src/pages/channels.vue
@@ -7,6 +7,7 @@
 				:tabs="headerTabs"
 		/></template>
 		<MkSpacer :content-max="700">
+			<MkInfo class="_gap" :warn="true">{{ i18n.ts.channelFederationWarn }}</MkInfo>
 			<swiper
 				:round-lengths="true"
 				:touch-angle="25"
@@ -119,6 +120,7 @@ import MkInput from "@/components/form/input.vue";
 import MkRadios from "@/components/form/radios.vue";
 import MkButton from "@/components/MkButton.vue";
 import MkFolder from "@/components/MkFolder.vue";
+import MkInfo from "@/components/MkInfo.vue";
 import { useRouter } from "@/router";
 import { definePageMetadata } from "@/scripts/page-metadata";
 import { deviceKind } from "@/scripts/device-kind";
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index 4b914c4085..ea786b164e 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -298,6 +298,9 @@ hr {
 
 ._gap {
 	margin: var(--margin) 0;
+	&:first-child {
+		margin-top: 0;
+	}
 }
 
 // TODO: 廃止

From 98f9e3e5c47b29bbc3a4c8eab9787ee1de90529d Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Sun, 28 May 2023 20:24:48 -0400
Subject: [PATCH 102/319] use cuid2 with timestamp

---
 .config/example.yml                           | 22 ++++------
 .../native-utils/__test__/index.spec.mjs      |  8 ++--
 packages/backend/package.json                 |  1 +
 packages/backend/src/config/types.ts          |  5 ++-
 packages/backend/src/misc/gen-id.ts           | 42 +++++++++----------
 pnpm-lock.yaml                                | 13 ++++++
 6 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/.config/example.yml b/.config/example.yml
index 7d8ba32be6..a83e02eda3 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -85,20 +85,16 @@ redis:
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────
 
-# You can select the ID generation method.
-# You don't usually need to change this setting, but you can
-# change it according to your preferences.
+# No need to uncomment in most cases, but you may want to change
+# these settings if you plan to run a large and/or distributed server.
 
-# Available methods:
-# aid ... Short, Millisecond accuracy
-# meid ... Similar to ObjectID, Millisecond accuracy
-# ulid ... Millisecond accuracy
-# objectid ... This is left for backward compatibility
-
-# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
-# ID SETTINGS AFTER THAT!
-
-id: 'aid'
+# cuid: {
+#   # Min 16, Max 24
+#   length: 16,
+#   # Set this to a unique string across workers (e.g., machine's hostname)
+#   # if your workers are running in multiple hosts.
+#   fingerprint: "my-fingerperint",
+# }
 
 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────
diff --git a/packages/backend/native-utils/__test__/index.spec.mjs b/packages/backend/native-utils/__test__/index.spec.mjs
index 0d41e012dd..7d68d6ac36 100644
--- a/packages/backend/native-utils/__test__/index.spec.mjs
+++ b/packages/backend/native-utils/__test__/index.spec.mjs
@@ -1,7 +1,9 @@
 import test from "ava";
 
-import { sum } from "../index.js";
+import { convertId, IdConvertType } from "../built/index.js";
 
-test("sum from native", (t) => {
-	t.is(sum(1, 2), 3);
+test("convert to mastodon id", (t) => {
+	t.is(convertId("9gf61ehcxv", IdConvertType.MastodonId), "960365976481219");
+	t.is(convertId("9fbr9z0wbrjqyd3u", IdConvertType.MastodonId), "3954607381600562394");
+	t.is(convertId("9fbs680oyviiqrol9md73p8g", IdConvertType.MastodonId), "3494513243013053824")
 });
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 96edb7f026..c0c5e24f90 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -32,6 +32,7 @@
 		"@koa/cors": "3.4.3",
 		"@koa/multer": "3.0.0",
 		"@koa/router": "9.0.1",
+		"@paralleldrive/cuid2": "2.2.0",
 		"@peertube/http-signature": "1.7.0",
 		"@redocly/openapi-core": "1.0.0-beta.120",
 		"@sinonjs/fake-timers": "9.1.2",
diff --git a/packages/backend/src/config/types.ts b/packages/backend/src/config/types.ts
index 01a98f9f09..e01c67ade1 100644
--- a/packages/backend/src/config/types.ts
+++ b/packages/backend/src/config/types.ts
@@ -54,7 +54,10 @@ export type Source = {
 
 	onlyQueueProcessor?: boolean;
 
-	id: string;
+	cuid?: {
+		length?: number;
+		fingerprint?: string;
+	};
 
 	outgoingAddressFamily?: "ipv4" | "ipv6" | "dual";
 
diff --git a/packages/backend/src/misc/gen-id.ts b/packages/backend/src/misc/gen-id.ts
index b7cc0965a1..fb92dd808c 100644
--- a/packages/backend/src/misc/gen-id.ts
+++ b/packages/backend/src/misc/gen-id.ts
@@ -1,27 +1,27 @@
-import { ulid } from "ulid";
-import { genAid } from "./id/aid.js";
-import { genMeid } from "./id/meid.js";
-import { genMeidg } from "./id/meidg.js";
-import { genObjectId } from "./id/object-id.js";
+import { init, createId } from "@paralleldrive/cuid2";
 import config from "@/config/index.js";
 
-const metohd = config.id.toLowerCase();
+const TIME2000 = 946684800000;
+const TIMESTAMP_LENGTH = 8;
 
+const length =
+	Math.min(Math.max(config.cuid?.length ?? 16, 16), 24) - TIMESTAMP_LENGTH;
+const fingerprint = `${config.cuid?.fingerprint ?? ""}${createId()}`;
+
+const genCuid2 = init({ length, fingerprint });
+
+/**
+ * The generated ID results in the form of `[8 chars timestamp] + [cuid2]`.
+ * The minimum and maximum lengths are 16 and 24, respectively.
+ * With the length of 16, namely 8 for cuid2, roughly 1427399 IDs are needed
+ * in the same millisecond to reach 50% chance of collision.
+ *
+ * Ref: https://github.com/paralleldrive/cuid2#parameterized-length
+ */
 export function genId(date?: Date): string {
-	if (!date || date > new Date()) date = new Date();
+	const now = (date ?? new Date()).getTime();
+	const time = Math.max(now - TIME2000, 0);
+	const timestamp = time.toString(36).padStart(TIMESTAMP_LENGTH, "0");
 
-	switch (metohd) {
-		case "aid":
-			return genAid(date);
-		case "meid":
-			return genMeid(date);
-		case "meidg":
-			return genMeidg(date);
-		case "ulid":
-			return ulid(date.getTime());
-		case "objectid":
-			return genObjectId(date);
-		default:
-			throw new Error("unrecognized id generation method");
-	}
+	return `${timestamp}${genCuid2()}`;
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 493e9fc062..b1ec8dbd64 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -104,6 +104,9 @@ importers:
       '@koa/router':
         specifier: 9.0.1
         version: 9.0.1
+      '@paralleldrive/cuid2':
+        specifier: 2.2.0
+        version: 2.2.0
       '@peertube/http-signature':
         specifier: 1.7.0
         version: 1.7.0
@@ -2277,6 +2280,10 @@ packages:
     hasBin: true
     dev: false
 
+  /@noble/hashes@1.3.0:
+    resolution: {integrity: sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg==}
+    dev: false
+
   /@nodelib/fs.scandir@2.1.5:
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
@@ -2330,6 +2337,12 @@ packages:
       through: 2.3.4
     dev: false
 
+  /@paralleldrive/cuid2@2.2.0:
+    resolution: {integrity: sha512-CVQDpPIUHrUGGLdrMGz1NmqZvqmsB2j2rCIQEu1EvxWjlFh4fhvEGmgR409cY20/67/WlJsggenq0no3p3kYsw==}
+    dependencies:
+      '@noble/hashes': 1.3.0
+    dev: false
+
   /@peertube/http-signature@1.7.0:
     resolution: {integrity: sha512-aGQIwo6/sWtyyqhVK4e1MtxYz4N1X8CNt6SOtCc+Wnczs5S5ONaLHDDR8LYaGn0MgOwvGgXyuZ5sJIfd7iyoUw==}
     engines: {node: '>=0.10'}

From 544e3a008e667039133ed3a9497f170c93a7af1a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 28 May 2023 20:14:08 -0700
Subject: [PATCH 103/319] =?UTF-8?q?feat:=20=E2=9C=A8=20server=20info=20wid?=
 =?UTF-8?q?get?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Syuilo <syuilotan@yahoo.co.jp>
---
 locales/en-US.yml                             |  23 ++--
 .../backend/src/models/repositories/user.ts   |  23 ++--
 .../client/src/components/MkMediaImage.vue    |   2 +-
 .../client/src/components/MkMediaList.vue     |  13 +-
 .../client/src/components/MkMediaVideo.vue    |   4 +-
 .../client/src/components/MkNoteDetailed.vue  |   8 +-
 .../src/components/MkSubNoteContent.vue       |  29 +++--
 packages/client/src/pages/note.vue            |  10 +-
 packages/client/src/widgets/index.ts          |   5 +
 packages/client/src/widgets/server-info.vue   | 114 ++++++++++++++++++
 10 files changed, 181 insertions(+), 50 deletions(-)
 create mode 100644 packages/client/src/widgets/server-info.vue

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 84e68ea6bc..57afc1766e 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1526,28 +1526,29 @@ _weekday:
   friday: "Friday"
   saturday: "Saturday"
 _widgets:
-  memo: "Sticky notes"
+  memo: "Sticky Notes"
   notifications: "Notifications"
   timeline: "Timeline"
   calendar: "Calendar"
   trends: "Trending"
   clock: "Clock"
-  rss: "RSS reader"
-  rssTicker: "RSS-Ticker"
+  rss: "RSS Reader"
+  rssTicker: "RSS Ticker"
   activity: "Activity"
   photos: "Photos"
-  digitalClock: "Digital clock"
-  unixClock: "UNIX clock"
+  digitalClock: "Digital Clock"
+  unixClock: "UNIX Clock"
   federation: "Federation"
-  instanceCloud: "Server cloud"
-  postForm: "Posting form"
+  instanceCloud: "Server Cloud"
+  postForm: "Posting Form"
   slideshow: "Slideshow"
   button: "Button"
-  onlineUsers: "Online users"
+  onlineUsers: "Online Users"
   jobQueue: "Job Queue"
-  serverMetric: "Server metrics"
-  aiscript: "AiScript console"
-  userList: "User list"
+  serverMetric: "Server Metrics"
+  aiscript: "AiScript Console"
+  userList: "User List"
+  serverInfo: "Server Info"
   _userList:
     chooseList: "Select a list"
 _cw:
diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index 5e0b83792d..1ca9b32893 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -257,17 +257,22 @@ export const UserRepository = db.getRepository(User).extend({
 
 	async getHasUnreadAntenna(userId: User["id"]): Promise<boolean> {
 		try {
-  const myAntennas = (await getAntennas()).filter((a) => a.userId === userId);
+			const myAntennas = (await getAntennas()).filter(
+				(a) => a.userId === userId,
+			);
 
-		const unread =
-			myAntennas.length > 0
-				? await AntennaNotes.findOneBy({
-						antennaId: In(myAntennas.map((x) => x.id)),
-						read: false,
-				  })
-				: null;
+			const unread =
+				myAntennas.length > 0
+					? await AntennaNotes.findOneBy({
+							antennaId: In(myAntennas.map((x) => x.id)),
+							read: false,
+					  })
+					: null;
 
-		return unread != null; } catch(e) { return false; }
+			return unread != null;
+		} catch (e) {
+			return false;
+		}
 	},
 
 	async getHasUnreadChannel(userId: User["id"]): Promise<boolean> {
diff --git a/packages/client/src/components/MkMediaImage.vue b/packages/client/src/components/MkMediaImage.vue
index 74f45c69c7..9097a4771c 100644
--- a/packages/client/src/components/MkMediaImage.vue
+++ b/packages/client/src/components/MkMediaImage.vue
@@ -91,7 +91,7 @@ watch(
 		align-items: center;
 		padding: 30px;
 		box-sizing: border-box;
-		background: rgba(0,0,0,0.5);
+		background: rgba(0, 0, 0, 0.5);
 
 		> .wrapper {
 			display: table-cell;
diff --git a/packages/client/src/components/MkMediaList.vue b/packages/client/src/components/MkMediaList.vue
index 901aceeff5..c01ccd5d81 100644
--- a/packages/client/src/components/MkMediaList.vue
+++ b/packages/client/src/components/MkMediaList.vue
@@ -11,10 +11,7 @@
 			:data-count="previewableCount < 5 ? previewableCount : null"
 			:class="{ dmWidth: inDm }"
 		>
-			<div
-				ref="gallery"
-				@click.stop
-			>
+			<div ref="gallery" @click.stop>
 				<template
 					v-for="media in mediaList.filter((media) =>
 						previewable(media)
@@ -189,7 +186,9 @@ const previewable = (file: misskey.entities.DriveFile): boolean => {
 		FILE_TYPE_BROWSERSAFE.includes(file.type)
 	);
 };
-const previewableCount = props.mediaList.filter((media) => previewable(media)).length;
+const previewableCount = props.mediaList.filter((media) =>
+	previewable(media)
+).length;
 </script>
 
 <style lang="scss" scoped>
@@ -251,14 +250,14 @@ const previewableCount = props.mediaList.filter((media) => previewable(media)).l
 			display: grid;
 			grid-gap: 8px;
 
-			> div, > button {
+			> div,
+			> button {
 				overflow: hidden;
 				border-radius: 6px;
 				pointer-events: all;
 				min-height: 50px;
 			}
 
-
 			> :nth-child(1) {
 				grid-column: 1 / 2;
 				grid-row: 1 / 2;
diff --git a/packages/client/src/components/MkMediaVideo.vue b/packages/client/src/components/MkMediaVideo.vue
index 29d85d9a3d..21f8aceddf 100644
--- a/packages/client/src/components/MkMediaVideo.vue
+++ b/packages/client/src/components/MkMediaVideo.vue
@@ -75,11 +75,11 @@ const hide = ref(
 onMounted(() => {
 	mini.value = plyr.value.player.media.scrollWidth < 300;
 	if (mini.value) {
-		plyr.value.player.on('play', () => {
+		plyr.value.player.on("play", () => {
 			plyr.value.player.fullscreen.enter();
 		});
 	}
-})
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 8801e39556..68e33d701f 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -73,9 +73,7 @@
 			:detailedView="true"
 			:parentId="note.id"
 		/>
-		<MkLoading
-			v-else-if="tab === 'replies' && note.repliesCount > 0"
-		/>
+		<MkLoading v-else-if="tab === 'replies' && note.repliesCount > 0" />
 
 		<MkNoteSub
 			v-if="directQuotes && tab === 'quotes'"
@@ -103,9 +101,7 @@
 			:with-chart="false"
 		/>
 		<!-- </MkPagination> -->
-		<MkLoading
-			v-else-if="tab === 'renotes' && note.renoteCount > 0"
-		/>
+		<MkLoading v-else-if="tab === 'renotes' && note.renoteCount > 0" />
 
 		<div v-if="tab === 'clips' && clips.length > 0" class="_content clips">
 			<MkA
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index ea09770548..d6263cfd2b 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -97,7 +97,10 @@
 					:to="`/notes/${note.renoteId}`"
 					>{{ i18n.ts.quoteAttached }}: ...</MkA
 				>
-				<XMediaList v-if="note.files.length > 0" :media-list="note.files" />
+				<XMediaList
+					v-if="note.files.length > 0"
+					:media-list="note.files"
+				/>
 				<XPoll v-if="note.poll" :note="note" class="poll" />
 				<template v-if="detailed">
 					<MkUrlPreview
@@ -151,7 +154,10 @@
 				<i class="ph-stop ph-bold"></i> {{ i18n.ts._mfm.stop }}
 			</template>
 		</MkButton>
-		<div v-if="(isLong && !collapsed) || (props.note.cw && showContent)" class="fade"></div>
+		<div
+			v-if="(isLong && !collapsed) || (props.note.cw && showContent)"
+			class="fade"
+		></div>
 	</div>
 </template>
 
@@ -188,13 +194,13 @@ const emit = defineEmits<{
 
 const cwButton = ref<HTMLElement>();
 const showMoreButton = ref<HTMLElement>();
-const isLong = !props.detailedView
-	&& ( props.note.cw == null
-		&& (props.note.text != null
-			&& (props.note.text.split("\n").length > 9 || props.note.text.length > 500)
-		)
-		|| props.note.files.length > 4
-	);
+const isLong =
+	!props.detailedView &&
+	((props.note.cw == null &&
+		props.note.text != null &&
+		(props.note.text.split("\n").length > 9 ||
+			props.note.text.length > 500)) ||
+		props.note.files.length > 4);
 
 const collapsed = $ref(props.note.cw == null && isLong);
 
@@ -238,7 +244,8 @@ function focusFooter(ev) {
 </script>
 
 <style lang="scss" scoped>
-:deep(a), :deep(button) {
+:deep(a),
+:deep(button) {
 	position: relative;
 	z-index: 2;
 }
@@ -390,7 +397,7 @@ function focusFooter(ev) {
 			background: var(--panel);
 			mask: linear-gradient(to top, var(--gradient));
 			-webkit-mask: linear-gradient(to top, var(--gradient));
-			transition: background .2s;
+			transition: background 0.2s;
 		}
 	}
 }
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index fbb71bd16c..c127ad0df4 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -135,8 +135,10 @@ function fetchNote() {
 				note.text == null &&
 				note.fileIds.length === 0 &&
 				note.poll == null;
-			appearNote = isRenote ? (note.renote as misskey.entities.Note) : note;
-			
+			appearNote = isRenote
+				? (note.renote as misskey.entities.Note)
+				: note;
+
 			Promise.all([
 				os.api("users/notes", {
 					userId: note.userId,
@@ -178,7 +180,9 @@ definePageMetadata(
 					path: `/notes/${appearNote.id}`,
 					share: {
 						title: i18n.t("noteOf", {
-							user: appearNote.user.name || appearNote.user.username,
+							user:
+								appearNote.user.name ||
+								appearNote.user.username,
 						}),
 						text: appearNote.text,
 					},
diff --git a/packages/client/src/widgets/index.ts b/packages/client/src/widgets/index.ts
index 216afa5260..4c48811a96 100644
--- a/packages/client/src/widgets/index.ts
+++ b/packages/client/src/widgets/index.ts
@@ -89,6 +89,10 @@ export default function (app: App) {
 		"MkwUserList",
 		defineAsyncComponent(() => import("./user-list.vue")),
 	);
+	app.component(
+		"MkwServerInfo",
+		defineAsyncComponent(() => import("./server-info.vue")),
+	);
 }
 
 export const widgets = [
@@ -110,6 +114,7 @@ export const widgets = [
 	"postForm",
 	"slideshow",
 	"serverMetric",
+	"serverInfo",
 	"onlineUsers",
 	"jobQueue",
 	"button",
diff --git a/packages/client/src/widgets/server-info.vue b/packages/client/src/widgets/server-info.vue
new file mode 100644
index 0000000000..852a9dcf2c
--- /dev/null
+++ b/packages/client/src/widgets/server-info.vue
@@ -0,0 +1,114 @@
+<template>
+	<div class="_panel">
+		<div
+			:class="$style.container"
+			:style="{
+				backgroundImage: instance.bannerUrl
+					? `url(${instance.bannerUrl})`
+					: null,
+			}"
+		>
+			<div :class="$style.iconContainer">
+				<img
+					:src="
+						instance.iconUrl ??
+						instance.faviconUrl ??
+						'/favicon.ico'
+					"
+					alt=""
+					:class="$style.icon"
+				/>
+			</div>
+			<div :class="$style.bodyContainer">
+				<div :class="$style.body">
+					<MkA :class="$style.name" to="/about" behavior="window">{{
+						instance.name
+					}}</MkA>
+					<div :class="$style.host">{{ host }}</div>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script lang="ts" setup>
+import {
+	useWidgetPropsManager,
+	Widget,
+	WidgetComponentEmits,
+	WidgetComponentExpose,
+	WidgetComponentProps,
+} from "./widget";
+import { GetFormResultType } from "@/scripts/form";
+import { host } from "@/config";
+import { instance } from "@/instance";
+
+const name = "serverInfo";
+
+const widgetPropsDef = {};
+
+type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
+
+const props = defineProps<WidgetComponentProps<WidgetProps>>();
+const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
+
+const { widgetProps, configure } = useWidgetPropsManager(
+	name,
+	widgetPropsDef,
+	props,
+	emit
+);
+
+defineExpose<WidgetComponentExpose>({
+	name,
+	configure,
+	id: props.widget ? props.widget.id : null,
+});
+</script>
+
+<style lang="scss" module>
+.container {
+	position: relative;
+	background-size: cover;
+	background-position: center;
+	display: flex;
+}
+
+.iconContainer {
+	display: inline-block;
+	text-align: center;
+	padding: 16px;
+}
+
+.icon {
+	display: inline-block;
+	width: 60px;
+	height: 60px;
+	border-radius: 8px;
+	box-sizing: border-box;
+	border: solid 3px var(--panelBorder);
+}
+
+.bodyContainer {
+	display: flex;
+	align-items: center;
+	min-width: 0;
+	padding: 0 16px 0 0;
+}
+
+.body {
+	text-overflow: ellipsis;
+	overflow: clip;
+}
+
+.name,
+.host {
+	color: var(--fg);
+	text-shadow: -1px -1px 0 var(--bg), 1px -1px 0 var(--bg),
+		-1px 1px 0 var(--bg), 1px 1px 0 var(--bg);
+}
+
+.host {
+	font-weight: bold;
+}
+</style>

From 2cf1d9f630bdeeab3fd7a8e3409b76bc8b1720da Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 28 May 2023 20:34:18 -0700
Subject: [PATCH 104/319] chore: formatting

---
 locales/en-US.yml                             |   2 +-
 packages/backend/src/db/meilisearch.ts        | 360 +++++++++---------
 .../processors/background/index-all-notes.ts  |  14 +-
 .../src/server/api/endpoints/notes/search.ts  |   2 +-
 packages/client/src/scripts/search.ts         |   2 +-
 .../src/widgets/server-metric/meilisearch.vue |   4 +-
 6 files changed, 192 insertions(+), 192 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index e402b1c620..5184df4bef 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -5,7 +5,7 @@ introMisskey: "Welcome! Calckey is an open source, decentralized social media pl
   \ that's free forever! \U0001F680"
 monthAndDay: "{month}/{day}"
 search: "Search"
-search_placeholder: "Enter search terms..."
+searchPlaceholder: "Search Calckey"
 notifications: "Notifications"
 username: "Username"
 password: "Password"
diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 5d294b95dd..7e176e0583 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -1,11 +1,11 @@
-import {Health, MeiliSearch, Stats} from "meilisearch";
-import {dbLogger} from "./logger.js";
+import { Health, MeiliSearch, Stats } from "meilisearch";
+import { dbLogger } from "./logger.js";
 
 import config from "@/config/index.js";
-import {Note} from "@/models/entities/note.js";
+import { Note } from "@/models/entities/note.js";
 import * as url from "url";
-import {ILocalUser, User} from "@/models/entities/user.js";
-import {Followings, Users} from "@/models/index.js";
+import { ILocalUser, User } from "@/models/entities/user.js";
+import { Followings, Users } from "@/models/index.js";
 
 const logger = dbLogger.createSubLogger("meilisearch", "gray", false);
 
@@ -72,195 +72,195 @@ export type MeilisearchNote = {
 
 export default hasConfig
 	? {
-		search: async (
-			query: string,
-			limit: number,
-			offset: number,
-			userCtx: ILocalUser | null,
-		) => {
-			/// Advanced search syntax
-			/// from:user => filter by user + optional domain
-			/// has:image/video/audio/text/file => filter by attachment types
-			/// domain:domain.com => filter by domain
-			/// before:Date => show posts made before Date
-			/// after: Date => show posts made after Date
-			/// "text" => get posts with exact text between quotes
-			/// filter:following => show results only from users you follow
-			/// filter:followers => show results only from followers
+			search: async (
+				query: string,
+				limit: number,
+				offset: number,
+				userCtx: ILocalUser | null,
+			) => {
+				/// Advanced search syntax
+				/// from:user => filter by user + optional domain
+				/// has:image/video/audio/text/file => filter by attachment types
+				/// domain:domain.com => filter by domain
+				/// before:Date => show posts made before Date
+				/// after: Date => show posts made after Date
+				/// "text" => get posts with exact text between quotes
+				/// filter:following => show results only from users you follow
+				/// filter:followers => show results only from followers
 
-			let constructedFilters: string[] = [];
+				let constructedFilters: string[] = [];
 
-			let splitSearch = query.split(" ");
+				let splitSearch = query.split(" ");
 
-			// Detect search operators and remove them from the actual query
-			let filteredSearchTerms = (
-				await Promise.all(
-					splitSearch.map(async (term) => {
-						if (term.startsWith("has:")) {
-							let fileType = term.slice(4);
-							constructedFilters.push(`mediaAttachment = "${fileType}"`);
-							return null;
-						} else if (term.startsWith("from:")) {
-							let user = term.slice(5);
-							constructedFilters.push(`userName = ${user}`);
-							return null;
-						} else if (term.startsWith("domain:")) {
-							let domain = term.slice(7);
-							constructedFilters.push(`userHost = ${domain}`);
-							return null;
-						} else if (term.startsWith("after:")) {
-							let timestamp = term.slice(6);
-							// Try to parse the timestamp as JavaScript Date
-							let date = Date.parse(timestamp);
-							if (isNaN(date)) return null;
-							constructedFilters.push(`createdAt > ${date / 1000}`);
-							return null;
-						} else if (term.startsWith("before:")) {
-							let timestamp = term.slice(7);
-							// Try to parse the timestamp as JavaScript Date
-							let date = Date.parse(timestamp);
-							if (isNaN(date)) return null;
-							constructedFilters.push(`createdAt < ${date / 1000}`);
-							return null;
-						} else if (term.startsWith("filter:following")) {
-							// Check if we got a context user
-							if (userCtx) {
-								// Fetch user follows from DB
-								let followedUsers = await Followings.find({
-									where: {
-										followerId: userCtx.id,
-									},
-									select: {
-										followeeId: true,
-									},
-								});
-								let followIDs = followedUsers.map((user) => user.followeeId);
+				// Detect search operators and remove them from the actual query
+				let filteredSearchTerms = (
+					await Promise.all(
+						splitSearch.map(async (term) => {
+							if (term.startsWith("has:")) {
+								let fileType = term.slice(4);
+								constructedFilters.push(`mediaAttachment = "${fileType}"`);
+								return null;
+							} else if (term.startsWith("from:")) {
+								let user = term.slice(5);
+								constructedFilters.push(`userName = ${user}`);
+								return null;
+							} else if (term.startsWith("domain:")) {
+								let domain = term.slice(7);
+								constructedFilters.push(`userHost = ${domain}`);
+								return null;
+							} else if (term.startsWith("after:")) {
+								let timestamp = term.slice(6);
+								// Try to parse the timestamp as JavaScript Date
+								let date = Date.parse(timestamp);
+								if (isNaN(date)) return null;
+								constructedFilters.push(`createdAt > ${date / 1000}`);
+								return null;
+							} else if (term.startsWith("before:")) {
+								let timestamp = term.slice(7);
+								// Try to parse the timestamp as JavaScript Date
+								let date = Date.parse(timestamp);
+								if (isNaN(date)) return null;
+								constructedFilters.push(`createdAt < ${date / 1000}`);
+								return null;
+							} else if (term.startsWith("filter:following")) {
+								// Check if we got a context user
+								if (userCtx) {
+									// Fetch user follows from DB
+									let followedUsers = await Followings.find({
+										where: {
+											followerId: userCtx.id,
+										},
+										select: {
+											followeeId: true,
+										},
+									});
+									let followIDs = followedUsers.map((user) => user.followeeId);
 
-								if (followIDs.length === 0) return null;
+									if (followIDs.length === 0) return null;
 
-								constructedFilters.push(`userId IN [${followIDs.join(",")}]`);
-							} else {
-								logger.warn(
-									"search filtered to follows called without user context",
-								);
+									constructedFilters.push(`userId IN [${followIDs.join(",")}]`);
+								} else {
+									logger.warn(
+										"search filtered to follows called without user context",
+									);
+								}
+
+								return null;
+							} else if (term.startsWith("filter:followers")) {
+								// Check if we got a context user
+								if (userCtx) {
+									// Fetch users follows from DB
+									let followedUsers = await Followings.find({
+										where: {
+											followeeId: userCtx.id,
+										},
+										select: {
+											followerId: true,
+										},
+									});
+									let followIDs = followedUsers.map((user) => user.followerId);
+
+									if (followIDs.length === 0) return null;
+
+									constructedFilters.push(`userId IN [${followIDs.join(",")}]`);
+								} else {
+									logger.warn(
+										"search filtered to followers called without user context",
+									);
+								}
+
+								return null;
 							}
 
-							return null;
-						} else if (term.startsWith("filter:followers")) {
-							// Check if we got a context user
-							if (userCtx) {
-								// Fetch users follows from DB
-								let followedUsers = await Followings.find({
-									where: {
-										followeeId: userCtx.id,
-									},
-									select: {
-										followerId: true,
-									},
-								});
-								let followIDs = followedUsers.map((user) => user.followerId);
+							return term;
+						}),
+					)
+				).filter((term) => term !== null);
 
-								if (followIDs.length === 0) return null;
+				let sortRules = [];
 
-								constructedFilters.push(`userId IN [${followIDs.join(",")}]`);
-							} else {
-								logger.warn(
-									"search filtered to followers called without user context",
-								);
-							}
+				// An empty search term with defined filters means we have a placeholder search => https://www.meilisearch.com/docs/reference/api/search#placeholder-search
+				// These have to be ordered manually, otherwise the *oldest* posts are returned first, which we don't want
+				if (filteredSearchTerms.length === 0 && constructedFilters.length > 0) {
+					sortRules.push("createdAt:desc");
+				}
 
-							return null;
+				logger.info(`Searching for ${filteredSearchTerms.join(" ")}`);
+				logger.info(`Limit: ${limit}`);
+				logger.info(`Offset: ${offset}`);
+				logger.info(`Filters: ${constructedFilters}`);
+				logger.info(`Ordering: ${sortRules}`);
+
+				return posts.search(filteredSearchTerms.join(" "), {
+					limit: limit,
+					offset: offset,
+					filter: constructedFilters,
+					sort: sortRules,
+				});
+			},
+			ingestNote: async (ingestNotes: Note | Note[]) => {
+				if (ingestNotes instanceof Note) {
+					ingestNotes = [ingestNotes];
+				}
+
+				let indexingBatch: MeilisearchNote[] = [];
+
+				for (let note of ingestNotes) {
+					if (note.user === undefined) {
+						note.user = await Users.findOne({
+							where: {
+								id: note.userId,
+							},
+						});
+					}
+
+					let attachmentType = "";
+					if (note.attachedFileTypes.length > 0) {
+						attachmentType = note.attachedFileTypes[0].split("/")[0];
+						switch (attachmentType) {
+							case "image":
+							case "video":
+							case "audio":
+							case "text":
+								break;
+							default:
+								attachmentType = "file";
+								break;
 						}
+					}
 
-						return term;
-					}),
-				)
-			).filter((term) => term !== null);
-
-			let sortRules = [];
-
-			// An empty search term with defined filters means we have a placeholder search => https://www.meilisearch.com/docs/reference/api/search#placeholder-search
-			// These have to be ordered manually, otherwise the *oldest* posts are returned first, which we don't want
-			if (filteredSearchTerms.length === 0 && constructedFilters.length > 0) {
-				sortRules.push("createdAt:desc");
-			}
-
-			logger.info(`Searching for ${filteredSearchTerms.join(" ")}`);
-			logger.info(`Limit: ${limit}`);
-			logger.info(`Offset: ${offset}`);
-			logger.info(`Filters: ${constructedFilters}`);
-			logger.info(`Ordering: ${sortRules}`);
-
-			return posts.search(filteredSearchTerms.join(" "), {
-				limit: limit,
-				offset: offset,
-				filter: constructedFilters,
-				sort: sortRules,
-			});
-		},
-		ingestNote: async (ingestNotes: Note | Note[]) => {
-			if (ingestNotes instanceof Note) {
-				ingestNotes = [ingestNotes];
-			}
-
-			let indexingBatch: MeilisearchNote[] = [];
-
-			for (let note of ingestNotes) {
-				if (note.user === undefined) {
-					note.user = await Users.findOne({
-						where: {
-							id: note.userId,
-						},
+					indexingBatch.push(<MeilisearchNote>{
+						id: note.id.toString(),
+						text: note.text ? note.text : "",
+						userId: note.userId,
+						userHost:
+							note.userHost !== ""
+								? note.userHost
+								: url.parse(config.host).host,
+						channelId: note.channelId ? note.channelId : "",
+						mediaAttachment: attachmentType,
+						userName: note.user?.username ?? "UNKNOWN",
+						createdAt: note.createdAt.getTime() / 1000, // division by 1000 is necessary because Node returns in ms-accuracy
 					});
 				}
 
-				let attachmentType = "";
-				if (note.attachedFileTypes.length > 0) {
-					attachmentType = note.attachedFileTypes[0].split("/")[0];
-					switch (attachmentType) {
-						case "image":
-						case "video":
-						case "audio":
-						case "text":
-							break;
-						default:
-							attachmentType = "file";
-							break;
-					}
-				}
+				return posts
+					.addDocuments(indexingBatch, {
+						primaryKey: "id",
+					})
+					.then(() =>
+						console.log(`sent ${indexingBatch.length} posts for indexing`),
+					);
+			},
+			serverStats: async () => {
+				let health: Health = await client.health();
+				let stats: Stats = await client.getStats();
 
-				indexingBatch.push(<MeilisearchNote>{
-					id: note.id.toString(),
-					text: note.text ? note.text : "",
-					userId: note.userId,
-					userHost:
-						note.userHost !== ""
-							? note.userHost
-							: url.parse(config.host).host,
-					channelId: note.channelId ? note.channelId : "",
-					mediaAttachment: attachmentType,
-					userName: note.user?.username ?? "UNKNOWN",
-					createdAt: note.createdAt.getTime() / 1000, // division by 1000 is necessary because Node returns in ms-accuracy
-				});
-			}
-
-			return posts
-				.addDocuments(indexingBatch, {
-					primaryKey: "id",
-				})
-				.then(() =>
-					console.log(`sent ${indexingBatch.length} posts for indexing`),
-				);
-		},
-		serverStats: async () => {
-			let health: Health = await client.health();
-			let stats: Stats = await client.getStats();
-
-			return {
-				health: health.status,
-				size: stats.databaseSize,
-				indexed_count: stats.indexes["posts"].numberOfDocuments,
-			};
-		},
-	}
+				return {
+					health: health.status,
+					size: stats.databaseSize,
+					indexed_count: stats.indexes["posts"].numberOfDocuments,
+				};
+			},
+	  }
 	: null;
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 646984c938..10c332aa3b 100644
--- a/packages/backend/src/queue/processors/background/index-all-notes.ts
+++ b/packages/backend/src/queue/processors/background/index-all-notes.ts
@@ -1,10 +1,10 @@
 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";
+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";
 import meilisearch from "../../../db/meilisearch.js";
 
 const logger = queueLogger.createSubLogger("index-all-notes");
@@ -33,7 +33,7 @@ export default async function indexAllNotes(
 		try {
 			notes = await Notes.find({
 				where: {
-					...(cursor ? {id: MoreThan(cursor)} : {}),
+					...(cursor ? { id: MoreThan(cursor) } : {}),
 				},
 				take: take,
 				order: {
@@ -69,7 +69,7 @@ export default async function indexAllNotes(
 
 			indexedCount += chunk.length;
 			const pct = (indexedCount / total) * 100;
-			job.update({indexedCount, cursor, total});
+			job.update({ indexedCount, cursor, total });
 			job.progress(+pct.toFixed(1));
 			logger.info(`Indexed notes ${indexedCount}/${total ? total : "?"}`);
 		}
diff --git a/packages/backend/src/server/api/endpoints/notes/search.ts b/packages/backend/src/server/api/endpoints/notes/search.ts
index 3463044701..d0c2f8d778 100644
--- a/packages/backend/src/server/api/endpoints/notes/search.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search.ts
@@ -4,7 +4,7 @@ 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 meilisearch, {MeilisearchNote} from "../../../../db/meilisearch.js";
+import meilisearch, { MeilisearchNote } from "../../../../db/meilisearch.js";
 import define from "../../define.js";
 import { makePaginationQuery } from "../../common/make-pagination-query.js";
 import { generateVisibilityQuery } from "../../common/generate-visibility-query.js";
diff --git a/packages/client/src/scripts/search.ts b/packages/client/src/scripts/search.ts
index e405115bfb..c6eb497eab 100644
--- a/packages/client/src/scripts/search.ts
+++ b/packages/client/src/scripts/search.ts
@@ -5,7 +5,7 @@ import { mainRouter } from "@/router";
 export async function search() {
 	const { canceled, result: query } = await os.inputText({
 		title: i18n.ts.search,
-		placeholder: i18n.ts.search_placeholder,
+		placeholder: i18n.ts.searchPlaceholder,
 		text:
 			"Advanced search operators\n" +
 			"from:user => filter by user\n" +
diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
index 403e0154f7..f9993cd096 100644
--- a/packages/client/src/widgets/server-metric/meilisearch.vue
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -11,9 +11,9 @@
 </template>
 
 <script lang="ts" setup>
-import {onBeforeUnmount, onMounted} from "vue";
+import { onBeforeUnmount, onMounted } from "vue";
 import bytes from "@/filters/bytes";
-import {i18n} from "@/i18n";
+import { i18n } from "@/i18n";
 
 const props = defineProps<{
 	connection: any;

From 9be629919a7d94a9bc64bbe077d7c264fa621690 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 28 May 2023 20:37:53 -0700
Subject: [PATCH 105/319] add pie chart to meili stats

---
 .../client/src/widgets/server-metric/meilisearch.vue  | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
index f9993cd096..4047793f51 100644
--- a/packages/client/src/widgets/server-metric/meilisearch.vue
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -1,5 +1,6 @@
 <template>
 	<div class="ms_stats">
+		<XPie class="pie" :value="progress" />
 		<div>
 			<p><i class="ph-file-search ph-bold ph-lg"></i>MeiliSearch</p>
 			<p>{{ i18n.ts._widgets.meiliStatus }}: {{ available }}</p>
@@ -13,6 +14,7 @@
 <script lang="ts" setup>
 import { onBeforeUnmount, onMounted } from "vue";
 import bytes from "@/filters/bytes";
+import XPie from "./pie.vue";
 import { i18n } from "@/i18n";
 
 const props = defineProps<{
@@ -20,6 +22,8 @@ const props = defineProps<{
 	meta: any;
 }>();
 
+let progress: number = $ref(0);
+
 let total_size: number = $ref(0);
 let index_count: number = $ref(0);
 let available: string = $ref("unavailable");
@@ -28,6 +32,7 @@ function onStats(stats) {
 	total_size = stats.meilisearch.size;
 	index_count = stats.meilisearch.indexed_count;
 	available = stats.meilisearch.health;
+	progress = Math.floor((index_count / total_size) * 100);
 }
 
 onMounted(() => {
@@ -43,6 +48,12 @@ onBeforeUnmount(() => {
 .ms_stats {
 	padding: 16px;
 
+	> .pie {
+		height: 82px;
+		flex-shrink: 0;
+		margin-right: 16px;
+	}
+
 	> div {
 		> p {
 			margin: 0;

From 39d73ca6b2de8601be706c9c06a3514532ee46d7 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 28 May 2023 20:43:23 -0700
Subject: [PATCH 106/319] chore: :arrow_up: up pnpm

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

diff --git a/package.json b/package.json
index 2899adf7e3..593690d6df 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"
 	},
-	"packageManager": "pnpm@8.5.1",
+	"packageManager": "pnpm@8.6.0",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",

From 7f81268f0703c2c4d1f099b7c775063aa5e23d2d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 28 May 2023 20:47:22 -0700
Subject: [PATCH 107/319] fix

---
 packages/client/package.json                |   2 +-
 packages/client/src/widgets/server-info.vue |   4 +-
 pnpm-lock.yaml                              | 355 ++++++++++++++------
 3 files changed, 258 insertions(+), 103 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 1af31dd099..ccddda6b9c 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -79,7 +79,7 @@
 		"typescript": "4.9.4",
 		"uuid": "9.0.0",
 		"vanilla-tilt": "1.8.0",
-		"vite": "^4.1.1",
+		"vite": "4.3.9",
 		"vite-plugin-compression": "^0.5.1",
 		"vue": "3.2.45",
 		"vue-isyourpasswordsafe": "^2.0.0",
diff --git a/packages/client/src/widgets/server-info.vue b/packages/client/src/widgets/server-info.vue
index 852a9dcf2c..35dd53c459 100644
--- a/packages/client/src/widgets/server-info.vue
+++ b/packages/client/src/widgets/server-info.vue
@@ -49,8 +49,8 @@ const widgetPropsDef = {};
 
 type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 
-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 } = useWidgetPropsManager(
 	name,
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 48a0e498be..abf12b62e3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,4 +1,8 @@
-lockfileVersion: '6.0'
+lockfileVersion: '6.1'
+
+settings:
+  autoInstallPeers: true
+  excludeLinksFromLockfile: false
 
 overrides:
   chokidar: ^3.3.1
@@ -24,7 +28,7 @@ importers:
         version: 7.2.0
       focus-trap-vue:
         specifier: ^4.0.1
-        version: 4.0.1(focus-trap@7.2.0)(vue@3.2.45)
+        version: 4.0.1(focus-trap@7.2.0)(vue@3.3.4)
       js-yaml:
         specifier: 4.1.0
         version: 4.1.0
@@ -264,7 +268,7 @@ importers:
         specifier: 7.0.2
         version: 7.0.2(@types/koa@2.13.5)(ejs@3.1.8)(pug@3.0.2)
       meilisearch:
-        specifier: ^0.32.4
+        specifier: 0.32.4
         version: 0.32.4
       mfm-js:
         specifier: 0.23.3
@@ -718,7 +722,7 @@ importers:
         version: 8.3.4
       '@vitejs/plugin-vue':
         specifier: 4.0.0
-        version: 4.0.0(vite@4.1.1)(vue@3.2.45)
+        version: 4.0.0(vite@4.3.9)(vue@3.2.45)
       '@vue/compiler-sfc':
         specifier: 3.2.45
         version: 3.2.45
@@ -879,11 +883,11 @@ importers:
         specifier: 1.8.0
         version: 1.8.0
       vite:
-        specifier: ^4.1.1
-        version: 4.1.1(sass@1.57.1)
+        specifier: 4.3.9
+        version: 4.3.9(sass@1.57.1)
       vite-plugin-compression:
         specifier: ^0.5.1
-        version: 0.5.1(vite@4.1.1)
+        version: 0.5.1(vite@4.3.9)
       vue:
         specifier: 3.2.45
         version: 3.2.45
@@ -1080,6 +1084,11 @@ packages:
     resolution: {integrity: sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==}
     engines: {node: '>=6.9.0'}
 
+  /@babel/helper-string-parser@7.21.5:
+    resolution: {integrity: sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==}
+    engines: {node: '>=6.9.0'}
+    dev: false
+
   /@babel/helper-validator-identifier@7.19.1:
     resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==}
     engines: {node: '>=6.9.0'}
@@ -1123,6 +1132,14 @@ packages:
       '@babel/types': 7.21.4
     dev: true
 
+  /@babel/parser@7.22.3:
+    resolution: {integrity: sha512-vrukxyW/ep8UD1UDzOYpTKQ6abgjFoeG6L+4ar9+c5TN9QnlqiOi6QK7LSR5ewm/ERyGkT/Ai6VboNrxhbr9Uw==}
+    engines: {node: '>=6.0.0'}
+    hasBin: true
+    dependencies:
+      '@babel/types': 7.22.3
+    dev: false
+
   /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.21.4):
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
@@ -1309,6 +1326,15 @@ packages:
       to-fast-properties: 2.0.0
     dev: true
 
+  /@babel/types@7.22.3:
+    resolution: {integrity: sha512-P3na3xIQHTKY4L0YOG7pM8M8uoUIB910WQaSiiMCZUC2Cy8XFEQONGABFnHWBa2gpGKODTAJcNhi5Zk0sLRrzg==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-string-parser': 7.21.5
+      '@babel/helper-validator-identifier': 7.19.1
+      to-fast-properties: 2.0.0
+    dev: false
+
   /@bcoe/v8-coverage@0.2.3:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
     dev: true
@@ -1599,8 +1625,8 @@ packages:
       - supports-color
     dev: false
 
-  /@esbuild/android-arm64@0.16.17:
-    resolution: {integrity: sha512-MIGl6p5sc3RDTLLkYL1MyL8BMRN4tLMRCn+yRJJmEDvYZ2M7tmAf80hx1kbNEUX2KJ50RRtxZ4JHLvCfuB6kBg==}
+  /@esbuild/android-arm64@0.17.19:
+    resolution: {integrity: sha512-KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
@@ -1608,8 +1634,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-arm@0.16.17:
-    resolution: {integrity: sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==}
+  /@esbuild/android-arm@0.17.19:
+    resolution: {integrity: sha512-rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
@@ -1617,8 +1643,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/android-x64@0.16.17:
-    resolution: {integrity: sha512-a3kTv3m0Ghh4z1DaFEuEDfz3OLONKuFvI4Xqczqx4BqLyuFaFkuaG4j2MtA6fuWEFeC5x9IvqnX7drmRq/fyAQ==}
+  /@esbuild/android-x64@0.17.19:
+    resolution: {integrity: sha512-uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
@@ -1626,8 +1652,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-arm64@0.16.17:
-    resolution: {integrity: sha512-/2agbUEfmxWHi9ARTX6OQ/KgXnOWfsNlTeLcoV7HSuSTv63E4DqtAc+2XqGw1KHxKMHGZgbVCZge7HXWX9Vn+w==}
+  /@esbuild/darwin-arm64@0.17.19:
+    resolution: {integrity: sha512-80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
@@ -1635,8 +1661,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/darwin-x64@0.16.17:
-    resolution: {integrity: sha512-2By45OBHulkd9Svy5IOCZt376Aa2oOkiE9QWUK9fe6Tb+WDr8hXL3dpqi+DeLiMed8tVXspzsTAvd0jUl96wmg==}
+  /@esbuild/darwin-x64@0.17.19:
+    resolution: {integrity: sha512-IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
@@ -1644,8 +1670,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-arm64@0.16.17:
-    resolution: {integrity: sha512-mt+cxZe1tVx489VTb4mBAOo2aKSnJ33L9fr25JXpqQqzbUIw/yzIzi+NHwAXK2qYV1lEFp4OoVeThGjUbmWmdw==}
+  /@esbuild/freebsd-arm64@0.17.19:
+    resolution: {integrity: sha512-pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
@@ -1653,8 +1679,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/freebsd-x64@0.16.17:
-    resolution: {integrity: sha512-8ScTdNJl5idAKjH8zGAsN7RuWcyHG3BAvMNpKOBaqqR7EbUhhVHOqXRdL7oZvz8WNHL2pr5+eIT5c65kA6NHug==}
+  /@esbuild/freebsd-x64@0.17.19:
+    resolution: {integrity: sha512-4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
@@ -1662,8 +1688,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm64@0.16.17:
-    resolution: {integrity: sha512-7S8gJnSlqKGVJunnMCrXHU9Q8Q/tQIxk/xL8BqAP64wchPCTzuM6W3Ra8cIa1HIflAvDnNOt2jaL17vaW+1V0g==}
+  /@esbuild/linux-arm64@0.17.19:
+    resolution: {integrity: sha512-ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
@@ -1671,8 +1697,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-arm@0.16.17:
-    resolution: {integrity: sha512-iihzrWbD4gIT7j3caMzKb/RsFFHCwqqbrbH9SqUSRrdXkXaygSZCZg1FybsZz57Ju7N/SHEgPyaR0LZ8Zbe9gQ==}
+  /@esbuild/linux-arm@0.17.19:
+    resolution: {integrity: sha512-cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
@@ -1680,8 +1706,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ia32@0.16.17:
-    resolution: {integrity: sha512-kiX69+wcPAdgl3Lonh1VI7MBr16nktEvOfViszBSxygRQqSpzv7BffMKRPMFwzeJGPxcio0pdD3kYQGpqQ2SSg==}
+  /@esbuild/linux-ia32@0.17.19:
+    resolution: {integrity: sha512-w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
@@ -1689,8 +1715,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-loong64@0.16.17:
-    resolution: {integrity: sha512-dTzNnQwembNDhd654cA4QhbS9uDdXC3TKqMJjgOWsC0yNCbpzfWoXdZvp0mY7HU6nzk5E0zpRGGx3qoQg8T2DQ==}
+  /@esbuild/linux-loong64@0.17.19:
+    resolution: {integrity: sha512-2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
@@ -1698,8 +1724,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-mips64el@0.16.17:
-    resolution: {integrity: sha512-ezbDkp2nDl0PfIUn0CsQ30kxfcLTlcx4Foz2kYv8qdC6ia2oX5Q3E/8m6lq84Dj/6b0FrkgD582fJMIfHhJfSw==}
+  /@esbuild/linux-mips64el@0.17.19:
+    resolution: {integrity: sha512-LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
@@ -1707,8 +1733,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-ppc64@0.16.17:
-    resolution: {integrity: sha512-dzS678gYD1lJsW73zrFhDApLVdM3cUF2MvAa1D8K8KtcSKdLBPP4zZSLy6LFZ0jYqQdQ29bjAHJDgz0rVbLB3g==}
+  /@esbuild/linux-ppc64@0.17.19:
+    resolution: {integrity: sha512-/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
@@ -1716,8 +1742,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-riscv64@0.16.17:
-    resolution: {integrity: sha512-ylNlVsxuFjZK8DQtNUwiMskh6nT0vI7kYl/4fZgV1llP5d6+HIeL/vmmm3jpuoo8+NuXjQVZxmKuhDApK0/cKw==}
+  /@esbuild/linux-riscv64@0.17.19:
+    resolution: {integrity: sha512-FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
@@ -1725,8 +1751,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-s390x@0.16.17:
-    resolution: {integrity: sha512-gzy7nUTO4UA4oZ2wAMXPNBGTzZFP7mss3aKR2hH+/4UUkCOyqmjXiKpzGrY2TlEUhbbejzXVKKGazYcQTZWA/w==}
+  /@esbuild/linux-s390x@0.17.19:
+    resolution: {integrity: sha512-IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
@@ -1734,8 +1760,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/linux-x64@0.16.17:
-    resolution: {integrity: sha512-mdPjPxfnmoqhgpiEArqi4egmBAMYvaObgn4poorpUaqmvzzbvqbowRllQ+ZgzGVMGKaPkqUmPDOOFQRUFDmeUw==}
+  /@esbuild/linux-x64@0.17.19:
+    resolution: {integrity: sha512-68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
@@ -1743,8 +1769,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/netbsd-x64@0.16.17:
-    resolution: {integrity: sha512-/PzmzD/zyAeTUsduZa32bn0ORug+Jd1EGGAUJvqfeixoEISYpGnAezN6lnJoskauoai0Jrs+XSyvDhppCPoKOA==}
+  /@esbuild/netbsd-x64@0.17.19:
+    resolution: {integrity: sha512-CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
@@ -1752,8 +1778,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/openbsd-x64@0.16.17:
-    resolution: {integrity: sha512-2yaWJhvxGEz2RiftSk0UObqJa/b+rIAjnODJgv2GbGGpRwAfpgzyrg1WLK8rqA24mfZa9GvpjLcBBg8JHkoodg==}
+  /@esbuild/openbsd-x64@0.17.19:
+    resolution: {integrity: sha512-cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
@@ -1761,8 +1787,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/sunos-x64@0.16.17:
-    resolution: {integrity: sha512-xtVUiev38tN0R3g8VhRfN7Zl42YCJvyBhRKw1RJjwE1d2emWTVToPLNEQj/5Qxc6lVFATDiy6LjVHYhIPrLxzw==}
+  /@esbuild/sunos-x64@0.17.19:
+    resolution: {integrity: sha512-vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
@@ -1770,8 +1796,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-arm64@0.16.17:
-    resolution: {integrity: sha512-ga8+JqBDHY4b6fQAmOgtJJue36scANy4l/rL97W+0wYmijhxKetzZdKOJI7olaBaMhWt8Pac2McJdZLxXWUEQw==}
+  /@esbuild/win32-arm64@0.17.19:
+    resolution: {integrity: sha512-yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
@@ -1779,8 +1805,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-ia32@0.16.17:
-    resolution: {integrity: sha512-WnsKaf46uSSF/sZhwnqE4L/F89AYNMiD4YtEcYekBt9Q7nj0DiId2XH2Ng2PHM54qi5oPrQ8luuzGszqi/veig==}
+  /@esbuild/win32-ia32@0.17.19:
+    resolution: {integrity: sha512-eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
@@ -1788,8 +1814,8 @@ packages:
     dev: true
     optional: true
 
-  /@esbuild/win32-x64@0.16.17:
-    resolution: {integrity: sha512-y+EHuSchhL7FjHgvQL/0fnnFmO4T1bhvWANX6gcnqTjtnKWbTvUMCpGnv2+t+31d7RzyEAYAd4u2fnIhHL6N/Q==}
+  /@esbuild/win32-x64@0.17.19:
+    resolution: {integrity: sha512-lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
@@ -2091,6 +2117,10 @@ packages:
   /@jridgewell/sourcemap-codec@1.4.14:
     resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
 
+  /@jridgewell/sourcemap-codec@1.4.15:
+    resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
+    dev: false
+
   /@jridgewell/trace-mapping@0.3.17:
     resolution: {integrity: sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==}
     dependencies:
@@ -2143,7 +2173,7 @@ packages:
       detect-libc: 2.0.1
       https-proxy-agent: 5.0.1
       make-dir: 3.1.0
-      node-fetch: 2.6.8
+      node-fetch: 2.6.11
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
@@ -2161,7 +2191,7 @@ packages:
       detect-libc: 2.0.1
       https-proxy-agent: 5.0.1
       make-dir: 3.1.0
-      node-fetch: 2.6.8
+      node-fetch: 2.6.11
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
@@ -3791,14 +3821,14 @@ packages:
       eslint-visitor-keys: 3.3.0
     dev: true
 
-  /@vitejs/plugin-vue@4.0.0(vite@4.1.1)(vue@3.2.45):
+  /@vitejs/plugin-vue@4.0.0(vite@4.3.9)(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.3.9(sass@1.57.1)
       vue: 3.2.45
     dev: true
 
@@ -3809,18 +3839,36 @@ packages:
       '@vue/shared': 3.2.45
       estree-walker: 2.0.2
       source-map: 0.6.1
+    dev: true
+
+  /@vue/compiler-core@3.3.4:
+    resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==}
+    dependencies:
+      '@babel/parser': 7.22.3
+      '@vue/shared': 3.3.4
+      estree-walker: 2.0.2
+      source-map-js: 1.0.2
+    dev: false
 
   /@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-dom@3.3.4:
+    resolution: {integrity: sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==}
+    dependencies:
+      '@vue/compiler-core': 3.3.4
+      '@vue/shared': 3.3.4
+    dev: false
 
   /@vue/compiler-sfc@2.7.14:
     resolution: {integrity: sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==}
     dependencies:
       '@babel/parser': 7.20.7
-      postcss: 8.4.21
+      postcss: 8.4.24
       source-map: 0.6.1
     dev: true
 
@@ -3837,12 +3885,36 @@ packages:
       magic-string: 0.25.9
       postcss: 8.4.21
       source-map: 0.6.1
+    dev: true
+
+  /@vue/compiler-sfc@3.3.4:
+    resolution: {integrity: sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==}
+    dependencies:
+      '@babel/parser': 7.22.3
+      '@vue/compiler-core': 3.3.4
+      '@vue/compiler-dom': 3.3.4
+      '@vue/compiler-ssr': 3.3.4
+      '@vue/reactivity-transform': 3.3.4
+      '@vue/shared': 3.3.4
+      estree-walker: 2.0.2
+      magic-string: 0.30.0
+      postcss: 8.4.24
+      source-map-js: 1.0.2
+    dev: false
 
   /@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/compiler-ssr@3.3.4:
+    resolution: {integrity: sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==}
+    dependencies:
+      '@vue/compiler-dom': 3.3.4
+      '@vue/shared': 3.3.4
+    dev: false
 
   /@vue/reactivity-transform@3.2.45:
     resolution: {integrity: sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==}
@@ -3852,17 +3924,43 @@ packages:
       '@vue/shared': 3.2.45
       estree-walker: 2.0.2
       magic-string: 0.25.9
+    dev: true
+
+  /@vue/reactivity-transform@3.3.4:
+    resolution: {integrity: sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==}
+    dependencies:
+      '@babel/parser': 7.22.3
+      '@vue/compiler-core': 3.3.4
+      '@vue/shared': 3.3.4
+      estree-walker: 2.0.2
+      magic-string: 0.30.0
+    dev: false
 
   /@vue/reactivity@3.2.45:
     resolution: {integrity: sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==}
     dependencies:
       '@vue/shared': 3.2.45
+    dev: true
+
+  /@vue/reactivity@3.3.4:
+    resolution: {integrity: sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==}
+    dependencies:
+      '@vue/shared': 3.3.4
+    dev: false
 
   /@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-core@3.3.4:
+    resolution: {integrity: sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==}
+    dependencies:
+      '@vue/reactivity': 3.3.4
+      '@vue/shared': 3.3.4
+    dev: false
 
   /@vue/runtime-dom@3.2.45:
     resolution: {integrity: sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==}
@@ -3870,6 +3968,15 @@ packages:
       '@vue/runtime-core': 3.2.45
       '@vue/shared': 3.2.45
       csstype: 2.6.21
+    dev: true
+
+  /@vue/runtime-dom@3.3.4:
+    resolution: {integrity: sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==}
+    dependencies:
+      '@vue/runtime-core': 3.3.4
+      '@vue/shared': 3.3.4
+      csstype: 3.1.2
+    dev: false
 
   /@vue/server-renderer@3.2.45(vue@3.2.45):
     resolution: {integrity: sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==}
@@ -3879,9 +3986,25 @@ packages:
       '@vue/compiler-ssr': 3.2.45
       '@vue/shared': 3.2.45
       vue: 3.2.45
+    dev: true
+
+  /@vue/server-renderer@3.3.4(vue@3.3.4):
+    resolution: {integrity: sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==}
+    peerDependencies:
+      vue: 3.3.4
+    dependencies:
+      '@vue/compiler-ssr': 3.3.4
+      '@vue/shared': 3.3.4
+      vue: 3.3.4
+    dev: false
 
   /@vue/shared@3.2.45:
     resolution: {integrity: sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==}
+    dev: true
+
+  /@vue/shared@3.3.4:
+    resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==}
+    dev: false
 
   /@webassemblyjs/ast@1.11.1:
     resolution: {integrity: sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==}
@@ -5883,8 +6006,8 @@ packages:
     requiresBuild: true
     dev: false
 
-  /core-js@3.30.1:
-    resolution: {integrity: sha512-ZNS5nbiSwDTq4hFosEDqm65izl2CWmLz0hARJMyNQBgkUZMIF51cQiMvIQKA6hvuaeWxQDP3hEedM1JZIgTldQ==}
+  /core-js@3.30.2:
+    resolution: {integrity: sha512-uBJiDmwqsbJCWHAwjrx3cvjbMXP7xD72Dmsn5LOJpiRmE3WbBbN5rCqQ2Qh6Ek6/eOrjlWngEynBWo4VxerQhg==}
     requiresBuild: true
     dev: true
 
@@ -6051,11 +6174,16 @@ packages:
 
   /csstype@2.6.21:
     resolution: {integrity: sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==}
+    dev: true
 
   /csstype@3.1.1:
     resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
     dev: true
 
+  /csstype@3.1.2:
+    resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
+    dev: false
+
   /custom-event-polyfill@1.0.7:
     resolution: {integrity: sha512-TDDkd5DkaZxZFM8p+1I3yAlvM3rSr1wbrOliG4yJiwinMZN8z/iGL7BTlDkrJcYTmgUSb4ywVCc3ZaUtOtC76w==}
     dev: true
@@ -6667,34 +6795,34 @@ packages:
       es6-symbol: 3.1.3
     dev: true
 
-  /esbuild@0.16.17:
-    resolution: {integrity: sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==}
+  /esbuild@0.17.19:
+    resolution: {integrity: sha512-XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==}
     engines: {node: '>=12'}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      '@esbuild/android-arm': 0.16.17
-      '@esbuild/android-arm64': 0.16.17
-      '@esbuild/android-x64': 0.16.17
-      '@esbuild/darwin-arm64': 0.16.17
-      '@esbuild/darwin-x64': 0.16.17
-      '@esbuild/freebsd-arm64': 0.16.17
-      '@esbuild/freebsd-x64': 0.16.17
-      '@esbuild/linux-arm': 0.16.17
-      '@esbuild/linux-arm64': 0.16.17
-      '@esbuild/linux-ia32': 0.16.17
-      '@esbuild/linux-loong64': 0.16.17
-      '@esbuild/linux-mips64el': 0.16.17
-      '@esbuild/linux-ppc64': 0.16.17
-      '@esbuild/linux-riscv64': 0.16.17
-      '@esbuild/linux-s390x': 0.16.17
-      '@esbuild/linux-x64': 0.16.17
-      '@esbuild/netbsd-x64': 0.16.17
-      '@esbuild/openbsd-x64': 0.16.17
-      '@esbuild/sunos-x64': 0.16.17
-      '@esbuild/win32-arm64': 0.16.17
-      '@esbuild/win32-ia32': 0.16.17
-      '@esbuild/win32-x64': 0.16.17
+      '@esbuild/android-arm': 0.17.19
+      '@esbuild/android-arm64': 0.17.19
+      '@esbuild/android-x64': 0.17.19
+      '@esbuild/darwin-arm64': 0.17.19
+      '@esbuild/darwin-x64': 0.17.19
+      '@esbuild/freebsd-arm64': 0.17.19
+      '@esbuild/freebsd-x64': 0.17.19
+      '@esbuild/linux-arm': 0.17.19
+      '@esbuild/linux-arm64': 0.17.19
+      '@esbuild/linux-ia32': 0.17.19
+      '@esbuild/linux-loong64': 0.17.19
+      '@esbuild/linux-mips64el': 0.17.19
+      '@esbuild/linux-ppc64': 0.17.19
+      '@esbuild/linux-riscv64': 0.17.19
+      '@esbuild/linux-s390x': 0.17.19
+      '@esbuild/linux-x64': 0.17.19
+      '@esbuild/netbsd-x64': 0.17.19
+      '@esbuild/openbsd-x64': 0.17.19
+      '@esbuild/sunos-x64': 0.17.19
+      '@esbuild/win32-arm64': 0.17.19
+      '@esbuild/win32-ia32': 0.17.19
+      '@esbuild/win32-x64': 0.17.19
     dev: true
 
   /escalade@3.1.1:
@@ -7408,14 +7536,14 @@ packages:
       readable-stream: 2.3.7
     dev: true
 
-  /focus-trap-vue@4.0.1(focus-trap@7.2.0)(vue@3.2.45):
+  /focus-trap-vue@4.0.1(focus-trap@7.2.0)(vue@3.3.4):
     resolution: {integrity: sha512-2iqOeoSvgq7Um6aL+255a/wXPskj6waLq2oKCa4gOnMORPo15JX7wN6J5bl1SMhMlTlkHXGSrQ9uJPJLPZDl5w==}
     peerDependencies:
       focus-trap: ^7.0.0
       vue: ^3.0.0
     dependencies:
       focus-trap: 7.2.0
-      vue: 3.2.45
+      vue: 3.3.4
     dev: false
 
   /focus-trap@7.2.0:
@@ -9654,7 +9782,7 @@ packages:
   /jsonfile@4.0.0:
     resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
     optionalDependencies:
-      graceful-fs: 4.2.11
+      graceful-fs: 4.2.10
 
   /jsonfile@5.0.0:
     resolution: {integrity: sha512-NQRZ5CRo74MhMMC3/3r5g2k4fjodJ/wh8MxjFbCViWKFjxrnudWSY5vomh+23ZaXzAS7J3fBZIR2dV6WbmfM0w==}
@@ -9668,7 +9796,7 @@ packages:
     dependencies:
       universalify: 2.0.0
     optionalDependencies:
-      graceful-fs: 4.2.11
+      graceful-fs: 4.2.10
     dev: true
 
   /jsonld@6.0.0:
@@ -10294,6 +10422,14 @@ packages:
     resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==}
     dependencies:
       sourcemap-codec: 1.4.8
+    dev: true
+
+  /magic-string@0.30.0:
+    resolution: {integrity: sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@jridgewell/sourcemap-codec': 1.4.15
+    dev: false
 
   /mailcheck@1.1.1:
     resolution: {integrity: sha512-3WjL8+ZDouZwKlyJBMp/4LeziLFXgleOdsYu87piGcMLqhBzCsy2QFdbtAwv757TFC/rtqd738fgJw1tFQCSgA==}
@@ -10762,8 +10898,8 @@ packages:
     hasBin: true
     dev: true
 
-  /nanoid@3.3.4:
-    resolution: {integrity: sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==}
+  /nanoid@3.3.6:
+    resolution: {integrity: sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==}
     engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
     hasBin: true
 
@@ -11896,7 +12032,15 @@ packages:
     resolution: {integrity: sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==}
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
-      nanoid: 3.3.4
+      nanoid: 3.3.6
+      picocolors: 1.0.0
+      source-map-js: 1.0.2
+
+  /postcss@8.4.24:
+    resolution: {integrity: sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==}
+    engines: {node: ^10 || ^12 || >=14}
+    dependencies:
+      nanoid: 3.3.6
       picocolors: 1.0.0
       source-map-js: 1.0.2
 
@@ -12789,8 +12933,8 @@ packages:
       rangestr: 0.0.1
       seedrandom: 2.4.2
 
-  /rollup@3.12.1:
-    resolution: {integrity: sha512-t9elERrz2i4UU9z7AwISj3CQcXP39cWxgRWLdf4Tm6aKm1eYrqHIgjzXBgb67GNY1sZckTFFi0oMozh3/S++Ig==}
+  /rollup@3.23.0:
+    resolution: {integrity: sha512-h31UlwEi7FHihLe1zbk+3Q7z1k/84rb9BSwmBSr/XjOCEaBJ2YyedQDuM0t/kfOS0IxM+vk1/zI9XxYj9V+NJQ==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
@@ -13224,6 +13368,7 @@ packages:
   /sourcemap-codec@1.4.8:
     resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
     deprecated: Please use @jridgewell/sourcemap-codec instead
+    dev: true
 
   /sparkles@1.0.1:
     resolution: {integrity: sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==}
@@ -14627,7 +14772,7 @@ 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.3.9):
     resolution: {integrity: sha512-5QJKBDc+gNYVqL/skgFAP81Yuzo9R+EAf19d+EtsMF/i8kFUpNi3J/H01QD3Oo8zBQn+NzoCIFkpPLynoOzaJg==}
     peerDependencies:
       vite: '>=2.0.0'
@@ -14635,13 +14780,13 @@ packages:
       chalk: 4.1.2
       debug: 4.3.4(supports-color@8.1.1)
       fs-extra: 10.1.0
-      vite: 4.1.1(sass@1.57.1)
+      vite: 4.3.9(sass@1.57.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /vite@4.1.1(sass@1.57.1):
-    resolution: {integrity: sha512-LM9WWea8vsxhr782r9ntg+bhSFS06FJgCvvB0+8hf8UWtvaiDagKYWXndjfX6kGl74keHJUcpzrQliDXZlF5yg==}
+  /vite@4.3.9(sass@1.57.1):
+    resolution: {integrity: sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
     peerDependencies:
@@ -14665,10 +14810,9 @@ packages:
       terser:
         optional: true
     dependencies:
-      esbuild: 0.16.17
-      postcss: 8.4.21
-      resolve: 1.22.1
-      rollup: 3.12.1
+      esbuild: 0.17.19
+      postcss: 8.4.24
+      rollup: 3.23.0
       sass: 1.57.1
     optionalDependencies:
       fsevents: 2.3.2
@@ -14715,6 +14859,17 @@ packages:
       '@vue/runtime-dom': 3.2.45
       '@vue/server-renderer': 3.2.45(vue@3.2.45)
       '@vue/shared': 3.2.45
+    dev: true
+
+  /vue@3.3.4:
+    resolution: {integrity: sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==}
+    dependencies:
+      '@vue/compiler-dom': 3.3.4
+      '@vue/compiler-sfc': 3.3.4
+      '@vue/runtime-dom': 3.3.4
+      '@vue/server-renderer': 3.3.4(vue@3.3.4)
+      '@vue/shared': 3.3.4
+    dev: false
 
   /vuedraggable@4.1.0(vue@3.2.45):
     resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==}
@@ -15340,7 +15495,7 @@ packages:
     name: plyr
     version: 3.7.0
     dependencies:
-      core-js: 3.30.1
+      core-js: 3.30.2
       custom-event-polyfill: 1.0.7
       loadjs: 4.2.0
       rangetouch: 2.0.1

From cf4427f4f094294034354b66b99d96f3626ab837 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Sun, 28 May 2023 23:49:55 -0400
Subject: [PATCH 108/319] fix example config format

---
 .config/example.yml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.config/example.yml b/.config/example.yml
index a83e02eda3..f5248fb9a0 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -88,13 +88,14 @@ redis:
 # No need to uncomment in most cases, but you may want to change
 # these settings if you plan to run a large and/or distributed server.
 
-# cuid: {
+# cuid:
 #   # Min 16, Max 24
-#   length: 16,
+#   length: 16
+#
 #   # Set this to a unique string across workers (e.g., machine's hostname)
 #   # if your workers are running in multiple hosts.
-#   fingerprint: "my-fingerperint",
-# }
+#   fingerprint: my-fingerprint
+
 
 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────

From d7e906bcf7f040a1c7e4cb5c91508e3285297b18 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 28 May 2023 20:59:36 -0700
Subject: [PATCH 109/319] fix

---
 packages/client/src/widgets/server-info.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/widgets/server-info.vue b/packages/client/src/widgets/server-info.vue
index 35dd53c459..32cd358838 100644
--- a/packages/client/src/widgets/server-info.vue
+++ b/packages/client/src/widgets/server-info.vue
@@ -3,16 +3,16 @@
 		<div
 			:class="$style.container"
 			:style="{
-				backgroundImage: instance.bannerUrl
-					? `url(${instance.bannerUrl})`
+				backgroundImage: $instance.bannerUrl
+					? `url(${$instance.bannerUrl})`
 					: null,
 			}"
 		>
 			<div :class="$style.iconContainer">
 				<img
 					:src="
-						instance.iconUrl ??
-						instance.faviconUrl ??
+						$instance.iconUrl ??
+						$instance.faviconUrl ??
 						'/favicon.ico'
 					"
 					alt=""
@@ -22,7 +22,7 @@
 			<div :class="$style.bodyContainer">
 				<div :class="$style.body">
 					<MkA :class="$style.name" to="/about" behavior="window">{{
-						instance.name
+						$instance.name
 					}}</MkA>
 					<div :class="$style.host">{{ host }}</div>
 				</div>
@@ -41,7 +41,6 @@ import {
 } from "./widget";
 import { GetFormResultType } from "@/scripts/form";
 import { host } from "@/config";
-import { instance } from "@/instance";
 
 const name = "serverInfo";
 

From 9063f93fb28d51cd97a409bd13ed23309dc0678d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 28 May 2023 21:04:54 -0700
Subject: [PATCH 110/319] chore: :bulb: meili

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

diff --git a/packages/backend/src/daemons/server-stats.ts b/packages/backend/src/daemons/server-stats.ts
index 2f1dd42ae3..c936d619ab 100644
--- a/packages/backend/src/daemons/server-stats.ts
+++ b/packages/backend/src/daemons/server-stats.ts
@@ -81,6 +81,7 @@ async function fs() {
 	return data || { rIO_sec: 0, wIO_sec: 0 };
 }
 
+// MEILI STAT
 async function meilisearchStatus() {
 	if (meilisearch) {
 		return meilisearch.serverStats();

From a717ef69232c2d93779670ec638850e35fae29ae Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 28 May 2023 21:10:21 -0700
Subject: [PATCH 111/319] properly calculate percent

---
 packages/client/src/widgets/server-metric/meilisearch.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
index 4047793f51..80a3f41466 100644
--- a/packages/client/src/widgets/server-metric/meilisearch.vue
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -16,6 +16,7 @@ import { onBeforeUnmount, onMounted } from "vue";
 import bytes from "@/filters/bytes";
 import XPie from "./pie.vue";
 import { i18n } from "@/i18n";
+import * as os from "@/os";
 
 const props = defineProps<{
 	connection: any;
@@ -23,7 +24,7 @@ const props = defineProps<{
 }>();
 
 let progress: number = $ref(0);
-
+let serverStats = $ref(null);
 let total_size: number = $ref(0);
 let index_count: number = $ref(0);
 let available: string = $ref("unavailable");
@@ -32,10 +33,13 @@ function onStats(stats) {
 	total_size = stats.meilisearch.size;
 	index_count = stats.meilisearch.indexed_count;
 	available = stats.meilisearch.health;
-	progress = Math.floor((index_count / total_size) * 100);
+	progress = Math.floor((index_count / serverStats.notesCount) * 100);
 }
 
 onMounted(() => {
+	os.api("stats", {}).then((res) => {
+		serverStats = res;
+	});
 	props.connection.on("stats", onStats);
 });
 

From ee08e1bddaa864368b598fff8894df256a890497 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 29 May 2023 09:11:42 -0400
Subject: [PATCH 112/319] Add clips, antennas hint

---
 locales/en-US.yml                             |  2 +
 packages/client/src/components/MkInfo.vue     | 30 ++++++-
 .../client/src/components/MkPagination.vue    |  6 +-
 .../client/src/pages/my-antennas/create.vue   |  8 +-
 .../client/src/pages/my-antennas/index.vue    | 80 +++++++++++--------
 packages/client/src/pages/my-clips/index.vue  | 43 +++++-----
 6 files changed, 108 insertions(+), 61 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 89bf10c9f1..98d4d7703b 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -404,6 +404,7 @@ avoidMultiCaptchaConfirm: "Using multiple Captcha systems may cause interference
   \ them. Would you like to disable the other Captcha systems currently active? If\
   \ you would like them to stay enabled, press cancel."
 antennas: "Antennas"
+antennasDesc: "Antennas display new posts matching the criteria you set!\n They can be accessed from the timelines page."
 manageAntennas: "Manage Antennas"
 name: "Name"
 antennaSource: "Antenna source"
@@ -771,6 +772,7 @@ pageLikedCount: "Number of received Page likes"
 contact: "Contact"
 useSystemFont: "Use the system's default font"
 clips: "Clips"
+clipsDesc: "Clips are like share-able categorized bookmarks. You can create clips from the menu of individual posts."
 experimentalFeatures: "Experimental features"
 developer: "Developer"
 makeExplorable: "Make account visible in \"Explore\""
diff --git a/packages/client/src/components/MkInfo.vue b/packages/client/src/components/MkInfo.vue
index 43f2de29e0..e59b5d56ea 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 }">
+	<div class="info" :class="{ warn, card }">
 		<i v-if="warn" class="ph-warning ph-bold ph-lg"></i>
-		<i v-else class="ph-info ph-bold ph-lg"></i>
+		<i v-else class="ph-bold ph-lg" :class="icon ? `ph-${icon}` : 'ph-info'"></i>
 		<slot></slot>
 	</div>
 </template>
@@ -10,12 +10,14 @@
 import {} from "vue";
 
 defineProps<{
+	icon?: string;
 	warn?: boolean;
+	card?: boolean;
 }>();
 </script>
 
 <style lang="scss" scoped>
-.fpezltsf {
+.info {
 	padding: 16px;
 	font-size: 90%;
 	background: var(--infoBg);
@@ -27,6 +29,28 @@ defineProps<{
 		color: var(--infoWarnFg);
 	}
 
+	&.card {
+		background: var(--panel);
+		color: var(--fg);
+		padding: 48px;
+		font-size: 1em;
+		text-align: center;
+		> i {
+			display: block;
+			font-size: 4em;
+			margin: 0;
+		}
+		> :deep(*) {
+			margin-inline: auto;
+		}
+		> :deep(:not(:last-child)) {
+			margin-bottom: 20px;
+		}
+		> :deep(p) {
+			max-width: 30em;
+		}
+	}
+
 	> i {
 		margin-right: 4px;
 	}
diff --git a/packages/client/src/components/MkPagination.vue b/packages/client/src/components/MkPagination.vue
index 24018e5269..564b214e0f 100644
--- a/packages/client/src/components/MkPagination.vue
+++ b/packages/client/src/components/MkPagination.vue
@@ -17,7 +17,7 @@
 			</slot>
 		</div>
 
-		<div v-else ref="rootEl">
+		<div v-else ref="rootEl" class="list">
 			<div
 				v-show="pagination.reversed && more"
 				key="_more_"
@@ -487,4 +487,8 @@ defineExpose({
 		margin-right: auto;
 	}
 }
+.list > :deep(._button) {
+	margin-inline: auto;
+	margin-bottom: 16px;
+}
 </style>
diff --git a/packages/client/src/pages/my-antennas/create.vue b/packages/client/src/pages/my-antennas/create.vue
index c0d838629e..040a6b052d 100644
--- a/packages/client/src/pages/my-antennas/create.vue
+++ b/packages/client/src/pages/my-antennas/create.vue
@@ -1,7 +1,9 @@
 <template>
-	<div class="geegznzt">
-		<XAntenna :antenna="draft" @created="onAntennaCreated" />
-	</div>
+	<MkSpacer :content-max="700">
+		<div class="geegznzt">
+			<XAntenna :antenna="draft" @created="onAntennaCreated" />
+		</div>
+	</MkSpacer>
 </template>
 
 <script lang="ts" setup>
diff --git a/packages/client/src/pages/my-antennas/index.vue b/packages/client/src/pages/my-antennas/index.vue
index cc3262a797..a4d15433ab 100644
--- a/packages/client/src/pages/my-antennas/index.vue
+++ b/packages/client/src/pages/my-antennas/index.vue
@@ -8,43 +8,60 @@
 		/></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"
+						<template #empty>
+							<MkInfo
+								:icon="'flying-saucer'"
+								:card="true"
+							>
+								<p>{{ i18n.ts.antennasDesc }}</p>
+								<MkButton
+									:link="true"
+									to="/my/antennas/create"
+									primary
+									class="add"
+									><i class="ph-plus ph-bold ph-lg"></i>
+									{{ i18n.ts.add }}</MkButton
+								>
+							</MkInfo>
+						</template>
+						<template #default="{ items }">
+							<MkButton
 								:link="true"
-								:to="`/timeline/antenna/${antenna.id}`"
+								to="/my/antennas/create"
+								primary
+								class="add"
+								><i class="ph-plus ph-bold ph-lg"></i>
+								{{ i18n.ts.add }}</MkButton
 							>
-								<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>
+							<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>
+						</template>
 					</MkPagination>
 				</div>
 			</div>
@@ -56,6 +73,7 @@
 import { onActivated, onDeactivated, ref } from "vue";
 import MkPagination from "@/components/MkPagination.vue";
 import MkButton from "@/components/MkButton.vue";
+import MkInfo from "@/components/MkInfo.vue";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
 
@@ -101,10 +119,6 @@ definePageMetadata({
 
 <style lang="scss" scoped>
 .ieepwinx {
-	> .add {
-		margin: 0 auto 16px auto;
-	}
-
 	.uopelskx {
 		float: left;
 		min-width: 25px;
diff --git a/packages/client/src/pages/my-clips/index.vue b/packages/client/src/pages/my-clips/index.vue
index 1c950a3f11..2d9ce3db6b 100644
--- a/packages/client/src/pages/my-clips/index.vue
+++ b/packages/client/src/pages/my-clips/index.vue
@@ -8,28 +8,32 @@
 		/></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>
+					<template #empty>
+						<MkInfo
+							:icon="'paperclip'"
+							:card="true"
+						>
+							<p>{{ i18n.ts.clipsDesc }}</p>
+						</MkInfo>
+					</template>
+					<template #default="{ items }">
+						<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>
+					</template>
 				</MkPagination>
 			</div>
 		</MkSpacer>
@@ -40,6 +44,7 @@
 import {} from "vue";
 import MkPagination from "@/components/MkPagination.vue";
 import MkButton from "@/components/MkButton.vue";
+import MkInfo from "@/components/MkInfo.vue";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
@@ -100,10 +105,6 @@ definePageMetadata({
 
 <style lang="scss" scoped>
 .qtcaoidl {
-	> .add {
-		margin: 0 auto 16px auto;
-	}
-
 	> .list {
 		> .item {
 			display: block;

From 69852b8a0581be424982b03aeae9f4df0493c0db Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 29 May 2023 09:40:00 -0400
Subject: [PATCH 113/319] Move follow button + always show label

---
 packages/client/src/pages/user/home.vue | 68 ++++++++++---------------
 packages/client/src/style.scss          |  5 ++
 2 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index 5de9b28d67..277d5f5ef9 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -134,20 +134,19 @@
 						</div>
 						<div class="follow-container">
 							<div class="actions">
-								<MkFollowButton
-									: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"/> -->
+								<MkFollowButton
+									:user="user"
+									@refresh="emit('refresh')"
+									:inline="true"
+									:transparent="false"
+									:full="true"
+									class="koudoku"
+								/>
 							</div>
 						</div>
 						<div class="description">
@@ -490,29 +489,6 @@ onUnmounted(() => {
 						border-radius: 6px;
 					}
 
-					> .actions {
-						position: absolute;
-						top: 12px;
-						right: 12px;
-						padding: 8px;
-						border-radius: 24px;
-
-						> .menu {
-							vertical-align: bottom;
-							height: 31px;
-							width: 31px;
-							color: #fff;
-							text-shadow: 0 0 8px var(--shadow);
-							font-size: 16px;
-						}
-
-						> .koudoku {
-							margin-left: 4px;
-							width: 31px;
-							vertical-align: bottom;
-						}
-					}
-
 					> .title {
 						position: absolute;
 						bottom: 0;
@@ -581,22 +557,23 @@ onUnmounted(() => {
 
 					> .actions {
 						position: absolute;
-						top: 12px;
+						top: 6px;
 						right: 12px;
 						padding: 8px;
 						border-radius: 24px;
+						display: flex;
+						justify-content: center;
+						align-items: center;
 
 						> .menu {
-							vertical-align: bottom;
 							height: 31px;
 							width: 31px;
 							color: --fg;
 							font-size: 16px;
 						}
 
-						> .koudoku {
-							margin-left: 4px;
-							vertical-align: bottom;
+						> :deep(.follow-button) {
+							margin-left: 8px;
 						}
 					}
 
@@ -797,6 +774,13 @@ onUnmounted(() => {
 
 				> .title {
 					display: block;
+					border-bottom: 0;
+					padding-bottom: 0;
+					> .bottom {
+						> .username {
+							margin-right: 0;
+						}
+					}
 				}
 
 				> .avatar {
@@ -822,15 +806,19 @@ onUnmounted(() => {
 				}
 
 				> .description {
-					top: -55px;
+					top: 0;
 					position: relative;
 				}
 
 				> .follow-container {
 					overflow: visible !important;
+					display: flex;
+					justify-content: center;
+					height: auto;
+					border-bottom: 1px solid var(--divider);
+					padding-bottom: 5px;
 					> .actions {
-						top: -110px;
-						right: 0px;
+						position: static;
 					}
 				}
 			}
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index 4b914c4085..10b5914896 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -212,6 +212,11 @@ hr {
 		opacity: 0.5;
 		cursor: default;
 	}
+
+	> i:only-child {
+		display: block;
+		margin: auto;
+	}
 }
 
 ._buttonPrimary {

From 0cf9ad072754f53e1313c739bbcfc593371c4023 Mon Sep 17 00:00:00 2001
From: Michael 465537 <michael.465537@gmail.com>
Date: Mon, 29 May 2023 11:46:44 +0000
Subject: [PATCH 114/319] chore: Translated using Weblate (German)

Currently translated at 98.9% (1734 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
---
 locales/de-DE.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 9acc8501f4..5c71d27cd1 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -947,7 +947,7 @@ recentNHours: "Die letzten {n} Stunden"
 recentNDays: "Die letzten {n} Tage"
 noEmailServerWarning: "Es ist kein Email-Server konfiguriert."
 thereIsUnresolvedAbuseReportWarning: "Es liegen ungelöste Meldungen vor."
-recommended: "Admin-Auswahl"
+recommended: "Favoriten"
 check: "Kontrolle"
 driveCapOverrideLabel: "Die Cloud-Drive-Kapazität dieses Nutzers verändern"
 driveCapOverrideCaption: "Gib einen Wert von 0 oder weniger ein, um die Kapazität
@@ -1355,8 +1355,8 @@ _tutorial:
     der/die auf diesem Server registriert ist."
   step5_5: "Die Social-Timeline {icon} ist eine Kombination aus der Home-Timeline
     und der Local-Timeline."
-  step5_6: "In der {icon} \"Admin-Auswahl\"-Timeline können sie Beiträge von Servern
-    sehen, die von den Server-Administratoren vorgeschlagen werden."
+  step5_6: "In der {icon} \"Favoriten\"-Timeline können sie Beiträge von Servern sehen,
+    die von den Server-Administratoren vorgeschlagen werden."
   step5_7: "In der {icon} Global-Timeline können Sie Beiträge von allen verknüpften
     Servern aus dem Fediverse sehen."
   step6_1: "Also, was ist das hier?"
@@ -1571,7 +1571,7 @@ _timelines:
   local: "Local-TL"
   social: "Social-TL"
   global: "Global-TL"
-  recommended: Admin-Auswahl
+  recommended: Favoriten
 _pages:
   newPage: "Neue Seite erstellen"
   editPage: "Seite bearbeiten"
@@ -1934,7 +1934,7 @@ _deck:
     direct: "Direktnachrichten"
   renameProfile: Arbeitsbereich umbenennen
   nameAlreadyExists: Der Name für den Arbeitsbereich ist bereits vorhanden.
-enableRecommendedTimeline: '"Admin-Auswahl"-Timeline einschalten'
+enableRecommendedTimeline: '"Favoriten"-Timeline einschalten'
 secureMode: Sicherer Modus (Autorisierter Abruf)
 instanceSecurity: Server-Sicherheit
 manageGroups: Gruppen verwalten
@@ -2036,8 +2036,8 @@ customMOTDDescription: Benutzerdefinierte Meldungen für die Meldung des Tages (
   die durch Zeilenumbrüche getrennt sind und nach dem Zufallsprinzip jedes Mal angezeigt
   werden, wenn ein Benutzer die Seite (neu) lädt.
 recommendedInstancesDescription: Empfohlene Server, die durch Zeilenumbrüche getrennt
-  sind, werden in der "Admin-Auswahl"-Timeline angezeigt. Fügen Sie NICHT "https://"
-  hinzu, sondern NUR die Domain.
+  sind, werden in der "Favoriten"-Timeline angezeigt. Fügen Sie NICHT "https://" hinzu,
+  sondern NUR die Domain.
 sendModMail: Moderationshinweis senden
 moveFromDescription: 'Dadurch wird ein Alias Ihres alten Nutzerkontos festgelegt,
   sodass Sie von ihrem bisherigen Konto zu diesem Nutzerkonto wechseln können. Tun

From e52b1330d30daf6d7e299866ccad7b75cbbafd3c Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Mon, 29 May 2023 17:06:39 +0200
Subject: [PATCH 115/319] Only connect to Meili with valid config

---
 packages/backend/src/db/meilisearch.ts | 76 +++++++++++++-------------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 7e176e0583..9a64da850d 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -9,55 +9,57 @@ import { Followings, Users } from "@/models/index.js";
 
 const logger = dbLogger.createSubLogger("meilisearch", "gray", false);
 
-logger.info("Connecting to MeiliSearch");
-
 const hasConfig =
 	config.meilisearch &&
 	(config.meilisearch.host ||
 		config.meilisearch.port ||
 		config.meilisearch.apiKey);
 
-const host = hasConfig ? config.meilisearch.host ?? "localhost" : "";
-const port = hasConfig ? config.meilisearch.port ?? 7700 : 0;
-const auth = hasConfig ? config.meilisearch.apiKey ?? "" : "";
-const ssl = hasConfig ? config.meilisearch.ssl ?? false : false;
+if (hasConfig) {
+	const host = hasConfig ? config.meilisearch.host ?? "localhost" : "";
+	const port = hasConfig ? config.meilisearch.port ?? 7700 : 0;
+	const auth = hasConfig ? config.meilisearch.apiKey ?? "" : "";
+	const ssl = hasConfig ? config.meilisearch.ssl ?? false : false;
 
-const client: MeiliSearch = new MeiliSearch({
-	host: `${ssl ? "https" : "http"}://${host}:${port}`,
-	apiKey: auth,
-});
+	logger.info("Connecting to MeiliSearch");
 
-const posts = client.index("posts");
+	const client: MeiliSearch = new MeiliSearch({
+		host: `${ssl ? "https" : "http"}://${host}:${port}`,
+		apiKey: auth,
+	});
 
-posts
-	.updateSearchableAttributes(["text"])
-	.catch((e) =>
-		logger.error(`Setting searchable attr failed, searches won't work: ${e}`),
-	);
+	const posts = client.index("posts");
 
-posts
-	.updateFilterableAttributes([
-		"userName",
-		"userHost",
-		"mediaAttachment",
-		"createdAt",
-		"userId",
-	])
-	.catch((e) =>
-		logger.error(
-			`Setting filterable attr failed, advanced searches won't work: ${e}`,
-		),
-	);
+	posts
+		.updateSearchableAttributes(["text"])
+		.catch((e) =>
+			logger.error(`Setting searchable attr failed, searches won't work: ${e}`),
+		);
 
-posts
-	.updateSortableAttributes(["createdAt"])
-	.catch((e) =>
-		logger.error(
-			`Setting sortable attr failed, placeholder searches won't sort properly: ${e}`,
-		),
-	);
+	posts
+		.updateFilterableAttributes([
+			"userName",
+			"userHost",
+			"mediaAttachment",
+			"createdAt",
+			"userId",
+		])
+		.catch((e) =>
+			logger.error(
+				`Setting filterable attr failed, advanced searches won't work: ${e}`,
+			),
+		);
 
-logger.info("Connected to MeiliSearch");
+	posts
+		.updateSortableAttributes(["createdAt"])
+		.catch((e) =>
+			logger.error(
+				`Setting sortable attr failed, placeholder searches won't sort properly: ${e}`,
+			),
+		);
+
+	logger.info("Connected to MeiliSearch");
+}
 
 export type MeilisearchNote = {
 	id: string;

From 8806ce8923ea53fcd4a5eae94da9963f90371490 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 19 May 2023 20:41:19 -0700
Subject: [PATCH 116/319] docs: searc providers

---
 README.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a72a171bb5..9a0279a657 100644
--- a/README.md
+++ b/README.md
@@ -148,7 +148,11 @@ 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
+## 🔎 Set up search
+
+### 🦔 Sonic
+
+Sonic is better suited for self hosters with smaller deployments. It's easier to use, uses almost no resources, and takes barely any any disk space.
 
 Follow sonic's [installation guide](https://github.com/valeriansaliou/sonic#installation)
 
@@ -157,6 +161,17 @@ Follow sonic's [installation guide](https://github.com/valeriansaliou/sonic#inst
 
 In Calckey's directory, fill out the `sonic` section of `.config/default.yml` with the correct information.
 
+### Meilisearch
+
+Meilisearch is better suited for larger deployments. It's faster but uses far more resources and disk space.
+
+Follow Meilisearch's [quick start guide](https://www.meilisearch.com/docs/learn/getting_started/quick_start)
+
+In Calckey's directory, fill out the `meilisearch` section of `.config/default.yml` with the correct information.
+
+### ElasticSearch
+
+Please don't use ElasticSearch unless you already have an ElasticSearch setup and want to continue using it for Calckey. ElasticSearch is slow, heavy, and offers very few benefits over Sonic/Meilisearch.
 
 ## 💅 Customize
 

From 61ebac5817da8b3f4478144ba40e645e03626bbb Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 09:22:24 -0700
Subject: [PATCH 117/319] docs: deps

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

diff --git a/README.md b/README.md
index 9a0279a657..5b3eb98fd4 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,8 @@ If you have access to a server that supports one of the sources below, I recomme
 
 - [FFmpeg](https://ffmpeg.org/) for video transcoding
 - Full text search (one of the following)
-  - 🦔 [Sonic](https://crates.io/crates/sonic-server) (recommended)
+  - 🦔 [Sonic](https://crates.io/crates/sonic-server)
+  - [MeiliSearch](https://www.meilisearch.com/)
   - [ElasticSearch](https://www.elastic.co/elasticsearch/)
 
 ### 🏗️ Build dependencies

From 655cf3dc274e84fa005ab9af4750d7fb3c6f4bf0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 09:31:02 -0700
Subject: [PATCH 118/319] chore: format

---
 packages/backend/jsconfig.json                |   7 +-
 .../native-utils/__test__/index.spec.mjs      |  10 +-
 .../src/models/entities/abuse-user-report.ts  |  38 +--
 .../src/models/entities/access-token.ts       |  35 +--
 packages/backend/src/models/entities/ad.ts    |  38 +--
 .../src/models/entities/announcement-read.ts  |  14 +-
 .../src/models/entities/announcement.ts       |  23 +-
 .../src/models/entities/antenna-note.ts       |  16 +-
 .../backend/src/models/entities/antenna.ts    |  52 ++--
 packages/backend/src/models/entities/app.ts   |  36 +--
 .../models/entities/attestation-challenge.ts  |  16 +-
 .../src/models/entities/auth-session.ts       |  14 +-
 .../backend/src/models/entities/blocking.ts   |  18 +-
 .../src/models/entities/channel-following.ts  |  18 +-
 .../models/entities/channel-note-pining.ts    |  14 +-
 .../backend/src/models/entities/channel.ts    |  37 +--
 .../backend/src/models/entities/clip-note.ts  |  14 +-
 packages/backend/src/models/entities/clip.ts  |  23 +-
 .../backend/src/models/entities/drive-file.ts | 132 +++++----
 .../src/models/entities/drive-folder.ts       |  21 +-
 packages/backend/src/models/entities/emoji.ts |  53 ++--
 .../src/models/entities/follow-request.ts     |  67 ++---
 .../backend/src/models/entities/following.ts  |  60 +++--
 .../src/models/entities/gallery-like.ts       |  12 +-
 .../src/models/entities/gallery-post.ts       |  36 +--
 .../backend/src/models/entities/hashtag.ts    |  14 +-
 .../backend/src/models/entities/instance.ts   |  83 +++---
 .../src/models/entities/messaging-message.ts  |  47 ++--
 packages/backend/src/models/entities/meta.ts  | 255 ++++++++++--------
 .../src/models/entities/moderation-log.ts     |  12 +-
 .../backend/src/models/entities/muted-note.ts |  18 +-
 .../backend/src/models/entities/muting.ts     |  20 +-
 .../backend/src/models/entities/note-edit.ts  |  20 +-
 .../src/models/entities/note-favorite.ts      |  14 +-
 .../src/models/entities/note-reaction.ts      |  16 +-
 .../src/models/entities/note-thread-muting.ts |  11 +-
 .../src/models/entities/note-unread.ts        |  18 +-
 .../src/models/entities/note-watching.ts      |  20 +-
 packages/backend/src/models/entities/note.ts  | 143 +++++-----
 .../src/models/entities/notification.ts       |  62 +++--
 .../backend/src/models/entities/page-like.ts  |  12 +-
 packages/backend/src/models/entities/page.ts  |  52 ++--
 .../models/entities/password-reset-request.ts |   8 +-
 .../backend/src/models/entities/poll-vote.ts  |  16 +-
 packages/backend/src/models/entities/poll.ts  |  29 +-
 .../backend/src/models/entities/promo-note.ts |   8 +-
 .../backend/src/models/entities/promo-read.ts |  14 +-
 .../models/entities/registration-tickets.ts   |   4 +-
 .../src/models/entities/registry-item.ts      |  36 +--
 packages/backend/src/models/entities/relay.ts |   9 +-
 .../src/models/entities/renote-muting.ts      |   4 +-
 .../backend/src/models/entities/signin.ts     |  14 +-
 .../src/models/entities/sw-subscription.ts    |  14 +-
 .../src/models/entities/used-username.ts      |   4 +-
 .../models/entities/user-group-invitation.ts  |  18 +-
 .../src/models/entities/user-group-joining.ts |  18 +-
 .../backend/src/models/entities/user-group.ts |  14 +-
 .../backend/src/models/entities/user-ip.ts    |   7 +-
 .../src/models/entities/user-keypair.ts       |   8 +-
 .../src/models/entities/user-list-joining.ts  |  18 +-
 .../backend/src/models/entities/user-list.ts  |  14 +-
 .../src/models/entities/user-note-pining.ts   |  14 +-
 .../src/models/entities/user-pending.ts       |  10 +-
 .../src/models/entities/user-profile.ts       | 144 +++++-----
 .../src/models/entities/user-publickey.ts     |   8 +-
 .../src/models/entities/user-security-key.ts  |  20 +-
 packages/backend/src/models/entities/user.ts  | 183 +++++++------
 .../backend/src/models/entities/webhook.ts    |  30 ++-
 packages/backend/src/server/web/manifest.json |   8 +-
 packages/calckey-js/package.json              |   4 +-
 packages/calckey-js/tsconfig.json             |   9 +-
 packages/client/src/widgets/server-info.vue   |   2 +-
 packages/sw/package.json                      |   4 +-
 rome.json                                     |  17 +-
 74 files changed, 1252 insertions(+), 1079 deletions(-)

diff --git a/packages/backend/jsconfig.json b/packages/backend/jsconfig.json
index 1230aadd12..f3f4f9c772 100644
--- a/packages/backend/jsconfig.json
+++ b/packages/backend/jsconfig.json
@@ -4,10 +4,5 @@
 		"module": "commonjs",
 		"allowSyntheticDefaultImports": true
 	},
-	"exclude": [
-		"node_modules",
-		"jspm_packages",
-		"tmp",
-		"temp"
-	]
+	"exclude": ["node_modules", "jspm_packages", "tmp", "temp"]
 }
diff --git a/packages/backend/native-utils/__test__/index.spec.mjs b/packages/backend/native-utils/__test__/index.spec.mjs
index 7d68d6ac36..1788dbb061 100644
--- a/packages/backend/native-utils/__test__/index.spec.mjs
+++ b/packages/backend/native-utils/__test__/index.spec.mjs
@@ -4,6 +4,12 @@ import { convertId, IdConvertType } from "../built/index.js";
 
 test("convert to mastodon id", (t) => {
 	t.is(convertId("9gf61ehcxv", IdConvertType.MastodonId), "960365976481219");
-	t.is(convertId("9fbr9z0wbrjqyd3u", IdConvertType.MastodonId), "3954607381600562394");
-	t.is(convertId("9fbs680oyviiqrol9md73p8g", IdConvertType.MastodonId), "3494513243013053824")
+	t.is(
+		convertId("9fbr9z0wbrjqyd3u", IdConvertType.MastodonId),
+		"3954607381600562394",
+	);
+	t.is(
+		convertId("9fbs680oyviiqrol9md73p8g", IdConvertType.MastodonId),
+		"3494513243013053824",
+	);
 });
diff --git a/packages/backend/src/models/entities/abuse-user-report.ts b/packages/backend/src/models/entities/abuse-user-report.ts
index 655fdd3ca6..be183548d8 100644
--- a/packages/backend/src/models/entities/abuse-user-report.ts
+++ b/packages/backend/src/models/entities/abuse-user-report.ts
@@ -15,8 +15,8 @@ export class AbuseUserReport {
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the AbuseUserReport.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the AbuseUserReport.",
 	})
 	public createdAt: Date;
 
@@ -24,8 +24,8 @@ export class AbuseUserReport {
 	@Column(id())
 	public targetUserId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public targetUser: User | null;
@@ -34,8 +34,8 @@ export class AbuseUserReport {
 	@Column(id())
 	public reporterId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public reporter: User | null;
@@ -46,40 +46,42 @@ export class AbuseUserReport {
 	})
 	public assigneeId: User["id"] | null;
 
-	@ManyToOne(type => User, {
-		onDelete: 'SET NULL',
+	@ManyToOne((type) => User, {
+		onDelete: "SET NULL",
 	})
 	@JoinColumn()
 	public assignee: User | null;
 
 	@Index()
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public resolved: boolean;
 
-	@Column('boolean', {
-		default: false
+	@Column("boolean", {
+		default: false,
 	})
 	public forwarded: boolean;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 2048,
 	})
 	public comment: string;
 
 	//#region Denormalized fields
 	@Index()
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public targetUserHost: string | null;
 
 	@Index()
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public reporterHost: string | null;
 	//#endregion
diff --git a/packages/backend/src/models/entities/access-token.ts b/packages/backend/src/models/entities/access-token.ts
index 83d7bbda86..8b950b171b 100644
--- a/packages/backend/src/models/entities/access-token.ts
+++ b/packages/backend/src/models/entities/access-token.ts
@@ -15,31 +15,31 @@ export class AccessToken {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the AccessToken.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the AccessToken.",
 	})
 	public createdAt: Date;
 
-	@Column('timestamp with time zone', {
+	@Column("timestamp with time zone", {
 		nullable: true,
 	})
 	public lastUsedAt: Date | null;
 
 	@Index()
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 	})
 	public token: string;
 
 	@Index()
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public session: string | null;
 
 	@Index()
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 	})
 	public hash: string;
@@ -48,8 +48,8 @@ export class AccessToken {
 	@Column(id())
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -60,37 +60,38 @@ export class AccessToken {
 	})
 	public appId: App["id"] | null;
 
-	@ManyToOne(type => App, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => App, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public app: App | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public name: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
 	})
 	public description: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
 	})
 	public iconUrl: string | null;
 
-	@Column('varchar', {
-		length: 64, array: true,
-		default: '{}',
+	@Column("varchar", {
+		length: 64,
+		array: true,
+		default: "{}",
 	})
 	public permission: string[];
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public fetched: boolean;
diff --git a/packages/backend/src/models/entities/ad.ts b/packages/backend/src/models/entities/ad.ts
index fa42973652..80d54ddd52 100644
--- a/packages/backend/src/models/entities/ad.ts
+++ b/packages/backend/src/models/entities/ad.ts
@@ -7,45 +7,51 @@ export class Ad {
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the Ad.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the Ad.",
 	})
 	public createdAt: Date;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The expired date of the Ad.',
+	@Column("timestamp with time zone", {
+		comment: "The expired date of the Ad.",
 	})
 	public expiresAt: Date;
 
-	@Column('varchar', {
-		length: 32, nullable: false,
+	@Column("varchar", {
+		length: 32,
+		nullable: false,
 	})
 	public place: string;
 
 	// 今は使われていないが将来的に活用される可能性はある
-	@Column('varchar', {
-		length: 32, nullable: false,
+	@Column("varchar", {
+		length: 32,
+		nullable: false,
 	})
 	public priority: string;
 
-	@Column('integer', {
-		default: 1, nullable: false,
+	@Column("integer", {
+		default: 1,
+		nullable: false,
 	})
 	public ratio: number;
 
-	@Column('varchar', {
-		length: 1024, nullable: false,
+	@Column("varchar", {
+		length: 1024,
+		nullable: false,
 	})
 	public url: string;
 
-	@Column('varchar', {
-		length: 1024, nullable: false,
+	@Column("varchar", {
+		length: 1024,
+		nullable: false,
 	})
 	public imageUrl: string;
 
-	@Column('varchar', {
-		length: 8192, nullable: false,
+	@Column("varchar", {
+		length: 8192,
+		nullable: false,
 	})
 	public memo: string;
 
diff --git a/packages/backend/src/models/entities/announcement-read.ts b/packages/backend/src/models/entities/announcement-read.ts
index 87d0f0e9ed..79af9e48e3 100644
--- a/packages/backend/src/models/entities/announcement-read.ts
+++ b/packages/backend/src/models/entities/announcement-read.ts
@@ -11,13 +11,13 @@ import { Announcement } from "./announcement.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['userId', 'announcementId'], { unique: true })
+@Index(["userId", "announcementId"], { unique: true })
 export class AnnouncementRead {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the AnnouncementRead.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the AnnouncementRead.",
 	})
 	public createdAt: Date;
 
@@ -25,8 +25,8 @@ export class AnnouncementRead {
 	@Column(id())
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -35,8 +35,8 @@ export class AnnouncementRead {
 	@Column(id())
 	public announcementId: Announcement["id"];
 
-	@ManyToOne(type => Announcement, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Announcement, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public announcement: Announcement | null;
diff --git a/packages/backend/src/models/entities/announcement.ts b/packages/backend/src/models/entities/announcement.ts
index 9d45af0149..1939604b97 100644
--- a/packages/backend/src/models/entities/announcement.ts
+++ b/packages/backend/src/models/entities/announcement.ts
@@ -7,29 +7,32 @@ export class Announcement {
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the Announcement.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the Announcement.",
 	})
 	public createdAt: Date;
 
-	@Column('timestamp with time zone', {
-		comment: 'The updated date of the Announcement.',
+	@Column("timestamp with time zone", {
+		comment: "The updated date of the Announcement.",
 		nullable: true,
 	})
 	public updatedAt: Date | null;
 
-	@Column('varchar', {
-		length: 8192, nullable: false,
+	@Column("varchar", {
+		length: 8192,
+		nullable: false,
 	})
 	public text: string;
 
-	@Column('varchar', {
-		length: 256, nullable: false,
+	@Column("varchar", {
+		length: 256,
+		nullable: false,
 	})
 	public title: string;
 
-	@Column('varchar', {
-		length: 1024, nullable: true,
+	@Column("varchar", {
+		length: 1024,
+		nullable: true,
 	})
 	public imageUrl: string | null;
 
diff --git a/packages/backend/src/models/entities/antenna-note.ts b/packages/backend/src/models/entities/antenna-note.ts
index c47c796bbf..fe982c19ee 100644
--- a/packages/backend/src/models/entities/antenna-note.ts
+++ b/packages/backend/src/models/entities/antenna-note.ts
@@ -11,7 +11,7 @@ import { Antenna } from "./antenna.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['noteId', 'antennaId'], { unique: true })
+@Index(["noteId", "antennaId"], { unique: true })
 export class AntennaNote {
 	@PrimaryColumn(id())
 	public id: string;
@@ -19,12 +19,12 @@ export class AntennaNote {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The note ID.',
+		comment: "The note ID.",
 	})
 	public noteId: Note["id"];
 
-	@ManyToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public note: Note | null;
@@ -32,18 +32,18 @@ export class AntennaNote {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The antenna ID.',
+		comment: "The antenna ID.",
 	})
 	public antennaId: Antenna["id"];
 
-	@ManyToOne(type => Antenna, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Antenna, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public antenna: Antenna | null;
 
 	@Index()
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public read: boolean;
diff --git a/packages/backend/src/models/entities/antenna.ts b/packages/backend/src/models/entities/antenna.ts
index c653b2a051..633dcc1d27 100644
--- a/packages/backend/src/models/entities/antenna.ts
+++ b/packages/backend/src/models/entities/antenna.ts
@@ -16,31 +16,33 @@ export class Antenna {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the Antenna.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the Antenna.",
 	})
 	public createdAt: Date;
 
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The owner ID.',
+		comment: "The owner ID.",
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
-		comment: 'The name of the Antenna.',
+		comment: "The name of the Antenna.",
 	})
 	public name: string;
 
-	@Column('enum', { enum: ['home', 'all', 'users', 'list', 'group', 'instances'] })
+	@Column("enum", {
+		enum: ["home", "all", "users", "list", "group", "instances"],
+	})
 	public src: "home" | "all" | "users" | "list" | "group" | "instances";
 
 	@Column({
@@ -49,8 +51,8 @@ export class Antenna {
 	})
 	public userListId: UserList["id"] | null;
 
-	@ManyToOne(type => UserList, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => UserList, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public userList: UserList | null;
@@ -61,51 +63,53 @@ export class Antenna {
 	})
 	public userGroupJoiningId: UserGroupJoining["id"] | null;
 
-	@ManyToOne(type => UserGroupJoining, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => UserGroupJoining, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public userGroupJoining: UserGroupJoining | null;
 
-	@Column('varchar', {
-		length: 1024, array: true,
-		default: '{}',
+	@Column("varchar", {
+		length: 1024,
+		array: true,
+		default: "{}",
 	})
 	public users: string[];
 
-	@Column('jsonb', {
+	@Column("jsonb", {
 		default: [],
 	})
 	public instances: string[];
 
-	@Column('jsonb', {
+	@Column("jsonb", {
 		default: [],
 	})
 	public keywords: string[][];
 
-	@Column('jsonb', {
+	@Column("jsonb", {
 		default: [],
 	})
 	public excludeKeywords: string[][];
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public caseSensitive: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public withReplies: boolean;
 
-	@Column('boolean')
+	@Column("boolean")
 	public withFile: boolean;
 
-	@Column('varchar', {
-		length: 2048, nullable: true,
+	@Column("varchar", {
+		length: 2048,
+		nullable: true,
 	})
 	public expression: string | null;
 
-	@Column('boolean')
+	@Column("boolean")
 	public notify: boolean;
 }
diff --git a/packages/backend/src/models/entities/app.ts b/packages/backend/src/models/entities/app.ts
index bb33eede4f..a41e35aa91 100644
--- a/packages/backend/src/models/entities/app.ts
+++ b/packages/backend/src/models/entities/app.ts
@@ -8,8 +8,8 @@ export class App {
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the App.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the App.",
 	})
 	public createdAt: Date;
 
@@ -17,44 +17,46 @@ export class App {
 	@Column({
 		...id(),
 		nullable: true,
-		comment: 'The owner ID.',
+		comment: "The owner ID.",
 	})
 	public userId: User["id"] | null;
 
-	@ManyToOne(type => User, {
-		onDelete: 'SET NULL',
+	@ManyToOne((type) => User, {
+		onDelete: "SET NULL",
 		nullable: true,
 	})
 	public user: User | null;
 
 	@Index()
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 64,
-		comment: 'The secret key of the App.',
+		comment: "The secret key of the App.",
 	})
 	public secret: string;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
-		comment: 'The name of the App.',
+		comment: "The name of the App.",
 	})
 	public name: string;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
-		comment: 'The description of the App.',
+		comment: "The description of the App.",
 	})
 	public description: string;
 
-	@Column('varchar', {
-		length: 64, array: true,
-		comment: 'The permission of the App.',
+	@Column("varchar", {
+		length: 64,
+		array: true,
+		comment: "The permission of the App.",
 	})
 	public permission: string[];
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: 'The callbackUrl of the App.',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment: "The callbackUrl of the App.",
 	})
 	public callbackUrl: string | null;
 }
diff --git a/packages/backend/src/models/entities/attestation-challenge.ts b/packages/backend/src/models/entities/attestation-challenge.ts
index 7a87d42be0..6a3a9c8ed7 100644
--- a/packages/backend/src/models/entities/attestation-challenge.ts
+++ b/packages/backend/src/models/entities/attestation-challenge.ts
@@ -18,27 +18,27 @@ export class AttestationChallenge {
 	@PrimaryColumn(id())
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
 	@Index()
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 64,
-		comment: 'Hex-encoded sha256 hash of the challenge.',
+		comment: "Hex-encoded sha256 hash of the challenge.",
 	})
 	public challenge: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The date challenge was created for expiry purposes.',
+	@Column("timestamp with time zone", {
+		comment: "The date challenge was created for expiry purposes.",
 	})
 	public createdAt: Date;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		comment:
-			'Indicates that the challenge is only for registration purposes if true to prevent the challenge for being used as authentication.',
+			"Indicates that the challenge is only for registration purposes if true to prevent the challenge for being used as authentication.",
 		default: false,
 	})
 	public registrationChallenge: boolean;
diff --git a/packages/backend/src/models/entities/auth-session.ts b/packages/backend/src/models/entities/auth-session.ts
index b762f84625..b31dca56cf 100644
--- a/packages/backend/src/models/entities/auth-session.ts
+++ b/packages/backend/src/models/entities/auth-session.ts
@@ -15,13 +15,13 @@ export class AuthSession {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the AuthSession.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the AuthSession.",
 	})
 	public createdAt: Date;
 
 	@Index()
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 	})
 	public token: string;
@@ -32,8 +32,8 @@ export class AuthSession {
 	})
 	public userId: User["id"] | null;
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 		nullable: true,
 	})
 	@JoinColumn()
@@ -42,8 +42,8 @@ export class AuthSession {
 	@Column(id())
 	public appId: App["id"];
 
-	@ManyToOne(type => App, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => App, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public app: App | null;
diff --git a/packages/backend/src/models/entities/blocking.ts b/packages/backend/src/models/entities/blocking.ts
index 3a44a4d656..55f677a981 100644
--- a/packages/backend/src/models/entities/blocking.ts
+++ b/packages/backend/src/models/entities/blocking.ts
@@ -10,26 +10,26 @@ import { User } from "./user.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['blockerId', 'blockeeId'], { unique: true })
+@Index(["blockerId", "blockeeId"], { unique: true })
 export class Blocking {
 	@PrimaryColumn(id())
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the Blocking.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the Blocking.",
 	})
 	public createdAt: Date;
 
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The blockee user ID.',
+		comment: "The blockee user ID.",
 	})
 	public blockeeId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public blockee: User | null;
@@ -37,12 +37,12 @@ export class Blocking {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The blocker user ID.',
+		comment: "The blocker user ID.",
 	})
 	public blockerId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public blocker: User | null;
diff --git a/packages/backend/src/models/entities/channel-following.ts b/packages/backend/src/models/entities/channel-following.ts
index 04ec193e19..ee329fa50f 100644
--- a/packages/backend/src/models/entities/channel-following.ts
+++ b/packages/backend/src/models/entities/channel-following.ts
@@ -11,26 +11,26 @@ import { id } from "../id.js";
 import { Channel } from "./channel.js";
 
 @Entity()
-@Index(['followerId', 'followeeId'], { unique: true })
+@Index(["followerId", "followeeId"], { unique: true })
 export class ChannelFollowing {
 	@PrimaryColumn(id())
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the ChannelFollowing.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the ChannelFollowing.",
 	})
 	public createdAt: Date;
 
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The followee channel ID.',
+		comment: "The followee channel ID.",
 	})
 	public followeeId: Channel["id"];
 
-	@ManyToOne(type => Channel, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Channel, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public followee: Channel | null;
@@ -38,12 +38,12 @@ export class ChannelFollowing {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The follower user ID.',
+		comment: "The follower user ID.",
 	})
 	public followerId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public follower: User | null;
diff --git a/packages/backend/src/models/entities/channel-note-pining.ts b/packages/backend/src/models/entities/channel-note-pining.ts
index bd13f4ca39..67d1d48ccd 100644
--- a/packages/backend/src/models/entities/channel-note-pining.ts
+++ b/packages/backend/src/models/entities/channel-note-pining.ts
@@ -11,13 +11,13 @@ import { Channel } from "./channel.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['channelId', 'noteId'], { unique: true })
+@Index(["channelId", "noteId"], { unique: true })
 export class ChannelNotePining {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the ChannelNotePining.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the ChannelNotePining.",
 	})
 	public createdAt: Date;
 
@@ -25,8 +25,8 @@ export class ChannelNotePining {
 	@Column(id())
 	public channelId: Channel["id"];
 
-	@ManyToOne(type => Channel, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Channel, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public channel: Channel | null;
@@ -34,8 +34,8 @@ export class ChannelNotePining {
 	@Column(id())
 	public noteId: Note["id"];
 
-	@ManyToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public note: Note | null;
diff --git a/packages/backend/src/models/entities/channel.ts b/packages/backend/src/models/entities/channel.ts
index 7f9851dbf9..ea22fed50b 100644
--- a/packages/backend/src/models/entities/channel.ts
+++ b/packages/backend/src/models/entities/channel.ts
@@ -16,13 +16,13 @@ export class Channel {
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the Channel.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the Channel.",
 	})
 	public createdAt: Date;
 
 	@Index()
-	@Column('timestamp with time zone', {
+	@Column("timestamp with time zone", {
 		nullable: true,
 	})
 	public lastNotedAt: Date | null;
@@ -31,52 +31,53 @@ export class Channel {
 	@Column({
 		...id(),
 		nullable: true,
-		comment: 'The owner ID.',
+		comment: "The owner ID.",
 	})
 	public userId: User["id"] | null;
 
-	@ManyToOne(type => User, {
-		onDelete: 'SET NULL',
+	@ManyToOne((type) => User, {
+		onDelete: "SET NULL",
 	})
 	@JoinColumn()
 	public user: User | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
-		comment: 'The name of the Channel.',
+		comment: "The name of the Channel.",
 	})
 	public name: string;
 
-	@Column('varchar', {
-		length: 2048, nullable: true,
-		comment: 'The description of the Channel.',
+	@Column("varchar", {
+		length: 2048,
+		nullable: true,
+		comment: "The description of the Channel.",
 	})
 	public description: string | null;
 
 	@Column({
 		...id(),
 		nullable: true,
-		comment: 'The ID of banner Channel.',
+		comment: "The ID of banner Channel.",
 	})
 	public bannerId: DriveFile["id"] | null;
 
-	@ManyToOne(type => DriveFile, {
-		onDelete: 'SET NULL',
+	@ManyToOne((type) => DriveFile, {
+		onDelete: "SET NULL",
 	})
 	@JoinColumn()
 	public banner: DriveFile | null;
 
 	@Index()
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
-		comment: 'The count of notes.',
+		comment: "The count of notes.",
 	})
 	public notesCount: number;
 
 	@Index()
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
-		comment: 'The count of users.',
+		comment: "The count of users.",
 	})
 	public usersCount: number;
 }
diff --git a/packages/backend/src/models/entities/clip-note.ts b/packages/backend/src/models/entities/clip-note.ts
index bc51daaf4d..1697474a84 100644
--- a/packages/backend/src/models/entities/clip-note.ts
+++ b/packages/backend/src/models/entities/clip-note.ts
@@ -11,7 +11,7 @@ import { Clip } from "./clip.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['noteId', 'clipId'], { unique: true })
+@Index(["noteId", "clipId"], { unique: true })
 export class ClipNote {
 	@PrimaryColumn(id())
 	public id: string;
@@ -19,12 +19,12 @@ export class ClipNote {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The note ID.',
+		comment: "The note ID.",
 	})
 	public noteId: Note["id"];
 
-	@ManyToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public note: Note | null;
@@ -32,12 +32,12 @@ export class ClipNote {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The clip ID.',
+		comment: "The clip ID.",
 	})
 	public clipId: Clip["id"];
 
-	@ManyToOne(type => Clip, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Clip, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public clip: Clip | null;
diff --git a/packages/backend/src/models/entities/clip.ts b/packages/backend/src/models/entities/clip.ts
index 10591cbeef..9554703a4c 100644
--- a/packages/backend/src/models/entities/clip.ts
+++ b/packages/backend/src/models/entities/clip.ts
@@ -14,38 +14,39 @@ export class Clip {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the Clip.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the Clip.",
 	})
 	public createdAt: Date;
 
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The owner ID.',
+		comment: "The owner ID.",
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
-		comment: 'The name of the Clip.',
+		comment: "The name of the Clip.",
 	})
 	public name: string;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public isPublic: boolean;
 
-	@Column('varchar', {
-		length: 2048, nullable: true,
-		comment: 'The description of the Clip.',
+	@Column("varchar", {
+		length: 2048,
+		nullable: true,
+		comment: "The description of the Clip.",
 	})
 	public description: string | null;
 }
diff --git a/packages/backend/src/models/entities/drive-file.ts b/packages/backend/src/models/entities/drive-file.ts
index 32e19bc6ee..d8b54fa194 100644
--- a/packages/backend/src/models/entities/drive-file.ts
+++ b/packages/backend/src/models/entities/drive-file.ts
@@ -12,14 +12,14 @@ import { DriveFolder } from "./drive-folder.js";
 import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js";
 
 @Entity()
-@Index(['userId', 'folderId', 'id'])
+@Index(["userId", "folderId", "id"])
 export class DriveFile {
 	@PrimaryColumn(id())
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the DriveFile.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the DriveFile.",
 	})
 	public createdAt: Date;
 
@@ -27,64 +27,67 @@ export class DriveFile {
 	@Column({
 		...id(),
 		nullable: true,
-		comment: 'The owner ID.',
+		comment: "The owner ID.",
 	})
 	public userId: User["id"] | null;
 
-	@ManyToOne(type => User, {
-		onDelete: 'SET NULL',
+	@ManyToOne((type) => User, {
+		onDelete: "SET NULL",
 	})
 	@JoinColumn()
 	public user: User | null;
 
 	@Index()
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: 'The host of owner. It will be null if the user in local.',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "The host of owner. It will be null if the user in local.",
 	})
 	public userHost: string | null;
 
 	@Index()
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 32,
-		comment: 'The MD5 hash of the DriveFile.',
+		comment: "The MD5 hash of the DriveFile.",
 	})
 	public md5: string;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 256,
-		comment: 'The file name of the DriveFile.',
+		comment: "The file name of the DriveFile.",
 	})
 	public name: string;
 
 	@Index()
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
-		comment: 'The content type (MIME) of the DriveFile.',
+		comment: "The content type (MIME) of the DriveFile.",
 	})
 	public type: string;
 
-	@Column('integer', {
-		comment: 'The file size (bytes) of the DriveFile.',
+	@Column("integer", {
+		comment: "The file size (bytes) of the DriveFile.",
 	})
 	public size: number;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: DB_MAX_IMAGE_COMMENT_LENGTH,
 		nullable: true,
-		comment: 'The comment of the DriveFile.',
+		comment: "The comment of the DriveFile.",
 	})
 	public comment: string | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: 'The BlurHash string.',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "The BlurHash string.",
 	})
 	public blurhash: string | null;
 
-	@Column('jsonb', {
+	@Column("jsonb", {
 		default: {},
-		comment: 'The any properties of the DriveFile. For example, it includes image width/height.',
+		comment:
+			"The any properties of the DriveFile. For example, it includes image width/height.",
 	})
 	public properties: {
 		width?: number;
@@ -93,59 +96,68 @@ export class DriveFile {
 		avgColor?: string;
 	};
 
-	@Column('boolean')
+	@Column("boolean")
 	public storedInternal: boolean;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
-		comment: 'The URL of the DriveFile.',
+		comment: "The URL of the DriveFile.",
 	})
 	public url: string;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: 'The URL of the thumbnail of the DriveFile.',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment: "The URL of the thumbnail of the DriveFile.",
 	})
 	public thumbnailUrl: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: 'The URL of the webpublic of the DriveFile.',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment: "The URL of the webpublic of the DriveFile.",
 	})
 	public webpublicUrl: string | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
 	})
 	public webpublicType: string | null;
 
 	@Index({ unique: true })
-	@Column('varchar', {
-		length: 256, nullable: true,
+	@Column("varchar", {
+		length: 256,
+		nullable: true,
 	})
 	public accessKey: string | null;
 
 	@Index({ unique: true })
-	@Column('varchar', {
-		length: 256, nullable: true,
+	@Column("varchar", {
+		length: 256,
+		nullable: true,
 	})
 	public thumbnailAccessKey: string | null;
 
 	@Index({ unique: true })
-	@Column('varchar', {
-		length: 256, nullable: true,
+	@Column("varchar", {
+		length: 256,
+		nullable: true,
 	})
 	public webpublicAccessKey: string | null;
 
 	@Index()
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: 'The URI of the DriveFile. it will be null when the DriveFile is local.',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment:
+			"The URI of the DriveFile. it will be null when the DriveFile is local.",
 	})
 	public uri: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
 	})
 	public src: string | null;
 
@@ -153,32 +165,33 @@ export class DriveFile {
 	@Column({
 		...id(),
 		nullable: true,
-		comment: 'The parent folder ID. If null, it means the DriveFile is located in root.',
+		comment:
+			"The parent folder ID. If null, it means the DriveFile is located in root.",
 	})
 	public folderId: DriveFolder["id"] | null;
 
-	@ManyToOne(type => DriveFolder, {
-		onDelete: 'SET NULL',
+	@ManyToOne((type) => DriveFolder, {
+		onDelete: "SET NULL",
 	})
 	@JoinColumn()
 	public folder: DriveFolder | null;
 
 	@Index()
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
-		comment: 'Whether the DriveFile is NSFW.',
+		comment: "Whether the DriveFile is NSFW.",
 	})
 	public isSensitive: boolean;
 
 	@Index()
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
-		comment: 'Whether the DriveFile is NSFW. (predict)',
+		comment: "Whether the DriveFile is NSFW. (predict)",
 	})
 	public maybeSensitive: boolean;
 
 	@Index()
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public maybePorn: boolean;
@@ -187,20 +200,21 @@ export class DriveFile {
 	 * 外部の(信頼されていない)URLへの直リンクか否か
 	 */
 	@Index()
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
-		comment: 'Whether the DriveFile is direct link to remote server.',
+		comment: "Whether the DriveFile is direct link to remote server.",
 	})
 	public isLink: boolean;
 
-	@Column('jsonb', {
+	@Column("jsonb", {
 		default: {},
 		nullable: true,
 	})
 	public requestHeaders: Record<string, string> | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
 	})
 	public requestIp: string | null;
 }
diff --git a/packages/backend/src/models/entities/drive-folder.ts b/packages/backend/src/models/entities/drive-folder.ts
index 77031ce4ea..0bb2c7a3d2 100644
--- a/packages/backend/src/models/entities/drive-folder.ts
+++ b/packages/backend/src/models/entities/drive-folder.ts
@@ -15,14 +15,14 @@ export class DriveFolder {
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the DriveFolder.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the DriveFolder.",
 	})
 	public createdAt: Date;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
-		comment: 'The name of the DriveFolder.',
+		comment: "The name of the DriveFolder.",
 	})
 	public name: string;
 
@@ -30,12 +30,12 @@ export class DriveFolder {
 	@Column({
 		...id(),
 		nullable: true,
-		comment: 'The owner ID.',
+		comment: "The owner ID.",
 	})
 	public userId: User["id"] | null;
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -44,12 +44,13 @@ export class DriveFolder {
 	@Column({
 		...id(),
 		nullable: true,
-		comment: 'The parent folder ID. If null, it means the DriveFolder is located in root.',
+		comment:
+			"The parent folder ID. If null, it means the DriveFolder is located in root.",
 	})
 	public parentId: DriveFolder["id"] | null;
 
-	@ManyToOne(type => DriveFolder, {
-		onDelete: 'SET NULL',
+	@ManyToOne((type) => DriveFolder, {
+		onDelete: "SET NULL",
 	})
 	@JoinColumn()
 	public parent: DriveFolder | null;
diff --git a/packages/backend/src/models/entities/emoji.ts b/packages/backend/src/models/entities/emoji.ts
index 773265d91c..727ba2f10a 100644
--- a/packages/backend/src/models/entities/emoji.ts
+++ b/packages/backend/src/models/entities/emoji.ts
@@ -2,73 +2,82 @@ import { PrimaryColumn, Entity, Index, Column } from "typeorm";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['name', 'host'], { unique: true })
+@Index(["name", "host"], { unique: true })
 export class Emoji {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
+	@Column("timestamp with time zone", {
 		nullable: true,
 	})
 	public updatedAt: Date | null;
 
 	@Index()
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 	})
 	public name: string;
 
 	@Index()
-	@Column('varchar', {
-		length: 128, nullable: true,
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
 	})
 	public host: string | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
 	})
 	public category: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 	})
 	public originalUrl: string;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
-		default: '',
+		default: "",
 	})
 	public publicUrl: string;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
 	})
 	public uri: string | null;
 
 	// publicUrlの方のtypeが入る
 	// (mime)
-	@Column('varchar', {
-		length: 64, nullable: true,
+	@Column("varchar", {
+		length: 64,
+		nullable: true,
 	})
 	public type: string | null;
 
-	@Column('varchar', {
-		array: true, length: 128, default: '{}',
+	@Column("varchar", {
+		array: true,
+		length: 128,
+		default: "{}",
 	})
 	public aliases: string[];
 
-	@Column('varchar', {
-		length: 1024, nullable: true,
+	@Column("varchar", {
+		length: 1024,
+		nullable: true,
 	})
 	public license: string | null;
 
-	@Column('integer', {
-		nullable: true, comment: 'Image width',
+	@Column("integer", {
+		nullable: true,
+		comment: "Image width",
 	})
 	public width: number | null;
 
-	@Column('integer', {
-		nullable: true, comment: "Image height",
+	@Column("integer", {
+		nullable: true,
+		comment: "Image height",
 	})
 	public height: number | null;
 }
diff --git a/packages/backend/src/models/entities/follow-request.ts b/packages/backend/src/models/entities/follow-request.ts
index 658fed5a5e..281eab9174 100644
--- a/packages/backend/src/models/entities/follow-request.ts
+++ b/packages/backend/src/models/entities/follow-request.ts
@@ -10,25 +10,25 @@ import { User } from "./user.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['followerId', 'followeeId'], { unique: true })
+@Index(["followerId", "followeeId"], { unique: true })
 export class FollowRequest {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the FollowRequest.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the FollowRequest.",
 	})
 	public createdAt: Date;
 
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The followee user ID.',
+		comment: "The followee user ID.",
 	})
 	public followeeId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public followee: User | null;
@@ -36,56 +36,63 @@ export class FollowRequest {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The follower user ID.',
+		comment: "The follower user ID.",
 	})
 	public followerId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public follower: User | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: 'id of Follow Activity.',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "id of Follow Activity.",
 	})
 	public requestId: string | null;
 
 	//#region Denormalized fields
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public followerHost: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public followerInbox: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public followerSharedInbox: string | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public followeeHost: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public followeeInbox: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public followeeSharedInbox: string | null;
 	//#endregion
diff --git a/packages/backend/src/models/entities/following.ts b/packages/backend/src/models/entities/following.ts
index 11f633fcd8..fafcf88851 100644
--- a/packages/backend/src/models/entities/following.ts
+++ b/packages/backend/src/models/entities/following.ts
@@ -10,26 +10,26 @@ import { User } from "./user.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['followerId', 'followeeId'], { unique: true })
+@Index(["followerId", "followeeId"], { unique: true })
 export class Following {
 	@PrimaryColumn(id())
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the Following.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the Following.",
 	})
 	public createdAt: Date;
 
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The followee user ID.',
+		comment: "The followee user ID.",
 	})
 	public followeeId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public followee: User | null;
@@ -37,52 +37,58 @@ export class Following {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The follower user ID.',
+		comment: "The follower user ID.",
 	})
 	public followerId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public follower: User | null;
 
 	//#region Denormalized fields
 	@Index()
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public followerHost: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public followerInbox: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public followerSharedInbox: string | null;
 
 	@Index()
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public followeeHost: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public followeeInbox: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public followeeSharedInbox: string | null;
 	//#endregion
diff --git a/packages/backend/src/models/entities/gallery-like.ts b/packages/backend/src/models/entities/gallery-like.ts
index e74e3c3ce5..259feb8bbb 100644
--- a/packages/backend/src/models/entities/gallery-like.ts
+++ b/packages/backend/src/models/entities/gallery-like.ts
@@ -11,20 +11,20 @@ import { id } from "../id.js";
 import { GalleryPost } from "./gallery-post.js";
 
 @Entity()
-@Index(['userId', 'postId'], { unique: true })
+@Index(["userId", "postId"], { unique: true })
 export class GalleryLike {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone')
+	@Column("timestamp with time zone")
 	public createdAt: Date;
 
 	@Index()
 	@Column(id())
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -32,8 +32,8 @@ export class GalleryLike {
 	@Column(id())
 	public postId: GalleryPost["id"];
 
-	@ManyToOne(type => GalleryPost, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => GalleryPost, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public post: GalleryPost | null;
diff --git a/packages/backend/src/models/entities/gallery-post.ts b/packages/backend/src/models/entities/gallery-post.ts
index a79bb88353..938348659d 100644
--- a/packages/backend/src/models/entities/gallery-post.ts
+++ b/packages/backend/src/models/entities/gallery-post.ts
@@ -16,36 +16,37 @@ export class GalleryPost {
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the GalleryPost.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the GalleryPost.",
 	})
 	public createdAt: Date;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The updated date of the GalleryPost.',
+	@Column("timestamp with time zone", {
+		comment: "The updated date of the GalleryPost.",
 	})
 	public updatedAt: Date;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 256,
 	})
 	public title: string;
 
-	@Column('varchar', {
-		length: 2048, nullable: true,
+	@Column("varchar", {
+		length: 2048,
+		nullable: true,
 	})
 	public description: string | null;
 
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The ID of author.',
+		comment: "The ID of author.",
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -53,26 +54,29 @@ export class GalleryPost {
 	@Index()
 	@Column({
 		...id(),
-		array: true, default: '{}',
+		array: true,
+		default: "{}",
 	})
 	public fileIds: DriveFile["id"][];
 
 	@Index()
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
-		comment: 'Whether the post is sensitive.',
+		comment: "Whether the post is sensitive.",
 	})
 	public isSensitive: boolean;
 
 	@Index()
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
 	})
 	public likedCount: number;
 
 	@Index()
-	@Column('varchar', {
-		length: 128, array: true, default: '{}',
+	@Column("varchar", {
+		length: 128,
+		array: true,
+		default: "{}",
 	})
 	public tags: string[];
 
diff --git a/packages/backend/src/models/entities/hashtag.ts b/packages/backend/src/models/entities/hashtag.ts
index 06fa004be4..7b3df1cc22 100644
--- a/packages/backend/src/models/entities/hashtag.ts
+++ b/packages/backend/src/models/entities/hashtag.ts
@@ -8,7 +8,7 @@ export class Hashtag {
 	public id: string;
 
 	@Index({ unique: true })
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 	})
 	public name: string;
@@ -20,7 +20,7 @@ export class Hashtag {
 	public mentionedUserIds: User["id"][];
 
 	@Index()
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
 	})
 	public mentionedUsersCount: number;
@@ -32,7 +32,7 @@ export class Hashtag {
 	public mentionedLocalUserIds: User["id"][];
 
 	@Index()
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
 	})
 	public mentionedLocalUsersCount: number;
@@ -44,7 +44,7 @@ export class Hashtag {
 	public mentionedRemoteUserIds: User["id"][];
 
 	@Index()
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
 	})
 	public mentionedRemoteUsersCount: number;
@@ -56,7 +56,7 @@ export class Hashtag {
 	public attachedUserIds: User["id"][];
 
 	@Index()
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
 	})
 	public attachedUsersCount: number;
@@ -68,7 +68,7 @@ export class Hashtag {
 	public attachedLocalUserIds: User["id"][];
 
 	@Index()
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
 	})
 	public attachedLocalUsersCount: number;
@@ -80,7 +80,7 @@ export class Hashtag {
 	public attachedRemoteUserIds: User["id"][];
 
 	@Index()
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
 	})
 	public attachedRemoteUsersCount: number;
diff --git a/packages/backend/src/models/entities/instance.ts b/packages/backend/src/models/entities/instance.ts
index 2b118455db..7e0b085831 100644
--- a/packages/backend/src/models/entities/instance.ts
+++ b/packages/backend/src/models/entities/instance.ts
@@ -10,8 +10,8 @@ export class Instance {
 	 * このインスタンスを捕捉した日時
 	 */
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The caught date of the Instance.',
+	@Column("timestamp with time zone", {
+		comment: "The caught date of the Instance.",
 	})
 	public caughtAt: Date;
 
@@ -19,34 +19,34 @@ export class Instance {
 	 * ホスト
 	 */
 	@Index({ unique: true })
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
-		comment: 'The host of the Instance.',
+		comment: "The host of the Instance.",
 	})
 	public host: string;
 
 	/**
 	 * インスタンスのユーザー数
 	 */
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
-		comment: 'The count of the users of the Instance.',
+		comment: "The count of the users of the Instance.",
 	})
 	public usersCount: number;
 
 	/**
 	 * インスタンスの投稿数
 	 */
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
-		comment: 'The count of the notes of the Instance.',
+		comment: "The count of the notes of the Instance.",
 	})
 	public notesCount: number;
 
 	/**
 	 * このインスタンスのユーザーからフォローされている、自インスタンスのユーザーの数
 	 */
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
 	})
 	public followingCount: number;
@@ -54,7 +54,7 @@ export class Instance {
 	/**
 	 * このインスタンスのユーザーをフォローしている、自インスタンスのユーザーの数
 	 */
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
 	})
 	public followersCount: number;
@@ -62,7 +62,7 @@ export class Instance {
 	/**
 	 * 直近のリクエスト送信日時
 	 */
-	@Column('timestamp with time zone', {
+	@Column("timestamp with time zone", {
 		nullable: true,
 	})
 	public latestRequestSentAt: Date | null;
@@ -70,7 +70,7 @@ export class Instance {
 	/**
 	 * 直近のリクエスト送信時のHTTPステータスコード
 	 */
-	@Column('integer', {
+	@Column("integer", {
 		nullable: true,
 	})
 	public latestStatus: number | null;
@@ -78,7 +78,7 @@ export class Instance {
 	/**
 	 * 直近のリクエスト受信日時
 	 */
-	@Column('timestamp with time zone', {
+	@Column("timestamp with time zone", {
 		nullable: true,
 	})
 	public latestRequestReceivedAt: Date | null;
@@ -86,13 +86,13 @@ export class Instance {
 	/**
 	 * このインスタンスと最後にやり取りした日時
 	 */
-	@Column('timestamp with time zone')
+	@Column("timestamp with time zone")
 	public lastCommunicatedAt: Date;
 
 	/**
 	 * このインスタンスと不通かどうか
 	 */
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public isNotResponding: boolean;
@@ -101,63 +101,72 @@ export class Instance {
 	 * このインスタンスへの配信を停止するか
 	 */
 	@Index()
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public isSuspended: boolean;
 
-	@Column('varchar', {
-		length: 64, nullable: true,
-		comment: 'The software of the Instance.',
+	@Column("varchar", {
+		length: 64,
+		nullable: true,
+		comment: "The software of the Instance.",
 	})
 	public softwareName: string | null;
 
-	@Column('varchar', {
-		length: 64, nullable: true,
+	@Column("varchar", {
+		length: 64,
+		nullable: true,
 	})
 	public softwareVersion: string | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		nullable: true,
 	})
 	public openRegistrations: boolean | null;
 
-	@Column('varchar', {
-		length: 256, nullable: true,
+	@Column("varchar", {
+		length: 256,
+		nullable: true,
 	})
 	public name: string | null;
 
-	@Column('varchar', {
-		length: 4096, nullable: true,
+	@Column("varchar", {
+		length: 4096,
+		nullable: true,
 	})
 	public description: string | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
 	})
 	public maintainerName: string | null;
 
-	@Column('varchar', {
-		length: 256, nullable: true,
+	@Column("varchar", {
+		length: 256,
+		nullable: true,
 	})
 	public maintainerEmail: string | null;
 
-	@Column('varchar', {
-		length: 256, nullable: true,
+	@Column("varchar", {
+		length: 256,
+		nullable: true,
 	})
 	public iconUrl: string | null;
 
-	@Column('varchar', {
-		length: 256, nullable: true,
+	@Column("varchar", {
+		length: 256,
+		nullable: true,
 	})
 	public faviconUrl: string | null;
 
-	@Column('varchar', {
-		length: 64, nullable: true,
+	@Column("varchar", {
+		length: 64,
+		nullable: true,
 	})
 	public themeColor: string | null;
 
-	@Column('timestamp with time zone', {
+	@Column("timestamp with time zone", {
 		nullable: true,
 	})
 	public infoUpdatedAt: Date | null;
diff --git a/packages/backend/src/models/entities/messaging-message.ts b/packages/backend/src/models/entities/messaging-message.ts
index 9cf197fa3b..d1da00eaef 100644
--- a/packages/backend/src/models/entities/messaging-message.ts
+++ b/packages/backend/src/models/entities/messaging-message.ts
@@ -17,68 +17,73 @@ export class MessagingMessage {
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the MessagingMessage.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the MessagingMessage.",
 	})
 	public createdAt: Date;
 
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The sender user ID.',
+		comment: "The sender user ID.",
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
 	@Index()
 	@Column({
-		...id(), nullable: true,
-		comment: 'The recipient user ID.',
+		...id(),
+		nullable: true,
+		comment: "The recipient user ID.",
 	})
 	public recipientId: User["id"] | null;
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public recipient: User | null;
 
 	@Index()
 	@Column({
-		...id(), nullable: true,
-		comment: 'The recipient group ID.',
+		...id(),
+		nullable: true,
+		comment: "The recipient group ID.",
 	})
 	public groupId: UserGroup["id"] | null;
 
-	@ManyToOne(type => UserGroup, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => UserGroup, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public group: UserGroup | null;
 
-	@Column('varchar', {
-		length: 4096, nullable: true,
+	@Column("varchar", {
+		length: 4096,
+		nullable: true,
 	})
 	public text: string | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public isRead: boolean;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
 	})
 	public uri: string | null;
 
 	@Column({
 		...id(),
-		array: true, default: '{}',
+		array: true,
+		default: "{}",
 	})
 	public reads: User["id"][];
 
@@ -88,8 +93,8 @@ export class MessagingMessage {
 	})
 	public fileId: DriveFile["id"] | null;
 
-	@ManyToOne(type => DriveFile, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => DriveFile, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public file: DriveFile | null;
diff --git a/packages/backend/src/models/entities/meta.ts b/packages/backend/src/models/entities/meta.ts
index 3a3c50d4a3..433ad0db56 100644
--- a/packages/backend/src/models/entities/meta.ts
+++ b/packages/backend/src/models/entities/meta.ts
@@ -6,119 +6,144 @@ import type { Clip } from "./clip.js";
 @Entity()
 export class Meta {
 	@PrimaryColumn({
-		type: 'varchar',
+		type: "varchar",
 		length: 32,
 	})
 	public id: string;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
 	})
 	public name: string | null;
 
-	@Column('varchar', {
-		length: 1024, nullable: true,
+	@Column("varchar", {
+		length: 1024,
+		nullable: true,
 	})
 	public description: string | null;
 
 	/**
 	 * メンテナの名前
 	 */
-	@Column('varchar', {
-		length: 128, nullable: true,
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
 	})
 	public maintainerName: string | null;
 
 	/**
 	 * メンテナの連絡先
 	 */
-	@Column('varchar', {
-		length: 128, nullable: true,
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
 	})
 	public maintainerEmail: string | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public disableRegistration: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public disableLocalTimeline: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: true,
 	})
 	public disableRecommendedTimeline: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public disableGlobalTimeline: boolean;
 
-	@Column('varchar', {
-		length: 256, default: '⭐',
+	@Column("varchar", {
+		length: 256,
+		default: "⭐",
 	})
 	public defaultReaction: string;
 
-	@Column('varchar', {
-		length: 64, array: true, default: '{}',
+	@Column("varchar", {
+		length: 64,
+		array: true,
+		default: "{}",
 	})
 	public langs: string[];
 
-	@Column('varchar', {
-		length: 256, array: true, default: '{}',
+	@Column("varchar", {
+		length: 256,
+		array: true,
+		default: "{}",
 	})
 	public pinnedUsers: string[];
 
-	@Column('varchar', {
-		length: 256, array: true, default: '{}',
+	@Column("varchar", {
+		length: 256,
+		array: true,
+		default: "{}",
 	})
 	public recommendedInstances: string[];
 
-	@Column('varchar', {
-		length: 256, array: true, default: '{}',
+	@Column("varchar", {
+		length: 256,
+		array: true,
+		default: "{}",
 	})
 	public customMOTD: string[];
 
-	@Column('varchar', {
-		length: 256, array: true, default: '{}',
+	@Column("varchar", {
+		length: 256,
+		array: true,
+		default: "{}",
 	})
 	public customSplashIcons: string[];
 
-	@Column('varchar', {
-		length: 256, array: true, default: '{}',
+	@Column("varchar", {
+		length: 256,
+		array: true,
+		default: "{}",
 	})
 	public hiddenTags: string[];
 
-	@Column('varchar', {
-		length: 256, array: true, default: '{}',
+	@Column("varchar", {
+		length: 256,
+		array: true,
+		default: "{}",
 	})
 	public blockedHosts: string[];
 
-	@Column('varchar', {
-		length: 256, array: true, default: '{}',
+	@Column("varchar", {
+		length: 256,
+		array: true,
+		default: "{}",
 	})
 	public silencedHosts: string[];
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public secureMode: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public privateMode: boolean;
 
-	@Column('varchar', {
-		length: 256, array: true, default: '{}',
+	@Column("varchar", {
+		length: 256,
+		array: true,
+		default: "{}",
 	})
 	public allowedHosts: string[];
 
-	@Column('varchar', {
-		length: 512, array: true, default: '{/featured,/channels,/explore,/pages,/about-calckey}',
+	@Column("varchar", {
+		length: 512,
+		array: true,
+		default: "{/featured,/channels,/explore,/pages,/about-calckey}",
 	})
 	public pinnedPages: string[];
 
@@ -128,51 +153,51 @@ export class Meta {
 	})
 	public pinnedClipId: Clip["id"] | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
 	})
 	public themeColor: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
-		default: '/assets/ai.png',
+		default: "/assets/ai.png",
 	})
 	public mascotImageUrl: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
 	})
 	public bannerUrl: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
 	})
 	public backgroundImageUrl: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
 	})
 	public logoImageUrl: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
-		default: 'https://xn--931a.moe/aiart/yubitun.png',
+		default: "https://xn--931a.moe/aiart/yubitun.png",
 	})
 	public errorImageUrl: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
 	})
 	public iconUrl: string | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: true,
 	})
 	public cacheRemoteFiles: boolean;
@@ -183,60 +208,60 @@ export class Meta {
 	})
 	public proxyAccountId: User["id"] | null;
 
-	@ManyToOne(type => User, {
-		onDelete: 'SET NULL',
+	@ManyToOne((type) => User, {
+		onDelete: "SET NULL",
 	})
 	@JoinColumn()
 	public proxyAccount: User | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public emailRequiredForSignup: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public enableHcaptcha: boolean;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 64,
 		nullable: true,
 	})
 	public hcaptchaSiteKey: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 64,
 		nullable: true,
 	})
 	public hcaptchaSecretKey: string | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public enableRecaptcha: boolean;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 64,
 		nullable: true,
 	})
 	public recaptchaSiteKey: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 64,
 		nullable: true,
 	})
 	public recaptchaSecretKey: string | null;
 
-	@Column('enum', {
-		enum: ['none', 'all', 'local', 'remote'],
-		default: 'none',
+	@Column("enum", {
+		enum: ["none", "all", "local", "remote"],
+		default: "none",
 	})
 	public sensitiveMediaDetection: "none" | "all" | "local" | "remote";
 
-	@Column('enum', {
-		enum: ['medium', 'low', 'high', 'veryLow', 'veryHigh'],
-		default: 'medium',
+	@Column("enum", {
+		enum: ["medium", "low", "high", "veryLow", "veryHigh"],
+		default: "medium",
 	})
 	public sensitiveMediaDetectionSensitivity:
 		| "medium"
@@ -245,279 +270,279 @@ export class Meta {
 		| "veryLow"
 		| "veryHigh";
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public setSensitiveFlagAutomatically: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public enableSensitiveMediaDetectionForVideos: boolean;
 
-	@Column('integer', {
+	@Column("integer", {
 		default: 1024,
-		comment: 'Drive capacity of a local user (MB)',
+		comment: "Drive capacity of a local user (MB)",
 	})
 	public localDriveCapacityMb: number;
 
-	@Column('integer', {
+	@Column("integer", {
 		default: 32,
-		comment: 'Drive capacity of a remote user (MB)',
+		comment: "Drive capacity of a remote user (MB)",
 	})
 	public remoteDriveCapacityMb: number;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public summalyProxy: string | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public enableEmail: boolean;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public email: string | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public smtpSecure: boolean;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public smtpHost: string | null;
 
-	@Column('integer', {
+	@Column("integer", {
 		nullable: true,
 	})
 	public smtpPort: number | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public smtpUser: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public smtpPass: string | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public enableServiceWorker: boolean;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public swPublicKey: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public swPrivateKey: string | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public enableTwitterIntegration: boolean;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public twitterConsumerKey: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public twitterConsumerSecret: string | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public enableGithubIntegration: boolean;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public githubClientId: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public githubClientSecret: string | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public enableDiscordIntegration: boolean;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public discordClientId: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public discordClientSecret: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public deeplAuthKey: string | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public deeplIsPro: boolean;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
 	})
 	public libreTranslateApiUrl: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 		nullable: true,
 	})
 	public libreTranslateApiKey: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
 	})
 	public ToSUrl: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
-		default: 'https://codeberg.org/calckey/calckey',
+		default: "https://codeberg.org/calckey/calckey",
 		nullable: false,
 	})
 	public repositoryUrl: string;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
-		default: 'https://codeberg.org/calckey/calckey/issues/new',
+		default: "https://codeberg.org/calckey/calckey/issues/new",
 		nullable: true,
 	})
 	public feedbackUrl: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 8192,
 		nullable: true,
 	})
 	public defaultLightTheme: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 8192,
 		nullable: true,
 	})
 	public defaultDarkTheme: string | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public useObjectStorage: boolean;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
 	})
 	public objectStorageBucket: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
 	})
 	public objectStoragePrefix: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
 	})
 	public objectStorageBaseUrl: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
 	})
 	public objectStorageEndpoint: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
 	})
 	public objectStorageRegion: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
 	})
 	public objectStorageAccessKey: string | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
 	})
 	public objectStorageSecretKey: string | null;
 
-	@Column('integer', {
+	@Column("integer", {
 		nullable: true,
 	})
 	public objectStoragePort: number | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: true,
 	})
 	public objectStorageUseSSL: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: true,
 	})
 	public objectStorageUseProxy: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public objectStorageSetPublicRead: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: true,
 	})
 	public objectStorageS3ForcePathStyle: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public enableIpLogging: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: true,
 	})
 	public enableActiveEmailValidation: boolean;
 
-	@Column('jsonb', {
+	@Column("jsonb", {
 		default: {},
 	})
 	public experimentalFeatures: Record<string, unknown>;
diff --git a/packages/backend/src/models/entities/moderation-log.ts b/packages/backend/src/models/entities/moderation-log.ts
index cc745e0d20..26bf1cdfa4 100644
--- a/packages/backend/src/models/entities/moderation-log.ts
+++ b/packages/backend/src/models/entities/moderation-log.ts
@@ -14,8 +14,8 @@ export class ModerationLog {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the ModerationLog.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the ModerationLog.",
 	})
 	public createdAt: Date;
 
@@ -23,17 +23,17 @@ export class ModerationLog {
 	@Column(id())
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 	})
 	public type: string;
 
-	@Column('jsonb')
+	@Column("jsonb")
 	public info: Record<string, any>;
 }
diff --git a/packages/backend/src/models/entities/muted-note.ts b/packages/backend/src/models/entities/muted-note.ts
index 11a6ae95d0..0ee245aea9 100644
--- a/packages/backend/src/models/entities/muted-note.ts
+++ b/packages/backend/src/models/entities/muted-note.ts
@@ -12,7 +12,7 @@ import { id } from "../id.js";
 import { mutedNoteReasons } from "../../types.js";
 
 @Entity()
-@Index(['noteId', 'userId'], { unique: true })
+@Index(["noteId", "userId"], { unique: true })
 export class MutedNote {
 	@PrimaryColumn(id())
 	public id: string;
@@ -20,12 +20,12 @@ export class MutedNote {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The note ID.',
+		comment: "The note ID.",
 	})
 	public noteId: Note["id"];
 
-	@ManyToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public note: Note | null;
@@ -33,12 +33,12 @@ export class MutedNote {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The user ID.',
+		comment: "The user ID.",
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -47,9 +47,9 @@ export class MutedNote {
 	 * ミュートされた理由。
 	 */
 	@Index()
-	@Column('enum', {
+	@Column("enum", {
 		enum: mutedNoteReasons,
-		comment: 'The reason of the MutedNote.',
+		comment: "The reason of the MutedNote.",
 	})
 	public reason: typeof mutedNoteReasons[number];
 }
diff --git a/packages/backend/src/models/entities/muting.ts b/packages/backend/src/models/entities/muting.ts
index 561bcfb95f..603619b468 100644
--- a/packages/backend/src/models/entities/muting.ts
+++ b/packages/backend/src/models/entities/muting.ts
@@ -10,19 +10,19 @@ import { User } from "./user.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['muterId', 'muteeId'], { unique: true })
+@Index(["muterId", "muteeId"], { unique: true })
 export class Muting {
 	@PrimaryColumn(id())
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the Muting.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the Muting.",
 	})
 	public createdAt: Date;
 
 	@Index()
-	@Column('timestamp with time zone', {
+	@Column("timestamp with time zone", {
 		nullable: true,
 	})
 	public expiresAt: Date | null;
@@ -30,12 +30,12 @@ export class Muting {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The mutee user ID.',
+		comment: "The mutee user ID.",
 	})
 	public muteeId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public mutee: User | null;
@@ -43,12 +43,12 @@ export class Muting {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The muter user ID.',
+		comment: "The muter user ID.",
 	})
 	public muterId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public muter: User | null;
diff --git a/packages/backend/src/models/entities/note-edit.ts b/packages/backend/src/models/entities/note-edit.ts
index a65375efb5..8761e2b153 100644
--- a/packages/backend/src/models/entities/note-edit.ts
+++ b/packages/backend/src/models/entities/note-edit.ts
@@ -18,34 +18,36 @@ export class NoteEdit {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The ID of note.',
+		comment: "The ID of note.",
 	})
 	public noteId: Note["id"];
 
-	@ManyToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public note: Note | null;
 
-	@Column('text', {
+	@Column("text", {
 		nullable: true,
 	})
 	public text: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
 	})
 	public cw: string | null;
 
 	@Column({
 		...id(),
-		array: true, default: '{}',
+		array: true,
+		default: "{}",
 	})
 	public fileIds: DriveFile["id"][];
 
-	@Column('timestamp with time zone', {
-		comment: 'The updated date of the Note.',
+	@Column("timestamp with time zone", {
+		comment: "The updated date of the Note.",
 	})
 	public updatedAt: Date;
 }
diff --git a/packages/backend/src/models/entities/note-favorite.ts b/packages/backend/src/models/entities/note-favorite.ts
index ab12d8b1b3..19641ecf45 100644
--- a/packages/backend/src/models/entities/note-favorite.ts
+++ b/packages/backend/src/models/entities/note-favorite.ts
@@ -11,13 +11,13 @@ import { User } from "./user.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['userId', 'noteId'], { unique: true })
+@Index(["userId", "noteId"], { unique: true })
 export class NoteFavorite {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the NoteFavorite.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the NoteFavorite.",
 	})
 	public createdAt: Date;
 
@@ -25,8 +25,8 @@ export class NoteFavorite {
 	@Column(id())
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -34,8 +34,8 @@ export class NoteFavorite {
 	@Column(id())
 	public noteId: Note["id"];
 
-	@ManyToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public note: Note | null;
diff --git a/packages/backend/src/models/entities/note-reaction.ts b/packages/backend/src/models/entities/note-reaction.ts
index 0e51c33b16..5e2a8d3e89 100644
--- a/packages/backend/src/models/entities/note-reaction.ts
+++ b/packages/backend/src/models/entities/note-reaction.ts
@@ -11,14 +11,14 @@ import { Note } from "./note.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['userId', 'noteId'], { unique: true })
+@Index(["userId", "noteId"], { unique: true })
 export class NoteReaction {
 	@PrimaryColumn(id())
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the NoteReaction.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the NoteReaction.",
 	})
 	public createdAt: Date;
 
@@ -26,8 +26,8 @@ export class NoteReaction {
 	@Column(id())
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user?: User | null;
@@ -36,15 +36,15 @@ export class NoteReaction {
 	@Column(id())
 	public noteId: Note["id"];
 
-	@ManyToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public note?: Note | null;
 
 	// TODO: 対象noteのuserIdを非正規化したい(「受け取ったリアクション一覧」のようなものを(JOIN無しで)実装したいため)
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 260,
 	})
 	public reaction: string;
diff --git a/packages/backend/src/models/entities/note-thread-muting.ts b/packages/backend/src/models/entities/note-thread-muting.ts
index 2985b195f0..704b328503 100644
--- a/packages/backend/src/models/entities/note-thread-muting.ts
+++ b/packages/backend/src/models/entities/note-thread-muting.ts
@@ -11,13 +11,12 @@ import { Note } from "./note.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['userId', 'threadId'], { unique: true })
+@Index(["userId", "threadId"], { unique: true })
 export class NoteThreadMuting {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-	})
+	@Column("timestamp with time zone", {})
 	public createdAt: Date;
 
 	@Index()
@@ -26,14 +25,14 @@ export class NoteThreadMuting {
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
 	@Index()
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 256,
 	})
 	public threadId: string;
diff --git a/packages/backend/src/models/entities/note-unread.ts b/packages/backend/src/models/entities/note-unread.ts
index d5bba72212..95695cbc8e 100644
--- a/packages/backend/src/models/entities/note-unread.ts
+++ b/packages/backend/src/models/entities/note-unread.ts
@@ -12,7 +12,7 @@ import { id } from "../id.js";
 import type { Channel } from "./channel.js";
 
 @Entity()
-@Index(['userId', 'noteId'], { unique: true })
+@Index(["userId", "noteId"], { unique: true })
 export class NoteUnread {
 	@PrimaryColumn(id())
 	public id: string;
@@ -21,8 +21,8 @@ export class NoteUnread {
 	@Column(id())
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -31,8 +31,8 @@ export class NoteUnread {
 	@Column(id())
 	public noteId: Note["id"];
 
-	@ManyToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public note: Note | null;
@@ -41,21 +41,21 @@ export class NoteUnread {
 	 * メンションか否か
 	 */
 	@Index()
-	@Column('boolean')
+	@Column("boolean")
 	public isMentioned: boolean;
 
 	/**
 	 * ダイレクト投稿か否か
 	 */
 	@Index()
-	@Column('boolean')
+	@Column("boolean")
 	public isSpecified: boolean;
 
 	//#region Denormalized fields
 	@Index()
 	@Column({
 		...id(),
-		comment: '[Denormalized]',
+		comment: "[Denormalized]",
 	})
 	public noteUserId: User["id"];
 
@@ -63,7 +63,7 @@ export class NoteUnread {
 	@Column({
 		...id(),
 		nullable: true,
-		comment: '[Denormalized]',
+		comment: "[Denormalized]",
 	})
 	public noteChannelId: Channel["id"] | null;
 	//#endregion
diff --git a/packages/backend/src/models/entities/note-watching.ts b/packages/backend/src/models/entities/note-watching.ts
index 7ac3e8e297..724b084af2 100644
--- a/packages/backend/src/models/entities/note-watching.ts
+++ b/packages/backend/src/models/entities/note-watching.ts
@@ -11,26 +11,26 @@ import { Note } from "./note.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['userId', 'noteId'], { unique: true })
+@Index(["userId", "noteId"], { unique: true })
 export class NoteWatching {
 	@PrimaryColumn(id())
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the NoteWatching.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the NoteWatching.",
 	})
 	public createdAt: Date;
 
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The watcher ID.',
+		comment: "The watcher ID.",
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -38,12 +38,12 @@ export class NoteWatching {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The target Note ID.',
+		comment: "The target Note ID.",
 	})
 	public noteId: Note["id"];
 
-	@ManyToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public note: Note | null;
@@ -52,7 +52,7 @@ export class NoteWatching {
 	@Index()
 	@Column({
 		...id(),
-		comment: '[Denormalized]',
+		comment: "[Denormalized]",
 	})
 	public noteUserId: Note["userId"];
 	//#endregion
diff --git a/packages/backend/src/models/entities/note.ts b/packages/backend/src/models/entities/note.ts
index f4e76c1dba..edcfdb635e 100644
--- a/packages/backend/src/models/entities/note.ts
+++ b/packages/backend/src/models/entities/note.ts
@@ -13,16 +13,16 @@ import { noteVisibilities } from "../../types.js";
 import { Channel } from "./channel.js";
 
 @Entity()
-@Index('IDX_NOTE_TAGS', { synchronize: false })
-@Index('IDX_NOTE_MENTIONS', { synchronize: false })
-@Index('IDX_NOTE_VISIBLE_USER_IDS', { synchronize: false })
+@Index("IDX_NOTE_TAGS", { synchronize: false })
+@Index("IDX_NOTE_MENTIONS", { synchronize: false })
+@Index("IDX_NOTE_VISIBLE_USER_IDS", { synchronize: false })
 export class Note {
 	@PrimaryColumn(id())
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the Note.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the Note.",
 	})
 	public createdAt: Date;
 
@@ -30,12 +30,12 @@ export class Note {
 	@Column({
 		...id(),
 		nullable: true,
-		comment: 'The ID of reply target.',
+		comment: "The ID of reply target.",
 	})
 	public replyId: Note["id"] | null;
 
-	@ManyToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public reply: Note | null;
@@ -44,66 +44,69 @@ export class Note {
 	@Column({
 		...id(),
 		nullable: true,
-		comment: 'The ID of renote target.',
+		comment: "The ID of renote target.",
 	})
 	public renoteId: Note["id"] | null;
 
-	@ManyToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public renote: Note | null;
 
 	@Index()
-	@Column('varchar', {
-		length: 256, nullable: true,
+	@Column("varchar", {
+		length: 256,
+		nullable: true,
 	})
 	public threadId: string | null;
 
-	@Column('text', {
+	@Column("text", {
 		nullable: true,
 	})
 	public text: string | null;
 
-	@Column('varchar', {
-		length: 256, nullable: true,
+	@Column("varchar", {
+		length: 256,
+		nullable: true,
 	})
 	public name: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
 	})
 	public cw: string | null;
 
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The ID of author.',
+		comment: "The ID of author.",
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public localOnly: boolean;
 
-	@Column('smallint', {
+	@Column("smallint", {
 		default: 0,
 	})
 	public renoteCount: number;
 
-	@Column('smallint', {
+	@Column("smallint", {
 		default: 0,
 	})
 	public repliesCount: number;
 
-	@Column('jsonb', {
+	@Column("jsonb", {
 		default: {},
 	})
 	public reactions: Record<string, number>;
@@ -115,71 +118,84 @@ export class Note {
 	 * followers ... フォロワーのみ
 	 * specified ... visibleUserIds で指定したユーザーのみ
 	 */
-	@Column('enum', { enum: noteVisibilities })
+	@Column("enum", { enum: noteVisibilities })
 	public visibility: typeof noteVisibilities[number];
 
 	@Index({ unique: true })
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: 'The URI of a note. it will be null when the note is local.',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment: "The URI of a note. it will be null when the note is local.",
 	})
 	public uri: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: 'The human readable url of a note. it will be null when the note is local.',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment:
+			"The human readable url of a note. it will be null when the note is local.",
 	})
 	public url: string | null;
 
-	@Column('integer', {
-		default: 0, select: false,
+	@Column("integer", {
+		default: 0,
+		select: false,
 	})
 	public score: number;
 
 	@Index()
 	@Column({
 		...id(),
-		array: true, default: '{}',
+		array: true,
+		default: "{}",
 	})
 	public fileIds: DriveFile["id"][];
 
 	@Index()
-	@Column('varchar', {
-		length: 256, array: true, default: '{}',
+	@Column("varchar", {
+		length: 256,
+		array: true,
+		default: "{}",
 	})
 	public attachedFileTypes: string[];
 
 	@Index()
 	@Column({
 		...id(),
-		array: true, default: '{}',
+		array: true,
+		default: "{}",
 	})
 	public visibleUserIds: User["id"][];
 
 	@Index()
 	@Column({
 		...id(),
-		array: true, default: '{}',
+		array: true,
+		default: "{}",
 	})
 	public mentions: User["id"][];
 
-	@Column('text', {
-		default: '[]',
+	@Column("text", {
+		default: "[]",
 	})
 	public mentionedRemoteUsers: string;
 
-	@Column('varchar', {
-		length: 128, array: true, default: '{}',
+	@Column("varchar", {
+		length: 128,
+		array: true,
+		default: "{}",
 	})
 	public emojis: string[];
 
 	@Index()
-	@Column('varchar', {
-		length: 128, array: true, default: '{}',
+	@Column("varchar", {
+		length: 128,
+		array: true,
+		default: "{}",
 	})
 	public tags: string[];
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public hasPoll: boolean;
@@ -188,53 +204,56 @@ export class Note {
 	@Column({
 		...id(),
 		nullable: true,
-		comment: 'The ID of source channel.',
+		comment: "The ID of source channel.",
 	})
 	public channelId: Channel["id"] | null;
 
-	@ManyToOne(type => Channel, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Channel, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public channel: Channel | null;
 
 	//#region Denormalized fields
 	@Index()
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public userHost: string | null;
 
 	@Column({
 		...id(),
 		nullable: true,
-		comment: '[Denormalized]',
+		comment: "[Denormalized]",
 	})
 	public replyUserId: User["id"] | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public replyUserHost: string | null;
 
 	@Column({
 		...id(),
 		nullable: true,
-		comment: '[Denormalized]',
+		comment: "[Denormalized]",
 	})
 	public renoteUserId: User["id"] | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public renoteUserHost: string | null;
 
-	@Column('timestamp with time zone', {
+	@Column("timestamp with time zone", {
 		nullable: true,
-		comment: 'The updated date of the Note.',
+		comment: "The updated date of the Note.",
 	})
 	public updatedAt: Date;
 	//#endregion
diff --git a/packages/backend/src/models/entities/notification.ts b/packages/backend/src/models/entities/notification.ts
index 2c55e988f1..da23f7d3ee 100644
--- a/packages/backend/src/models/entities/notification.ts
+++ b/packages/backend/src/models/entities/notification.ts
@@ -20,8 +20,8 @@ export class Notification {
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the Notification.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the Notification.",
 	})
 	public createdAt: Date;
 
@@ -31,12 +31,12 @@ export class Notification {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The ID of recipient user of the Notification.',
+		comment: "The ID of recipient user of the Notification.",
 	})
 	public notifieeId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public notifiee: User | null;
@@ -48,12 +48,12 @@ export class Notification {
 	@Column({
 		...id(),
 		nullable: true,
-		comment: 'The ID of sender user of the Notification.',
+		comment: "The ID of sender user of the Notification.",
 	})
 	public notifierId: User["id"] | null;
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public notifier: User | null;
@@ -74,9 +74,9 @@ export class Notification {
 	 * app - App notifications.
 	 */
 	@Index()
-	@Column('enum', {
+	@Column("enum", {
 		enum: notificationTypes,
-		comment: 'The type of the Notification.',
+		comment: "The type of the Notification.",
 	})
 	public type: typeof notificationTypes[number];
 
@@ -84,9 +84,9 @@ export class Notification {
 	 * Whether the notification was read.
 	 */
 	@Index()
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
-		comment: 'Whether the notification was read.',
+		comment: "Whether the notification was read.",
 	})
 	public isRead: boolean;
 
@@ -96,8 +96,8 @@ export class Notification {
 	})
 	public noteId: Note["id"] | null;
 
-	@ManyToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public note: Note | null;
@@ -108,8 +108,8 @@ export class Notification {
 	})
 	public followRequestId: FollowRequest["id"] | null;
 
-	@ManyToOne(type => FollowRequest, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => FollowRequest, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public followRequest: FollowRequest | null;
@@ -120,18 +120,19 @@ export class Notification {
 	})
 	public userGroupInvitationId: UserGroupInvitation["id"] | null;
 
-	@ManyToOne(type => UserGroupInvitation, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => UserGroupInvitation, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public userGroupInvitation: UserGroupInvitation | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
 	})
 	public reaction: string | null;
 
-	@Column('integer', {
+	@Column("integer", {
 		nullable: true,
 	})
 	public choice: number | null;
@@ -139,8 +140,9 @@ export class Notification {
 	/**
 	 * App notification body
 	 */
-	@Column('varchar', {
-		length: 2048, nullable: true,
+	@Column("varchar", {
+		length: 2048,
+		nullable: true,
 	})
 	public customBody: string | null;
 
@@ -148,8 +150,9 @@ export class Notification {
 	 * App notification header
 	 * (If omitted, it is expected to be displayed with the app name)
 	 */
-	@Column('varchar', {
-		length: 256, nullable: true,
+	@Column("varchar", {
+		length: 256,
+		nullable: true,
 	})
 	public customHeader: string | null;
 
@@ -157,8 +160,9 @@ export class Notification {
 	 * App notification icon (URL)
 	 * (If omitted, it is expected to be displayed as an app icon)
 	 */
-	@Column('varchar', {
-		length: 1024, nullable: true,
+	@Column("varchar", {
+		length: 1024,
+		nullable: true,
 	})
 	public customIcon: string | null;
 
@@ -172,8 +176,8 @@ export class Notification {
 	})
 	public appAccessTokenId: AccessToken["id"] | null;
 
-	@ManyToOne(type => AccessToken, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => AccessToken, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public appAccessToken: AccessToken | null;
diff --git a/packages/backend/src/models/entities/page-like.ts b/packages/backend/src/models/entities/page-like.ts
index 75f4dc49b0..6304e0b24c 100644
--- a/packages/backend/src/models/entities/page-like.ts
+++ b/packages/backend/src/models/entities/page-like.ts
@@ -11,20 +11,20 @@ import { id } from "../id.js";
 import { Page } from "./page.js";
 
 @Entity()
-@Index(['userId', 'pageId'], { unique: true })
+@Index(["userId", "pageId"], { unique: true })
 export class PageLike {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone')
+	@Column("timestamp with time zone")
 	public createdAt: Date;
 
 	@Index()
 	@Column(id())
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -32,8 +32,8 @@ export class PageLike {
 	@Column(id())
 	public pageId: Page["id"];
 
-	@ManyToOne(type => Page, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Page, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public page: Page | null;
diff --git a/packages/backend/src/models/entities/page.ts b/packages/backend/src/models/entities/page.ts
index 5fe9f52088..d0733c8ce4 100644
--- a/packages/backend/src/models/entities/page.ts
+++ b/packages/backend/src/models/entities/page.ts
@@ -11,51 +11,52 @@ import { id } from "../id.js";
 import { DriveFile } from "./drive-file.js";
 
 @Entity()
-@Index(['userId', 'name'], { unique: true })
+@Index(["userId", "name"], { unique: true })
 export class Page {
 	@PrimaryColumn(id())
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the Page.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the Page.",
 	})
 	public createdAt: Date;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The updated date of the Page.',
+	@Column("timestamp with time zone", {
+		comment: "The updated date of the Page.",
 	})
 	public updatedAt: Date;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 256,
 	})
 	public title: string;
 
 	@Index()
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 256,
 	})
 	public name: string;
 
-	@Column('varchar', {
-		length: 256, nullable: true,
+	@Column("varchar", {
+		length: 256,
+		nullable: true,
 	})
 	public summary: string | null;
 
-	@Column('boolean')
+	@Column("boolean")
 	public alignCenter: boolean;
 
-	@Column('boolean')
+	@Column("boolean")
 	public isPublic: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public hideTitleWhenPinned: boolean;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 32,
 	})
 	public font: string;
@@ -63,12 +64,12 @@ export class Page {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The ID of author.',
+		comment: "The ID of author.",
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -79,25 +80,25 @@ export class Page {
 	})
 	public eyeCatchingImageId: DriveFile["id"] | null;
 
-	@ManyToOne(type => DriveFile, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => DriveFile, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public eyeCatchingImage: DriveFile | null;
 
-	@Column('jsonb', {
+	@Column("jsonb", {
 		default: [],
 	})
 	public content: Record<string, any>[];
 
-	@Column('jsonb', {
+	@Column("jsonb", {
 		default: [],
 	})
 	public variables: Record<string, any>[];
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 16384,
-		default: '',
+		default: "",
 	})
 	public script: string;
 
@@ -106,17 +107,18 @@ export class Page {
 	 * followers ... フォロワーのみ
 	 * specified ... visibleUserIds で指定したユーザーのみ
 	 */
-	@Column('enum', { enum: ['public', 'followers', 'specified'] })
+	@Column("enum", { enum: ["public", "followers", "specified"] })
 	public visibility: "public" | "followers" | "specified";
 
 	@Index()
 	@Column({
 		...id(),
-		array: true, default: '{}',
+		array: true,
+		default: "{}",
 	})
 	public visibleUserIds: User["id"][];
 
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
 	})
 	public likedCount: number;
diff --git a/packages/backend/src/models/entities/password-reset-request.ts b/packages/backend/src/models/entities/password-reset-request.ts
index 4c681d4f70..ab0bccbbef 100644
--- a/packages/backend/src/models/entities/password-reset-request.ts
+++ b/packages/backend/src/models/entities/password-reset-request.ts
@@ -14,11 +14,11 @@ export class PasswordResetRequest {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone')
+	@Column("timestamp with time zone")
 	public createdAt: Date;
 
 	@Index({ unique: true })
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 256,
 	})
 	public token: string;
@@ -29,8 +29,8 @@ export class PasswordResetRequest {
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
diff --git a/packages/backend/src/models/entities/poll-vote.ts b/packages/backend/src/models/entities/poll-vote.ts
index 0649951cf4..d59a720c37 100644
--- a/packages/backend/src/models/entities/poll-vote.ts
+++ b/packages/backend/src/models/entities/poll-vote.ts
@@ -11,14 +11,14 @@ import { Note } from "./note.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['userId', 'noteId', 'choice'], { unique: true })
+@Index(["userId", "noteId", "choice"], { unique: true })
 export class PollVote {
 	@PrimaryColumn(id())
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the PollVote.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the PollVote.",
 	})
 	public createdAt: Date;
 
@@ -26,8 +26,8 @@ export class PollVote {
 	@Column(id())
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -36,12 +36,12 @@ export class PollVote {
 	@Column(id())
 	public noteId: Note["id"];
 
-	@ManyToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public note: Note | null;
 
-	@Column('integer')
+	@Column("integer")
 	public choice: number;
 }
diff --git a/packages/backend/src/models/entities/poll.ts b/packages/backend/src/models/entities/poll.ts
index 28a70b3c7b..405cca2225 100644
--- a/packages/backend/src/models/entities/poll.ts
+++ b/packages/backend/src/models/entities/poll.ts
@@ -16,48 +16,51 @@ export class Poll {
 	@PrimaryColumn(id())
 	public noteId: Note["id"];
 
-	@OneToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@OneToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public note: Note | null;
 
-	@Column('timestamp with time zone', {
+	@Column("timestamp with time zone", {
 		nullable: true,
 	})
 	public expiresAt: Date | null;
 
-	@Column('boolean')
+	@Column("boolean")
 	public multiple: boolean;
 
-	@Column('varchar', {
-		length: 256, array: true, default: '{}',
+	@Column("varchar", {
+		length: 256,
+		array: true,
+		default: "{}",
 	})
 	public choices: string[];
 
-	@Column('integer', {
+	@Column("integer", {
 		array: true,
 	})
 	public votes: number[];
 
 	//#region Denormalized fields
-	@Column('enum', {
+	@Column("enum", {
 		enum: noteVisibilities,
-		comment: '[Denormalized]',
+		comment: "[Denormalized]",
 	})
 	public noteVisibility: typeof noteVisibilities[number];
 
 	@Index()
 	@Column({
 		...id(),
-		comment: '[Denormalized]',
+		comment: "[Denormalized]",
 	})
 	public userId: User["id"];
 
 	@Index()
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public userHost: string | null;
 	//#endregion
diff --git a/packages/backend/src/models/entities/promo-note.ts b/packages/backend/src/models/entities/promo-note.ts
index 4daacd246a..caa64927e9 100644
--- a/packages/backend/src/models/entities/promo-note.ts
+++ b/packages/backend/src/models/entities/promo-note.ts
@@ -15,20 +15,20 @@ export class PromoNote {
 	@PrimaryColumn(id())
 	public noteId: Note["id"];
 
-	@OneToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@OneToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public note: Note | null;
 
-	@Column('timestamp with time zone')
+	@Column("timestamp with time zone")
 	public expiresAt: Date;
 
 	//#region Denormalized fields
 	@Index()
 	@Column({
 		...id(),
-		comment: '[Denormalized]',
+		comment: "[Denormalized]",
 	})
 	public userId: User["id"];
 	//#endregion
diff --git a/packages/backend/src/models/entities/promo-read.ts b/packages/backend/src/models/entities/promo-read.ts
index 5938bfde9d..b31877dc34 100644
--- a/packages/backend/src/models/entities/promo-read.ts
+++ b/packages/backend/src/models/entities/promo-read.ts
@@ -11,13 +11,13 @@ import { User } from "./user.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['userId', 'noteId'], { unique: true })
+@Index(["userId", "noteId"], { unique: true })
 export class PromoRead {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the PromoRead.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the PromoRead.",
 	})
 	public createdAt: Date;
 
@@ -25,8 +25,8 @@ export class PromoRead {
 	@Column(id())
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -34,8 +34,8 @@ export class PromoRead {
 	@Column(id())
 	public noteId: Note["id"];
 
-	@ManyToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public note: Note | null;
diff --git a/packages/backend/src/models/entities/registration-tickets.ts b/packages/backend/src/models/entities/registration-tickets.ts
index af785fbc0d..549f05d07a 100644
--- a/packages/backend/src/models/entities/registration-tickets.ts
+++ b/packages/backend/src/models/entities/registration-tickets.ts
@@ -6,11 +6,11 @@ export class RegistrationTicket {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone')
+	@Column("timestamp with time zone")
 	public createdAt: Date;
 
 	@Index({ unique: true })
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 64,
 	})
 	public code: string;
diff --git a/packages/backend/src/models/entities/registry-item.ts b/packages/backend/src/models/entities/registry-item.ts
index 655573883a..d044222e6e 100644
--- a/packages/backend/src/models/entities/registry-item.ts
+++ b/packages/backend/src/models/entities/registry-item.ts
@@ -15,51 +15,55 @@ export class RegistryItem {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the RegistryItem.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the RegistryItem.",
 	})
 	public createdAt: Date;
 
-	@Column('timestamp with time zone', {
-		comment: 'The updated date of the RegistryItem.',
+	@Column("timestamp with time zone", {
+		comment: "The updated date of the RegistryItem.",
 	})
 	public updatedAt: Date;
 
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The owner ID.',
+		comment: "The owner ID.",
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 1024,
-		comment: 'The key of the RegistryItem.',
+		comment: "The key of the RegistryItem.",
 	})
 	public key: string;
 
-	@Column('jsonb', {
-		default: {}, nullable: true,
-		comment: 'The value of the RegistryItem.',
+	@Column("jsonb", {
+		default: {},
+		nullable: true,
+		comment: "The value of the RegistryItem.",
 	})
 	public value: any | null;
 
 	@Index()
-	@Column('varchar', {
-		length: 1024, array: true, default: '{}',
+	@Column("varchar", {
+		length: 1024,
+		array: true,
+		default: "{}",
 	})
 	public scope: string[];
 
 	// サードパーティアプリに開放するときのためのカラム
 	@Index()
-	@Column('varchar', {
-		length: 512, nullable: true,
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
 	})
 	public domain: string | null;
 }
diff --git a/packages/backend/src/models/entities/relay.ts b/packages/backend/src/models/entities/relay.ts
index 82c0779ff8..c7509dcf41 100644
--- a/packages/backend/src/models/entities/relay.ts
+++ b/packages/backend/src/models/entities/relay.ts
@@ -7,13 +7,14 @@ export class Relay {
 	public id: string;
 
 	@Index({ unique: true })
-	@Column('varchar', {
-		length: 512, nullable: false,
+	@Column("varchar", {
+		length: 512,
+		nullable: false,
 	})
 	public inbox: string;
 
-	@Column('enum', {
-		enum: ['requesting', 'accepted', 'rejected'],
+	@Column("enum", {
+		enum: ["requesting", "accepted", "rejected"],
 	})
 	public status: "requesting" | "accepted" | "rejected";
 }
diff --git a/packages/backend/src/models/entities/renote-muting.ts b/packages/backend/src/models/entities/renote-muting.ts
index 64ec7f583f..e8856492f1 100644
--- a/packages/backend/src/models/entities/renote-muting.ts
+++ b/packages/backend/src/models/entities/renote-muting.ts
@@ -28,7 +28,7 @@ export class RenoteMuting {
 	})
 	public muteeId: User["id"];
 
-	@ManyToOne(type => User, {
+	@ManyToOne((type) => User, {
 		onDelete: "CASCADE",
 	})
 	@JoinColumn()
@@ -41,7 +41,7 @@ export class RenoteMuting {
 	})
 	public muterId: User["id"];
 
-	@ManyToOne(type => User, {
+	@ManyToOne((type) => User, {
 		onDelete: "CASCADE",
 	})
 	@JoinColumn()
diff --git a/packages/backend/src/models/entities/signin.ts b/packages/backend/src/models/entities/signin.ts
index 7859918238..517e71c8fd 100644
--- a/packages/backend/src/models/entities/signin.ts
+++ b/packages/backend/src/models/entities/signin.ts
@@ -14,8 +14,8 @@ export class Signin {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the Signin.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the Signin.",
 	})
 	public createdAt: Date;
 
@@ -23,20 +23,20 @@ export class Signin {
 	@Column(id())
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 	})
 	public ip: string;
 
-	@Column('jsonb')
+	@Column("jsonb")
 	public headers: Record<string, any>;
 
-	@Column('boolean')
+	@Column("boolean")
 	public success: boolean;
 }
diff --git a/packages/backend/src/models/entities/sw-subscription.ts b/packages/backend/src/models/entities/sw-subscription.ts
index 8f18688eab..f7823fbaaa 100644
--- a/packages/backend/src/models/entities/sw-subscription.ts
+++ b/packages/backend/src/models/entities/sw-subscription.ts
@@ -14,35 +14,35 @@ export class SwSubscription {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone')
+	@Column("timestamp with time zone")
 	public createdAt: Date;
 
 	@Index()
 	@Column(id())
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 	})
 	public endpoint: string;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 256,
 	})
 	public auth: string;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 	})
 	public publickey: string;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public sendReadMessage: boolean;
diff --git a/packages/backend/src/models/entities/used-username.ts b/packages/backend/src/models/entities/used-username.ts
index a069205a5f..d00a25991e 100644
--- a/packages/backend/src/models/entities/used-username.ts
+++ b/packages/backend/src/models/entities/used-username.ts
@@ -2,12 +2,12 @@ import { PrimaryColumn, Entity, Column } from "typeorm";
 
 @Entity()
 export class UsedUsername {
-	@PrimaryColumn('varchar', {
+	@PrimaryColumn("varchar", {
 		length: 128,
 	})
 	public username: string;
 
-	@Column('timestamp with time zone')
+	@Column("timestamp with time zone")
 	public createdAt: Date;
 
 	constructor(data: Partial<UsedUsername>) {
diff --git a/packages/backend/src/models/entities/user-group-invitation.ts b/packages/backend/src/models/entities/user-group-invitation.ts
index 8037b30e1b..fa2655ab67 100644
--- a/packages/backend/src/models/entities/user-group-invitation.ts
+++ b/packages/backend/src/models/entities/user-group-invitation.ts
@@ -11,25 +11,25 @@ import { UserGroup } from "./user-group.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['userId', 'userGroupId'], { unique: true })
+@Index(["userId", "userGroupId"], { unique: true })
 export class UserGroupInvitation {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the UserGroupInvitation.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the UserGroupInvitation.",
 	})
 	public createdAt: Date;
 
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The user ID.',
+		comment: "The user ID.",
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -37,12 +37,12 @@ export class UserGroupInvitation {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The group ID.',
+		comment: "The group ID.",
 	})
 	public userGroupId: UserGroup["id"];
 
-	@ManyToOne(type => UserGroup, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => UserGroup, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public userGroup: UserGroup | null;
diff --git a/packages/backend/src/models/entities/user-group-joining.ts b/packages/backend/src/models/entities/user-group-joining.ts
index 6d503b274e..78f820d0e8 100644
--- a/packages/backend/src/models/entities/user-group-joining.ts
+++ b/packages/backend/src/models/entities/user-group-joining.ts
@@ -11,25 +11,25 @@ import { UserGroup } from "./user-group.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['userId', 'userGroupId'], { unique: true })
+@Index(["userId", "userGroupId"], { unique: true })
 export class UserGroupJoining {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the UserGroupJoining.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the UserGroupJoining.",
 	})
 	public createdAt: Date;
 
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The user ID.',
+		comment: "The user ID.",
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -37,12 +37,12 @@ export class UserGroupJoining {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The group ID.',
+		comment: "The group ID.",
 	})
 	public userGroupId: UserGroup["id"];
 
-	@ManyToOne(type => UserGroup, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => UserGroup, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public userGroup: UserGroup | null;
diff --git a/packages/backend/src/models/entities/user-group.ts b/packages/backend/src/models/entities/user-group.ts
index 38e5af3346..23876ec8b8 100644
--- a/packages/backend/src/models/entities/user-group.ts
+++ b/packages/backend/src/models/entities/user-group.ts
@@ -15,12 +15,12 @@ export class UserGroup {
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the UserGroup.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the UserGroup.",
 	})
 	public createdAt: Date;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 256,
 	})
 	public name: string;
@@ -28,17 +28,17 @@ export class UserGroup {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The ID of owner.',
+		comment: "The ID of owner.",
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public isPrivate: boolean;
diff --git a/packages/backend/src/models/entities/user-ip.ts b/packages/backend/src/models/entities/user-ip.ts
index 6b88d52216..c30e56b66b 100644
--- a/packages/backend/src/models/entities/user-ip.ts
+++ b/packages/backend/src/models/entities/user-ip.ts
@@ -12,20 +12,19 @@ import { Note } from "./note.js";
 import type { User } from "./user.js";
 
 @Entity()
-@Index(['userId', 'ip'], { unique: true })
+@Index(["userId", "ip"], { unique: true })
 export class UserIp {
 	@PrimaryGeneratedColumn()
 	public id: string;
 
-	@Column('timestamp with time zone', {
-	})
+	@Column("timestamp with time zone", {})
 	public createdAt: Date;
 
 	@Index()
 	@Column(id())
 	public userId: User["id"];
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 	})
 	public ip: string;
diff --git a/packages/backend/src/models/entities/user-keypair.ts b/packages/backend/src/models/entities/user-keypair.ts
index 212e742b9e..f98384f538 100644
--- a/packages/backend/src/models/entities/user-keypair.ts
+++ b/packages/backend/src/models/entities/user-keypair.ts
@@ -7,18 +7,18 @@ export class UserKeypair {
 	@PrimaryColumn(id())
 	public userId: User["id"];
 
-	@OneToOne(type => User, {
-		onDelete: 'CASCADE',
+	@OneToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 4096,
 	})
 	public publicKey: string;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 4096,
 	})
 	public privateKey: string;
diff --git a/packages/backend/src/models/entities/user-list-joining.ts b/packages/backend/src/models/entities/user-list-joining.ts
index e52fa7b399..4caa71ad32 100644
--- a/packages/backend/src/models/entities/user-list-joining.ts
+++ b/packages/backend/src/models/entities/user-list-joining.ts
@@ -11,25 +11,25 @@ import { UserList } from "./user-list.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['userId', 'userListId'], { unique: true })
+@Index(["userId", "userListId"], { unique: true })
 export class UserListJoining {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the UserListJoining.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the UserListJoining.",
 	})
 	public createdAt: Date;
 
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The user ID.',
+		comment: "The user ID.",
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -37,12 +37,12 @@ export class UserListJoining {
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The list ID.',
+		comment: "The list ID.",
 	})
 	public userListId: UserList["id"];
 
-	@ManyToOne(type => UserList, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => UserList, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public userList: UserList | null;
diff --git a/packages/backend/src/models/entities/user-list.ts b/packages/backend/src/models/entities/user-list.ts
index 7c43452308..3c95d44d6b 100644
--- a/packages/backend/src/models/entities/user-list.ts
+++ b/packages/backend/src/models/entities/user-list.ts
@@ -14,27 +14,27 @@ export class UserList {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the UserList.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the UserList.",
 	})
 	public createdAt: Date;
 
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The owner ID.',
+		comment: "The owner ID.",
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
-		comment: 'The name of the UserList.',
+		comment: "The name of the UserList.",
 	})
 	public name: string;
 }
diff --git a/packages/backend/src/models/entities/user-note-pining.ts b/packages/backend/src/models/entities/user-note-pining.ts
index dc6d61f7e5..c30fe1e028 100644
--- a/packages/backend/src/models/entities/user-note-pining.ts
+++ b/packages/backend/src/models/entities/user-note-pining.ts
@@ -11,13 +11,13 @@ import { User } from "./user.js";
 import { id } from "../id.js";
 
 @Entity()
-@Index(['userId', 'noteId'], { unique: true })
+@Index(["userId", "noteId"], { unique: true })
 export class UserNotePining {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the UserNotePinings.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the UserNotePinings.",
 	})
 	public createdAt: Date;
 
@@ -25,8 +25,8 @@ export class UserNotePining {
 	@Column(id())
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
@@ -34,8 +34,8 @@ export class UserNotePining {
 	@Column(id())
 	public noteId: Note["id"];
 
-	@ManyToOne(type => Note, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => Note, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public note: Note | null;
diff --git a/packages/backend/src/models/entities/user-pending.ts b/packages/backend/src/models/entities/user-pending.ts
index cac85d1c02..18ae5ad993 100644
--- a/packages/backend/src/models/entities/user-pending.ts
+++ b/packages/backend/src/models/entities/user-pending.ts
@@ -6,26 +6,26 @@ export class UserPending {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone')
+	@Column("timestamp with time zone")
 	public createdAt: Date;
 
 	@Index({ unique: true })
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 	})
 	public code: string;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 	})
 	public username: string;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 	})
 	public email: string;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
 	})
 	public password: string;
diff --git a/packages/backend/src/models/entities/user-profile.ts b/packages/backend/src/models/entities/user-profile.ts
index a5eca6f485..119eecdc73 100644
--- a/packages/backend/src/models/entities/user-profile.ts
+++ b/packages/backend/src/models/entities/user-profile.ts
@@ -18,31 +18,34 @@ export class UserProfile {
 	@PrimaryColumn(id())
 	public userId: User["id"];
 
-	@OneToOne(type => User, {
-		onDelete: 'CASCADE',
+	@OneToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: 'The location of the User.',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "The location of the User.",
 	})
 	public location: string | null;
 
-	@Column('char', {
-		length: 10, nullable: true,
-		comment: 'The birthday (YYYY-MM-DD) of the User.',
+	@Column("char", {
+		length: 10,
+		nullable: true,
+		comment: "The birthday (YYYY-MM-DD) of the User.",
 	})
 	public birthday: string | null;
 
-	@Column('varchar', {
-		length: 2048, nullable: true,
-		comment: 'The description (bio) of the User.',
+	@Column("varchar", {
+		length: 2048,
+		nullable: true,
+		comment: "The description (bio) of the User.",
 	})
 	public description: string | null;
 
-	@Column('jsonb', {
+	@Column("jsonb", {
 		default: [],
 	})
 	public fields: {
@@ -50,136 +53,145 @@ export class UserProfile {
 		value: string;
 	}[];
 
-	@Column('varchar', {
-		length: 32, nullable: true,
+	@Column("varchar", {
+		length: 32,
+		nullable: true,
 	})
 	public lang: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: 'Remote URL of the user.',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment: "Remote URL of the user.",
 	})
 	public url: string | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: 'The email address of the User.',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "The email address of the User.",
 	})
 	public email: string | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
 	})
 	public emailVerifyCode: string | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public emailVerified: boolean;
 
-	@Column('jsonb', {
-		default: ['follow', 'receiveFollowRequest', 'groupInvited'],
+	@Column("jsonb", {
+		default: ["follow", "receiveFollowRequest", "groupInvited"],
 	})
 	public emailNotificationTypes: string[];
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public publicReactions: boolean;
 
-	@Column('enum', {
+	@Column("enum", {
 		enum: ffVisibility,
-		default: 'public',
+		default: "public",
 	})
 	public ffVisibility: typeof ffVisibility[number];
 
-	@Column('varchar', {
-		length: 128, nullable: true,
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
 	})
 	public twoFactorTempSecret: string | null;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
 	})
 	public twoFactorSecret: string | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public twoFactorEnabled: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public securityKeysAvailable: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public usePasswordLessLogin: boolean;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: 'The password hash of the User. It will be null if the origin of the user is local.',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment:
+			"The password hash of the User. It will be null if the origin of the user is local.",
 	})
 	public password: string | null;
 
-	@Column('varchar', {
-		length: 8192, default: '',
+	@Column("varchar", {
+		length: 8192,
+		default: "",
 	})
 	public moderationNote: string | null;
 
 	// TODO: そのうち消す
-	@Column('jsonb', {
+	@Column("jsonb", {
 		default: {},
-		comment: 'The client-specific data of the User.',
+		comment: "The client-specific data of the User.",
 	})
 	public clientData: Record<string, any>;
 
 	// TODO: そのうち消す
-	@Column('jsonb', {
+	@Column("jsonb", {
 		default: {},
-		comment: 'The room data of the User.',
+		comment: "The room data of the User.",
 	})
 	public room: Record<string, any>;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public autoAcceptFollowed: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
-		comment: 'Whether reject index by crawler.',
+		comment: "Whether reject index by crawler.",
 	})
 	public noCrawle: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: true,
 	})
 	public preventAiLearning: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public alwaysMarkNsfw: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public autoSensitive: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public carefulBot: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: true,
 	})
 	public injectFeaturedNote: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: true,
 	})
 	public receiveAnnouncementEmail: boolean;
@@ -190,35 +202,36 @@ export class UserProfile {
 	})
 	public pinnedPageId: Page["id"] | null;
 
-	@OneToOne(type => Page, {
-		onDelete: 'SET NULL',
+	@OneToOne((type) => Page, {
+		onDelete: "SET NULL",
 	})
 	@JoinColumn()
 	public pinnedPage: Page | null;
 
-	@Column('jsonb', {
+	@Column("jsonb", {
 		default: {},
 	})
 	public integrations: Record<string, any>;
 
 	@Index()
-	@Column('boolean', {
-		default: false, select: false,
+	@Column("boolean", {
+		default: false,
+		select: false,
 	})
 	public enableWordMute: boolean;
 
-	@Column('jsonb', {
+	@Column("jsonb", {
 		default: [],
 	})
 	public mutedWords: string[][];
 
-	@Column('jsonb', {
+	@Column("jsonb", {
 		default: [],
-		comment: 'List of instances muted by the user.',
+		comment: "List of instances muted by the user.",
 	})
 	public mutedInstances: string[];
 
-	@Column('enum', {
+	@Column("enum", {
 		enum: notificationTypes,
 		array: true,
 		default: [],
@@ -227,9 +240,10 @@ export class UserProfile {
 
 	//#region Denormalized fields
 	@Index()
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: '[Denormalized]',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "[Denormalized]",
 	})
 	public userHost: string | null;
 	//#endregion
diff --git a/packages/backend/src/models/entities/user-publickey.ts b/packages/backend/src/models/entities/user-publickey.ts
index d1a9239d11..83a86b8a3a 100644
--- a/packages/backend/src/models/entities/user-publickey.ts
+++ b/packages/backend/src/models/entities/user-publickey.ts
@@ -14,19 +14,19 @@ export class UserPublickey {
 	@PrimaryColumn(id())
 	public userId: User["id"];
 
-	@OneToOne(type => User, {
-		onDelete: 'CASCADE',
+	@OneToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
 	@Index({ unique: true })
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 256,
 	})
 	public keyId: string;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 4096,
 	})
 	public keyPem: string;
diff --git a/packages/backend/src/models/entities/user-security-key.ts b/packages/backend/src/models/entities/user-security-key.ts
index 3b9d925d9e..511cab4ae4 100644
--- a/packages/backend/src/models/entities/user-security-key.ts
+++ b/packages/backend/src/models/entities/user-security-key.ts
@@ -11,8 +11,8 @@ import { id } from "../id.js";
 
 @Entity()
 export class UserSecurityKey {
-	@PrimaryColumn('varchar', {
-		comment: 'Variable-length id given to navigator.credentials.get()',
+	@PrimaryColumn("varchar", {
+		comment: "Variable-length id given to navigator.credentials.get()",
 	})
 	public id: string;
 
@@ -20,27 +20,27 @@ export class UserSecurityKey {
 	@Column(id())
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
 	@Index()
-	@Column('varchar', {
+	@Column("varchar", {
 		comment:
-			'Variable-length public key used to verify attestations (hex-encoded).',
+			"Variable-length public key used to verify attestations (hex-encoded).",
 	})
 	public publicKey: string;
 
-	@Column('timestamp with time zone', {
+	@Column("timestamp with time zone", {
 		comment:
-			'The date of the last time the UserSecurityKey was successfully validated.',
+			"The date of the last time the UserSecurityKey was successfully validated.",
 	})
 	public lastUsed: Date;
 
-	@Column('varchar', {
-		comment: 'User-defined name for this key',
+	@Column("varchar", {
+		comment: "User-defined name for this key",
 		length: 30,
 	})
 	public name: string;
diff --git a/packages/backend/src/models/entities/user.ts b/packages/backend/src/models/entities/user.ts
index c23f4f28d7..53dc7e60b0 100644
--- a/packages/backend/src/models/entities/user.ts
+++ b/packages/backend/src/models/entities/user.ts
@@ -10,99 +10,101 @@ import { id } from "../id.js";
 import { DriveFile } from "./drive-file.js";
 
 @Entity()
-@Index(['usernameLower', 'host'], { unique: true })
+@Index(["usernameLower", "host"], { unique: true })
 export class User {
 	@PrimaryColumn(id())
 	public id: string;
 
 	@Index()
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the User.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the User.",
 	})
 	public createdAt: Date;
 
 	@Index()
-	@Column('timestamp with time zone', {
+	@Column("timestamp with time zone", {
 		nullable: true,
-		comment: 'The updated date of the User.',
+		comment: "The updated date of the User.",
 	})
 	public updatedAt: Date | null;
 
-	@Column('timestamp with time zone', {
+	@Column("timestamp with time zone", {
 		nullable: true,
 	})
 	public lastFetchedAt: Date | null;
 
 	@Index()
-	@Column('timestamp with time zone', {
+	@Column("timestamp with time zone", {
 		nullable: true,
 	})
 	public lastActiveDate: Date | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
 	})
 	public hideOnlineStatus: boolean;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
-		comment: 'The username of the User.',
+		comment: "The username of the User.",
 	})
 	public username: string;
 
 	@Index()
-	@Column('varchar', {
-		length: 128, select: false,
-		comment: 'The username (lowercased) of the User.',
+	@Column("varchar", {
+		length: 128,
+		select: false,
+		comment: "The username (lowercased) of the User.",
 	})
 	public usernameLower: string;
 
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: 'The name of the User.',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment: "The name of the User.",
 	})
 	public name: string | null;
 
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
-		comment: 'The count of followers.',
+		comment: "The count of followers.",
 	})
 	public followersCount: number;
 
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
-		comment: 'The count of following.',
+		comment: "The count of following.",
 	})
 	public followingCount: number;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 512,
 		nullable: true,
-		comment: 'The URI of the new account of the User',
+		comment: "The URI of the new account of the User",
 	})
 	public movedToUri: string | null;
 
-	@Column('simple-array', {
+	@Column("simple-array", {
 		nullable: true,
-		comment: 'URIs the user is known as too',
+		comment: "URIs the user is known as too",
 	})
 	public alsoKnownAs: string[] | null;
 
-	@Column('integer', {
+	@Column("integer", {
 		default: 0,
-		comment: 'The count of notes.',
+		comment: "The count of notes.",
 	})
 	public notesCount: number;
 
 	@Column({
 		...id(),
 		nullable: true,
-		comment: 'The ID of avatar DriveFile.',
+		comment: "The ID of avatar DriveFile.",
 	})
 	public avatarId: DriveFile["id"] | null;
 
-	@OneToOne(type => DriveFile, {
-		onDelete: 'SET NULL',
+	@OneToOne((type) => DriveFile, {
+		onDelete: "SET NULL",
 	})
 	@JoinColumn()
 	public avatar: DriveFile | null;
@@ -110,143 +112,162 @@ export class User {
 	@Column({
 		...id(),
 		nullable: true,
-		comment: 'The ID of banner DriveFile.',
+		comment: "The ID of banner DriveFile.",
 	})
 	public bannerId: DriveFile["id"] | null;
 
-	@OneToOne(type => DriveFile, {
-		onDelete: 'SET NULL',
+	@OneToOne((type) => DriveFile, {
+		onDelete: "SET NULL",
 	})
 	@JoinColumn()
 	public banner: DriveFile | null;
 
 	@Index()
-	@Column('varchar', {
-		length: 128, array: true, default: '{}',
+	@Column("varchar", {
+		length: 128,
+		array: true,
+		default: "{}",
 	})
 	public tags: string[];
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
-		comment: 'Whether the User is suspended.',
+		comment: "Whether the User is suspended.",
 	})
 	public isSuspended: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
-		comment: 'Whether the User is silenced.',
+		comment: "Whether the User is silenced.",
 	})
 	public isSilenced: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
-		comment: 'Whether the User is locked.',
+		comment: "Whether the User is locked.",
 	})
 	public isLocked: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
-		comment: 'Whether the User is a bot.',
+		comment: "Whether the User is a bot.",
 	})
 	public isBot: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
-		comment: 'Whether the User is a cat.',
+		comment: "Whether the User is a cat.",
 	})
 	public isCat: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: true,
-		comment: 'Whether to speak as a cat if isCat.',
+		comment: "Whether to speak as a cat if isCat.",
 	})
 	public speakAsCat: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
-		comment: 'Whether the User is the admin.',
+		comment: "Whether the User is the admin.",
 	})
 	public isAdmin: boolean;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
-		comment: 'Whether the User is a moderator.',
+		comment: "Whether the User is a moderator.",
 	})
 	public isModerator: boolean;
 
 	@Index()
-	@Column('boolean', {
+	@Column("boolean", {
 		default: true,
-		comment: 'Whether the User is explorable.',
+		comment: "Whether the User is explorable.",
 	})
 	public isExplorable: boolean;
 
 	// アカウントが削除されたかどうかのフラグだが、完全に削除される際は物理削除なので実質削除されるまでの「削除が進行しているかどうか」のフラグ
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
-		comment: 'Whether the User is deleted.',
+		comment: "Whether the User is deleted.",
 	})
 	public isDeleted: boolean;
 
-	@Column('varchar', {
-		length: 128, array: true, default: '{}',
+	@Column("varchar", {
+		length: 128,
+		array: true,
+		default: "{}",
 	})
 	public emojis: string[];
 
 	@Index()
-	@Column('varchar', {
-		length: 128, nullable: true,
-		comment: 'The host of the User. It will be null if the origin of the user is local.',
+	@Column("varchar", {
+		length: 128,
+		nullable: true,
+		comment:
+			"The host of the User. It will be null if the origin of the user is local.",
 	})
 	public host: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: 'The inbox URL of the User. It will be null if the origin of the user is local.',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment:
+			"The inbox URL of the User. It will be null if the origin of the user is local.",
 	})
 	public inbox: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: 'The sharedInbox URL of the User. It will be null if the origin of the user is local.',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment:
+			"The sharedInbox URL of the User. It will be null if the origin of the user is local.",
 	})
 	public sharedInbox: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: 'The featured URL of the User. It will be null if the origin of the user is local.',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment:
+			"The featured URL of the User. It will be null if the origin of the user is local.",
 	})
 	public featured: string | null;
 
 	@Index()
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: 'The URI of the User. It will be null if the origin of the user is local.',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment:
+			"The URI of the User. It will be null if the origin of the user is local.",
 	})
 	public uri: string | null;
 
-	@Column('varchar', {
-		length: 512, nullable: true,
-		comment: 'The URI of the user Follower Collection. It will be null if the origin of the user is local.',
+	@Column("varchar", {
+		length: 512,
+		nullable: true,
+		comment:
+			"The URI of the user Follower Collection. It will be null if the origin of the user is local.",
 	})
 	public followersUri: string | null;
 
-	@Column('boolean', {
+	@Column("boolean", {
 		default: false,
-		comment: 'Whether to show users replying to other users in the timeline.',
+		comment: "Whether to show users replying to other users in the timeline.",
 	})
 	public showTimelineReplies: boolean;
 
 	@Index({ unique: true })
-	@Column('char', {
-		length: 16, nullable: true, unique: true,
-		comment: 'The native access token of the User. It will be null if the origin of the user is local.',
+	@Column("char", {
+		length: 16,
+		nullable: true,
+		unique: true,
+		comment:
+			"The native access token of the User. It will be null if the origin of the user is local.",
 	})
 	public token: string | null;
 
-	@Column('integer', {
+	@Column("integer", {
 		nullable: true,
-		comment: 'Overrides user drive capacity limit',
+		comment: "Overrides user drive capacity limit",
 	})
 	public driveCapacityOverrideMb: number | null;
 
diff --git a/packages/backend/src/models/entities/webhook.ts b/packages/backend/src/models/entities/webhook.ts
index 5db51c3a3c..47fd79966d 100644
--- a/packages/backend/src/models/entities/webhook.ts
+++ b/packages/backend/src/models/entities/webhook.ts
@@ -25,48 +25,50 @@ export class Webhook {
 	@PrimaryColumn(id())
 	public id: string;
 
-	@Column('timestamp with time zone', {
-		comment: 'The created date of the Antenna.',
+	@Column("timestamp with time zone", {
+		comment: "The created date of the Antenna.",
 	})
 	public createdAt: Date;
 
 	@Index()
 	@Column({
 		...id(),
-		comment: 'The owner ID.',
+		comment: "The owner ID.",
 	})
 	public userId: User["id"];
 
-	@ManyToOne(type => User, {
-		onDelete: 'CASCADE',
+	@ManyToOne((type) => User, {
+		onDelete: "CASCADE",
 	})
 	@JoinColumn()
 	public user: User | null;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 128,
-		comment: 'The name of the Antenna.',
+		comment: "The name of the Antenna.",
 	})
 	public name: string;
 
 	@Index()
-	@Column('varchar', {
-		length: 128, array: true, default: '{}',
+	@Column("varchar", {
+		length: 128,
+		array: true,
+		default: "{}",
 	})
 	public on: typeof webhookEventTypes[number][];
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 1024,
 	})
 	public url: string;
 
-	@Column('varchar', {
+	@Column("varchar", {
 		length: 1024,
 	})
 	public secret: string;
 
 	@Index()
-	@Column('boolean', {
+	@Column("boolean", {
 		default: true,
 	})
 	public active: boolean;
@@ -74,7 +76,7 @@ export class Webhook {
 	/**
 	 * 直近のリクエスト送信日時
 	 */
-	@Column('timestamp with time zone', {
+	@Column("timestamp with time zone", {
 		nullable: true,
 	})
 	public latestSentAt: Date | null;
@@ -82,7 +84,7 @@ export class Webhook {
 	/**
 	 * 直近のリクエスト送信時のHTTPステータスコード
 	 */
-	@Column('integer', {
+	@Column("integer", {
 		nullable: true,
 	})
 	public latestStatus: number | null;
diff --git a/packages/backend/src/server/web/manifest.json b/packages/backend/src/server/web/manifest.json
index 1e662fb202..647a5d4371 100644
--- a/packages/backend/src/server/web/manifest.json
+++ b/packages/backend/src/server/web/manifest.json
@@ -41,7 +41,7 @@
 			"url": "url"
 		}
 	},
-	"screenshots" : [
+	"screenshots": [
 		{
 			"src": "/static-assets/screenshots/1.webp",
 			"sizes": "1195x579",
@@ -57,7 +57,7 @@
 			"label": "Posts"
 		}
 	],
-	"shortcuts" : [
+	"shortcuts": [
 		{
 			"name": "Notifications",
 			"short_name": "Notifs",
@@ -68,7 +68,5 @@
 			"url": "/my/messaging"
 		}
 	],
-	"categories": [
-    "social"
-  ]
+	"categories": ["social"]
 }
diff --git a/packages/calckey-js/package.json b/packages/calckey-js/package.json
index 598dd1cdbc..6f724fc219 100644
--- a/packages/calckey-js/package.json
+++ b/packages/calckey-js/package.json
@@ -34,9 +34,7 @@
 		"tsd": "^0.19.1",
 		"typescript": "4.5.4"
 	},
-	"files": [
-		"built"
-	],
+	"files": ["built"],
 	"dependencies": {
 		"autobind-decorator": "^2.4.0",
 		"eventemitter3": "^4.0.7",
diff --git a/packages/calckey-js/tsconfig.json b/packages/calckey-js/tsconfig.json
index a03a242628..642bcc45be 100644
--- a/packages/calckey-js/tsconfig.json
+++ b/packages/calckey-js/tsconfig.json
@@ -15,11 +15,6 @@
 		"noImplicitReturns": true,
 		"esModuleInterop": true
 	},
-	"include": [
-		"src/**/*"
-	],
-	"exclude": [
-		"node_modules",
-		"test/**/*"
-	]
+	"include": ["src/**/*"],
+	"exclude": ["node_modules", "test/**/*"]
 }
diff --git a/packages/client/src/widgets/server-info.vue b/packages/client/src/widgets/server-info.vue
index 32cd358838..d24dd8a987 100644
--- a/packages/client/src/widgets/server-info.vue
+++ b/packages/client/src/widgets/server-info.vue
@@ -48,7 +48,7 @@ const widgetPropsDef = {};
 
 type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 
-	const props = defineProps<{ widget?: Widget<WidgetProps> }>();
+const props = defineProps<{ widget?: Widget<WidgetProps> }>();
 const emit = defineEmits<{ (ev: "updateProps", props: WidgetProps) }>();
 
 const { widgetProps, configure } = useWidgetPropsManager(
diff --git a/packages/sw/package.json b/packages/sw/package.json
index 112005ba7c..0d0ac52dfb 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -6,9 +6,7 @@
 		"watch": "pnpm swc src -d built -D -w",
 		"lint": "pnpm rome check \"src/**/*.ts\""
 	},
-	"dependencies": {
-
-	},
+	"dependencies": {},
 	"devDependencies": {
 		"@swc/cli": "^0.1.62",
 		"@swc/core": "^1.3.50",
diff --git a/rome.json b/rome.json
index 6b74808ed0..7a51b60e68 100644
--- a/rome.json
+++ b/rome.json
@@ -5,5 +5,18 @@
     "rules": {
       "recommended": true
     }
-  }
-}
\ No newline at end of file
+  },
+	"formatter": {
+		"ignore": [
+			"packages/calckey-js/api-extractor.json",
+			"packages/*/tsconfig.json",
+			"packages/*/package-lock.json",
+			"packages/backend/src/server/web/manifest.ts",
+			"packages/backend/built/",
+			"packages/backend/nsfw-model/",
+			"packages/client/src/emojilist.json",
+			"*.md",
+			"*/.yml"
+		]
+	}
+}

From d7d5915e3b06786bc964a91c3c633cde8ab8cc9d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 09:32:55 -0700
Subject: [PATCH 119/319] dev31

---
 package.json                                             | 2 +-
 .../client/src/widgets/server-metric/meilisearch.vue     | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index 593690d6df..b793290eb3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev26",
+	"version": "14.0.0-dev31",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
index 80a3f41466..a4a899200b 100644
--- a/packages/client/src/widgets/server-metric/meilisearch.vue
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="ms_stats">
+	<div class="verusivbr">
 		<XPie class="pie" :value="progress" />
 		<div>
 			<p><i class="ph-file-search ph-bold ph-lg"></i>MeiliSearch</p>
@@ -33,7 +33,7 @@ function onStats(stats) {
 	total_size = stats.meilisearch.size;
 	index_count = stats.meilisearch.indexed_count;
 	available = stats.meilisearch.health;
-	progress = Math.floor((index_count / serverStats.notesCount) * 100);
+	progress = (index_count / serverStats.notesCount);
 }
 
 onMounted(() => {
@@ -49,7 +49,8 @@ onBeforeUnmount(() => {
 </script>
 
 <style lang="scss" scoped>
-.ms_stats {
+.verusivbr {
+	display: flex;
 	padding: 16px;
 
 	> .pie {
@@ -59,6 +60,8 @@ onBeforeUnmount(() => {
 	}
 
 	> div {
+		flex: 1;
+
 		> p {
 			margin: 0;
 			font-size: 0.8em;

From 73bf8eddc79e47d86494a1273e2ded0d3dd8502a Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Mon, 29 May 2023 18:33:57 +0200
Subject: [PATCH 120/319] Delete deleted posts from Meilisearch

---
 packages/backend/src/db/meilisearch.ts        | 24 +++++++++++++++++++
 .../src/queue/processors/db/delete-account.ts |  4 ++++
 packages/backend/src/services/note/delete.ts  |  5 ++++
 3 files changed, 33 insertions(+)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 7e176e0583..206e0dc62d 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -262,5 +262,29 @@ export default hasConfig
 					indexed_count: stats.indexes["posts"].numberOfDocuments,
 				};
 			},
+			deleteNotes: async (note: Note | Note[] | string | string[]) => {
+				if (note instanceof Note) {
+					note = [note];
+				}
+				if (typeof note === "string") {
+					note = [note];
+				}
+
+				let deletionBatch = note.map((n) => {
+					if(n instanceof Note) {
+						return n.id;
+					}
+
+					if(n.length > 0) return n;
+
+					logger.error(`Failed to delete note from Meilisearch, invalid post ID: ${JSON.stringify(n)}`)
+
+					throw new Error(`Invalid note ID passed to meilisearch deleteNote: ${JSON.stringify(n)}`)
+				}).filter((el) => el !== null);
+
+				await posts.deleteDocuments(deletionBatch as string[]).then(() => {
+					logger.info(`submitted ${deletionBatch.length} large batch for deletion`)
+				});
+			},
 	  }
 	: null;
diff --git a/packages/backend/src/queue/processors/db/delete-account.ts b/packages/backend/src/queue/processors/db/delete-account.ts
index 764b83db2d..a356ca7abf 100644
--- a/packages/backend/src/queue/processors/db/delete-account.ts
+++ b/packages/backend/src/queue/processors/db/delete-account.ts
@@ -7,6 +7,7 @@ import type { DriveFile } from "@/models/entities/drive-file.js";
 import { MoreThan } from "typeorm";
 import { deleteFileSync } from "@/services/drive/delete-file.js";
 import { sendEmail } from "@/services/send-email.js";
+import meilisearch from "@/db/meilisearch.js";
 
 const logger = queueLogger.createSubLogger("delete-account");
 
@@ -43,6 +44,9 @@ export async function deleteAccount(
 			cursor = notes[notes.length - 1].id;
 
 			await Notes.delete(notes.map((note) => note.id));
+			if (meilisearch) {
+				await meilisearch.deleteNotes(notes);
+			}
 		}
 
 		logger.succ("All of notes deleted");
diff --git a/packages/backend/src/services/note/delete.ts b/packages/backend/src/services/note/delete.ts
index 392578e2f6..285a08075e 100644
--- a/packages/backend/src/services/note/delete.ts
+++ b/packages/backend/src/services/note/delete.ts
@@ -21,6 +21,7 @@ import {
 import { countSameRenotes } from "@/misc/count-same-renotes.js";
 import { registerOrFetchInstanceDoc } from "../register-or-fetch-instance-doc.js";
 import { deliverToRelays } from "../relay.js";
+import meilisearch from "@/db/meilisearch.js";
 
 /**
  * 投稿を削除します。
@@ -119,6 +120,10 @@ export default async function (
 		id: note.id,
 		userId: user.id,
 	});
+
+	if(meilisearch) {
+		await meilisearch.deleteNotes(note.id);
+	}
 }
 
 async function findCascadingNotes(note: Note) {

From 316a09409ce3889ffc43e5562be59556939199f7 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 10:00:16 -0700
Subject: [PATCH 121/319] revert #10222

---
 packages/backend/src/db/meilisearch.ts | 112 ++++++++++++-------------
 1 file changed, 55 insertions(+), 57 deletions(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 9a64da850d..6740cf08bd 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -15,51 +15,49 @@ const hasConfig =
 		config.meilisearch.port ||
 		config.meilisearch.apiKey);
 
-if (hasConfig) {
-	const host = hasConfig ? config.meilisearch.host ?? "localhost" : "";
-	const port = hasConfig ? config.meilisearch.port ?? 7700 : 0;
-	const auth = hasConfig ? config.meilisearch.apiKey ?? "" : "";
-	const ssl = hasConfig ? config.meilisearch.ssl ?? false : false;
+const host = hasConfig ? config.meilisearch.host ?? "localhost" : "";
+const port = hasConfig ? config.meilisearch.port ?? 7700 : 0;
+const auth = hasConfig ? config.meilisearch.apiKey ?? "" : "";
+const ssl = hasConfig ? config.meilisearch.ssl ?? false : false;
 
-	logger.info("Connecting to MeiliSearch");
+logger.info("Connecting to MeiliSearch");
 
-	const client: MeiliSearch = new MeiliSearch({
-		host: `${ssl ? "https" : "http"}://${host}:${port}`,
-		apiKey: auth,
-	});
+const client: MeiliSearch = new MeiliSearch({
+	host: `${ssl ? "https" : "http"}://${host}:${port}`,
+	apiKey: auth,
+});
 
-	const posts = client.index("posts");
+const posts = client.index("posts");
 
-	posts
-		.updateSearchableAttributes(["text"])
-		.catch((e) =>
-			logger.error(`Setting searchable attr failed, searches won't work: ${e}`),
-		);
+posts
+	.updateSearchableAttributes(["text"])
+	.catch((e) =>
+		logger.error(`Setting searchable attr failed, searches won't work: ${e}`),
+	);
 
-	posts
-		.updateFilterableAttributes([
-			"userName",
-			"userHost",
-			"mediaAttachment",
-			"createdAt",
-			"userId",
-		])
-		.catch((e) =>
-			logger.error(
-				`Setting filterable attr failed, advanced searches won't work: ${e}`,
-			),
-		);
+posts
+	.updateFilterableAttributes([
+		"userName",
+		"userHost",
+		"mediaAttachment",
+		"createdAt",
+		"userId",
+	])
+	.catch((e) =>
+		logger.error(
+			`Setting filterable attr failed, advanced searches won't work: ${e}`,
+		),
+	);
 
-	posts
-		.updateSortableAttributes(["createdAt"])
-		.catch((e) =>
-			logger.error(
-				`Setting sortable attr failed, placeholder searches won't sort properly: ${e}`,
-			),
-		);
+posts
+	.updateSortableAttributes(["createdAt"])
+	.catch((e) =>
+		logger.error(
+			`Setting sortable attr failed, placeholder searches won't sort properly: ${e}`,
+		),
+	);
 
-	logger.info("Connected to MeiliSearch");
-}
+logger.info("Connected to MeiliSearch");
 
 export type MeilisearchNote = {
 	id: string;
@@ -90,37 +88,37 @@ export default hasConfig
 				/// filter:following => show results only from users you follow
 				/// filter:followers => show results only from followers
 
-				let constructedFilters: string[] = [];
+				const constructedFilters: string[] = [];
 
-				let splitSearch = query.split(" ");
+				const splitSearch = query.split(" ");
 
 				// Detect search operators and remove them from the actual query
-				let filteredSearchTerms = (
+				const filteredSearchTerms = (
 					await Promise.all(
 						splitSearch.map(async (term) => {
 							if (term.startsWith("has:")) {
-								let fileType = term.slice(4);
+								const fileType = term.slice(4);
 								constructedFilters.push(`mediaAttachment = "${fileType}"`);
 								return null;
 							} else if (term.startsWith("from:")) {
-								let user = term.slice(5);
+								const user = term.slice(5);
 								constructedFilters.push(`userName = ${user}`);
 								return null;
 							} else if (term.startsWith("domain:")) {
-								let domain = term.slice(7);
+								const domain = term.slice(7);
 								constructedFilters.push(`userHost = ${domain}`);
 								return null;
 							} else if (term.startsWith("after:")) {
-								let timestamp = term.slice(6);
+								const timestamp = term.slice(6);
 								// Try to parse the timestamp as JavaScript Date
-								let date = Date.parse(timestamp);
+								const date = Date.parse(timestamp);
 								if (isNaN(date)) return null;
 								constructedFilters.push(`createdAt > ${date / 1000}`);
 								return null;
 							} else if (term.startsWith("before:")) {
-								let timestamp = term.slice(7);
+								const timestamp = term.slice(7);
 								// Try to parse the timestamp as JavaScript Date
-								let date = Date.parse(timestamp);
+								const date = Date.parse(timestamp);
 								if (isNaN(date)) return null;
 								constructedFilters.push(`createdAt < ${date / 1000}`);
 								return null;
@@ -128,7 +126,7 @@ export default hasConfig
 								// Check if we got a context user
 								if (userCtx) {
 									// Fetch user follows from DB
-									let followedUsers = await Followings.find({
+									const followedUsers = await Followings.find({
 										where: {
 											followerId: userCtx.id,
 										},
@@ -136,7 +134,7 @@ export default hasConfig
 											followeeId: true,
 										},
 									});
-									let followIDs = followedUsers.map((user) => user.followeeId);
+									const followIDs = followedUsers.map((user) => user.followeeId);
 
 									if (followIDs.length === 0) return null;
 
@@ -152,7 +150,7 @@ export default hasConfig
 								// Check if we got a context user
 								if (userCtx) {
 									// Fetch users follows from DB
-									let followedUsers = await Followings.find({
+									const followedUsers = await Followings.find({
 										where: {
 											followeeId: userCtx.id,
 										},
@@ -160,7 +158,7 @@ export default hasConfig
 											followerId: true,
 										},
 									});
-									let followIDs = followedUsers.map((user) => user.followerId);
+									const followIDs = followedUsers.map((user) => user.followerId);
 
 									if (followIDs.length === 0) return null;
 
@@ -179,7 +177,7 @@ export default hasConfig
 					)
 				).filter((term) => term !== null);
 
-				let sortRules = [];
+				const sortRules = [];
 
 				// An empty search term with defined filters means we have a placeholder search => https://www.meilisearch.com/docs/reference/api/search#placeholder-search
 				// These have to be ordered manually, otherwise the *oldest* posts are returned first, which we don't want
@@ -205,9 +203,9 @@ export default hasConfig
 					ingestNotes = [ingestNotes];
 				}
 
-				let indexingBatch: MeilisearchNote[] = [];
+				const indexingBatch: MeilisearchNote[] = [];
 
-				for (let note of ingestNotes) {
+				for (const note of ingestNotes) {
 					if (note.user === undefined) {
 						note.user = await Users.findOne({
 							where: {
@@ -255,8 +253,8 @@ export default hasConfig
 					);
 			},
 			serverStats: async () => {
-				let health: Health = await client.health();
-				let stats: Stats = await client.getStats();
+				const health: Health = await client.health();
+				const stats: Stats = await client.getStats();
 
 				return {
 					health: health.status,

From 7476ebc7a2f493bd333002c8ffd295b3d7a238a6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 10:01:34 -0700
Subject: [PATCH 122/319] chore: format

---
 packages/backend/src/db/meilisearch.ts        | 38 +++++++++++++------
 packages/backend/src/services/note/delete.ts  |  2 +-
 .../src/widgets/server-metric/meilisearch.vue |  2 +-
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 120450ac4f..95f57a42dd 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -134,7 +134,9 @@ export default hasConfig
 											followeeId: true,
 										},
 									});
-									const followIDs = followedUsers.map((user) => user.followeeId);
+									const followIDs = followedUsers.map(
+										(user) => user.followeeId,
+									);
 
 									if (followIDs.length === 0) return null;
 
@@ -158,7 +160,9 @@ export default hasConfig
 											followerId: true,
 										},
 									});
-									const followIDs = followedUsers.map((user) => user.followerId);
+									const followIDs = followedUsers.map(
+										(user) => user.followerId,
+									);
 
 									if (followIDs.length === 0) return null;
 
@@ -270,20 +274,32 @@ export default hasConfig
 					note = [note];
 				}
 
-				let deletionBatch = note.map((n) => {
-					if(n instanceof Note) {
-						return n.id;
-					}
+				let deletionBatch = note
+					.map((n) => {
+						if (n instanceof Note) {
+							return n.id;
+						}
 
-					if(n.length > 0) return n;
+						if (n.length > 0) return n;
 
-					logger.error(`Failed to delete note from Meilisearch, invalid post ID: ${JSON.stringify(n)}`)
+						logger.error(
+							`Failed to delete note from Meilisearch, invalid post ID: ${JSON.stringify(
+								n,
+							)}`,
+						);
 
-					throw new Error(`Invalid note ID passed to meilisearch deleteNote: ${JSON.stringify(n)}`)
-				}).filter((el) => el !== null);
+						throw new Error(
+							`Invalid note ID passed to meilisearch deleteNote: ${JSON.stringify(
+								n,
+							)}`,
+						);
+					})
+					.filter((el) => el !== null);
 
 				await posts.deleteDocuments(deletionBatch as string[]).then(() => {
-					logger.info(`submitted ${deletionBatch.length} large batch for deletion`)
+					logger.info(
+						`submitted ${deletionBatch.length} large batch for deletion`,
+					);
 				});
 			},
 	  }
diff --git a/packages/backend/src/services/note/delete.ts b/packages/backend/src/services/note/delete.ts
index 285a08075e..90175ccdc4 100644
--- a/packages/backend/src/services/note/delete.ts
+++ b/packages/backend/src/services/note/delete.ts
@@ -121,7 +121,7 @@ export default async function (
 		userId: user.id,
 	});
 
-	if(meilisearch) {
+	if (meilisearch) {
 		await meilisearch.deleteNotes(note.id);
 	}
 }
diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
index a4a899200b..8119ff537b 100644
--- a/packages/client/src/widgets/server-metric/meilisearch.vue
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -33,7 +33,7 @@ function onStats(stats) {
 	total_size = stats.meilisearch.size;
 	index_count = stats.meilisearch.indexed_count;
 	available = stats.meilisearch.health;
-	progress = (index_count / serverStats.notesCount);
+	progress = index_count / serverStats.notesCount;
 }
 
 onMounted(() => {

From 971347de8cef68857b284653bb1cd5f000620268 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 10:01:41 -0700
Subject: [PATCH 123/319] dev32

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

diff --git a/package.json b/package.json
index b793290eb3..de993cde08 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev31",
+	"version": "14.0.0-dev32",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 020b212b10b0fdc9941005de43bf7c8c800c4bba Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 29 May 2023 13:10:35 -0400
Subject: [PATCH 124/319] always show antennas hint at top

---
 .../client/src/pages/my-antennas/index.vue    | 40 +++++++------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/packages/client/src/pages/my-antennas/index.vue b/packages/client/src/pages/my-antennas/index.vue
index a4d15433ab..d8c9617ec3 100644
--- a/packages/client/src/pages/my-antennas/index.vue
+++ b/packages/client/src/pages/my-antennas/index.vue
@@ -8,37 +8,27 @@
 		/></template>
 		<MkSpacer :content-max="700">
 			<div class="ieepwinx">
-
+				<MkInfo
+					class="_gap"
+					:icon="'flying-saucer'"
+					:card="true"
+				>
+					<p>{{ i18n.ts.antennasDesc }}</p>
+					<MkButton
+						:link="true"
+						to="/my/antennas/create"
+						primary
+						class="add"
+						><i class="ph-plus ph-bold ph-lg"></i>
+						{{ i18n.ts.add }}</MkButton
+					>
+				</MkInfo>
 				<div class="">
 					<MkPagination
 						ref="list"
 						:pagination="pagination"
 					>
-						<template #empty>
-							<MkInfo
-								:icon="'flying-saucer'"
-								:card="true"
-							>
-								<p>{{ i18n.ts.antennasDesc }}</p>
-								<MkButton
-									:link="true"
-									to="/my/antennas/create"
-									primary
-									class="add"
-									><i class="ph-plus ph-bold ph-lg"></i>
-									{{ i18n.ts.add }}</MkButton
-								>
-							</MkInfo>
-						</template>
 						<template #default="{ items }">
-							<MkButton
-								:link="true"
-								to="/my/antennas/create"
-								primary
-								class="add"
-								><i class="ph-plus ph-bold ph-lg"></i>
-								{{ i18n.ts.add }}</MkButton
-							>
 							<div v-for="antenna in items" :key="antenna.id">
 								<MkA
 									class="uopelskx"

From 41c80b693da412d9662ff7df02fe285e47d4ec88 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 10:18:12 -0700
Subject: [PATCH 125/319] fixes

---
 packages/backend/src/db/meilisearch.ts |  2 +-
 packages/client/src/scripts/search.ts  | 35 ++++++++++++++++----------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 95f57a42dd..7f31789554 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -274,7 +274,7 @@ export default hasConfig
 					note = [note];
 				}
 
-				let deletionBatch = note
+				const deletionBatch = note
 					.map((n) => {
 						if (n instanceof Note) {
 							return n.id;
diff --git a/packages/client/src/scripts/search.ts b/packages/client/src/scripts/search.ts
index c6eb497eab..8f1f0a7dfa 100644
--- a/packages/client/src/scripts/search.ts
+++ b/packages/client/src/scripts/search.ts
@@ -3,19 +3,30 @@ import { i18n } from "@/i18n";
 import { mainRouter } from "@/router";
 
 export async function search() {
+	let searchOptions = "";
+
+	let meta = null;
+
+	os.api("server-info", {}).then((res) => {
+		meta = res;
+	});
+
+	if (meta.meilisearch.health === "available") {
+		searchOptions =
+		"Advanced search operators\n" +
+		"from:user => filter by user\n" +
+		"has:image/video/audio/text/file => filter by attachment types\n" +
+		"domain:domain.com => filter by domain\n" +
+		"before:Date => show posts made before Date\n" +
+		"after:Date => show posts made after Date\n" +
+		'"text" => get posts with exact text between quotes\n' +
+		"filter:following => show results only from users you follow\n" +
+		"filter:followers => show results only from followers\n";
+	}
 	const { canceled, result: query } = await os.inputText({
 		title: i18n.ts.search,
 		placeholder: i18n.ts.searchPlaceholder,
-		text:
-			"Advanced search operators\n" +
-			"from:user => filter by user\n" +
-			"has:image/video/audio/text/file => filter by attachment types\n" +
-			"domain:domain.com => filter by domain\n" +
-			"before:Date => show posts made before Date\n" +
-			"after:Date => show posts made after Date\n" +
-			'"text" => get posts with exact text between quotes\n' +
-			"filter:following => show results only from users you follow\n" +
-			"filter:followers => show results only from followers\n",
+		text: searchOptions,
 	});
 	if (canceled || query == null || query === "") return;
 
@@ -46,9 +57,7 @@ export async function search() {
 		// TODO
 		//v.$root.$emit('warp', date);
 		os.alert({
-			icon: "ph-clock-counter-clockwise ph-bold ph-lg",
-			iconOnly: true,
-			autoClose: true,
+			type: "waiting",
 		});
 		return;
 	}

From 8dd99a2d1db45ab11b96652ec52f959a2791f9b5 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 10:19:13 -0700
Subject: [PATCH 126/319] formatting

---
 packages/client/src/scripts/search.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/scripts/search.ts b/packages/client/src/scripts/search.ts
index 8f1f0a7dfa..379f09c089 100644
--- a/packages/client/src/scripts/search.ts
+++ b/packages/client/src/scripts/search.ts
@@ -13,15 +13,15 @@ export async function search() {
 
 	if (meta.meilisearch.health === "available") {
 		searchOptions =
-		"Advanced search operators\n" +
-		"from:user => filter by user\n" +
-		"has:image/video/audio/text/file => filter by attachment types\n" +
-		"domain:domain.com => filter by domain\n" +
-		"before:Date => show posts made before Date\n" +
-		"after:Date => show posts made after Date\n" +
-		'"text" => get posts with exact text between quotes\n' +
-		"filter:following => show results only from users you follow\n" +
-		"filter:followers => show results only from followers\n";
+			"Advanced search operators\n" +
+			"from:user => filter by user\n" +
+			"has:image/video/audio/text/file => filter by attachment types\n" +
+			"domain:domain.com => filter by domain\n" +
+			"before:Date => show posts made before Date\n" +
+			"after:Date => show posts made after Date\n" +
+			'"text" => get posts with exact text between quotes\n' +
+			"filter:following => show results only from users you follow\n" +
+			"filter:followers => show results only from followers\n";
 	}
 	const { canceled, result: query } = await os.inputText({
 		title: i18n.ts.search,

From 0524789185ddef4cd73d0e9b9618b03e31b9d085 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Mon, 29 May 2023 19:45:55 +0200
Subject: [PATCH 127/319] Make Meilisearch optional and don't connect if
 unconfigured

---
 packages/backend/src/db/meilisearch.ts | 81 ++++++++++++++------------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 7f31789554..60491f8827 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -1,63 +1,68 @@
-import { Health, MeiliSearch, Stats } from "meilisearch";
+import { Health, Index, MeiliSearch, Stats } from "meilisearch";
 import { dbLogger } from "./logger.js";
 
 import config from "@/config/index.js";
 import { Note } from "@/models/entities/note.js";
 import * as url from "url";
-import { ILocalUser, User } from "@/models/entities/user.js";
+import { ILocalUser } from "@/models/entities/user.js";
 import { Followings, Users } from "@/models/index.js";
 
 const logger = dbLogger.createSubLogger("meilisearch", "gray", false);
 
+let posts: Index;
+let client: MeiliSearch;
+
 const hasConfig =
 	config.meilisearch &&
 	(config.meilisearch.host ||
 		config.meilisearch.port ||
 		config.meilisearch.apiKey);
 
-const host = hasConfig ? config.meilisearch.host ?? "localhost" : "";
-const port = hasConfig ? config.meilisearch.port ?? 7700 : 0;
-const auth = hasConfig ? config.meilisearch.apiKey ?? "" : "";
-const ssl = hasConfig ? config.meilisearch.ssl ?? false : false;
+if(hasConfig) {
+	const host = hasConfig ? config.meilisearch.host ?? "localhost" : "";
+    const port = hasConfig ? config.meilisearch.port ?? 7700 : 0;
+    const auth = hasConfig ? config.meilisearch.apiKey ?? "" : "";
+    const ssl = hasConfig ? config.meilisearch.ssl ?? false : false;
 
-logger.info("Connecting to MeiliSearch");
+    logger.info("Connecting to MeiliSearch");
 
-const client: MeiliSearch = new MeiliSearch({
-	host: `${ssl ? "https" : "http"}://${host}:${port}`,
-	apiKey: auth,
-});
+	client = new MeiliSearch({
+		host: `${ssl ? "https" : "http"}://${host}:${port}`,
+    	apiKey: auth,
+    });
 
-const posts = client.index("posts");
+	posts = client.index("posts");
 
-posts
-	.updateSearchableAttributes(["text"])
-	.catch((e) =>
-		logger.error(`Setting searchable attr failed, searches won't work: ${e}`),
-	);
+	posts
+    	.updateSearchableAttributes(["text"])
+    	.catch((e) =>
+    		logger.error(`Setting searchable attr failed, searches won't work: ${e}`),
+    	);
 
-posts
-	.updateFilterableAttributes([
-		"userName",
-		"userHost",
-		"mediaAttachment",
-		"createdAt",
-		"userId",
-	])
-	.catch((e) =>
-		logger.error(
-			`Setting filterable attr failed, advanced searches won't work: ${e}`,
-		),
-	);
+    posts
+    	.updateFilterableAttributes([
+    		"userName",
+    		"userHost",
+    		"mediaAttachment",
+    		"createdAt",
+    		"userId",
+    	])
+    	.catch((e) =>
+    		logger.error(
+    			`Setting filterable attr failed, advanced searches won't work: ${e}`,
+    		),
+    	);
 
-posts
-	.updateSortableAttributes(["createdAt"])
-	.catch((e) =>
-		logger.error(
-			`Setting sortable attr failed, placeholder searches won't sort properly: ${e}`,
-		),
-	);
+    posts
+    	.updateSortableAttributes(["createdAt"])
+    	.catch((e) =>
+    		logger.error(
+    			`Setting sortable attr failed, placeholder searches won't sort properly: ${e}`,
+    		),
+    	);
 
-logger.info("Connected to MeiliSearch");
+    logger.info("Connected to MeiliSearch");
+}
 
 export type MeilisearchNote = {
 	id: string;

From 33ef39cd4a2523c9d6398f9419e6b014218684dc Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Mon, 29 May 2023 20:09:52 +0200
Subject: [PATCH 128/319] formatter

---
 packages/backend/src/db/meilisearch.ts | 64 +++++++++++++-------------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 60491f8827..01efaa0ba0 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -18,50 +18,50 @@ const hasConfig =
 		config.meilisearch.port ||
 		config.meilisearch.apiKey);
 
-if(hasConfig) {
+if (hasConfig) {
 	const host = hasConfig ? config.meilisearch.host ?? "localhost" : "";
-    const port = hasConfig ? config.meilisearch.port ?? 7700 : 0;
-    const auth = hasConfig ? config.meilisearch.apiKey ?? "" : "";
-    const ssl = hasConfig ? config.meilisearch.ssl ?? false : false;
+	const port = hasConfig ? config.meilisearch.port ?? 7700 : 0;
+	const auth = hasConfig ? config.meilisearch.apiKey ?? "" : "";
+	const ssl = hasConfig ? config.meilisearch.ssl ?? false : false;
 
-    logger.info("Connecting to MeiliSearch");
+	logger.info("Connecting to MeiliSearch");
 
 	client = new MeiliSearch({
 		host: `${ssl ? "https" : "http"}://${host}:${port}`,
-    	apiKey: auth,
-    });
+		apiKey: auth,
+	});
 
 	posts = client.index("posts");
 
 	posts
-    	.updateSearchableAttributes(["text"])
-    	.catch((e) =>
-    		logger.error(`Setting searchable attr failed, searches won't work: ${e}`),
-    	);
+		.updateSearchableAttributes(["text"])
+		.catch((e) =>
+			logger.error(`Setting searchable attr failed, searches won't work: ${e}`),
+		);
 
-    posts
-    	.updateFilterableAttributes([
-    		"userName",
-    		"userHost",
-    		"mediaAttachment",
-    		"createdAt",
-    		"userId",
-    	])
-    	.catch((e) =>
-    		logger.error(
-    			`Setting filterable attr failed, advanced searches won't work: ${e}`,
-    		),
-    	);
+	posts
+		.updateFilterableAttributes([
+			"userName",
+			"userHost",
+			"mediaAttachment",
+			"createdAt",
+			"userId",
+		])
+		.catch((e) =>
+			logger.error(
+				`Setting filterable attr failed, advanced searches won't work: ${e}`,
+			),
+		);
 
-    posts
-    	.updateSortableAttributes(["createdAt"])
-    	.catch((e) =>
-    		logger.error(
-    			`Setting sortable attr failed, placeholder searches won't sort properly: ${e}`,
-    		),
-    	);
+	posts
+		.updateSortableAttributes(["createdAt"])
+		.catch((e) =>
+			logger.error(
+				`Setting sortable attr failed, placeholder searches won't sort properly: ${e}`,
+			),
+		);
 
-    logger.info("Connected to MeiliSearch");
+	logger.info("Connected to MeiliSearch");
 }
 
 export type MeilisearchNote = {

From 7527351620a47107a18e5d2dc36b38352277582d Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 29 May 2023 14:51:02 -0400
Subject: [PATCH 129/319] Add timeline hints

---
 packages/client/src/components/MkInfo.vue     | 23 ++++++++-
 packages/client/src/components/MkTimeline.vue | 48 +++++++++++++++++++
 packages/client/src/store.ts                  | 20 ++++++++
 3 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkInfo.vue b/packages/client/src/components/MkInfo.vue
index e59b5d56ea..848a4e37ab 100644
--- a/packages/client/src/components/MkInfo.vue
+++ b/packages/client/src/components/MkInfo.vue
@@ -1,19 +1,34 @@
 <template>
-	<div class="info" :class="{ warn, card }">
+	<div v-if="visible" class="info" :class="{ warn, card }">
 		<i v-if="warn" class="ph-warning ph-bold ph-lg"></i>
 		<i v-else class="ph-bold ph-lg" :class="icon ? `ph-${icon}` : 'ph-info'"></i>
 		<slot></slot>
+		<button class="_button close" @click.stop="close">
+			<i class="ph-x ph-bold ph-lg"></i>
+		</button>
 	</div>
 </template>
 
 <script lang="ts" setup>
-import {} from "vue";
+import { ref } from "vue";
+
+const visible = ref(true);
 
 defineProps<{
 	icon?: string;
 	warn?: boolean;
 	card?: boolean;
 }>();
+
+const emit = defineEmits<{
+	(ev: "close"): void;
+}>();
+
+function close() {
+	visible.value = false;
+	emit("close");
+}
+
 </script>
 
 <style lang="scss" scoped>
@@ -54,5 +69,9 @@ defineProps<{
 	> i {
 		margin-right: 4px;
 	}
+	> .close {
+		margin-left: auto;
+		float: right;
+	}
 }
 </style>
diff --git a/packages/client/src/components/MkTimeline.vue b/packages/client/src/components/MkTimeline.vue
index 317e556cfb..01885beecc 100644
--- a/packages/client/src/components/MkTimeline.vue
+++ b/packages/client/src/components/MkTimeline.vue
@@ -1,4 +1,11 @@
 <template>
+	<MkInfo v-if="tlHint && !tlHintClosed" class="_gap" @close="closeHint"> 
+		<I18n
+			:src="tlHint"
+		>
+			<template #icon></template>
+		</I18n>
+	</MkInfo>
 	<XNotes
 		ref="tlComponent"
 		:no-gap="!$store.state.showGapBetweenNotesInTimeline"
@@ -10,10 +17,13 @@
 <script lang="ts" setup>
 import { ref, computed, provide, onUnmounted } from "vue";
 import XNotes from "@/components/MkNotes.vue";
+import MkInfo from "@/components/MkInfo.vue";
 import * as os from "@/os";
 import { stream } from "@/stream";
 import * as sound from "@/scripts/sound";
 import { $i } from "@/account";
+import { i18n } from "@/i18n";
+import { defaultStore } from "@/store";
 
 const props = defineProps<{
 	src: string;
@@ -64,6 +74,9 @@ let query;
 let connection;
 let connection2;
 
+let tlHint;
+let tlHintClosed;
+
 if (props.src === "antenna") {
 	endpoint = "antennas/notes";
 	query = {
@@ -81,22 +94,37 @@ if (props.src === "antenna") {
 	connection2 = stream.useChannel("main");
 	connection2.on("follow", onChangeFollowing);
 	connection2.on("unfollow", onChangeFollowing);
+
+	tlHint = i18n.ts._tutorial.step5_3;
+	tlHintClosed = defaultStore.state.tlHomeHintClosed;
 } else if (props.src === "local") {
 	endpoint = "notes/local-timeline";
 	connection = stream.useChannel("localTimeline");
 	connection.on("note", prepend);
+
+	tlHint = i18n.ts._tutorial.step5_4;
+	tlHintClosed = defaultStore.state.tlLocalHintClosed;
 } else if (props.src === "recommended") {
 	endpoint = "notes/recommended-timeline";
 	connection = stream.useChannel("recommendedTimeline");
 	connection.on("note", prepend);
+
+	tlHint = i18n.ts._tutorial.step5_6;
+	tlHintClosed = defaultStore.state.tlRecommendedHintClosed;
 } else if (props.src === "social") {
 	endpoint = "notes/hybrid-timeline";
 	connection = stream.useChannel("hybridTimeline");
 	connection.on("note", prepend);
+
+	tlHint = i18n.ts._tutorial.step5_5;
+	tlHintClosed = defaultStore.state.tlSocialHintClosed;
 } else if (props.src === "global") {
 	endpoint = "notes/global-timeline";
 	connection = stream.useChannel("globalTimeline");
 	connection.on("note", prepend);
+
+	tlHint = i18n.ts._tutorial.step5_7;
+	tlHintClosed = defaultStore.state.tlGlobalHintClosed;
 } else if (props.src === "mentions") {
 	endpoint = "notes/mentions";
 	connection = stream.useChannel("main");
@@ -135,6 +163,26 @@ if (props.src === "antenna") {
 	connection.on("note", prepend);
 }
 
+function closeHint() {
+	switch (props.src) {
+		case 'home':
+			defaultStore.set("tlHomeHintClosed", true);
+			break;
+		case 'local':
+			defaultStore.set("tlLocalHintClosed", true);
+			break;
+		case 'recommended':
+			defaultStore.set("tlRecommendedHintClosed", true);
+			break;
+		case 'social':
+			defaultStore.set("tlSocialHintClosed", true);
+			break;
+		case 'global':
+			defaultStore.set("tlGlobalHintClosed", true);
+			break;
+	}
+}
+
 const pagination = {
 	endpoint: endpoint,
 	limit: 10,
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 7043c88aa8..b6897a65ce 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -26,6 +26,26 @@ export const defaultStore = markRaw(
 			where: "account",
 			default: 0,
 		},
+		tlHomeHintClosed: {
+			where: "device",
+			default: false,
+		},
+		tlLocalHintClosed: {
+			where: "device",
+			default: false,
+		},
+		tlRecommendedHintClosed: {
+			where: "device",
+			default: false,
+		},
+		tlSocialHintClosed: {
+			where: "device",
+			default: false,
+		},
+		tlGlobalHintClosed: {
+			where: "device",
+			default: false,
+		},
 		keepCw: {
 			where: "account",
 			default: true,

From 4bead341a1c36d52787ca5f7f7ad887c45705da9 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 29 May 2023 14:55:00 -0400
Subject: [PATCH 130/319] closeable prop

---
 packages/client/src/components/MkInfo.vue     | 3 ++-
 packages/client/src/components/MkTimeline.vue | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/components/MkInfo.vue b/packages/client/src/components/MkInfo.vue
index 848a4e37ab..4ab4c1eba9 100644
--- a/packages/client/src/components/MkInfo.vue
+++ b/packages/client/src/components/MkInfo.vue
@@ -3,7 +3,7 @@
 		<i v-if="warn" class="ph-warning ph-bold ph-lg"></i>
 		<i v-else class="ph-bold ph-lg" :class="icon ? `ph-${icon}` : 'ph-info'"></i>
 		<slot></slot>
-		<button class="_button close" @click.stop="close">
+		<button v-if="closeable" class="_button close" @click.stop="close">
 			<i class="ph-x ph-bold ph-lg"></i>
 		</button>
 	</div>
@@ -18,6 +18,7 @@ defineProps<{
 	icon?: string;
 	warn?: boolean;
 	card?: boolean;
+	closeable?: boolean;
 }>();
 
 const emit = defineEmits<{
diff --git a/packages/client/src/components/MkTimeline.vue b/packages/client/src/components/MkTimeline.vue
index 01885beecc..9712fb0235 100644
--- a/packages/client/src/components/MkTimeline.vue
+++ b/packages/client/src/components/MkTimeline.vue
@@ -1,5 +1,5 @@
 <template>
-	<MkInfo v-if="tlHint && !tlHintClosed" class="_gap" @close="closeHint"> 
+	<MkInfo v-if="tlHint && !tlHintClosed" :closeable="true" class="_gap" @close="closeHint"> 
 		<I18n
 			:src="tlHint"
 		>

From d232ba2affb07ad985aa794c61594553c4ba2465 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 29 May 2023 15:08:33 -0400
Subject: [PATCH 131/319] Add lists hint

---
 locales/en-US.yml                             |  1 +
 .../client/src/components/MkPagination.vue    |  3 +++
 packages/client/src/pages/my-lists/index.vue  | 27 +++++++++----------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 437a9cd354..0bc53783fd 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -83,6 +83,7 @@ exportRequested: "You've requested an export. This may take a while. It will be
   \ to your Drive once completed."
 importRequested: "You've requested an import. This may take a while."
 lists: "Lists"
+listsDesc: "Lists let you create timelines with specified users. They can be accessed from the timelines page."
 noLists: "You don't have any lists"
 note: "Post"
 notes: "Posts"
diff --git a/packages/client/src/components/MkPagination.vue b/packages/client/src/components/MkPagination.vue
index 564b214e0f..4caea737e9 100644
--- a/packages/client/src/components/MkPagination.vue
+++ b/packages/client/src/components/MkPagination.vue
@@ -490,5 +490,8 @@ defineExpose({
 .list > :deep(._button) {
 	margin-inline: auto;
 	margin-bottom: 16px;
+	&:last-of-type:not(:first-child) {
+		margin-top: 16px;
+	}
 }
 </style>
diff --git a/packages/client/src/pages/my-lists/index.vue b/packages/client/src/pages/my-lists/index.vue
index 6ecfd12f46..e3c4da3cca 100644
--- a/packages/client/src/pages/my-lists/index.vue
+++ b/packages/client/src/pages/my-lists/index.vue
@@ -8,16 +8,17 @@
 		/></template>
 		<MkSpacer :content-max="700">
 			<div class="qkcjvfiv">
-				<div class="buttonWrapper">
+				<MkInfo
+					class="_gap"
+					:icon="'list-bullets'"
+					:card="true"
+				>
+					<p>{{ i18n.ts.listsDesc }}</p>
 					<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>
+				</MkInfo>
 
 				<MkPagination
 					v-slot="{ items }"
@@ -34,6 +35,10 @@
 						<div class="name">{{ list.name }}</div>
 						<MkAvatars :user-ids="list.userIds" />
 					</MkA>
+					<MkButton @click="deleteAll"
+						><i class="ph-trash ph-bold ph-lg"></i>
+						{{ i18n.ts.deleteAll }}</MkButton
+					>
 				</MkPagination>
 			</div>
 		</MkSpacer>
@@ -45,6 +50,7 @@ import {} from "vue";
 import MkPagination from "@/components/MkPagination.vue";
 import MkButton from "@/components/MkButton.vue";
 import MkAvatars from "@/components/MkAvatars.vue";
+import MkInfo from "@/components/MkInfo.vue";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
@@ -92,15 +98,6 @@ definePageMetadata({
 
 <style lang="scss" scoped>
 .qkcjvfiv {
-	> .buttonWrapper {
-		display: grid;
-		justify-content: center;
-
-		> .add {
-			margin: 0 auto var(--margin) auto;
-		}
-	}
-
 	> .lists {
 		> .list {
 			display: block;

From b0c2f1d99f2a34c809c45c4de4a1331755c866e8 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 12:16:35 -0700
Subject: [PATCH 132/319] locales

---
 locales/ca-ES.yml                          |  4 ++--
 locales/en-US.yml                          |  3 ++-
 locales/ja-JP.yml                          |  3 ++-
 locales/pl-PL.yml                          |  3 ++-
 locales/ru-RU.yml                          |  4 ++--
 packages/client/src/scripts/index-posts.ts |  1 +
 packages/client/src/scripts/search.ts      | 13 ++-----------
 7 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index f64f70583a..f438b4f9a8 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1802,8 +1802,8 @@ pushNotificationNotSupported: El vostre navegador o servidor no admet notificaci
   push
 license: Llicència
 indexPosts: Índex de notes
-indexFrom: Índex a partir de l'ID de Publicacions (deixeu en blanc per indexar cada
-  publicació)
+indexFrom: Índex a partir de l'ID de Publicacions
+indexFromDescription: Deixeu en blanc per indexar cada publicació
 indexNotice: Ara indexant. Això probablement trigarà una estona, si us plau, no reinicieu
   el servidor durant almenys una hora.
 _instanceTicker:
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 5184df4bef..5b6af9bed0 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1065,7 +1065,8 @@ migrationConfirm: "Are you absolutely sure you want to migrate your account to {
 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)"
+indexFrom: "Index from Post ID onwards"
+indexFromDescription: "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"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 84c894c7a8..94454f3f9d 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -966,7 +966,8 @@ migrationConfirm: "本当にこのアカウントを {account} に引っ越し
 defaultReaction: "リモートとローカルの投稿に対するデフォルトの絵文字リアクション"
 license: "ライセンス"
 indexPosts: "投稿をインデックス"
-indexFrom: "この投稿ID以降をインデックスする（空白で全ての投稿を指定します）"
+indexFrom: "この投稿ID以降をインデックスする"
+indexFromDescription: "空白で全ての投稿を指定します"
 indexNotice: "インデックスを開始しました。完了まで時間がかかる場合があるため、少なくとも1時間はサーバーを再起動しないでください。"
 customKaTeXMacro: "カスタムKaTeXマクロ"
 customKaTeXMacroDescription: "数式入力を楽にするためのマクロを設定しましょう！記法はLaTeXにおけるコマンドの定義と同様に \\newcommand{\\\
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index c127c5a525..659e204af5 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1898,7 +1898,8 @@ sendPushNotificationReadMessageCaption: Powiadomienie zawierające tekst "{empty
 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)
+indexFrom: Indeksuj wpisy od ID
+indexFromDescription: Zostaw puste dla indeksowania wszystkich wpisów
 indexNotice: Indeksuję. Zapewne zajmie to chwilę, nie restartuj serwera przez co najmniej
   godzinę.
 customKaTeXMacro: Niestandardowe makra KaTeX
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 4d94ab287c..ad47d7d37c 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -1909,8 +1909,8 @@ recommendedInstances: Рекомендованные инстансы
 defaultReaction: Эмодзи реакция по умолчанию для выходящих и исходящих постов
 license: Лицензия
 indexPosts: Индексировать посты
-indexFrom: Индексировать начиная с идентификатора поста и далее (оставьте пустым для
-  индексации каждого поста)
+indexFrom: Индексировать начиная с идентификатора поста и далее
+indexFromDescription: оставьте пустым для индексации каждого поста
 indexNotice: Теперь индексирование. Вероятно, это займет некоторое время, пожалуйста,
   не перезагружайте свой сервер по крайней мере в течение часа.
 customKaTeXMacro: Кастомные KaTex макросы
diff --git a/packages/client/src/scripts/index-posts.ts b/packages/client/src/scripts/index-posts.ts
index 9817a83284..94b545e90e 100644
--- a/packages/client/src/scripts/index-posts.ts
+++ b/packages/client/src/scripts/index-posts.ts
@@ -4,6 +4,7 @@ import * as os from "@/os";
 export async function indexPosts() {
 	const { canceled, result: index } = await os.inputText({
 		title: i18n.ts.indexFrom,
+		text: i18n.ts.indexFromDescription,
 	});
 	if (canceled) return;
 
diff --git a/packages/client/src/scripts/search.ts b/packages/client/src/scripts/search.ts
index 379f09c089..2b52dc6683 100644
--- a/packages/client/src/scripts/search.ts
+++ b/packages/client/src/scripts/search.ts
@@ -3,16 +3,7 @@ import { i18n } from "@/i18n";
 import { mainRouter } from "@/router";
 
 export async function search() {
-	let searchOptions = "";
-
-	let meta = null;
-
-	os.api("server-info", {}).then((res) => {
-		meta = res;
-	});
-
-	if (meta.meilisearch.health === "available") {
-		searchOptions =
+	const searchOptions  =
 			"Advanced search operators\n" +
 			"from:user => filter by user\n" +
 			"has:image/video/audio/text/file => filter by attachment types\n" +
@@ -22,7 +13,7 @@ export async function search() {
 			'"text" => get posts with exact text between quotes\n' +
 			"filter:following => show results only from users you follow\n" +
 			"filter:followers => show results only from followers\n";
-	}
+
 	const { canceled, result: query } = await os.inputText({
 		title: i18n.ts.search,
 		placeholder: i18n.ts.searchPlaceholder,

From d9211926bcfd3f50c55ae9f97dcc8f38e890b079 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 29 May 2023 15:19:53 -0400
Subject: [PATCH 133/319] forgot to give aria to close button o o p s

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

diff --git a/packages/client/src/components/MkInfo.vue b/packages/client/src/components/MkInfo.vue
index 4ab4c1eba9..2e535739ed 100644
--- a/packages/client/src/components/MkInfo.vue
+++ b/packages/client/src/components/MkInfo.vue
@@ -3,7 +3,7 @@
 		<i v-if="warn" class="ph-warning ph-bold ph-lg"></i>
 		<i v-else class="ph-bold ph-lg" :class="icon ? `ph-${icon}` : 'ph-info'"></i>
 		<slot></slot>
-		<button v-if="closeable" class="_button close" @click.stop="close">
+		<button v-if="closeable" v-tooltip="i18n.ts.close" class="_button close" @click.stop="close">
 			<i class="ph-x ph-bold ph-lg"></i>
 		</button>
 	</div>
@@ -11,6 +11,7 @@
 
 <script lang="ts" setup>
 import { ref } from "vue";
+import { i18n } from "@/i18n";
 
 const visible = ref(true);
 

From e15449f51dd26ddebd068f18056552ad5fe4873f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 12:22:03 -0700
Subject: [PATCH 134/319] chore: :technologist: pull request template

---
 pull_request_template.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pull_request_template.yml

diff --git a/pull_request_template.yml b/pull_request_template.yml
new file mode 100644
index 0000000000..f45c199aa3
--- /dev/null
+++ b/pull_request_template.yml
@@ -0,0 +1,28 @@
+name: Pull Request
+about: Create a pull request
+title: "[PR]: "
+body:
+  - type: markdown
+    attributes:
+      value: |
+                Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: about
+    attributes:
+      label: What does this PR do?
+      description: Please give us a brief description of what this PR does.
+      placeholder: Makes Calckey so amazing by...
+    validations:
+      required: true
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Contribution Guidelines
+      description: By submitting this issue, you agree to follow our [Contribution Guidelines](https://codeberg.org/calckey/calckey/src/branch/develop/CONTRIBUTING.md)
+      options:
+        - label: I agree to follow this project's Contribution Guidelines
+          required: true
+        - label: I have made sure to test this pull request
+          required: true
+        - label: I have made sure to run `pnpm run format` before submitting this pull request
+          required: true

From 0276b59ef6be1214581a16f8f966be05c0bd8fdd Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 12:23:19 -0700
Subject: [PATCH 135/319] typo

---
 pull_request_template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pull_request_template.yml b/pull_request_template.yml
index f45c199aa3..41d04f59fe 100644
--- a/pull_request_template.yml
+++ b/pull_request_template.yml
@@ -5,7 +5,7 @@ body:
   - type: markdown
     attributes:
       value: |
-                Thanks for taking the time to fill out this bug report!
+                Thanks for taking the time to make Calckey better!
   - type: textarea
     id: about
     attributes:

From c075455bc27273817e70f00a4b1546677a632998 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 12:28:58 -0700
Subject: [PATCH 136/319] dev33

---
 package.json                          | 2 +-
 packages/client/src/scripts/search.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index de993cde08..47b379b8a8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev32",
+	"version": "14.0.0-dev33",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/scripts/search.ts b/packages/client/src/scripts/search.ts
index 2b52dc6683..40f09e4bc2 100644
--- a/packages/client/src/scripts/search.ts
+++ b/packages/client/src/scripts/search.ts
@@ -17,7 +17,7 @@ export async function search() {
 	const { canceled, result: query } = await os.inputText({
 		title: i18n.ts.search,
 		placeholder: i18n.ts.searchPlaceholder,
-		text: searchOptions,
+		// text: searchOptions,
 	});
 	if (canceled || query == null || query === "") return;
 

From 908e7e20cbdaaf0ec8e298d687fa622fbe386fea Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 12:52:43 -0700
Subject: [PATCH 137/319] remove repetitive errors in groups

---
 packages/client/src/pages/my-groups/index.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/client/src/pages/my-groups/index.vue b/packages/client/src/pages/my-groups/index.vue
index 4c411e71a5..ce04f9f602 100644
--- a/packages/client/src/pages/my-groups/index.vue
+++ b/packages/client/src/pages/my-groups/index.vue
@@ -111,6 +111,10 @@ async function leave(group) {
 </script>
 
 <style lang="scss" scoped>
+._fullinfo {
+	display: none !important;
+}
+
 ._card {
 	margin-bottom: 1rem;
 	._title {

From f3bb46b94af9a73e9f862883e73307d47e0568d6 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 29 May 2023 15:59:04 -0400
Subject: [PATCH 138/319] typo

---
 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 d1f416d323..ece9a92016 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1451,7 +1451,7 @@ _tutorial:
     \ you follow."
   step5_4: "The Local {icon} timeline is where you can see posts from everyone else on this server."
   step5_5: "The Social {icon} timeline is a combination of the Home and Local timelines."
-  step5_6: "The Recommended {icon} timeline is where you can see posts from server\
+  step5_6: "The Recommended {icon} timeline is where you can see posts from servers\
     \ the admins recommend."
   step5_7: "The Global {icon} timeline is where you can see posts from every other\
     \ connected server."

From d6eee26e49a5eb67a61e172c15d1d1a3ba1e4dd4 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 13:03:47 -0700
Subject: [PATCH 139/319] add tooltip to meili pie chart

---
 packages/client/src/widgets/server-metric/meilisearch.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
index 8119ff537b..b640131e2b 100644
--- a/packages/client/src/widgets/server-metric/meilisearch.vue
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="verusivbr">
-		<XPie class="pie" :value="progress" />
+		<XPie v-tooltip="i18n.ts.meiliIndexCount" class="pie" :value="progress" />
 		<div>
 			<p><i class="ph-file-search ph-bold ph-lg"></i>MeiliSearch</p>
 			<p>{{ i18n.ts._widgets.meiliStatus }}: {{ available }}</p>

From c3bc85e141d9dddeb85e659e0d5aa9e5f8a29ae9 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 13:16:41 -0700
Subject: [PATCH 140/319] fix: server info widget images

---
 packages/client/src/widgets/server-info.vue | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/widgets/server-info.vue b/packages/client/src/widgets/server-info.vue
index d24dd8a987..19cfbb06ae 100644
--- a/packages/client/src/widgets/server-info.vue
+++ b/packages/client/src/widgets/server-info.vue
@@ -3,19 +3,17 @@
 		<div
 			:class="$style.container"
 			:style="{
-				backgroundImage: $instance.bannerUrl
-					? `url(${$instance.bannerUrl})`
-					: null,
+				backgroundImage: `url(${$instance.bannerUrl})`,
 			}"
 		>
 			<div :class="$style.iconContainer">
 				<img
 					:src="
-						$instance.iconUrl ??
-						$instance.faviconUrl ??
-						'/favicon.ico'
-					"
-					alt=""
+							$instance.iconUrl ||
+							$instance.faviconUrl ||
+							'/favicon.ico'
+						"
+					alt="Instance logo"
 					:class="$style.icon"
 				/>
 			</div>
@@ -107,7 +105,7 @@ defineExpose<WidgetComponentExpose>({
 		-1px 1px 0 var(--bg), 1px 1px 0 var(--bg);
 }
 
-.host {
+.name {
 	font-weight: bold;
 }
 </style>

From 7969fe3dd11c503d1c9a48556b8af8384a77715b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 13:17:42 -0700
Subject: [PATCH 141/319] chore: formatting

---
 package.json                                  |  2 +-
 packages/client/src/components/MkInfo.vue     | 14 ++++++++++---
 packages/client/src/components/MkTimeline.vue | 21 +++++++++++--------
 packages/client/src/pages/channels.vue        |  4 +++-
 .../client/src/pages/my-antennas/index.vue    | 15 +++++--------
 packages/client/src/pages/my-clips/index.vue  |  5 +----
 packages/client/src/pages/my-lists/index.vue  |  6 +-----
 packages/client/src/scripts/search.ts         | 20 +++++++++---------
 packages/client/src/widgets/server-info.vue   |  8 +++----
 .../src/widgets/server-metric/meilisearch.vue |  6 +++++-
 10 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/package.json b/package.json
index 47b379b8a8..06433d6eb9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev33",
+	"version": "14.0.0-dev34",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
diff --git a/packages/client/src/components/MkInfo.vue b/packages/client/src/components/MkInfo.vue
index 2e535739ed..d8bf68fc1b 100644
--- a/packages/client/src/components/MkInfo.vue
+++ b/packages/client/src/components/MkInfo.vue
@@ -1,9 +1,18 @@
 <template>
 	<div v-if="visible" class="info" :class="{ warn, card }">
 		<i v-if="warn" class="ph-warning ph-bold ph-lg"></i>
-		<i v-else class="ph-bold ph-lg" :class="icon ? `ph-${icon}` : 'ph-info'"></i>
+		<i
+			v-else
+			class="ph-bold ph-lg"
+			:class="icon ? `ph-${icon}` : 'ph-info'"
+		></i>
 		<slot></slot>
-		<button v-if="closeable" v-tooltip="i18n.ts.close" class="_button close" @click.stop="close">
+		<button
+			v-if="closeable"
+			v-tooltip="i18n.ts.close"
+			class="_button close"
+			@click.stop="close"
+		>
 			<i class="ph-x ph-bold ph-lg"></i>
 		</button>
 	</div>
@@ -30,7 +39,6 @@ function close() {
 	visible.value = false;
 	emit("close");
 }
-
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/MkTimeline.vue b/packages/client/src/components/MkTimeline.vue
index 9712fb0235..11fe175d9c 100644
--- a/packages/client/src/components/MkTimeline.vue
+++ b/packages/client/src/components/MkTimeline.vue
@@ -1,8 +1,11 @@
 <template>
-	<MkInfo v-if="tlHint && !tlHintClosed" :closeable="true" class="_gap" @close="closeHint"> 
-		<I18n
-			:src="tlHint"
-		>
+	<MkInfo
+		v-if="tlHint && !tlHintClosed"
+		:closeable="true"
+		class="_gap"
+		@close="closeHint"
+	>
+		<I18n :src="tlHint">
 			<template #icon></template>
 		</I18n>
 	</MkInfo>
@@ -165,19 +168,19 @@ if (props.src === "antenna") {
 
 function closeHint() {
 	switch (props.src) {
-		case 'home':
+		case "home":
 			defaultStore.set("tlHomeHintClosed", true);
 			break;
-		case 'local':
+		case "local":
 			defaultStore.set("tlLocalHintClosed", true);
 			break;
-		case 'recommended':
+		case "recommended":
 			defaultStore.set("tlRecommendedHintClosed", true);
 			break;
-		case 'social':
+		case "social":
 			defaultStore.set("tlSocialHintClosed", true);
 			break;
-		case 'global':
+		case "global":
 			defaultStore.set("tlGlobalHintClosed", true);
 			break;
 	}
diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue
index c1e34ea444..b79985bafb 100644
--- a/packages/client/src/pages/channels.vue
+++ b/packages/client/src/pages/channels.vue
@@ -7,7 +7,9 @@
 				:tabs="headerTabs"
 		/></template>
 		<MkSpacer :content-max="700">
-			<MkInfo class="_gap" :warn="true">{{ i18n.ts.channelFederationWarn }}</MkInfo>
+			<MkInfo class="_gap" :warn="true">{{
+				i18n.ts.channelFederationWarn
+			}}</MkInfo>
 			<swiper
 				:round-lengths="true"
 				:touch-angle="25"
diff --git a/packages/client/src/pages/my-antennas/index.vue b/packages/client/src/pages/my-antennas/index.vue
index d8c9617ec3..259c6db695 100644
--- a/packages/client/src/pages/my-antennas/index.vue
+++ b/packages/client/src/pages/my-antennas/index.vue
@@ -8,11 +8,7 @@
 		/></template>
 		<MkSpacer :content-max="700">
 			<div class="ieepwinx">
-				<MkInfo
-					class="_gap"
-					:icon="'flying-saucer'"
-					:card="true"
-				>
+				<MkInfo class="_gap" :icon="'flying-saucer'" :card="true">
 					<p>{{ i18n.ts.antennasDesc }}</p>
 					<MkButton
 						:link="true"
@@ -24,10 +20,7 @@
 					>
 				</MkInfo>
 				<div class="">
-					<MkPagination
-						ref="list"
-						:pagination="pagination"
-					>
+					<MkPagination ref="list" :pagination="pagination">
 						<template #default="{ items }">
 							<div v-for="antenna in items" :key="antenna.id">
 								<MkA
@@ -35,7 +28,9 @@
 									:link="true"
 									:to="`/timeline/antenna/${antenna.id}`"
 								>
-									<i class="ph-flying-saucer ph-bold ph-lg"></i
+									<i
+										class="ph-flying-saucer ph-bold ph-lg"
+									></i
 									><i
 										:class="`${
 											antenna.hasUnreadNote
diff --git a/packages/client/src/pages/my-clips/index.vue b/packages/client/src/pages/my-clips/index.vue
index 2d9ce3db6b..f88ee5a9bb 100644
--- a/packages/client/src/pages/my-clips/index.vue
+++ b/packages/client/src/pages/my-clips/index.vue
@@ -14,10 +14,7 @@
 					class="list"
 				>
 					<template #empty>
-						<MkInfo
-							:icon="'paperclip'"
-							:card="true"
-						>
+						<MkInfo :icon="'paperclip'" :card="true">
 							<p>{{ i18n.ts.clipsDesc }}</p>
 						</MkInfo>
 					</template>
diff --git a/packages/client/src/pages/my-lists/index.vue b/packages/client/src/pages/my-lists/index.vue
index e3c4da3cca..cb3a74f57e 100644
--- a/packages/client/src/pages/my-lists/index.vue
+++ b/packages/client/src/pages/my-lists/index.vue
@@ -8,11 +8,7 @@
 		/></template>
 		<MkSpacer :content-max="700">
 			<div class="qkcjvfiv">
-				<MkInfo
-					class="_gap"
-					:icon="'list-bullets'"
-					:card="true"
-				>
+				<MkInfo class="_gap" :icon="'list-bullets'" :card="true">
 					<p>{{ i18n.ts.listsDesc }}</p>
 					<MkButton primary class="add" @click="create"
 						><i class="ph-plus ph-bold ph-lg"></i>
diff --git a/packages/client/src/scripts/search.ts b/packages/client/src/scripts/search.ts
index 40f09e4bc2..03f61f1f0b 100644
--- a/packages/client/src/scripts/search.ts
+++ b/packages/client/src/scripts/search.ts
@@ -3,16 +3,16 @@ import { i18n } from "@/i18n";
 import { mainRouter } from "@/router";
 
 export async function search() {
-	const searchOptions  =
-			"Advanced search operators\n" +
-			"from:user => filter by user\n" +
-			"has:image/video/audio/text/file => filter by attachment types\n" +
-			"domain:domain.com => filter by domain\n" +
-			"before:Date => show posts made before Date\n" +
-			"after:Date => show posts made after Date\n" +
-			'"text" => get posts with exact text between quotes\n' +
-			"filter:following => show results only from users you follow\n" +
-			"filter:followers => show results only from followers\n";
+	// const searchOptions =
+	// 	"Advanced search operators\n" +
+	// 	"from:user => filter by user\n" +
+	// 	"has:image/video/audio/text/file => filter by attachment types\n" +
+	// 	"domain:domain.com => filter by domain\n" +
+	// 	"before:Date => show posts made before Date\n" +
+	// 	"after:Date => show posts made after Date\n" +
+	// 	'"text" => get posts with exact text between quotes\n' +
+	// 	"filter:following => show results only from users you follow\n" +
+	// 	"filter:followers => show results only from followers\n";
 
 	const { canceled, result: query } = await os.inputText({
 		title: i18n.ts.search,
diff --git a/packages/client/src/widgets/server-info.vue b/packages/client/src/widgets/server-info.vue
index 19cfbb06ae..a608c26ce9 100644
--- a/packages/client/src/widgets/server-info.vue
+++ b/packages/client/src/widgets/server-info.vue
@@ -9,10 +9,10 @@
 			<div :class="$style.iconContainer">
 				<img
 					:src="
-							$instance.iconUrl ||
-							$instance.faviconUrl ||
-							'/favicon.ico'
-						"
+						$instance.iconUrl ||
+						$instance.faviconUrl ||
+						'/favicon.ico'
+					"
 					alt="Instance logo"
 					:class="$style.icon"
 				/>
diff --git a/packages/client/src/widgets/server-metric/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
index b640131e2b..f8668c61b5 100644
--- a/packages/client/src/widgets/server-metric/meilisearch.vue
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -1,6 +1,10 @@
 <template>
 	<div class="verusivbr">
-		<XPie v-tooltip="i18n.ts.meiliIndexCount" class="pie" :value="progress" />
+		<XPie
+			v-tooltip="i18n.ts.meiliIndexCount"
+			class="pie"
+			:value="progress"
+		/>
 		<div>
 			<p><i class="ph-file-search ph-bold ph-lg"></i>MeiliSearch</p>
 			<p>{{ i18n.ts._widgets.meiliStatus }}: {{ available }}</p>

From 4a05f0c87629bf92e42952f8bc2b321cf15be2ea Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 13:49:38 -0700
Subject: [PATCH 142/319] refactor: :coffin: remove old metrics view

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

diff --git a/packages/client/src/pages/admin/metrics.vue b/packages/client/src/pages/admin/metrics.vue
deleted file mode 100644
index d0b9de74bc..0000000000
--- a/packages/client/src/pages/admin/metrics.vue
+++ /dev/null
@@ -1,554 +0,0 @@
-<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>
-			<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 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>
-			<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 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>
-			<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>
-</template>
-
-<script lang="ts">
-import { defineComponent, markRaw } from "vue";
-import {
-	Chart,
-	ArcElement,
-	LineElement,
-	BarElement,
-	PointElement,
-	BarController,
-	LineController,
-	CategoryScale,
-	LinearScale,
-	Legend,
-	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";
-
-Chart.register(
-	ArcElement,
-	LineElement,
-	BarElement,
-	PointElement,
-	BarController,
-	LineController,
-	CategoryScale,
-	LinearScale,
-	Legend,
-	Title,
-	Tooltip,
-	SubTitle
-);
-
-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);
-	const g = parseInt(result[2], 16);
-	const b = parseInt(result[3], 16);
-	return `rgba(${r}, ${g}, ${b}, ${a})`;
-};
-import * as os from "@/os";
-import { stream } from "@/stream";
-
-export default defineComponent({
-	components: {
-		MkButton,
-		MkSelect,
-		MkInput,
-		MkContainer,
-		MkFolder,
-		MkwFederation,
-	},
-
-	data() {
-		return {
-			version,
-			url,
-			stats: null,
-			serverInfo: null,
-			connection: null,
-			queueConnection: markRaw(stream.useChannel("queueStats")),
-			memUsage: 0,
-			chartCpuMem: null,
-			chartNet: null,
-			jobs: [],
-			logs: [],
-			logLevel: "all",
-			logDomain: "",
-			modLogs: [],
-			dbInfo: null,
-			overviewHeight: "1fr",
-			queueHeight: "1fr",
-			paused: false,
-			i18n,
-		};
-	},
-
-	computed: {
-		gridColor() {
-			// TODO: var(--panel)の色が暗いか明るいかで判定する
-			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");
-
-		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", {
-				id: Math.random().toString().substr(2, 8),
-				length: 150,
-			});
-
-			this.$nextTick(() => {
-				this.queueConnection.send("requestLog", {
-					id: Math.random().toString().substr(2, 8),
-					length: 200,
-				});
-			});
-		});
-	},
-
-	beforeUnmount() {
-		if (this.connection) {
-			this.connection.off("stats", this.onStats);
-			this.connection.off("statsLog", this.onStatsLog);
-			this.connection.dispose();
-		}
-		this.queueConnection.dispose();
-	},
-
-	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,
-								},
-								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",
-						},
-					},
-				})
-			);
-		},
-
-		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,
-								},
-								ticks: {
-									display: false,
-								},
-							},
-							y: {
-								position: "right",
-								gridLines: {
-									display: true,
-									color: this.gridColor,
-									zeroLineColor: this.gridColor,
-								},
-								ticks: {
-									display: false,
-								},
-							},
-						},
-						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,
-								},
-								ticks: {
-									display: false,
-								},
-							},
-							y: {
-								position: "right",
-								gridLines: {
-									display: true,
-									color: this.gridColor,
-									zeroLineColor: this.gridColor,
-								},
-								ticks: {
-									display: false,
-								},
-							},
-						},
-						tooltips: {
-							intersect: false,
-							mode: "index",
-						},
-					},
-				})
-			);
-		},
-
-		fetchJobs() {
-			os.api("admin/queue/deliver-delayed", {}).then((jobs) => {
-				this.jobs = jobs;
-			});
-		},
-
-		onStats(stats) {
-			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);
-			this.memUsage = stats.mem.active;
-
-			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.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.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) {
-				this.chartCpuMem.data.labels.shift();
-				this.chartCpuMem.data.datasets[0].data.shift();
-				this.chartCpuMem.data.datasets[1].data.shift();
-				this.chartCpuMem.data.datasets[2].data.shift();
-				this.chartNet.data.labels.shift();
-				this.chartNet.data.datasets[0].data.shift();
-				this.chartNet.data.datasets[1].data.shift();
-				this.chartDisk.data.labels.shift();
-				this.chartDisk.data.datasets[0].data.shift();
-				this.chartDisk.data.datasets[1].data.shift();
-			}
-			this.chartCpuMem.update();
-			this.chartNet.update();
-			this.chartDisk.update();
-		},
-
-		onStatsLog(statsLog) {
-			for (const stats of [...statsLog].reverse()) {
-				this.onStats(stats);
-			}
-		},
-
-		bytes,
-
-		number,
-
-		pause() {
-			this.paused = true;
-		},
-
-		resume() {
-			this.paused = false;
-		},
-	},
-});
-</script>
-
-<style lang="scss" scoped>
-.xhexznfu {
-	> div:nth-child(2) {
-		padding: 16px;
-		border-top: solid 0.5px var(--divider);
-	}
-}
-</style>

From a87fc03b9278e0c2f4d1be9070d44ba1a9587c97 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 15:10:14 -0700
Subject: [PATCH 143/319] =?UTF-8?q?style:=20=F0=9F=92=84=20server=20metric?=
 =?UTF-8?q?s=20widgets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/client/src/widgets/server-metric/cpu.vue  |  2 +-
 .../src/widgets/server-metric/meilisearch.vue      | 14 +++++++-------
 packages/client/src/widgets/server-metric/mem.vue  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/widgets/server-metric/cpu.vue b/packages/client/src/widgets/server-metric/cpu.vue
index 5aa4d26987..563fe3b0fb 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 ph-bold ph-lg"></i>CPU</p>
+			<p><i class="ph-cpu 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/meilisearch.vue b/packages/client/src/widgets/server-metric/meilisearch.vue
index f8668c61b5..78032cb6e4 100644
--- a/packages/client/src/widgets/server-metric/meilisearch.vue
+++ b/packages/client/src/widgets/server-metric/meilisearch.vue
@@ -8,8 +8,8 @@
 		<div>
 			<p><i class="ph-file-search ph-bold ph-lg"></i>MeiliSearch</p>
 			<p>{{ i18n.ts._widgets.meiliStatus }}: {{ available }}</p>
-			<p>{{ i18n.ts._widgets.meiliSize }}: {{ bytes(total_size, 2) }}</p>
-			<p>{{ i18n.ts._widgets.meiliIndexCount }}: {{ index_count }}</p>
+			<p>{{ i18n.ts._widgets.meiliSize }}: {{ bytes(totalSize, 1) }}</p>
+			<p>{{ i18n.ts._widgets.meiliIndexCount }}: {{ indexCount }}</p>
 		</div>
 	</div>
 	<br />
@@ -29,15 +29,15 @@ const props = defineProps<{
 
 let progress: number = $ref(0);
 let serverStats = $ref(null);
-let total_size: number = $ref(0);
-let index_count: number = $ref(0);
+let totalSize: number = $ref(0);
+let indexCount: number = $ref(0);
 let available: string = $ref("unavailable");
 
 function onStats(stats) {
-	total_size = stats.meilisearch.size;
-	index_count = stats.meilisearch.indexed_count;
+	totalSize = stats.meilisearch.size;
+	indexCount = stats.meilisearch.indexed_count;
 	available = stats.meilisearch.health;
-	progress = index_count / serverStats.notesCount;
+	progress = indexCount / serverStats.notesCount;
 }
 
 onMounted(() => {
diff --git a/packages/client/src/widgets/server-metric/mem.vue b/packages/client/src/widgets/server-metric/mem.vue
index e3ef00d5e2..80cad4a82c 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 ph-bold ph-lg"></i>RAM</p>
+			<p><i class="ph-microchip 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>

From ea6fca97fd2ff9d60f59259171b34e5d3bdcb4ca Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 15:10:25 -0700
Subject: [PATCH 144/319] feat: :sparkles: server metrics in admin overview

---
 .../src/pages/admin/overview.metrics.vue      | 145 ++++++++++++++++++
 packages/client/src/pages/admin/overview.vue  |   6 +
 2 files changed, 151 insertions(+)
 create mode 100644 packages/client/src/pages/admin/overview.metrics.vue

diff --git a/packages/client/src/pages/admin/overview.metrics.vue b/packages/client/src/pages/admin/overview.metrics.vue
new file mode 100644
index 0000000000..afd6552a6a
--- /dev/null
+++ b/packages/client/src/pages/admin/overview.metrics.vue
@@ -0,0 +1,145 @@
+<template>
+	<div class="_panel" :class="$style.root">
+		<div class="ntjkdlsfk">
+			<div class="_panel">
+				<XPie class="pie" :value="cpuUsage" />
+				<div>
+					<p><i class="ph-cpu ph-bold ph-lg"></i>CPU</p>
+					<p>{{ meta.cpu.cores }} Logical cores</p>
+					<p>{{ meta.cpu.model }}</p>
+				</div>
+			</div>
+
+			<div class="_panel">
+				<XPie class="pie" :value="memUsage" />
+				<div>
+					<p><i class="ph-microchip ph-bold ph-lg"></i>RAM</p>
+					<p>Total: {{ bytes(memTotal, 1) }}</p>
+					<p>Used: {{ bytes(memUsed, 1) }}</p>
+					<p>Free: {{ bytes(memFree, 1) }}</p>
+				</div>
+			</div>
+
+			<div class="_panel">
+				<XPie class="pie" :value="diskUsage" />
+				<div>
+					<p><i class="ph-hard-drives ph-bold ph-lg"></i>Disk</p>
+					<p>Total: {{ bytes(diskTotal, 1) }}</p>
+					<p>Free: {{ bytes(diskAvailable, 1) }}</p>
+					<p>Used: {{ bytes(diskUsed, 1) }}</p>
+				</div>
+			</div>
+
+			<div class="_panel">
+				<XPie class="pie" :value="meiliProgress" />
+				<div>
+					<p>
+						<i class="ph-file-search ph-bold ph-lg"></i>MeiliSearch
+					</p>
+					<p>
+						{{ i18n.ts._widgets.meiliStatus }}: {{ meiliAvailable }}
+					</p>
+					<p>
+						{{ i18n.ts._widgets.meiliSize }}:
+						{{ bytes(meiliTotalSize, 1) }}
+					</p>
+					<p>
+						{{ i18n.ts._widgets.meiliIndexCount }}:
+						{{ meiliIndexCount }}
+					</p>
+				</div>
+			</div>
+		</div>
+	</div>
+</template>
+
+<script lang="ts" setup>
+import { onMounted, onUnmounted } from "vue";
+import XPie from "../../widgets/server-metric/pie.vue";
+import bytes from "@/filters/bytes";
+import { stream } from "@/stream";
+import * as os from "@/os";
+import { i18n } from "@/i18n";
+
+const meta = await os.api("server-info", {});
+const serverStats = await os.api("stats", {});
+
+let cpuUsage: number = $ref(0);
+
+let memUsage: number = $ref(0);
+let memTotal: number = $ref(0);
+let memUsed: number = $ref(0);
+let memFree: number = $ref(0);
+
+let meiliProgress: number = $ref(0);
+let meiliTotalSize: number = $ref(0);
+let meiliIndexCount: number = $ref(0);
+let meiliAvailable: string = $ref("unavailable");
+
+const diskUsage = $computed(() => meta.fs.used / meta.fs.total);
+const diskTotal = $computed(() => meta.fs.total);
+const diskUsed = $computed(() => meta.fs.used);
+const diskAvailable = $computed(() => meta.fs.total - meta.fs.used);
+
+function onStats(stats) {
+	cpuUsage = stats.cpu;
+
+	memUsage = stats.mem.active / meta.mem.total;
+	memTotal = meta.mem.total;
+	memUsed = stats.mem.active;
+	memFree = memTotal - memUsed;
+
+	meiliTotalSize = stats.meilisearch.size;
+	meiliIndexCount = stats.meilisearch.indexed_count;
+	meiliAvailable = stats.meilisearch.health;
+	meiliProgress = meiliIndexCount / serverStats.notesCount;
+}
+
+const connection = stream.useChannel("serverStats");
+onMounted(() => {
+	connection.on("stats", onStats);
+	connection.dispose();
+});
+
+onUnmounted(() => {
+	connection.off("stats", onStats);
+	connection.dispose();
+});
+</script>
+
+<style lang="scss" module>
+.root {
+	padding: 20px;
+}
+
+.ntjkdlsfk {
+	display: flex;
+	padding: 16px;
+
+	> ._panel {
+		> .pie {
+			height: 82px;
+			flex-shrink: 0;
+			margin-right: 16px;
+		}
+
+		> div {
+			flex: 1;
+
+			> p {
+				margin: 0;
+				font-size: 0.8em;
+
+				&:first-child {
+					font-weight: bold;
+					margin-bottom: 4px;
+
+					> i {
+						margin-right: 4px;
+					}
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue
index 4c3391ce43..67da86746e 100644
--- a/packages/client/src/pages/admin/overview.vue
+++ b/packages/client/src/pages/admin/overview.vue
@@ -50,6 +50,11 @@
 				<template #header>Inbox queue</template>
 				<XQueue domain="inbox" />
 			</MkFolder>
+
+			<MkFolder class="item">
+				<template #header>Server metrics</template>
+				<XMetrics domain="inbox" />
+			</MkFolder>
 		</div>
 	</MkSpacer>
 </template>
@@ -71,6 +76,7 @@ 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 XMetrics from "./overview.metrics.vue";
 import MkTagCloud from "@/components/MkTagCloud.vue";
 import { version, url } from "@/config";
 import * as os from "@/os";

From e80dc758a25b16ee3dbec37e0c6a3b4d38123b71 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 15:10:33 -0700
Subject: [PATCH 145/319] dev35

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

diff --git a/package.json b/package.json
index 06433d6eb9..311e522e73 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev34",
+	"version": "14.0.0-dev35",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 28cdfc0b6f9b0a3b998e9054a51bf6913a828dce Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 15:21:29 -0700
Subject: [PATCH 146/319] fix query

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

diff --git a/packages/client/src/pages/admin/overview.metrics.vue b/packages/client/src/pages/admin/overview.metrics.vue
index afd6552a6a..cfd497439a 100644
--- a/packages/client/src/pages/admin/overview.metrics.vue
+++ b/packages/client/src/pages/admin/overview.metrics.vue
@@ -62,7 +62,7 @@ import * as os from "@/os";
 import { i18n } from "@/i18n";
 
 const meta = await os.api("server-info", {});
-const serverStats = await os.api("stats", {});
+const serverStats = await os.api("stats");
 
 let cpuUsage: number = $ref(0);
 

From 380f81dfba6333a00bc2231807c4f0fa33552cf1 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 29 May 2023 18:29:42 -0400
Subject: [PATCH 147/319] fix close button pos in compose box

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

diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index e0d2a8f4c0..697e1c86fd 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -1030,6 +1030,8 @@ onMounted(() => {
 	}
 
 	> header {
+		display: flex;
+		flex-wrap: wrap;
 		z-index: 1000;
 		height: 66px;
 

From a5f38224563d253160c2a5339514c6ab5c577d43 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 15:40:02 -0700
Subject: [PATCH 148/319] margin

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

diff --git a/packages/client/src/components/MkUrlPreview.vue b/packages/client/src/components/MkUrlPreview.vue
index 8421fab5af..3706f78858 100644
--- a/packages/client/src/components/MkUrlPreview.vue
+++ b/packages/client/src/components/MkUrlPreview.vue
@@ -227,7 +227,7 @@ onUnmounted(() => {
 
 .mk-url-preview {
 	> .expand-tweet {
-		margin-top: 1rem;
+		margin-top: 0.5rem;
 	}
 
 	&.max-width_400px {

From c58692fa5861afba772b77ff243fda67af4bb6ce Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 16:13:36 -0700
Subject: [PATCH 149/319] refactor: add back old info display from mkv12

---
 .../src/pages/admin/overview.metrics.vue      | 161 +++++++++++-------
 1 file changed, 101 insertions(+), 60 deletions(-)

diff --git a/packages/client/src/pages/admin/overview.metrics.vue b/packages/client/src/pages/admin/overview.metrics.vue
index cfd497439a..fbef55c3d5 100644
--- a/packages/client/src/pages/admin/overview.metrics.vue
+++ b/packages/client/src/pages/admin/overview.metrics.vue
@@ -1,52 +1,72 @@
 <template>
-	<div class="_panel" :class="$style.root">
-		<div class="ntjkdlsfk">
-			<div class="_panel">
-				<XPie class="pie" :value="cpuUsage" />
-				<div>
-					<p><i class="ph-cpu ph-bold ph-lg"></i>CPU</p>
-					<p>{{ meta.cpu.cores }} Logical cores</p>
-					<p>{{ meta.cpu.model }}</p>
+	<div class="_panel ntjkdlsfk" :class="$style.root">
+		<div class="container env">
+			<div class="body">
+				<div class="number _panel">
+					<div class="label">Calckey</div>
+					<div class="value _monospace">{{ version }}</div>
 				</div>
-			</div>
-
-			<div class="_panel">
-				<XPie class="pie" :value="memUsage" />
-				<div>
-					<p><i class="ph-microchip ph-bold ph-lg"></i>RAM</p>
-					<p>Total: {{ bytes(memTotal, 1) }}</p>
-					<p>Used: {{ bytes(memUsed, 1) }}</p>
-					<p>Free: {{ bytes(memFree, 1) }}</p>
+				<div v-if="serverInfo" class="number _panel">
+					<div class="label">Node.js</div>
+					<div class="value _monospace">{{ serverInfo.node }}</div>
 				</div>
-			</div>
-
-			<div class="_panel">
-				<XPie class="pie" :value="diskUsage" />
-				<div>
-					<p><i class="ph-hard-drives ph-bold ph-lg"></i>Disk</p>
-					<p>Total: {{ bytes(diskTotal, 1) }}</p>
-					<p>Free: {{ bytes(diskAvailable, 1) }}</p>
-					<p>Used: {{ bytes(diskUsed, 1) }}</p>
+				<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 class="_panel">
+					<XPie class="pie" :value="cpuUsage" />
+					<div>
+						<p><i class="ph-cpu ph-bold ph-lg"></i>CPU</p>
+						<p>{{ meta.cpu.cores }} Logical cores</p>
+						<p>{{ meta.cpu.model }}</p>
+					</div>
 				</div>
-			</div>
 
-			<div class="_panel">
-				<XPie class="pie" :value="meiliProgress" />
-				<div>
-					<p>
-						<i class="ph-file-search ph-bold ph-lg"></i>MeiliSearch
-					</p>
-					<p>
-						{{ i18n.ts._widgets.meiliStatus }}: {{ meiliAvailable }}
-					</p>
-					<p>
-						{{ i18n.ts._widgets.meiliSize }}:
-						{{ bytes(meiliTotalSize, 1) }}
-					</p>
-					<p>
-						{{ i18n.ts._widgets.meiliIndexCount }}:
-						{{ meiliIndexCount }}
-					</p>
+				<div class="_panel">
+					<XPie class="pie" :value="memUsage" />
+					<div>
+						<p><i class="ph-microchip ph-bold ph-lg"></i>RAM</p>
+						<p>Total: {{ bytes(memTotal, 1) }}</p>
+						<p>Used: {{ bytes(memUsed, 1) }}</p>
+						<p>Free: {{ bytes(memFree, 1) }}</p>
+					</div>
+				</div>
+
+				<div class="_panel">
+					<XPie class="pie" :value="diskUsage" />
+					<div>
+						<p><i class="ph-hard-drives ph-bold ph-lg"></i>Disk</p>
+						<p>Total: {{ bytes(diskTotal, 1) }}</p>
+						<p>Free: {{ bytes(diskAvailable, 1) }}</p>
+						<p>Used: {{ bytes(diskUsed, 1) }}</p>
+					</div>
+				</div>
+
+				<div class="_panel">
+					<XPie class="pie" :value="meiliProgress" />
+					<div>
+						<p>
+							<i class="ph-file-search ph-bold ph-lg"></i
+							>MeiliSearch
+						</p>
+						<p>
+							{{ i18n.ts._widgets.meiliStatus }}:
+							{{ meiliAvailable }}
+						</p>
+						<p>
+							{{ i18n.ts._widgets.meiliSize }}:
+							{{ bytes(meiliTotalSize, 1) }}
+						</p>
+						<p>
+							{{ i18n.ts._widgets.meiliIndexCount }}:
+							{{ meiliIndexCount }}
+						</p>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -60,9 +80,11 @@ import bytes from "@/filters/bytes";
 import { stream } from "@/stream";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
+import { version } from "@/config";
 
 const meta = await os.api("server-info", {});
 const serverStats = await os.api("stats");
+const serverInfo = await os.api("admin/server-info");
 
 let cpuUsage: number = $ref(0);
 
@@ -116,26 +138,45 @@ onUnmounted(() => {
 	display: flex;
 	padding: 16px;
 
-	> ._panel {
-		> .pie {
-			height: 82px;
-			flex-shrink: 0;
-			margin-right: 16px;
-		}
+	&.env {
+		> .body {
+			display: grid;
+			grid-gap: 16px;
+			grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
 
-		> div {
-			flex: 1;
+			> .number {
+				padding: 14px 20px;
 
-			> p {
-				margin: 0;
-				font-size: 0.8em;
+				> .label {
+					opacity: 0.7;
+					font-size: 0.8em;
+				}
 
-				&:first-child {
-					font-weight: bold;
-					margin-bottom: 4px;
+				> .value {
+					font-size: 1.1em;
+				}
+			}
 
-					> i {
-						margin-right: 4px;
+			> .pie {
+				height: 82px;
+				flex-shrink: 0;
+				margin-right: 16px;
+			}
+
+			> div {
+				flex: 1;
+
+				> p {
+					margin: 0;
+					font-size: 0.8em;
+
+					&:first-child {
+						font-weight: bold;
+						margin-bottom: 4px;
+
+						> i {
+							margin-right: 4px;
+						}
 					}
 				}
 			}

From da8ed09932dfd33b1cee933080156ec182dedb23 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 19:30:20 -0700
Subject: [PATCH 150/319] chore: up bull-board deps

---
 package.json                  |   4 +-
 packages/backend/package.json |   6 +-
 pnpm-lock.yaml                | 200 +++++-----------------------------
 3 files changed, 35 insertions(+), 175 deletions(-)

diff --git a/package.json b/package.json
index 311e522e73..5c57c79cf2 100644
--- a/package.json
+++ b/package.json
@@ -36,8 +36,8 @@
 		"chokidar": "^3.3.1"
 	},
 	"dependencies": {
-		"@bull-board/api": "^4.10.2",
-		"@bull-board/ui": "^4.10.2",
+		"@bull-board/api": "5.2.0",
+		"@bull-board/ui": "5.2.0",
 		"@napi-rs/cli": "^2.15.0",
 		"@tensorflow/tfjs": "^3.21.0",
 		"focus-trap": "^7.2.0",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index bffa42c495..3d483e0034 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -23,9 +23,9 @@
 		"@tensorflow/tfjs-node": "3.21.1"
 	},
 	"dependencies": {
-		"@bull-board/api": "^4.6.4",
-		"@bull-board/koa": "^4.6.4",
-		"@bull-board/ui": "^4.6.4",
+		"@bull-board/api": "5.2.0",
+		"@bull-board/koa": "5.2.0",
+		"@bull-board/ui": "5.2.0",
 		"@calckey/megalodon": "5.2.0",
 		"@discordapp/twemoji": "14.0.2",
 		"@elastic/elasticsearch": "7.17.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4c9b786737..d69f3142a9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,11 +12,11 @@ importers:
   .:
     dependencies:
       '@bull-board/api':
-        specifier: ^4.10.2
-        version: 4.10.2
+        specifier: 5.2.0
+        version: 5.2.0(@bull-board/ui@5.2.0)
       '@bull-board/ui':
-        specifier: ^4.10.2
-        version: 4.10.2
+        specifier: 5.2.0
+        version: 5.2.0
       '@napi-rs/cli':
         specifier: ^2.15.0
         version: 2.15.0
@@ -28,7 +28,7 @@ importers:
         version: 7.2.0
       focus-trap-vue:
         specifier: ^4.0.1
-        version: 4.0.1(focus-trap@7.2.0)(vue@3.3.4)
+        version: 4.0.1(focus-trap@7.2.0)(vue@3.2.45)
       js-yaml:
         specifier: 4.1.0
         version: 4.1.0
@@ -82,14 +82,14 @@ importers:
   packages/backend:
     dependencies:
       '@bull-board/api':
-        specifier: ^4.6.4
-        version: 4.10.2
+        specifier: 5.2.0
+        version: 5.2.0(@bull-board/ui@5.2.0)
       '@bull-board/koa':
-        specifier: ^4.6.4
-        version: 4.10.2(@types/koa@2.13.5)(pug@3.0.2)
+        specifier: 5.2.0
+        version: 5.2.0(@types/koa@2.13.5)(pug@3.0.2)
       '@bull-board/ui':
-        specifier: ^4.6.4
-        version: 4.10.2
+        specifier: 5.2.0
+        version: 5.2.0
       '@calckey/megalodon':
         specifier: 5.2.0
         version: 5.2.0
@@ -1087,11 +1087,6 @@ packages:
     resolution: {integrity: sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helper-string-parser@7.21.5:
-    resolution: {integrity: sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==}
-    engines: {node: '>=6.9.0'}
-    dev: false
-
   /@babel/helper-validator-identifier@7.19.1:
     resolution: {integrity: sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==}
     engines: {node: '>=6.9.0'}
@@ -1135,14 +1130,6 @@ packages:
       '@babel/types': 7.21.4
     dev: true
 
-  /@babel/parser@7.22.3:
-    resolution: {integrity: sha512-vrukxyW/ep8UD1UDzOYpTKQ6abgjFoeG6L+4ar9+c5TN9QnlqiOi6QK7LSR5ewm/ERyGkT/Ai6VboNrxhbr9Uw==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-    dependencies:
-      '@babel/types': 7.22.3
-    dev: false
-
   /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.21.4):
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
@@ -1329,30 +1316,24 @@ packages:
       to-fast-properties: 2.0.0
     dev: true
 
-  /@babel/types@7.22.3:
-    resolution: {integrity: sha512-P3na3xIQHTKY4L0YOG7pM8M8uoUIB910WQaSiiMCZUC2Cy8XFEQONGABFnHWBa2gpGKODTAJcNhi5Zk0sLRrzg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-string-parser': 7.21.5
-      '@babel/helper-validator-identifier': 7.19.1
-      to-fast-properties: 2.0.0
-    dev: false
-
   /@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==}
+  /@bull-board/api@5.2.0(@bull-board/ui@5.2.0):
+    resolution: {integrity: sha512-1HGF2EF/4zI3+Cj414nQzwFprLXOJTlVdqXUf5UEBS4HtYafWv93mGIwkrD8S4Bpz4VSvM87adF6tQPJ7Ewt+w==}
+    peerDependencies:
+      '@bull-board/ui': 5.2.0
     dependencies:
+      '@bull-board/ui': 5.2.0
       redis-info: 3.1.0
     dev: false
 
-  /@bull-board/koa@4.10.2(@types/koa@2.13.5)(pug@3.0.2):
-    resolution: {integrity: sha512-gabPtsMOt2SQHkS5VcY1q/FCpbBRFiFrbWbcouZ7zWKg413J8nG+yErz3pc0rbmp23kbKX6wTG/diWKhE7EWbA==}
+  /@bull-board/koa@5.2.0(@types/koa@2.13.5)(pug@3.0.2):
+    resolution: {integrity: sha512-jntDAl/POouD0PS/iiKXBNl26SuUf7Y5uL3EgpDN7isvwFcpKhvdk0VdBypjrkRHN6rPaEJJPkEtK30qv01XYw==}
     dependencies:
-      '@bull-board/api': 4.10.2
-      '@bull-board/ui': 4.10.2
+      '@bull-board/api': 5.2.0(@bull-board/ui@5.2.0)
+      '@bull-board/ui': 5.2.0
       ejs: 3.1.8
       koa: 2.13.4
       koa-mount: 4.0.0
@@ -1416,10 +1397,10 @@ packages:
       - whiskers
     dev: false
 
-  /@bull-board/ui@4.10.2:
-    resolution: {integrity: sha512-vaHGojG5D3xjnaed3nwOaLy4Y06RgDJdYRaFR5E06SjZ0vOvjVYGD6s4cykK512Aw/ElFhKDPwzhf8BvpwAtDQ==}
+  /@bull-board/ui@5.2.0:
+    resolution: {integrity: sha512-f2sgs7AjOVch7tFhbmlVCkhZjJWboxwNxWEfAsIUd1WidUC+Ef5J02tpQvu7apzRtu5zcn8IiJtI5HFO6oKaCA==}
     dependencies:
-      '@bull-board/api': 4.10.2
+      '@bull-board/api': 5.2.0(@bull-board/ui@5.2.0)
     dev: false
 
   /@calckey/megalodon@5.2.0:
@@ -2120,10 +2101,6 @@ packages:
   /@jridgewell/sourcemap-codec@1.4.14:
     resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
 
-  /@jridgewell/sourcemap-codec@1.4.15:
-    resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
-    dev: false
-
   /@jridgewell/trace-mapping@0.3.17:
     resolution: {integrity: sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==}
     dependencies:
@@ -3852,30 +3829,12 @@ packages:
       '@vue/shared': 3.2.45
       estree-walker: 2.0.2
       source-map: 0.6.1
-    dev: true
-
-  /@vue/compiler-core@3.3.4:
-    resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==}
-    dependencies:
-      '@babel/parser': 7.22.3
-      '@vue/shared': 3.3.4
-      estree-walker: 2.0.2
-      source-map-js: 1.0.2
-    dev: false
 
   /@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-dom@3.3.4:
-    resolution: {integrity: sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==}
-    dependencies:
-      '@vue/compiler-core': 3.3.4
-      '@vue/shared': 3.3.4
-    dev: false
 
   /@vue/compiler-sfc@2.7.14:
     resolution: {integrity: sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==}
@@ -3898,36 +3857,12 @@ packages:
       magic-string: 0.25.9
       postcss: 8.4.21
       source-map: 0.6.1
-    dev: true
-
-  /@vue/compiler-sfc@3.3.4:
-    resolution: {integrity: sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==}
-    dependencies:
-      '@babel/parser': 7.22.3
-      '@vue/compiler-core': 3.3.4
-      '@vue/compiler-dom': 3.3.4
-      '@vue/compiler-ssr': 3.3.4
-      '@vue/reactivity-transform': 3.3.4
-      '@vue/shared': 3.3.4
-      estree-walker: 2.0.2
-      magic-string: 0.30.0
-      postcss: 8.4.24
-      source-map-js: 1.0.2
-    dev: false
 
   /@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/compiler-ssr@3.3.4:
-    resolution: {integrity: sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==}
-    dependencies:
-      '@vue/compiler-dom': 3.3.4
-      '@vue/shared': 3.3.4
-    dev: false
 
   /@vue/reactivity-transform@3.2.45:
     resolution: {integrity: sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==}
@@ -3937,43 +3872,17 @@ packages:
       '@vue/shared': 3.2.45
       estree-walker: 2.0.2
       magic-string: 0.25.9
-    dev: true
-
-  /@vue/reactivity-transform@3.3.4:
-    resolution: {integrity: sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==}
-    dependencies:
-      '@babel/parser': 7.22.3
-      '@vue/compiler-core': 3.3.4
-      '@vue/shared': 3.3.4
-      estree-walker: 2.0.2
-      magic-string: 0.30.0
-    dev: false
 
   /@vue/reactivity@3.2.45:
     resolution: {integrity: sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==}
     dependencies:
       '@vue/shared': 3.2.45
-    dev: true
-
-  /@vue/reactivity@3.3.4:
-    resolution: {integrity: sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==}
-    dependencies:
-      '@vue/shared': 3.3.4
-    dev: false
 
   /@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-core@3.3.4:
-    resolution: {integrity: sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==}
-    dependencies:
-      '@vue/reactivity': 3.3.4
-      '@vue/shared': 3.3.4
-    dev: false
 
   /@vue/runtime-dom@3.2.45:
     resolution: {integrity: sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==}
@@ -3981,15 +3890,6 @@ packages:
       '@vue/runtime-core': 3.2.45
       '@vue/shared': 3.2.45
       csstype: 2.6.21
-    dev: true
-
-  /@vue/runtime-dom@3.3.4:
-    resolution: {integrity: sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==}
-    dependencies:
-      '@vue/runtime-core': 3.3.4
-      '@vue/shared': 3.3.4
-      csstype: 3.1.2
-    dev: false
 
   /@vue/server-renderer@3.2.45(vue@3.2.45):
     resolution: {integrity: sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==}
@@ -3999,25 +3899,9 @@ packages:
       '@vue/compiler-ssr': 3.2.45
       '@vue/shared': 3.2.45
       vue: 3.2.45
-    dev: true
-
-  /@vue/server-renderer@3.3.4(vue@3.3.4):
-    resolution: {integrity: sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==}
-    peerDependencies:
-      vue: 3.3.4
-    dependencies:
-      '@vue/compiler-ssr': 3.3.4
-      '@vue/shared': 3.3.4
-      vue: 3.3.4
-    dev: false
 
   /@vue/shared@3.2.45:
     resolution: {integrity: sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==}
-    dev: true
-
-  /@vue/shared@3.3.4:
-    resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==}
-    dev: false
 
   /@webassemblyjs/ast@1.11.1:
     resolution: {integrity: sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==}
@@ -6187,16 +6071,11 @@ packages:
 
   /csstype@2.6.21:
     resolution: {integrity: sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==}
-    dev: true
 
   /csstype@3.1.1:
     resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
     dev: true
 
-  /csstype@3.1.2:
-    resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
-    dev: false
-
   /custom-event-polyfill@1.0.7:
     resolution: {integrity: sha512-TDDkd5DkaZxZFM8p+1I3yAlvM3rSr1wbrOliG4yJiwinMZN8z/iGL7BTlDkrJcYTmgUSb4ywVCc3ZaUtOtC76w==}
     dev: true
@@ -7549,14 +7428,14 @@ packages:
       readable-stream: 2.3.7
     dev: true
 
-  /focus-trap-vue@4.0.1(focus-trap@7.2.0)(vue@3.3.4):
+  /focus-trap-vue@4.0.1(focus-trap@7.2.0)(vue@3.2.45):
     resolution: {integrity: sha512-2iqOeoSvgq7Um6aL+255a/wXPskj6waLq2oKCa4gOnMORPo15JX7wN6J5bl1SMhMlTlkHXGSrQ9uJPJLPZDl5w==}
     peerDependencies:
       focus-trap: ^7.0.0
       vue: ^3.0.0
     dependencies:
       focus-trap: 7.2.0
-      vue: 3.3.4
+      vue: 3.2.45
     dev: false
 
   /focus-trap@7.2.0:
@@ -7716,7 +7595,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
 
@@ -9795,7 +9674,7 @@ 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==}
@@ -9809,7 +9688,7 @@ packages:
     dependencies:
       universalify: 2.0.0
     optionalDependencies:
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
     dev: true
 
   /jsonld@6.0.0:
@@ -10435,14 +10314,6 @@ packages:
     resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==}
     dependencies:
       sourcemap-codec: 1.4.8
-    dev: true
-
-  /magic-string@0.30.0:
-    resolution: {integrity: sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==}
-    engines: {node: '>=12'}
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.4.15
-    dev: false
 
   /mailcheck@1.1.1:
     resolution: {integrity: sha512-3WjL8+ZDouZwKlyJBMp/4LeziLFXgleOdsYu87piGcMLqhBzCsy2QFdbtAwv757TFC/rtqd738fgJw1tFQCSgA==}
@@ -12056,6 +11927,7 @@ packages:
       nanoid: 3.3.6
       picocolors: 1.0.0
       source-map-js: 1.0.2
+    dev: true
 
   /postgres-array@2.0.0:
     resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
@@ -13381,7 +13253,6 @@ packages:
   /sourcemap-codec@1.4.8:
     resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
     deprecated: Please use @jridgewell/sourcemap-codec instead
-    dev: true
 
   /sparkles@1.0.1:
     resolution: {integrity: sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==}
@@ -14760,7 +14631,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
@@ -14872,17 +14743,6 @@ packages:
       '@vue/runtime-dom': 3.2.45
       '@vue/server-renderer': 3.2.45(vue@3.2.45)
       '@vue/shared': 3.2.45
-    dev: true
-
-  /vue@3.3.4:
-    resolution: {integrity: sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==}
-    dependencies:
-      '@vue/compiler-dom': 3.3.4
-      '@vue/compiler-sfc': 3.3.4
-      '@vue/runtime-dom': 3.3.4
-      '@vue/server-renderer': 3.3.4(vue@3.3.4)
-      '@vue/shared': 3.3.4
-    dev: false
 
   /vuedraggable@4.1.0(vue@3.2.45):
     resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==}

From 2c42707551735980034c8db8b9081d1869510be0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 19:32:33 -0700
Subject: [PATCH 151/319] up redis deps

---
 packages/backend/package.json |  4 ++--
 pnpm-lock.yaml                | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 3d483e0034..d9d0b4ab4d 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -68,7 +68,7 @@
 		"fluent-ffmpeg": "2.1.2",
 		"got": "12.5.3",
 		"hpagent": "0.1.2",
-		"ioredis": "5.2.4",
+		"ioredis": "5.3.2",
 		"ip-cidr": "3.0.11",
 		"is-svg": "4.3.2",
 		"js-yaml": "4.1.0",
@@ -171,7 +171,7 @@
 		"@types/qs": "6.9.7",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "3.4.4",
-		"@types/redis": "4.0.11",
+		"@types/redis": "4.6.6",
 		"@types/rename": "1.0.4",
 		"@types/sanitize-html": "2.8.0",
 		"@types/semver": "7.3.13",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d69f3142a9..fa4763f260 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -217,8 +217,8 @@ importers:
         specifier: 0.1.2
         version: 0.1.2
       ioredis:
-        specifier: 5.2.4
-        version: 5.2.4
+        specifier: 5.3.2
+        version: 5.3.2
       ip-cidr:
         specifier: 3.0.11
         version: 3.0.11
@@ -398,7 +398,7 @@ importers:
         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)
+        version: 0.3.11(ioredis@5.3.2)(pg@8.8.0)(ts-node@10.9.1)
       ulid:
         specifier: 2.3.0
         version: 2.3.0
@@ -3217,7 +3217,7 @@ packages:
     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:
-      ioredis: 5.2.4
+      ioredis: 5.3.2
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -4990,7 +4990,7 @@ packages:
       cron-parser: 4.7.1
       debuglog: 1.0.1
       get-port: 5.1.1
-      ioredis: 5.2.4
+      ioredis: 5.3.2
       lodash: 4.17.21
       msgpackr: 1.8.1
       p-timeout: 3.2.0
@@ -8500,8 +8500,8 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /ioredis@5.2.4:
-    resolution: {integrity: sha512-qIpuAEt32lZJQ0XyrloCRdlEdUUNGG9i0UOk6zgzK6igyudNWqEBxfH6OlbnOOoBBvr1WB02mm8fR55CnikRng==}
+  /ioredis@5.3.2:
+    resolution: {integrity: sha512-1DKMMzlIHM02eBBVOFQ1+AolGjs6+xEcM4PDL7NqOS6szq7H9jSaEkIUH6/a5Hl241LzW6JLSiAbNvTQjUupUA==}
     engines: {node: '>=12.22.0'}
     dependencies:
       '@ioredis/commands': 1.2.0
@@ -14246,7 +14246,7 @@ packages:
   /typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
-  /typeorm@0.3.11(ioredis@5.2.4)(pg@8.8.0)(ts-node@10.9.1):
+  /typeorm@0.3.11(ioredis@5.3.2)(pg@8.8.0)(ts-node@10.9.1):
     resolution: {integrity: sha512-pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg==}
     engines: {node: '>= 12.9.0'}
     hasBin: true
@@ -14313,7 +14313,7 @@ packages:
       debug: 4.3.4(supports-color@8.1.1)
       dotenv: 16.0.3
       glob: 7.2.3
-      ioredis: 5.2.4
+      ioredis: 5.3.2
       js-yaml: 4.1.0
       mkdirp: 1.0.4
       pg: 8.8.0

From 15d311c513923f59f583f02d42325458f5878d91 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 19:34:32 -0700
Subject: [PATCH 152/319] fix

---
 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 d9d0b4ab4d..82a3f6cc8b 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -171,7 +171,7 @@
 		"@types/qs": "6.9.7",
 		"@types/random-seed": "0.3.3",
 		"@types/ratelimiter": "3.4.4",
-		"@types/redis": "4.6.6",
+		"@types/redis": "4.0.11",
 		"@types/rename": "1.0.4",
 		"@types/sanitize-html": "2.8.0",
 		"@types/semver": "7.3.13",

From 102d2bd6a8cd7c938ab87793646fd1e6f74c3653 Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Mon, 29 May 2023 22:40:53 -0400
Subject: [PATCH 153/319] swiper tweak

---
 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 62897209f3..2fa2c861e6 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -114,7 +114,7 @@ html, body {
 }
 
 .swiper-slide {
-	height: unset !important;
+	min-height: 100vh;
 }
 
 a {

From ce5d93c9df57a2da8c2e54d6b8a62fea5612b3a6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 19:45:42 -0700
Subject: [PATCH 154/319] Revert "refactor: add back old info display from
 mkv12"

This reverts commit c58692fa5861afba772b77ff243fda67af4bb6ce.
---
 .../src/pages/admin/overview.metrics.vue      | 157 +++++++-----------
 1 file changed, 58 insertions(+), 99 deletions(-)

diff --git a/packages/client/src/pages/admin/overview.metrics.vue b/packages/client/src/pages/admin/overview.metrics.vue
index fbef55c3d5..cfd497439a 100644
--- a/packages/client/src/pages/admin/overview.metrics.vue
+++ b/packages/client/src/pages/admin/overview.metrics.vue
@@ -1,72 +1,52 @@
 <template>
-	<div class="_panel ntjkdlsfk" :class="$style.root">
-		<div class="container env">
-			<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 class="_panel">
-					<XPie class="pie" :value="cpuUsage" />
-					<div>
-						<p><i class="ph-cpu ph-bold ph-lg"></i>CPU</p>
-						<p>{{ meta.cpu.cores }} Logical cores</p>
-						<p>{{ meta.cpu.model }}</p>
-					</div>
+	<div class="_panel" :class="$style.root">
+		<div class="ntjkdlsfk">
+			<div class="_panel">
+				<XPie class="pie" :value="cpuUsage" />
+				<div>
+					<p><i class="ph-cpu ph-bold ph-lg"></i>CPU</p>
+					<p>{{ meta.cpu.cores }} Logical cores</p>
+					<p>{{ meta.cpu.model }}</p>
 				</div>
+			</div>
 
-				<div class="_panel">
-					<XPie class="pie" :value="memUsage" />
-					<div>
-						<p><i class="ph-microchip ph-bold ph-lg"></i>RAM</p>
-						<p>Total: {{ bytes(memTotal, 1) }}</p>
-						<p>Used: {{ bytes(memUsed, 1) }}</p>
-						<p>Free: {{ bytes(memFree, 1) }}</p>
-					</div>
+			<div class="_panel">
+				<XPie class="pie" :value="memUsage" />
+				<div>
+					<p><i class="ph-microchip ph-bold ph-lg"></i>RAM</p>
+					<p>Total: {{ bytes(memTotal, 1) }}</p>
+					<p>Used: {{ bytes(memUsed, 1) }}</p>
+					<p>Free: {{ bytes(memFree, 1) }}</p>
 				</div>
+			</div>
 
-				<div class="_panel">
-					<XPie class="pie" :value="diskUsage" />
-					<div>
-						<p><i class="ph-hard-drives ph-bold ph-lg"></i>Disk</p>
-						<p>Total: {{ bytes(diskTotal, 1) }}</p>
-						<p>Free: {{ bytes(diskAvailable, 1) }}</p>
-						<p>Used: {{ bytes(diskUsed, 1) }}</p>
-					</div>
+			<div class="_panel">
+				<XPie class="pie" :value="diskUsage" />
+				<div>
+					<p><i class="ph-hard-drives ph-bold ph-lg"></i>Disk</p>
+					<p>Total: {{ bytes(diskTotal, 1) }}</p>
+					<p>Free: {{ bytes(diskAvailable, 1) }}</p>
+					<p>Used: {{ bytes(diskUsed, 1) }}</p>
 				</div>
+			</div>
 
-				<div class="_panel">
-					<XPie class="pie" :value="meiliProgress" />
-					<div>
-						<p>
-							<i class="ph-file-search ph-bold ph-lg"></i
-							>MeiliSearch
-						</p>
-						<p>
-							{{ i18n.ts._widgets.meiliStatus }}:
-							{{ meiliAvailable }}
-						</p>
-						<p>
-							{{ i18n.ts._widgets.meiliSize }}:
-							{{ bytes(meiliTotalSize, 1) }}
-						</p>
-						<p>
-							{{ i18n.ts._widgets.meiliIndexCount }}:
-							{{ meiliIndexCount }}
-						</p>
-					</div>
+			<div class="_panel">
+				<XPie class="pie" :value="meiliProgress" />
+				<div>
+					<p>
+						<i class="ph-file-search ph-bold ph-lg"></i>MeiliSearch
+					</p>
+					<p>
+						{{ i18n.ts._widgets.meiliStatus }}: {{ meiliAvailable }}
+					</p>
+					<p>
+						{{ i18n.ts._widgets.meiliSize }}:
+						{{ bytes(meiliTotalSize, 1) }}
+					</p>
+					<p>
+						{{ i18n.ts._widgets.meiliIndexCount }}:
+						{{ meiliIndexCount }}
+					</p>
 				</div>
 			</div>
 		</div>
@@ -80,11 +60,9 @@ import bytes from "@/filters/bytes";
 import { stream } from "@/stream";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
-import { version } from "@/config";
 
 const meta = await os.api("server-info", {});
 const serverStats = await os.api("stats");
-const serverInfo = await os.api("admin/server-info");
 
 let cpuUsage: number = $ref(0);
 
@@ -138,45 +116,26 @@ onUnmounted(() => {
 	display: flex;
 	padding: 16px;
 
-	&.env {
-		> .body {
-			display: grid;
-			grid-gap: 16px;
-			grid-template-columns: repeat(auto-fill, minmax(180px, 1fr));
+	> ._panel {
+		> .pie {
+			height: 82px;
+			flex-shrink: 0;
+			margin-right: 16px;
+		}
 
-			> .number {
-				padding: 14px 20px;
+		> div {
+			flex: 1;
 
-				> .label {
-					opacity: 0.7;
-					font-size: 0.8em;
-				}
+			> p {
+				margin: 0;
+				font-size: 0.8em;
 
-				> .value {
-					font-size: 1.1em;
-				}
-			}
+				&:first-child {
+					font-weight: bold;
+					margin-bottom: 4px;
 
-			> .pie {
-				height: 82px;
-				flex-shrink: 0;
-				margin-right: 16px;
-			}
-
-			> div {
-				flex: 1;
-
-				> p {
-					margin: 0;
-					font-size: 0.8em;
-
-					&:first-child {
-						font-weight: bold;
-						margin-bottom: 4px;
-
-						> i {
-							margin-right: 4px;
-						}
+					> i {
+						margin-right: 4px;
 					}
 				}
 			}

From d339fa3a1a034f9dcbb268d311efdc8e054a65ce Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 29 May 2023 19:49:53 -0700
Subject: [PATCH 155/319] node v20

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

diff --git a/README.md b/README.md
index 5b3eb98fd4..e976807f90 100644
--- a/README.md
+++ b/README.md
@@ -76,7 +76,7 @@ If you have access to a server that supports one of the sources below, I recomme
 
 ## 🧑‍💻 Dependencies
 
-- 🐢 At least [NodeJS](https://nodejs.org/en/) v18.12.1 (v19 recommended)
+- 🐢 At least [NodeJS](https://nodejs.org/en/) v18.12.1 (v20 recommended)
   - Install with [nvm](https://github.com/nvm-sh/nvm)
 - 🐘 At least [PostgreSQL](https://www.postgresql.org/) v12
 - 🍱 At least [Redis](https://redis.io/) v6 (v7 recommend)

From 3bc9577cf34166c1f136811aa668dbba63606c6b Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Tue, 30 May 2023 03:09:35 +0000
Subject: [PATCH 156/319] Delete '.node-version'

---
 .node-version | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .node-version

diff --git a/.node-version b/.node-version
deleted file mode 100644
index 7fd023741b..0000000000
--- a/.node-version
+++ /dev/null
@@ -1 +0,0 @@
-v16.15.0

From 0aef4977b261ce45e07d45a233ffd44deb04a18b Mon Sep 17 00:00:00 2001
From: Freeplay <Freeplay@duck.com>
Date: Tue, 30 May 2023 10:15:18 -0400
Subject: [PATCH 157/319] fix border w/ wallpaper

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

diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 30ea4ccf1e..68e4619ebb 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -252,6 +252,9 @@ function more(ev: MouseEvent) {
 		#calckey_app > :not(.wallpaper) & {
 			background: var(--navBg);
 		}
+		#calckey_app > .wallpaper:not(.centered) & {
+			border-right: 1px solid var(--divider);
+		}
 		contain: strict;
 		display: flex;
 		flex-direction: column;

From b10337c858e1e313c2703f2b4e3c04abf346c495 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Tue, 30 May 2023 23:11:10 +0200
Subject: [PATCH 158/319] Add english and japanese stop words to Meili database

---
 packages/backend/src/db/meilisearch.ts | 60 ++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 01efaa0ba0..8b8c36ddf3 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -61,6 +61,66 @@ if (hasConfig) {
 			),
 		);
 
+	posts
+		.updateStopWords([
+			"the",
+			"a",
+			"as",
+			"be",
+			"of",
+			"they",
+			"these",
+			"これ",
+			"それ",
+			"あれ",
+			"この",
+			"その",
+			"あの",
+			"ここ",
+			"そこ",
+			"あそこ",
+			"こちら",
+			"どこ",
+			"だれ",
+			"なに",
+			"なん",
+			"何",
+			"私",
+			"貴方",
+			"貴方方",
+			"我々",
+			"私達",
+			"あの人",
+			"あのか",
+			"彼女",
+			"彼",
+			"です",
+			"ありま",
+			"おりま",
+			"います",
+			"は",
+			"が",
+			"の",
+			"に",
+			"を",
+			"で",
+			"え",
+			"から",
+			"まで",
+			"より",
+			"も",
+			"どの",
+			"と",
+			"し",
+			"それで",
+			"しかし",
+		])
+		.catch((e) =>
+			logger.error(
+				`Failed to set Meilisearch stop words, database size will be larger: ${e}`,
+			),
+		);
+
 	logger.info("Connected to MeiliSearch");
 }
 

From 85fc4bf5ad77ce5bd81bbcb11eb2146e0428d969 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Wed, 31 May 2023 02:34:44 +0000
Subject: [PATCH 159/319] revert 3bc9577cf34166c1f136811aa668dbba63606c6b

revert Delete '.node-version'
---
 .node-version | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .node-version

diff --git a/.node-version b/.node-version
new file mode 100644
index 0000000000..7fd023741b
--- /dev/null
+++ b/.node-version
@@ -0,0 +1 @@
+v16.15.0

From ea79bdb3539b0c0b3dea5b17278fc55a9a56ca08 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Wed, 31 May 2023 02:36:19 +0000
Subject: [PATCH 160/319] Update '.node-version'

---
 .node-version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.node-version b/.node-version
index 7fd023741b..8ddbc0c64a 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-v16.15.0
+v18.16.0

From 862384d32dc97f65c16ba2de0991fe97677f8877 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Wed, 31 May 2023 02:37:57 +0000
Subject: [PATCH 161/319] =?UTF-8?q?docs:=20=F0=9F=93=9D=20versions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/README.md b/README.md
index e976807f90..d6575445f8 100644
--- a/README.md
+++ b/README.md
@@ -76,9 +76,9 @@ If you have access to a server that supports one of the sources below, I recomme
 
 ## 🧑‍💻 Dependencies
 
-- 🐢 At least [NodeJS](https://nodejs.org/en/) v18.12.1 (v20 recommended)
+- 🐢 At least [NodeJS](https://nodejs.org/en/) v18.16.0 (v20 recommended)
   - Install with [nvm](https://github.com/nvm-sh/nvm)
-- 🐘 At least [PostgreSQL](https://www.postgresql.org/) v12
+- 🐘 At least [PostgreSQL](https://www.postgresql.org/) v12 (v14 recommende)
 - 🍱 At least [Redis](https://redis.io/) v6 (v7 recommend)
 - Web Proxy (one of the following)
   - 🍀 Nginx (recommended)

From e7a028e9ddbe679ceb9dc1a00c5b9cbf20e534ee Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Wed, 31 May 2023 02:40:23 +0000
Subject: [PATCH 162/319] =?UTF-8?q?docs:=20=F0=9F=93=9D=20typos?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/README.md b/README.md
index d6575445f8..5f59211e10 100644
--- a/README.md
+++ b/README.md
@@ -78,8 +78,8 @@ If you have access to a server that supports one of the sources below, I recomme
 
 - 🐢 At least [NodeJS](https://nodejs.org/en/) v18.16.0 (v20 recommended)
   - Install with [nvm](https://github.com/nvm-sh/nvm)
-- 🐘 At least [PostgreSQL](https://www.postgresql.org/) v12 (v14 recommende)
-- 🍱 At least [Redis](https://redis.io/) v6 (v7 recommend)
+- 🐘 At least [PostgreSQL](https://www.postgresql.org/) v12 (v14 recommended)
+- 🍱 At least [Redis](https://redis.io/) v6 (v7 recommended)
 - Web Proxy (one of the following)
   - 🍀 Nginx (recommended)
   - 🦦 Caddy

From 2619c141ab4290372da34f8861c68091c8111aa9 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Wed, 31 May 2023 02:41:29 +0000
Subject: [PATCH 163/319] =?UTF-8?q?docs:=20=F0=9F=93=9D=20full=20git=20clo?=
 =?UTF-8?q?ne?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/README.md b/README.md
index 5f59211e10..5dcdc4861d 100644
--- a/README.md
+++ b/README.md
@@ -104,7 +104,7 @@ If you have access to a server that supports one of the sources below, I recomme
 ## 👀 Get folder ready
 
 ```sh
-git clone --depth 1 https://codeberg.org/calckey/calckey.git
+git clone https://codeberg.org/calckey/calckey.git
 cd calckey/
 ```
 

From b1d0b291ffce134478f5c80611baec7f91f7c503 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Tue, 30 May 2023 23:10:12 -0400
Subject: [PATCH 164/319] get array for alsoKnownAs

---
 .../src/server/api/endpoints/i/known-as.ts    | 63 ++++++++++---------
 .../src/server/api/endpoints/users/show.ts    | 35 ++++++-----
 .../client/src/pages/settings/migration.vue   | 54 +++++++++-------
 3 files changed, 88 insertions(+), 64 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/i/known-as.ts b/packages/backend/src/server/api/endpoints/i/known-as.ts
index 5e86e8b955..d4d9061b30 100644
--- a/packages/backend/src/server/api/endpoints/i/known-as.ts
+++ b/packages/backend/src/server/api/endpoints/i/known-as.ts
@@ -1,4 +1,4 @@
-import type { User, UserDetailedNotMeOnly } from "@/models/entities/user.js";
+import type { User } from "@/models/entities/user.js";
 import { Users } from "@/models/index.js";
 import { resolveUser } from "@/remote/resolve-user.js";
 import acceptAllFollowRequests from "@/services/following/requests/accept-all.js";
@@ -6,10 +6,9 @@ import { publishToFollowers } from "@/services/i/update.js";
 import { publishMainStream } from "@/services/stream.js";
 import { DAY } from "@/const.js";
 import { apiLogger } from "../../logger.js";
-import { UserProfiles } from "@/models/index.js";
-import config from "@/config/index.js";
 import define from "../../define.js";
 import { ApiError } from "../../error.js";
+import { parse } from "@/misc/acct.js";
 
 export const meta = {
 	tags: ["users"],
@@ -38,49 +37,57 @@ export const meta = {
 			code: "URI_NULL",
 			id: "bf326f31-d430-4f97-9933-5d61e4d48a23",
 		},
+		alreadyMoved: {
+			message: 'You have already moved your account.',
+			code: 'ALREADY_MOVED',
+			id: '56f20ec9-fd06-4fa5-841b-edd6d7d4fa31',
+		},
+		yourself: {
+			message: 'You can\'t set yourself as your own alias.',
+			code: 'FORBIDDEN_TO_SET_YOURSELF',
+			id: '25c90186-4ab0-49c8-9bba-a1fa6c202ba4',
+		},
 	},
 } as const;
 
 export const paramDef = {
 	type: "object",
 	properties: {
-		alsoKnownAs: { type: "string" },
+		alsoKnownAs: {
+			type: 'array',
+			maxItems: 10,
+			uniqueItems: true,
+			items: { type: 'string' },
+		},
 	},
 	required: ["alsoKnownAs"],
 } as const;
 
 export default define(meta, paramDef, async (ps, user) => {
 	if (!ps.alsoKnownAs) throw new ApiError(meta.errors.noSuchUser);
+	if (user.movedToUri) throw new ApiError(meta.errors.alreadyMoved);
 
-	let unfiltered: string = ps.alsoKnownAs;
-	const updates = {} as Partial<User>;
+	const newAka = new Set<string>();
 
-	if (!unfiltered) {
-		updates.alsoKnownAs = null;
-	} else {
-		if (unfiltered.startsWith("acct:")) unfiltered = unfiltered.substring(5);
-		if (unfiltered.startsWith("@")) unfiltered = unfiltered.substring(1);
-		if (!unfiltered.includes("@")) throw new ApiError(meta.errors.notRemote);
+	for (const line of ps.alsoKnownAs) {
+		if (!line) throw new ApiError(meta.errors.noSuchUser);
+		const { username, host } = parse(line);
 
-		const userAddress: string[] = unfiltered.split("@");
-		const knownAs = await resolveUser(userAddress[0], userAddress[1]).catch(
-			(e) => {
-				apiLogger.warn(`failed to resolve remote user: ${e}`);
-				throw new ApiError(meta.errors.noSuchUser);
-			},
-		);
+		const aka = await resolveUser(username, host).catch((e) => {
+			apiLogger.warn(`failed to resolve remote user: ${e}`);
+			throw new ApiError(meta.errors.noSuchUser);
+		});
 
-		const toUrl: string | null = knownAs.uri;
-		if (!toUrl) {
-			throw new ApiError(meta.errors.uriNull);
-		}
-		if (updates.alsoKnownAs == null || updates.alsoKnownAs.length === 0) {
-			updates.alsoKnownAs = [toUrl];
-		} else {
-			updates.alsoKnownAs.push(toUrl);
-		}
+		if (aka.id === user.id) throw new ApiError(meta.errors.yourself);
+		if (!aka.uri) throw new ApiError(meta.errors.uriNull);
+
+		newAka.add(aka.uri);
 	}
 
+	const updates = {
+		alsoKnownAs: newAka.size > 0 ? Array.from(newAka) : null,
+	} as Partial<User>;
+
 	await Users.update(user.id, updates);
 
 	const iObj = await Users.pack<true, true>(user.id, user, {
diff --git a/packages/backend/src/server/api/endpoints/users/show.ts b/packages/backend/src/server/api/endpoints/users/show.ts
index 49cac81fdb..bead8df0a4 100644
--- a/packages/backend/src/server/api/endpoints/users/show.ts
+++ b/packages/backend/src/server/api/endpoints/users/show.ts
@@ -54,7 +54,7 @@ export const paramDef = {
 	anyOf: [
 		{
 			properties: {
-				userId: { type: "string", format: "misskey:id" },
+				userId: { type: "string" },
 			},
 			required: ["userId"],
 		},
@@ -65,7 +65,6 @@ export const paramDef = {
 					uniqueItems: true,
 					items: {
 						type: "string",
-						format: "misskey:id",
 					},
 				},
 			},
@@ -95,21 +94,27 @@ export default define(meta, paramDef, async (ps, me) => {
 			return [];
 		}
 
-		const users = await Users.findBy(
-			isAdminOrModerator
-				? {
-						id: In(ps.userIds),
-				  }
-				: {
-						id: In(ps.userIds),
-						isSuspended: false,
-				  },
-		);
+		const isUrl = ps.userIds[0].startsWith("http");
+		let users: User[];
+		if (isUrl) {
+			users = await Users.findBy(
+				isAdminOrModerator
+					? { uri: In(ps.userIds) }
+					: { uri: In(ps.userIds), isSuspended: false },
+			);
+		} else {
+			users = await Users.findBy(
+				isAdminOrModerator
+					? { id: In(ps.userIds) }
+					: { id: In(ps.userIds), isSuspended: false },
+			);
+		}
 
 		// リクエストされた通りに並べ替え
 		const _users: User[] = [];
 		for (const id of ps.userIds) {
-			_users.push(users.find((x) => x.id === id)!);
+			const res = users.find((x) => (isUrl ? x.uri === id : x.id === id));
+			if (res) _users.push(res);
 		}
 
 		return await Promise.all(
@@ -129,7 +134,9 @@ export default define(meta, paramDef, async (ps, me) => {
 		} else {
 			const q: FindOptionsWhere<User> =
 				ps.userId != null
-					? { id: ps.userId }
+					? ps.userId.startsWith("http")
+						? { uri: ps.userId }
+						: { id: ps.userId }
 					: { usernameLower: ps.username!.toLowerCase(), host: IsNull() };
 
 			user = await Users.findOneBy(q);
diff --git a/packages/client/src/pages/settings/migration.vue b/packages/client/src/pages/settings/migration.vue
index 6d5b435e3b..610d1ce1fe 100644
--- a/packages/client/src/pages/settings/migration.vue
+++ b/packages/client/src/pages/settings/migration.vue
@@ -2,14 +2,10 @@
 	<div class="_formRoot">
 		<FormSection>
 			<template #label>{{ i18n.ts.moveTo }}</template>
+			<FormInfo warn class="_formBlock">{{ i18n.ts.moveAccountDescription }}</FormInfo>
 			<FormInput v-model="moveToAccount" class="_formBlock">
-				<template #prefix
-					><i class="ph-airplane-takeoff ph-bold ph-lg"></i
-				></template>
+				<template #prefix><i class="ph-airplane-takeoff ph-bold ph-lg"></i></template>
 				<template #label>{{ i18n.ts.moveToLabel }}</template>
-				<template #caption>{{
-					i18n.ts.moveAccountDescription
-				}}</template>
 			</FormInput>
 			<FormButton primary danger @click="move(moveToAccount)">
 				{{ i18n.ts.moveAccount }}
@@ -18,19 +14,15 @@
 
 		<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>
-				<template #caption>{{ i18n.ts.moveFromDescription }}</template>
+			<FormInfo warn class="_formBlock">{{ i18n.ts.moveFromDescription }}</FormInfo>
+			<FormInput v-for="(_, i) in accountAlias" v-model="accountAlias[i]" class="_formBlock">
+				<template #prefix><i class="ph-airplane-landing ph-bold ph-lg"></i></template>
+				<template #label>{{ `#${i + 1} ${i18n.ts.moveFromLabel}` }}</template>
 			</FormInput>
-			<FormButton
-				class="button"
-				inline
-				primary
-				@click="save(accountAlias.toString())"
-			>
+			<FormButton class="button" :disabled="accountAlias.length >= 10" inline style="margin-right: 8px" @click="add"><i
+					class="ph-plus ph-bold ph-lg"></i>
+				{{ i18n.ts.add }}</FormButton>
+			<FormButton class="button" inline primary @click="save">
 				<i class="ph-floppy-disk-back ph-bold ph-lg"></i>
 				{{ i18n.ts.save }}
 			</FormButton>
@@ -42,17 +34,35 @@
 import FormSection from "@/components/form/section.vue";
 import FormInput from "@/components/form/input.vue";
 import FormButton from "@/components/MkButton.vue";
+import FormInfo from "@/components/MkInfo.vue";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
+import { $i } from "@/account";
+import { toString } from 'calckey-js/built/acct';
 
 let moveToAccount = $ref("");
-let accountAlias = $ref("");
+let accountAlias = $ref([""]);
 
-async function save(account): Promise<void> {
-	os.apiWithDialog("i/known-as", {
-		alsoKnownAs: account,
+await init();
+
+async function init() {
+	if ($i?.alsoKnownAs && $i.alsoKnownAs.length > 0) {
+		const aka = await os.api('users/show', { userIds: $i.alsoKnownAs });
+		accountAlias = (aka && aka.length > 0) ? aka.map(user => `@${toString(user)}`) : [''];
+	}
+}
+
+async function save(): Promise<void> {
+	const i = os.apiWithDialog("i/known-as", {
+		alsoKnownAs: accountAlias.map(e => e.trim()).filter(e => e !== ""),
 	});
+	$i.alsoKnownAs = i.alsoKnownAs;
+	await init();
+}
+
+function add(): void {
+	accountAlias.push('');
 }
 
 async function move(account): Promise<void> {

From c321a6ee39080efcb2f3fea08799409dba05e13f Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Wed, 31 May 2023 01:02:41 -0400
Subject: [PATCH 165/319] use parse instead

---
 .../backend/src/server/api/endpoints/i/move.ts   | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/i/move.ts b/packages/backend/src/server/api/endpoints/i/move.ts
index 3d947063ff..ba2360b196 100644
--- a/packages/backend/src/server/api/endpoints/i/move.ts
+++ b/packages/backend/src/server/api/endpoints/i/move.ts
@@ -10,9 +10,9 @@ import deleteFollowing from "@/services/following/delete.js";
 import create from "@/services/following/create.js";
 import { getUser } from "@/server/api/common/getters.js";
 import { Followings, Users } from "@/models/index.js";
-import { UserProfiles } from "@/models/index.js";
 import config from "@/config/index.js";
 import { publishMainStream } from "@/services/stream.js";
+import { parse } from "@/misc/acct.js";
 
 export const meta = {
 	tags: ["users"],
@@ -95,17 +95,10 @@ export default define(meta, paramDef, async (ps, user) => {
 	if (user.isAdmin) throw new ApiError(meta.errors.adminForbidden);
 	if (user.movedToUri) throw new ApiError(meta.errors.alreadyMoved);
 
-	let unfiltered: string = ps.moveToAccount;
-	if (!unfiltered) {
-		throw new ApiError(meta.errors.noSuchMoveTarget);
-	}
+	const { username, host } = parse(ps.moveToAccount);
+	if (!host) throw new ApiError(meta.errors.notRemote);
 
-	if (unfiltered.startsWith("acct:")) unfiltered = unfiltered.substring(5);
-	if (unfiltered.startsWith("@")) unfiltered = unfiltered.substring(1);
-	if (!unfiltered.includes("@")) throw new ApiError(meta.errors.notRemote);
-
-	const userAddress: string[] = unfiltered.split("@");
-	const moveTo: User = await resolveUser(userAddress[0], userAddress[1]).catch(
+	const moveTo: User = await resolveUser(username, host).catch(
 		(e) => {
 			apiLogger.warn(`failed to resolve remote user: ${e}`);
 			throw new ApiError(meta.errors.noSuchMoveTarget);
@@ -134,6 +127,7 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	if (!toUrl) toUrl = "";
 	updates.movedToUri = toUrl;
+	updates.alsoKnownAs = user.alsoKnownAs?.concat(toUrl) ?? [toUrl];
 
 	await Users.update(user.id, updates);
 	const iObj = await Users.pack<true, true>(user.id, user, {

From 8480ced256f0822af001e49ee145974d527613e8 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Wed, 31 May 2023 01:14:13 -0400
Subject: [PATCH 166/319] remove empty form input

---
 .../src/server/api/endpoints/i/known-as.ts    | 16 +++---
 .../src/server/api/endpoints/i/move.ts        | 10 ++--
 .../client/src/pages/settings/migration.vue   | 55 ++++++++++++++-----
 3 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/i/known-as.ts b/packages/backend/src/server/api/endpoints/i/known-as.ts
index d4d9061b30..0d0c06180a 100644
--- a/packages/backend/src/server/api/endpoints/i/known-as.ts
+++ b/packages/backend/src/server/api/endpoints/i/known-as.ts
@@ -38,14 +38,14 @@ export const meta = {
 			id: "bf326f31-d430-4f97-9933-5d61e4d48a23",
 		},
 		alreadyMoved: {
-			message: 'You have already moved your account.',
-			code: 'ALREADY_MOVED',
-			id: '56f20ec9-fd06-4fa5-841b-edd6d7d4fa31',
+			message: "You have already moved your account.",
+			code: "ALREADY_MOVED",
+			id: "56f20ec9-fd06-4fa5-841b-edd6d7d4fa31",
 		},
 		yourself: {
-			message: 'You can\'t set yourself as your own alias.',
-			code: 'FORBIDDEN_TO_SET_YOURSELF',
-			id: '25c90186-4ab0-49c8-9bba-a1fa6c202ba4',
+			message: "You can't set yourself as your own alias.",
+			code: "FORBIDDEN_TO_SET_YOURSELF",
+			id: "25c90186-4ab0-49c8-9bba-a1fa6c202ba4",
 		},
 	},
 } as const;
@@ -54,10 +54,10 @@ export const paramDef = {
 	type: "object",
 	properties: {
 		alsoKnownAs: {
-			type: 'array',
+			type: "array",
 			maxItems: 10,
 			uniqueItems: true,
-			items: { type: 'string' },
+			items: { type: "string" },
 		},
 	},
 	required: ["alsoKnownAs"],
diff --git a/packages/backend/src/server/api/endpoints/i/move.ts b/packages/backend/src/server/api/endpoints/i/move.ts
index ba2360b196..d972aaf1d9 100644
--- a/packages/backend/src/server/api/endpoints/i/move.ts
+++ b/packages/backend/src/server/api/endpoints/i/move.ts
@@ -98,12 +98,10 @@ export default define(meta, paramDef, async (ps, user) => {
 	const { username, host } = parse(ps.moveToAccount);
 	if (!host) throw new ApiError(meta.errors.notRemote);
 
-	const moveTo: User = await resolveUser(username, host).catch(
-		(e) => {
-			apiLogger.warn(`failed to resolve remote user: ${e}`);
-			throw new ApiError(meta.errors.noSuchMoveTarget);
-		},
-	);
+	const moveTo: User = await resolveUser(username, host).catch((e) => {
+		apiLogger.warn(`failed to resolve remote user: ${e}`);
+		throw new ApiError(meta.errors.noSuchMoveTarget);
+	});
 	let fromUrl: string | null = user.uri;
 	if (!fromUrl) {
 		fromUrl = `${config.url}/users/${user.id}`;
diff --git a/packages/client/src/pages/settings/migration.vue b/packages/client/src/pages/settings/migration.vue
index 610d1ce1fe..df65e6e25c 100644
--- a/packages/client/src/pages/settings/migration.vue
+++ b/packages/client/src/pages/settings/migration.vue
@@ -2,9 +2,13 @@
 	<div class="_formRoot">
 		<FormSection>
 			<template #label>{{ i18n.ts.moveTo }}</template>
-			<FormInfo warn class="_formBlock">{{ i18n.ts.moveAccountDescription }}</FormInfo>
+			<FormInfo warn class="_formBlock">{{
+				i18n.ts.moveAccountDescription
+			}}</FormInfo>
 			<FormInput v-model="moveToAccount" class="_formBlock">
-				<template #prefix><i class="ph-airplane-takeoff ph-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)">
@@ -14,14 +18,30 @@
 
 		<FormSection>
 			<template #label>{{ i18n.ts.moveFrom }}</template>
-			<FormInfo warn class="_formBlock">{{ i18n.ts.moveFromDescription }}</FormInfo>
-			<FormInput v-for="(_, i) in accountAlias" v-model="accountAlias[i]" class="_formBlock">
-				<template #prefix><i class="ph-airplane-landing ph-bold ph-lg"></i></template>
-				<template #label>{{ `#${i + 1} ${i18n.ts.moveFromLabel}` }}</template>
+			<FormInfo warn class="_formBlock">{{
+				i18n.ts.moveFromDescription
+			}}</FormInfo>
+			<FormInput
+				v-for="(_, i) in accountAlias"
+				v-model="accountAlias[i]"
+				class="_formBlock"
+			>
+				<template #prefix
+					><i class="ph-airplane-landing ph-bold ph-lg"></i
+				></template>
+				<template #label>{{
+					`#${i + 1} ${i18n.ts.moveFromLabel}`
+				}}</template>
 			</FormInput>
-			<FormButton class="button" :disabled="accountAlias.length >= 10" inline style="margin-right: 8px" @click="add"><i
-					class="ph-plus ph-bold ph-lg"></i>
-				{{ i18n.ts.add }}</FormButton>
+			<FormButton
+				class="button"
+				:disabled="accountAlias.length >= 10"
+				inline
+				style="margin-right: 8px"
+				@click="add"
+				><i class="ph-plus ph-bold ph-lg"></i>
+				{{ i18n.ts.add }}</FormButton
+			>
 			<FormButton class="button" inline primary @click="save">
 				<i class="ph-floppy-disk-back ph-bold ph-lg"></i>
 				{{ i18n.ts.save }}
@@ -39,7 +59,7 @@ import * as os from "@/os";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
 import { $i } from "@/account";
-import { toString } from 'calckey-js/built/acct';
+import { toString } from "calckey-js/built/acct";
 
 let moveToAccount = $ref("");
 let accountAlias = $ref([""]);
@@ -48,21 +68,26 @@ await init();
 
 async function init() {
 	if ($i?.alsoKnownAs && $i.alsoKnownAs.length > 0) {
-		const aka = await os.api('users/show', { userIds: $i.alsoKnownAs });
-		accountAlias = (aka && aka.length > 0) ? aka.map(user => `@${toString(user)}`) : [''];
+		const aka = await os.api("users/show", { userIds: $i.alsoKnownAs });
+		accountAlias =
+			aka && aka.length > 0
+				? aka.map((user) => `@${toString(user)}`)
+				: [""];
+	} else {
+		accountAlias = [""];
 	}
 }
 
 async function save(): Promise<void> {
-	const i = os.apiWithDialog("i/known-as", {
-		alsoKnownAs: accountAlias.map(e => e.trim()).filter(e => e !== ""),
+	const i = await os.apiWithDialog("i/known-as", {
+		alsoKnownAs: accountAlias.map((e) => e.trim()).filter((e) => e !== ""),
 	});
 	$i.alsoKnownAs = i.alsoKnownAs;
 	await init();
 }
 
 function add(): void {
-	accountAlias.push('');
+	accountAlias.push("");
 }
 
 async function move(account): Promise<void> {

From 23f551884fa0d7624ffd429f0488e41a46a6f3f6 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Wed, 31 May 2023 12:08:21 +0200
Subject: [PATCH 167/319] Less logging of every single WS message + use logger
 in Meilisearch

---
 packages/backend/src/db/meilisearch.ts          | 2 +-
 packages/backend/src/server/api/stream/index.ts | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/backend/src/db/meilisearch.ts b/packages/backend/src/db/meilisearch.ts
index 01efaa0ba0..33553b64cf 100644
--- a/packages/backend/src/db/meilisearch.ts
+++ b/packages/backend/src/db/meilisearch.ts
@@ -258,7 +258,7 @@ export default hasConfig
 						primaryKey: "id",
 					})
 					.then(() =>
-						console.log(`sent ${indexingBatch.length} posts for indexing`),
+						logger.info(`sent ${indexingBatch.length} posts for indexing`),
 					);
 			},
 			serverStats: async () => {
diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts
index 055fe200b7..b8482c5686 100644
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -394,7 +394,6 @@ export default class Connection {
 	 * クライアントにメッセージ送信
 	 */
 	public sendMessageToWs(type: string, payload: any) {
-		console.log(payload, this.isMastodonCompatible);
 		if (this.isMastodonCompatible) {
 			if (payload.type === "note") {
 				this.wsConnection.send(

From ffb93678d7e5f3285eeb57ca179f0a0a5633283a Mon Sep 17 00:00:00 2001
From: "Konni (im Schloss)" <hi@kartonrad.de>
Date: Wed, 31 May 2023 13:52:21 +0200
Subject: [PATCH 168/319] Fixed dev enviroment _> documented procedure

---
 .envrc              |  4 +-
 docs/development.md | 90 ++++++++++++++++++++++++++++++++++++++++++++-
 flake.lock          | 54 +++++++++++++--------------
 flake.nix           |  2 +-
 4 files changed, 118 insertions(+), 32 deletions(-)

diff --git a/.envrc b/.envrc
index 0dcc9e739e..3ce7171a3c 100644
--- a/.envrc
+++ b/.envrc
@@ -1,4 +1,4 @@
-if ! has nix_direnv_version || ! nix_direnv_version 2.2.1; then
-  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.2.1/direnvrc" "sha256-zelF0vLbEl5uaqrfIzbgNzJWGmLzCmYAkInj/LNxvKs="
+if ! has nix_direnv_version || ! nix_direnv_version 2.3.0; then
+  source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/2.3.0/direnvrc" "sha256-Dmd+j63L84wuzgyjITIfSxSD57Tx7v51DMxVZOsiUD8="
 fi
 use flake . --impure
diff --git a/docs/development.md b/docs/development.md
index 41d1b34699..6d6c0ea8d2 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -7,8 +7,8 @@ Please note, however, that this environment will not work on Windows outside of
 
 ### Prerequisites
 
-- Installed the [Nix Package Manager](https://nixos.org/download.html)
-- Installed [direnv](https://direnv.net/docs/installation.html) and added its hook to your shell.
+- Installed the [Nix Package Manager](https://nixos.org/download.html) (use the comman on their website)
+- Installed [direnv](https://direnv.net/docs/installation.html) and added its hook to your shell. (package manager)
 
 Once the repo is cloned to your computer, follow these next few steps inside the Calckey folder:
 
@@ -20,3 +20,89 @@ Once the repo is cloned to your computer, follow these next few steps inside the
 - You should now see the admin user creation screen!
 
 Note: When you want to restart a dev server, all you need to do is run `devenv up`, no other steps are necessary.
+
+# Possible Troubles with the dev enviroment
+(this doesn't have to be done under normal conditions, this is for future reference)
+
+### direnv
+If you have any trouble with `direnv allow`
+Check that the contents of `.envrc` have the same version of nix-direnv that is specified here:
+> nix-direnv under -> installation -> using direnv source url
+> https://github.com/nix-community/nix-direnv#direnv-source_url
+
+there should be no errors during `direnv allow`
+
+### outdated nix packages
+if `install-deps` or any subsequent command doesn't run due to versioning problems
+`flake.nix` and `flake.lock` may be outdated
+
+delete `flake.lock`, or better, run `nix flake update --extra-experimental-features flakes --extra-experimental-features nix-command`
+after that, run `direnv rebuild`
+
+if there are any errors, you might have to change `flake.nix`
+(because the available options can change between versions - consider getting support in [the matrix channel](https://matrix.to/#/#calckey:matrix.fedibird.com))
+
+### after changing a node version
+in my case, i had to change the node version from 19, to 18
+
+! before proceeding, make sure to delete all build artifacts! 
+remove `node_modules` and `built` folders, and maybe `.devenv` and `.direnv` as well
+manually, or run `npm cache clean --force` and `pnpm cleanall`
+
+### Windows Subsystem for Linux
+if `devenv up` terminates because of wrong folder permissions, 
+
+create the file `/etc/wsl.conf` in your distro and add
+```shell
+[automount]
+options = "metadata"
+```
+
+this allows `chmod` calls to actually have an effect.
+the build scripts DO actually set the permissions, it just needs to work in wsl.
+
+### devenv up
+devenv up may take a looong time. (some say this is fake news, maybe it was bad luck in my case)
+
+do not get spooked by this error:
+```
+> calckey@14.0.0-dev32 start /mnt/.../calckey
+> pnpm --filter backend run start
+
+
+> backend@ start /mnt/.../calckey/packages/backend
+> pnpm node ./built/index.js
+
+node:internal/modules/cjs/loader:1078
+  throw err;
+  ^
+
+Error: Cannot find module '/mnt/.../calckey/packages/backend/built/index.js'
+    at Module._resolveFilename (node:internal/modules/cjs/loader:1075:15)
+    at Module._load (node:internal/modules/cjs/loader:920:27)
+    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:81:12)
+    at node:internal/main/run_main_module:23:47 {
+  code: 'MODULE_NOT_FOUND',
+  requireStack: []
+}
+
+Node.js v18.16.0
+undefined
+/mnt/.../calckey/packages/backend:
+ ERR_PNPM_RECURSIVE_RUN_FIRST_FAIL  backend@ start: `pnpm node ./built/index.js`
+Exit status 1
+ ELIFECYCLE  Command failed with exit code 1.
+```
+
+the script is designed to constantly try to start the server, while the build is still running.
+this just means that the build isn't finished yet.
+
+at some point you should see a banner that says "Calckey" in big letters -
+then you're good to go and can run `migrate` (in another terminal)!
+
+if you don't see the banner, 
+and it's for some reason stuck on `Finished 'build' after 917 ms` for a view minutes,
+
+just leave devenv running and open another terminal in the folder 
+run `migrate` and then `pnpm --filter backend run start` by yourself
+the server should start
diff --git a/flake.lock b/flake.lock
index c074931407..f1ff690415 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1682953188,
-        "narHash": "sha256-MFH6yK7QnEV6+T96Pt++lH8ozDn4YqzaOXAS6u5h3mM=",
+        "lastModified": 1685521914,
+        "narHash": "sha256-0fdFP5IASLwJ0PSXrErW8PZon9TVYmi8VRF8OtjGkV4=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "c388b8c57116a71174d26b09c0c38b4b6b5bac3a",
+        "rev": "e206d8f2e3e8d6aa943656052f15bdfea8146b8d",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         "rust-analyzer-src": "rust-analyzer-src"
       },
       "locked": {
-        "lastModified": 1682922129,
-        "narHash": "sha256-qnhkfksuuSLbN5UJM+KSCMSRC13bXosr6Ed3NwerRno=",
+        "lastModified": 1685514167,
+        "narHash": "sha256-urRxF0ZGSNeZjM4kALNg3wTh7fBscbqQmS6S/HU7Wms=",
         "owner": "nix-community",
         "repo": "fenix",
-        "rev": "c1f90f80ba4d60bea60685dd4515fb22d53279cc",
+        "rev": "3abfea51663583186f687c49a157eab1639349ca",
         "type": "github"
       },
       "original": {
@@ -63,11 +63,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1680392223,
-        "narHash": "sha256-n3g7QFr85lDODKt250rkZj2IFS3i4/8HBU2yKHO3tqw=",
+        "lastModified": 1685457039,
+        "narHash": "sha256-bEFtQm+YyLxQjKQAaBHJyPN1z2wbhBnr2g1NJWSYjwM=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "dcc36e45d054d7bb554c9cdab69093debd91a0b5",
+        "rev": "80717d11615b6f42d1ad2e18ead51193fc15de69",
         "type": "github"
       },
       "original": {
@@ -155,11 +155,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1677534593,
-        "narHash": "sha256-PuZSAHeq4/9pP/uYH1FcagQ3nLm/DrDrvKi/xC9glvw=",
+        "lastModified": 1678875422,
+        "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3ad64d9e2d5bf80c877286102355b1625891ae9a",
+        "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459",
         "type": "github"
       },
       "original": {
@@ -172,11 +172,11 @@
     "nixpkgs-lib": {
       "locked": {
         "dir": "lib",
-        "lastModified": 1680213900,
-        "narHash": "sha256-cIDr5WZIj3EkKyCgj/6j3HBH4Jj1W296z7HTcWj1aMA=",
+        "lastModified": 1682879489,
+        "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e3652e0735fbec227f342712f180f4f21f0594f2",
+        "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0",
         "type": "github"
       },
       "original": {
@@ -205,11 +205,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1673800717,
-        "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=",
+        "lastModified": 1678872516,
+        "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2f9fd351ec37f5d479556cd48be4ca340da59b8f",
+        "rev": "9b8e5abb18324c7fe9f07cb100c3cd4a29cda8b8",
         "type": "github"
       },
       "original": {
@@ -221,11 +221,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1682929865,
-        "narHash": "sha256-jxVrgnf5QNjO+XoxDxUWtN2G5xyJSGZ5SWDQFxMuHxc=",
+        "lastModified": 1685399834,
+        "narHash": "sha256-Lt7//5snriXSdJo5hlVcDkpERL1piiih0UXIz1RUcC4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f2e9a130461950270f87630b11132323706b4d91",
+        "rev": "58c85835512b0db938600b6fe13cc3e3dc4b364e",
         "type": "github"
       },
       "original": {
@@ -250,11 +250,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1677160285,
-        "narHash": "sha256-tBzpCjMP+P3Y3nKLYvdBkXBg3KvTMo3gvi8tLQaqXVY=",
+        "lastModified": 1682596858,
+        "narHash": "sha256-Hf9XVpqaGqe/4oDGr30W8HlsWvJXtMsEPHDqHZA6dDg=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "2bd861ab81469428d9c823ef72c4bb08372dd2c4",
+        "rev": "fb58866e20af98779017134319b5663b8215d912",
         "type": "github"
       },
       "original": {
@@ -274,11 +274,11 @@
     "rust-analyzer-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1682886915,
-        "narHash": "sha256-FPQKPvlHIU2DsDF6GMoRtrZhil0vHi6MFd8vpKEx/n8=",
+        "lastModified": 1685465261,
+        "narHash": "sha256-aJ2nUinUrNcFi+pb47bS5IIAeSiUEEPLJY8W4Q8Pcjk=",
         "owner": "rust-lang",
         "repo": "rust-analyzer",
-        "rev": "3a27518fee5a723005299cf49e2d58a842a261ca",
+        "rev": "d2b3caa5b5694125fad04a9699e919444439f6a2",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 73d8fe02f1..8553456ea1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,7 +41,7 @@
 							languages.typescript.enable = true;
 							# Enable javascript for NPM and PNPM
 							languages.javascript.enable = true;
-							languages.javascript.package = pkgs.nodejs_19;
+							languages.javascript.package = pkgs.nodejs_18;
 							# Enable stable Rust for the backend
 							languages.rust.enable = true;
 							languages.rust.version = "stable";

From 0291579e2f21056a830238bd4e6fd997412e8113 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 31 May 2023 12:06:26 -0700
Subject: [PATCH 169/319] chore: :arrow_up: up bull

---
 packages/backend/package.json |  2 +-
 pnpm-lock.yaml                | 11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 82a3f6cc8b..c084d67bc6 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -50,7 +50,7 @@
 		"axios": "^1.3.2",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.5",
-		"bull": "4.10.2",
+		"bull": "4.10.4",
 		"cacheable-lookup": "7.0.0",
 		"calckey-js": "workspace:*",
 		"cbor": "8.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fa4763f260..1c06f87dd8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -163,8 +163,8 @@ importers:
         specifier: 1.1.5
         version: 1.1.5
       bull:
-        specifier: 4.10.2
-        version: 4.10.2
+        specifier: 4.10.4
+        version: 4.10.4
       cacheable-lookup:
         specifier: 7.0.0
         version: 7.0.0
@@ -4983,8 +4983,8 @@ packages:
       node-gyp-build: 4.6.0
     dev: false
 
-  /bull@4.10.2:
-    resolution: {integrity: sha512-xa65xtWjQsLqYU/eNaXxq9VRG8xd6qNsQEjR7yjYuae05xKrzbVMVj2QgrYsTMmSs/vsqJjHqHSRRiW1+IkGXQ==}
+  /bull@4.10.4:
+    resolution: {integrity: sha512-o9m/7HjS/Or3vqRd59evBlWCXd9Lp+ALppKseoSKHaykK46SmRjAilX98PgmOz1yeVaurt8D5UtvEt4bUjM3eA==}
     engines: {node: '>=12'}
     dependencies:
       cron-parser: 4.7.1
@@ -4993,7 +4993,6 @@ packages:
       ioredis: 5.3.2
       lodash: 4.17.21
       msgpackr: 1.8.1
-      p-timeout: 3.2.0
       semver: 7.3.8
       uuid: 8.3.2
     transitivePeerDependencies:
@@ -11326,6 +11325,7 @@ packages:
   /p-finally@1.0.0:
     resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
     engines: {node: '>=4'}
+    dev: true
 
   /p-limit@2.3.0:
     resolution: {integrity: sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==}
@@ -11370,6 +11370,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       p-finally: 1.0.0
+    dev: true
 
   /p-try@2.2.0:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}

From 3443e5d649efc6c2efa44f22924dc08b18616bbb Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Wed, 31 May 2023 16:28:07 -0400
Subject: [PATCH 170/319] button styling

---
 packages/client/src/components/MkInfo.vue     |  6 +++-
 .../src/components/global/MkPageHeader.vue    | 24 ++-------------
 packages/client/src/style.scss                | 30 +++++++++++++++++++
 3 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/packages/client/src/components/MkInfo.vue b/packages/client/src/components/MkInfo.vue
index d8bf68fc1b..481f9fbd17 100644
--- a/packages/client/src/components/MkInfo.vue
+++ b/packages/client/src/components/MkInfo.vue
@@ -10,7 +10,7 @@
 		<button
 			v-if="closeable"
 			v-tooltip="i18n.ts.close"
-			class="_button close"
+			class="_buttonIcon close"
 			@click.stop="close"
 		>
 			<i class="ph-x ph-bold ph-lg"></i>
@@ -48,6 +48,9 @@ function close() {
 	background: var(--infoBg);
 	color: var(--infoFg);
 	border-radius: var(--radius);
+	display: flex;
+	align-items: center;
+	gap: .4em;
 
 	&.warn {
 		background: var(--infoWarnBg);
@@ -55,6 +58,7 @@ function close() {
 	}
 
 	&.card {
+		display: inline;
 		background: var(--panel);
 		color: var(--fg);
 		padding: 48px;
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 67549a6541..ae703092fe 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -11,7 +11,7 @@
 			<div class="buttons">
 				<button
 					v-if="props.displayBackButton"
-					class="_button button icon backButton"
+					class="_buttonIcon button icon backButton"
 					@click.stop="goBack()"
 					@touchstart="preventDrag"
 					v-tooltip.noDelay="i18n.ts.goBack"
@@ -110,7 +110,7 @@
 			<template v-for="action in actions">
 				<button
 					v-tooltip.noDelay="action.text"
-					class="_button button"
+					class="_buttonIcon button"
 					:class="{ highlighted: action.highlighted }"
 					@click.stop="action.handler"
 					@touchstart="preventDrag"
@@ -393,26 +393,6 @@ onUnmounted(() => {
 			}
 		}
 
-		> .button/*, @at-root .backButton*/ {
-			/* I don't know how to get this to work */
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			height: calc(var(--height) - (var(--margin) * 2));
-			width: calc(var(--height) - (var(--margin) * 2));
-			box-sizing: border-box;
-			position: relative;
-			border-radius: 5px;
-
-			&:hover {
-				background: rgba(0, 0, 0, 0.05);
-			}
-
-			&.highlighted {
-				color: var(--accent);
-			}
-		}
-
 		> .fullButton {
 			& + .fullButton {
 				margin-left: 12px;
diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index 2fa2c861e6..1dec7d3b70 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -219,6 +219,36 @@ hr {
 	}
 }
 
+._buttonIcon {
+	@extend ._button;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: calc(var(--height) - (var(--margin) * 2));
+	height: calc(var(--height) - (var(--margin) * 2));
+	box-sizing: border-box;
+	position: relative;
+	border-radius: 5px;
+
+	&::before {
+		content: "";
+		position: absolute;
+		width: 2.7em;
+		height: 2.7em;
+		border-radius: inherit;
+		transition: background 0.2s;
+	}
+
+	&:hover:before {
+		// background: rgba(0, 0, 0, 0.05);
+		background: var(--buttonBg);
+	}
+
+	&.highlighted::before {
+		color: var(--accent);
+	}
+}
+
 ._buttonPrimary {
 	@extend ._button;
 	color: var(--fgOnAccent);

From 0663a67b866fa449aac5893cf652c114ddfee906 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Wed, 31 May 2023 16:41:31 -0400
Subject: [PATCH 171/319] fix

---
 packages/client/src/style.scss | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/client/src/style.scss b/packages/client/src/style.scss
index 1dec7d3b70..eefa610d00 100644
--- a/packages/client/src/style.scss
+++ b/packages/client/src/style.scss
@@ -229,6 +229,7 @@ hr {
 	box-sizing: border-box;
 	position: relative;
 	border-radius: 5px;
+	outline: none;
 
 	&::before {
 		content: "";
@@ -239,12 +240,13 @@ hr {
 		transition: background 0.2s;
 	}
 
-	&:hover:before {
-		// background: rgba(0, 0, 0, 0.05);
+	&:hover:before, &:focus::before, &.highlighted::before {
 		background: var(--buttonBg);
 	}
-
-	&.highlighted::before {
+	&:focus-visible::before {
+		outline: auto;
+	}
+	&.highlighted {
 		color: var(--accent);
 	}
 }

From f3bdce06368afe68a6043a1e93045d5c4d2a6891 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Wed, 31 May 2023 17:02:58 -0400
Subject: [PATCH 172/319] Fix #10236

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

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index af3e1c4eea..589b83a513 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -9,6 +9,7 @@
 		class="tkcbzcuz note-container"
 		:tabindex="!isDeleted ? '-1' : null"
 		:class="{ renote: isRenote }"
+		:id="appearNote.id"
 	>
 		<MkNoteSub
 			v-if="appearNote.reply && !detailedView"
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index f4637948d1..dd69145a03 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -30,6 +30,7 @@
 						:note="note"
 						:parentId="parentId"
 						:conversation="conversation"
+						:detailedView="detailedView"
 						@focusfooter="footerEl.focus()"
 					/>
 					<div v-if="translating || translation" class="translation">
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index d6263cfd2b..e651b3923c 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -2,7 +2,7 @@
 	<p v-if="note.cw != null" class="cw">
 		<MkA
 			v-if="conversation && note.renoteId == parentId"
-			:to="`#${parentId}`"
+			:to="detailedView ? `#${parentId}` : `${notePage(note)}#${parentId}`"
 			behavior="browser"
 			class="reply-icon"
 			@click.stop
@@ -11,7 +11,7 @@
 		</MkA>
 		<MkA
 			v-else-if="!detailed && note.replyId"
-			:to="`#${note.replyId}`"
+			:to="detailedView ? `#${note.replyId}` :`${notePage(note)}#${note.replyId}`"
 			behavior="browser"
 			v-tooltip="i18n.ts.jumpToPrevious"
 			class="reply-icon"
@@ -66,7 +66,7 @@
 				<template v-if="!note.cw">
 					<MkA
 						v-if="conversation && note.renoteId == parentId"
-						:to="`#${parentId}`"
+						:to="detailedView ? `#${parentId}` : `${notePage(note)}#${parentId}`"
 						behavior="browser"
 						class="reply-icon"
 						@click.stop
@@ -75,7 +75,7 @@
 					</MkA>
 					<MkA
 						v-else-if="!detailed && note.replyId"
-						:to="`#${note.replyId}`"
+						:to="detailedView ? `#${note.replyId}` :`${notePage(note)}#${note.replyId}`"
 						behavior="browser"
 						v-tooltip="i18n.ts.jumpToPrevious"
 						class="reply-icon"
@@ -173,11 +173,13 @@ import MkUrlPreview from "@/components/MkUrlPreview.vue";
 import XShowMoreButton from "@/components/MkShowMoreButton.vue";
 import XCwButton from "@/components/MkCwButton.vue";
 import MkButton from "@/components/MkButton.vue";
+import { notePage } from "@/filters/note";
 import { extractUrlFromMfm } from "@/scripts/extract-url-from-mfm";
 import { extractMfmWithAnimation } from "@/scripts/extract-mfm";
 import { i18n } from "@/i18n";
 import { defaultStore } from "@/store";
 
+
 const props = defineProps<{
 	note: misskey.entities.Note;
 	parentId?;

From 618042c3e3314ee4fe9a0208f4cfd4443bab8e5d Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Wed, 31 May 2023 17:59:03 -0400
Subject: [PATCH 173/319] lemme just update that

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

diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue
index 4e511a6762..71dbeb87bd 100644
--- a/packages/client/src/pages/about-calckey.vue
+++ b/packages/client/src/pages/about-calckey.vue
@@ -104,9 +104,9 @@
 								><Mfm
 									:text="'@panos@calckey.social (Project Coordinator)'"
 							/></FormLink>
-							<FormLink to="/@freeplay@bz.pawdev.me"
+							<FormLink to="/@freeplay@calckey.social"
 								><Mfm
-									:text="'@freeplay@bz.pawdev.me (UI/UX Designer)'"
+									:text="'@freeplay@calckey.social (UI)'"
 							/></FormLink>
 							<FormLink
 								to="https://www.youtube.com/c/Henkiwashere"

From 9d9047c33d5ab844b785edbdaf98dba83a29197c Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Thu, 1 Jun 2023 07:24:49 +0900
Subject: [PATCH 174/319] switch position of social and recommended

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

diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index a44f36c55b..1947caaef3 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -109,12 +109,12 @@ let timelines = ["home"];
 if (isLocalTimelineAvailable) {
 	timelines.push("local");
 }
-if (isRecommendedTimelineAvailable) {
-	timelines.push("recommended");
-}
 if (isLocalTimelineAvailable) {
 	timelines.push("social");
 }
+if (isRecommendedTimelineAvailable) {
+	timelines.push("recommended");
+}
 if (isGlobalTimelineAvailable) {
 	timelines.push("global");
 }
@@ -255,16 +255,6 @@ const headerTabs = $computed(() => [
 				},
 		  ]
 		: []),
-	...(isRecommendedTimelineAvailable
-		? [
-				{
-					key: "recommended",
-					title: i18n.ts._timelines.recommended,
-					icon: "ph-thumbs-up ph-bold ph-lg",
-					iconOnly: true,
-				},
-		  ]
-		: []),
 	...(isLocalTimelineAvailable
 		? [
 				{
@@ -275,6 +265,16 @@ const headerTabs = $computed(() => [
 				},
 		  ]
 		: []),
+	...(isRecommendedTimelineAvailable
+		? [
+				{
+					key: "recommended",
+					title: i18n.ts._timelines.recommended,
+					icon: "ph-thumbs-up ph-bold ph-lg",
+					iconOnly: true,
+				},
+		  ]
+		: []),
 	...(isGlobalTimelineAvailable
 		? [
 				{

From 0a9936629814570ae1720db4d0e2f315259944db Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Thu, 1 Jun 2023 07:29:54 +0900
Subject: [PATCH 175/319] no change, but more comfortable

---
 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 1947caaef3..5d96d6dfd8 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -195,7 +195,7 @@ async function chooseAntenna(ev: MouseEvent): Promise<void> {
 }
 
 function saveSrc(
-	newSrc: "home" | "local" | "recommended" | "social" | "global"
+	newSrc: "home" | "local" | "social" | "recommended" | "global"
 ): void {
 	defaultStore.set("tl", {
 		...defaultStore.state.tl,

From 151f5e355d3d75806a9822b015c1c895b8a6fa5f Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Thu, 1 Jun 2023 07:55:59 +0900
Subject: [PATCH 176/319] Fix exported settings being not importable

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

diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue
index a5f606e0ef..595fe4f03c 100644
--- a/packages/client/src/pages/settings/preferences-backups.vue
+++ b/packages/client/src/pages/settings/preferences-backups.vue
@@ -173,7 +173,7 @@ function validate(profile: unknown): void {
 	if (!isObject(profile)) throw new Error("not an object");
 
 	// Check if unnecessary properties exist
-	if (Object.keys(profile).some((key) => !profileProps.includes(key)))
+	if (Object.keys(profile).some((key) => !profileProps.includes(key) && key !== "host"))
 		throw new Error("Unnecessary properties exist");
 
 	if (!profile.name) throw new Error("Missing required prop: name");

From 7b02b87ec67c0bd5145078fcade5589577d0b45f Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Thu, 1 Jun 2023 08:01:24 +0900
Subject: [PATCH 177/319] format

---
 packages/client/src/pages/settings/preferences-backups.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue
index 595fe4f03c..14bb27f91e 100644
--- a/packages/client/src/pages/settings/preferences-backups.vue
+++ b/packages/client/src/pages/settings/preferences-backups.vue
@@ -173,7 +173,11 @@ function validate(profile: unknown): void {
 	if (!isObject(profile)) throw new Error("not an object");
 
 	// Check if unnecessary properties exist
-	if (Object.keys(profile).some((key) => !profileProps.includes(key) && key !== "host"))
+	if (
+		Object.keys(profile).some(
+			(key) => !profileProps.includes(key) && key !== "host"
+		)
+	)
 		throw new Error("Unnecessary properties exist");
 
 	if (!profile.name) throw new Error("Missing required prop: name");

From b9046573e1671932f9c33a56aa8f404e0bdfff4f Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Wed, 31 May 2023 19:35:02 -0400
Subject: [PATCH 178/319] fix

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

diff --git a/packages/client/src/components/MkInfo.vue b/packages/client/src/components/MkInfo.vue
index 481f9fbd17..f07594ca73 100644
--- a/packages/client/src/components/MkInfo.vue
+++ b/packages/client/src/components/MkInfo.vue
@@ -58,7 +58,7 @@ function close() {
 	}
 
 	&.card {
-		display: inline;
+		display: block;
 		background: var(--panel);
 		color: var(--fg);
 		padding: 48px;

From c97c6fbe5b4ce16e5760f3be8406a53de72bc94e Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Wed, 31 May 2023 19:43:58 -0400
Subject: [PATCH 179/319] hide broken logged-out header link for now

---
 packages/client/src/ui/visitor/header.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/src/ui/visitor/header.vue b/packages/client/src/ui/visitor/header.vue
index e79bd288ef..dbeeb3d2ce 100644
--- a/packages/client/src/ui/visitor/header.vue
+++ b/packages/client/src/ui/visitor/header.vue
@@ -6,14 +6,14 @@
 					><i class="ph-house ph-bold ph-lg icon"></i
 					>{{ i18n.ts.home }}</MkA
 				>
-				<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

From 1548fc2f2a70e49969ea7d75161293b506cdff0e Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Wed, 31 May 2023 22:10:44 -0400
Subject: [PATCH 180/319] Fix #10219

---
 packages/client/src/components/MkPageWindow.vue | 1 +
 packages/client/src/components/MkWindow.vue     | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/packages/client/src/components/MkPageWindow.vue b/packages/client/src/components/MkPageWindow.vue
index bb5066b7e4..703494144e 100644
--- a/packages/client/src/components/MkPageWindow.vue
+++ b/packages/client/src/components/MkPageWindow.vue
@@ -9,6 +9,7 @@
 		:buttons-right="buttonsRight"
 		:contextmenu="contextmenu"
 		@closed="$emit('closed')"
+		class="page-window"
 	>
 		<template #header>
 			<template v-if="pageMetadata?.value">
diff --git a/packages/client/src/components/MkWindow.vue b/packages/client/src/components/MkWindow.vue
index 5aa3adef21..e6509acf97 100644
--- a/packages/client/src/components/MkWindow.vue
+++ b/packages/client/src/components/MkWindow.vue
@@ -9,6 +9,7 @@
 			ref="rootEl"
 			class="ebkgocck"
 			:class="{ maximized }"
+			v-bind="$attrs"
 		>
 			<div
 				class="body _shadow _narrow_"
@@ -596,6 +597,11 @@ defineExpose({
 		}
 	}
 
+	&.page-window > .body > .body {
+		background: var(--bg);
+		scrollbar-gutter: stable;
+	}
+
 	> .handle {
 		$size: 8px;
 

From 2515319c08c177e7851aac50e4871f9c8a8c43b3 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Wed, 31 May 2023 22:38:14 -0400
Subject: [PATCH 181/319] hide back button when not needed

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

diff --git a/packages/client/src/components/MkPageWindow.vue b/packages/client/src/components/MkPageWindow.vue
index 703494144e..a5951fd1d7 100644
--- a/packages/client/src/components/MkPageWindow.vue
+++ b/packages/client/src/components/MkPageWindow.vue
@@ -97,6 +97,7 @@ provideMetadataReceiver((info) => {
 	pageMetadata = info;
 });
 provide("shouldOmitHeaderTitle", true);
+provide("shouldBackButton", false);
 provide("shouldHeaderThin", true);
 
 const contextmenu = $computed(() => [
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index ae703092fe..1a8c74500d 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -10,7 +10,7 @@
 		<div class="left">
 			<div class="buttons">
 				<button
-					v-if="props.displayBackButton"
+					v-if="displayBackButton"
 					class="_buttonIcon button icon backButton"
 					@click.stop="goBack()"
 					@touchstart="preventDrag"
@@ -164,6 +164,8 @@ const props = defineProps<{
 	to?: string;
 }>();
 
+const displayBackButton = props.displayBackButton && history.length > 2 && inject("shouldBackButton", true);
+
 const emit = defineEmits<{
 	(ev: "update:tab", key: string);
 }>();

From c5cd624d821f48bc1d0d3c0c16ff65b0dcafc888 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Wed, 31 May 2023 23:35:25 -0400
Subject: [PATCH 182/319] Add expand on note click option

---
 locales/en-US.yml                                 | 2 ++
 packages/client/src/components/MkNote.vue         | 5 +++--
 packages/client/src/components/MkNoteDetailed.vue | 4 ----
 packages/client/src/components/MkNoteSub.vue      | 9 ++++++---
 packages/client/src/pages/settings/general.vue    | 8 ++++++++
 packages/client/src/store.ts                      | 4 ++++
 6 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index ece9a92016..a1c406c5d1 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -598,6 +598,8 @@ scratchpadDescription: "The scratchpad provides an environment for AiScript expe
 output: "Output"
 script: "Script"
 disablePagesScript: "Disable AiScript on Pages"
+expandOnNoteClick: "Expand post on click"
+expandOnNoteClickDesc: "If disabled, you can still expand posts in the right-click menu or by clicking the timestamp."
 updateRemoteUser: "Update remote user information"
 deleteAllFiles: "Delete all files"
 deleteAllFilesConfirm: "Are you sure that you want to delete all files?"
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 589b83a513..669fd67efa 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -68,6 +68,7 @@
 			class="article"
 			@contextmenu.stop="onContextmenu"
 			@click="noteClick"
+			:style="{ cursor: expandOnNoteClick && !detailedView ? 'pointer' : '' }"
 		>
 			<div class="main">
 				<div class="header-container">
@@ -313,6 +314,7 @@ const muted = ref(getWordSoftMute(note, $i, defaultStore.state.mutedWords));
 const translation = ref(null);
 const translating = ref(false);
 const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
+const expandOnNoteClick = defaultStore.state.expandOnNoteClick;
 
 const keymap = {
 	r: () => reply(true),
@@ -501,7 +503,7 @@ function scrollIntoView() {
 }
 
 function noteClick(e) {
-	if (document.getSelection().type === "Range" || props.detailedView) {
+	if (document.getSelection().type === "Range" || props.detailedView || !expandOnNoteClick) {
 		e.stopPropagation();
 	} else {
 		router.push(notePage(appearNote));
@@ -704,7 +706,6 @@ defineExpose({
 		position: relative;
 		overflow: clip;
 		padding: 4px 32px 10px;
-		cursor: pointer;
 
 		&:first-child,
 		&:nth-child(2) {
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 68e33d701f..ff8264a606 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -534,12 +534,8 @@ onUnmounted(() => {
 
 	> .reply {
 		border-top: solid 0.5px var(--divider);
-		cursor: pointer;
 		padding-top: 24px;
 		padding-bottom: 10px;
-		@media (pointer: coarse) {
-			cursor: default;
-		}
 	}
 
 	// Hover
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index dd69145a03..60fbbe11eb 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -14,7 +14,10 @@
 		@contextmenu.stop="onContextmenu"
 	>
 		<div v-if="conversation && depth > 1" class="line"></div>
-		<div class="main" @click="noteClick">
+		<div class="main" 
+			@click="noteClick"
+			:style="{ cursor: expandOnNoteClick ? 'pointer' : '' }"
+		>
 			<div class="avatar-container">
 				<MkAvatar class="avatar" :user="appearNote.user" />
 				<div
@@ -258,6 +261,7 @@ const replies: misskey.entities.Note[] =
 		)
 		.reverse() ?? [];
 const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
+const expandOnNoteClick = defaultStore.state.expandOnNoteClick;
 
 useNoteCapture({
 	rootEl: el,
@@ -397,7 +401,7 @@ function blur() {
 }
 
 function noteClick(e) {
-	if (document.getSelection().type === "Range") {
+	if (document.getSelection().type === "Range" || !expandOnNoteClick) {
 		e.stopPropagation();
 	} else {
 		router.push(notePage(props.note));
@@ -422,7 +426,6 @@ function noteClick(e) {
 
 	> .main {
 		display: flex;
-		cursor: pointer;
 
 		> .avatar-container {
 			margin-right: 8px;
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index f120551b82..5486503b1c 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -54,6 +54,10 @@
 			<FormSwitch v-model="disablePagesScript" class="_formBlock">{{
 				i18n.ts.disablePagesScript
 			}}</FormSwitch>
+			<FormSwitch v-model="expandOnNoteClick" class="_formBlock">{{ 
+				i18n.ts.expandOnNoteClick
+			}}<template #caption>{{ i18n.ts.expandOnNoteClickDesc }}</template>
+			</FormSwitch>
 			<FormSwitch v-model="profile.showTimelineReplies" class="_formBlock"
 				>{{ i18n.ts.flagShowTimelineReplies
 				}}<template #caption
@@ -299,6 +303,9 @@ const nsfw = computed(defaultStore.makeGetterSetter("nsfw"));
 const disablePagesScript = computed(
 	defaultStore.makeGetterSetter("disablePagesScript")
 );
+const expandOnNoteClick = computed(
+	defaultStore.makeGetterSetter("expandOnNoteClick")
+);
 const showFixedPostForm = computed(
 	defaultStore.makeGetterSetter("showFixedPostForm")
 );
@@ -366,6 +373,7 @@ watch(
 		seperateRenoteQuote,
 		showAdminUpdates,
 		autoplayMfm,
+		expandOnNoteClick,
 	],
 	async () => {
 		await reloadAsk();
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index b6897a65ce..68d299aa40 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -162,6 +162,10 @@ export const defaultStore = markRaw(
 			where: "device",
 			default: true,
 		},
+		expandOnNoteClick: {
+			where: "device",
+			default: true,
+		},
 		nsfw: {
 			where: "device",
 			default: "respect" as "respect" | "force" | "ignore",

From 7c4b14e43247f35a1165eaff58b9c8f7b2e80099 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Wed, 31 May 2023 23:38:08 -0400
Subject: [PATCH 183/319] typo

---
 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 a1c406c5d1..251995cf4f 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -598,8 +598,8 @@ scratchpadDescription: "The scratchpad provides an environment for AiScript expe
 output: "Output"
 script: "Script"
 disablePagesScript: "Disable AiScript on Pages"
-expandOnNoteClick: "Expand post on click"
-expandOnNoteClickDesc: "If disabled, you can still expand posts in the right-click menu or by clicking the timestamp."
+expandOnNoteClick: "Open post on click"
+expandOnNoteClickDesc: "If disabled, you can still open posts in the right-click menu or by clicking the timestamp."
 updateRemoteUser: "Update remote user information"
 deleteAllFiles: "Delete all files"
 deleteAllFilesConfirm: "Are you sure that you want to delete all files?"

From b1eab102ec194f71b19ab073272a86e4c28069cb Mon Sep 17 00:00:00 2001
From: Morten Juhl-Johansen <gitlab@0pn.eu>
Date: Thu, 1 Jun 2023 11:16:57 +0000
Subject: [PATCH 184/319] chore: Translated using Weblate (Danish)

Currently translated at 11.5% (203 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/da/
---
 locales/da-DK.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/locales/da-DK.yml b/locales/da-DK.yml
index c6d339a2e3..8af6a538e7 100644
--- a/locales/da-DK.yml
+++ b/locales/da-DK.yml
@@ -217,3 +217,21 @@ perHour: Hver time
 perDay: Hver dag
 stopActivityDelivery: Stop med at sende aktiviteter
 blockThisInstance: Blokere denne instans
+muteAndBlock: Mutes og blokeringer
+mutedUsers: Mutede brugere
+newer: nyere
+older: ældre
+silencedInstances: Nedtonede servere
+clearQueue: Ryd kø
+clearQueueConfirmTitle: Er du sikker på, at du ønsker at rydde køen?
+clearCachedFiles: Ryd cache
+clearCachedFilesConfirm: Er du sikker på, at du ønsker at slette alle cachede eksterne
+  filer?
+blockedInstances: Blokerede servere
+blockedInstancesDescription: Listen af navne på servere, du ønsker at blokere. Servere
+  på listen vil ikke længere kunne kommunikere med denne server.
+hiddenTags: Skjulte hashtags
+clearQueueConfirmText: De indlæg i denne kø, der ikke allerede er leveret, vil ikke
+  blive federeret. Denne operation er almindeligvis ikke påkrævet.
+jumpToPrevious: Spring til tidligere
+cw: Advarsel om indhold

From 4d2eaa645bc812daca64aaffff053589fe87346c Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 1 Jun 2023 20:53:13 +0200
Subject: [PATCH 185/319] Import emojis without meta.json

---
 .../processors/db/import-custom-emojis.ts     | 127 +++++++++++++-----
 1 file changed, 91 insertions(+), 36 deletions(-)

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 e2454405fd..77eb130a54 100644
--- a/packages/backend/src/queue/processors/db/import-custom-emojis.ts
+++ b/packages/backend/src/queue/processors/db/import-custom-emojis.ts
@@ -11,6 +11,7 @@ import { addFile } from "@/services/drive/add-file.js";
 import { genId } from "@/misc/gen-id.js";
 import { db } from "@/db/postgre.js";
 import probeImageSize from "probe-image-size";
+import * as path from "path";
 
 const logger = queueLogger.createSubLogger("import-custom-emojis");
 
@@ -29,11 +30,11 @@ export async function importCustomEmojis(
 		return;
 	}
 
-	const [path, cleanup] = await createTempDir();
+	const [tempPath, cleanup] = await createTempDir();
 
-	logger.info(`Temp dir is ${path}`);
+	logger.info(`Temp dir is ${tempPath}`);
 
-	const destPath = `${path}/emojis.zip`;
+	const destPath = `${tempPath}/emojis.zip`;
 
 	try {
 		fs.writeFileSync(destPath, "", "binary");
@@ -46,44 +47,98 @@ export async function importCustomEmojis(
 		throw e;
 	}
 
-	const outputPath = `${path}/emojis`;
+	const outputPath = `${tempPath}/emojis`;
 	const unzipStream = fs.createReadStream(destPath);
 	const zip = new AdmZip(destPath);
 	zip.extractAllToAsync(outputPath, true, false, async (error) => {
 		if (error) throw error;
-		const metaRaw = fs.readFileSync(`${outputPath}/meta.json`, "utf-8");
-		const meta = JSON.parse(metaRaw);
 
-		for (const record of meta.emojis) {
-			if (!record.downloaded) continue;
-			const emojiInfo = record.emoji;
-			const emojiPath = `${outputPath}/${record.fileName}`;
-			await Emojis.delete({
-				name: emojiInfo.name,
-			});
-			const driveFile = await addFile({
-				user: null,
-				path: emojiPath,
-				name: record.fileName,
-				force: true,
-			});
-			const file = fs.createReadStream(emojiPath);
-			const size = await probeImageSize(file);
-			file.destroy();
-			await Emojis.insert({
-				id: genId(),
-				updatedAt: new Date(),
-				name: emojiInfo.name,
-				category: emojiInfo.category,
-				host: null,
-				aliases: emojiInfo.aliases,
-				originalUrl: driveFile.url,
-				publicUrl: driveFile.webpublicUrl ?? driveFile.url,
-				type: driveFile.webpublicType ?? driveFile.type,
-				license: emojiInfo.license,
-				width: size.width || null,
-				height: size.height || null,
-			}).then((x) => Emojis.findOneByOrFail(x.identifiers[0]));
+		if (fs.existsSync(`${outputPath}/meta.json`)) {
+			logger.info("starting emoji import with metadata")
+			const metaRaw = fs.readFileSync(`${outputPath}/meta.json`, "utf-8");
+			const meta = JSON.parse(metaRaw);
+
+			for (const record of meta.emojis) {
+				if (!record.downloaded) continue;
+				const emojiInfo = record.emoji;
+				const emojiPath = `${outputPath}/${record.fileName}`;
+				await Emojis.delete({
+					name: emojiInfo.name,
+				});
+				const driveFile = await addFile({
+					user: null,
+					path: emojiPath,
+					name: record.fileName,
+					force: true,
+				});
+				const file = fs.createReadStream(emojiPath);
+				const size = await probeImageSize(file);
+				file.destroy();
+				await Emojis.insert({
+					id: genId(),
+					updatedAt: new Date(),
+					name: emojiInfo.name,
+					category: emojiInfo.category,
+					host: null,
+					aliases: emojiInfo.aliases,
+					originalUrl: driveFile.url,
+					publicUrl: driveFile.webpublicUrl ?? driveFile.url,
+					type: driveFile.webpublicType ?? driveFile.type,
+					license: emojiInfo.license,
+					width: size.width || null,
+					height: size.height || null,
+				}).then((x) => Emojis.findOneByOrFail(x.identifiers[0]));
+			}
+		} else {
+			logger.info("starting emoji import without metadata")
+			// Since we lack metadata, we import into a randomized category name instead
+			let categoryName = genId();
+
+			let containedEmojis = fs.readdirSync(outputPath);
+
+			// Filter directories
+			containedEmojis = containedEmojis.filter(
+				(emoji) => !fs.lstatSync(`${outputPath}/${emoji}`).isDirectory(),
+			);
+
+			// Filter out accidental JSON files
+			containedEmojis = containedEmojis.filter((emoji) =>
+				emoji.match(/\.(json)$/i),
+			);
+
+			// only go one layer deep, recursion would be weird
+			containedEmojis.filter((emoji) => !emoji.includes("/"));
+
+			for (const emojiPath of containedEmojis) {
+				// strip extension and get filename to use as name
+				const name = path.basename(emojiPath, path.extname(emojiPath));
+				await Emojis.delete({
+					name: name,
+				});
+				const driveFile = await addFile({
+					user: null,
+					path: emojiPath,
+					name: path.basename(emojiPath),
+					force: true,
+				});
+				const file = fs.createReadStream(emojiPath);
+				const size = await probeImageSize(file);
+				file.destroy();
+				await Emojis.insert({
+					id: genId(),
+					updatedAt: new Date(),
+					name: name,
+					category: categoryName,
+					host: null,
+					aliases: [],
+					originalUrl: driveFile.url,
+					publicUrl: driveFile.webpublicUrl ?? driveFile.url,
+					type: driveFile.webpublicType ?? driveFile.type,
+					license: null,
+					width: size.width || null,
+					height: size.height || null,
+				}).then((x) => Emojis.findOneByOrFail(x.identifiers[0]));
+			}
 		}
 
 		await db.queryResultCache!.remove(["meta_emojis"]);

From 4e4617b4751acacb1f7962c59ce8fdf11d814701 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 1 Jun 2023 11:53:32 -0700
Subject: [PATCH 186/319] fix: locale key

---
 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 ece9a92016..e26f6ed2b5 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -2031,6 +2031,6 @@ _experiments:
   postEditingCaption: "Shows the option for users to edit their existing posts via\
     \ the post options menu."
   enablePostImports: "Enable post imports"
-  postImportsDescription: "Allows users to import their posts from past Calckey,\
+  postImportsCaption: "Allows users to import their posts from past Calckey,\
     \ Misskey, Mastodon, Akkoma, and Pleroma accounts. It may cause slowdowns during\
     \ load if your queue is bottlenecked."

From 35e72bfca767d3fcfb4290cf60628fec73824587 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Thu, 1 Jun 2023 11:55:13 -0700
Subject: [PATCH 187/319] chore: formatting

---
 packages/client/src/components/MkInfo.vue     |  2 +-
 .../src/components/MkSubNoteContent.vue       | 23 +++++++++++++++----
 .../src/components/global/MkPageHeader.vue    |  5 +++-
 packages/client/src/pages/about-calckey.vue   | 13 ++++++-----
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/packages/client/src/components/MkInfo.vue b/packages/client/src/components/MkInfo.vue
index f07594ca73..ba3a606ab8 100644
--- a/packages/client/src/components/MkInfo.vue
+++ b/packages/client/src/components/MkInfo.vue
@@ -50,7 +50,7 @@ function close() {
 	border-radius: var(--radius);
 	display: flex;
 	align-items: center;
-	gap: .4em;
+	gap: 0.4em;
 
 	&.warn {
 		background: var(--infoWarnBg);
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index e651b3923c..0b6f920cb8 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -2,7 +2,9 @@
 	<p v-if="note.cw != null" class="cw">
 		<MkA
 			v-if="conversation && note.renoteId == parentId"
-			:to="detailedView ? `#${parentId}` : `${notePage(note)}#${parentId}`"
+			:to="
+				detailedView ? `#${parentId}` : `${notePage(note)}#${parentId}`
+			"
 			behavior="browser"
 			class="reply-icon"
 			@click.stop
@@ -11,7 +13,11 @@
 		</MkA>
 		<MkA
 			v-else-if="!detailed && note.replyId"
-			:to="detailedView ? `#${note.replyId}` :`${notePage(note)}#${note.replyId}`"
+			:to="
+				detailedView
+					? `#${note.replyId}`
+					: `${notePage(note)}#${note.replyId}`
+			"
 			behavior="browser"
 			v-tooltip="i18n.ts.jumpToPrevious"
 			class="reply-icon"
@@ -66,7 +72,11 @@
 				<template v-if="!note.cw">
 					<MkA
 						v-if="conversation && note.renoteId == parentId"
-						:to="detailedView ? `#${parentId}` : `${notePage(note)}#${parentId}`"
+						:to="
+							detailedView
+								? `#${parentId}`
+								: `${notePage(note)}#${parentId}`
+						"
 						behavior="browser"
 						class="reply-icon"
 						@click.stop
@@ -75,7 +85,11 @@
 					</MkA>
 					<MkA
 						v-else-if="!detailed && note.replyId"
-						:to="detailedView ? `#${note.replyId}` :`${notePage(note)}#${note.replyId}`"
+						:to="
+							detailedView
+								? `#${note.replyId}`
+								: `${notePage(note)}#${note.replyId}`
+						"
 						behavior="browser"
 						v-tooltip="i18n.ts.jumpToPrevious"
 						class="reply-icon"
@@ -179,7 +193,6 @@ import { extractMfmWithAnimation } from "@/scripts/extract-mfm";
 import { i18n } from "@/i18n";
 import { defaultStore } from "@/store";
 
-
 const props = defineProps<{
 	note: misskey.entities.Note;
 	parentId?;
diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index 1a8c74500d..a000b16bce 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -164,7 +164,10 @@ const props = defineProps<{
 	to?: string;
 }>();
 
-const displayBackButton = props.displayBackButton && history.length > 2 && inject("shouldBackButton", true);
+const displayBackButton =
+	props.displayBackButton &&
+	history.length > 2 &&
+	inject("shouldBackButton", true);
 
 const emit = defineEmits<{
 	(ev: "update:tab", key: string);
diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue
index 71dbeb87bd..f0faa40660 100644
--- a/packages/client/src/pages/about-calckey.vue
+++ b/packages/client/src/pages/about-calckey.vue
@@ -97,17 +97,18 @@
 								><Mfm
 									:text="'$[sparkle @kainoa@calckey.social] (Main developer)'"
 							/></FormLink>
-							<FormLink to="/@cleo@bz.pawdev.me"
-								><Mfm :text="'@cleo@bz.pawdev.me (Maintainer)'"
+							<FormLink to="/@april@calckey.social"
+								><Mfm
+									:text="'@april@calckey.social (Backend)'"
+							/></FormLink>
+							<FormLink to="/@freeplay@calckey.social"
+								><Mfm
+									:text="'@freeplay@calckey.social (UI/UX)'"
 							/></FormLink>
 							<FormLink to="/@panos@calckey.social"
 								><Mfm
 									:text="'@panos@calckey.social (Project Coordinator)'"
 							/></FormLink>
-							<FormLink to="/@freeplay@calckey.social"
-								><Mfm
-									:text="'@freeplay@calckey.social (UI)'"
-							/></FormLink>
 							<FormLink
 								to="https://www.youtube.com/c/Henkiwashere"
 								external

From f508a358b1f74b9faaf34057eeedf48dbbac5912 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 1 Jun 2023 21:01:15 +0200
Subject: [PATCH 188/319] more logging

---
 .../backend/src/queue/processors/db/import-custom-emojis.ts   | 4 ++++
 1 file changed, 4 insertions(+)

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 77eb130a54..d80ff988b8 100644
--- a/packages/backend/src/queue/processors/db/import-custom-emojis.ts
+++ b/packages/backend/src/queue/processors/db/import-custom-emojis.ts
@@ -112,6 +112,8 @@ export async function importCustomEmojis(
 			for (const emojiPath of containedEmojis) {
 				// strip extension and get filename to use as name
 				const name = path.basename(emojiPath, path.extname(emojiPath));
+				logger.info(`importing ${name}`)
+
 				await Emojis.delete({
 					name: name,
 				});
@@ -124,6 +126,8 @@ export async function importCustomEmojis(
 				const file = fs.createReadStream(emojiPath);
 				const size = await probeImageSize(file);
 				file.destroy();
+				logger.info(`emoji size: ${size.width}x${size.height}`)
+
 				await Emojis.insert({
 					id: genId(),
 					updatedAt: new Date(),

From d409c31ad51174fd9db4289e795821bffde48e93 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 1 Jun 2023 21:12:03 +0200
Subject: [PATCH 189/319] me when I lack a brain

---
 .../backend/src/queue/processors/db/import-custom-emojis.ts    | 3 ---
 1 file changed, 3 deletions(-)

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 d80ff988b8..7dbb525d35 100644
--- a/packages/backend/src/queue/processors/db/import-custom-emojis.ts
+++ b/packages/backend/src/queue/processors/db/import-custom-emojis.ts
@@ -106,9 +106,6 @@ export async function importCustomEmojis(
 				emoji.match(/\.(json)$/i),
 			);
 
-			// only go one layer deep, recursion would be weird
-			containedEmojis.filter((emoji) => !emoji.includes("/"));
-
 			for (const emojiPath of containedEmojis) {
 				// strip extension and get filename to use as name
 				const name = path.basename(emojiPath, path.extname(emojiPath));

From 9be58ba0b4b92e0291ada5a01ee42f67be1d3611 Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 1 Jun 2023 21:30:23 +0200
Subject: [PATCH 190/319] missing inversion + use proper emoji path

---
 .../queue/processors/db/import-custom-emojis.ts   | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

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 7dbb525d35..a40f2c5cb3 100644
--- a/packages/backend/src/queue/processors/db/import-custom-emojis.ts
+++ b/packages/backend/src/queue/processors/db/import-custom-emojis.ts
@@ -96,19 +96,16 @@ export async function importCustomEmojis(
 
 			let containedEmojis = fs.readdirSync(outputPath);
 
-			// Filter directories
-			containedEmojis = containedEmojis.filter(
-				(emoji) => !fs.lstatSync(`${outputPath}/${emoji}`).isDirectory(),
-			);
-
 			// Filter out accidental JSON files
 			containedEmojis = containedEmojis.filter((emoji) =>
-				emoji.match(/\.(json)$/i),
+				!emoji.match(/\.(json)$/i),
 			);
 
-			for (const emojiPath of containedEmojis) {
+			for (const emojiFilename of containedEmojis) {
 				// strip extension and get filename to use as name
-				const name = path.basename(emojiPath, path.extname(emojiPath));
+				const name = path.basename(emojiFilename, path.extname(emojiFilename));
+				const emojiPath = `${outputPath}/${emojiFilename}`;
+
 				logger.info(`importing ${name}`)
 
 				await Emojis.delete({
@@ -117,7 +114,7 @@ export async function importCustomEmojis(
 				const driveFile = await addFile({
 					user: null,
 					path: emojiPath,
-					name: path.basename(emojiPath),
+					name: path.basename(emojiFilename),
 					force: true,
 				});
 				const file = fs.createReadStream(emojiPath);

From 7eeac4810a40df979c0f3771bc99a5841611ad9f Mon Sep 17 00:00:00 2001
From: PrivateGER <privateger@privateger.me>
Date: Thu, 1 Jun 2023 21:38:37 +0200
Subject: [PATCH 191/319] formatter

---
 .../src/queue/processors/db/import-custom-emojis.ts  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 a40f2c5cb3..9e8b3b174e 100644
--- a/packages/backend/src/queue/processors/db/import-custom-emojis.ts
+++ b/packages/backend/src/queue/processors/db/import-custom-emojis.ts
@@ -54,7 +54,7 @@ export async function importCustomEmojis(
 		if (error) throw error;
 
 		if (fs.existsSync(`${outputPath}/meta.json`)) {
-			logger.info("starting emoji import with metadata")
+			logger.info("starting emoji import with metadata");
 			const metaRaw = fs.readFileSync(`${outputPath}/meta.json`, "utf-8");
 			const meta = JSON.parse(metaRaw);
 
@@ -90,15 +90,15 @@ export async function importCustomEmojis(
 				}).then((x) => Emojis.findOneByOrFail(x.identifiers[0]));
 			}
 		} else {
-			logger.info("starting emoji import without metadata")
+			logger.info("starting emoji import without metadata");
 			// Since we lack metadata, we import into a randomized category name instead
 			let categoryName = genId();
 
 			let containedEmojis = fs.readdirSync(outputPath);
 
 			// Filter out accidental JSON files
-			containedEmojis = containedEmojis.filter((emoji) =>
-				!emoji.match(/\.(json)$/i),
+			containedEmojis = containedEmojis.filter(
+				(emoji) => !emoji.match(/\.(json)$/i),
 			);
 
 			for (const emojiFilename of containedEmojis) {
@@ -106,7 +106,7 @@ export async function importCustomEmojis(
 				const name = path.basename(emojiFilename, path.extname(emojiFilename));
 				const emojiPath = `${outputPath}/${emojiFilename}`;
 
-				logger.info(`importing ${name}`)
+				logger.info(`importing ${name}`);
 
 				await Emojis.delete({
 					name: name,
@@ -120,7 +120,7 @@ export async function importCustomEmojis(
 				const file = fs.createReadStream(emojiPath);
 				const size = await probeImageSize(file);
 				file.destroy();
-				logger.info(`emoji size: ${size.width}x${size.height}`)
+				logger.info(`emoji size: ${size.width}x${size.height}`);
 
 				await Emojis.insert({
 					id: genId(),

From 4c64feee46651c03268dd51374529fb5be03fdab Mon Sep 17 00:00:00 2001
From: Michael 465537 <michael.465537@gmail.com>
Date: Thu, 1 Jun 2023 20:15:46 +0000
Subject: [PATCH 192/319] chore: Translated using Weblate (German)

Currently translated at 98.9% (1734 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
---
 locales/de-DE.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 5c71d27cd1..3fa1bb1f58 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -25,9 +25,9 @@ openInWindow: "In einem Fenster öffnen"
 profile: "Profil"
 timeline: "Timelines"
 noAccountDescription: "Dieser Nutzer hat seine Profilbeschreibung noch nicht ausgefüllt."
-login: "Anmelden"
+login: "Login"
 loggingIn: "Du wirst angemeldet"
-logout: "Abmelden"
+logout: "Logout"
 signup: "Registrieren"
 uploading: "Wird hochgeladen …"
 save: "Speichern"
@@ -1571,7 +1571,7 @@ _timelines:
   local: "Local-TL"
   social: "Social-TL"
   global: "Global-TL"
-  recommended: Favoriten
+  recommended: Admin-Favoriten
 _pages:
   newPage: "Neue Seite erstellen"
   editPage: "Seite bearbeiten"

From 1efb167f8ffa5159adc80122d6395c57354c46aa Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Fri, 2 Jun 2023 14:44:41 -0400
Subject: [PATCH 193/319] Add delay & start adding cubic-bezier to mfm

---
 packages/client/src/components/mfm.ts | 32 +++++++++++++++++++--------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 23a9333485..331fd3c123 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -57,6 +57,10 @@ export default defineComponent({
 			if (t == null) return null;
 			return t.match(/^[0-9.]+s$/) ? t : null;
 		};
+		const validEase = (e: string | null | undefined) => {
+			if (e == null) return null;
+			return e.match(/\(-?[0-9.]+,-?[0-9.]+,-?[0-9.]+,-?[0-9.]+\)/) ? e : null;
+		}
 
 		const genEl = (ast: mfm.MfmNode[]) =>
 			concat(
@@ -102,22 +106,27 @@ export default defineComponent({
 							switch (token.props.name) {
 								case "tada": {
 									const speed = validTime(token.props.args.speed) || "1s";
-									style = `font-size: 150%; animation: tada ${speed} linear infinite both;`;
+									const delay = validTime(token.props.args.delay) || "0s";
+									const ease = validEase(token.props.args.ease) ?? "(0,0,1,1)";
+									style = `font-size: 150%; animation: tada ${speed} ${delay} cubic-bezier${ease} infinite both;`;
 									break;
 								}
 								case "jelly": {
 									const speed = validTime(token.props.args.speed) || "1s";
-									style = `animation: mfm-rubberBand ${speed} linear infinite both;`;
+									const delay = validTime(token.props.args.delay) || "0s";
+									style = `animation: mfm-rubberBand ${speed} ${delay} linear infinite both;`;
 									break;
 								}
 								case "twitch": {
 									const speed = validTime(token.props.args.speed) || "0.5s";
-									style = `animation: mfm-twitch ${speed} ease infinite;`;
+									const delay = validTime(token.props.args.delay) || "0s";
+									style = `animation: mfm-twitch ${speed} ${delay} ease infinite;`;
 									break;
 								}
 								case "shake": {
 									const speed = validTime(token.props.args.speed) || "0.5s";
-									style = `animation: mfm-shake ${speed} ease infinite;`;
+									const delay = validTime(token.props.args.delay) || "0s";
+									style = `animation: mfm-shake ${speed} ${delay} ease infinite;`;
 									break;
 								}
 								case "spin": {
@@ -132,22 +141,26 @@ export default defineComponent({
 										? "mfm-spinY"
 										: "mfm-spin";
 									const speed = validTime(token.props.args.speed) || "1.5s";
-									style = `animation: ${anime} ${speed} linear infinite; animation-direction: ${direction};`;
+									const delay = validTime(token.props.args.delay) || "0s";
+									style = `animation: ${anime} ${speed} ${delay} linear infinite; animation-direction: ${direction};`;
 									break;
 								}
 								case "jump": {
 									const speed = validTime(token.props.args.speed) || "0.75s";
-									style = `animation: mfm-jump ${speed} linear infinite;`;
+									const delay = validTime(token.props.args.delay) || "0s";
+									style = `animation: mfm-jump ${speed} ${delay} linear infinite;`;
 									break;
 								}
 								case "bounce": {
 									const speed = validTime(token.props.args.speed) || "0.75s";
-									style = `animation: mfm-bounce ${speed} linear infinite; transform-origin: center bottom;`;
+									const delay = validTime(token.props.args.delay) || "0s";
+									style = `animation: mfm-bounce ${speed} ${delay} linear infinite; transform-origin: center bottom;`;
 									break;
 								}
 								case "rainbow": {
 									const speed = validTime(token.props.args.speed) || "1s";
-									style = `animation: mfm-rainbow ${speed} linear infinite;`;
+									const delay = validTime(token.props.args.delay) || "0s";
+									style = `animation: mfm-rainbow ${speed} ${delay} linear infinite;`;
 									break;
 								}
 								case "sparkle": {
@@ -161,7 +174,8 @@ export default defineComponent({
 										? "alternate-reverse"
 										: "alternate";
 									const speed = validTime(token.props.args.speed) || "1.5s";
-									style = `animation: mfm-fade ${speed} linear infinite; animation-direction: ${direction};`;
+									const delay = validTime(token.props.args.delay) || "0s";
+									style = `animation: mfm-fade ${speed} ${delay} linear infinite; animation-direction: ${direction};`;
 									break;
 								}
 								case "flip": {

From c722cee10182bbcec5711fc8daef79947c05b3a6 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Fri, 2 Jun 2023 15:06:57 -0400
Subject: [PATCH 194/319] Idk why I used ?? there

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

diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 331fd3c123..74a92ee488 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -107,7 +107,7 @@ export default defineComponent({
 								case "tada": {
 									const speed = validTime(token.props.args.speed) || "1s";
 									const delay = validTime(token.props.args.delay) || "0s";
-									const ease = validEase(token.props.args.ease) ?? "(0,0,1,1)";
+									const ease = validEase(token.props.args.ease) || "(0,0,1,1)";
 									style = `font-size: 150%; animation: tada ${speed} ${delay} cubic-bezier${ease} infinite both;`;
 									break;
 								}

From d9bf0f7cc49599e61010d22c568c6a9c7cd46511 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 3 Jun 2023 04:16:36 +0900
Subject: [PATCH 195/319] instance -> server

---
 CALCKEY.md         | 12 ++++++------
 CODE_OF_CONDUCT.md |  2 +-
 README.md          | 18 +++++++++---------
 docs/docker.md     |  8 ++++----
 docs/kubernetes.md |  4 ++--
 5 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 55d37a56e5..d1585adc34 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -11,7 +11,7 @@
   - Federate with note edits
   - User "choices" (recommended users) like Mastodon and Soapbox
   - Join Reason system like Mastodon/Pleroma
-  - Option to publicize instance blocks
+  - Option to publicize server blocks
   - Build flag to remove NSFW/AI stuff
   - Filter notifications by user
   - Exclude self from antenna
@@ -19,7 +19,7 @@
   - MFM button
   - Personal notes for all accounts
   - Fully revamp non-logged-in screen
-  - Lookup/details for post/file/instance
+  - Lookup/details for post/file/server
   - [Rat mode?](https://stop.voring.me/notes/933fx97bmd)
 
 ## Work in progress
@@ -43,7 +43,7 @@
   - Upgrade packages with security vunrabilities
 - Saner defaults
 - Fediverse account migration
-- Recommended instances timeline
+- Recommended servers timeline
 - OCR image captioning
 - Improve mobile UX
   - Swipe through pages on mobile
@@ -71,7 +71,7 @@
 - Better welcome screen (not logged in)
 - vue-plyr as video/audio player
 - Ability to turn off "Connection lost" message
-- Raw instance info only for moderators
+- Raw server info only for moderators
 - New spinner animation
 - Spinner instead of "Loading..."
 - SearchX instead of Google
@@ -98,7 +98,7 @@
 - Obliteration of Ai-chan
 - Switch to [Calckey.js](https://codeberg.org/calckey/calckey.js)
 - Woozy mode 🥴
-- Improve blocking instances
+- Improve blocking servers
 - Release notes
 - New post style
 - Admins set default reaction emoji
@@ -117,7 +117,7 @@
 - Sonic search
 - Popular color schemes, including Nord, Gruvbox, and Catppuccin
 - Non-nyaify cat mode
-- Post imports from other Calckey/Misskey/Mastodon/Pleroma/Akkoma instances
+- Post imports from other Calckey/Misskey/Mastodon/Pleroma/Akkoma servers
 - Improve Classic mode
 - Proper Helm/Kubernetes config
 - Multiple boost visibilities
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 143c63d29c..95e2bd421a 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -59,7 +59,7 @@ representative at an online or offline event.
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
+Servers of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
 @thatonecalculator on Codeberg,
 `@kainoa@calckey.social` on the Fediverse,
diff --git a/README.md b/README.md
index 5dcdc4861d..f4d7c4150a 100644
--- a/README.md
+++ b/README.md
@@ -23,15 +23,15 @@
 # ✨ About Calckey
 
 - Calckey is based off of Misskey, a powerful microblogging server on ActivityPub with features such as emoji reactions, a customizable web UI, rich chatting, and much more!
-- Calckey adds many quality of life changes and bug fixes for users and instance admins alike.
+- Calckey adds many quality of life changes and bug fixes for users and server admins alike.
 - Read **[this document](./CALCKEY.md)** all for current and future differences.
 - Notable differences:
   - Improved UI/UX (especially on mobile)
   - Improved notifications
-  - Improved instance security
+  - Improved server security
   - Improved accessibility
   - Improved threads
-  - Recommended Instances timeline
+  - Recommended Servers timeline
   - OCR image captioning
   - New and improved Groups
   - Better intro tutorial
@@ -50,10 +50,10 @@
 - 💸 OpenCollective: <https://opencollective.com/Calckey>
 - 💸 Liberapay: <https://liberapay.com/ThatOneCalculator>
   - Donate publicly to get your name on the Patron list!
-- 🚢 Flagship instance: <https://calckey.social>
+- 🚢 Flagship server: <https://calckey.social>
 - 📣 Official account: <https://i.calckey.cloud/@calckey>
 - 💁 Matrix support room: <https://matrix.to/#/#calckey:matrix.fedibird.com>
-- 📜 Instance list: <https://calckey.fediverse.observer/list>
+- 📜 Server list: <https://calckey.fediverse.observer/list>
 - 📖 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/>
@@ -177,13 +177,13 @@ Please don't use ElasticSearch unless you already have an ElasticSearch setup an
 ## 💅 Customize
 
 - To add custom CSS for all users, edit `./custom/assets/instance.css`.
-- To add static assets (such as images for the splash screen), place them in the `./custom/assets/` directory. They'll then be available on `https://yourinstance.tld/static-assets/filename.ext`.
+- To add static assets (such as images for the splash screen), place them in the `./custom/assets/` directory. They'll then be available on `https://yourserver.tld/static-assets/filename.ext`.
 - To add custom locales, place them in the `./custom/locales/` directory. If you name your custom locale the same as an existing locale, it will overwrite it. If you give it a unique name, it will be added to the list. Also make sure that the first part of the filename matches the locale you're basing it on. (Example: `en-FOO.yml`)
 - To add custom error images, place them in the `./custom/assets/badges` directory, replacing the files already there.
 - To add custom sounds, place only mp3 files in the `./custom/assets/sounds` directory.
 - To update custom assets without rebuilding, just run `pnpm run gulp`.
 
-## 🧑‍🔬 Configuring a new instance
+## 🧑‍🔬 Configuring a new server
 
 - Run `cp .config/example.yml .config/default.yml`
 - Edit `.config/default.yml`, making sure to fill out required fields.
@@ -198,7 +198,7 @@ For migrating from Misskey v13, Misskey v12, and Foundkey, read [this document](
 ### 🍀 Nginx (recommended)
 
 - Run `sudo cp ./calckey.nginx.conf /etc/nginx/sites-available/ && cd /etc/nginx/sites-available/`
-- Edit `calckey.nginx.conf` to reflect your instance properly
+- Edit `calckey.nginx.conf` to reflect your server properly
 - Run `sudo ln -s ./calckey.nginx.conf ../sites-enabled/calckey.nginx.conf`
 - Run `sudo nginx -t` to validate that the config is valid, then restart the NGINX service.
 
@@ -218,7 +218,7 @@ example.tld {
 > Apache has some known problems with Calckey. Only use it if you have to.
 
 - Run `sudo cp ./calckey.apache.conf /etc/apache2/sites-available/ && cd /etc/apache2/sites-available/`
-- Edit `calckey.apache.conf` to reflect your instance properly
+- Edit `calckey.apache.conf` to reflect your server properly
 - Run `sudo a2ensite calckey.apache` to enable the site
 - Run `sudo service apache2 restart` to reload apache2 configuration
 ## 🚀 Build and launch!
diff --git a/docs/docker.md b/docs/docker.md
index 8c42ee54d7..0c625a4b3d 100644
--- a/docs/docker.md
+++ b/docs/docker.md
@@ -1,4 +1,4 @@
-# 🐳 Running a Calckey instance with Docker
+# 🐳 Running a Calckey server with Docker
 
 ## Pre-built docker container
 [thatonecalculator/calckey](https://hub.docker.com/r/thatonecalculator/calckey)
@@ -8,7 +8,7 @@
 There is a `docker-compose.yml` in the root of the project that you can use to build the container from source
 
 - .config/docker.env (**db config settings**)
-- .config/default.yml (**calckey instance settings**)
+- .config/default.yml (**calckey server settings**)
 
 ## Configuring
 
@@ -20,7 +20,7 @@ Rename the files:
 
 then edit them according to your environment.
 You can configure `docker.env` with anything you like, but you will have to pay attention to the `default.yml` file:
-- `url` should be set to the URL you will be hosting the web interface for the instance at.
+- `url` should be set to the URL you will be hosting the web interface for the server 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`
@@ -36,7 +36,7 @@ Copy `docker-compose.yml` and the `config/` to a directory, then run the **docke
 
 NOTE: This will take some time to come fully online, even after download and extracting the container images, and it may emit some error messages before completing successfully. Specifically, the `db` container needs to initialize and so isn't available to the `web` container right away. Only once the `db` container comes online does the `web` container start building and initializing the calckey tables.
 
-Once the instance is up you can use a web browser to access the web interface at `http://serverip:3000` (where `serverip` is the IP of the server you are running the calckey instance on).
+Once the server is up you can use a web browser to access the web interface at `http://serverip:3000` (where `serverip` is the IP of the server you are running the calckey server on).
 
 ## Docker for development
 
diff --git a/docs/kubernetes.md b/docs/kubernetes.md
index 710d0dee06..5cb6e5d831 100644
--- a/docs/kubernetes.md
+++ b/docs/kubernetes.md
@@ -1,4 +1,4 @@
-# Running a Calckey instance with Kubernetes and Helm
+# Running a Calckey server with Kubernetes and Helm
 
 This is a [Helm](https://helm.sh/) chart directory in the root of the project
 that you can use to deploy calckey to a Kubernetes cluster
@@ -27,7 +27,7 @@ helm upgrade \
     -f .config/helm_values.yml
 ```
 
-4. Watch your calckey instance spin up:
+4. Watch your calckey server spin up:
 ```shell
 kubectl -n calckey get po -w
 ```

From d8d2ee266eb20cafc4b2915d4ac84e3656e98475 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Fri, 2 Jun 2023 15:39:33 -0400
Subject: [PATCH 196/319] Setup to also support steps

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

diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 74a92ee488..86a9aba2ed 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -59,7 +59,9 @@ export default defineComponent({
 		};
 		const validEase = (e: string | null | undefined) => {
 			if (e == null) return null;
-			return e.match(/\(-?[0-9.]+,-?[0-9.]+,-?[0-9.]+,-?[0-9.]+\)/) ? e : null;
+			return e.match(/(steps)?\(-?[0-9.]+,-?[0-9.]+,-?[0-9.]+,-?[0-9.]+\)/) 
+				? (e.startsWith("steps") ? e : "cubic-bezier" + e)
+				: null
 		}
 
 		const genEl = (ast: mfm.MfmNode[]) =>
@@ -107,8 +109,8 @@ export default defineComponent({
 								case "tada": {
 									const speed = validTime(token.props.args.speed) || "1s";
 									const delay = validTime(token.props.args.delay) || "0s";
-									const ease = validEase(token.props.args.ease) || "(0,0,1,1)";
-									style = `font-size: 150%; animation: tada ${speed} ${delay} cubic-bezier${ease} infinite both;`;
+									const ease = validEase(token.props.args.ease) || "linear";
+									style = `font-size: 150%; animation: tada ${speed} ${delay} ${ease} infinite both;`;
 									break;
 								}
 								case "jelly": {

From 860e5bdbd039bde7c836af495c88c07d1ea478d9 Mon Sep 17 00:00:00 2001
From: mutex <medini_seiken@mailredacted.com>
Date: Thu, 1 Jun 2023 21:21:16 +0000
Subject: [PATCH 197/319] chore: Translated using Weblate (German)

Currently translated at 99.5% (1745 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
---
 locales/de-DE.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 3fa1bb1f58..bcfcdc0d1a 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -1901,8 +1901,8 @@ _notification:
     followBack: "folgt dir nun auch"
     reply: "Antworten"
     renote: "Renote"
-  voted: haben an Ihrer Umfrage teilgenommen
-  reacted: hat auf Ihren Beitrag reagiert
+  voted: haben bei deiner Umfrage abgestimmt
+  reacted: hat auf deinen Beitrag reagiert
   renoted: hat Ihren Beitrag geteilt
 _deck:
   alwaysShowMainColumn: "Hauptspalte immer zeigen"
@@ -2004,7 +2004,7 @@ socialTimeline: Social-Timeline
 moveFrom: Bisheriges Nutzerkonto zu diesem Nutzerkonto umziehen
 _messaging:
   groups: Gruppen
-  dms: Persönlich
+  dms: Privat
 recommendedInstances: Empfohlene Server
 logoImageUrl: URL des Logo-Bildes
 userSaysSomethingReasonReply: '{name} hat auf einen Beitrag geantwortet der {reason}
@@ -2074,9 +2074,9 @@ _experiments:
     das Menü "Beitragsoptionen" zu bearbeiten
 noGraze: Bitte deaktivieren Sie die Browsererweiterung "Graze for Mastodon", da sie
   die Funktion von Calckey stört.
-indexFrom: Index ab Beitrags-ID (leer lassen, um jeden Beitrag zu indizieren)
-indexNotice: Jetzt wird indiziert. Dies wird wahrscheinlich eine Weile dauern, bitte
-  starten Sie Ihren Server für mindestens eine Stunde nicht neu.
+indexFrom: Indizieren ab Beitrags-ID (frei lassen, um jeden Beitrag zu indizieren)
+indexNotice: Indizierung gestartet. Dies wird wahrscheinlich eine Weile dauern. Bitte
+  starte den Server für mindestens eine Stunde nicht neu.
 customKaTeXMacroDescription: "Richten Sie Makros ein, um mathematische Ausdrücke einfach
   zu schreiben! Die Notation entspricht den LaTeX-Befehlsdefinitionen und wird als\n
   \\newcommand{\\name}{content} or \\newcommand{\\name}[number of arguments]{content}\n

From 6233883cd07650c7362c2f2ab2f35bf6e58f4ebf Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Fri, 2 Jun 2023 17:23:09 -0400
Subject: [PATCH 198/319] hide close button bottom fade for now

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

diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 0b6f920cb8..5c965972ae 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -168,10 +168,10 @@
 				<i class="ph-stop ph-bold"></i> {{ i18n.ts._mfm.stop }}
 			</template>
 		</MkButton>
-		<div
+		<!-- <div
 			v-if="(isLong && !collapsed) || (props.note.cw && showContent)"
 			class="fade"
-		></div>
+		></div> -->
 	</div>
 </template>
 

From 028d47587cc89bdca13de900c4eb8adb03e14d73 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 21:36:47 +0000
Subject: [PATCH 199/319] Update 'CODE_OF_CONDUCT.md'

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

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 95e2bd421a..143c63d29c 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -59,7 +59,7 @@ representative at an online or offline event.
 
 ## Enforcement
 
-Servers of abusive, harassing, or otherwise unacceptable behavior may be
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
 @thatonecalculator on Codeberg,
 `@kainoa@calckey.social` on the Fediverse,

From 4cbf73140c3d62f6c9bbe6f1e64d3cc26c8d6ae3 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 14:52:44 -0700
Subject: [PATCH 200/319] fix: show message on error alert if text is null

---
 packages/client/src/os.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index 0aa823d059..0636bfd3e2 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -277,6 +277,9 @@ export function alert(props: {
 	text?: string | null;
 }): Promise<void> {
 	return new Promise((resolve, reject) => {
+		if (props.text == null && props.type === "error") {
+			props.text = "An unknown error occured!"
+		}
 		popup(
 			MkDialog,
 			props,

From 8e5a374ac76aea52b66bb0eb330f05d96aaa9570 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 14:53:28 -0700
Subject: [PATCH 201/319] chore: formatting

---
 packages/client/src/components/MkNote.vue      | 10 ++++++++--
 packages/client/src/components/MkNoteSub.vue   |  3 ++-
 packages/client/src/os.ts                      |  2 +-
 packages/client/src/pages/about-calckey.vue    |  3 +--
 packages/client/src/pages/settings/general.vue |  8 +++++---
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 669fd67efa..7eca22a734 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -68,7 +68,9 @@
 			class="article"
 			@contextmenu.stop="onContextmenu"
 			@click="noteClick"
-			:style="{ cursor: expandOnNoteClick && !detailedView ? 'pointer' : '' }"
+			:style="{
+				cursor: expandOnNoteClick && !detailedView ? 'pointer' : '',
+			}"
 		>
 			<div class="main">
 				<div class="header-container">
@@ -503,7 +505,11 @@ function scrollIntoView() {
 }
 
 function noteClick(e) {
-	if (document.getSelection().type === "Range" || props.detailedView || !expandOnNoteClick) {
+	if (
+		document.getSelection().type === "Range" ||
+		props.detailedView ||
+		!expandOnNoteClick
+	) {
 		e.stopPropagation();
 	} else {
 		router.push(notePage(appearNote));
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 60fbbe11eb..c26af16687 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -14,7 +14,8 @@
 		@contextmenu.stop="onContextmenu"
 	>
 		<div v-if="conversation && depth > 1" class="line"></div>
-		<div class="main" 
+		<div
+			class="main"
 			@click="noteClick"
 			:style="{ cursor: expandOnNoteClick ? 'pointer' : '' }"
 		>
diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index 0636bfd3e2..6831d72fae 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -278,7 +278,7 @@ export function alert(props: {
 }): Promise<void> {
 	return new Promise((resolve, reject) => {
 		if (props.text == null && props.type === "error") {
-			props.text = "An unknown error occured!"
+			props.text = "An unknown error occured!";
 		}
 		popup(
 			MkDialog,
diff --git a/packages/client/src/pages/about-calckey.vue b/packages/client/src/pages/about-calckey.vue
index f0faa40660..1e16356a51 100644
--- a/packages/client/src/pages/about-calckey.vue
+++ b/packages/client/src/pages/about-calckey.vue
@@ -98,8 +98,7 @@
 									:text="'$[sparkle @kainoa@calckey.social] (Main developer)'"
 							/></FormLink>
 							<FormLink to="/@april@calckey.social"
-								><Mfm
-									:text="'@april@calckey.social (Backend)'"
+								><Mfm :text="'@april@calckey.social (Backend)'"
 							/></FormLink>
 							<FormLink to="/@freeplay@calckey.social"
 								><Mfm
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index 5486503b1c..030126a968 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -54,9 +54,11 @@
 			<FormSwitch v-model="disablePagesScript" class="_formBlock">{{
 				i18n.ts.disablePagesScript
 			}}</FormSwitch>
-			<FormSwitch v-model="expandOnNoteClick" class="_formBlock">{{ 
-				i18n.ts.expandOnNoteClick
-			}}<template #caption>{{ i18n.ts.expandOnNoteClickDesc }}</template>
+			<FormSwitch v-model="expandOnNoteClick" class="_formBlock"
+				>{{ i18n.ts.expandOnNoteClick
+				}}<template #caption>{{
+					i18n.ts.expandOnNoteClickDesc
+				}}</template>
 			</FormSwitch>
 			<FormSwitch v-model="profile.showTimelineReplies" class="_formBlock"
 				>{{ i18n.ts.flagShowTimelineReplies

From 903d12f18fab17219d68cf64e6c1dece39307c7a Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Fri, 2 Jun 2023 18:14:39 -0400
Subject: [PATCH 202/319] fix gap

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

diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index 277d5f5ef9..a7da75dc64 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -261,7 +261,7 @@
 					</div>
 				</div>
 
-				<div class="contents">
+				<div class="contents _gap">
 					<div v-if="user.pinnedNotes.length > 0" class="_gap">
 						<XNote
 							v-for="note in user.pinnedNotes"

From b0a04faaba3e9af6b98da26f04d5b42d805b76df Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 15:45:05 -0700
Subject: [PATCH 203/319] fix: :recycle: use locale for error

https://calckey.social/notes/9fippqiwhl287b5m
---
 packages/client/src/os.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index 6831d72fae..ed911978b4 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -11,6 +11,7 @@ import MkToast from "@/components/MkToast.vue";
 import MkDialog from "@/components/MkDialog.vue";
 import { MenuItem } from "@/types/menu";
 import { $i } from "@/account";
+import { i18n } from "./i18n";
 
 export const pendingApiRequestsCount = ref(0);
 
@@ -278,7 +279,7 @@ export function alert(props: {
 }): Promise<void> {
 	return new Promise((resolve, reject) => {
 		if (props.text == null && props.type === "error") {
-			props.text = "An unknown error occured!";
+			props.text = i18n.ts.somethingHappened;
 		}
 		popup(
 			MkDialog,

From 09983a657d03429cecbe40b09822cfed9d26f605 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 16:10:57 -0700
Subject: [PATCH 204/319] chore: update example config

---
 .config/example.yml | 65 +++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/.config/example.yml b/.config/example.yml
index ba53bde43a..16fa67142e 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -2,32 +2,31 @@
 # Calckey configuration
 #━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
+# After starting your server, please don't change the URL! Doing so will break federation.
+
 #   ┌─────┐
 #───┘ URL └─────────────────────────────────────────────────────
 
 # Final accessible URL seen by a user.
-url: https://example.tld/
-
-# ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
-# URL SETTINGS AFTER THAT!
+url: https://example.com/
 
 #   ┌───────────────────────┐
 #───┘ Port and TLS settings └───────────────────────────────────
 
 #
-# Misskey requires a reverse proxy to support HTTPS connections.
+# Calckey requires a reverse proxy to support HTTPS connections.
 #
-#                 +----- https://example.tld/ ------------+
+#                 +----- https://example.com/ ------------+
 #   +------+      |+-------------+      +----------------+|
-#   | User | ---> || Proxy (443) | ---> | Misskey (3000) ||
+#   | User | ---> || Proxy (443) | ---> | Calckey (3000) ||
 #   +------+      |+-------------+      +----------------+|
 #                 +---------------------------------------+
 #
-#   You need to set up a reverse proxy. (e.g. nginx)
+#   You need to set up a reverse proxy. (e.g. nginx, caddy)
 #   An encrypted connection with HTTPS is highly recommended
 #   because tokens may be transferred in GET requests.
 
-# The port that your Misskey server should listen on.
+# The port that your Calckey server should listen on.
 port: 3000
 
 #   ┌──────────────────────────┐
@@ -62,6 +61,17 @@ redis:
   #prefix: example-prefix
   #db: 1
 
+# Please configure either MeiliSearch *or* Sonic.
+# If both MeiliSearch and Sonic configurations are present, MeiliSearch will take precedence.
+
+#   ┌───────────────────────────┐
+#───┘ MeiliSearch configuration └─────────────────────────────────────
+#meilisearch:
+#  host: meilisearch
+#  port: 7700
+#  ssl: false
+#  apiKey:
+
 #   ┌─────────────────────┐
 #───┘ Sonic configuration └─────────────────────────────────────
 
@@ -72,23 +82,6 @@ redis:
 #  collection: notes
 #  bucket: default
 
-#   ┌─────────────────────────────┐
-#───┘ Elasticsearch configuration └─────────────────────────────
-
-#elasticsearch:
-#  host: localhost
-#  port: 9200
-#  ssl: false
-#  user:
-#  pass:
-
-#   ┌───────────────────────────┐
-#───┘ Meilisearch configuration └─────────────────────────────────────
-#meilisearch:
-#  host: meilisearch
-#  port: 7700
-#  ssl: false
-#  apiKey:
 
 #   ┌───────────────┐
 #───┘ ID generation └───────────────────────────────────────────
@@ -108,10 +101,10 @@ redis:
 #   ┌─────────────────────┐
 #───┘ Other configuration └─────────────────────────────────────
 
-# Max note length, should be < 8000.
+# Maximum length of a post (default 3000, max 8192)
 #maxNoteLength: 3000
 
-# Maximum lenght of an image caption or file comment (default 1500, max 8192)
+# Maximum length of an image caption (default 1500, max 8192)
 #maxCaptionLength: 1500
 
 # Reserved usernames that only the administrator can register with
@@ -185,13 +178,21 @@ reservedUsernames: [
 # Upload or download file size limits (bytes)
 #maxFileSize: 262144000
 
+#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+# Congrats, you've reached the end of the config file needed for most deployments!
+# Enjoy your Calckey server!
+#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+
+
+
+#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 # Managed hosting settings
-# !!!!!!!!!!
-# >>>>>> NORMAL SELF-HOSTERS, STAY AWAY! <<<<<<
-# >>>>>> YOU DON'T NEED THIS! <<<<<<
-# !!!!!!!!!!
+# >>> NORMAL SELF-HOSTERS, STAY AWAY! <<<
+# >>> YOU DON'T NEED THIS! <<<
 # Each category is optional, but if each item in each category is mandatory!
 # If you mess this up, that's on you, you've been warned...
+#━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
 #maxUserSignups: 100
 #isManagedHosting: true

From 389ca3f332748bce2f11048796ee16112eb0ff05 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Fri, 2 Jun 2023 21:04:51 -0400
Subject: [PATCH 205/319] aria to acc menu button

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

diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index a7da75dc64..2ea4bc9711 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -134,7 +134,7 @@
 						</div>
 						<div class="follow-container">
 							<div class="actions">
-								<button class="menu _button" @click="menu">
+								<button class="menu _button" @click="menu" v-tooltip="i18n.ts.menu">
 									<i
 										class="ph-dots-three-outline ph-bold ph-lg"
 									></i>

From bf21b8412909cae4c49d27cbec9c040ed9213067 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Fri, 2 Jun 2023 22:54:23 -0400
Subject: [PATCH 206/319] fix mfm-cheat-sheet styling

---
 .../client/src/components/MkCheatSheetDialog.vue   |  8 ++------
 packages/client/src/pages/mfm-cheat-sheet.vue      | 14 ++++++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/client/src/components/MkCheatSheetDialog.vue b/packages/client/src/components/MkCheatSheetDialog.vue
index 04b8cec6e2..519955d484 100644
--- a/packages/client/src/components/MkCheatSheetDialog.vue
+++ b/packages/client/src/components/MkCheatSheetDialog.vue
@@ -6,12 +6,7 @@
 		@closed="$emit('closed')"
 	>
 		<template #header>{{ i18n.ts._mfm.cheatSheet }}</template>
-
-		<div class="_monolithic_">
-			<div class="_section">
-				<XCheatSheet />
-			</div>
-		</div>
+		<XCheatSheet :popup="true" style="background: var(--bg)"/>
 	</XModalWindow>
 </template>
 
@@ -41,4 +36,5 @@ function close(res) {
 .fade-leave-to {
 	opacity: 0;
 }
+
 </style>
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index a22d7ce1ec..e9fb213b7e 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -1,8 +1,8 @@
 <template>
 	<MkStickyContainer>
-		<template #header><MkPageHeader /></template>
+		<template #header><MkPageHeader v-if="!popup" /></template>
 		<MkSpacer :content-max="800">
-			<div :class="$style.root">
+			<div class="mfm-cheat-sheet">
 				<div>{{ i18n.ts._mfm.intro }}</div>
 				<br />
 				<div class="section _block">
@@ -449,6 +449,10 @@ import { definePageMetadata } from "@/scripts/page-metadata";
 import { i18n } from "@/i18n";
 import { instance } from "@/instance";
 
+defineProps<{
+	popup?: boolean
+}>();
+
 let preview_mention = $ref("@example");
 let preview_hashtag = $ref("#test");
 let preview_link = $ref(`[${i18n.ts._mfm.dummy}](https://calckey.org)`);
@@ -514,10 +518,8 @@ definePageMetadata({
 });
 </script>
 
-<style lang="scss" module>
-.root {
-	background: var(--bg);
-
+<style lang="scss" scoped>
+.mfm-cheat-sheet {
 	> .section {
 		> .title {
 			position: sticky;

From 217b389a7b1045b5af97ed061bdbcb3cec2c1301 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Fri, 2 Jun 2023 22:57:04 -0400
Subject: [PATCH 207/319] tweak

---
 packages/client/src/pages/mfm-cheat-sheet.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index e9fb213b7e..1bbe36915a 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -536,6 +536,7 @@ definePageMetadata({
 			> p {
 				margin: 0;
 				padding: 16px;
+				padding-top: 0;
 			}
 
 			> .preview {

From bf54fb70afbc5e5143586ef2670da0f27d539224 Mon Sep 17 00:00:00 2001
From: mappi <mappi@mizuiromoon.com>
Date: Fri, 2 Jun 2023 16:31:25 +0900
Subject: [PATCH 208/319] fix: vue-plyr audio tag

Co-authored-by: mappi <mappi-pr@github.com>
---
 packages/client/src/components/MkNote.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 7eca22a734..1325809f3f 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -381,6 +381,8 @@ const currentClipPage = inject<Ref<misskey.entities.Clip> | null>(
 function onContextmenu(ev: MouseEvent): void {
 	const isLink = (el: HTMLElement) => {
 		if (el.tagName === "A") return true;
+		// The Audio element's context menu is the browser default, such as for selecting playback speed.
+		if (el.tagName === 'AUDIO') return true;
 		if (el.parentElement) {
 			return isLink(el.parentElement);
 		}

From 14126de3d7980675ea8c6d4826bc39c06580af91 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 20:06:04 -0700
Subject: [PATCH 209/319] chore: formatting

---
 packages/client/src/components/MkCheatSheetDialog.vue | 3 +--
 packages/client/src/components/MkNote.vue             | 2 +-
 packages/client/src/pages/mfm-cheat-sheet.vue         | 2 +-
 packages/client/src/pages/user/home.vue               | 6 +++++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/components/MkCheatSheetDialog.vue b/packages/client/src/components/MkCheatSheetDialog.vue
index 519955d484..3b723cde5a 100644
--- a/packages/client/src/components/MkCheatSheetDialog.vue
+++ b/packages/client/src/components/MkCheatSheetDialog.vue
@@ -6,7 +6,7 @@
 		@closed="$emit('closed')"
 	>
 		<template #header>{{ i18n.ts._mfm.cheatSheet }}</template>
-		<XCheatSheet :popup="true" style="background: var(--bg)"/>
+		<XCheatSheet :popup="true" style="background: var(--bg)" />
 	</XModalWindow>
 </template>
 
@@ -36,5 +36,4 @@ function close(res) {
 .fade-leave-to {
 	opacity: 0;
 }
-
 </style>
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 1325809f3f..ddf805fb3e 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -382,7 +382,7 @@ function onContextmenu(ev: MouseEvent): void {
 	const isLink = (el: HTMLElement) => {
 		if (el.tagName === "A") return true;
 		// The Audio element's context menu is the browser default, such as for selecting playback speed.
-		if (el.tagName === 'AUDIO') return true;
+		if (el.tagName === "AUDIO") return true;
 		if (el.parentElement) {
 			return isLink(el.parentElement);
 		}
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index 1bbe36915a..6c284bee01 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -450,7 +450,7 @@ import { i18n } from "@/i18n";
 import { instance } from "@/instance";
 
 defineProps<{
-	popup?: boolean
+	popup?: boolean;
 }>();
 
 let preview_mention = $ref("@example");
diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index 2ea4bc9711..1926fee887 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -134,7 +134,11 @@
 						</div>
 						<div class="follow-container">
 							<div class="actions">
-								<button class="menu _button" @click="menu" v-tooltip="i18n.ts.menu">
+								<button
+									class="menu _button"
+									@click="menu"
+									v-tooltip="i18n.ts.menu"
+								>
 									<i
 										class="ph-dots-three-outline ph-bold ph-lg"
 									></i>

From 4e82dab1eb13a1411aefa172c779e5a2a74e85dd Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Thu, 25 May 2023 02:34:48 -0400
Subject: [PATCH 210/319] add entities and two schemas

---
 packages/backend/native-utils/.editorconfig   |   3 +
 packages/backend/native-utils/Cargo.toml      |   3 +
 packages/backend/native-utils/build.rs        |   2 +-
 .../native-utils/crates/model/Cargo.toml      |  17 +
 .../model/src/entity/abuse_user_report.rs     |  56 +++
 .../crates/model/src/entity/access_token.rs   |  70 +++
 .../crates/model/src/entity/ad.rs             |  27 ++
 .../crates/model/src/entity/announcement.rs   |  33 ++
 .../model/src/entity/announcement_read.rs     |  51 +++
 .../crates/model/src/entity/antenna.rs        |  93 ++++
 .../crates/model/src/entity/antenna_note.rs   |  50 +++
 .../crates/model/src/entity/app.rs            |  57 +++
 .../model/src/entity/attestation_challenge.rs |  38 ++
 .../crates/model/src/entity/auth_session.rs   |  52 +++
 .../crates/model/src/entity/blocking.rs       |  39 ++
 .../crates/model/src/entity/channel.rs        |  83 ++++
 .../model/src/entity/channel_following.rs     |  51 +++
 .../model/src/entity/channel_note_pining.rs   |  51 +++
 .../crates/model/src/entity/clip.rs           |  47 ++
 .../crates/model/src/entity/clip_note.rs      |  49 ++
 .../crates/model/src/entity/drive_file.rs     | 114 +++++
 .../crates/model/src/entity/drive_folder.rs   |  54 +++
 .../crates/model/src/entity/emoji.rs          |  31 ++
 .../crates/model/src/entity/follow_request.rs |  61 +++
 .../crates/model/src/entity/following.rs      |  51 +++
 .../crates/model/src/entity/gallery_like.rs   |  51 +++
 .../crates/model/src/entity/gallery_post.rs   |  54 +++
 .../crates/model/src/entity/hashtag.rs        |  41 ++
 .../crates/model/src/entity/instance.rs       |  59 +++
 .../model/src/entity/messaging_message.rs     |  76 ++++
 .../crates/model/src/entity/meta.rs           | 211 +++++++++
 .../crates/model/src/entity/migrations.rs     |  18 +
 .../crates/model/src/entity/mod.rs            |  75 ++++
 .../crates/model/src/entity/moderation_log.rs |  38 ++
 .../crates/model/src/entity/muted_note.rs     |  51 +++
 .../crates/model/src/entity/muting.rs         |  41 ++
 .../crates/model/src/entity/note.rs           | 235 ++++++++++
 .../crates/model/src/entity/note_edit.rs      |  40 ++
 .../crates/model/src/entity/note_favorite.rs  |  51 +++
 .../crates/model/src/entity/note_reaction.rs  |  52 +++
 .../model/src/entity/note_thread_muting.rs    |  37 ++
 .../crates/model/src/entity/note_unread.rs    |  57 +++
 .../crates/model/src/entity/note_watching.rs  |  53 +++
 .../crates/model/src/entity/notification.rs   | 115 +++++
 .../crates/model/src/entity/page.rs           |  90 ++++
 .../crates/model/src/entity/page_like.rs      |  51 +++
 .../src/entity/password_reset_request.rs      |  36 ++
 .../crates/model/src/entity/poll.rs           |  43 ++
 .../crates/model/src/entity/poll_vote.rs      |  52 +++
 .../crates/model/src/entity/prelude.rs        |  72 +++
 .../crates/model/src/entity/promo_note.rs     |  35 ++
 .../crates/model/src/entity/promo_read.rs     |  51 +++
 .../model/src/entity/registration_ticket.rs   |  19 +
 .../crates/model/src/entity/registry_item.rs  |  42 ++
 .../crates/model/src/entity/relay.rs          |  19 +
 .../crates/model/src/entity/renote_muting.rs  |  22 +
 .../crates/model/src/entity/reversi_game.rs   |  68 +++
 .../model/src/entity/reversi_matching.rs      |  39 ++
 .../model/src/entity/sea_orm_active_enums.rs  | 175 ++++++++
 .../crates/model/src/entity/signin.rs         |  39 ++
 .../model/src/entity/sw_subscription.rs       |  40 ++
 .../crates/model/src/entity/used_username.rs  |  18 +
 .../crates/model/src/entity/user.rs           | 425 ++++++++++++++++++
 .../crates/model/src/entity/user_group.rs     |  70 +++
 .../model/src/entity/user_group_invitation.rs |  59 +++
 .../model/src/entity/user_group_invite.rs     |  51 +++
 .../model/src/entity/user_group_joining.rs    |  59 +++
 .../crates/model/src/entity/user_ip.rs        |  21 +
 .../crates/model/src/entity/user_keypair.rs   |  35 ++
 .../crates/model/src/entity/user_list.rs      |  52 +++
 .../model/src/entity/user_list_joining.rs     |  51 +++
 .../model/src/entity/user_note_pining.rs      |  51 +++
 .../crates/model/src/entity/user_pending.rs   |  22 +
 .../crates/model/src/entity/user_profile.rs   | 111 +++++
 .../crates/model/src/entity/user_publickey.rs |  35 ++
 .../model/src/entity/user_security_key.rs     |  38 ++
 .../crates/model/src/entity/webhook.rs        |  44 ++
 .../native-utils/crates/model/src/lib.rs      |   3 +
 .../model/src/repository/abuse_user_report.rs |   1 +
 .../crates/model/src/repository/mod.rs        |   1 +
 .../crates/model/src/schema/antenna.rs        | 128 ++++++
 .../crates/model/src/schema/app.rs            | 108 +++++
 .../crates/model/src/schema/mod.rs            |  21 +
 packages/backend/native-utils/rustfmt.toml    |   2 -
 packages/backend/native-utils/src/lib.rs      |   1 -
 .../backend/native-utils/src/mastodon_api.rs  |  78 ++--
 86 files changed, 4873 insertions(+), 43 deletions(-)
 create mode 100644 packages/backend/native-utils/.editorconfig
 create mode 100644 packages/backend/native-utils/crates/model/Cargo.toml
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/abuse_user_report.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/access_token.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/ad.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/announcement.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/announcement_read.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/antenna.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/antenna_note.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/app.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/attestation_challenge.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/auth_session.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/blocking.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/channel.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/channel_following.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/channel_note_pining.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/clip.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/clip_note.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/drive_file.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/drive_folder.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/emoji.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/follow_request.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/following.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/gallery_like.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/gallery_post.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/hashtag.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/instance.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/messaging_message.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/meta.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/migrations.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/mod.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/moderation_log.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/muted_note.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/muting.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/note.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/note_edit.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/note_favorite.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/note_reaction.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/note_thread_muting.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/note_unread.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/note_watching.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/notification.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/page.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/page_like.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/password_reset_request.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/poll.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/poll_vote.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/prelude.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/promo_note.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/promo_read.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/registration_ticket.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/registry_item.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/relay.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/renote_muting.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/reversi_game.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/reversi_matching.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/sea_orm_active_enums.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/signin.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/sw_subscription.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/used_username.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/user.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/user_group.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/user_group_invitation.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/user_group_invite.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/user_group_joining.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/user_ip.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/user_keypair.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/user_list.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/user_list_joining.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/user_note_pining.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/user_pending.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/user_profile.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/user_publickey.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/user_security_key.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/webhook.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/lib.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/repository/abuse_user_report.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/repository/mod.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/schema/antenna.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/schema/app.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/schema/mod.rs
 delete mode 100644 packages/backend/native-utils/rustfmt.toml

diff --git a/packages/backend/native-utils/.editorconfig b/packages/backend/native-utils/.editorconfig
new file mode 100644
index 0000000000..889b72e112
--- /dev/null
+++ b/packages/backend/native-utils/.editorconfig
@@ -0,0 +1,3 @@
+[*.rs]
+indent_style = space
+indent_size = 4
diff --git a/packages/backend/native-utils/Cargo.toml b/packages/backend/native-utils/Cargo.toml
index 4f7fb4c39a..6f3c0e23f8 100644
--- a/packages/backend/native-utils/Cargo.toml
+++ b/packages/backend/native-utils/Cargo.toml
@@ -3,6 +3,9 @@ edition = "2021"
 name = "native-utils"
 version = "0.0.0"
 
+[workspace]
+members = ["crates/*"]
+
 [lib]
 crate-type = ["cdylib"]
 
diff --git a/packages/backend/native-utils/build.rs b/packages/backend/native-utils/build.rs
index 1f866b6a3c..9fc2367889 100644
--- a/packages/backend/native-utils/build.rs
+++ b/packages/backend/native-utils/build.rs
@@ -1,5 +1,5 @@
 extern crate napi_build;
 
 fn main() {
-  napi_build::setup();
+    napi_build::setup();
 }
diff --git a/packages/backend/native-utils/crates/model/Cargo.toml b/packages/backend/native-utils/crates/model/Cargo.toml
new file mode 100644
index 0000000000..7b492a89d5
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "model"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+chrono = "0.4.24"
+jsonschema = "0.17.0"
+once_cell = "1.17.1"
+schemars = { version = "0.8.12", features = ["chrono"] }
+sea-orm = { version = "0.11.3", features = ["postgres-array", "sqlx-postgres", "runtime-tokio-rustls", "mock"] }
+serde = { version = "1.0.163", features = ["derive"] }
+serde_json = "1.0.96"
+tokio = { version = "1.28.1", features = ["sync"] }
+utoipa = "3.3.0"
diff --git a/packages/backend/native-utils/crates/model/src/entity/abuse_user_report.rs b/packages/backend/native-utils/crates/model/src/entity/abuse_user_report.rs
new file mode 100644
index 0000000000..163a686ab1
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/abuse_user_report.rs
@@ -0,0 +1,56 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "abuse_user_report")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "targetUserId")]
+    pub target_user_id: String,
+    #[sea_orm(column_name = "reporterId")]
+    pub reporter_id: String,
+    #[sea_orm(column_name = "assigneeId")]
+    pub assignee_id: Option<String>,
+    pub resolved: bool,
+    pub comment: String,
+    #[sea_orm(column_name = "targetUserHost")]
+    pub target_user_host: Option<String>,
+    #[sea_orm(column_name = "reporterHost")]
+    pub reporter_host: Option<String>,
+    pub forwarded: bool,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::ReporterId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User3,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::AssigneeId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "SetNull"
+    )]
+    User2,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::TargetUserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User1,
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/access_token.rs b/packages/backend/native-utils/crates/model/src/entity/access_token.rs
new file mode 100644
index 0000000000..ba3a43d64f
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/access_token.rs
@@ -0,0 +1,70 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "access_token")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    pub token: String,
+    pub hash: String,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "appId")]
+    pub app_id: Option<String>,
+    #[sea_orm(column_name = "lastUsedAt")]
+    pub last_used_at: Option<DateTimeWithTimeZone>,
+    pub session: Option<String>,
+    pub name: Option<String>,
+    pub description: Option<String>,
+    #[sea_orm(column_name = "iconUrl")]
+    pub icon_url: Option<String>,
+    pub permission: Vec<String>,
+    pub fetched: bool,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::app::Entity",
+        from = "Column::AppId",
+        to = "super::app::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    App,
+    #[sea_orm(has_many = "super::notification::Entity")]
+    Notification,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::app::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::App.def()
+    }
+}
+
+impl Related<super::notification::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Notification.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/ad.rs b/packages/backend/native-utils/crates/model/src/entity/ad.rs
new file mode 100644
index 0000000000..4e31c7b0d4
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/ad.rs
@@ -0,0 +1,27 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "ad")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "expiresAt")]
+    pub expires_at: DateTimeWithTimeZone,
+    pub place: String,
+    pub priority: String,
+    pub url: String,
+    #[sea_orm(column_name = "imageUrl")]
+    pub image_url: String,
+    pub memo: String,
+    pub ratio: i32,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/announcement.rs b/packages/backend/native-utils/crates/model/src/entity/announcement.rs
new file mode 100644
index 0000000000..0f02a1ca92
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/announcement.rs
@@ -0,0 +1,33 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "announcement")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    pub text: String,
+    pub title: String,
+    #[sea_orm(column_name = "imageUrl")]
+    pub image_url: Option<String>,
+    #[sea_orm(column_name = "updatedAt")]
+    pub updated_at: Option<DateTimeWithTimeZone>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::announcement_read::Entity")]
+    AnnouncementRead,
+}
+
+impl Related<super::announcement_read::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AnnouncementRead.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/announcement_read.rs b/packages/backend/native-utils/crates/model/src/entity/announcement_read.rs
new file mode 100644
index 0000000000..ad7dcc6f24
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/announcement_read.rs
@@ -0,0 +1,51 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "announcement_read")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "announcementId")]
+    pub announcement_id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::announcement::Entity",
+        from = "Column::AnnouncementId",
+        to = "super::announcement::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Announcement,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::announcement::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Announcement.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/antenna.rs b/packages/backend/native-utils/crates/model/src/entity/antenna.rs
new file mode 100644
index 0000000000..f9c040b59c
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/antenna.rs
@@ -0,0 +1,93 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use super::sea_orm_active_enums::AntennaSrcEnum;
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "antenna")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    pub name: String,
+    pub src: AntennaSrcEnum,
+    #[sea_orm(column_name = "userListId")]
+    pub user_list_id: Option<String>,
+    #[sea_orm(column_type = "JsonBinary")]
+    pub keywords: Json,
+    #[sea_orm(column_name = "withFile")]
+    pub with_file: bool,
+    pub expression: Option<String>,
+    pub notify: bool,
+    #[sea_orm(column_name = "caseSensitive")]
+    pub case_sensitive: bool,
+    #[sea_orm(column_name = "withReplies")]
+    pub with_replies: bool,
+    #[sea_orm(column_name = "userGroupJoiningId")]
+    pub user_group_joining_id: Option<String>,
+    pub users: Vec<String>,
+    #[sea_orm(column_name = "excludeKeywords", column_type = "JsonBinary")]
+    pub exclude_keywords: Json,
+    #[sea_orm(column_type = "JsonBinary")]
+    pub instances: Json,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::antenna_note::Entity")]
+    AntennaNote,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+    #[sea_orm(
+        belongs_to = "super::user_group_joining::Entity",
+        from = "Column::UserGroupJoiningId",
+        to = "super::user_group_joining::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    UserGroupJoining,
+    #[sea_orm(
+        belongs_to = "super::user_list::Entity",
+        from = "Column::UserListId",
+        to = "super::user_list::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    UserList,
+}
+
+impl Related<super::antenna_note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AntennaNote.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl Related<super::user_group_joining::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserGroupJoining.def()
+    }
+}
+
+impl Related<super::user_list::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserList.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/antenna_note.rs b/packages/backend/native-utils/crates/model/src/entity/antenna_note.rs
new file mode 100644
index 0000000000..ecf7b88f72
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/antenna_note.rs
@@ -0,0 +1,50 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "antenna_note")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "noteId")]
+    pub note_id: String,
+    #[sea_orm(column_name = "antennaId")]
+    pub antenna_id: String,
+    pub read: bool,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::antenna::Entity",
+        from = "Column::AntennaId",
+        to = "super::antenna::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Antenna,
+    #[sea_orm(
+        belongs_to = "super::note::Entity",
+        from = "Column::NoteId",
+        to = "super::note::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Note,
+}
+
+impl Related<super::antenna::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Antenna.def()
+    }
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/app.rs b/packages/backend/native-utils/crates/model/src/entity/app.rs
new file mode 100644
index 0000000000..bd6ae5acfb
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/app.rs
@@ -0,0 +1,57 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "app")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: Option<String>,
+    pub secret: String,
+    pub name: String,
+    pub description: String,
+    pub permission: Vec<String>,
+    #[sea_orm(column_name = "callbackUrl")]
+    pub callback_url: Option<String>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::access_token::Entity")]
+    AccessToken,
+    #[sea_orm(has_many = "super::auth_session::Entity")]
+    AuthSession,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "SetNull"
+    )]
+    User,
+}
+
+impl Related<super::access_token::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AccessToken.def()
+    }
+}
+
+impl Related<super::auth_session::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AuthSession.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/attestation_challenge.rs b/packages/backend/native-utils/crates/model/src/entity/attestation_challenge.rs
new file mode 100644
index 0000000000..25da1ae575
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/attestation_challenge.rs
@@ -0,0 +1,38 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "attestation_challenge")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "userId", primary_key, auto_increment = false)]
+    pub user_id: String,
+    pub challenge: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "registrationChallenge")]
+    pub registration_challenge: bool,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/auth_session.rs b/packages/backend/native-utils/crates/model/src/entity/auth_session.rs
new file mode 100644
index 0000000000..c3b2fab54d
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/auth_session.rs
@@ -0,0 +1,52 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "auth_session")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    pub token: String,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: Option<String>,
+    #[sea_orm(column_name = "appId")]
+    pub app_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::app::Entity",
+        from = "Column::AppId",
+        to = "super::app::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    App,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::app::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::App.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/blocking.rs b/packages/backend/native-utils/crates/model/src/entity/blocking.rs
new file mode 100644
index 0000000000..c9092e50d6
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/blocking.rs
@@ -0,0 +1,39 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "blocking")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "blockeeId")]
+    pub blockee_id: String,
+    #[sea_orm(column_name = "blockerId")]
+    pub blocker_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::BlockerId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User2,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::BlockeeId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User1,
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/channel.rs b/packages/backend/native-utils/crates/model/src/entity/channel.rs
new file mode 100644
index 0000000000..b39b57f568
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/channel.rs
@@ -0,0 +1,83 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "channel")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "lastNotedAt")]
+    pub last_noted_at: Option<DateTimeWithTimeZone>,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: Option<String>,
+    pub name: String,
+    pub description: Option<String>,
+    #[sea_orm(column_name = "bannerId")]
+    pub banner_id: Option<String>,
+    #[sea_orm(column_name = "notesCount")]
+    pub notes_count: i32,
+    #[sea_orm(column_name = "usersCount")]
+    pub users_count: i32,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::channel_following::Entity")]
+    ChannelFollowing,
+    #[sea_orm(has_many = "super::channel_note_pining::Entity")]
+    ChannelNotePining,
+    #[sea_orm(
+        belongs_to = "super::drive_file::Entity",
+        from = "Column::BannerId",
+        to = "super::drive_file::Column::Id",
+        on_update = "NoAction",
+        on_delete = "SetNull"
+    )]
+    DriveFile,
+    #[sea_orm(has_many = "super::note::Entity")]
+    Note,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "SetNull"
+    )]
+    User,
+}
+
+impl Related<super::channel_following::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ChannelFollowing.def()
+    }
+}
+
+impl Related<super::channel_note_pining::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ChannelNotePining.def()
+    }
+}
+
+impl Related<super::drive_file::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::DriveFile.def()
+    }
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/channel_following.rs b/packages/backend/native-utils/crates/model/src/entity/channel_following.rs
new file mode 100644
index 0000000000..a415b6c32c
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/channel_following.rs
@@ -0,0 +1,51 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "channel_following")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "followeeId")]
+    pub followee_id: String,
+    #[sea_orm(column_name = "followerId")]
+    pub follower_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::channel::Entity",
+        from = "Column::FolloweeId",
+        to = "super::channel::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Channel,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::FollowerId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::channel::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Channel.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/channel_note_pining.rs b/packages/backend/native-utils/crates/model/src/entity/channel_note_pining.rs
new file mode 100644
index 0000000000..16f80b91de
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/channel_note_pining.rs
@@ -0,0 +1,51 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "channel_note_pining")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "channelId")]
+    pub channel_id: String,
+    #[sea_orm(column_name = "noteId")]
+    pub note_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::channel::Entity",
+        from = "Column::ChannelId",
+        to = "super::channel::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Channel,
+    #[sea_orm(
+        belongs_to = "super::note::Entity",
+        from = "Column::NoteId",
+        to = "super::note::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Note,
+}
+
+impl Related<super::channel::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Channel.def()
+    }
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/clip.rs b/packages/backend/native-utils/crates/model/src/entity/clip.rs
new file mode 100644
index 0000000000..6cf1ac1c87
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/clip.rs
@@ -0,0 +1,47 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "clip")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    pub name: String,
+    #[sea_orm(column_name = "isPublic")]
+    pub is_public: bool,
+    pub description: Option<String>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::clip_note::Entity")]
+    ClipNote,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::clip_note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ClipNote.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/clip_note.rs b/packages/backend/native-utils/crates/model/src/entity/clip_note.rs
new file mode 100644
index 0000000000..ba7114c3b8
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/clip_note.rs
@@ -0,0 +1,49 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "clip_note")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "noteId")]
+    pub note_id: String,
+    #[sea_orm(column_name = "clipId")]
+    pub clip_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::clip::Entity",
+        from = "Column::ClipId",
+        to = "super::clip::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Clip,
+    #[sea_orm(
+        belongs_to = "super::note::Entity",
+        from = "Column::NoteId",
+        to = "super::note::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Note,
+}
+
+impl Related<super::clip::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Clip.def()
+    }
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/drive_file.rs b/packages/backend/native-utils/crates/model/src/entity/drive_file.rs
new file mode 100644
index 0000000000..5b3d17b004
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/drive_file.rs
@@ -0,0 +1,114 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "drive_file")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: Option<String>,
+    #[sea_orm(column_name = "userHost")]
+    pub user_host: Option<String>,
+    pub md5: String,
+    pub name: String,
+    pub r#type: String,
+    pub size: i32,
+    pub comment: Option<String>,
+    #[sea_orm(column_type = "JsonBinary")]
+    pub properties: Json,
+    #[sea_orm(column_name = "storedInternal")]
+    pub stored_internal: bool,
+    pub url: String,
+    #[sea_orm(column_name = "thumbnailUrl")]
+    pub thumbnail_url: Option<String>,
+    #[sea_orm(column_name = "webpublicUrl")]
+    pub webpublic_url: Option<String>,
+    #[sea_orm(column_name = "accessKey")]
+    pub access_key: Option<String>,
+    #[sea_orm(column_name = "thumbnailAccessKey")]
+    pub thumbnail_access_key: Option<String>,
+    #[sea_orm(column_name = "webpublicAccessKey")]
+    pub webpublic_access_key: Option<String>,
+    pub uri: Option<String>,
+    pub src: Option<String>,
+    #[sea_orm(column_name = "folderId")]
+    pub folder_id: Option<String>,
+    #[sea_orm(column_name = "isSensitive")]
+    pub is_sensitive: bool,
+    #[sea_orm(column_name = "isLink")]
+    pub is_link: bool,
+    pub blurhash: Option<String>,
+    #[sea_orm(column_name = "webpublicType")]
+    pub webpublic_type: Option<String>,
+    #[sea_orm(column_name = "requestHeaders", column_type = "JsonBinary", nullable)]
+    pub request_headers: Option<Json>,
+    #[sea_orm(column_name = "requestIp")]
+    pub request_ip: Option<String>,
+    #[sea_orm(column_name = "maybeSensitive")]
+    pub maybe_sensitive: bool,
+    #[sea_orm(column_name = "maybePorn")]
+    pub maybe_porn: bool,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::channel::Entity")]
+    Channel,
+    #[sea_orm(
+        belongs_to = "super::drive_folder::Entity",
+        from = "Column::FolderId",
+        to = "super::drive_folder::Column::Id",
+        on_update = "NoAction",
+        on_delete = "SetNull"
+    )]
+    DriveFolder,
+    #[sea_orm(has_many = "super::messaging_message::Entity")]
+    MessagingMessage,
+    #[sea_orm(has_many = "super::page::Entity")]
+    Page,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "SetNull"
+    )]
+    User,
+}
+
+impl Related<super::channel::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Channel.def()
+    }
+}
+
+impl Related<super::drive_folder::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::DriveFolder.def()
+    }
+}
+
+impl Related<super::messaging_message::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::MessagingMessage.def()
+    }
+}
+
+impl Related<super::page::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Page.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/drive_folder.rs b/packages/backend/native-utils/crates/model/src/entity/drive_folder.rs
new file mode 100644
index 0000000000..9756f70530
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/drive_folder.rs
@@ -0,0 +1,54 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "drive_folder")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    pub name: String,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: Option<String>,
+    #[sea_orm(column_name = "parentId")]
+    pub parent_id: Option<String>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::drive_file::Entity")]
+    DriveFile,
+    #[sea_orm(
+        belongs_to = "Entity",
+        from = "Column::ParentId",
+        to = "Column::Id",
+        on_update = "NoAction",
+        on_delete = "SetNull"
+    )]
+    SelfRef,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::drive_file::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::DriveFile.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/emoji.rs b/packages/backend/native-utils/crates/model/src/entity/emoji.rs
new file mode 100644
index 0000000000..9dff7c719b
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/emoji.rs
@@ -0,0 +1,31 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "emoji")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "updatedAt")]
+    pub updated_at: Option<DateTimeWithTimeZone>,
+    pub name: String,
+    pub host: Option<String>,
+    #[sea_orm(column_name = "originalUrl")]
+    pub original_url: String,
+    pub uri: Option<String>,
+    pub r#type: Option<String>,
+    pub aliases: Vec<String>,
+    pub category: Option<String>,
+    #[sea_orm(column_name = "publicUrl")]
+    pub public_url: String,
+    pub license: Option<String>,
+    pub width: Option<i32>,
+    pub height: Option<i32>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/follow_request.rs b/packages/backend/native-utils/crates/model/src/entity/follow_request.rs
new file mode 100644
index 0000000000..32e31a09d6
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/follow_request.rs
@@ -0,0 +1,61 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "follow_request")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "followeeId")]
+    pub followee_id: String,
+    #[sea_orm(column_name = "followerId")]
+    pub follower_id: String,
+    #[sea_orm(column_name = "requestId")]
+    pub request_id: Option<String>,
+    #[sea_orm(column_name = "followerHost")]
+    pub follower_host: Option<String>,
+    #[sea_orm(column_name = "followerInbox")]
+    pub follower_inbox: Option<String>,
+    #[sea_orm(column_name = "followerSharedInbox")]
+    pub follower_shared_inbox: Option<String>,
+    #[sea_orm(column_name = "followeeHost")]
+    pub followee_host: Option<String>,
+    #[sea_orm(column_name = "followeeInbox")]
+    pub followee_inbox: Option<String>,
+    #[sea_orm(column_name = "followeeSharedInbox")]
+    pub followee_shared_inbox: Option<String>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::notification::Entity")]
+    Notification,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::FolloweeId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User2,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::FollowerId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User1,
+}
+
+impl Related<super::notification::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Notification.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/following.rs b/packages/backend/native-utils/crates/model/src/entity/following.rs
new file mode 100644
index 0000000000..6f339e05dc
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/following.rs
@@ -0,0 +1,51 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "following")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "followeeId")]
+    pub followee_id: String,
+    #[sea_orm(column_name = "followerId")]
+    pub follower_id: String,
+    #[sea_orm(column_name = "followerHost")]
+    pub follower_host: Option<String>,
+    #[sea_orm(column_name = "followerInbox")]
+    pub follower_inbox: Option<String>,
+    #[sea_orm(column_name = "followerSharedInbox")]
+    pub follower_shared_inbox: Option<String>,
+    #[sea_orm(column_name = "followeeHost")]
+    pub followee_host: Option<String>,
+    #[sea_orm(column_name = "followeeInbox")]
+    pub followee_inbox: Option<String>,
+    #[sea_orm(column_name = "followeeSharedInbox")]
+    pub followee_shared_inbox: Option<String>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::FolloweeId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User2,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::FollowerId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User1,
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/gallery_like.rs b/packages/backend/native-utils/crates/model/src/entity/gallery_like.rs
new file mode 100644
index 0000000000..0fdbf07efe
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/gallery_like.rs
@@ -0,0 +1,51 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "gallery_like")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "postId")]
+    pub post_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::gallery_post::Entity",
+        from = "Column::PostId",
+        to = "super::gallery_post::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    GalleryPost,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::gallery_post::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::GalleryPost.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/gallery_post.rs b/packages/backend/native-utils/crates/model/src/entity/gallery_post.rs
new file mode 100644
index 0000000000..a23ebbd8f0
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/gallery_post.rs
@@ -0,0 +1,54 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "gallery_post")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "updatedAt")]
+    pub updated_at: DateTimeWithTimeZone,
+    pub title: String,
+    pub description: Option<String>,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "fileIds")]
+    pub file_ids: Vec<String>,
+    #[sea_orm(column_name = "isSensitive")]
+    pub is_sensitive: bool,
+    #[sea_orm(column_name = "likedCount")]
+    pub liked_count: i32,
+    pub tags: Vec<String>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::gallery_like::Entity")]
+    GalleryLike,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::gallery_like::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::GalleryLike.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/hashtag.rs b/packages/backend/native-utils/crates/model/src/entity/hashtag.rs
new file mode 100644
index 0000000000..a83ebbf293
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/hashtag.rs
@@ -0,0 +1,41 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "hashtag")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    pub name: String,
+    #[sea_orm(column_name = "mentionedUserIds")]
+    pub mentioned_user_ids: Vec<String>,
+    #[sea_orm(column_name = "mentionedUsersCount")]
+    pub mentioned_users_count: i32,
+    #[sea_orm(column_name = "mentionedLocalUserIds")]
+    pub mentioned_local_user_ids: Vec<String>,
+    #[sea_orm(column_name = "mentionedLocalUsersCount")]
+    pub mentioned_local_users_count: i32,
+    #[sea_orm(column_name = "mentionedRemoteUserIds")]
+    pub mentioned_remote_user_ids: Vec<String>,
+    #[sea_orm(column_name = "mentionedRemoteUsersCount")]
+    pub mentioned_remote_users_count: i32,
+    #[sea_orm(column_name = "attachedUserIds")]
+    pub attached_user_ids: Vec<String>,
+    #[sea_orm(column_name = "attachedUsersCount")]
+    pub attached_users_count: i32,
+    #[sea_orm(column_name = "attachedLocalUserIds")]
+    pub attached_local_user_ids: Vec<String>,
+    #[sea_orm(column_name = "attachedLocalUsersCount")]
+    pub attached_local_users_count: i32,
+    #[sea_orm(column_name = "attachedRemoteUserIds")]
+    pub attached_remote_user_ids: Vec<String>,
+    #[sea_orm(column_name = "attachedRemoteUsersCount")]
+    pub attached_remote_users_count: i32,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/instance.rs b/packages/backend/native-utils/crates/model/src/entity/instance.rs
new file mode 100644
index 0000000000..405648efc5
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/instance.rs
@@ -0,0 +1,59 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "instance")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "caughtAt")]
+    pub caught_at: DateTimeWithTimeZone,
+    pub host: String,
+    #[sea_orm(column_name = "usersCount")]
+    pub users_count: i32,
+    #[sea_orm(column_name = "notesCount")]
+    pub notes_count: i32,
+    #[sea_orm(column_name = "followingCount")]
+    pub following_count: i32,
+    #[sea_orm(column_name = "followersCount")]
+    pub followers_count: i32,
+    #[sea_orm(column_name = "latestRequestSentAt")]
+    pub latest_request_sent_at: Option<DateTimeWithTimeZone>,
+    #[sea_orm(column_name = "latestStatus")]
+    pub latest_status: Option<i32>,
+    #[sea_orm(column_name = "latestRequestReceivedAt")]
+    pub latest_request_received_at: Option<DateTimeWithTimeZone>,
+    #[sea_orm(column_name = "lastCommunicatedAt")]
+    pub last_communicated_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "isNotResponding")]
+    pub is_not_responding: bool,
+    #[sea_orm(column_name = "softwareName")]
+    pub software_name: Option<String>,
+    #[sea_orm(column_name = "softwareVersion")]
+    pub software_version: Option<String>,
+    #[sea_orm(column_name = "openRegistrations")]
+    pub open_registrations: Option<bool>,
+    pub name: Option<String>,
+    pub description: Option<String>,
+    #[sea_orm(column_name = "maintainerName")]
+    pub maintainer_name: Option<String>,
+    #[sea_orm(column_name = "maintainerEmail")]
+    pub maintainer_email: Option<String>,
+    #[sea_orm(column_name = "infoUpdatedAt")]
+    pub info_updated_at: Option<DateTimeWithTimeZone>,
+    #[sea_orm(column_name = "isSuspended")]
+    pub is_suspended: bool,
+    #[sea_orm(column_name = "iconUrl")]
+    pub icon_url: Option<String>,
+    #[sea_orm(column_name = "themeColor")]
+    pub theme_color: Option<String>,
+    #[sea_orm(column_name = "faviconUrl")]
+    pub favicon_url: Option<String>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/messaging_message.rs b/packages/backend/native-utils/crates/model/src/entity/messaging_message.rs
new file mode 100644
index 0000000000..cfb8963710
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/messaging_message.rs
@@ -0,0 +1,76 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "messaging_message")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "recipientId")]
+    pub recipient_id: Option<String>,
+    pub text: Option<String>,
+    #[sea_orm(column_name = "isRead")]
+    pub is_read: bool,
+    #[sea_orm(column_name = "fileId")]
+    pub file_id: Option<String>,
+    #[sea_orm(column_name = "groupId")]
+    pub group_id: Option<String>,
+    pub reads: Vec<String>,
+    pub uri: Option<String>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::drive_file::Entity",
+        from = "Column::FileId",
+        to = "super::drive_file::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    DriveFile,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User2,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::RecipientId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User1,
+    #[sea_orm(
+        belongs_to = "super::user_group::Entity",
+        from = "Column::GroupId",
+        to = "super::user_group::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    UserGroup,
+}
+
+impl Related<super::drive_file::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::DriveFile.def()
+    }
+}
+
+impl Related<super::user_group::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserGroup.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/meta.rs b/packages/backend/native-utils/crates/model/src/entity/meta.rs
new file mode 100644
index 0000000000..768c725aa7
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/meta.rs
@@ -0,0 +1,211 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use super::sea_orm_active_enums::MetaSensitivemediadetectionEnum;
+use super::sea_orm_active_enums::MetaSensitivemediadetectionsensitivityEnum;
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "meta")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    pub name: Option<String>,
+    pub description: Option<String>,
+    #[sea_orm(column_name = "maintainerName")]
+    pub maintainer_name: Option<String>,
+    #[sea_orm(column_name = "maintainerEmail")]
+    pub maintainer_email: Option<String>,
+    #[sea_orm(column_name = "disableRegistration")]
+    pub disable_registration: bool,
+    #[sea_orm(column_name = "disableLocalTimeline")]
+    pub disable_local_timeline: bool,
+    #[sea_orm(column_name = "disableGlobalTimeline")]
+    pub disable_global_timeline: bool,
+    #[sea_orm(column_name = "useStarForReactionFallback")]
+    pub use_star_for_reaction_fallback: bool,
+    pub langs: Vec<String>,
+    #[sea_orm(column_name = "hiddenTags")]
+    pub hidden_tags: Vec<String>,
+    #[sea_orm(column_name = "blockedHosts")]
+    pub blocked_hosts: Vec<String>,
+    #[sea_orm(column_name = "mascotImageUrl")]
+    pub mascot_image_url: Option<String>,
+    #[sea_orm(column_name = "bannerUrl")]
+    pub banner_url: Option<String>,
+    #[sea_orm(column_name = "errorImageUrl")]
+    pub error_image_url: Option<String>,
+    #[sea_orm(column_name = "iconUrl")]
+    pub icon_url: Option<String>,
+    #[sea_orm(column_name = "cacheRemoteFiles")]
+    pub cache_remote_files: bool,
+    #[sea_orm(column_name = "enableRecaptcha")]
+    pub enable_recaptcha: bool,
+    #[sea_orm(column_name = "recaptchaSiteKey")]
+    pub recaptcha_site_key: Option<String>,
+    #[sea_orm(column_name = "recaptchaSecretKey")]
+    pub recaptcha_secret_key: Option<String>,
+    #[sea_orm(column_name = "localDriveCapacityMb")]
+    pub local_drive_capacity_mb: i32,
+    #[sea_orm(column_name = "remoteDriveCapacityMb")]
+    pub remote_drive_capacity_mb: i32,
+    #[sea_orm(column_name = "summalyProxy")]
+    pub summaly_proxy: Option<String>,
+    #[sea_orm(column_name = "enableEmail")]
+    pub enable_email: bool,
+    pub email: Option<String>,
+    #[sea_orm(column_name = "smtpSecure")]
+    pub smtp_secure: bool,
+    #[sea_orm(column_name = "smtpHost")]
+    pub smtp_host: Option<String>,
+    #[sea_orm(column_name = "smtpPort")]
+    pub smtp_port: Option<i32>,
+    #[sea_orm(column_name = "smtpUser")]
+    pub smtp_user: Option<String>,
+    #[sea_orm(column_name = "smtpPass")]
+    pub smtp_pass: Option<String>,
+    #[sea_orm(column_name = "enableServiceWorker")]
+    pub enable_service_worker: bool,
+    #[sea_orm(column_name = "swPublicKey")]
+    pub sw_public_key: Option<String>,
+    #[sea_orm(column_name = "swPrivateKey")]
+    pub sw_private_key: Option<String>,
+    #[sea_orm(column_name = "enableTwitterIntegration")]
+    pub enable_twitter_integration: bool,
+    #[sea_orm(column_name = "twitterConsumerKey")]
+    pub twitter_consumer_key: Option<String>,
+    #[sea_orm(column_name = "twitterConsumerSecret")]
+    pub twitter_consumer_secret: Option<String>,
+    #[sea_orm(column_name = "enableGithubIntegration")]
+    pub enable_github_integration: bool,
+    #[sea_orm(column_name = "githubClientId")]
+    pub github_client_id: Option<String>,
+    #[sea_orm(column_name = "githubClientSecret")]
+    pub github_client_secret: Option<String>,
+    #[sea_orm(column_name = "enableDiscordIntegration")]
+    pub enable_discord_integration: bool,
+    #[sea_orm(column_name = "discordClientId")]
+    pub discord_client_id: Option<String>,
+    #[sea_orm(column_name = "discordClientSecret")]
+    pub discord_client_secret: Option<String>,
+    #[sea_orm(column_name = "pinnedUsers")]
+    pub pinned_users: Vec<String>,
+    #[sea_orm(column_name = "ToSUrl")]
+    pub to_s_url: Option<String>,
+    #[sea_orm(column_name = "repositoryUrl")]
+    pub repository_url: String,
+    #[sea_orm(column_name = "feedbackUrl")]
+    pub feedback_url: Option<String>,
+    #[sea_orm(column_name = "useObjectStorage")]
+    pub use_object_storage: bool,
+    #[sea_orm(column_name = "objectStorageBucket")]
+    pub object_storage_bucket: Option<String>,
+    #[sea_orm(column_name = "objectStoragePrefix")]
+    pub object_storage_prefix: Option<String>,
+    #[sea_orm(column_name = "objectStorageBaseUrl")]
+    pub object_storage_base_url: Option<String>,
+    #[sea_orm(column_name = "objectStorageEndpoint")]
+    pub object_storage_endpoint: Option<String>,
+    #[sea_orm(column_name = "objectStorageRegion")]
+    pub object_storage_region: Option<String>,
+    #[sea_orm(column_name = "objectStorageAccessKey")]
+    pub object_storage_access_key: Option<String>,
+    #[sea_orm(column_name = "objectStorageSecretKey")]
+    pub object_storage_secret_key: Option<String>,
+    #[sea_orm(column_name = "objectStoragePort")]
+    pub object_storage_port: Option<i32>,
+    #[sea_orm(column_name = "objectStorageUseSSL")]
+    pub object_storage_use_ssl: bool,
+    #[sea_orm(column_name = "proxyAccountId")]
+    pub proxy_account_id: Option<String>,
+    #[sea_orm(column_name = "objectStorageUseProxy")]
+    pub object_storage_use_proxy: bool,
+    #[sea_orm(column_name = "enableHcaptcha")]
+    pub enable_hcaptcha: bool,
+    #[sea_orm(column_name = "hcaptchaSiteKey")]
+    pub hcaptcha_site_key: Option<String>,
+    #[sea_orm(column_name = "hcaptchaSecretKey")]
+    pub hcaptcha_secret_key: Option<String>,
+    #[sea_orm(column_name = "objectStorageSetPublicRead")]
+    pub object_storage_set_public_read: bool,
+    #[sea_orm(column_name = "pinnedPages")]
+    pub pinned_pages: Vec<String>,
+    #[sea_orm(column_name = "backgroundImageUrl")]
+    pub background_image_url: Option<String>,
+    #[sea_orm(column_name = "logoImageUrl")]
+    pub logo_image_url: Option<String>,
+    #[sea_orm(column_name = "pinnedClipId")]
+    pub pinned_clip_id: Option<String>,
+    #[sea_orm(column_name = "objectStorageS3ForcePathStyle")]
+    pub object_storage_s3_force_path_style: bool,
+    #[sea_orm(column_name = "allowedHosts")]
+    pub allowed_hosts: Option<Vec<String>>,
+    #[sea_orm(column_name = "secureMode")]
+    pub secure_mode: Option<bool>,
+    #[sea_orm(column_name = "privateMode")]
+    pub private_mode: Option<bool>,
+    #[sea_orm(column_name = "deeplAuthKey")]
+    pub deepl_auth_key: Option<String>,
+    #[sea_orm(column_name = "deeplIsPro")]
+    pub deepl_is_pro: bool,
+    #[sea_orm(column_name = "emailRequiredForSignup")]
+    pub email_required_for_signup: bool,
+    #[sea_orm(column_name = "themeColor")]
+    pub theme_color: Option<String>,
+    #[sea_orm(column_name = "defaultLightTheme")]
+    pub default_light_theme: Option<String>,
+    #[sea_orm(column_name = "defaultDarkTheme")]
+    pub default_dark_theme: Option<String>,
+    #[sea_orm(column_name = "sensitiveMediaDetection")]
+    pub sensitive_media_detection: MetaSensitivemediadetectionEnum,
+    #[sea_orm(column_name = "sensitiveMediaDetectionSensitivity")]
+    pub sensitive_media_detection_sensitivity: MetaSensitivemediadetectionsensitivityEnum,
+    #[sea_orm(column_name = "setSensitiveFlagAutomatically")]
+    pub set_sensitive_flag_automatically: bool,
+    #[sea_orm(column_name = "enableIpLogging")]
+    pub enable_ip_logging: bool,
+    #[sea_orm(column_name = "enableSensitiveMediaDetectionForVideos")]
+    pub enable_sensitive_media_detection_for_videos: bool,
+    #[sea_orm(column_name = "enableActiveEmailValidation")]
+    pub enable_active_email_validation: bool,
+    #[sea_orm(column_name = "customMOTD")]
+    pub custom_motd: Vec<String>,
+    #[sea_orm(column_name = "customSplashIcons")]
+    pub custom_splash_icons: Vec<String>,
+    #[sea_orm(column_name = "disableRecommendedTimeline")]
+    pub disable_recommended_timeline: bool,
+    #[sea_orm(column_name = "recommendedInstances")]
+    pub recommended_instances: Vec<String>,
+    #[sea_orm(column_name = "enableGuestTimeline")]
+    pub enable_guest_timeline: bool,
+    #[sea_orm(column_name = "defaultReaction")]
+    pub default_reaction: String,
+    #[sea_orm(column_name = "libreTranslateApiUrl")]
+    pub libre_translate_api_url: Option<String>,
+    #[sea_orm(column_name = "libreTranslateApiKey")]
+    pub libre_translate_api_key: Option<String>,
+    #[sea_orm(column_name = "silencedHosts")]
+    pub silenced_hosts: Vec<String>,
+    #[sea_orm(column_name = "experimentalFeatures", column_type = "JsonBinary")]
+    pub experimental_features: Json,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::ProxyAccountId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "SetNull"
+    )]
+    User,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/migrations.rs b/packages/backend/native-utils/crates/model/src/entity/migrations.rs
new file mode 100644
index 0000000000..c53c3fc899
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/migrations.rs
@@ -0,0 +1,18 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "migrations")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub id: i32,
+    pub timestamp: i64,
+    pub name: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/mod.rs b/packages/backend/native-utils/crates/model/src/entity/mod.rs
new file mode 100644
index 0000000000..077f9fa6e7
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/mod.rs
@@ -0,0 +1,75 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+pub mod prelude;
+
+pub mod abuse_user_report;
+pub mod access_token;
+pub mod ad;
+pub mod announcement;
+pub mod announcement_read;
+pub mod antenna;
+pub mod antenna_note;
+pub mod app;
+pub mod attestation_challenge;
+pub mod auth_session;
+pub mod blocking;
+pub mod channel;
+pub mod channel_following;
+pub mod channel_note_pining;
+pub mod clip;
+pub mod clip_note;
+pub mod drive_file;
+pub mod drive_folder;
+pub mod emoji;
+pub mod follow_request;
+pub mod following;
+pub mod gallery_like;
+pub mod gallery_post;
+pub mod hashtag;
+pub mod instance;
+pub mod messaging_message;
+pub mod meta;
+pub mod migrations;
+pub mod moderation_log;
+pub mod muted_note;
+pub mod muting;
+pub mod note;
+pub mod note_edit;
+pub mod note_favorite;
+pub mod note_reaction;
+pub mod note_thread_muting;
+pub mod note_unread;
+pub mod note_watching;
+pub mod notification;
+pub mod page;
+pub mod page_like;
+pub mod password_reset_request;
+pub mod poll;
+pub mod poll_vote;
+pub mod promo_note;
+pub mod promo_read;
+pub mod registration_ticket;
+pub mod registry_item;
+pub mod relay;
+pub mod renote_muting;
+pub mod reversi_game;
+pub mod reversi_matching;
+pub mod sea_orm_active_enums;
+pub mod signin;
+pub mod sw_subscription;
+pub mod used_username;
+pub mod user;
+pub mod user_group;
+pub mod user_group_invitation;
+pub mod user_group_invite;
+pub mod user_group_joining;
+pub mod user_ip;
+pub mod user_keypair;
+pub mod user_list;
+pub mod user_list_joining;
+pub mod user_note_pining;
+pub mod user_pending;
+pub mod user_profile;
+pub mod user_publickey;
+pub mod user_security_key;
+pub mod webhook;
diff --git a/packages/backend/native-utils/crates/model/src/entity/moderation_log.rs b/packages/backend/native-utils/crates/model/src/entity/moderation_log.rs
new file mode 100644
index 0000000000..eb49d4f150
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/moderation_log.rs
@@ -0,0 +1,38 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "moderation_log")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    pub r#type: String,
+    #[sea_orm(column_type = "JsonBinary")]
+    pub info: Json,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/muted_note.rs b/packages/backend/native-utils/crates/model/src/entity/muted_note.rs
new file mode 100644
index 0000000000..17328a8297
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/muted_note.rs
@@ -0,0 +1,51 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use super::sea_orm_active_enums::MutedNoteReasonEnum;
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "muted_note")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "noteId")]
+    pub note_id: String,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    pub reason: MutedNoteReasonEnum,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::note::Entity",
+        from = "Column::NoteId",
+        to = "super::note::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Note,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/muting.rs b/packages/backend/native-utils/crates/model/src/entity/muting.rs
new file mode 100644
index 0000000000..60020b60bb
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/muting.rs
@@ -0,0 +1,41 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "muting")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "muteeId")]
+    pub mutee_id: String,
+    #[sea_orm(column_name = "muterId")]
+    pub muter_id: String,
+    #[sea_orm(column_name = "expiresAt")]
+    pub expires_at: Option<DateTimeWithTimeZone>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::MuterId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User2,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::MuteeId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User1,
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/note.rs b/packages/backend/native-utils/crates/model/src/entity/note.rs
new file mode 100644
index 0000000000..cc3ec289fa
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/note.rs
@@ -0,0 +1,235 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use super::sea_orm_active_enums::NoteVisibilityEnum;
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "note")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "replyId")]
+    pub reply_id: Option<String>,
+    #[sea_orm(column_name = "renoteId")]
+    pub renote_id: Option<String>,
+    #[sea_orm(column_type = "Text", nullable)]
+    pub text: Option<String>,
+    pub name: Option<String>,
+    pub cw: Option<String>,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "localOnly")]
+    pub local_only: bool,
+    #[sea_orm(column_name = "renoteCount")]
+    pub renote_count: i16,
+    #[sea_orm(column_name = "repliesCount")]
+    pub replies_count: i16,
+    #[sea_orm(column_type = "JsonBinary")]
+    pub reactions: Json,
+    pub visibility: NoteVisibilityEnum,
+    pub uri: Option<String>,
+    pub score: i32,
+    #[sea_orm(column_name = "fileIds")]
+    pub file_ids: Vec<String>,
+    #[sea_orm(column_name = "attachedFileTypes")]
+    pub attached_file_types: Vec<String>,
+    #[sea_orm(column_name = "visibleUserIds")]
+    pub visible_user_ids: Vec<String>,
+    pub mentions: Vec<String>,
+    #[sea_orm(column_name = "mentionedRemoteUsers", column_type = "Text")]
+    pub mentioned_remote_users: String,
+    pub emojis: Vec<String>,
+    pub tags: Vec<String>,
+    #[sea_orm(column_name = "hasPoll")]
+    pub has_poll: bool,
+    #[sea_orm(column_name = "userHost")]
+    pub user_host: Option<String>,
+    #[sea_orm(column_name = "replyUserId")]
+    pub reply_user_id: Option<String>,
+    #[sea_orm(column_name = "replyUserHost")]
+    pub reply_user_host: Option<String>,
+    #[sea_orm(column_name = "renoteUserId")]
+    pub renote_user_id: Option<String>,
+    #[sea_orm(column_name = "renoteUserHost")]
+    pub renote_user_host: Option<String>,
+    pub url: Option<String>,
+    #[sea_orm(column_name = "channelId")]
+    pub channel_id: Option<String>,
+    #[sea_orm(column_name = "threadId")]
+    pub thread_id: Option<String>,
+    #[sea_orm(column_name = "updatedAt")]
+    pub updated_at: Option<DateTimeWithTimeZone>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::antenna_note::Entity")]
+    AntennaNote,
+    #[sea_orm(
+        belongs_to = "super::channel::Entity",
+        from = "Column::ChannelId",
+        to = "super::channel::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Channel,
+    #[sea_orm(has_many = "super::channel_note_pining::Entity")]
+    ChannelNotePining,
+    #[sea_orm(has_many = "super::clip_note::Entity")]
+    ClipNote,
+    #[sea_orm(has_many = "super::muted_note::Entity")]
+    MutedNote,
+    #[sea_orm(
+        belongs_to = "Entity",
+        from = "Column::ReplyId",
+        to = "Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    SelfRef2,
+    #[sea_orm(
+        belongs_to = "Entity",
+        from = "Column::RenoteId",
+        to = "Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    SelfRef1,
+    #[sea_orm(has_many = "super::note_edit::Entity")]
+    NoteEdit,
+    #[sea_orm(has_many = "super::note_favorite::Entity")]
+    NoteFavorite,
+    #[sea_orm(has_many = "super::note_reaction::Entity")]
+    NoteReaction,
+    #[sea_orm(has_many = "super::note_unread::Entity")]
+    NoteUnread,
+    #[sea_orm(has_many = "super::note_watching::Entity")]
+    NoteWatching,
+    #[sea_orm(has_many = "super::notification::Entity")]
+    Notification,
+    #[sea_orm(has_one = "super::poll::Entity")]
+    Poll,
+    #[sea_orm(has_many = "super::poll_vote::Entity")]
+    PollVote,
+    #[sea_orm(has_one = "super::promo_note::Entity")]
+    PromoNote,
+    #[sea_orm(has_many = "super::promo_read::Entity")]
+    PromoRead,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+    #[sea_orm(has_many = "super::user_note_pining::Entity")]
+    UserNotePining,
+}
+
+impl Related<super::antenna_note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AntennaNote.def()
+    }
+}
+
+impl Related<super::channel::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Channel.def()
+    }
+}
+
+impl Related<super::channel_note_pining::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ChannelNotePining.def()
+    }
+}
+
+impl Related<super::clip_note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ClipNote.def()
+    }
+}
+
+impl Related<super::muted_note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::MutedNote.def()
+    }
+}
+
+impl Related<super::note_edit::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::NoteEdit.def()
+    }
+}
+
+impl Related<super::note_favorite::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::NoteFavorite.def()
+    }
+}
+
+impl Related<super::note_reaction::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::NoteReaction.def()
+    }
+}
+
+impl Related<super::note_unread::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::NoteUnread.def()
+    }
+}
+
+impl Related<super::note_watching::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::NoteWatching.def()
+    }
+}
+
+impl Related<super::notification::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Notification.def()
+    }
+}
+
+impl Related<super::poll::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Poll.def()
+    }
+}
+
+impl Related<super::poll_vote::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::PollVote.def()
+    }
+}
+
+impl Related<super::promo_note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::PromoNote.def()
+    }
+}
+
+impl Related<super::promo_read::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::PromoRead.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl Related<super::user_note_pining::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserNotePining.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_edit.rs b/packages/backend/native-utils/crates/model/src/entity/note_edit.rs
new file mode 100644
index 0000000000..7b87613ddb
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/note_edit.rs
@@ -0,0 +1,40 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "note_edit")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "noteId")]
+    pub note_id: String,
+    #[sea_orm(column_type = "Text", nullable)]
+    pub text: Option<String>,
+    pub cw: Option<String>,
+    #[sea_orm(column_name = "fileIds")]
+    pub file_ids: Vec<String>,
+    #[sea_orm(column_name = "updatedAt")]
+    pub updated_at: DateTimeWithTimeZone,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::note::Entity",
+        from = "Column::NoteId",
+        to = "super::note::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Note,
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_favorite.rs b/packages/backend/native-utils/crates/model/src/entity/note_favorite.rs
new file mode 100644
index 0000000000..b5c96a9a6d
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/note_favorite.rs
@@ -0,0 +1,51 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "note_favorite")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "noteId")]
+    pub note_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::note::Entity",
+        from = "Column::NoteId",
+        to = "super::note::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Note,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_reaction.rs b/packages/backend/native-utils/crates/model/src/entity/note_reaction.rs
new file mode 100644
index 0000000000..52526aa9f6
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/note_reaction.rs
@@ -0,0 +1,52 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "note_reaction")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "noteId")]
+    pub note_id: String,
+    pub reaction: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::note::Entity",
+        from = "Column::NoteId",
+        to = "super::note::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Note,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_thread_muting.rs b/packages/backend/native-utils/crates/model/src/entity/note_thread_muting.rs
new file mode 100644
index 0000000000..572a037502
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/note_thread_muting.rs
@@ -0,0 +1,37 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "note_thread_muting")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "threadId")]
+    pub thread_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_unread.rs b/packages/backend/native-utils/crates/model/src/entity/note_unread.rs
new file mode 100644
index 0000000000..80fae4335a
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/note_unread.rs
@@ -0,0 +1,57 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "note_unread")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "noteId")]
+    pub note_id: String,
+    #[sea_orm(column_name = "noteUserId")]
+    pub note_user_id: String,
+    #[sea_orm(column_name = "isSpecified")]
+    pub is_specified: bool,
+    #[sea_orm(column_name = "isMentioned")]
+    pub is_mentioned: bool,
+    #[sea_orm(column_name = "noteChannelId")]
+    pub note_channel_id: Option<String>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::note::Entity",
+        from = "Column::NoteId",
+        to = "super::note::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Note,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_watching.rs b/packages/backend/native-utils/crates/model/src/entity/note_watching.rs
new file mode 100644
index 0000000000..1ff7af52ed
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/note_watching.rs
@@ -0,0 +1,53 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "note_watching")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "noteId")]
+    pub note_id: String,
+    #[sea_orm(column_name = "noteUserId")]
+    pub note_user_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::note::Entity",
+        from = "Column::NoteId",
+        to = "super::note::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Note,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/notification.rs b/packages/backend/native-utils/crates/model/src/entity/notification.rs
new file mode 100644
index 0000000000..c2d9115f3d
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/notification.rs
@@ -0,0 +1,115 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use super::sea_orm_active_enums::NotificationTypeEnum;
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "notification")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "notifieeId")]
+    pub notifiee_id: String,
+    #[sea_orm(column_name = "notifierId")]
+    pub notifier_id: Option<String>,
+    #[sea_orm(column_name = "isRead")]
+    pub is_read: bool,
+    #[sea_orm(column_name = "noteId")]
+    pub note_id: Option<String>,
+    pub reaction: Option<String>,
+    pub choice: Option<i32>,
+    #[sea_orm(column_name = "followRequestId")]
+    pub follow_request_id: Option<String>,
+    pub r#type: NotificationTypeEnum,
+    #[sea_orm(column_name = "userGroupInvitationId")]
+    pub user_group_invitation_id: Option<String>,
+    #[sea_orm(column_name = "customBody")]
+    pub custom_body: Option<String>,
+    #[sea_orm(column_name = "customHeader")]
+    pub custom_header: Option<String>,
+    #[sea_orm(column_name = "customIcon")]
+    pub custom_icon: Option<String>,
+    #[sea_orm(column_name = "appAccessTokenId")]
+    pub app_access_token_id: Option<String>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::access_token::Entity",
+        from = "Column::AppAccessTokenId",
+        to = "super::access_token::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    AccessToken,
+    #[sea_orm(
+        belongs_to = "super::follow_request::Entity",
+        from = "Column::FollowRequestId",
+        to = "super::follow_request::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    FollowRequest,
+    #[sea_orm(
+        belongs_to = "super::note::Entity",
+        from = "Column::NoteId",
+        to = "super::note::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Note,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::NotifierId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User2,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::NotifieeId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User1,
+    #[sea_orm(
+        belongs_to = "super::user_group_invitation::Entity",
+        from = "Column::UserGroupInvitationId",
+        to = "super::user_group_invitation::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    UserGroupInvitation,
+}
+
+impl Related<super::access_token::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AccessToken.def()
+    }
+}
+
+impl Related<super::follow_request::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::FollowRequest.def()
+    }
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl Related<super::user_group_invitation::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserGroupInvitation.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/page.rs b/packages/backend/native-utils/crates/model/src/entity/page.rs
new file mode 100644
index 0000000000..32f082daf2
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/page.rs
@@ -0,0 +1,90 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use super::sea_orm_active_enums::PageVisibilityEnum;
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "page")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "updatedAt")]
+    pub updated_at: DateTimeWithTimeZone,
+    pub title: String,
+    pub name: String,
+    pub summary: Option<String>,
+    #[sea_orm(column_name = "alignCenter")]
+    pub align_center: bool,
+    pub font: String,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "eyeCatchingImageId")]
+    pub eye_catching_image_id: Option<String>,
+    #[sea_orm(column_type = "JsonBinary")]
+    pub content: Json,
+    #[sea_orm(column_type = "JsonBinary")]
+    pub variables: Json,
+    pub visibility: PageVisibilityEnum,
+    #[sea_orm(column_name = "visibleUserIds")]
+    pub visible_user_ids: Vec<String>,
+    #[sea_orm(column_name = "likedCount")]
+    pub liked_count: i32,
+    #[sea_orm(column_name = "hideTitleWhenPinned")]
+    pub hide_title_when_pinned: bool,
+    pub script: String,
+    #[sea_orm(column_name = "isPublic")]
+    pub is_public: bool,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::drive_file::Entity",
+        from = "Column::EyeCatchingImageId",
+        to = "super::drive_file::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    DriveFile,
+    #[sea_orm(has_many = "super::page_like::Entity")]
+    PageLike,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+    #[sea_orm(has_one = "super::user_profile::Entity")]
+    UserProfile,
+}
+
+impl Related<super::drive_file::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::DriveFile.def()
+    }
+}
+
+impl Related<super::page_like::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::PageLike.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl Related<super::user_profile::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserProfile.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/page_like.rs b/packages/backend/native-utils/crates/model/src/entity/page_like.rs
new file mode 100644
index 0000000000..e9de78eb68
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/page_like.rs
@@ -0,0 +1,51 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "page_like")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "pageId")]
+    pub page_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::page::Entity",
+        from = "Column::PageId",
+        to = "super::page::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Page,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::page::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Page.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/password_reset_request.rs b/packages/backend/native-utils/crates/model/src/entity/password_reset_request.rs
new file mode 100644
index 0000000000..472b93db9d
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/password_reset_request.rs
@@ -0,0 +1,36 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "password_reset_request")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    pub token: String,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/poll.rs b/packages/backend/native-utils/crates/model/src/entity/poll.rs
new file mode 100644
index 0000000000..0facabd9a6
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/poll.rs
@@ -0,0 +1,43 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use super::sea_orm_active_enums::PollNotevisibilityEnum;
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "poll")]
+pub struct Model {
+    #[sea_orm(column_name = "noteId", primary_key, auto_increment = false, unique)]
+    pub note_id: String,
+    #[sea_orm(column_name = "expiresAt")]
+    pub expires_at: Option<DateTimeWithTimeZone>,
+    pub multiple: bool,
+    pub choices: Vec<String>,
+    pub votes: Vec<i32>,
+    #[sea_orm(column_name = "noteVisibility")]
+    pub note_visibility: PollNotevisibilityEnum,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "userHost")]
+    pub user_host: Option<String>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::note::Entity",
+        from = "Column::NoteId",
+        to = "super::note::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Note,
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/poll_vote.rs b/packages/backend/native-utils/crates/model/src/entity/poll_vote.rs
new file mode 100644
index 0000000000..29b6928efd
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/poll_vote.rs
@@ -0,0 +1,52 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "poll_vote")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "noteId")]
+    pub note_id: String,
+    pub choice: i32,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::note::Entity",
+        from = "Column::NoteId",
+        to = "super::note::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Note,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/prelude.rs b/packages/backend/native-utils/crates/model/src/entity/prelude.rs
new file mode 100644
index 0000000000..7cab688bb8
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/prelude.rs
@@ -0,0 +1,72 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+pub use super::abuse_user_report::Entity as AbuseUserReport;
+pub use super::access_token::Entity as AccessToken;
+pub use super::ad::Entity as Ad;
+pub use super::announcement::Entity as Announcement;
+pub use super::announcement_read::Entity as AnnouncementRead;
+pub use super::antenna::Entity as Antenna;
+pub use super::antenna_note::Entity as AntennaNote;
+pub use super::app::Entity as App;
+pub use super::attestation_challenge::Entity as AttestationChallenge;
+pub use super::auth_session::Entity as AuthSession;
+pub use super::blocking::Entity as Blocking;
+pub use super::channel::Entity as Channel;
+pub use super::channel_following::Entity as ChannelFollowing;
+pub use super::channel_note_pining::Entity as ChannelNotePining;
+pub use super::clip::Entity as Clip;
+pub use super::clip_note::Entity as ClipNote;
+pub use super::drive_file::Entity as DriveFile;
+pub use super::drive_folder::Entity as DriveFolder;
+pub use super::emoji::Entity as Emoji;
+pub use super::follow_request::Entity as FollowRequest;
+pub use super::following::Entity as Following;
+pub use super::gallery_like::Entity as GalleryLike;
+pub use super::gallery_post::Entity as GalleryPost;
+pub use super::hashtag::Entity as Hashtag;
+pub use super::instance::Entity as Instance;
+pub use super::messaging_message::Entity as MessagingMessage;
+pub use super::meta::Entity as Meta;
+pub use super::migrations::Entity as Migrations;
+pub use super::moderation_log::Entity as ModerationLog;
+pub use super::muted_note::Entity as MutedNote;
+pub use super::muting::Entity as Muting;
+pub use super::note::Entity as Note;
+pub use super::note_edit::Entity as NoteEdit;
+pub use super::note_favorite::Entity as NoteFavorite;
+pub use super::note_reaction::Entity as NoteReaction;
+pub use super::note_thread_muting::Entity as NoteThreadMuting;
+pub use super::note_unread::Entity as NoteUnread;
+pub use super::note_watching::Entity as NoteWatching;
+pub use super::notification::Entity as Notification;
+pub use super::page::Entity as Page;
+pub use super::page_like::Entity as PageLike;
+pub use super::password_reset_request::Entity as PasswordResetRequest;
+pub use super::poll::Entity as Poll;
+pub use super::poll_vote::Entity as PollVote;
+pub use super::promo_note::Entity as PromoNote;
+pub use super::promo_read::Entity as PromoRead;
+pub use super::registration_ticket::Entity as RegistrationTicket;
+pub use super::registry_item::Entity as RegistryItem;
+pub use super::relay::Entity as Relay;
+pub use super::renote_muting::Entity as RenoteMuting;
+pub use super::reversi_game::Entity as ReversiGame;
+pub use super::reversi_matching::Entity as ReversiMatching;
+pub use super::signin::Entity as Signin;
+pub use super::sw_subscription::Entity as SwSubscription;
+pub use super::used_username::Entity as UsedUsername;
+pub use super::user::Entity as User;
+pub use super::user_group::Entity as UserGroup;
+pub use super::user_group_invitation::Entity as UserGroupInvitation;
+pub use super::user_group_invite::Entity as UserGroupInvite;
+pub use super::user_group_joining::Entity as UserGroupJoining;
+pub use super::user_ip::Entity as UserIp;
+pub use super::user_keypair::Entity as UserKeypair;
+pub use super::user_list::Entity as UserList;
+pub use super::user_list_joining::Entity as UserListJoining;
+pub use super::user_note_pining::Entity as UserNotePining;
+pub use super::user_pending::Entity as UserPending;
+pub use super::user_profile::Entity as UserProfile;
+pub use super::user_publickey::Entity as UserPublickey;
+pub use super::user_security_key::Entity as UserSecurityKey;
+pub use super::webhook::Entity as Webhook;
diff --git a/packages/backend/native-utils/crates/model/src/entity/promo_note.rs b/packages/backend/native-utils/crates/model/src/entity/promo_note.rs
new file mode 100644
index 0000000000..6e8de98663
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/promo_note.rs
@@ -0,0 +1,35 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "promo_note")]
+pub struct Model {
+    #[sea_orm(column_name = "noteId", primary_key, auto_increment = false, unique)]
+    pub note_id: String,
+    #[sea_orm(column_name = "expiresAt")]
+    pub expires_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::note::Entity",
+        from = "Column::NoteId",
+        to = "super::note::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Note,
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/promo_read.rs b/packages/backend/native-utils/crates/model/src/entity/promo_read.rs
new file mode 100644
index 0000000000..807ad4a272
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/promo_read.rs
@@ -0,0 +1,51 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "promo_read")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "noteId")]
+    pub note_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::note::Entity",
+        from = "Column::NoteId",
+        to = "super::note::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Note,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/registration_ticket.rs b/packages/backend/native-utils/crates/model/src/entity/registration_ticket.rs
new file mode 100644
index 0000000000..8d7e4ba8d0
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/registration_ticket.rs
@@ -0,0 +1,19 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "registration_ticket")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    pub code: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/registry_item.rs b/packages/backend/native-utils/crates/model/src/entity/registry_item.rs
new file mode 100644
index 0000000000..8aa1882107
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/registry_item.rs
@@ -0,0 +1,42 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "registry_item")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "updatedAt")]
+    pub updated_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    pub key: String,
+    pub scope: Vec<String>,
+    pub domain: Option<String>,
+    #[sea_orm(column_type = "JsonBinary", nullable)]
+    pub value: Option<Json>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/relay.rs b/packages/backend/native-utils/crates/model/src/entity/relay.rs
new file mode 100644
index 0000000000..731d12e8cc
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/relay.rs
@@ -0,0 +1,19 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use super::sea_orm_active_enums::RelayStatusEnum;
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "relay")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    pub inbox: String,
+    pub status: RelayStatusEnum,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/renote_muting.rs b/packages/backend/native-utils/crates/model/src/entity/renote_muting.rs
new file mode 100644
index 0000000000..b63c989a69
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/renote_muting.rs
@@ -0,0 +1,22 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "renote_muting")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "muteeId")]
+    pub mutee_id: String,
+    #[sea_orm(column_name = "muterId")]
+    pub muter_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/reversi_game.rs b/packages/backend/native-utils/crates/model/src/entity/reversi_game.rs
new file mode 100644
index 0000000000..56f83e5430
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/reversi_game.rs
@@ -0,0 +1,68 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "reversi_game")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "startedAt")]
+    pub started_at: Option<DateTimeWithTimeZone>,
+    #[sea_orm(column_name = "user1Id")]
+    pub user1_id: String,
+    #[sea_orm(column_name = "user2Id")]
+    pub user2_id: String,
+    #[sea_orm(column_name = "user1Accepted")]
+    pub user1_accepted: bool,
+    #[sea_orm(column_name = "user2Accepted")]
+    pub user2_accepted: bool,
+    pub black: Option<i32>,
+    #[sea_orm(column_name = "isStarted")]
+    pub is_started: bool,
+    #[sea_orm(column_name = "isEnded")]
+    pub is_ended: bool,
+    #[sea_orm(column_name = "winnerId")]
+    pub winner_id: Option<String>,
+    pub surrendered: Option<String>,
+    #[sea_orm(column_type = "JsonBinary")]
+    pub logs: Json,
+    pub map: Vec<String>,
+    pub bw: String,
+    #[sea_orm(column_name = "isLlotheo")]
+    pub is_llotheo: bool,
+    #[sea_orm(column_name = "canPutEverywhere")]
+    pub can_put_everywhere: bool,
+    #[sea_orm(column_name = "loopedBoard")]
+    pub looped_board: bool,
+    #[sea_orm(column_type = "JsonBinary", nullable)]
+    pub form1: Option<Json>,
+    #[sea_orm(column_type = "JsonBinary", nullable)]
+    pub form2: Option<Json>,
+    pub crc32: Option<String>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::User2Id",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User2,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::User1Id",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User1,
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/reversi_matching.rs b/packages/backend/native-utils/crates/model/src/entity/reversi_matching.rs
new file mode 100644
index 0000000000..9261b64822
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/reversi_matching.rs
@@ -0,0 +1,39 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "reversi_matching")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "parentId")]
+    pub parent_id: String,
+    #[sea_orm(column_name = "childId")]
+    pub child_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::ParentId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User2,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::ChildId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User1,
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/sea_orm_active_enums.rs b/packages/backend/native-utils/crates/model/src/entity/sea_orm_active_enums.rs
new file mode 100644
index 0000000000..747cd953a2
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/sea_orm_active_enums.rs
@@ -0,0 +1,175 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "antenna_src_enum")]
+pub enum AntennaSrcEnum {
+    #[sea_orm(string_value = "all")]
+    All,
+    #[sea_orm(string_value = "group")]
+    Group,
+    #[sea_orm(string_value = "home")]
+    Home,
+    #[sea_orm(string_value = "instances")]
+    Instances,
+    #[sea_orm(string_value = "list")]
+    List,
+    #[sea_orm(string_value = "users")]
+    Users,
+}
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[sea_orm(
+    rs_type = "String",
+    db_type = "Enum",
+    enum_name = "meta_sensitivemediadetection_enum"
+)]
+pub enum MetaSensitivemediadetectionEnum {
+    #[sea_orm(string_value = "all")]
+    All,
+    #[sea_orm(string_value = "local")]
+    Local,
+    #[sea_orm(string_value = "none")]
+    None,
+    #[sea_orm(string_value = "remote")]
+    Remote,
+}
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[sea_orm(
+    rs_type = "String",
+    db_type = "Enum",
+    enum_name = "meta_sensitivemediadetectionsensitivity_enum"
+)]
+pub enum MetaSensitivemediadetectionsensitivityEnum {
+    #[sea_orm(string_value = "high")]
+    High,
+    #[sea_orm(string_value = "low")]
+    Low,
+    #[sea_orm(string_value = "medium")]
+    Medium,
+    #[sea_orm(string_value = "veryHigh")]
+    VeryHigh,
+    #[sea_orm(string_value = "veryLow")]
+    VeryLow,
+}
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[sea_orm(
+    rs_type = "String",
+    db_type = "Enum",
+    enum_name = "muted_note_reason_enum"
+)]
+pub enum MutedNoteReasonEnum {
+    #[sea_orm(string_value = "manual")]
+    Manual,
+    #[sea_orm(string_value = "other")]
+    Other,
+    #[sea_orm(string_value = "spam")]
+    Spam,
+    #[sea_orm(string_value = "word")]
+    Word,
+}
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[sea_orm(
+    rs_type = "String",
+    db_type = "Enum",
+    enum_name = "note_visibility_enum"
+)]
+pub enum NoteVisibilityEnum {
+    #[sea_orm(string_value = "followers")]
+    Followers,
+    #[sea_orm(string_value = "hidden")]
+    Hidden,
+    #[sea_orm(string_value = "home")]
+    Home,
+    #[sea_orm(string_value = "public")]
+    Public,
+    #[sea_orm(string_value = "specified")]
+    Specified,
+}
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[sea_orm(
+    rs_type = "String",
+    db_type = "Enum",
+    enum_name = "notification_type_enum"
+)]
+pub enum NotificationTypeEnum {
+    #[sea_orm(string_value = "app")]
+    App,
+    #[sea_orm(string_value = "follow")]
+    Follow,
+    #[sea_orm(string_value = "followRequestAccepted")]
+    FollowRequestAccepted,
+    #[sea_orm(string_value = "groupInvited")]
+    GroupInvited,
+    #[sea_orm(string_value = "mention")]
+    Mention,
+    #[sea_orm(string_value = "pollEnded")]
+    PollEnded,
+    #[sea_orm(string_value = "pollVote")]
+    PollVote,
+    #[sea_orm(string_value = "quote")]
+    Quote,
+    #[sea_orm(string_value = "reaction")]
+    Reaction,
+    #[sea_orm(string_value = "receiveFollowRequest")]
+    ReceiveFollowRequest,
+    #[sea_orm(string_value = "renote")]
+    Renote,
+    #[sea_orm(string_value = "reply")]
+    Reply,
+}
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[sea_orm(
+    rs_type = "String",
+    db_type = "Enum",
+    enum_name = "page_visibility_enum"
+)]
+pub enum PageVisibilityEnum {
+    #[sea_orm(string_value = "followers")]
+    Followers,
+    #[sea_orm(string_value = "public")]
+    Public,
+    #[sea_orm(string_value = "specified")]
+    Specified,
+}
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[sea_orm(
+    rs_type = "String",
+    db_type = "Enum",
+    enum_name = "poll_notevisibility_enum"
+)]
+pub enum PollNotevisibilityEnum {
+    #[sea_orm(string_value = "followers")]
+    Followers,
+    #[sea_orm(string_value = "home")]
+    Home,
+    #[sea_orm(string_value = "public")]
+    Public,
+    #[sea_orm(string_value = "specified")]
+    Specified,
+}
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "relay_status_enum")]
+pub enum RelayStatusEnum {
+    #[sea_orm(string_value = "accepted")]
+    Accepted,
+    #[sea_orm(string_value = "rejected")]
+    Rejected,
+    #[sea_orm(string_value = "requesting")]
+    Requesting,
+}
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[sea_orm(
+    rs_type = "String",
+    db_type = "Enum",
+    enum_name = "user_profile_ffvisibility_enum"
+)]
+pub enum UserProfileFfvisibilityEnum {
+    #[sea_orm(string_value = "followers")]
+    Followers,
+    #[sea_orm(string_value = "private")]
+    Private,
+    #[sea_orm(string_value = "public")]
+    Public,
+}
diff --git a/packages/backend/native-utils/crates/model/src/entity/signin.rs b/packages/backend/native-utils/crates/model/src/entity/signin.rs
new file mode 100644
index 0000000000..d6f730892b
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/signin.rs
@@ -0,0 +1,39 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "signin")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    pub ip: String,
+    #[sea_orm(column_type = "JsonBinary")]
+    pub headers: Json,
+    pub success: bool,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/sw_subscription.rs b/packages/backend/native-utils/crates/model/src/entity/sw_subscription.rs
new file mode 100644
index 0000000000..0d2ac26d9d
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/sw_subscription.rs
@@ -0,0 +1,40 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "sw_subscription")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    pub endpoint: String,
+    pub auth: String,
+    pub publickey: String,
+    #[sea_orm(column_name = "sendReadMessage")]
+    pub send_read_message: bool,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/used_username.rs b/packages/backend/native-utils/crates/model/src/entity/used_username.rs
new file mode 100644
index 0000000000..cf325cfa5f
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/used_username.rs
@@ -0,0 +1,18 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "used_username")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub username: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/user.rs b/packages/backend/native-utils/crates/model/src/entity/user.rs
new file mode 100644
index 0000000000..cd11539940
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/user.rs
@@ -0,0 +1,425 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "user")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "updatedAt")]
+    pub updated_at: Option<DateTimeWithTimeZone>,
+    #[sea_orm(column_name = "lastFetchedAt")]
+    pub last_fetched_at: Option<DateTimeWithTimeZone>,
+    pub username: String,
+    #[sea_orm(column_name = "usernameLower")]
+    pub username_lower: String,
+    pub name: Option<String>,
+    #[sea_orm(column_name = "followersCount")]
+    pub followers_count: i32,
+    #[sea_orm(column_name = "followingCount")]
+    pub following_count: i32,
+    #[sea_orm(column_name = "notesCount")]
+    pub notes_count: i32,
+    #[sea_orm(column_name = "avatarId", unique)]
+    pub avatar_id: Option<String>,
+    #[sea_orm(column_name = "bannerId", unique)]
+    pub banner_id: Option<String>,
+    pub tags: Vec<String>,
+    #[sea_orm(column_name = "isSuspended")]
+    pub is_suspended: bool,
+    #[sea_orm(column_name = "isSilenced")]
+    pub is_silenced: bool,
+    #[sea_orm(column_name = "isLocked")]
+    pub is_locked: bool,
+    #[sea_orm(column_name = "isBot")]
+    pub is_bot: bool,
+    #[sea_orm(column_name = "isCat")]
+    pub is_cat: bool,
+    #[sea_orm(column_name = "isAdmin")]
+    pub is_admin: bool,
+    #[sea_orm(column_name = "isModerator")]
+    pub is_moderator: bool,
+    pub emojis: Vec<String>,
+    pub host: Option<String>,
+    pub inbox: Option<String>,
+    #[sea_orm(column_name = "sharedInbox")]
+    pub shared_inbox: Option<String>,
+    pub featured: Option<String>,
+    pub uri: Option<String>,
+    #[sea_orm(unique)]
+    pub token: Option<String>,
+    #[sea_orm(column_name = "isExplorable")]
+    pub is_explorable: bool,
+    #[sea_orm(column_name = "followersUri")]
+    pub followers_uri: Option<String>,
+    #[sea_orm(column_name = "lastActiveDate")]
+    pub last_active_date: Option<DateTimeWithTimeZone>,
+    #[sea_orm(column_name = "hideOnlineStatus")]
+    pub hide_online_status: bool,
+    #[sea_orm(column_name = "isDeleted")]
+    pub is_deleted: bool,
+    #[sea_orm(column_name = "showTimelineReplies")]
+    pub show_timeline_replies: bool,
+    #[sea_orm(column_name = "driveCapacityOverrideMb")]
+    pub drive_capacity_override_mb: Option<i32>,
+    #[sea_orm(column_name = "movedToUri")]
+    pub moved_to_uri: Option<String>,
+    #[sea_orm(column_name = "alsoKnownAs", column_type = "Text", nullable)]
+    pub also_known_as: Option<String>,
+    #[sea_orm(column_name = "speakAsCat")]
+    pub speak_as_cat: bool,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::access_token::Entity")]
+    AccessToken,
+    #[sea_orm(has_many = "super::announcement_read::Entity")]
+    AnnouncementRead,
+    #[sea_orm(has_many = "super::antenna::Entity")]
+    Antenna,
+    #[sea_orm(has_many = "super::app::Entity")]
+    App,
+    #[sea_orm(has_many = "super::attestation_challenge::Entity")]
+    AttestationChallenge,
+    #[sea_orm(has_many = "super::auth_session::Entity")]
+    AuthSession,
+    #[sea_orm(has_many = "super::channel::Entity")]
+    Channel,
+    #[sea_orm(has_many = "super::channel_following::Entity")]
+    ChannelFollowing,
+    #[sea_orm(has_many = "super::clip::Entity")]
+    Clip,
+    #[sea_orm(
+        belongs_to = "super::drive_file::Entity",
+        from = "Column::AvatarId",
+        to = "super::drive_file::Column::Id",
+        on_update = "NoAction",
+        on_delete = "SetNull"
+    )]
+    DriveFile2,
+    #[sea_orm(
+        belongs_to = "super::drive_file::Entity",
+        from = "Column::BannerId",
+        to = "super::drive_file::Column::Id",
+        on_update = "NoAction",
+        on_delete = "SetNull"
+    )]
+    DriveFile1,
+    #[sea_orm(has_many = "super::drive_folder::Entity")]
+    DriveFolder,
+    #[sea_orm(has_many = "super::gallery_like::Entity")]
+    GalleryLike,
+    #[sea_orm(has_many = "super::gallery_post::Entity")]
+    GalleryPost,
+    #[sea_orm(has_many = "super::meta::Entity")]
+    Meta,
+    #[sea_orm(has_many = "super::moderation_log::Entity")]
+    ModerationLog,
+    #[sea_orm(has_many = "super::muted_note::Entity")]
+    MutedNote,
+    #[sea_orm(has_many = "super::note::Entity")]
+    Note,
+    #[sea_orm(has_many = "super::note_favorite::Entity")]
+    NoteFavorite,
+    #[sea_orm(has_many = "super::note_reaction::Entity")]
+    NoteReaction,
+    #[sea_orm(has_many = "super::note_thread_muting::Entity")]
+    NoteThreadMuting,
+    #[sea_orm(has_many = "super::note_unread::Entity")]
+    NoteUnread,
+    #[sea_orm(has_many = "super::note_watching::Entity")]
+    NoteWatching,
+    #[sea_orm(has_many = "super::page::Entity")]
+    Page,
+    #[sea_orm(has_many = "super::page_like::Entity")]
+    PageLike,
+    #[sea_orm(has_many = "super::password_reset_request::Entity")]
+    PasswordResetRequest,
+    #[sea_orm(has_many = "super::poll_vote::Entity")]
+    PollVote,
+    #[sea_orm(has_many = "super::promo_read::Entity")]
+    PromoRead,
+    #[sea_orm(has_many = "super::registry_item::Entity")]
+    RegistryItem,
+    #[sea_orm(has_many = "super::signin::Entity")]
+    Signin,
+    #[sea_orm(has_many = "super::sw_subscription::Entity")]
+    SwSubscription,
+    #[sea_orm(has_many = "super::user_group::Entity")]
+    UserGroup,
+    #[sea_orm(has_many = "super::user_group_invitation::Entity")]
+    UserGroupInvitation,
+    #[sea_orm(has_many = "super::user_group_invite::Entity")]
+    UserGroupInvite,
+    #[sea_orm(has_many = "super::user_group_joining::Entity")]
+    UserGroupJoining,
+    #[sea_orm(has_one = "super::user_keypair::Entity")]
+    UserKeypair,
+    #[sea_orm(has_many = "super::user_list::Entity")]
+    UserList,
+    #[sea_orm(has_many = "super::user_list_joining::Entity")]
+    UserListJoining,
+    #[sea_orm(has_many = "super::user_note_pining::Entity")]
+    UserNotePining,
+    #[sea_orm(has_one = "super::user_profile::Entity")]
+    UserProfile,
+    #[sea_orm(has_one = "super::user_publickey::Entity")]
+    UserPublickey,
+    #[sea_orm(has_many = "super::user_security_key::Entity")]
+    UserSecurityKey,
+    #[sea_orm(has_many = "super::webhook::Entity")]
+    Webhook,
+}
+
+impl Related<super::access_token::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AccessToken.def()
+    }
+}
+
+impl Related<super::announcement_read::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AnnouncementRead.def()
+    }
+}
+
+impl Related<super::antenna::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Antenna.def()
+    }
+}
+
+impl Related<super::app::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::App.def()
+    }
+}
+
+impl Related<super::attestation_challenge::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AttestationChallenge.def()
+    }
+}
+
+impl Related<super::auth_session::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::AuthSession.def()
+    }
+}
+
+impl Related<super::channel::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Channel.def()
+    }
+}
+
+impl Related<super::channel_following::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ChannelFollowing.def()
+    }
+}
+
+impl Related<super::clip::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Clip.def()
+    }
+}
+
+impl Related<super::drive_folder::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::DriveFolder.def()
+    }
+}
+
+impl Related<super::gallery_like::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::GalleryLike.def()
+    }
+}
+
+impl Related<super::gallery_post::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::GalleryPost.def()
+    }
+}
+
+impl Related<super::meta::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Meta.def()
+    }
+}
+
+impl Related<super::moderation_log::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::ModerationLog.def()
+    }
+}
+
+impl Related<super::muted_note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::MutedNote.def()
+    }
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl Related<super::note_favorite::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::NoteFavorite.def()
+    }
+}
+
+impl Related<super::note_reaction::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::NoteReaction.def()
+    }
+}
+
+impl Related<super::note_thread_muting::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::NoteThreadMuting.def()
+    }
+}
+
+impl Related<super::note_unread::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::NoteUnread.def()
+    }
+}
+
+impl Related<super::note_watching::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::NoteWatching.def()
+    }
+}
+
+impl Related<super::page::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Page.def()
+    }
+}
+
+impl Related<super::page_like::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::PageLike.def()
+    }
+}
+
+impl Related<super::password_reset_request::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::PasswordResetRequest.def()
+    }
+}
+
+impl Related<super::poll_vote::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::PollVote.def()
+    }
+}
+
+impl Related<super::promo_read::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::PromoRead.def()
+    }
+}
+
+impl Related<super::registry_item::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::RegistryItem.def()
+    }
+}
+
+impl Related<super::signin::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Signin.def()
+    }
+}
+
+impl Related<super::sw_subscription::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::SwSubscription.def()
+    }
+}
+
+impl Related<super::user_group::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserGroup.def()
+    }
+}
+
+impl Related<super::user_group_invitation::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserGroupInvitation.def()
+    }
+}
+
+impl Related<super::user_group_invite::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserGroupInvite.def()
+    }
+}
+
+impl Related<super::user_group_joining::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserGroupJoining.def()
+    }
+}
+
+impl Related<super::user_keypair::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserKeypair.def()
+    }
+}
+
+impl Related<super::user_list::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserList.def()
+    }
+}
+
+impl Related<super::user_list_joining::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserListJoining.def()
+    }
+}
+
+impl Related<super::user_note_pining::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserNotePining.def()
+    }
+}
+
+impl Related<super::user_profile::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserProfile.def()
+    }
+}
+
+impl Related<super::user_publickey::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserPublickey.def()
+    }
+}
+
+impl Related<super::user_security_key::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserSecurityKey.def()
+    }
+}
+
+impl Related<super::webhook::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Webhook.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_group.rs b/packages/backend/native-utils/crates/model/src/entity/user_group.rs
new file mode 100644
index 0000000000..278e9997d7
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/user_group.rs
@@ -0,0 +1,70 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "user_group")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    pub name: String,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "isPrivate")]
+    pub is_private: bool,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::messaging_message::Entity")]
+    MessagingMessage,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+    #[sea_orm(has_many = "super::user_group_invitation::Entity")]
+    UserGroupInvitation,
+    #[sea_orm(has_many = "super::user_group_invite::Entity")]
+    UserGroupInvite,
+    #[sea_orm(has_many = "super::user_group_joining::Entity")]
+    UserGroupJoining,
+}
+
+impl Related<super::messaging_message::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::MessagingMessage.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl Related<super::user_group_invitation::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserGroupInvitation.def()
+    }
+}
+
+impl Related<super::user_group_invite::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserGroupInvite.def()
+    }
+}
+
+impl Related<super::user_group_joining::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserGroupJoining.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_group_invitation.rs b/packages/backend/native-utils/crates/model/src/entity/user_group_invitation.rs
new file mode 100644
index 0000000000..62538db37c
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/user_group_invitation.rs
@@ -0,0 +1,59 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "user_group_invitation")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "userGroupId")]
+    pub user_group_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::notification::Entity")]
+    Notification,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+    #[sea_orm(
+        belongs_to = "super::user_group::Entity",
+        from = "Column::UserGroupId",
+        to = "super::user_group::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    UserGroup,
+}
+
+impl Related<super::notification::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Notification.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl Related<super::user_group::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserGroup.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_group_invite.rs b/packages/backend/native-utils/crates/model/src/entity/user_group_invite.rs
new file mode 100644
index 0000000000..7ddfa021fe
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/user_group_invite.rs
@@ -0,0 +1,51 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "user_group_invite")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "userGroupId")]
+    pub user_group_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+    #[sea_orm(
+        belongs_to = "super::user_group::Entity",
+        from = "Column::UserGroupId",
+        to = "super::user_group::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    UserGroup,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl Related<super::user_group::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserGroup.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_group_joining.rs b/packages/backend/native-utils/crates/model/src/entity/user_group_joining.rs
new file mode 100644
index 0000000000..65cb000df5
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/user_group_joining.rs
@@ -0,0 +1,59 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "user_group_joining")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "userGroupId")]
+    pub user_group_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::antenna::Entity")]
+    Antenna,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+    #[sea_orm(
+        belongs_to = "super::user_group::Entity",
+        from = "Column::UserGroupId",
+        to = "super::user_group::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    UserGroup,
+}
+
+impl Related<super::antenna::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Antenna.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl Related<super::user_group::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserGroup.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_ip.rs b/packages/backend/native-utils/crates/model/src/entity/user_ip.rs
new file mode 100644
index 0000000000..d108b29fe7
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/user_ip.rs
@@ -0,0 +1,21 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "user_ip")]
+pub struct Model {
+    #[sea_orm(primary_key)]
+    pub id: i32,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    pub ip: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_keypair.rs b/packages/backend/native-utils/crates/model/src/entity/user_keypair.rs
new file mode 100644
index 0000000000..a9a07b1d9d
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/user_keypair.rs
@@ -0,0 +1,35 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "user_keypair")]
+pub struct Model {
+    #[sea_orm(column_name = "userId", primary_key, auto_increment = false, unique)]
+    pub user_id: String,
+    #[sea_orm(column_name = "publicKey")]
+    pub public_key: String,
+    #[sea_orm(column_name = "privateKey")]
+    pub private_key: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_list.rs b/packages/backend/native-utils/crates/model/src/entity/user_list.rs
new file mode 100644
index 0000000000..6a2f932414
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/user_list.rs
@@ -0,0 +1,52 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "user_list")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    pub name: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(has_many = "super::antenna::Entity")]
+    Antenna,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+    #[sea_orm(has_many = "super::user_list_joining::Entity")]
+    UserListJoining,
+}
+
+impl Related<super::antenna::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Antenna.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl Related<super::user_list_joining::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserListJoining.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_list_joining.rs b/packages/backend/native-utils/crates/model/src/entity/user_list_joining.rs
new file mode 100644
index 0000000000..fddcfdb543
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/user_list_joining.rs
@@ -0,0 +1,51 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "user_list_joining")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "userListId")]
+    pub user_list_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+    #[sea_orm(
+        belongs_to = "super::user_list::Entity",
+        from = "Column::UserListId",
+        to = "super::user_list::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    UserList,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl Related<super::user_list::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::UserList.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_note_pining.rs b/packages/backend/native-utils/crates/model/src/entity/user_note_pining.rs
new file mode 100644
index 0000000000..24e976e223
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/user_note_pining.rs
@@ -0,0 +1,51 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "user_note_pining")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "noteId")]
+    pub note_id: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::note::Entity",
+        from = "Column::NoteId",
+        to = "super::note::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    Note,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::note::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Note.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_pending.rs b/packages/backend/native-utils/crates/model/src/entity/user_pending.rs
new file mode 100644
index 0000000000..e9134d9eec
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/user_pending.rs
@@ -0,0 +1,22 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "user_pending")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    pub code: String,
+    pub username: String,
+    pub email: String,
+    pub password: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_profile.rs b/packages/backend/native-utils/crates/model/src/entity/user_profile.rs
new file mode 100644
index 0000000000..d22dcbebf3
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/user_profile.rs
@@ -0,0 +1,111 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use super::sea_orm_active_enums::UserProfileFfvisibilityEnum;
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "user_profile")]
+pub struct Model {
+    #[sea_orm(column_name = "userId", primary_key, auto_increment = false, unique)]
+    pub user_id: String,
+    pub location: Option<String>,
+    pub birthday: Option<String>,
+    pub description: Option<String>,
+    #[sea_orm(column_type = "JsonBinary")]
+    pub fields: Json,
+    pub url: Option<String>,
+    pub email: Option<String>,
+    #[sea_orm(column_name = "emailVerifyCode")]
+    pub email_verify_code: Option<String>,
+    #[sea_orm(column_name = "emailVerified")]
+    pub email_verified: bool,
+    #[sea_orm(column_name = "twoFactorTempSecret")]
+    pub two_factor_temp_secret: Option<String>,
+    #[sea_orm(column_name = "twoFactorSecret")]
+    pub two_factor_secret: Option<String>,
+    #[sea_orm(column_name = "twoFactorEnabled")]
+    pub two_factor_enabled: bool,
+    pub password: Option<String>,
+    #[sea_orm(column_name = "clientData", column_type = "JsonBinary")]
+    pub client_data: Json,
+    #[sea_orm(column_name = "autoAcceptFollowed")]
+    pub auto_accept_followed: bool,
+    #[sea_orm(column_name = "alwaysMarkNsfw")]
+    pub always_mark_nsfw: bool,
+    #[sea_orm(column_name = "carefulBot")]
+    pub careful_bot: bool,
+    #[sea_orm(column_name = "userHost")]
+    pub user_host: Option<String>,
+    #[sea_orm(column_name = "securityKeysAvailable")]
+    pub security_keys_available: bool,
+    #[sea_orm(column_name = "usePasswordLessLogin")]
+    pub use_password_less_login: bool,
+    #[sea_orm(column_name = "pinnedPageId", unique)]
+    pub pinned_page_id: Option<String>,
+    #[sea_orm(column_type = "JsonBinary")]
+    pub room: Json,
+    #[sea_orm(column_type = "JsonBinary")]
+    pub integrations: Json,
+    #[sea_orm(column_name = "injectFeaturedNote")]
+    pub inject_featured_note: bool,
+    #[sea_orm(column_name = "enableWordMute")]
+    pub enable_word_mute: bool,
+    #[sea_orm(column_name = "mutedWords", column_type = "JsonBinary")]
+    pub muted_words: Json,
+    #[sea_orm(column_name = "mutingNotificationTypes")]
+    pub muting_notification_types: Vec<String>,
+    #[sea_orm(column_name = "noCrawle")]
+    pub no_crawle: bool,
+    #[sea_orm(column_name = "receiveAnnouncementEmail")]
+    pub receive_announcement_email: bool,
+    #[sea_orm(column_name = "emailNotificationTypes", column_type = "JsonBinary")]
+    pub email_notification_types: Json,
+    pub lang: Option<String>,
+    #[sea_orm(column_name = "mutedInstances", column_type = "JsonBinary")]
+    pub muted_instances: Json,
+    #[sea_orm(column_name = "publicReactions")]
+    pub public_reactions: bool,
+    #[sea_orm(column_name = "ffVisibility")]
+    pub ff_visibility: UserProfileFfvisibilityEnum,
+    #[sea_orm(column_name = "autoSensitive")]
+    pub auto_sensitive: bool,
+    #[sea_orm(column_name = "moderationNote")]
+    pub moderation_note: String,
+    #[sea_orm(column_name = "preventAiLearning")]
+    pub prevent_ai_learning: bool,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::page::Entity",
+        from = "Column::PinnedPageId",
+        to = "super::page::Column::Id",
+        on_update = "NoAction",
+        on_delete = "SetNull"
+    )]
+    Page,
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::page::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::Page.def()
+    }
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_publickey.rs b/packages/backend/native-utils/crates/model/src/entity/user_publickey.rs
new file mode 100644
index 0000000000..5cf6857e23
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/user_publickey.rs
@@ -0,0 +1,35 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "user_publickey")]
+pub struct Model {
+    #[sea_orm(column_name = "userId", primary_key, auto_increment = false, unique)]
+    pub user_id: String,
+    #[sea_orm(column_name = "keyId")]
+    pub key_id: String,
+    #[sea_orm(column_name = "keyPem")]
+    pub key_pem: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_security_key.rs b/packages/backend/native-utils/crates/model/src/entity/user_security_key.rs
new file mode 100644
index 0000000000..531b59ab88
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/user_security_key.rs
@@ -0,0 +1,38 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "user_security_key")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    #[sea_orm(column_name = "publicKey")]
+    pub public_key: String,
+    #[sea_orm(column_name = "lastUsed")]
+    pub last_used: DateTimeWithTimeZone,
+    pub name: String,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/webhook.rs b/packages/backend/native-utils/crates/model/src/entity/webhook.rs
new file mode 100644
index 0000000000..39508f7fa7
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/webhook.rs
@@ -0,0 +1,44 @@
+//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
+
+use sea_orm::entity::prelude::*;
+use serde::{Deserialize, Serialize};
+
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[sea_orm(table_name = "webhook")]
+pub struct Model {
+    #[sea_orm(primary_key, auto_increment = false)]
+    pub id: String,
+    #[sea_orm(column_name = "createdAt")]
+    pub created_at: DateTimeWithTimeZone,
+    #[sea_orm(column_name = "userId")]
+    pub user_id: String,
+    pub name: String,
+    pub on: Vec<String>,
+    pub url: String,
+    pub secret: String,
+    pub active: bool,
+    #[sea_orm(column_name = "latestSentAt")]
+    pub latest_sent_at: Option<DateTimeWithTimeZone>,
+    #[sea_orm(column_name = "latestStatus")]
+    pub latest_status: Option<i32>,
+}
+
+#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
+pub enum Relation {
+    #[sea_orm(
+        belongs_to = "super::user::Entity",
+        from = "Column::UserId",
+        to = "super::user::Column::Id",
+        on_update = "NoAction",
+        on_delete = "Cascade"
+    )]
+    User,
+}
+
+impl Related<super::user::Entity> for Entity {
+    fn to() -> RelationDef {
+        Relation::User.def()
+    }
+}
+
+impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/lib.rs b/packages/backend/native-utils/crates/model/src/lib.rs
new file mode 100644
index 0000000000..b14d29c349
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/lib.rs
@@ -0,0 +1,3 @@
+pub mod entity;
+pub mod repository;
+pub mod schema;
diff --git a/packages/backend/native-utils/crates/model/src/repository/abuse_user_report.rs b/packages/backend/native-utils/crates/model/src/repository/abuse_user_report.rs
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/repository/abuse_user_report.rs
@@ -0,0 +1 @@
+
diff --git a/packages/backend/native-utils/crates/model/src/repository/mod.rs b/packages/backend/native-utils/crates/model/src/repository/mod.rs
new file mode 100644
index 0000000000..f7a5900810
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/repository/mod.rs
@@ -0,0 +1 @@
+pub mod abuse_user_report;
diff --git a/packages/backend/native-utils/crates/model/src/schema/antenna.rs b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
new file mode 100644
index 0000000000..3bffe4f5f1
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
@@ -0,0 +1,128 @@
+use jsonschema::JSONSchema;
+use once_cell::sync::Lazy;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+use super::Schema;
+
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct Antenna {
+    pub id: String,
+    pub created_at: chrono::DateTime<chrono::Utc>,
+    pub name: String,
+    pub keywords: Vec<Vec<String>>,
+    pub exclude_keywords: Vec<Vec<String>>,
+    #[schema(inline)]
+    pub src: AntennaSrcEnum,
+    pub user_list_id: Option<String>,
+    pub user_group_id: Option<String>,
+    pub users: Vec<String>,
+    pub instances: Vec<String>,
+    #[serde(default)]
+    pub case_sensitive: bool,
+    #[serde(default)]
+    pub notify: bool,
+    #[serde(default)]
+    pub with_replies: bool,
+    #[serde(default)]
+    pub with_file: bool,
+    #[serde(default)]
+    pub has_unread_note: bool,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "lowercase")]
+pub enum AntennaSrcEnum {
+    Home,
+    All,
+    Users,
+    List,
+    Group,
+    Instances,
+}
+
+impl Schema<Self> for Antenna {}
+
+pub static VALIDATOR: Lazy<JSONSchema> = Lazy::new(|| Antenna::validator());
+
+#[cfg(test)]
+mod tests {
+    use serde_json::json;
+
+    use super::VALIDATOR;
+
+    #[test]
+    fn valid() {
+        let instance = json!({
+            "id": "9f4x0bkx1u",
+            "createdAt": "2023-05-24T06:56:14.323Z",
+            "name": "Valid Antenna",
+            "keywords": [["first", "keyword"], ["second"]],
+            "excludeKeywords": [["excluding", "keywrods"], ["from", "antenna"]],
+            "src": "users",
+            // "userListId" and "userGroupId" can be null or be omitted
+            "userListId": null,
+            "users": ["9f4yjw6m13", "9f4yk2cp6d"],
+            "instances": [],
+            // "caseSensitive", "notify", "withReplies", "withFile", and
+            // "hasUnreadNote" are false if ommited
+            "notify": false,
+            "withReplies": false,
+            "withFile": false,
+            "hasUnreadNote": false,
+        });
+
+        assert!(VALIDATOR.is_valid(&instance));
+    }
+
+    #[test]
+    fn invalid() {
+        let instance = json!({
+            // "id" is required
+            "id": null,
+            // trailing "Z" is missing
+            "createdAt": "2023-05-24T07:36:34.389",
+            // "name" is required
+            // "keywords" must be an array
+            "keywords": "invalid keyword",
+            // "excludeKeywords" is required
+            "excludeKeywords": null,
+            // "src" should be one of "home", "all", "users", "list", "group", and
+            // "instances"
+            "src": "invalid_src",
+            // "userListId" is string
+            "userListId": ["9f4ziiqfxw"],
+            // "users" must be an array of strings
+            "users": [1, "9f4ykyuza6"],
+            "instances": ["9f4ykyuybo"],
+            // "caseSensitive" is boolean
+            "caseSensitive": 0,
+            "notify": true,
+            "withReplies": true,
+            "withFile": true,
+            "hasUnreadNote": true,
+        });
+
+        let result = VALIDATOR
+            .validate(&instance)
+            .expect_err("validation must fail");
+        let mut paths: Vec<String> = result.map(|e| e.schema_path.to_string()).collect();
+        paths.sort();
+        assert_eq!(
+            paths,
+            vec![
+                "/properties/caseSensitive/type",
+                "/properties/createdAt/format",
+                "/properties/excludeKeywords/type",
+                "/properties/id/type",
+                "/properties/keywords/type",
+                "/properties/src/enum",
+                "/properties/userListId/type",
+                "/properties/users/items/type",
+                "/required"
+            ]
+        );
+    }
+}
diff --git a/packages/backend/native-utils/crates/model/src/schema/app.rs b/packages/backend/native-utils/crates/model/src/schema/app.rs
new file mode 100644
index 0000000000..861bdc48ac
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/schema/app.rs
@@ -0,0 +1,108 @@
+use jsonschema::JSONSchema;
+use once_cell::sync::Lazy;
+use schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use utoipa::ToSchema;
+
+use super::Schema;
+
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct App {
+    pub id: String,
+    pub name: String,
+    #[schemars(url)]
+    pub callback_url: Option<String>,
+    #[schema(inline)]
+    pub permission: Vec<Permission>,
+    pub secret: Option<String>,
+    pub is_authorized: Option<bool>,
+}
+
+/// This represents `permissions` in `packages/calckey-js/src/consts.ts`.
+#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, ToSchema)]
+pub enum Permission {
+    #[serde(rename = "read:account")]
+    ReadAccount,
+    #[serde(rename = "write:account")]
+    WriteAccount,
+    #[serde(rename = "read:blocks")]
+    ReadBlocks,
+    #[serde(rename = "write:blocks")]
+    WriteBlocks,
+    #[serde(rename = "read:drive")]
+    ReadDrive,
+    #[serde(rename = "write:drive")]
+    WriteDrive,
+    #[serde(rename = "read:favorites")]
+    ReadFavorites,
+    #[serde(rename = "write:favorites")]
+    WriteFavorites,
+    #[serde(rename = "read:following")]
+    ReadFollowing,
+    #[serde(rename = "write:following")]
+    WriteFollowing,
+    #[serde(rename = "read:messaging")]
+    ReadMessaging,
+    #[serde(rename = "write:messaging")]
+    WriteMessaging,
+    #[serde(rename = "read:mutes")]
+    ReadMutes,
+    #[serde(rename = "write:mutes")]
+    WriteMutes,
+    #[serde(rename = "read:notes")]
+    ReadNotes,
+    #[serde(rename = "write:notes")]
+    WriteNotes,
+    #[serde(rename = "read:notifications")]
+    ReadNotifications,
+    #[serde(rename = "write:notifications")]
+    WriteNotifications,
+    #[serde(rename = "read:reactions")]
+    ReadReactions,
+    #[serde(rename = "write:reactions")]
+    WriteReactions,
+    #[serde(rename = "write:votes")]
+    WriteVotes,
+    #[serde(rename = "read:pages")]
+    ReadPages,
+    #[serde(rename = "write:pages")]
+    WritePages,
+    #[serde(rename = "read:page-likes")]
+    ReadPageLikes,
+    #[serde(rename = "write:page-likes")]
+    WritePageLikes,
+    #[serde(rename = "read:user-groups")]
+    ReadUserGroups,
+    #[serde(rename = "write:user-groups")]
+    WriteUserGroups,
+    #[serde(rename = "read:channels")]
+    ReadChannels,
+    #[serde(rename = "write:channels")]
+    WriteChannels,
+    #[serde(rename = "read:gallery")]
+    ReadGallery,
+    #[serde(rename = "write:gallery")]
+    WriteGallery,
+    #[serde(rename = "read:gallery-likes")]
+    ReadGalleryLikes,
+    #[serde(rename = "write:gallery-likes")]
+    WriteGalleryLikes,
+}
+
+impl Schema<Self> for App {}
+
+pub static VALIDATOR: Lazy<JSONSchema> = Lazy::new(|| App::validator());
+
+#[cfg(test)]
+mod tests {
+    #[test]
+    fn valid() {
+        todo!();
+    }
+
+    #[test]
+    fn invalid() {
+        todo!();
+    }
+}
diff --git a/packages/backend/native-utils/crates/model/src/schema/mod.rs b/packages/backend/native-utils/crates/model/src/schema/mod.rs
new file mode 100644
index 0000000000..cc495aac1b
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/schema/mod.rs
@@ -0,0 +1,21 @@
+pub mod antenna;
+pub mod app;
+
+use jsonschema::JSONSchema;
+use schemars::{schema_for, JsonSchema};
+
+/// Structs of schema defitions implement this trait in order to
+/// provide the JSON Schema validator [`jsonschema::JSONSchema`].
+trait Schema<T: JsonSchema> {
+    /// Returns the validator of [JSON Schema Draft
+    /// 7](https://json-schema.org/specification-links.html#draft-7) with the
+    /// default settings of [`schemars::gen::SchemaSettings`].
+    fn validator() -> JSONSchema {
+        let root = schema_for!(T);
+        let schema = serde_json::to_value(&root).expect("Schema definition invalid");
+        JSONSchema::options()
+            .with_draft(jsonschema::Draft::Draft7)
+            .compile(&schema)
+            .expect("Unable to compile schema")
+    }
+}
diff --git a/packages/backend/native-utils/rustfmt.toml b/packages/backend/native-utils/rustfmt.toml
deleted file mode 100644
index cab5731eda..0000000000
--- a/packages/backend/native-utils/rustfmt.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-tab_spaces = 2
-edition = "2021"
diff --git a/packages/backend/native-utils/src/lib.rs b/packages/backend/native-utils/src/lib.rs
index bc5b9fc7cf..e131901406 100644
--- a/packages/backend/native-utils/src/lib.rs
+++ b/packages/backend/native-utils/src/lib.rs
@@ -1,2 +1 @@
-
 pub mod mastodon_api;
diff --git a/packages/backend/native-utils/src/mastodon_api.rs b/packages/backend/native-utils/src/mastodon_api.rs
index 36b4eb9849..7a3ea455a1 100644
--- a/packages/backend/native-utils/src/mastodon_api.rs
+++ b/packages/backend/native-utils/src/mastodon_api.rs
@@ -7,64 +7,64 @@ static CHAR_COLLECTION: &str = "0123456789abcdefghijklmnopqrstuvwxyz";
 
 #[napi]
 pub enum IdConvertType {
-  MastodonId,
-  CalckeyId,
+    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);
-      }
+    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",
-          ))
+            Ok(out.to_string())
         }
-      };
-      let mut out = String::new();
+        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;
-      }
+            while input != 0 {
+                out.insert(0, char_from_num((input % 36) as u8)?);
+                input /= 36;
+            }
 
-      Ok(out)
+            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);
+    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",
-  ))
+    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))
+    CHAR_COLLECTION
+        .chars()
+        .nth(number as usize)
+        .ok_or(Error::from_status(Status::Unknown))
 }

From bc0e0b14d096b5eba318ceb57b391acee04b1722 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Thu, 25 May 2023 08:55:20 -0400
Subject: [PATCH 211/319] add repository trait

---
 .../native-utils/crates/database/Cargo.toml   | 15 ++++++
 .../native-utils/crates/database/src/error.rs |  9 ++++
 .../native-utils/crates/database/src/lib.rs   | 18 +++++++
 .../native-utils/crates/model/Cargo.toml      |  4 ++
 .../native-utils/crates/model/src/error.rs    |  9 ++++
 .../native-utils/crates/model/src/lib.rs      |  3 +-
 .../model/src/repository/abuse_user_report.rs |  1 -
 .../crates/model/src/repository/antenna.rs    | 47 +++++++++++++++++++
 .../crates/model/src/repository/mod.rs        | 12 ++++-
 .../crates/model/src/schema/antenna.rs        | 33 ++++++++-----
 .../crates/model/src/schema/app.rs            |  5 +-
 .../crates/model/src/schema/mod.rs            | 30 ++++++++++++
 12 files changed, 169 insertions(+), 17 deletions(-)
 create mode 100644 packages/backend/native-utils/crates/database/Cargo.toml
 create mode 100644 packages/backend/native-utils/crates/database/src/error.rs
 create mode 100644 packages/backend/native-utils/crates/database/src/lib.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/error.rs
 delete mode 100644 packages/backend/native-utils/crates/model/src/repository/abuse_user_report.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/repository/antenna.rs

diff --git a/packages/backend/native-utils/crates/database/Cargo.toml b/packages/backend/native-utils/crates/database/Cargo.toml
new file mode 100644
index 0000000000..69e0c73f7a
--- /dev/null
+++ b/packages/backend/native-utils/crates/database/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "database"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[features]
+default = ["napi"]
+napi = []
+
+[dependencies]
+once_cell = "1.17.1"
+sea-orm = { version = "0.11.3", features = ["sqlx-postgres", "runtime-tokio-rustls"] }
+thiserror = "1.0.40"
diff --git a/packages/backend/native-utils/crates/database/src/error.rs b/packages/backend/native-utils/crates/database/src/error.rs
new file mode 100644
index 0000000000..b70964f2ee
--- /dev/null
+++ b/packages/backend/native-utils/crates/database/src/error.rs
@@ -0,0 +1,9 @@
+use sea_orm::error::DbErr;
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error("The database connections have not been initialized yet")]
+    Uninitialized,
+    #[error("ORM error: {0}")]
+    OrmError(#[from] DbErr),
+}
diff --git a/packages/backend/native-utils/crates/database/src/lib.rs b/packages/backend/native-utils/crates/database/src/lib.rs
new file mode 100644
index 0000000000..3c9db912b2
--- /dev/null
+++ b/packages/backend/native-utils/crates/database/src/lib.rs
@@ -0,0 +1,18 @@
+pub mod error;
+
+use once_cell::sync::OnceCell;
+use sea_orm::{Database, DatabaseConnection};
+
+use crate::error::Error;
+
+static DB_CONN: OnceCell<DatabaseConnection> = OnceCell::new();
+
+pub async fn init_database(connection_uri: impl Into<String>) -> Result<(), Error> {
+    let conn = Database::connect(connection_uri.into()).await?;
+    DB_CONN.get_or_init(move || conn);
+    Ok(())
+}
+
+pub fn get_database() -> Result<&'static DatabaseConnection, Error> {
+    DB_CONN.get().ok_or(Error::Uninitialized)
+}
diff --git a/packages/backend/native-utils/crates/model/Cargo.toml b/packages/backend/native-utils/crates/model/Cargo.toml
index 7b492a89d5..832375ec7c 100644
--- a/packages/backend/native-utils/crates/model/Cargo.toml
+++ b/packages/backend/native-utils/crates/model/Cargo.toml
@@ -6,12 +6,16 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+async-trait = "0.1.68"
 chrono = "0.4.24"
+database = { path = "../database" }
 jsonschema = "0.17.0"
 once_cell = "1.17.1"
+parse-display = "0.8.0"
 schemars = { version = "0.8.12", features = ["chrono"] }
 sea-orm = { version = "0.11.3", features = ["postgres-array", "sqlx-postgres", "runtime-tokio-rustls", "mock"] }
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
+thiserror = "1.0.40"
 tokio = { version = "1.28.1", features = ["sync"] }
 utoipa = "3.3.0"
diff --git a/packages/backend/native-utils/crates/model/src/error.rs b/packages/backend/native-utils/crates/model/src/error.rs
new file mode 100644
index 0000000000..f75c0119a3
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/error.rs
@@ -0,0 +1,9 @@
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error("Failed to parse string")]
+    ParseError(#[from] parse_display::ParseError),
+    #[error("Failed to get database connection")]
+    DatabaseConnectionError(#[from] database::error::Error),
+    #[error("Database operation error: {0}")]
+    DatabaseOperationError(#[from] sea_orm::DbErr),
+}
diff --git a/packages/backend/native-utils/crates/model/src/lib.rs b/packages/backend/native-utils/crates/model/src/lib.rs
index b14d29c349..61ba77a59b 100644
--- a/packages/backend/native-utils/crates/model/src/lib.rs
+++ b/packages/backend/native-utils/crates/model/src/lib.rs
@@ -1,3 +1,4 @@
 pub mod entity;
-pub mod repository;
+pub mod error;
 pub mod schema;
+pub mod repository;
diff --git a/packages/backend/native-utils/crates/model/src/repository/abuse_user_report.rs b/packages/backend/native-utils/crates/model/src/repository/abuse_user_report.rs
deleted file mode 100644
index 8b13789179..0000000000
--- a/packages/backend/native-utils/crates/model/src/repository/abuse_user_report.rs
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/packages/backend/native-utils/crates/model/src/repository/antenna.rs b/packages/backend/native-utils/crates/model/src/repository/antenna.rs
new file mode 100644
index 0000000000..32e17e244e
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/repository/antenna.rs
@@ -0,0 +1,47 @@
+use sea_orm::{ColumnTrait, EntityTrait, QueryFilter};
+use async_trait::async_trait;
+
+use crate::entity::{antenna, antenna_note, user_group_joining};
+use crate::error::Error;
+use crate::schema::{antenna::Antenna, json_to_keyword, json_to_string_list};
+
+use super::Repository;
+
+#[async_trait]
+impl Repository<Antenna> for antenna::Model {
+    async fn pack(self) -> Result<Antenna, Error> {
+        let db = database::get_database()?;
+        let has_unread_note = antenna_note::Entity::find()
+            .filter(antenna_note::Column::AntennaId.eq(self.id.to_owned()))
+            .filter(antenna_note::Column::Read.eq(false))
+            .one(db)
+            .await?
+            .is_some();
+        let user_group_joining = match self.user_group_joining_id {
+            None => None,
+            Some(id) => user_group_joining::Entity::find_by_id(id).one(db).await?,
+        };
+        let user_group_id = match user_group_joining {
+            None => None,
+            Some(m) => Some(m.user_group_id),
+        };
+
+        Ok(Antenna {
+            id: self.id,
+            created_at: self.created_at.into(),
+            name: self.name,
+            keywords: json_to_keyword(&self.keywords),
+            exclude_keywords: json_to_keyword(&self.exclude_keywords),
+            src: self.src.try_into()?,
+            user_list_id: self.user_list_id,
+            user_group_id,
+            users: self.users,
+            instances: json_to_string_list(&self.instances),
+            case_sensitive: self.case_sensitive,
+            notify: self.notify,
+            with_replies: self.with_replies,
+            with_file: self.with_file,
+            has_unread_note,
+        })
+    }
+}
diff --git a/packages/backend/native-utils/crates/model/src/repository/mod.rs b/packages/backend/native-utils/crates/model/src/repository/mod.rs
index f7a5900810..b720d1d484 100644
--- a/packages/backend/native-utils/crates/model/src/repository/mod.rs
+++ b/packages/backend/native-utils/crates/model/src/repository/mod.rs
@@ -1 +1,11 @@
-pub mod abuse_user_report;
+pub mod antenna;
+
+use async_trait::async_trait;
+use schemars::JsonSchema;
+
+use crate::error::Error;
+
+#[async_trait]
+trait Repository<T: JsonSchema> {
+    async fn pack(self) -> Result<T, Error>;
+}
diff --git a/packages/backend/native-utils/crates/model/src/schema/antenna.rs b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
index 3bffe4f5f1..a8065d09e2 100644
--- a/packages/backend/native-utils/crates/model/src/schema/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
@@ -1,25 +1,26 @@
 use jsonschema::JSONSchema;
 use once_cell::sync::Lazy;
+use parse_display::FromStr;
 use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
 
-use super::Schema;
+use super::{Keyword, Schema, StringList};
+use crate::entity::sea_orm_active_enums::AntennaSrcEnum;
 
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[derive(Debug, JsonSchema, ToSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct Antenna {
     pub id: String,
     pub created_at: chrono::DateTime<chrono::Utc>,
     pub name: String,
-    pub keywords: Vec<Vec<String>>,
-    pub exclude_keywords: Vec<Vec<String>>,
+    pub keywords: Keyword,
+    pub exclude_keywords: Keyword,
     #[schema(inline)]
-    pub src: AntennaSrcEnum,
+    pub src: AntennaSrc,
     pub user_list_id: Option<String>,
     pub user_group_id: Option<String>,
-    pub users: Vec<String>,
-    pub instances: Vec<String>,
+    pub users: StringList,
+    pub instances: StringList,
     #[serde(default)]
     pub case_sensitive: bool,
     #[serde(default)]
@@ -32,9 +33,10 @@ pub struct Antenna {
     pub has_unread_note: bool,
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[derive(Debug, FromStr, JsonSchema, ToSchema)]
 #[serde(rename_all = "lowercase")]
-pub enum AntennaSrcEnum {
+#[display(style = "lowercase")]
+pub enum AntennaSrc {
     Home,
     All,
     Users,
@@ -43,9 +45,18 @@ pub enum AntennaSrcEnum {
     Instances,
 }
 
-impl Schema<Self> for Antenna {}
+impl TryFrom<AntennaSrcEnum> for AntennaSrc {
+    type Error = parse_display::ParseError;
 
+    fn try_from(value: AntennaSrcEnum) -> Result<Self, Self::Error> {
+        value.to_string().parse()
+    }
+}
+
+// ---- TODO: could be macro
+impl Schema<Self> for Antenna {}
 pub static VALIDATOR: Lazy<JSONSchema> = Lazy::new(|| Antenna::validator());
+// ----
 
 #[cfg(test)]
 mod tests {
diff --git a/packages/backend/native-utils/crates/model/src/schema/app.rs b/packages/backend/native-utils/crates/model/src/schema/app.rs
index 861bdc48ac..adc404eb9c 100644
--- a/packages/backend/native-utils/crates/model/src/schema/app.rs
+++ b/packages/backend/native-utils/crates/model/src/schema/app.rs
@@ -1,12 +1,11 @@
 use jsonschema::JSONSchema;
 use once_cell::sync::Lazy;
 use schemars::JsonSchema;
-use serde::{Deserialize, Serialize};
 use utoipa::ToSchema;
 
 use super::Schema;
 
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[derive(Debug, JsonSchema, ToSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct App {
     pub id: String,
@@ -20,7 +19,7 @@ pub struct App {
 }
 
 /// This represents `permissions` in `packages/calckey-js/src/consts.ts`.
-#[derive(Clone, Debug, Serialize, Deserialize, JsonSchema, ToSchema)]
+#[derive(Debug, JsonSchema, ToSchema)]
 pub enum Permission {
     #[serde(rename = "read:account")]
     ReadAccount,
diff --git a/packages/backend/native-utils/crates/model/src/schema/mod.rs b/packages/backend/native-utils/crates/model/src/schema/mod.rs
index cc495aac1b..2a0853814b 100644
--- a/packages/backend/native-utils/crates/model/src/schema/mod.rs
+++ b/packages/backend/native-utils/crates/model/src/schema/mod.rs
@@ -3,6 +3,10 @@ pub mod app;
 
 use jsonschema::JSONSchema;
 use schemars::{schema_for, JsonSchema};
+use serde_json::Value;
+
+type Keyword = Vec<Vec<String>>;
+type StringList = Vec<String>;
 
 /// Structs of schema defitions implement this trait in order to
 /// provide the JSON Schema validator [`jsonschema::JSONSchema`].
@@ -19,3 +23,29 @@ trait Schema<T: JsonSchema> {
             .expect("Unable to compile schema")
     }
 }
+
+pub(crate) fn json_to_keyword(value: &Value) -> Keyword {
+    match value.as_array() {
+        None => vec![vec![]],
+        Some(or_vec) => or_vec
+            .iter()
+            .map(|and_val| match and_val.as_array() {
+                None => vec![],
+                Some(and_vec) => and_vec
+                    .iter()
+                    .map(|word| word.as_str().unwrap_or_default().to_string())
+                    .collect(),
+            })
+            .collect(),
+    }
+}
+
+pub(crate) fn json_to_string_list(value: &Value) -> StringList {
+    match value.as_array() {
+        None => vec![],
+        Some(v) => v
+            .iter()
+            .map(|s| s.as_str().unwrap_or_default().to_string())
+            .collect(),
+    }
+}

From 9220aa3e4c1adf03447fef0fc5cef34edd6e3538 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Thu, 25 May 2023 08:55:41 -0400
Subject: [PATCH 212/319] remove unused serde

---
 .../model/src/entity/abuse_user_report.rs     |  3 +--
 .../crates/model/src/entity/access_token.rs   |  3 +--
 .../crates/model/src/entity/ad.rs             |  3 +--
 .../crates/model/src/entity/announcement.rs   |  3 +--
 .../model/src/entity/announcement_read.rs     |  3 +--
 .../crates/model/src/entity/antenna.rs        |  3 +--
 .../crates/model/src/entity/antenna_note.rs   |  3 +--
 .../crates/model/src/entity/app.rs            |  3 +--
 .../model/src/entity/attestation_challenge.rs |  3 +--
 .../crates/model/src/entity/auth_session.rs   |  3 +--
 .../crates/model/src/entity/blocking.rs       |  3 +--
 .../crates/model/src/entity/channel.rs        |  3 +--
 .../model/src/entity/channel_following.rs     |  3 +--
 .../model/src/entity/channel_note_pining.rs   |  3 +--
 .../crates/model/src/entity/clip.rs           |  3 +--
 .../crates/model/src/entity/clip_note.rs      |  3 +--
 .../crates/model/src/entity/drive_file.rs     |  3 +--
 .../crates/model/src/entity/drive_folder.rs   |  3 +--
 .../crates/model/src/entity/emoji.rs          |  3 +--
 .../crates/model/src/entity/follow_request.rs |  3 +--
 .../crates/model/src/entity/following.rs      |  3 +--
 .../crates/model/src/entity/gallery_like.rs   |  3 +--
 .../crates/model/src/entity/gallery_post.rs   |  3 +--
 .../crates/model/src/entity/hashtag.rs        |  3 +--
 .../crates/model/src/entity/instance.rs       |  3 +--
 .../model/src/entity/messaging_message.rs     |  3 +--
 .../crates/model/src/entity/meta.rs           |  3 +--
 .../crates/model/src/entity/migrations.rs     |  3 +--
 .../crates/model/src/entity/moderation_log.rs |  3 +--
 .../crates/model/src/entity/muted_note.rs     |  3 +--
 .../crates/model/src/entity/muting.rs         |  3 +--
 .../crates/model/src/entity/note.rs           |  3 +--
 .../crates/model/src/entity/note_edit.rs      |  3 +--
 .../crates/model/src/entity/note_favorite.rs  |  3 +--
 .../crates/model/src/entity/note_reaction.rs  |  3 +--
 .../model/src/entity/note_thread_muting.rs    |  3 +--
 .../crates/model/src/entity/note_unread.rs    |  3 +--
 .../crates/model/src/entity/note_watching.rs  |  3 +--
 .../crates/model/src/entity/notification.rs   |  3 +--
 .../crates/model/src/entity/page.rs           |  3 +--
 .../crates/model/src/entity/page_like.rs      |  3 +--
 .../src/entity/password_reset_request.rs      |  3 +--
 .../crates/model/src/entity/poll.rs           |  3 +--
 .../crates/model/src/entity/poll_vote.rs      |  3 +--
 .../crates/model/src/entity/promo_note.rs     |  3 +--
 .../crates/model/src/entity/promo_read.rs     |  3 +--
 .../model/src/entity/registration_ticket.rs   |  3 +--
 .../crates/model/src/entity/registry_item.rs  |  3 +--
 .../crates/model/src/entity/relay.rs          |  3 +--
 .../crates/model/src/entity/renote_muting.rs  |  3 +--
 .../crates/model/src/entity/reversi_game.rs   |  3 +--
 .../model/src/entity/reversi_matching.rs      |  3 +--
 .../model/src/entity/sea_orm_active_enums.rs  | 21 +++++++++----------
 .../crates/model/src/entity/signin.rs         |  3 +--
 .../model/src/entity/sw_subscription.rs       |  3 +--
 .../crates/model/src/entity/used_username.rs  |  3 +--
 .../crates/model/src/entity/user.rs           |  3 +--
 .../crates/model/src/entity/user_group.rs     |  3 +--
 .../model/src/entity/user_group_invitation.rs |  3 +--
 .../model/src/entity/user_group_invite.rs     |  3 +--
 .../model/src/entity/user_group_joining.rs    |  3 +--
 .../crates/model/src/entity/user_ip.rs        |  3 +--
 .../crates/model/src/entity/user_keypair.rs   |  3 +--
 .../crates/model/src/entity/user_list.rs      |  3 +--
 .../model/src/entity/user_list_joining.rs     |  3 +--
 .../model/src/entity/user_note_pining.rs      |  3 +--
 .../crates/model/src/entity/user_pending.rs   |  3 +--
 .../crates/model/src/entity/user_profile.rs   |  3 +--
 .../crates/model/src/entity/user_publickey.rs |  3 +--
 .../model/src/entity/user_security_key.rs     |  3 +--
 .../crates/model/src/entity/webhook.rs        |  3 +--
 71 files changed, 80 insertions(+), 151 deletions(-)

diff --git a/packages/backend/native-utils/crates/model/src/entity/abuse_user_report.rs b/packages/backend/native-utils/crates/model/src/entity/abuse_user_report.rs
index 163a686ab1..270837973c 100644
--- a/packages/backend/native-utils/crates/model/src/entity/abuse_user_report.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/abuse_user_report.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "abuse_user_report")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/access_token.rs b/packages/backend/native-utils/crates/model/src/entity/access_token.rs
index ba3a43d64f..fa9894414f 100644
--- a/packages/backend/native-utils/crates/model/src/entity/access_token.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/access_token.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "access_token")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/ad.rs b/packages/backend/native-utils/crates/model/src/entity/ad.rs
index 4e31c7b0d4..708ed69ce7 100644
--- a/packages/backend/native-utils/crates/model/src/entity/ad.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/ad.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "ad")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/announcement.rs b/packages/backend/native-utils/crates/model/src/entity/announcement.rs
index 0f02a1ca92..3e9b916879 100644
--- a/packages/backend/native-utils/crates/model/src/entity/announcement.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/announcement.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "announcement")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/announcement_read.rs b/packages/backend/native-utils/crates/model/src/entity/announcement_read.rs
index ad7dcc6f24..7fc51d475e 100644
--- a/packages/backend/native-utils/crates/model/src/entity/announcement_read.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/announcement_read.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "announcement_read")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/antenna.rs b/packages/backend/native-utils/crates/model/src/entity/antenna.rs
index f9c040b59c..513d15e831 100644
--- a/packages/backend/native-utils/crates/model/src/entity/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/antenna.rs
@@ -2,9 +2,8 @@
 
 use super::sea_orm_active_enums::AntennaSrcEnum;
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "antenna")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/antenna_note.rs b/packages/backend/native-utils/crates/model/src/entity/antenna_note.rs
index ecf7b88f72..d4c850bfce 100644
--- a/packages/backend/native-utils/crates/model/src/entity/antenna_note.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/antenna_note.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "antenna_note")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/app.rs b/packages/backend/native-utils/crates/model/src/entity/app.rs
index bd6ae5acfb..5f3d5d1317 100644
--- a/packages/backend/native-utils/crates/model/src/entity/app.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/app.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "app")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/attestation_challenge.rs b/packages/backend/native-utils/crates/model/src/entity/attestation_challenge.rs
index 25da1ae575..135a4f1fb9 100644
--- a/packages/backend/native-utils/crates/model/src/entity/attestation_challenge.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/attestation_challenge.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "attestation_challenge")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/auth_session.rs b/packages/backend/native-utils/crates/model/src/entity/auth_session.rs
index c3b2fab54d..83aecbaa65 100644
--- a/packages/backend/native-utils/crates/model/src/entity/auth_session.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/auth_session.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "auth_session")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/blocking.rs b/packages/backend/native-utils/crates/model/src/entity/blocking.rs
index c9092e50d6..4667e60c68 100644
--- a/packages/backend/native-utils/crates/model/src/entity/blocking.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/blocking.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "blocking")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/channel.rs b/packages/backend/native-utils/crates/model/src/entity/channel.rs
index b39b57f568..9132d9d4e1 100644
--- a/packages/backend/native-utils/crates/model/src/entity/channel.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/channel.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "channel")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/channel_following.rs b/packages/backend/native-utils/crates/model/src/entity/channel_following.rs
index a415b6c32c..bd1b16dcee 100644
--- a/packages/backend/native-utils/crates/model/src/entity/channel_following.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/channel_following.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "channel_following")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/channel_note_pining.rs b/packages/backend/native-utils/crates/model/src/entity/channel_note_pining.rs
index 16f80b91de..2c9089ac45 100644
--- a/packages/backend/native-utils/crates/model/src/entity/channel_note_pining.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/channel_note_pining.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "channel_note_pining")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/clip.rs b/packages/backend/native-utils/crates/model/src/entity/clip.rs
index 6cf1ac1c87..209bd047e3 100644
--- a/packages/backend/native-utils/crates/model/src/entity/clip.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/clip.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "clip")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/clip_note.rs b/packages/backend/native-utils/crates/model/src/entity/clip_note.rs
index ba7114c3b8..953c5511cb 100644
--- a/packages/backend/native-utils/crates/model/src/entity/clip_note.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/clip_note.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "clip_note")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/drive_file.rs b/packages/backend/native-utils/crates/model/src/entity/drive_file.rs
index 5b3d17b004..abc191ba3a 100644
--- a/packages/backend/native-utils/crates/model/src/entity/drive_file.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/drive_file.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "drive_file")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/drive_folder.rs b/packages/backend/native-utils/crates/model/src/entity/drive_folder.rs
index 9756f70530..f0b7162835 100644
--- a/packages/backend/native-utils/crates/model/src/entity/drive_folder.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/drive_folder.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "drive_folder")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/emoji.rs b/packages/backend/native-utils/crates/model/src/entity/emoji.rs
index 9dff7c719b..a89f0b22d5 100644
--- a/packages/backend/native-utils/crates/model/src/entity/emoji.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/emoji.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "emoji")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/follow_request.rs b/packages/backend/native-utils/crates/model/src/entity/follow_request.rs
index 32e31a09d6..af763baa6d 100644
--- a/packages/backend/native-utils/crates/model/src/entity/follow_request.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/follow_request.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "follow_request")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/following.rs b/packages/backend/native-utils/crates/model/src/entity/following.rs
index 6f339e05dc..087ca270b6 100644
--- a/packages/backend/native-utils/crates/model/src/entity/following.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/following.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "following")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/gallery_like.rs b/packages/backend/native-utils/crates/model/src/entity/gallery_like.rs
index 0fdbf07efe..186c92703d 100644
--- a/packages/backend/native-utils/crates/model/src/entity/gallery_like.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/gallery_like.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "gallery_like")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/gallery_post.rs b/packages/backend/native-utils/crates/model/src/entity/gallery_post.rs
index a23ebbd8f0..bb68eda62f 100644
--- a/packages/backend/native-utils/crates/model/src/entity/gallery_post.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/gallery_post.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "gallery_post")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/hashtag.rs b/packages/backend/native-utils/crates/model/src/entity/hashtag.rs
index a83ebbf293..9a6e44623b 100644
--- a/packages/backend/native-utils/crates/model/src/entity/hashtag.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/hashtag.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "hashtag")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/instance.rs b/packages/backend/native-utils/crates/model/src/entity/instance.rs
index 405648efc5..3f3af2a5d8 100644
--- a/packages/backend/native-utils/crates/model/src/entity/instance.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/instance.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "instance")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/messaging_message.rs b/packages/backend/native-utils/crates/model/src/entity/messaging_message.rs
index cfb8963710..0fbfc1ffb3 100644
--- a/packages/backend/native-utils/crates/model/src/entity/messaging_message.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/messaging_message.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "messaging_message")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/meta.rs b/packages/backend/native-utils/crates/model/src/entity/meta.rs
index 768c725aa7..33ab911baa 100644
--- a/packages/backend/native-utils/crates/model/src/entity/meta.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/meta.rs
@@ -3,9 +3,8 @@
 use super::sea_orm_active_enums::MetaSensitivemediadetectionEnum;
 use super::sea_orm_active_enums::MetaSensitivemediadetectionsensitivityEnum;
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "meta")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/migrations.rs b/packages/backend/native-utils/crates/model/src/entity/migrations.rs
index c53c3fc899..c03df11802 100644
--- a/packages/backend/native-utils/crates/model/src/entity/migrations.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/migrations.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "migrations")]
 pub struct Model {
     #[sea_orm(primary_key)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/moderation_log.rs b/packages/backend/native-utils/crates/model/src/entity/moderation_log.rs
index eb49d4f150..3306853927 100644
--- a/packages/backend/native-utils/crates/model/src/entity/moderation_log.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/moderation_log.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "moderation_log")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/muted_note.rs b/packages/backend/native-utils/crates/model/src/entity/muted_note.rs
index 17328a8297..1740e90783 100644
--- a/packages/backend/native-utils/crates/model/src/entity/muted_note.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/muted_note.rs
@@ -2,9 +2,8 @@
 
 use super::sea_orm_active_enums::MutedNoteReasonEnum;
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "muted_note")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/muting.rs b/packages/backend/native-utils/crates/model/src/entity/muting.rs
index 60020b60bb..83885034c6 100644
--- a/packages/backend/native-utils/crates/model/src/entity/muting.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/muting.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "muting")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/note.rs b/packages/backend/native-utils/crates/model/src/entity/note.rs
index cc3ec289fa..2e733edaea 100644
--- a/packages/backend/native-utils/crates/model/src/entity/note.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/note.rs
@@ -2,9 +2,8 @@
 
 use super::sea_orm_active_enums::NoteVisibilityEnum;
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "note")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_edit.rs b/packages/backend/native-utils/crates/model/src/entity/note_edit.rs
index 7b87613ddb..5e98b3da4c 100644
--- a/packages/backend/native-utils/crates/model/src/entity/note_edit.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/note_edit.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "note_edit")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_favorite.rs b/packages/backend/native-utils/crates/model/src/entity/note_favorite.rs
index b5c96a9a6d..42f3c400f1 100644
--- a/packages/backend/native-utils/crates/model/src/entity/note_favorite.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/note_favorite.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "note_favorite")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_reaction.rs b/packages/backend/native-utils/crates/model/src/entity/note_reaction.rs
index 52526aa9f6..c740d994f5 100644
--- a/packages/backend/native-utils/crates/model/src/entity/note_reaction.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/note_reaction.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "note_reaction")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_thread_muting.rs b/packages/backend/native-utils/crates/model/src/entity/note_thread_muting.rs
index 572a037502..f1dbfb5985 100644
--- a/packages/backend/native-utils/crates/model/src/entity/note_thread_muting.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/note_thread_muting.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "note_thread_muting")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_unread.rs b/packages/backend/native-utils/crates/model/src/entity/note_unread.rs
index 80fae4335a..7468156113 100644
--- a/packages/backend/native-utils/crates/model/src/entity/note_unread.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/note_unread.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "note_unread")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_watching.rs b/packages/backend/native-utils/crates/model/src/entity/note_watching.rs
index 1ff7af52ed..4a87a44950 100644
--- a/packages/backend/native-utils/crates/model/src/entity/note_watching.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/note_watching.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "note_watching")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/notification.rs b/packages/backend/native-utils/crates/model/src/entity/notification.rs
index c2d9115f3d..4500e59d9f 100644
--- a/packages/backend/native-utils/crates/model/src/entity/notification.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/notification.rs
@@ -2,9 +2,8 @@
 
 use super::sea_orm_active_enums::NotificationTypeEnum;
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "notification")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/page.rs b/packages/backend/native-utils/crates/model/src/entity/page.rs
index 32f082daf2..efb7949447 100644
--- a/packages/backend/native-utils/crates/model/src/entity/page.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/page.rs
@@ -2,9 +2,8 @@
 
 use super::sea_orm_active_enums::PageVisibilityEnum;
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "page")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/page_like.rs b/packages/backend/native-utils/crates/model/src/entity/page_like.rs
index e9de78eb68..3d3d2f3ac7 100644
--- a/packages/backend/native-utils/crates/model/src/entity/page_like.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/page_like.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "page_like")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/password_reset_request.rs b/packages/backend/native-utils/crates/model/src/entity/password_reset_request.rs
index 472b93db9d..3b24d70d90 100644
--- a/packages/backend/native-utils/crates/model/src/entity/password_reset_request.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/password_reset_request.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "password_reset_request")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/poll.rs b/packages/backend/native-utils/crates/model/src/entity/poll.rs
index 0facabd9a6..a4d9e2df10 100644
--- a/packages/backend/native-utils/crates/model/src/entity/poll.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/poll.rs
@@ -2,9 +2,8 @@
 
 use super::sea_orm_active_enums::PollNotevisibilityEnum;
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "poll")]
 pub struct Model {
     #[sea_orm(column_name = "noteId", primary_key, auto_increment = false, unique)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/poll_vote.rs b/packages/backend/native-utils/crates/model/src/entity/poll_vote.rs
index 29b6928efd..1b8b3ba1c0 100644
--- a/packages/backend/native-utils/crates/model/src/entity/poll_vote.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/poll_vote.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "poll_vote")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/promo_note.rs b/packages/backend/native-utils/crates/model/src/entity/promo_note.rs
index 6e8de98663..aa5eb2f3d1 100644
--- a/packages/backend/native-utils/crates/model/src/entity/promo_note.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/promo_note.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "promo_note")]
 pub struct Model {
     #[sea_orm(column_name = "noteId", primary_key, auto_increment = false, unique)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/promo_read.rs b/packages/backend/native-utils/crates/model/src/entity/promo_read.rs
index 807ad4a272..d7dcacfb87 100644
--- a/packages/backend/native-utils/crates/model/src/entity/promo_read.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/promo_read.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "promo_read")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/registration_ticket.rs b/packages/backend/native-utils/crates/model/src/entity/registration_ticket.rs
index 8d7e4ba8d0..f71c87327b 100644
--- a/packages/backend/native-utils/crates/model/src/entity/registration_ticket.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/registration_ticket.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "registration_ticket")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/registry_item.rs b/packages/backend/native-utils/crates/model/src/entity/registry_item.rs
index 8aa1882107..6de0c740f6 100644
--- a/packages/backend/native-utils/crates/model/src/entity/registry_item.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/registry_item.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "registry_item")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/relay.rs b/packages/backend/native-utils/crates/model/src/entity/relay.rs
index 731d12e8cc..736b48b780 100644
--- a/packages/backend/native-utils/crates/model/src/entity/relay.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/relay.rs
@@ -2,9 +2,8 @@
 
 use super::sea_orm_active_enums::RelayStatusEnum;
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "relay")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/renote_muting.rs b/packages/backend/native-utils/crates/model/src/entity/renote_muting.rs
index b63c989a69..b5e7d38f24 100644
--- a/packages/backend/native-utils/crates/model/src/entity/renote_muting.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/renote_muting.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "renote_muting")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/reversi_game.rs b/packages/backend/native-utils/crates/model/src/entity/reversi_game.rs
index 56f83e5430..1e53592802 100644
--- a/packages/backend/native-utils/crates/model/src/entity/reversi_game.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/reversi_game.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "reversi_game")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/reversi_matching.rs b/packages/backend/native-utils/crates/model/src/entity/reversi_matching.rs
index 9261b64822..aafdf13f69 100644
--- a/packages/backend/native-utils/crates/model/src/entity/reversi_matching.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/reversi_matching.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "reversi_matching")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/sea_orm_active_enums.rs b/packages/backend/native-utils/crates/model/src/entity/sea_orm_active_enums.rs
index 747cd953a2..14ef7002a2 100644
--- a/packages/backend/native-utils/crates/model/src/entity/sea_orm_active_enums.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/sea_orm_active_enums.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "antenna_src_enum")]
 pub enum AntennaSrcEnum {
     #[sea_orm(string_value = "all")]
@@ -19,7 +18,7 @@ pub enum AntennaSrcEnum {
     #[sea_orm(string_value = "users")]
     Users,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",
@@ -35,7 +34,7 @@ pub enum MetaSensitivemediadetectionEnum {
     #[sea_orm(string_value = "remote")]
     Remote,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",
@@ -53,7 +52,7 @@ pub enum MetaSensitivemediadetectionsensitivityEnum {
     #[sea_orm(string_value = "veryLow")]
     VeryLow,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",
@@ -69,7 +68,7 @@ pub enum MutedNoteReasonEnum {
     #[sea_orm(string_value = "word")]
     Word,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",
@@ -87,7 +86,7 @@ pub enum NoteVisibilityEnum {
     #[sea_orm(string_value = "specified")]
     Specified,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",
@@ -119,7 +118,7 @@ pub enum NotificationTypeEnum {
     #[sea_orm(string_value = "reply")]
     Reply,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",
@@ -133,7 +132,7 @@ pub enum PageVisibilityEnum {
     #[sea_orm(string_value = "specified")]
     Specified,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",
@@ -149,7 +148,7 @@ pub enum PollNotevisibilityEnum {
     #[sea_orm(string_value = "specified")]
     Specified,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "relay_status_enum")]
 pub enum RelayStatusEnum {
     #[sea_orm(string_value = "accepted")]
@@ -159,7 +158,7 @@ pub enum RelayStatusEnum {
     #[sea_orm(string_value = "requesting")]
     Requesting,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",
diff --git a/packages/backend/native-utils/crates/model/src/entity/signin.rs b/packages/backend/native-utils/crates/model/src/entity/signin.rs
index d6f730892b..6220973c11 100644
--- a/packages/backend/native-utils/crates/model/src/entity/signin.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/signin.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "signin")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/sw_subscription.rs b/packages/backend/native-utils/crates/model/src/entity/sw_subscription.rs
index 0d2ac26d9d..eaa332d8c6 100644
--- a/packages/backend/native-utils/crates/model/src/entity/sw_subscription.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/sw_subscription.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "sw_subscription")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/used_username.rs b/packages/backend/native-utils/crates/model/src/entity/used_username.rs
index cf325cfa5f..e9e8eb0978 100644
--- a/packages/backend/native-utils/crates/model/src/entity/used_username.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/used_username.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "used_username")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user.rs b/packages/backend/native-utils/crates/model/src/entity/user.rs
index cd11539940..79b9fa6927 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "user")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_group.rs b/packages/backend/native-utils/crates/model/src/entity/user_group.rs
index 278e9997d7..680f78b9ed 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_group.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_group.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "user_group")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_group_invitation.rs b/packages/backend/native-utils/crates/model/src/entity/user_group_invitation.rs
index 62538db37c..5a6f6f4a16 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_group_invitation.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_group_invitation.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "user_group_invitation")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_group_invite.rs b/packages/backend/native-utils/crates/model/src/entity/user_group_invite.rs
index 7ddfa021fe..786dd1f315 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_group_invite.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_group_invite.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "user_group_invite")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_group_joining.rs b/packages/backend/native-utils/crates/model/src/entity/user_group_joining.rs
index 65cb000df5..2baa0b9a72 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_group_joining.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_group_joining.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "user_group_joining")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_ip.rs b/packages/backend/native-utils/crates/model/src/entity/user_ip.rs
index d108b29fe7..872cfd860e 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_ip.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_ip.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "user_ip")]
 pub struct Model {
     #[sea_orm(primary_key)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_keypair.rs b/packages/backend/native-utils/crates/model/src/entity/user_keypair.rs
index a9a07b1d9d..df23b506b3 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_keypair.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_keypair.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "user_keypair")]
 pub struct Model {
     #[sea_orm(column_name = "userId", primary_key, auto_increment = false, unique)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_list.rs b/packages/backend/native-utils/crates/model/src/entity/user_list.rs
index 6a2f932414..ff05f2c440 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_list.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_list.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "user_list")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_list_joining.rs b/packages/backend/native-utils/crates/model/src/entity/user_list_joining.rs
index fddcfdb543..27899a8c5f 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_list_joining.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_list_joining.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "user_list_joining")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_note_pining.rs b/packages/backend/native-utils/crates/model/src/entity/user_note_pining.rs
index 24e976e223..bcb3ec8b02 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_note_pining.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_note_pining.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "user_note_pining")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_pending.rs b/packages/backend/native-utils/crates/model/src/entity/user_pending.rs
index e9134d9eec..1fb3b4fdcf 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_pending.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_pending.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "user_pending")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_profile.rs b/packages/backend/native-utils/crates/model/src/entity/user_profile.rs
index d22dcbebf3..3a12469d88 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_profile.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_profile.rs
@@ -2,9 +2,8 @@
 
 use super::sea_orm_active_enums::UserProfileFfvisibilityEnum;
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "user_profile")]
 pub struct Model {
     #[sea_orm(column_name = "userId", primary_key, auto_increment = false, unique)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_publickey.rs b/packages/backend/native-utils/crates/model/src/entity/user_publickey.rs
index 5cf6857e23..c3c6dbf1f0 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_publickey.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_publickey.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "user_publickey")]
 pub struct Model {
     #[sea_orm(column_name = "userId", primary_key, auto_increment = false, unique)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_security_key.rs b/packages/backend/native-utils/crates/model/src/entity/user_security_key.rs
index 531b59ab88..cbb31e1b0d 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_security_key.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_security_key.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "user_security_key")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/webhook.rs b/packages/backend/native-utils/crates/model/src/entity/webhook.rs
index 39508f7fa7..952dcbadba 100644
--- a/packages/backend/native-utils/crates/model/src/entity/webhook.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/webhook.rs
@@ -1,9 +1,8 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
 use sea_orm::entity::prelude::*;
-use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Serialize, Deserialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "webhook")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]

From 81ba464f1b24da56ab54e620cc319c356cabd4c2 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Thu, 25 May 2023 08:56:57 -0400
Subject: [PATCH 213/319] format

---
 packages/backend/native-utils/crates/model/src/lib.rs           | 2 +-
 .../backend/native-utils/crates/model/src/repository/antenna.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/native-utils/crates/model/src/lib.rs b/packages/backend/native-utils/crates/model/src/lib.rs
index 61ba77a59b..6e86ec0524 100644
--- a/packages/backend/native-utils/crates/model/src/lib.rs
+++ b/packages/backend/native-utils/crates/model/src/lib.rs
@@ -1,4 +1,4 @@
 pub mod entity;
 pub mod error;
-pub mod schema;
 pub mod repository;
+pub mod schema;
diff --git a/packages/backend/native-utils/crates/model/src/repository/antenna.rs b/packages/backend/native-utils/crates/model/src/repository/antenna.rs
index 32e17e244e..dc6cb5a016 100644
--- a/packages/backend/native-utils/crates/model/src/repository/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/repository/antenna.rs
@@ -1,5 +1,5 @@
-use sea_orm::{ColumnTrait, EntityTrait, QueryFilter};
 use async_trait::async_trait;
+use sea_orm::{ColumnTrait, EntityTrait, QueryFilter};
 
 use crate::entity::{antenna, antenna_note, user_group_joining};
 use crate::error::Error;

From d453eaf4aefde1f02d71a81d58511a2f17c50e2c Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Thu, 25 May 2023 09:23:26 -0400
Subject: [PATCH 214/319] remove unused feature

---
 packages/backend/native-utils/crates/database/Cargo.toml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/backend/native-utils/crates/database/Cargo.toml b/packages/backend/native-utils/crates/database/Cargo.toml
index 69e0c73f7a..b88f9b324f 100644
--- a/packages/backend/native-utils/crates/database/Cargo.toml
+++ b/packages/backend/native-utils/crates/database/Cargo.toml
@@ -5,10 +5,6 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[features]
-default = ["napi"]
-napi = []
-
 [dependencies]
 once_cell = "1.17.1"
 sea-orm = { version = "0.11.3", features = ["sqlx-postgres", "runtime-tokio-rustls"] }

From 535eb3540b32e767d9fc4a8076ca9b120e971f0a Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Thu, 25 May 2023 09:42:59 -0400
Subject: [PATCH 215/319] add mock database

---
 .../native-utils/crates/database/Cargo.toml   |  2 +-
 .../native-utils/crates/database/src/lib.rs   | 22 ++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/backend/native-utils/crates/database/Cargo.toml b/packages/backend/native-utils/crates/database/Cargo.toml
index b88f9b324f..8498f52f24 100644
--- a/packages/backend/native-utils/crates/database/Cargo.toml
+++ b/packages/backend/native-utils/crates/database/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2021"
 
 [dependencies]
 once_cell = "1.17.1"
-sea-orm = { version = "0.11.3", features = ["sqlx-postgres", "runtime-tokio-rustls"] }
+sea-orm = { version = "0.11.3", features = ["sqlx-postgres", "runtime-tokio-rustls", "mock"] }
 thiserror = "1.0.40"
diff --git a/packages/backend/native-utils/crates/database/src/lib.rs b/packages/backend/native-utils/crates/database/src/lib.rs
index 3c9db912b2..e92d6bcfce 100644
--- a/packages/backend/native-utils/crates/database/src/lib.rs
+++ b/packages/backend/native-utils/crates/database/src/lib.rs
@@ -1,11 +1,13 @@
 pub mod error;
 
-use once_cell::sync::OnceCell;
-use sea_orm::{Database, DatabaseConnection};
+use once_cell::sync::{Lazy, OnceCell};
+use sea_orm::{Database, DatabaseBackend, DatabaseConnection, MockDatabase};
 
 use crate::error::Error;
 
 static DB_CONN: OnceCell<DatabaseConnection> = OnceCell::new();
+static DB_MOCK: Lazy<DatabaseConnection> =
+    Lazy::new(|| MockDatabase::new(DatabaseBackend::Postgres).into_connection());
 
 pub async fn init_database(connection_uri: impl Into<String>) -> Result<(), Error> {
     let conn = Database::connect(connection_uri.into()).await?;
@@ -14,5 +16,19 @@ pub async fn init_database(connection_uri: impl Into<String>) -> Result<(), Erro
 }
 
 pub fn get_database() -> Result<&'static DatabaseConnection, Error> {
-    DB_CONN.get().ok_or(Error::Uninitialized)
+    if cfg!(test) {
+        Ok(&DB_MOCK)
+    } else {
+        DB_CONN.get().ok_or(Error::Uninitialized)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::get_database;
+
+    #[test]
+    fn can_get_mock_without_initialization() {
+        assert!(get_database().is_ok());
+    }
 }

From 2f9a6859f14dd87e8b0e3210983bcfadddf0b4d0 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Thu, 25 May 2023 12:11:59 -0400
Subject: [PATCH 216/319] add utility crate

---
 .../native-utils/crates/database/src/lib.rs   |  4 +--
 .../native-utils/crates/util/Cargo.toml       | 11 +++++++
 .../native-utils/crates/util/src/id.rs        | 31 +++++++++++++++++++
 .../native-utils/crates/util/src/lib.rs       |  1 +
 4 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 packages/backend/native-utils/crates/util/Cargo.toml
 create mode 100644 packages/backend/native-utils/crates/util/src/id.rs
 create mode 100644 packages/backend/native-utils/crates/util/src/lib.rs

diff --git a/packages/backend/native-utils/crates/database/src/lib.rs b/packages/backend/native-utils/crates/database/src/lib.rs
index e92d6bcfce..5506c702a2 100644
--- a/packages/backend/native-utils/crates/database/src/lib.rs
+++ b/packages/backend/native-utils/crates/database/src/lib.rs
@@ -28,7 +28,7 @@ mod tests {
     use super::get_database;
 
     #[test]
-    fn can_get_mock_without_initialization() {
-        assert!(get_database().is_ok());
+    fn can_get_mock() {
+        get_database().unwrap().as_mock_connection();
     }
 }
diff --git a/packages/backend/native-utils/crates/util/Cargo.toml b/packages/backend/native-utils/crates/util/Cargo.toml
new file mode 100644
index 0000000000..8010d27f43
--- /dev/null
+++ b/packages/backend/native-utils/crates/util/Cargo.toml
@@ -0,0 +1,11 @@
+[package]
+name = "util"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+chrono = "0.4.24"
+radix_fmt = "1.0.0"
+rand = "0.8.5"
diff --git a/packages/backend/native-utils/crates/util/src/id.rs b/packages/backend/native-utils/crates/util/src/id.rs
new file mode 100644
index 0000000000..3dc713668b
--- /dev/null
+++ b/packages/backend/native-utils/crates/util/src/id.rs
@@ -0,0 +1,31 @@
+use chrono::{DateTime, Utc};
+use radix_fmt::radix_36;
+
+const TIME_2000: i64 = 946_684_800_000;
+
+/// FIXME: Should we continue aid, or use other (more secure and scalable) guids
+/// such as [Cuid2](https://github.com/paralleldrive/cuid2)?
+pub fn create_aid(date: DateTime<Utc>) -> String {
+    let time = date.timestamp_millis() - TIME_2000;
+    let time = if time < 0 { 0 } else { time };
+    let num: i16 = rand::random();
+    let mut noise = format!("{:0>2}", radix_36(num).to_string());
+    let noise = noise.split_off(noise.len() - 2);
+    format!("{:0>8}{}", radix_36(time).to_string(), noise,)
+}
+
+#[cfg(test)]
+mod tests {
+    use chrono::{TimeZone, Utc};
+
+    use super::create_aid;
+
+    #[test]
+    fn generate_aid() {
+        let date = Utc.with_ymd_and_hms(2023, 5, 25, 11, 49, 37).unwrap();
+        let aid = create_aid(date);
+        assert_eq!(aid.len(), 10);
+        assert!(aid.starts_with("9f6mynag"));
+        assert_ne!(create_aid(Utc::now()), create_aid(Utc::now()));
+    }
+}
diff --git a/packages/backend/native-utils/crates/util/src/lib.rs b/packages/backend/native-utils/crates/util/src/lib.rs
new file mode 100644
index 0000000000..fd6bb6c432
--- /dev/null
+++ b/packages/backend/native-utils/crates/util/src/lib.rs
@@ -0,0 +1 @@
+pub mod id;

From 00ba8a280452a067c3e6f502995e5919a1719da7 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Thu, 25 May 2023 21:40:04 -0400
Subject: [PATCH 217/319] return mock db when mock feature is enabled

---
 .../native-utils/crates/database/Cargo.toml   |  9 ++++-
 .../native-utils/crates/database/src/error.rs |  2 +-
 .../native-utils/crates/database/src/lib.rs   | 33 ++++++++++++-------
 .../native-utils/crates/model/Cargo.toml      |  7 +++-
 .../native-utils/crates/model/src/error.rs    |  2 +-
 5 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/packages/backend/native-utils/crates/database/Cargo.toml b/packages/backend/native-utils/crates/database/Cargo.toml
index 8498f52f24..e4c60623e0 100644
--- a/packages/backend/native-utils/crates/database/Cargo.toml
+++ b/packages/backend/native-utils/crates/database/Cargo.toml
@@ -5,7 +5,14 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[features]
+mock = []
+
 [dependencies]
 once_cell = "1.17.1"
-sea-orm = { version = "0.11.3", features = ["sqlx-postgres", "runtime-tokio-rustls", "mock"] }
+sea-orm = { version = "0.11.3", features = ["sqlx-postgres", "runtime-tokio-rustls"] }
 thiserror = "1.0.40"
+tokio = { version = "1.28.1", features = ["macros"] }
+
+[dev-dependencies]
+sea-orm = { version = "0.11.3", features = ["sqlx-postgres", "sqlx-sqlite", "runtime-tokio-rustls", "mock"] }
diff --git a/packages/backend/native-utils/crates/database/src/error.rs b/packages/backend/native-utils/crates/database/src/error.rs
index b70964f2ee..babdd68318 100644
--- a/packages/backend/native-utils/crates/database/src/error.rs
+++ b/packages/backend/native-utils/crates/database/src/error.rs
@@ -1,6 +1,6 @@
 use sea_orm::error::DbErr;
 
-#[derive(thiserror::Error, Debug)]
+#[derive(thiserror::Error, Debug, PartialEq, Eq)]
 pub enum Error {
     #[error("The database connections have not been initialized yet")]
     Uninitialized,
diff --git a/packages/backend/native-utils/crates/database/src/lib.rs b/packages/backend/native-utils/crates/database/src/lib.rs
index 5506c702a2..756be123e0 100644
--- a/packages/backend/native-utils/crates/database/src/lib.rs
+++ b/packages/backend/native-utils/crates/database/src/lib.rs
@@ -1,13 +1,15 @@
 pub mod error;
 
-use once_cell::sync::{Lazy, OnceCell};
-use sea_orm::{Database, DatabaseBackend, DatabaseConnection, MockDatabase};
+use sea_orm::{Database, DatabaseConnection};
 
 use crate::error::Error;
 
-static DB_CONN: OnceCell<DatabaseConnection> = OnceCell::new();
-static DB_MOCK: Lazy<DatabaseConnection> =
-    Lazy::new(|| MockDatabase::new(DatabaseBackend::Postgres).into_connection());
+static DB_CONN: once_cell::sync::OnceCell<DatabaseConnection> = once_cell::sync::OnceCell::new();
+
+#[cfg(feature = "mock")]
+static DB_MOCK: once_cell::sync::Lazy<DatabaseConnection> = once_cell::sync::Lazy::new(|| {
+    sea_orm::MockDatabase::new(sea_orm::DatabaseBackend::Postgres).into_connection()
+});
 
 pub async fn init_database(connection_uri: impl Into<String>) -> Result<(), Error> {
     let conn = Database::connect(connection_uri.into()).await?;
@@ -16,19 +18,26 @@ pub async fn init_database(connection_uri: impl Into<String>) -> Result<(), Erro
 }
 
 pub fn get_database() -> Result<&'static DatabaseConnection, Error> {
-    if cfg!(test) {
-        Ok(&DB_MOCK)
-    } else {
-        DB_CONN.get().ok_or(Error::Uninitialized)
-    }
+    #[cfg(feature = "mock")]
+    return Ok(&DB_MOCK);
+    #[cfg(not(feature = "mock"))]
+    DB_CONN.get().ok_or(Error::Uninitialized)
 }
 
 #[cfg(test)]
 mod tests {
     use super::get_database;
+    use crate::{error::Error, init_database};
 
     #[test]
-    fn can_get_mock() {
-        get_database().unwrap().as_mock_connection();
+    fn error_uninitialized() {
+        assert_eq!(get_database().unwrap_err(), Error::Uninitialized);
+    }
+
+    #[tokio::test]
+    async fn connect_in_memory_sqlite() -> Result<(), Error> {
+        init_database("sqlite::memory:").await?;
+        get_database()?;
+        Ok(())
     }
 }
diff --git a/packages/backend/native-utils/crates/model/Cargo.toml b/packages/backend/native-utils/crates/model/Cargo.toml
index 832375ec7c..8714afdb41 100644
--- a/packages/backend/native-utils/crates/model/Cargo.toml
+++ b/packages/backend/native-utils/crates/model/Cargo.toml
@@ -13,9 +13,14 @@ jsonschema = "0.17.0"
 once_cell = "1.17.1"
 parse-display = "0.8.0"
 schemars = { version = "0.8.12", features = ["chrono"] }
-sea-orm = { version = "0.11.3", features = ["postgres-array", "sqlx-postgres", "runtime-tokio-rustls", "mock"] }
+sea-orm = { version = "0.11.3", features = ["postgres-array", "sqlx-postgres", "runtime-tokio-rustls"] }
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 thiserror = "1.0.40"
 tokio = { version = "1.28.1", features = ["sync"] }
+util = { path = "../util" }
 utoipa = "3.3.0"
+
+[dev-dependencies]
+database = { path = "../database", features = ["mock"] }
+sea-orm = { version = "0.11.3", features = ["postgres-array", "sqlx-postgres", "runtime-tokio-rustls", "mock"] }
diff --git a/packages/backend/native-utils/crates/model/src/error.rs b/packages/backend/native-utils/crates/model/src/error.rs
index f75c0119a3..379ecb7842 100644
--- a/packages/backend/native-utils/crates/model/src/error.rs
+++ b/packages/backend/native-utils/crates/model/src/error.rs
@@ -1,4 +1,4 @@
-#[derive(thiserror::Error, Debug)]
+#[derive(thiserror::Error, Debug, PartialEq, Eq)]
 pub enum Error {
     #[error("Failed to parse string")]
     ParseError(#[from] parse_display::ParseError),

From eda1e7ab3b8e8ec9fb08ed2a97d4c27112fef60f Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Thu, 25 May 2023 21:49:50 -0400
Subject: [PATCH 218/319] fix features

---
 packages/backend/native-utils/crates/database/Cargo.toml | 4 ++--
 packages/backend/native-utils/crates/model/Cargo.toml    | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/backend/native-utils/crates/database/Cargo.toml b/packages/backend/native-utils/crates/database/Cargo.toml
index e4c60623e0..4ff4da2b7b 100644
--- a/packages/backend/native-utils/crates/database/Cargo.toml
+++ b/packages/backend/native-utils/crates/database/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-mock = []
+mock = ["sea-orm/mock"]
 
 [dependencies]
 once_cell = "1.17.1"
@@ -15,4 +15,4 @@ thiserror = "1.0.40"
 tokio = { version = "1.28.1", features = ["macros"] }
 
 [dev-dependencies]
-sea-orm = { version = "0.11.3", features = ["sqlx-postgres", "sqlx-sqlite", "runtime-tokio-rustls", "mock"] }
+sea-orm = { version = "0.11.3", features = ["sqlx-sqlite"] }
diff --git a/packages/backend/native-utils/crates/model/Cargo.toml b/packages/backend/native-utils/crates/model/Cargo.toml
index 8714afdb41..63f53c6306 100644
--- a/packages/backend/native-utils/crates/model/Cargo.toml
+++ b/packages/backend/native-utils/crates/model/Cargo.toml
@@ -23,4 +23,3 @@ utoipa = "3.3.0"
 
 [dev-dependencies]
 database = { path = "../database", features = ["mock"] }
-sea-orm = { version = "0.11.3", features = ["postgres-array", "sqlx-postgres", "runtime-tokio-rustls", "mock"] }

From 6bb8775b2e3ab25910184039576cecf9eaa3588b Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 26 May 2023 04:00:09 -0400
Subject: [PATCH 219/319] change aid to cuid2

---
 .../native-utils/crates/util/Cargo.toml       |  6 +--
 .../native-utils/crates/util/src/id.rs        | 48 +++++++++++--------
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/packages/backend/native-utils/crates/util/Cargo.toml b/packages/backend/native-utils/crates/util/Cargo.toml
index 8010d27f43..3c28e248f9 100644
--- a/packages/backend/native-utils/crates/util/Cargo.toml
+++ b/packages/backend/native-utils/crates/util/Cargo.toml
@@ -6,6 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-chrono = "0.4.24"
-radix_fmt = "1.0.0"
-rand = "0.8.5"
+cuid2 = "0.1.0"
+once_cell = "1.17.1"
+thiserror = "1.0.40"
diff --git a/packages/backend/native-utils/crates/util/src/id.rs b/packages/backend/native-utils/crates/util/src/id.rs
index 3dc713668b..f82b646528 100644
--- a/packages/backend/native-utils/crates/util/src/id.rs
+++ b/packages/backend/native-utils/crates/util/src/id.rs
@@ -1,31 +1,39 @@
-use chrono::{DateTime, Utc};
-use radix_fmt::radix_36;
+//! ID generation utility based on [cuid2]
 
-const TIME_2000: i64 = 946_684_800_000;
+use cuid2::CuidConstructor;
+use once_cell::sync::OnceCell;
 
-/// FIXME: Should we continue aid, or use other (more secure and scalable) guids
-/// such as [Cuid2](https://github.com/paralleldrive/cuid2)?
-pub fn create_aid(date: DateTime<Utc>) -> String {
-    let time = date.timestamp_millis() - TIME_2000;
-    let time = if time < 0 { 0 } else { time };
-    let num: i16 = rand::random();
-    let mut noise = format!("{:0>2}", radix_36(num).to_string());
-    let noise = noise.split_off(noise.len() - 2);
-    format!("{:0>8}{}", radix_36(time).to_string(), noise,)
+#[derive(thiserror::Error, Debug, PartialEq, Eq)]
+#[error("ID generator has not been initialized yet")]
+pub struct ErrorUninitialized;
+
+static GENERATOR: OnceCell<CuidConstructor> = OnceCell::new();
+
+pub fn init_id(length: u16) {
+    GENERATOR.get_or_init(move || CuidConstructor::new().with_length(length));
+}
+
+pub fn create_id() -> Result<String, ErrorUninitialized> {
+    match GENERATOR.get() {
+        None => Err(ErrorUninitialized),
+        Some(gen) => Ok(gen.create_id()),
+    }
 }
 
 #[cfg(test)]
 mod tests {
-    use chrono::{TimeZone, Utc};
+    use std::thread;
 
-    use super::create_aid;
+    use crate::id;
 
     #[test]
-    fn generate_aid() {
-        let date = Utc.with_ymd_and_hms(2023, 5, 25, 11, 49, 37).unwrap();
-        let aid = create_aid(date);
-        assert_eq!(aid.len(), 10);
-        assert!(aid.starts_with("9f6mynag"));
-        assert_ne!(create_aid(Utc::now()), create_aid(Utc::now()));
+    fn can_generate() {
+        assert_eq!(id::create_id(), Err(id::ErrorUninitialized));
+        id::init_id(12);
+        assert_eq!(id::create_id().unwrap().len(), 12);
+        assert_ne!(id::create_id().unwrap(), id::create_id().unwrap());
+        let id1 = thread::spawn(|| id::create_id().unwrap());
+        let id2 = thread::spawn(|| id::create_id().unwrap());
+        assert_ne!(id1.join().unwrap(), id2.join().unwrap())
     }
 }

From f1f3e5976d0991d5c3f4b7d228b03e4b4d58fa9a Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Sat, 27 May 2023 02:37:34 -0400
Subject: [PATCH 220/319] add random string generator

---
 .../native-utils/crates/util/Cargo.toml       |  1 +
 .../native-utils/crates/util/src/lib.rs       |  1 +
 .../native-utils/crates/util/src/random.rs    | 25 +++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 packages/backend/native-utils/crates/util/src/random.rs

diff --git a/packages/backend/native-utils/crates/util/Cargo.toml b/packages/backend/native-utils/crates/util/Cargo.toml
index 3c28e248f9..ad5486b4b6 100644
--- a/packages/backend/native-utils/crates/util/Cargo.toml
+++ b/packages/backend/native-utils/crates/util/Cargo.toml
@@ -8,4 +8,5 @@ edition = "2021"
 [dependencies]
 cuid2 = "0.1.0"
 once_cell = "1.17.1"
+rand = "0.8.5"
 thiserror = "1.0.40"
diff --git a/packages/backend/native-utils/crates/util/src/lib.rs b/packages/backend/native-utils/crates/util/src/lib.rs
index fd6bb6c432..1be5a7fd1f 100644
--- a/packages/backend/native-utils/crates/util/src/lib.rs
+++ b/packages/backend/native-utils/crates/util/src/lib.rs
@@ -1 +1,2 @@
 pub mod id;
+pub mod random;
diff --git a/packages/backend/native-utils/crates/util/src/random.rs b/packages/backend/native-utils/crates/util/src/random.rs
new file mode 100644
index 0000000000..fb2f021479
--- /dev/null
+++ b/packages/backend/native-utils/crates/util/src/random.rs
@@ -0,0 +1,25 @@
+use rand::{distributions::Alphanumeric, thread_rng, Rng};
+
+pub fn gen_string(length: u16) -> String {
+    thread_rng()
+        .sample_iter(Alphanumeric)
+        .take(length.into())
+        .map(char::from)
+        .collect()
+}
+
+#[cfg(test)]
+mod tests {
+    use std::thread;
+
+    use super::gen_string;
+
+    #[test]
+    fn can_generate_string() {
+        assert_eq!(gen_string(16).len(), 16);
+        assert_ne!(gen_string(16), gen_string(16));
+        let s1 = thread::spawn(|| gen_string(16));
+        let s2 = thread::spawn(|| gen_string(16));
+        assert_ne!(s1.join().unwrap(), s2.join().unwrap());
+    }
+}

From 737ccfe11c43b1ca837e10a5160e6c9651ff8cd1 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Sat, 27 May 2023 03:35:09 -0400
Subject: [PATCH 221/319] remove mock database

---
 packages/backend/native-utils/crates/database/Cargo.toml | 6 ------
 packages/backend/native-utils/crates/database/src/lib.rs | 8 --------
 packages/backend/native-utils/crates/model/Cargo.toml    | 3 ---
 3 files changed, 17 deletions(-)

diff --git a/packages/backend/native-utils/crates/database/Cargo.toml b/packages/backend/native-utils/crates/database/Cargo.toml
index 4ff4da2b7b..440a76cf58 100644
--- a/packages/backend/native-utils/crates/database/Cargo.toml
+++ b/packages/backend/native-utils/crates/database/Cargo.toml
@@ -5,14 +5,8 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-[features]
-mock = ["sea-orm/mock"]
-
 [dependencies]
 once_cell = "1.17.1"
 sea-orm = { version = "0.11.3", features = ["sqlx-postgres", "runtime-tokio-rustls"] }
 thiserror = "1.0.40"
 tokio = { version = "1.28.1", features = ["macros"] }
-
-[dev-dependencies]
-sea-orm = { version = "0.11.3", features = ["sqlx-sqlite"] }
diff --git a/packages/backend/native-utils/crates/database/src/lib.rs b/packages/backend/native-utils/crates/database/src/lib.rs
index 756be123e0..d0e7b25770 100644
--- a/packages/backend/native-utils/crates/database/src/lib.rs
+++ b/packages/backend/native-utils/crates/database/src/lib.rs
@@ -6,11 +6,6 @@ use crate::error::Error;
 
 static DB_CONN: once_cell::sync::OnceCell<DatabaseConnection> = once_cell::sync::OnceCell::new();
 
-#[cfg(feature = "mock")]
-static DB_MOCK: once_cell::sync::Lazy<DatabaseConnection> = once_cell::sync::Lazy::new(|| {
-    sea_orm::MockDatabase::new(sea_orm::DatabaseBackend::Postgres).into_connection()
-});
-
 pub async fn init_database(connection_uri: impl Into<String>) -> Result<(), Error> {
     let conn = Database::connect(connection_uri.into()).await?;
     DB_CONN.get_or_init(move || conn);
@@ -18,9 +13,6 @@ pub async fn init_database(connection_uri: impl Into<String>) -> Result<(), Erro
 }
 
 pub fn get_database() -> Result<&'static DatabaseConnection, Error> {
-    #[cfg(feature = "mock")]
-    return Ok(&DB_MOCK);
-    #[cfg(not(feature = "mock"))]
     DB_CONN.get().ok_or(Error::Uninitialized)
 }
 
diff --git a/packages/backend/native-utils/crates/model/Cargo.toml b/packages/backend/native-utils/crates/model/Cargo.toml
index 63f53c6306..87f712aa7e 100644
--- a/packages/backend/native-utils/crates/model/Cargo.toml
+++ b/packages/backend/native-utils/crates/model/Cargo.toml
@@ -20,6 +20,3 @@ thiserror = "1.0.40"
 tokio = { version = "1.28.1", features = ["sync"] }
 util = { path = "../util" }
 utoipa = "3.3.0"
-
-[dev-dependencies]
-database = { path = "../database", features = ["mock"] }

From 4012d38f7fd3961e18be6a9c7a80db94faea5e0c Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Sat, 27 May 2023 05:50:07 -0400
Subject: [PATCH 222/319] add integration test in model

---
 .../native-utils/crates/database/src/lib.rs   |  4 +-
 .../crates/model/src/repository/mod.rs        |  2 +-
 .../crates/model/src/schema/antenna.rs        | 21 +++--
 .../crates/model/src/schema/app.rs            |  8 +-
 .../native-utils/crates/model/tests/common.rs | 88 +++++++++++++++++++
 .../crates/model/tests/repository/antenna.rs  | 60 +++++++++++++
 .../crates/model/tests/repository/mod.rs      |  1 +
 .../native-utils/crates/util/src/id.rs        |  2 +-
 .../native-utils/crates/util/src/random.rs    |  2 +-
 9 files changed, 173 insertions(+), 15 deletions(-)
 create mode 100644 packages/backend/native-utils/crates/model/tests/common.rs
 create mode 100644 packages/backend/native-utils/crates/model/tests/repository/antenna.rs
 create mode 100644 packages/backend/native-utils/crates/model/tests/repository/mod.rs

diff --git a/packages/backend/native-utils/crates/database/src/lib.rs b/packages/backend/native-utils/crates/database/src/lib.rs
index d0e7b25770..36d4a532aa 100644
--- a/packages/backend/native-utils/crates/database/src/lib.rs
+++ b/packages/backend/native-utils/crates/database/src/lib.rs
@@ -22,12 +22,12 @@ mod tests {
     use crate::{error::Error, init_database};
 
     #[test]
-    fn error_uninitialized() {
+    fn unit_lib_error_uninitialized() {
         assert_eq!(get_database().unwrap_err(), Error::Uninitialized);
     }
 
     #[tokio::test]
-    async fn connect_in_memory_sqlite() -> Result<(), Error> {
+    async fn unit_lib_connect_in_memory_sqlite() -> Result<(), Error> {
         init_database("sqlite::memory:").await?;
         get_database()?;
         Ok(())
diff --git a/packages/backend/native-utils/crates/model/src/repository/mod.rs b/packages/backend/native-utils/crates/model/src/repository/mod.rs
index b720d1d484..01e11412db 100644
--- a/packages/backend/native-utils/crates/model/src/repository/mod.rs
+++ b/packages/backend/native-utils/crates/model/src/repository/mod.rs
@@ -6,6 +6,6 @@ use schemars::JsonSchema;
 use crate::error::Error;
 
 #[async_trait]
-trait Repository<T: JsonSchema> {
+pub trait Repository<T: JsonSchema> {
     async fn pack(self) -> Result<T, Error>;
 }
diff --git a/packages/backend/native-utils/crates/model/src/schema/antenna.rs b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
index a8065d09e2..3f4c40ccb7 100644
--- a/packages/backend/native-utils/crates/model/src/schema/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
@@ -7,7 +7,7 @@ use utoipa::ToSchema;
 use super::{Keyword, Schema, StringList};
 use crate::entity::sea_orm_active_enums::AntennaSrcEnum;
 
-#[derive(Debug, JsonSchema, ToSchema)]
+#[derive(Clone, Debug, PartialEq, Eq, JsonSchema, ToSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct Antenna {
     pub id: String,
@@ -33,9 +33,10 @@ pub struct Antenna {
     pub has_unread_note: bool,
 }
 
-#[derive(Debug, FromStr, JsonSchema, ToSchema)]
-#[serde(rename_all = "lowercase")]
-#[display(style = "lowercase")]
+#[derive(Clone, Debug, FromStr, PartialEq, Eq, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+#[display(style = "camelCase")]
+#[display("'{}'")]
 pub enum AntennaSrc {
     Home,
     All,
@@ -62,10 +63,18 @@ pub static VALIDATOR: Lazy<JSONSchema> = Lazy::new(|| Antenna::validator());
 mod tests {
     use serde_json::json;
 
+    use crate::{entity::sea_orm_active_enums::AntennaSrcEnum, schema::antenna::AntennaSrc};
+
     use super::VALIDATOR;
 
     #[test]
-    fn valid() {
+    fn unit_schema_src_from_active_enum() {
+        let src = AntennaSrc::try_from(AntennaSrcEnum::All).unwrap();
+        assert_eq!(src, AntennaSrc::All);
+    }
+
+    #[test]
+    fn unit_schema_antenna_valid() {
         let instance = json!({
             "id": "9f4x0bkx1u",
             "createdAt": "2023-05-24T06:56:14.323Z",
@@ -89,7 +98,7 @@ mod tests {
     }
 
     #[test]
-    fn invalid() {
+    fn unit_schema_antenna_invalid() {
         let instance = json!({
             // "id" is required
             "id": null,
diff --git a/packages/backend/native-utils/crates/model/src/schema/app.rs b/packages/backend/native-utils/crates/model/src/schema/app.rs
index adc404eb9c..0b18ebedac 100644
--- a/packages/backend/native-utils/crates/model/src/schema/app.rs
+++ b/packages/backend/native-utils/crates/model/src/schema/app.rs
@@ -5,7 +5,7 @@ use utoipa::ToSchema;
 
 use super::Schema;
 
-#[derive(Debug, JsonSchema, ToSchema)]
+#[derive(Clone, Debug, PartialEq, Eq, JsonSchema, ToSchema)]
 #[serde(rename_all = "camelCase")]
 pub struct App {
     pub id: String,
@@ -19,7 +19,7 @@ pub struct App {
 }
 
 /// This represents `permissions` in `packages/calckey-js/src/consts.ts`.
-#[derive(Debug, JsonSchema, ToSchema)]
+#[derive(Clone, Debug, PartialEq, Eq, JsonSchema, ToSchema)]
 pub enum Permission {
     #[serde(rename = "read:account")]
     ReadAccount,
@@ -96,12 +96,12 @@ pub static VALIDATOR: Lazy<JSONSchema> = Lazy::new(|| App::validator());
 #[cfg(test)]
 mod tests {
     #[test]
-    fn valid() {
+    fn unit_schema_app_valid() {
         todo!();
     }
 
     #[test]
-    fn invalid() {
+    fn unit_shcmea_app_invalid() {
         todo!();
     }
 }
diff --git a/packages/backend/native-utils/crates/model/tests/common.rs b/packages/backend/native-utils/crates/model/tests/common.rs
new file mode 100644
index 0000000000..9fd8815d3b
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/tests/common.rs
@@ -0,0 +1,88 @@
+extern crate model;
+
+mod repository;
+
+use chrono::Utc;
+use model::entity::{antenna, sea_orm_active_enums::AntennaSrcEnum, user};
+use sea_orm::{
+    ActiveModelTrait, ActiveValue::Set, DatabaseConnection, DbErr, EntityTrait, TransactionTrait,
+};
+use serde_json::json;
+use std::env;
+use util::{
+    id::{create_id, init_id},
+    random::gen_string,
+};
+
+/// Insert predefined entries in the database.
+async fn prepare() {
+    let conn_uri = env::var("DATABASE_URL")
+        .unwrap_or("postgres://calckey:calckey@localhost/calckey".to_string());
+    database::init_database(conn_uri)
+        .await
+        .expect("Unable to initialize database connection");
+    let db = database::get_database().expect("Unable to get database connection from pool");
+    setup_model(db).await;
+}
+
+/// Delete all entries in the database.
+async fn cleanup() {
+    let db = database::get_database().unwrap();
+    db.transaction::<_, (), DbErr>(|txn| {
+        Box::pin(async move {
+            user::Entity::delete_many().exec(txn).await.unwrap();
+            antenna::Entity::delete_many().exec(txn).await.unwrap();
+
+            Ok(())
+        })
+    })
+    .await
+    .expect("Unable to delete predefined models");
+}
+
+async fn setup_model(db: &DatabaseConnection) {
+    init_id(12);
+
+    db.transaction::<_, (), DbErr>(|txn| {
+        Box::pin(async move {
+            let user_id = create_id().unwrap();
+            let name = "Alice";
+            let user_model = user::ActiveModel {
+                id: Set(user_id.to_owned()),
+                created_at: Set(Utc::now().into()),
+                username: Set(name.to_lowercase().to_string()),
+                username_lower: Set(name.to_lowercase().to_string()),
+                name: Set(Some(name.to_string())),
+                token: Set(Some(gen_string(16))),
+                is_admin: Set(true),
+                ..Default::default()
+            };
+            user_model.insert(txn).await?;
+            let antenna_model = antenna::ActiveModel {
+                id: Set(create_id().unwrap()),
+                created_at: Set(Utc::now().into()),
+                user_id: Set(user_id.to_owned()),
+                name: Set("Test Antenna".to_string()),
+                src: Set(AntennaSrcEnum::All),
+                keywords: Set(json!([["foo", "bar"], ["foobar"]])),
+                exclude_keywords: Set(json!([["abc"], ["def", "ghi"]])),
+                with_file: Set(false),
+                notify: Set(true),
+                case_sensitive: Set(true),
+                with_replies: Set(false),
+                ..Default::default()
+            };
+            antenna_model.insert(txn).await?;
+
+            Ok(())
+        })
+    })
+    .await
+    .expect("Unable to setup predefined models");
+}
+
+#[tokio::test]
+async fn inte_common_prepare_and_cleanup() {
+    prepare().await;
+    cleanup().await;
+}
diff --git a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
new file mode 100644
index 0000000000..42fd3b4bd0
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
@@ -0,0 +1,60 @@
+use model::{
+    entity::{antenna, user},
+    repository::Repository,
+    schema,
+};
+use sea_orm::{ColumnTrait, EntityTrait, QueryFilter};
+
+use crate::{cleanup, prepare};
+
+#[tokio::test]
+async fn inte_repository_antenna_can_pack() {
+    prepare().await;
+
+    let db = database::get_database().unwrap();
+
+    let alice_antenna = user::Entity::find()
+        .filter(user::Column::Username.eq("alice"))
+        .find_also_related(antenna::Entity)
+        .one(db)
+        .await
+        .unwrap()
+        .expect("alice not found")
+        .1
+        .expect("alice's antenna not found");
+
+    let packed = alice_antenna
+        .to_owned()
+        .pack()
+        .await
+        .expect("Unable to pack");
+
+    assert_eq!(
+        packed,
+        schema::antenna::Antenna {
+            id: alice_antenna.id,
+            created_at: alice_antenna.created_at.into(),
+            name: "Test Antenna".to_string(),
+            keywords: vec![
+                vec!["foo".to_string(), "bar".to_string()],
+                vec!["foobar".to_string()]
+            ],
+            exclude_keywords: vec![
+                vec!["abc".to_string()],
+                vec!["def".to_string(), "ghi".to_string()]
+            ],
+            src: schema::antenna::AntennaSrc::All,
+            user_list_id: None,
+            user_group_id: None,
+            users: vec![],
+            instances: vec![],
+            case_sensitive: true,
+            notify: true,
+            with_replies: false,
+            with_file: false,
+            has_unread_note: false,
+        }
+    );
+
+    cleanup().await;
+}
diff --git a/packages/backend/native-utils/crates/model/tests/repository/mod.rs b/packages/backend/native-utils/crates/model/tests/repository/mod.rs
new file mode 100644
index 0000000000..c11ef7687f
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/tests/repository/mod.rs
@@ -0,0 +1 @@
+mod antenna;
diff --git a/packages/backend/native-utils/crates/util/src/id.rs b/packages/backend/native-utils/crates/util/src/id.rs
index f82b646528..94f20a8479 100644
--- a/packages/backend/native-utils/crates/util/src/id.rs
+++ b/packages/backend/native-utils/crates/util/src/id.rs
@@ -27,7 +27,7 @@ mod tests {
     use crate::id;
 
     #[test]
-    fn can_generate() {
+    fn unit_id_can_generate() {
         assert_eq!(id::create_id(), Err(id::ErrorUninitialized));
         id::init_id(12);
         assert_eq!(id::create_id().unwrap().len(), 12);
diff --git a/packages/backend/native-utils/crates/util/src/random.rs b/packages/backend/native-utils/crates/util/src/random.rs
index fb2f021479..c197298c77 100644
--- a/packages/backend/native-utils/crates/util/src/random.rs
+++ b/packages/backend/native-utils/crates/util/src/random.rs
@@ -15,7 +15,7 @@ mod tests {
     use super::gen_string;
 
     #[test]
-    fn can_generate_string() {
+    fn unit_random_can_generate_string() {
         assert_eq!(gen_string(16).len(), 16);
         assert_ne!(gen_string(16), gen_string(16));
         let s1 = thread::spawn(|| gen_string(16));

From 6bbfe1a6b49f1f2ee37c8ac91883ddf7380638cc Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Sat, 27 May 2023 06:28:27 -0400
Subject: [PATCH 223/319] add tests

---
 packages/backend/native-utils/crates/database/src/lib.rs | 9 +--------
 packages/backend/native-utils/package.json               | 4 +++-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/packages/backend/native-utils/crates/database/src/lib.rs b/packages/backend/native-utils/crates/database/src/lib.rs
index 36d4a532aa..28c0a6ed45 100644
--- a/packages/backend/native-utils/crates/database/src/lib.rs
+++ b/packages/backend/native-utils/crates/database/src/lib.rs
@@ -19,17 +19,10 @@ pub fn get_database() -> Result<&'static DatabaseConnection, Error> {
 #[cfg(test)]
 mod tests {
     use super::get_database;
-    use crate::{error::Error, init_database};
+    use crate::error::Error;
 
     #[test]
     fn unit_lib_error_uninitialized() {
         assert_eq!(get_database().unwrap_err(), Error::Uninitialized);
     }
-
-    #[tokio::test]
-    async fn unit_lib_connect_in_memory_sqlite() -> Result<(), Error> {
-        init_database("sqlite::memory:").await?;
-        get_database()?;
-        Ok(())
-    }
 }
diff --git a/packages/backend/native-utils/package.json b/packages/backend/native-utils/package.json
index 787d1bd89f..c82826d69b 100644
--- a/packages/backend/native-utils/package.json
+++ b/packages/backend/native-utils/package.json
@@ -39,6 +39,8 @@
     "prepublishOnly": "napi prepublish -t npm",
     "test": "ava",
     "universal": "napi universal",
-    "version": "napi version"
+    "version": "napi version",
+    "cargo:unit": "cargo test --workspace unit",
+    "cargo:integration": "cargo test --workspace inte -- --test-threads=1"
   }
 }

From 6698c00f78633eac22c569bd16c47a1f3464b4c3 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Sat, 27 May 2023 06:52:15 -0400
Subject: [PATCH 224/319] rename test modules

---
 .../native-utils/crates/database/src/lib.rs   |   4 +-
 .../crates/model/src/schema/antenna.rs        |   8 +-
 .../crates/model/src/schema/app.rs            |   6 +-
 .../native-utils/crates/model/tests/common.rs |  12 +-
 .../crates/model/tests/repository/antenna.rs  | 106 +++++++++---------
 .../native-utils/crates/util/src/id.rs        |   4 +-
 .../native-utils/crates/util/src/random.rs    |   4 +-
 packages/backend/native-utils/package.json    |   4 +-
 8 files changed, 77 insertions(+), 71 deletions(-)

diff --git a/packages/backend/native-utils/crates/database/src/lib.rs b/packages/backend/native-utils/crates/database/src/lib.rs
index 28c0a6ed45..6907a12816 100644
--- a/packages/backend/native-utils/crates/database/src/lib.rs
+++ b/packages/backend/native-utils/crates/database/src/lib.rs
@@ -17,12 +17,12 @@ pub fn get_database() -> Result<&'static DatabaseConnection, Error> {
 }
 
 #[cfg(test)]
-mod tests {
+mod unit_test {
     use super::get_database;
     use crate::error::Error;
 
     #[test]
-    fn unit_lib_error_uninitialized() {
+    fn error_uninitialized() {
         assert_eq!(get_database().unwrap_err(), Error::Uninitialized);
     }
 }
diff --git a/packages/backend/native-utils/crates/model/src/schema/antenna.rs b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
index 3f4c40ccb7..d5f19a96f7 100644
--- a/packages/backend/native-utils/crates/model/src/schema/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
@@ -60,7 +60,7 @@ pub static VALIDATOR: Lazy<JSONSchema> = Lazy::new(|| Antenna::validator());
 // ----
 
 #[cfg(test)]
-mod tests {
+mod unit_test {
     use serde_json::json;
 
     use crate::{entity::sea_orm_active_enums::AntennaSrcEnum, schema::antenna::AntennaSrc};
@@ -68,13 +68,13 @@ mod tests {
     use super::VALIDATOR;
 
     #[test]
-    fn unit_schema_src_from_active_enum() {
+    fn src_from_active_enum() {
         let src = AntennaSrc::try_from(AntennaSrcEnum::All).unwrap();
         assert_eq!(src, AntennaSrc::All);
     }
 
     #[test]
-    fn unit_schema_antenna_valid() {
+    fn antenna_valid() {
         let instance = json!({
             "id": "9f4x0bkx1u",
             "createdAt": "2023-05-24T06:56:14.323Z",
@@ -98,7 +98,7 @@ mod tests {
     }
 
     #[test]
-    fn unit_schema_antenna_invalid() {
+    fn antenna_invalid() {
         let instance = json!({
             // "id" is required
             "id": null,
diff --git a/packages/backend/native-utils/crates/model/src/schema/app.rs b/packages/backend/native-utils/crates/model/src/schema/app.rs
index 0b18ebedac..b45cad6d66 100644
--- a/packages/backend/native-utils/crates/model/src/schema/app.rs
+++ b/packages/backend/native-utils/crates/model/src/schema/app.rs
@@ -94,14 +94,14 @@ impl Schema<Self> for App {}
 pub static VALIDATOR: Lazy<JSONSchema> = Lazy::new(|| App::validator());
 
 #[cfg(test)]
-mod tests {
+mod unit_test {
     #[test]
-    fn unit_schema_app_valid() {
+    fn valid() {
         todo!();
     }
 
     #[test]
-    fn unit_shcmea_app_invalid() {
+    fn invalid() {
         todo!();
     }
 }
diff --git a/packages/backend/native-utils/crates/model/tests/common.rs b/packages/backend/native-utils/crates/model/tests/common.rs
index 9fd8815d3b..38c6160711 100644
--- a/packages/backend/native-utils/crates/model/tests/common.rs
+++ b/packages/backend/native-utils/crates/model/tests/common.rs
@@ -81,8 +81,12 @@ async fn setup_model(db: &DatabaseConnection) {
     .expect("Unable to setup predefined models");
 }
 
-#[tokio::test]
-async fn inte_common_prepare_and_cleanup() {
-    prepare().await;
-    cleanup().await;
+mod it_test {
+    use super::{cleanup, prepare};
+
+    #[tokio::test]
+    async fn can_prepare_and_cleanup() {
+        prepare().await;
+        cleanup().await;
+    }
 }
diff --git a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
index 42fd3b4bd0..7f3aac74d0 100644
--- a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
+++ b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
@@ -1,60 +1,62 @@
-use model::{
-    entity::{antenna, user},
-    repository::Repository,
-    schema,
-};
-use sea_orm::{ColumnTrait, EntityTrait, QueryFilter};
+mod it_test {
+    use model::{
+        entity::{antenna, user},
+        repository::Repository,
+        schema,
+    };
+    use sea_orm::{ColumnTrait, EntityTrait, QueryFilter};
 
-use crate::{cleanup, prepare};
+    use crate::{cleanup, prepare};
 
-#[tokio::test]
-async fn inte_repository_antenna_can_pack() {
-    prepare().await;
+    #[tokio::test]
+    async fn can_pack() {
+        prepare().await;
 
-    let db = database::get_database().unwrap();
+        let db = database::get_database().unwrap();
 
-    let alice_antenna = user::Entity::find()
-        .filter(user::Column::Username.eq("alice"))
-        .find_also_related(antenna::Entity)
-        .one(db)
-        .await
-        .unwrap()
-        .expect("alice not found")
-        .1
-        .expect("alice's antenna not found");
+        let alice_antenna = user::Entity::find()
+            .filter(user::Column::Username.eq("alice"))
+            .find_also_related(antenna::Entity)
+            .one(db)
+            .await
+            .unwrap()
+            .expect("alice not found")
+            .1
+            .expect("alice's antenna not found");
 
-    let packed = alice_antenna
-        .to_owned()
-        .pack()
-        .await
-        .expect("Unable to pack");
+        let packed = alice_antenna
+            .to_owned()
+            .pack()
+            .await
+            .expect("Unable to pack");
 
-    assert_eq!(
-        packed,
-        schema::antenna::Antenna {
-            id: alice_antenna.id,
-            created_at: alice_antenna.created_at.into(),
-            name: "Test Antenna".to_string(),
-            keywords: vec![
-                vec!["foo".to_string(), "bar".to_string()],
-                vec!["foobar".to_string()]
-            ],
-            exclude_keywords: vec![
-                vec!["abc".to_string()],
-                vec!["def".to_string(), "ghi".to_string()]
-            ],
-            src: schema::antenna::AntennaSrc::All,
-            user_list_id: None,
-            user_group_id: None,
-            users: vec![],
-            instances: vec![],
-            case_sensitive: true,
-            notify: true,
-            with_replies: false,
-            with_file: false,
-            has_unread_note: false,
-        }
-    );
+        assert_eq!(
+            packed,
+            schema::antenna::Antenna {
+                id: alice_antenna.id,
+                created_at: alice_antenna.created_at.into(),
+                name: "Test Antenna".to_string(),
+                keywords: vec![
+                    vec!["foo".to_string(), "bar".to_string()],
+                    vec!["foobar".to_string()]
+                ],
+                exclude_keywords: vec![
+                    vec!["abc".to_string()],
+                    vec!["def".to_string(), "ghi".to_string()]
+                ],
+                src: schema::antenna::AntennaSrc::All,
+                user_list_id: None,
+                user_group_id: None,
+                users: vec![],
+                instances: vec![],
+                case_sensitive: true,
+                notify: true,
+                with_replies: false,
+                with_file: false,
+                has_unread_note: false,
+            }
+        );
 
-    cleanup().await;
+        cleanup().await;
+    }
 }
diff --git a/packages/backend/native-utils/crates/util/src/id.rs b/packages/backend/native-utils/crates/util/src/id.rs
index 94f20a8479..2831ef79dd 100644
--- a/packages/backend/native-utils/crates/util/src/id.rs
+++ b/packages/backend/native-utils/crates/util/src/id.rs
@@ -21,13 +21,13 @@ pub fn create_id() -> Result<String, ErrorUninitialized> {
 }
 
 #[cfg(test)]
-mod tests {
+mod unit_test {
     use std::thread;
 
     use crate::id;
 
     #[test]
-    fn unit_id_can_generate() {
+    fn can_generate_unique_ids() {
         assert_eq!(id::create_id(), Err(id::ErrorUninitialized));
         id::init_id(12);
         assert_eq!(id::create_id().unwrap().len(), 12);
diff --git a/packages/backend/native-utils/crates/util/src/random.rs b/packages/backend/native-utils/crates/util/src/random.rs
index c197298c77..1c4a20d50f 100644
--- a/packages/backend/native-utils/crates/util/src/random.rs
+++ b/packages/backend/native-utils/crates/util/src/random.rs
@@ -9,13 +9,13 @@ pub fn gen_string(length: u16) -> String {
 }
 
 #[cfg(test)]
-mod tests {
+mod unit_test {
     use std::thread;
 
     use super::gen_string;
 
     #[test]
-    fn unit_random_can_generate_string() {
+    fn can_generate_unique_strings() {
         assert_eq!(gen_string(16).len(), 16);
         assert_ne!(gen_string(16), gen_string(16));
         let s1 = thread::spawn(|| gen_string(16));
diff --git a/packages/backend/native-utils/package.json b/packages/backend/native-utils/package.json
index c82826d69b..60f14260dd 100644
--- a/packages/backend/native-utils/package.json
+++ b/packages/backend/native-utils/package.json
@@ -40,7 +40,7 @@
     "test": "ava",
     "universal": "napi universal",
     "version": "napi version",
-    "cargo:unit": "cargo test --workspace unit",
-    "cargo:integration": "cargo test --workspace inte -- --test-threads=1"
+    "cargo:unit": "cargo test --workspace unit_test",
+    "cargo:integration": "cargo test --workspace it_test -- --test-threads=1"
   }
 }

From 76e5e314116d173c924d0a202dfe66d26bb6b635 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Sat, 27 May 2023 07:02:10 -0400
Subject: [PATCH 225/319] todo unread note check

---
 .../native-utils/crates/model/tests/repository/antenna.rs   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
index 7f3aac74d0..a7e490733a 100644
--- a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
+++ b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
@@ -11,7 +11,6 @@ mod it_test {
     #[tokio::test]
     async fn can_pack() {
         prepare().await;
-
         let db = database::get_database().unwrap();
 
         let alice_antenna = user::Entity::find()
@@ -59,4 +58,9 @@ mod it_test {
 
         cleanup().await;
     }
+
+    #[tokio::test]
+    async fn unread_note() {
+        todo!();
+    }
 }

From 1455068e0c0eface8bb1228690603f9460614d4e Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Wed, 31 May 2023 12:09:30 -0400
Subject: [PATCH 226/319] add newtype

---
 .../native-utils/crates/model/Cargo.toml      |  1 +
 .../crates/model/src/entity/antenna.rs        | 10 ++--
 .../crates/model/src/entity/mod.rs            |  1 +
 .../crates/model/src/entity/newtype/macros.rs | 51 +++++++++++++++++++
 .../crates/model/src/entity/newtype/mod.rs    | 17 +++++++
 .../crates/model/src/repository/antenna.rs    |  8 +--
 .../crates/model/src/schema/antenna.rs        | 12 ++---
 .../crates/model/src/schema/mod.rs            | 30 -----------
 .../native-utils/crates/model/tests/common.rs | 13 +++--
 .../crates/model/tests/repository/antenna.rs  | 10 ++--
 10 files changed, 101 insertions(+), 52 deletions(-)
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/newtype/macros.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs

diff --git a/packages/backend/native-utils/crates/model/Cargo.toml b/packages/backend/native-utils/crates/model/Cargo.toml
index 87f712aa7e..47d2e15537 100644
--- a/packages/backend/native-utils/crates/model/Cargo.toml
+++ b/packages/backend/native-utils/crates/model/Cargo.toml
@@ -9,6 +9,7 @@ edition = "2021"
 async-trait = "0.1.68"
 chrono = "0.4.24"
 database = { path = "../database" }
+derive_more = "0.99.17"
 jsonschema = "0.17.0"
 once_cell = "1.17.1"
 parse-display = "0.8.0"
diff --git a/packages/backend/native-utils/crates/model/src/entity/antenna.rs b/packages/backend/native-utils/crates/model/src/entity/antenna.rs
index 513d15e831..5e514576be 100644
--- a/packages/backend/native-utils/crates/model/src/entity/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/antenna.rs
@@ -1,6 +1,6 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
 
-use super::sea_orm_active_enums::AntennaSrcEnum;
+use super::{newtype, sea_orm_active_enums::AntennaSrcEnum};
 use sea_orm::entity::prelude::*;
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
@@ -17,7 +17,7 @@ pub struct Model {
     #[sea_orm(column_name = "userListId")]
     pub user_list_id: Option<String>,
     #[sea_orm(column_type = "JsonBinary")]
-    pub keywords: Json,
+    pub keywords: newtype::Keyword,
     #[sea_orm(column_name = "withFile")]
     pub with_file: bool,
     pub expression: Option<String>,
@@ -28,11 +28,11 @@ pub struct Model {
     pub with_replies: bool,
     #[sea_orm(column_name = "userGroupJoiningId")]
     pub user_group_joining_id: Option<String>,
-    pub users: Vec<String>,
+    pub users: newtype::StringVec,
     #[sea_orm(column_name = "excludeKeywords", column_type = "JsonBinary")]
-    pub exclude_keywords: Json,
+    pub exclude_keywords: newtype::Keyword,
     #[sea_orm(column_type = "JsonBinary")]
-    pub instances: Json,
+    pub instances: newtype::StringVec,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/mod.rs b/packages/backend/native-utils/crates/model/src/entity/mod.rs
index 077f9fa6e7..6105b05550 100644
--- a/packages/backend/native-utils/crates/model/src/entity/mod.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/mod.rs
@@ -33,6 +33,7 @@ pub mod migrations;
 pub mod moderation_log;
 pub mod muted_note;
 pub mod muting;
+pub mod newtype;
 pub mod note;
 pub mod note_edit;
 pub mod note_favorite;
diff --git a/packages/backend/native-utils/crates/model/src/entity/newtype/macros.rs b/packages/backend/native-utils/crates/model/src/entity/newtype/macros.rs
new file mode 100644
index 0000000000..0266e80c85
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/newtype/macros.rs
@@ -0,0 +1,51 @@
+#[macro_export]
+macro_rules! impl_json_newtype {
+    ($a:tt) => {
+        impl From<$a> for Value {
+            fn from(source: $a) -> Self {
+                Value::Json(serde_json::to_value(source).ok().map(Box::new))
+            }
+        }
+
+        impl TryGetable for $a {
+            fn try_get_by<I: sea_orm::ColIdx>(
+                res: &QueryResult,
+                idx: I,
+            ) -> Result<Self, TryGetError> {
+                let json_value: serde_json::Value =
+                    res.try_get_by(idx).map_err(TryGetError::DbErr)?;
+                serde_json::from_value(json_value)
+                    .map_err(|e| TryGetError::DbErr(DbErr::Json(e.to_string())))
+            }
+        }
+
+        impl sea_query::ValueType for $a {
+            fn try_from(v: Value) -> Result<Self, sea_query::ValueTypeErr> {
+                match v {
+                    Value::Json(Some(x)) => Ok($a(
+                        serde_json::from_value(*x).map_err(|_| sea_query::ValueTypeErr)?
+                    )),
+                    _ => Err(sea_query::ValueTypeErr),
+                }
+            }
+
+            fn type_name() -> String {
+                stringify!($a).to_owned()
+            }
+
+            fn array_type() -> sea_orm::sea_query::ArrayType {
+                sea_orm::sea_query::ArrayType::Json
+            }
+
+            fn column_type() -> sea_query::ColumnType {
+                sea_query::ColumnType::Json
+            }
+        }
+
+        impl sea_query::Nullable for $a {
+            fn null() -> Value {
+                Value::Json(None)
+            }
+        }
+    };
+}
diff --git a/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs b/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
new file mode 100644
index 0000000000..714f3dafb7
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
@@ -0,0 +1,17 @@
+mod macros;
+
+use derive_more::From;
+use schemars::JsonSchema;
+use sea_orm::{sea_query, DbErr, QueryResult, TryGetError, TryGetable, Value};
+use serde::{Deserialize, Serialize};
+
+use crate::impl_json_newtype;
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema, From)]
+pub struct Keyword(pub Vec<Vec<String>>);
+impl_json_newtype!(Keyword);
+
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema, From)]
+
+pub struct StringVec(pub Vec<String>);
+impl_json_newtype!(StringVec);
diff --git a/packages/backend/native-utils/crates/model/src/repository/antenna.rs b/packages/backend/native-utils/crates/model/src/repository/antenna.rs
index dc6cb5a016..9a6882b59a 100644
--- a/packages/backend/native-utils/crates/model/src/repository/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/repository/antenna.rs
@@ -3,7 +3,7 @@ use sea_orm::{ColumnTrait, EntityTrait, QueryFilter};
 
 use crate::entity::{antenna, antenna_note, user_group_joining};
 use crate::error::Error;
-use crate::schema::{antenna::Antenna, json_to_keyword, json_to_string_list};
+use crate::schema::antenna::Antenna;
 
 use super::Repository;
 
@@ -30,13 +30,13 @@ impl Repository<Antenna> for antenna::Model {
             id: self.id,
             created_at: self.created_at.into(),
             name: self.name,
-            keywords: json_to_keyword(&self.keywords),
-            exclude_keywords: json_to_keyword(&self.exclude_keywords),
+            keywords: self.keywords,
+            exclude_keywords: self.exclude_keywords,
             src: self.src.try_into()?,
             user_list_id: self.user_list_id,
             user_group_id,
             users: self.users,
-            instances: json_to_string_list(&self.instances),
+            instances: self.instances,
             case_sensitive: self.case_sensitive,
             notify: self.notify,
             with_replies: self.with_replies,
diff --git a/packages/backend/native-utils/crates/model/src/schema/antenna.rs b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
index d5f19a96f7..035dca344c 100644
--- a/packages/backend/native-utils/crates/model/src/schema/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
@@ -4,8 +4,8 @@ use parse_display::FromStr;
 use schemars::JsonSchema;
 use utoipa::ToSchema;
 
-use super::{Keyword, Schema, StringList};
-use crate::entity::sea_orm_active_enums::AntennaSrcEnum;
+use super::Schema;
+use crate::entity::{newtype, sea_orm_active_enums::AntennaSrcEnum};
 
 #[derive(Clone, Debug, PartialEq, Eq, JsonSchema, ToSchema)]
 #[serde(rename_all = "camelCase")]
@@ -13,14 +13,14 @@ pub struct Antenna {
     pub id: String,
     pub created_at: chrono::DateTime<chrono::Utc>,
     pub name: String,
-    pub keywords: Keyword,
-    pub exclude_keywords: Keyword,
+    pub keywords: newtype::Keyword,
+    pub exclude_keywords: newtype::Keyword,
     #[schema(inline)]
     pub src: AntennaSrc,
     pub user_list_id: Option<String>,
     pub user_group_id: Option<String>,
-    pub users: StringList,
-    pub instances: StringList,
+    pub users: newtype::StringVec,
+    pub instances: newtype::StringVec,
     #[serde(default)]
     pub case_sensitive: bool,
     #[serde(default)]
diff --git a/packages/backend/native-utils/crates/model/src/schema/mod.rs b/packages/backend/native-utils/crates/model/src/schema/mod.rs
index 2a0853814b..cc495aac1b 100644
--- a/packages/backend/native-utils/crates/model/src/schema/mod.rs
+++ b/packages/backend/native-utils/crates/model/src/schema/mod.rs
@@ -3,10 +3,6 @@ pub mod app;
 
 use jsonschema::JSONSchema;
 use schemars::{schema_for, JsonSchema};
-use serde_json::Value;
-
-type Keyword = Vec<Vec<String>>;
-type StringList = Vec<String>;
 
 /// Structs of schema defitions implement this trait in order to
 /// provide the JSON Schema validator [`jsonschema::JSONSchema`].
@@ -23,29 +19,3 @@ trait Schema<T: JsonSchema> {
             .expect("Unable to compile schema")
     }
 }
-
-pub(crate) fn json_to_keyword(value: &Value) -> Keyword {
-    match value.as_array() {
-        None => vec![vec![]],
-        Some(or_vec) => or_vec
-            .iter()
-            .map(|and_val| match and_val.as_array() {
-                None => vec![],
-                Some(and_vec) => and_vec
-                    .iter()
-                    .map(|word| word.as_str().unwrap_or_default().to_string())
-                    .collect(),
-            })
-            .collect(),
-    }
-}
-
-pub(crate) fn json_to_string_list(value: &Value) -> StringList {
-    match value.as_array() {
-        None => vec![],
-        Some(v) => v
-            .iter()
-            .map(|s| s.as_str().unwrap_or_default().to_string())
-            .collect(),
-    }
-}
diff --git a/packages/backend/native-utils/crates/model/tests/common.rs b/packages/backend/native-utils/crates/model/tests/common.rs
index 38c6160711..6a54ca414b 100644
--- a/packages/backend/native-utils/crates/model/tests/common.rs
+++ b/packages/backend/native-utils/crates/model/tests/common.rs
@@ -7,7 +7,6 @@ use model::entity::{antenna, sea_orm_active_enums::AntennaSrcEnum, user};
 use sea_orm::{
     ActiveModelTrait, ActiveValue::Set, DatabaseConnection, DbErr, EntityTrait, TransactionTrait,
 };
-use serde_json::json;
 use std::env;
 use util::{
     id::{create_id, init_id},
@@ -64,8 +63,16 @@ async fn setup_model(db: &DatabaseConnection) {
                 user_id: Set(user_id.to_owned()),
                 name: Set("Test Antenna".to_string()),
                 src: Set(AntennaSrcEnum::All),
-                keywords: Set(json!([["foo", "bar"], ["foobar"]])),
-                exclude_keywords: Set(json!([["abc"], ["def", "ghi"]])),
+                keywords: Set(vec![
+                    vec!["foo".to_string(), "bar".to_string()],
+                    vec!["foobar".to_string()],
+                ]
+                .into()),
+                exclude_keywords: Set(vec![
+                    vec!["abc".to_string()],
+                    vec!["def".to_string(), "ghi".to_string()],
+                ]
+                .into()),
                 with_file: Set(false),
                 notify: Set(true),
                 case_sensitive: Set(true),
diff --git a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
index a7e490733a..73ddc65054 100644
--- a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
+++ b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
@@ -38,16 +38,18 @@ mod it_test {
                 keywords: vec![
                     vec!["foo".to_string(), "bar".to_string()],
                     vec!["foobar".to_string()]
-                ],
+                ]
+                .into(),
                 exclude_keywords: vec![
                     vec!["abc".to_string()],
                     vec!["def".to_string(), "ghi".to_string()]
-                ],
+                ]
+                .into(),
                 src: schema::antenna::AntennaSrc::All,
                 user_list_id: None,
                 user_group_id: None,
-                users: vec![],
-                instances: vec![],
+                users: vec![].into(),
+                instances: vec![].into(),
                 case_sensitive: true,
                 notify: true,
                 with_replies: false,

From 0bd5893e7d2c66bbed16a6b35352587ab35ef257 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Wed, 31 May 2023 12:24:02 -0400
Subject: [PATCH 227/319] fix varchar array

---
 .../native-utils/crates/model/src/entity/antenna.rs       | 8 ++++----
 .../native-utils/crates/model/src/entity/newtype/mod.rs   | 8 ++++----
 .../native-utils/crates/model/src/schema/antenna.rs       | 8 ++++----
 .../backend/native-utils/crates/model/tests/common.rs     | 2 +-
 .../native-utils/crates/model/tests/repository/antenna.rs | 2 +-
 packages/backend/native-utils/package.json                | 2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/backend/native-utils/crates/model/src/entity/antenna.rs b/packages/backend/native-utils/crates/model/src/entity/antenna.rs
index 5e514576be..ccff0aab4f 100644
--- a/packages/backend/native-utils/crates/model/src/entity/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/antenna.rs
@@ -17,7 +17,7 @@ pub struct Model {
     #[sea_orm(column_name = "userListId")]
     pub user_list_id: Option<String>,
     #[sea_orm(column_type = "JsonBinary")]
-    pub keywords: newtype::Keyword,
+    pub keywords: newtype::JsonKeyword,
     #[sea_orm(column_name = "withFile")]
     pub with_file: bool,
     pub expression: Option<String>,
@@ -28,11 +28,11 @@ pub struct Model {
     pub with_replies: bool,
     #[sea_orm(column_name = "userGroupJoiningId")]
     pub user_group_joining_id: Option<String>,
-    pub users: newtype::StringVec,
+    pub users: Vec<String>,
     #[sea_orm(column_name = "excludeKeywords", column_type = "JsonBinary")]
-    pub exclude_keywords: newtype::Keyword,
+    pub exclude_keywords: newtype::JsonKeyword,
     #[sea_orm(column_type = "JsonBinary")]
-    pub instances: newtype::StringVec,
+    pub instances: newtype::JsonStringVec,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs b/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
index 714f3dafb7..f7e3c3d436 100644
--- a/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
@@ -8,10 +8,10 @@ use serde::{Deserialize, Serialize};
 use crate::impl_json_newtype;
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema, From)]
-pub struct Keyword(pub Vec<Vec<String>>);
-impl_json_newtype!(Keyword);
+pub struct JsonKeyword(pub Vec<Vec<String>>);
+impl_json_newtype!(JsonKeyword);
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema, From)]
 
-pub struct StringVec(pub Vec<String>);
-impl_json_newtype!(StringVec);
+pub struct JsonStringVec(pub Vec<String>);
+impl_json_newtype!(JsonStringVec);
diff --git a/packages/backend/native-utils/crates/model/src/schema/antenna.rs b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
index 035dca344c..4a71982f7f 100644
--- a/packages/backend/native-utils/crates/model/src/schema/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
@@ -13,14 +13,14 @@ pub struct Antenna {
     pub id: String,
     pub created_at: chrono::DateTime<chrono::Utc>,
     pub name: String,
-    pub keywords: newtype::Keyword,
-    pub exclude_keywords: newtype::Keyword,
+    pub keywords: newtype::JsonKeyword,
+    pub exclude_keywords: newtype::JsonKeyword,
     #[schema(inline)]
     pub src: AntennaSrc,
     pub user_list_id: Option<String>,
     pub user_group_id: Option<String>,
-    pub users: newtype::StringVec,
-    pub instances: newtype::StringVec,
+    pub users: Vec<String>,
+    pub instances: newtype::JsonStringVec,
     #[serde(default)]
     pub case_sensitive: bool,
     #[serde(default)]
diff --git a/packages/backend/native-utils/crates/model/tests/common.rs b/packages/backend/native-utils/crates/model/tests/common.rs
index 6a54ca414b..d459056f3f 100644
--- a/packages/backend/native-utils/crates/model/tests/common.rs
+++ b/packages/backend/native-utils/crates/model/tests/common.rs
@@ -88,7 +88,7 @@ async fn setup_model(db: &DatabaseConnection) {
     .expect("Unable to setup predefined models");
 }
 
-mod it_test {
+mod int_test {
     use super::{cleanup, prepare};
 
     #[tokio::test]
diff --git a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
index 73ddc65054..e07a16c072 100644
--- a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
+++ b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
@@ -1,4 +1,4 @@
-mod it_test {
+mod int_test {
     use model::{
         entity::{antenna, user},
         repository::Repository,
diff --git a/packages/backend/native-utils/package.json b/packages/backend/native-utils/package.json
index 60f14260dd..aa194bad3a 100644
--- a/packages/backend/native-utils/package.json
+++ b/packages/backend/native-utils/package.json
@@ -41,6 +41,6 @@
     "universal": "napi universal",
     "version": "napi version",
     "cargo:unit": "cargo test --workspace unit_test",
-    "cargo:integration": "cargo test --workspace it_test -- --test-threads=1"
+    "cargo:integration": "cargo test --workspace int_test -- --test-threads=1"
   }
 }

From 354ece6432751505bf7b9ac7531bc7e70e00400b Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Wed, 31 May 2023 18:12:59 -0400
Subject: [PATCH 228/319] add abstraction of string array type

---
 .../native-utils/crates/database/src/lib.rs   |  6 +-
 .../native-utils/crates/migration/Cargo.toml  | 25 +++++++
 .../native-utils/crates/migration/README.md   | 41 ++++++++++
 .../native-utils/crates/migration/src/lib.rs  | 12 +++
 .../src/m20230531_180824_stringvec.rs         | 74 +++++++++++++++++++
 .../native-utils/crates/migration/src/main.rs |  6 ++
 .../native-utils/crates/model/Cargo.toml      |  6 +-
 .../crates/model/src/entity/antenna.rs        |  2 +-
 .../crates/model/src/entity/newtype/macros.rs |  6 +-
 .../crates/model/src/entity/newtype/mod.rs    | 17 +++--
 .../native-utils/crates/model/src/error.rs    |  2 +-
 .../crates/model/src/repository/antenna.rs    |  8 +-
 .../crates/model/src/schema/antenna.rs        |  8 +-
 .../native-utils/crates/model/tests/common.rs | 24 +++++-
 14 files changed, 213 insertions(+), 24 deletions(-)
 create mode 100644 packages/backend/native-utils/crates/migration/Cargo.toml
 create mode 100644 packages/backend/native-utils/crates/migration/README.md
 create mode 100644 packages/backend/native-utils/crates/migration/src/lib.rs
 create mode 100644 packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs
 create mode 100644 packages/backend/native-utils/crates/migration/src/main.rs

diff --git a/packages/backend/native-utils/crates/database/src/lib.rs b/packages/backend/native-utils/crates/database/src/lib.rs
index 6907a12816..0012d2292f 100644
--- a/packages/backend/native-utils/crates/database/src/lib.rs
+++ b/packages/backend/native-utils/crates/database/src/lib.rs
@@ -1,10 +1,10 @@
 pub mod error;
 
-use sea_orm::{Database, DatabaseConnection};
+use sea_orm::{Database, DbConn};
 
 use crate::error::Error;
 
-static DB_CONN: once_cell::sync::OnceCell<DatabaseConnection> = once_cell::sync::OnceCell::new();
+static DB_CONN: once_cell::sync::OnceCell<DbConn> = once_cell::sync::OnceCell::new();
 
 pub async fn init_database(connection_uri: impl Into<String>) -> Result<(), Error> {
     let conn = Database::connect(connection_uri.into()).await?;
@@ -12,7 +12,7 @@ pub async fn init_database(connection_uri: impl Into<String>) -> Result<(), Erro
     Ok(())
 }
 
-pub fn get_database() -> Result<&'static DatabaseConnection, Error> {
+pub fn get_database() -> Result<&'static DbConn, Error> {
     DB_CONN.get().ok_or(Error::Uninitialized)
 }
 
diff --git a/packages/backend/native-utils/crates/migration/Cargo.toml b/packages/backend/native-utils/crates/migration/Cargo.toml
new file mode 100644
index 0000000000..46108c68c5
--- /dev/null
+++ b/packages/backend/native-utils/crates/migration/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "migration"
+version = "0.1.0"
+edition = "2021"
+publish = false
+
+[lib]
+name = "migration"
+path = "src/lib.rs"
+
+[dependencies]
+async-std = { version = "1", features = ["attributes", "tokio1"] }
+serde_json = "1.0.96"
+model = { path = "../model" }
+
+[dependencies.sea-orm-migration]
+version = "0.11.0"
+features = [
+  # Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.
+  # View the list of supported features at https://www.sea-ql.org/SeaORM/docs/install-and-config/database-and-async-runtime.
+  # e.g.
+  "runtime-tokio-rustls",  # `ASYNC_RUNTIME` feature
+  "sqlx-postgres",         # `DATABASE_DRIVER` feature
+	"sqlx-sqlite",
+]
diff --git a/packages/backend/native-utils/crates/migration/README.md b/packages/backend/native-utils/crates/migration/README.md
new file mode 100644
index 0000000000..b3ea53eb44
--- /dev/null
+++ b/packages/backend/native-utils/crates/migration/README.md
@@ -0,0 +1,41 @@
+# Running Migrator CLI
+
+- Generate a new migration file
+    ```sh
+    cargo run -- migrate generate MIGRATION_NAME
+    ```
+- Apply all pending migrations
+    ```sh
+    cargo run
+    ```
+    ```sh
+    cargo run -- up
+    ```
+- Apply first 10 pending migrations
+    ```sh
+    cargo run -- up -n 10
+    ```
+- Rollback last applied migrations
+    ```sh
+    cargo run -- down
+    ```
+- Rollback last 10 applied migrations
+    ```sh
+    cargo run -- down -n 10
+    ```
+- Drop all tables from the database, then reapply all migrations
+    ```sh
+    cargo run -- fresh
+    ```
+- Rollback all applied migrations, then reapply all migrations
+    ```sh
+    cargo run -- refresh
+    ```
+- Rollback all applied migrations
+    ```sh
+    cargo run -- reset
+    ```
+- Check the status of all migrations
+    ```sh
+    cargo run -- status
+    ```
diff --git a/packages/backend/native-utils/crates/migration/src/lib.rs b/packages/backend/native-utils/crates/migration/src/lib.rs
new file mode 100644
index 0000000000..a2a1b932f2
--- /dev/null
+++ b/packages/backend/native-utils/crates/migration/src/lib.rs
@@ -0,0 +1,12 @@
+pub use sea_orm_migration::prelude::*;
+
+mod m20230531_180824_stringvec;
+
+pub struct Migrator;
+
+#[async_trait::async_trait]
+impl MigratorTrait for Migrator {
+    fn migrations() -> Vec<Box<dyn MigrationTrait>> {
+        vec![Box::new(m20230531_180824_stringvec::Migration)]
+    }
+}
diff --git a/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs b/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs
new file mode 100644
index 0000000000..ba1fc257d0
--- /dev/null
+++ b/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs
@@ -0,0 +1,74 @@
+use model::entity::{antenna, newtype::StringVec};
+use sea_orm_migration::{
+    prelude::*,
+    sea_orm::{DbBackend, EntityTrait, Statement},
+};
+use serde_json::json;
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        if manager.get_database_backend() == DbBackend::Sqlite {
+            return Ok(());
+        }
+
+        let db = manager.get_connection();
+        let query = Query::select()
+            .column(Antenna::Id)
+            .column(Antenna::Users)
+            .from(Antenna::Table)
+            .to_string(PostgresQueryBuilder);
+        let res: Vec<(String, Vec<String>)> = db
+            .query_all(Statement::from_string(DbBackend::Postgres, query))
+            .await?
+            .iter()
+            .filter_map(|r| r.try_get_many_by_index().ok())
+            .collect();
+
+        manager
+            .alter_table(
+                Table::alter()
+                    .table(Antenna::Table)
+                    .drop_column(Antenna::Users)
+                    .add_column(
+                        ColumnDef::new(Antenna::Users)
+                            .json_binary()
+                            .not_null()
+                            .default(json!([])),
+                    )
+                    .to_owned(),
+            )
+            .await?;
+
+        let models: Vec<antenna::ActiveModel> = res
+            .iter()
+            .map(|(id, users)| antenna::ActiveModel {
+                id: sea_orm::Set(id.to_owned()),
+                users: sea_orm::Set(StringVec::from(users.to_owned())),
+                ..Default::default()
+            })
+            .collect();
+
+        for model in models {
+            antenna::Entity::update(model).exec(db).await?;
+        }
+
+        Ok(())
+    }
+
+    async fn down(&self, _manager: &SchemaManager) -> Result<(), DbErr> {
+        // Replace the sample below with your own migration scripts
+        Ok(())
+    }
+}
+
+/// Learn more at https://docs.rs/sea-query#iden
+#[derive(Iden)]
+enum Antenna {
+    Table,
+    Id,
+    Users,
+}
diff --git a/packages/backend/native-utils/crates/migration/src/main.rs b/packages/backend/native-utils/crates/migration/src/main.rs
new file mode 100644
index 0000000000..c6b6e48dbc
--- /dev/null
+++ b/packages/backend/native-utils/crates/migration/src/main.rs
@@ -0,0 +1,6 @@
+use sea_orm_migration::prelude::*;
+
+#[async_std::main]
+async fn main() {
+    cli::run_cli(migration::Migrator).await;
+}
diff --git a/packages/backend/native-utils/crates/model/Cargo.toml b/packages/backend/native-utils/crates/model/Cargo.toml
index 47d2e15537..4f121a1e11 100644
--- a/packages/backend/native-utils/crates/model/Cargo.toml
+++ b/packages/backend/native-utils/crates/model/Cargo.toml
@@ -4,9 +4,13 @@ version = "0.1.0"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+[features]
+default = ["compat"]
+compat = ["sea-orm/postgres-array"]
 
 [dependencies]
 async-trait = "0.1.68"
+cfg-if = "1.0.0"
 chrono = "0.4.24"
 database = { path = "../database" }
 derive_more = "0.99.17"
@@ -14,7 +18,7 @@ jsonschema = "0.17.0"
 once_cell = "1.17.1"
 parse-display = "0.8.0"
 schemars = { version = "0.8.12", features = ["chrono"] }
-sea-orm = { version = "0.11.3", features = ["postgres-array", "sqlx-postgres", "runtime-tokio-rustls"] }
+sea-orm = { version = "0.11.3", features = ["sqlx-postgres", "sqlx-sqlite", "runtime-tokio-rustls"] }
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 thiserror = "1.0.40"
diff --git a/packages/backend/native-utils/crates/model/src/entity/antenna.rs b/packages/backend/native-utils/crates/model/src/entity/antenna.rs
index ccff0aab4f..0ebd1cf45b 100644
--- a/packages/backend/native-utils/crates/model/src/entity/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/antenna.rs
@@ -28,7 +28,7 @@ pub struct Model {
     pub with_replies: bool,
     #[sea_orm(column_name = "userGroupJoiningId")]
     pub user_group_joining_id: Option<String>,
-    pub users: Vec<String>,
+    pub users: newtype::StringVec,
     #[sea_orm(column_name = "excludeKeywords", column_type = "JsonBinary")]
     pub exclude_keywords: newtype::JsonKeyword,
     #[sea_orm(column_type = "JsonBinary")]
diff --git a/packages/backend/native-utils/crates/model/src/entity/newtype/macros.rs b/packages/backend/native-utils/crates/model/src/entity/newtype/macros.rs
index 0266e80c85..4b05c2c99c 100644
--- a/packages/backend/native-utils/crates/model/src/entity/newtype/macros.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/newtype/macros.rs
@@ -33,12 +33,12 @@ macro_rules! impl_json_newtype {
                 stringify!($a).to_owned()
             }
 
-            fn array_type() -> sea_orm::sea_query::ArrayType {
-                sea_orm::sea_query::ArrayType::Json
+            fn array_type() -> sea_query::ArrayType {
+                sea_query::ArrayType::Json
             }
 
             fn column_type() -> sea_query::ColumnType {
-                sea_query::ColumnType::Json
+                sea_query::ColumnType::JsonBinary
             }
         }
 
diff --git a/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs b/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
index f7e3c3d436..2b11c5f21a 100644
--- a/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
@@ -1,17 +1,24 @@
 mod macros;
 
-use derive_more::From;
-use schemars::JsonSchema;
+use cfg_if::cfg_if;
+use derive_more::{From, Into};
 use sea_orm::{sea_query, DbErr, QueryResult, TryGetError, TryGetable, Value};
 use serde::{Deserialize, Serialize};
 
 use crate::impl_json_newtype;
 
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema, From)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, From, Into)]
 pub struct JsonKeyword(pub Vec<Vec<String>>);
 impl_json_newtype!(JsonKeyword);
 
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, JsonSchema, From)]
-
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, From, Into)]
 pub struct JsonStringVec(pub Vec<String>);
 impl_json_newtype!(JsonStringVec);
+
+cfg_if! {
+    if #[cfg(feature = "compat")] {
+        pub type StringVec = Vec<String>;
+    } else {
+        pub type StringVec = JsonStringVec;
+    }
+}
diff --git a/packages/backend/native-utils/crates/model/src/error.rs b/packages/backend/native-utils/crates/model/src/error.rs
index 379ecb7842..7686312ec4 100644
--- a/packages/backend/native-utils/crates/model/src/error.rs
+++ b/packages/backend/native-utils/crates/model/src/error.rs
@@ -3,7 +3,7 @@ pub enum Error {
     #[error("Failed to parse string")]
     ParseError(#[from] parse_display::ParseError),
     #[error("Failed to get database connection")]
-    DatabaseConnectionError(#[from] database::error::Error),
+    DbConnError(#[from] database::error::Error),
     #[error("Database operation error: {0}")]
     DatabaseOperationError(#[from] sea_orm::DbErr),
 }
diff --git a/packages/backend/native-utils/crates/model/src/repository/antenna.rs b/packages/backend/native-utils/crates/model/src/repository/antenna.rs
index 9a6882b59a..f9ef012a6e 100644
--- a/packages/backend/native-utils/crates/model/src/repository/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/repository/antenna.rs
@@ -30,13 +30,13 @@ impl Repository<Antenna> for antenna::Model {
             id: self.id,
             created_at: self.created_at.into(),
             name: self.name,
-            keywords: self.keywords,
-            exclude_keywords: self.exclude_keywords,
+            keywords: self.keywords.into(),
+            exclude_keywords: self.exclude_keywords.into(),
             src: self.src.try_into()?,
             user_list_id: self.user_list_id,
             user_group_id,
-            users: self.users,
-            instances: self.instances,
+            users: self.users.into(),
+            instances: self.instances.into(),
             case_sensitive: self.case_sensitive,
             notify: self.notify,
             with_replies: self.with_replies,
diff --git a/packages/backend/native-utils/crates/model/src/schema/antenna.rs b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
index 4a71982f7f..fa7902b924 100644
--- a/packages/backend/native-utils/crates/model/src/schema/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
@@ -5,7 +5,7 @@ use schemars::JsonSchema;
 use utoipa::ToSchema;
 
 use super::Schema;
-use crate::entity::{newtype, sea_orm_active_enums::AntennaSrcEnum};
+use crate::entity::sea_orm_active_enums::AntennaSrcEnum;
 
 #[derive(Clone, Debug, PartialEq, Eq, JsonSchema, ToSchema)]
 #[serde(rename_all = "camelCase")]
@@ -13,14 +13,14 @@ pub struct Antenna {
     pub id: String,
     pub created_at: chrono::DateTime<chrono::Utc>,
     pub name: String,
-    pub keywords: newtype::JsonKeyword,
-    pub exclude_keywords: newtype::JsonKeyword,
+    pub keywords: Vec<Vec<String>>,
+    pub exclude_keywords: Vec<Vec<String>>,
     #[schema(inline)]
     pub src: AntennaSrc,
     pub user_list_id: Option<String>,
     pub user_group_id: Option<String>,
     pub users: Vec<String>,
-    pub instances: newtype::JsonStringVec,
+    pub instances: Vec<String>,
     #[serde(default)]
     pub case_sensitive: bool,
     #[serde(default)]
diff --git a/packages/backend/native-utils/crates/model/tests/common.rs b/packages/backend/native-utils/crates/model/tests/common.rs
index d459056f3f..f05c4432dc 100644
--- a/packages/backend/native-utils/crates/model/tests/common.rs
+++ b/packages/backend/native-utils/crates/model/tests/common.rs
@@ -5,7 +5,8 @@ mod repository;
 use chrono::Utc;
 use model::entity::{antenna, sea_orm_active_enums::AntennaSrcEnum, user};
 use sea_orm::{
-    ActiveModelTrait, ActiveValue::Set, DatabaseConnection, DbErr, EntityTrait, TransactionTrait,
+    ActiveModelTrait, ActiveValue::Set, ConnectionTrait, DbBackend, DbConn, DbErr, EntityTrait,
+    TransactionTrait,
 };
 use std::env;
 use util::{
@@ -24,6 +25,15 @@ async fn prepare() {
     setup_model(db).await;
 }
 
+async fn setup_schema(db: DbConn) {
+    // Setup Schema helper
+    let schema = sea_orm::Schema::new(DbBackend::Sqlite);
+    let stmt = schema.create_table_from_entity(antenna::Entity);
+    db.execute(db.get_database_backend().build(&stmt))
+        .await
+        .expect("Unable to initialize in-memoty sqlite");
+}
+
 /// Delete all entries in the database.
 async fn cleanup() {
     let db = database::get_database().unwrap();
@@ -39,7 +49,7 @@ async fn cleanup() {
     .expect("Unable to delete predefined models");
 }
 
-async fn setup_model(db: &DatabaseConnection) {
+async fn setup_model(db: &DbConn) {
     init_id(12);
 
     db.transaction::<_, (), DbErr>(|txn| {
@@ -89,6 +99,10 @@ async fn setup_model(db: &DatabaseConnection) {
 }
 
 mod int_test {
+    use sea_orm::Database;
+
+    use crate::setup_schema;
+
     use super::{cleanup, prepare};
 
     #[tokio::test]
@@ -96,4 +110,10 @@ mod int_test {
         prepare().await;
         cleanup().await;
     }
+
+    #[tokio::test]
+    async fn can_setup_sqlite_schema() {
+        let db = Database::connect("sqlite::memory:").await.unwrap();
+        setup_schema(db).await;
+    }
 }

From 6178593e22bb1a572e278a32a56577130b40914f Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Wed, 31 May 2023 18:21:57 -0400
Subject: [PATCH 229/319] make sqlite compat

---
 packages/backend/native-utils/crates/model/Cargo.toml         | 4 ++--
 .../native-utils/crates/model/src/entity/newtype/mod.rs       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/native-utils/crates/model/Cargo.toml b/packages/backend/native-utils/crates/model/Cargo.toml
index 4f121a1e11..e99f8b561d 100644
--- a/packages/backend/native-utils/crates/model/Cargo.toml
+++ b/packages/backend/native-utils/crates/model/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [features]
-default = ["compat"]
-compat = ["sea-orm/postgres-array"]
+default = ["legacy"]
+legacy = ["sea-orm/postgres-array"]
 
 [dependencies]
 async-trait = "0.1.68"
diff --git a/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs b/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
index 2b11c5f21a..65eba72d7c 100644
--- a/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
@@ -16,7 +16,7 @@ pub struct JsonStringVec(pub Vec<String>);
 impl_json_newtype!(JsonStringVec);
 
 cfg_if! {
-    if #[cfg(feature = "compat")] {
+    if #[cfg(feature = "legacy")] {
         pub type StringVec = Vec<String>;
     } else {
         pub type StringVec = JsonStringVec;

From 745384ff5812fc695f3e50710b7072c1a683fe18 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Thu, 1 Jun 2023 00:18:50 -0400
Subject: [PATCH 230/319] use vec newtype

---
 .../crates/model/src/entity/access_token.rs   |  4 +++-
 .../crates/model/src/entity/app.rs            |  4 +++-
 .../crates/model/src/entity/emoji.rs          |  4 +++-
 .../crates/model/src/entity/gallery_post.rs   |  6 +++--
 .../crates/model/src/entity/hashtag.rs        | 14 +++++++-----
 .../model/src/entity/messaging_message.rs     |  4 +++-
 .../crates/model/src/entity/meta.rs           | 22 ++++++++++---------
 .../crates/model/src/entity/newtype/mod.rs    |  6 +++++
 .../crates/model/src/entity/note.rs           | 14 +++++++-----
 .../crates/model/src/entity/note_edit.rs      |  4 +++-
 .../crates/model/src/entity/page.rs           |  4 +++-
 .../crates/model/src/entity/poll.rs           |  6 +++--
 .../crates/model/src/entity/registry_item.rs  |  4 +++-
 .../crates/model/src/entity/reversi_game.rs   |  4 +++-
 .../crates/model/src/entity/user.rs           |  6 +++--
 .../crates/model/src/entity/user_profile.rs   |  4 +++-
 .../crates/model/src/entity/webhook.rs        |  4 +++-
 17 files changed, 76 insertions(+), 38 deletions(-)

diff --git a/packages/backend/native-utils/crates/model/src/entity/access_token.rs b/packages/backend/native-utils/crates/model/src/entity/access_token.rs
index fa9894414f..f84971605f 100644
--- a/packages/backend/native-utils/crates/model/src/entity/access_token.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/access_token.rs
@@ -2,6 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
+use super::newtype::StringVec;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "access_token")]
 pub struct Model {
@@ -22,7 +24,7 @@ pub struct Model {
     pub description: Option<String>,
     #[sea_orm(column_name = "iconUrl")]
     pub icon_url: Option<String>,
-    pub permission: Vec<String>,
+    pub permission: StringVec,
     pub fetched: bool,
 }
 
diff --git a/packages/backend/native-utils/crates/model/src/entity/app.rs b/packages/backend/native-utils/crates/model/src/entity/app.rs
index 5f3d5d1317..3102945689 100644
--- a/packages/backend/native-utils/crates/model/src/entity/app.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/app.rs
@@ -2,6 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
+use super::newtype::StringVec;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "app")]
 pub struct Model {
@@ -14,7 +16,7 @@ pub struct Model {
     pub secret: String,
     pub name: String,
     pub description: String,
-    pub permission: Vec<String>,
+    pub permission: StringVec,
     #[sea_orm(column_name = "callbackUrl")]
     pub callback_url: Option<String>,
 }
diff --git a/packages/backend/native-utils/crates/model/src/entity/emoji.rs b/packages/backend/native-utils/crates/model/src/entity/emoji.rs
index a89f0b22d5..fdb99a2c3f 100644
--- a/packages/backend/native-utils/crates/model/src/entity/emoji.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/emoji.rs
@@ -2,6 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
+use super::newtype::StringVec;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "emoji")]
 pub struct Model {
@@ -15,7 +17,7 @@ pub struct Model {
     pub original_url: String,
     pub uri: Option<String>,
     pub r#type: Option<String>,
-    pub aliases: Vec<String>,
+    pub aliases: StringVec,
     pub category: Option<String>,
     #[sea_orm(column_name = "publicUrl")]
     pub public_url: String,
diff --git a/packages/backend/native-utils/crates/model/src/entity/gallery_post.rs b/packages/backend/native-utils/crates/model/src/entity/gallery_post.rs
index bb68eda62f..875d3af589 100644
--- a/packages/backend/native-utils/crates/model/src/entity/gallery_post.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/gallery_post.rs
@@ -2,6 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
+use super::newtype::StringVec;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "gallery_post")]
 pub struct Model {
@@ -16,12 +18,12 @@ pub struct Model {
     #[sea_orm(column_name = "userId")]
     pub user_id: String,
     #[sea_orm(column_name = "fileIds")]
-    pub file_ids: Vec<String>,
+    pub file_ids: StringVec,
     #[sea_orm(column_name = "isSensitive")]
     pub is_sensitive: bool,
     #[sea_orm(column_name = "likedCount")]
     pub liked_count: i32,
-    pub tags: Vec<String>,
+    pub tags: StringVec,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/hashtag.rs b/packages/backend/native-utils/crates/model/src/entity/hashtag.rs
index 9a6e44623b..917f4ea1b0 100644
--- a/packages/backend/native-utils/crates/model/src/entity/hashtag.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/hashtag.rs
@@ -2,6 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
+use super::newtype::StringVec;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "hashtag")]
 pub struct Model {
@@ -9,27 +11,27 @@ pub struct Model {
     pub id: String,
     pub name: String,
     #[sea_orm(column_name = "mentionedUserIds")]
-    pub mentioned_user_ids: Vec<String>,
+    pub mentioned_user_ids: StringVec,
     #[sea_orm(column_name = "mentionedUsersCount")]
     pub mentioned_users_count: i32,
     #[sea_orm(column_name = "mentionedLocalUserIds")]
-    pub mentioned_local_user_ids: Vec<String>,
+    pub mentioned_local_user_ids: StringVec,
     #[sea_orm(column_name = "mentionedLocalUsersCount")]
     pub mentioned_local_users_count: i32,
     #[sea_orm(column_name = "mentionedRemoteUserIds")]
-    pub mentioned_remote_user_ids: Vec<String>,
+    pub mentioned_remote_user_ids: StringVec,
     #[sea_orm(column_name = "mentionedRemoteUsersCount")]
     pub mentioned_remote_users_count: i32,
     #[sea_orm(column_name = "attachedUserIds")]
-    pub attached_user_ids: Vec<String>,
+    pub attached_user_ids: StringVec,
     #[sea_orm(column_name = "attachedUsersCount")]
     pub attached_users_count: i32,
     #[sea_orm(column_name = "attachedLocalUserIds")]
-    pub attached_local_user_ids: Vec<String>,
+    pub attached_local_user_ids: StringVec,
     #[sea_orm(column_name = "attachedLocalUsersCount")]
     pub attached_local_users_count: i32,
     #[sea_orm(column_name = "attachedRemoteUserIds")]
-    pub attached_remote_user_ids: Vec<String>,
+    pub attached_remote_user_ids: StringVec,
     #[sea_orm(column_name = "attachedRemoteUsersCount")]
     pub attached_remote_users_count: i32,
 }
diff --git a/packages/backend/native-utils/crates/model/src/entity/messaging_message.rs b/packages/backend/native-utils/crates/model/src/entity/messaging_message.rs
index 0fbfc1ffb3..b66c01fc9b 100644
--- a/packages/backend/native-utils/crates/model/src/entity/messaging_message.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/messaging_message.rs
@@ -2,6 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
+use super::newtype::StringVec;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "messaging_message")]
 pub struct Model {
@@ -20,7 +22,7 @@ pub struct Model {
     pub file_id: Option<String>,
     #[sea_orm(column_name = "groupId")]
     pub group_id: Option<String>,
-    pub reads: Vec<String>,
+    pub reads: StringVec,
     pub uri: Option<String>,
 }
 
diff --git a/packages/backend/native-utils/crates/model/src/entity/meta.rs b/packages/backend/native-utils/crates/model/src/entity/meta.rs
index 33ab911baa..a97cb89c4d 100644
--- a/packages/backend/native-utils/crates/model/src/entity/meta.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/meta.rs
@@ -4,6 +4,8 @@ use super::sea_orm_active_enums::MetaSensitivemediadetectionEnum;
 use super::sea_orm_active_enums::MetaSensitivemediadetectionsensitivityEnum;
 use sea_orm::entity::prelude::*;
 
+use super::newtype::StringVec;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "meta")]
 pub struct Model {
@@ -23,11 +25,11 @@ pub struct Model {
     pub disable_global_timeline: bool,
     #[sea_orm(column_name = "useStarForReactionFallback")]
     pub use_star_for_reaction_fallback: bool,
-    pub langs: Vec<String>,
+    pub langs: StringVec,
     #[sea_orm(column_name = "hiddenTags")]
-    pub hidden_tags: Vec<String>,
+    pub hidden_tags: StringVec,
     #[sea_orm(column_name = "blockedHosts")]
-    pub blocked_hosts: Vec<String>,
+    pub blocked_hosts: StringVec,
     #[sea_orm(column_name = "mascotImageUrl")]
     pub mascot_image_url: Option<String>,
     #[sea_orm(column_name = "bannerUrl")]
@@ -88,7 +90,7 @@ pub struct Model {
     #[sea_orm(column_name = "discordClientSecret")]
     pub discord_client_secret: Option<String>,
     #[sea_orm(column_name = "pinnedUsers")]
-    pub pinned_users: Vec<String>,
+    pub pinned_users: StringVec,
     #[sea_orm(column_name = "ToSUrl")]
     pub to_s_url: Option<String>,
     #[sea_orm(column_name = "repositoryUrl")]
@@ -128,7 +130,7 @@ pub struct Model {
     #[sea_orm(column_name = "objectStorageSetPublicRead")]
     pub object_storage_set_public_read: bool,
     #[sea_orm(column_name = "pinnedPages")]
-    pub pinned_pages: Vec<String>,
+    pub pinned_pages: StringVec,
     #[sea_orm(column_name = "backgroundImageUrl")]
     pub background_image_url: Option<String>,
     #[sea_orm(column_name = "logoImageUrl")]
@@ -138,7 +140,7 @@ pub struct Model {
     #[sea_orm(column_name = "objectStorageS3ForcePathStyle")]
     pub object_storage_s3_force_path_style: bool,
     #[sea_orm(column_name = "allowedHosts")]
-    pub allowed_hosts: Option<Vec<String>>,
+    pub allowed_hosts: Option<StringVec>,
     #[sea_orm(column_name = "secureMode")]
     pub secure_mode: Option<bool>,
     #[sea_orm(column_name = "privateMode")]
@@ -168,13 +170,13 @@ pub struct Model {
     #[sea_orm(column_name = "enableActiveEmailValidation")]
     pub enable_active_email_validation: bool,
     #[sea_orm(column_name = "customMOTD")]
-    pub custom_motd: Vec<String>,
+    pub custom_motd: StringVec,
     #[sea_orm(column_name = "customSplashIcons")]
-    pub custom_splash_icons: Vec<String>,
+    pub custom_splash_icons: StringVec,
     #[sea_orm(column_name = "disableRecommendedTimeline")]
     pub disable_recommended_timeline: bool,
     #[sea_orm(column_name = "recommendedInstances")]
-    pub recommended_instances: Vec<String>,
+    pub recommended_instances: StringVec,
     #[sea_orm(column_name = "enableGuestTimeline")]
     pub enable_guest_timeline: bool,
     #[sea_orm(column_name = "defaultReaction")]
@@ -184,7 +186,7 @@ pub struct Model {
     #[sea_orm(column_name = "libreTranslateApiKey")]
     pub libre_translate_api_key: Option<String>,
     #[sea_orm(column_name = "silencedHosts")]
-    pub silenced_hosts: Vec<String>,
+    pub silenced_hosts: StringVec,
     #[sea_orm(column_name = "experimentalFeatures", column_type = "JsonBinary")]
     pub experimental_features: Json,
 }
diff --git a/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs b/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
index 65eba72d7c..bd43024416 100644
--- a/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
@@ -15,10 +15,16 @@ impl_json_newtype!(JsonKeyword);
 pub struct JsonStringVec(pub Vec<String>);
 impl_json_newtype!(JsonStringVec);
 
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, From, Into)]
+pub struct JsonI32Vec(pub Vec<i32>);
+impl_json_newtype!(JsonI32Vec);
+
 cfg_if! {
     if #[cfg(feature = "legacy")] {
         pub type StringVec = Vec<String>;
+        pub type I32Vec = Vec<i32>;
     } else {
         pub type StringVec = JsonStringVec;
+        pub type I32Vec = JsonI32Vec;
     }
 }
diff --git a/packages/backend/native-utils/crates/model/src/entity/note.rs b/packages/backend/native-utils/crates/model/src/entity/note.rs
index 2e733edaea..c2f20c11be 100644
--- a/packages/backend/native-utils/crates/model/src/entity/note.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/note.rs
@@ -3,6 +3,8 @@
 use super::sea_orm_active_enums::NoteVisibilityEnum;
 use sea_orm::entity::prelude::*;
 
+use super::newtype::StringVec;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "note")]
 pub struct Model {
@@ -32,16 +34,16 @@ pub struct Model {
     pub uri: Option<String>,
     pub score: i32,
     #[sea_orm(column_name = "fileIds")]
-    pub file_ids: Vec<String>,
+    pub file_ids: StringVec,
     #[sea_orm(column_name = "attachedFileTypes")]
-    pub attached_file_types: Vec<String>,
+    pub attached_file_types: StringVec,
     #[sea_orm(column_name = "visibleUserIds")]
-    pub visible_user_ids: Vec<String>,
-    pub mentions: Vec<String>,
+    pub visible_user_ids: StringVec,
+    pub mentions: StringVec,
     #[sea_orm(column_name = "mentionedRemoteUsers", column_type = "Text")]
     pub mentioned_remote_users: String,
-    pub emojis: Vec<String>,
-    pub tags: Vec<String>,
+    pub emojis: StringVec,
+    pub tags: StringVec,
     #[sea_orm(column_name = "hasPoll")]
     pub has_poll: bool,
     #[sea_orm(column_name = "userHost")]
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_edit.rs b/packages/backend/native-utils/crates/model/src/entity/note_edit.rs
index 5e98b3da4c..4e8f420833 100644
--- a/packages/backend/native-utils/crates/model/src/entity/note_edit.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/note_edit.rs
@@ -2,6 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
+use super::newtype::StringVec;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "note_edit")]
 pub struct Model {
@@ -13,7 +15,7 @@ pub struct Model {
     pub text: Option<String>,
     pub cw: Option<String>,
     #[sea_orm(column_name = "fileIds")]
-    pub file_ids: Vec<String>,
+    pub file_ids: StringVec,
     #[sea_orm(column_name = "updatedAt")]
     pub updated_at: DateTimeWithTimeZone,
 }
diff --git a/packages/backend/native-utils/crates/model/src/entity/page.rs b/packages/backend/native-utils/crates/model/src/entity/page.rs
index efb7949447..c3d09fa8c2 100644
--- a/packages/backend/native-utils/crates/model/src/entity/page.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/page.rs
@@ -3,6 +3,8 @@
 use super::sea_orm_active_enums::PageVisibilityEnum;
 use sea_orm::entity::prelude::*;
 
+use super::newtype::StringVec;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "page")]
 pub struct Model {
@@ -28,7 +30,7 @@ pub struct Model {
     pub variables: Json,
     pub visibility: PageVisibilityEnum,
     #[sea_orm(column_name = "visibleUserIds")]
-    pub visible_user_ids: Vec<String>,
+    pub visible_user_ids: StringVec,
     #[sea_orm(column_name = "likedCount")]
     pub liked_count: i32,
     #[sea_orm(column_name = "hideTitleWhenPinned")]
diff --git a/packages/backend/native-utils/crates/model/src/entity/poll.rs b/packages/backend/native-utils/crates/model/src/entity/poll.rs
index a4d9e2df10..81953cfbac 100644
--- a/packages/backend/native-utils/crates/model/src/entity/poll.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/poll.rs
@@ -3,6 +3,8 @@
 use super::sea_orm_active_enums::PollNotevisibilityEnum;
 use sea_orm::entity::prelude::*;
 
+use super::newtype::{I32Vec, StringVec};
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "poll")]
 pub struct Model {
@@ -11,8 +13,8 @@ pub struct Model {
     #[sea_orm(column_name = "expiresAt")]
     pub expires_at: Option<DateTimeWithTimeZone>,
     pub multiple: bool,
-    pub choices: Vec<String>,
-    pub votes: Vec<i32>,
+    pub choices: StringVec,
+    pub votes: I32Vec,
     #[sea_orm(column_name = "noteVisibility")]
     pub note_visibility: PollNotevisibilityEnum,
     #[sea_orm(column_name = "userId")]
diff --git a/packages/backend/native-utils/crates/model/src/entity/registry_item.rs b/packages/backend/native-utils/crates/model/src/entity/registry_item.rs
index 6de0c740f6..54d72d5d89 100644
--- a/packages/backend/native-utils/crates/model/src/entity/registry_item.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/registry_item.rs
@@ -2,6 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
+use super::newtype::StringVec;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "registry_item")]
 pub struct Model {
@@ -14,7 +16,7 @@ pub struct Model {
     #[sea_orm(column_name = "userId")]
     pub user_id: String,
     pub key: String,
-    pub scope: Vec<String>,
+    pub scope: StringVec,
     pub domain: Option<String>,
     #[sea_orm(column_type = "JsonBinary", nullable)]
     pub value: Option<Json>,
diff --git a/packages/backend/native-utils/crates/model/src/entity/reversi_game.rs b/packages/backend/native-utils/crates/model/src/entity/reversi_game.rs
index 1e53592802..0c82fccf74 100644
--- a/packages/backend/native-utils/crates/model/src/entity/reversi_game.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/reversi_game.rs
@@ -2,6 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
+use super::newtype::StringVec;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "reversi_game")]
 pub struct Model {
@@ -29,7 +31,7 @@ pub struct Model {
     pub surrendered: Option<String>,
     #[sea_orm(column_type = "JsonBinary")]
     pub logs: Json,
-    pub map: Vec<String>,
+    pub map: StringVec,
     pub bw: String,
     #[sea_orm(column_name = "isLlotheo")]
     pub is_llotheo: bool,
diff --git a/packages/backend/native-utils/crates/model/src/entity/user.rs b/packages/backend/native-utils/crates/model/src/entity/user.rs
index 79b9fa6927..1cf6ac6b7b 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user.rs
@@ -2,6 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
+use super::newtype::StringVec;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "user")]
 pub struct Model {
@@ -27,7 +29,7 @@ pub struct Model {
     pub avatar_id: Option<String>,
     #[sea_orm(column_name = "bannerId", unique)]
     pub banner_id: Option<String>,
-    pub tags: Vec<String>,
+    pub tags: StringVec,
     #[sea_orm(column_name = "isSuspended")]
     pub is_suspended: bool,
     #[sea_orm(column_name = "isSilenced")]
@@ -42,7 +44,7 @@ pub struct Model {
     pub is_admin: bool,
     #[sea_orm(column_name = "isModerator")]
     pub is_moderator: bool,
-    pub emojis: Vec<String>,
+    pub emojis: StringVec,
     pub host: Option<String>,
     pub inbox: Option<String>,
     #[sea_orm(column_name = "sharedInbox")]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_profile.rs b/packages/backend/native-utils/crates/model/src/entity/user_profile.rs
index 3a12469d88..d62607f162 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_profile.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_profile.rs
@@ -3,6 +3,8 @@
 use super::sea_orm_active_enums::UserProfileFfvisibilityEnum;
 use sea_orm::entity::prelude::*;
 
+use super::newtype::StringVec;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "user_profile")]
 pub struct Model {
@@ -53,7 +55,7 @@ pub struct Model {
     #[sea_orm(column_name = "mutedWords", column_type = "JsonBinary")]
     pub muted_words: Json,
     #[sea_orm(column_name = "mutingNotificationTypes")]
-    pub muting_notification_types: Vec<String>,
+    pub muting_notification_types: StringVec,
     #[sea_orm(column_name = "noCrawle")]
     pub no_crawle: bool,
     #[sea_orm(column_name = "receiveAnnouncementEmail")]
diff --git a/packages/backend/native-utils/crates/model/src/entity/webhook.rs b/packages/backend/native-utils/crates/model/src/entity/webhook.rs
index 952dcbadba..dd3c3c7389 100644
--- a/packages/backend/native-utils/crates/model/src/entity/webhook.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/webhook.rs
@@ -2,6 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
+use super::newtype::StringVec;
+
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
 #[sea_orm(table_name = "webhook")]
 pub struct Model {
@@ -12,7 +14,7 @@ pub struct Model {
     #[sea_orm(column_name = "userId")]
     pub user_id: String,
     pub name: String,
-    pub on: Vec<String>,
+    pub on: StringVec,
     pub url: String,
     pub secret: String,
     pub active: bool,

From 98f2397fbbe34737471a8cf3ed69484773b6d9a2 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Thu, 1 Jun 2023 04:01:25 -0400
Subject: [PATCH 231/319] add migration to convert array to jsonb

---
 .../src/m20230531_180824_stringvec.rs         | 395 ++++++++++++++++--
 .../native-utils/crates/model/Cargo.toml      |   6 +-
 .../crates/model/src/entity/mod.rs            |   2 -
 .../crates/model/src/entity/prelude.rs        |   2 -
 .../crates/model/src/entity/reversi_game.rs   |  69 ---
 .../model/src/entity/reversi_matching.rs      |  38 --
 .../native-utils/crates/model/tests/common.rs |   6 +-
 7 files changed, 365 insertions(+), 153 deletions(-)
 delete mode 100644 packages/backend/native-utils/crates/model/src/entity/reversi_game.rs
 delete mode 100644 packages/backend/native-utils/crates/model/src/entity/reversi_matching.rs

diff --git a/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs b/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs
index ba1fc257d0..b7c0a70b3d 100644
--- a/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs
+++ b/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs
@@ -1,7 +1,11 @@
-use model::entity::{antenna, newtype::StringVec};
+use model::entity::{
+    access_token, antenna, app, emoji, gallery_post, hashtag, messaging_message, meta,
+    newtype::{I32Vec, StringVec},
+    note, note_edit, poll, registry_item, user, user_profile, webhook,
+};
 use sea_orm_migration::{
     prelude::*,
-    sea_orm::{DbBackend, EntityTrait, Statement},
+    sea_orm::{DbBackend, EntityTrait, Statement, TryGetable},
 };
 use serde_json::json;
 
@@ -11,50 +15,220 @@ pub struct Migration;
 #[async_trait::async_trait]
 impl MigrationTrait for Migration {
     async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        manager
+            .drop_table(Table::drop().table(Alias::new("reversi_game")).to_owned())
+            .await?;
+
+        manager
+            .drop_table(
+                Table::drop()
+                    .table(Alias::new("reversi_matching"))
+                    .to_owned(),
+            )
+            .await?;
+
         if manager.get_database_backend() == DbBackend::Sqlite {
             return Ok(());
         }
 
         let db = manager.get_connection();
-        let query = Query::select()
-            .column(Antenna::Id)
-            .column(Antenna::Users)
-            .from(Antenna::Table)
-            .to_string(PostgresQueryBuilder);
-        let res: Vec<(String, Vec<String>)> = db
-            .query_all(Statement::from_string(DbBackend::Postgres, query))
-            .await?
-            .iter()
-            .filter_map(|r| r.try_get_many_by_index().ok())
-            .collect();
 
-        manager
-            .alter_table(
-                Table::alter()
-                    .table(Antenna::Table)
-                    .drop_column(Antenna::Users)
-                    .add_column(
-                        ColumnDef::new(Antenna::Users)
-                            .json_binary()
-                            .not_null()
-                            .default(json!([])),
-                    )
-                    .to_owned(),
-            )
-            .await?;
+        macro_rules! copy_data {
+            ($data:ident, $ent:ident, $col:tt) => {
+                let models: Vec<$ent::ActiveModel> = $data
+                    .iter()
+                    .map(|(id, r)| $ent::ActiveModel {
+                        id: sea_orm::Set(id.to_owned()),
+                        $col: sea_orm::Set(StringVec::from(r.to_owned())),
+                        ..Default::default()
+                    })
+                    .collect();
+                for model in models {
+                    $ent::Entity::update(model).exec(db).await?;
+                }
+            };
+        }
 
-        let models: Vec<antenna::ActiveModel> = res
+        macro_rules! convert_to_stringvec_json {
+            ($table:expr, $id:expr, $col:expr, $ent:ident, $col_name:tt) => {
+                let query = select_query($table, $id, $col);
+                let res = get_vec::<Vec<String>>(db, query).await?;
+                convert_col(manager, $table, $col).await?;
+                copy_data!(res, $ent, $col_name);
+            };
+        }
+
+        convert_to_stringvec_json!(
+            AccessToken::Table,
+            AccessToken::Id,
+            AccessToken::Permission,
+            access_token,
+            permission
+        );
+        convert_to_stringvec_json!(Antenna::Table, Antenna::Id, Antenna::Users, antenna, users);
+        convert_to_stringvec_json!(App::Table, App::Id, App::Permission, app, permission);
+        convert_to_stringvec_json!(Emoji::Table, Emoji::Id, Emoji::Aliases, emoji, aliases);
+        convert_to_stringvec_json!(
+            GalleryPost::Table,
+            GalleryPost::Id,
+            GalleryPost::FileIds,
+            gallery_post,
+            file_ids
+        );
+        convert_to_stringvec_json!(
+            GalleryPost::Table,
+            GalleryPost::Id,
+            GalleryPost::Tags,
+            gallery_post,
+            tags
+        );
+        convert_to_stringvec_json!(
+            Hashtag::Table,
+            Hashtag::Id,
+            Hashtag::MentionedUserIds,
+            hashtag,
+            mentioned_user_ids
+        );
+        convert_to_stringvec_json!(
+            Hashtag::Table,
+            Hashtag::Id,
+            Hashtag::MentionedLocalUserIds,
+            hashtag,
+            mentioned_local_user_ids
+        );
+        convert_to_stringvec_json!(
+            Hashtag::Table,
+            Hashtag::Id,
+            Hashtag::MentionedRemoteUserIds,
+            hashtag,
+            mentioned_remote_user_ids
+        );
+        convert_to_stringvec_json!(
+            Hashtag::Table,
+            Hashtag::Id,
+            Hashtag::AttachedUserIds,
+            hashtag,
+            attached_user_ids
+        );
+        convert_to_stringvec_json!(
+            Hashtag::Table,
+            Hashtag::Id,
+            Hashtag::AttachedLocalUserIds,
+            hashtag,
+            attached_local_user_ids
+        );
+        convert_to_stringvec_json!(
+            Hashtag::Table,
+            Hashtag::Id,
+            Hashtag::AttachedRemoteUserIds,
+            hashtag,
+            attached_remote_user_ids
+        );
+        convert_to_stringvec_json!(
+            MessagingMessage::Table,
+            MessagingMessage::Id,
+            MessagingMessage::Reads,
+            messaging_message,
+            reads
+        );
+        convert_to_stringvec_json!(Meta::Table, Meta::Id, Meta::Langs, meta, langs);
+        convert_to_stringvec_json!(
+            Meta::Table,
+            Meta::Id,
+            Meta::BlockedHosts,
+            meta,
+            blocked_hosts
+        );
+        convert_to_stringvec_json!(Meta::Table, Meta::Id, Meta::HiddenTags, meta, hidden_tags);
+        convert_to_stringvec_json!(Meta::Table, Meta::Id, Meta::PinnedUsers, meta, pinned_users);
+        convert_to_stringvec_json!(Meta::Table, Meta::Id, Meta::PinnedPages, meta, pinned_pages);
+        convert_to_stringvec_json!(
+            Meta::Table,
+            Meta::Id,
+            Meta::RecommendedInstances,
+            meta,
+            recommended_instances
+        );
+        convert_to_stringvec_json!(
+            Meta::Table,
+            Meta::Id,
+            Meta::SilencedHosts,
+            meta,
+            silenced_hosts
+        );
+        convert_to_stringvec_json!(Note::Table, Note::Id, Note::FileIds, note, file_ids);
+        convert_to_stringvec_json!(
+            Note::Table,
+            Note::Id,
+            Note::AttachedFileTypes,
+            note,
+            attached_file_types
+        );
+        convert_to_stringvec_json!(
+            Note::Table,
+            Note::Id,
+            Note::VisibleUserIds,
+            note,
+            visible_user_ids
+        );
+        convert_to_stringvec_json!(Note::Table, Note::Id, Note::Mentions, note, mentions);
+        convert_to_stringvec_json!(Note::Table, Note::Id, Note::Emojis, note, emojis);
+        convert_to_stringvec_json!(Note::Table, Note::Id, Note::Tags, note, tags);
+        convert_to_stringvec_json!(
+            NoteEdit::Table,
+            NoteEdit::Id,
+            NoteEdit::FileIds,
+            note_edit,
+            file_ids
+        );
+
+        // Convert poll here because its primary key is not id, but note_id.
+        let query = select_query(Poll::Table, Poll::NoteId, Poll::Choices);
+        let res = get_vec::<Vec<String>>(db, query).await?;
+        convert_col(manager, Poll::Table, Poll::Choices).await?;
+        let poll_models: Vec<poll::ActiveModel> = res
             .iter()
-            .map(|(id, users)| antenna::ActiveModel {
-                id: sea_orm::Set(id.to_owned()),
-                users: sea_orm::Set(StringVec::from(users.to_owned())),
+            .map(|(id, r)| poll::ActiveModel {
+                note_id: sea_orm::Set(id.to_owned()),
+                choices: sea_orm::Set(StringVec::from(r.to_owned())),
                 ..Default::default()
             })
             .collect();
-
-        for model in models {
-            antenna::Entity::update(model).exec(db).await?;
+        for model in poll_models {
+            poll::Entity::update(model).exec(db).await?;
         }
+        let query = select_query(Poll::Table, Poll::NoteId, Poll::Votes);
+        let res = get_vec::<Vec<i32>>(db, query).await?;
+        convert_col(manager, Poll::Table, Poll::Votes).await?;
+        let poll_models: Vec<poll::ActiveModel> = res
+            .iter()
+            .map(|(id, r)| poll::ActiveModel {
+                note_id: sea_orm::Set(id.to_owned()),
+                votes: sea_orm::Set(I32Vec::from(r.to_owned())),
+                ..Default::default()
+            })
+            .collect();
+        for model in poll_models {
+            poll::Entity::update(model).exec(db).await?;
+        }
+
+        convert_to_stringvec_json!(
+            RegistryItem::Table,
+            RegistryItem::Id,
+            RegistryItem::Scope,
+            registry_item,
+            scope
+        );
+        convert_to_stringvec_json!(User::Table, User::Id, User::Tags, user, tags);
+        convert_to_stringvec_json!(User::Table, User::Id, User::Emojis, user, emojis);
+        convert_to_stringvec_json!(
+            UserProfile::Table,
+            UserProfile::Id,
+            UserProfile::MutingNotificationTypes,
+            user_profile,
+            muting_notification_types
+        );
+        convert_to_stringvec_json!(Webhook::Table, Webhook::Id, Webhook::On, webhook, on);
 
         Ok(())
     }
@@ -66,9 +240,160 @@ impl MigrationTrait for Migration {
 }
 
 /// Learn more at https://docs.rs/sea-query#iden
-#[derive(Iden)]
+#[derive(Iden, Clone)]
 enum Antenna {
     Table,
     Id,
     Users,
 }
+#[derive(Iden, Clone)]
+enum AccessToken {
+    Table,
+    Id,
+    Permission,
+}
+#[derive(Iden, Clone)]
+enum App {
+    Table,
+    Id,
+    Permission,
+}
+#[derive(Iden, Clone)]
+enum Emoji {
+    Table,
+    Id,
+    Aliases,
+}
+#[derive(Iden, Clone)]
+enum GalleryPost {
+    Table,
+    Id,
+    FileIds,
+    Tags,
+}
+#[derive(Iden, Clone)]
+enum Hashtag {
+    Table,
+    Id,
+    MentionedUserIds,
+    MentionedLocalUserIds,
+    MentionedRemoteUserIds,
+    AttachedUserIds,
+    AttachedLocalUserIds,
+    AttachedRemoteUserIds,
+}
+#[derive(Iden, Clone)]
+enum MessagingMessage {
+    Table,
+    Id,
+    Reads,
+}
+#[derive(Iden, Clone)]
+enum Meta {
+    Table,
+    Id,
+    Langs,
+    HiddenTags,
+    BlockedHosts,
+    PinnedUsers,
+    PinnedPages,
+    RecommendedInstances,
+    SilencedHosts,
+}
+#[derive(Iden, Clone)]
+enum Note {
+    Table,
+    Id,
+    FileIds,
+    AttachedFileTypes,
+    VisibleUserIds,
+    Mentions,
+    Emojis,
+    Tags,
+}
+#[derive(Iden, Clone)]
+enum NoteEdit {
+    Table,
+    Id,
+    FileIds,
+}
+#[derive(Iden, Clone)]
+enum Page {
+    Table,
+    Id,
+    VisibleUserIds,
+}
+#[derive(Iden, Clone)]
+enum Poll {
+    Table,
+    NoteId,
+    Choices,
+    Votes, // I32Vec
+}
+#[derive(Iden, Clone)]
+enum RegistryItem {
+    Table,
+    Id,
+    Scope,
+}
+#[derive(Iden, Clone)]
+enum User {
+    Table,
+    Id,
+    Tags,
+    Emojis,
+}
+#[derive(Iden, Clone)]
+enum UserProfile {
+    Table,
+    Id,
+    MutingNotificationTypes,
+}
+#[derive(Iden, Clone)]
+enum Webhook {
+    Table,
+    Id,
+    On,
+}
+
+fn select_query<T: Iden + 'static>(table: T, id: T, col: T) -> String {
+    Query::select()
+        .column(id)
+        .column(col)
+        .from(table)
+        .to_string(PostgresQueryBuilder)
+}
+
+async fn get_vec<'a, T: TryGetable>(
+    db: &SchemaManagerConnection<'a>,
+    query: String,
+) -> Result<Vec<(String, T)>, DbErr> {
+    let res: Vec<(String, T)> = db
+        .query_all(Statement::from_string(DbBackend::Postgres, query))
+        .await?
+        .iter()
+        .filter_map(|r| r.try_get_many_by_index().ok())
+        .collect();
+    Ok(res)
+}
+
+async fn convert_col<'a, T: Iden + Clone + 'static>(
+    manager: &SchemaManager<'a>,
+    table: T,
+    col: T,
+) -> Result<(), DbErr> {
+    manager
+        .alter_table(
+            Table::alter()
+                .table(table)
+                .drop_column(col.to_owned())
+                .add_column(
+                    ColumnDef::new(col.to_owned())
+                        .json_binary()
+                        .not_null()
+                        .default(json!([])),
+                )
+                .to_owned(),
+        )
+        .await
+}
diff --git a/packages/backend/native-utils/crates/model/Cargo.toml b/packages/backend/native-utils/crates/model/Cargo.toml
index e99f8b561d..a511e6e997 100644
--- a/packages/backend/native-utils/crates/model/Cargo.toml
+++ b/packages/backend/native-utils/crates/model/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [features]
-default = ["legacy"]
-legacy = ["sea-orm/postgres-array"]
+default = []
+legacy = []
 
 [dependencies]
 async-trait = "0.1.68"
@@ -18,7 +18,7 @@ jsonschema = "0.17.0"
 once_cell = "1.17.1"
 parse-display = "0.8.0"
 schemars = { version = "0.8.12", features = ["chrono"] }
-sea-orm = { version = "0.11.3", features = ["sqlx-postgres", "sqlx-sqlite", "runtime-tokio-rustls"] }
+sea-orm = { version = "0.11.3", features = ["sqlx-postgres", "postgres-array", "sqlx-sqlite", "runtime-tokio-rustls"] }
 serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 thiserror = "1.0.40"
diff --git a/packages/backend/native-utils/crates/model/src/entity/mod.rs b/packages/backend/native-utils/crates/model/src/entity/mod.rs
index 6105b05550..d71057fdee 100644
--- a/packages/backend/native-utils/crates/model/src/entity/mod.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/mod.rs
@@ -53,8 +53,6 @@ pub mod registration_ticket;
 pub mod registry_item;
 pub mod relay;
 pub mod renote_muting;
-pub mod reversi_game;
-pub mod reversi_matching;
 pub mod sea_orm_active_enums;
 pub mod signin;
 pub mod sw_subscription;
diff --git a/packages/backend/native-utils/crates/model/src/entity/prelude.rs b/packages/backend/native-utils/crates/model/src/entity/prelude.rs
index 7cab688bb8..8be696cb40 100644
--- a/packages/backend/native-utils/crates/model/src/entity/prelude.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/prelude.rs
@@ -50,8 +50,6 @@ pub use super::registration_ticket::Entity as RegistrationTicket;
 pub use super::registry_item::Entity as RegistryItem;
 pub use super::relay::Entity as Relay;
 pub use super::renote_muting::Entity as RenoteMuting;
-pub use super::reversi_game::Entity as ReversiGame;
-pub use super::reversi_matching::Entity as ReversiMatching;
 pub use super::signin::Entity as Signin;
 pub use super::sw_subscription::Entity as SwSubscription;
 pub use super::used_username::Entity as UsedUsername;
diff --git a/packages/backend/native-utils/crates/model/src/entity/reversi_game.rs b/packages/backend/native-utils/crates/model/src/entity/reversi_game.rs
deleted file mode 100644
index 0c82fccf74..0000000000
--- a/packages/backend/native-utils/crates/model/src/entity/reversi_game.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
-
-use sea_orm::entity::prelude::*;
-
-use super::newtype::StringVec;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
-#[sea_orm(table_name = "reversi_game")]
-pub struct Model {
-    #[sea_orm(primary_key, auto_increment = false)]
-    pub id: String,
-    #[sea_orm(column_name = "createdAt")]
-    pub created_at: DateTimeWithTimeZone,
-    #[sea_orm(column_name = "startedAt")]
-    pub started_at: Option<DateTimeWithTimeZone>,
-    #[sea_orm(column_name = "user1Id")]
-    pub user1_id: String,
-    #[sea_orm(column_name = "user2Id")]
-    pub user2_id: String,
-    #[sea_orm(column_name = "user1Accepted")]
-    pub user1_accepted: bool,
-    #[sea_orm(column_name = "user2Accepted")]
-    pub user2_accepted: bool,
-    pub black: Option<i32>,
-    #[sea_orm(column_name = "isStarted")]
-    pub is_started: bool,
-    #[sea_orm(column_name = "isEnded")]
-    pub is_ended: bool,
-    #[sea_orm(column_name = "winnerId")]
-    pub winner_id: Option<String>,
-    pub surrendered: Option<String>,
-    #[sea_orm(column_type = "JsonBinary")]
-    pub logs: Json,
-    pub map: StringVec,
-    pub bw: String,
-    #[sea_orm(column_name = "isLlotheo")]
-    pub is_llotheo: bool,
-    #[sea_orm(column_name = "canPutEverywhere")]
-    pub can_put_everywhere: bool,
-    #[sea_orm(column_name = "loopedBoard")]
-    pub looped_board: bool,
-    #[sea_orm(column_type = "JsonBinary", nullable)]
-    pub form1: Option<Json>,
-    #[sea_orm(column_type = "JsonBinary", nullable)]
-    pub form2: Option<Json>,
-    pub crc32: Option<String>,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::User2Id",
-        to = "super::user::Column::Id",
-        on_update = "NoAction",
-        on_delete = "Cascade"
-    )]
-    User2,
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::User1Id",
-        to = "super::user::Column::Id",
-        on_update = "NoAction",
-        on_delete = "Cascade"
-    )]
-    User1,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/src/entity/reversi_matching.rs b/packages/backend/native-utils/crates/model/src/entity/reversi_matching.rs
deleted file mode 100644
index aafdf13f69..0000000000
--- a/packages/backend/native-utils/crates/model/src/entity/reversi_matching.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
-
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
-#[sea_orm(table_name = "reversi_matching")]
-pub struct Model {
-    #[sea_orm(primary_key, auto_increment = false)]
-    pub id: String,
-    #[sea_orm(column_name = "createdAt")]
-    pub created_at: DateTimeWithTimeZone,
-    #[sea_orm(column_name = "parentId")]
-    pub parent_id: String,
-    #[sea_orm(column_name = "childId")]
-    pub child_id: String,
-}
-
-#[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
-pub enum Relation {
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::ParentId",
-        to = "super::user::Column::Id",
-        on_update = "NoAction",
-        on_delete = "Cascade"
-    )]
-    User2,
-    #[sea_orm(
-        belongs_to = "super::user::Entity",
-        from = "Column::ChildId",
-        to = "super::user::Column::Id",
-        on_update = "NoAction",
-        on_delete = "Cascade"
-    )]
-    User1,
-}
-
-impl ActiveModelBehavior for ActiveModel {}
diff --git a/packages/backend/native-utils/crates/model/tests/common.rs b/packages/backend/native-utils/crates/model/tests/common.rs
index f05c4432dc..0fd32d8f96 100644
--- a/packages/backend/native-utils/crates/model/tests/common.rs
+++ b/packages/backend/native-utils/crates/model/tests/common.rs
@@ -31,7 +31,7 @@ async fn setup_schema(db: DbConn) {
     let stmt = schema.create_table_from_entity(antenna::Entity);
     db.execute(db.get_database_backend().build(&stmt))
         .await
-        .expect("Unable to initialize in-memoty sqlite");
+        .expect("Unable to setup schemas for in-memoty sqlite");
 }
 
 /// Delete all entries in the database.
@@ -101,9 +101,7 @@ async fn setup_model(db: &DbConn) {
 mod int_test {
     use sea_orm::Database;
 
-    use crate::setup_schema;
-
-    use super::{cleanup, prepare};
+    use super::{cleanup, prepare, setup_schema};
 
     #[tokio::test]
     async fn can_prepare_and_cleanup() {

From d28f74b5130406f38925fc358c1e969175ee355c Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Thu, 1 Jun 2023 04:06:31 -0400
Subject: [PATCH 232/319] fix primary key specifier

---
 .../src/m20230531_180824_stringvec.rs         | 104 +++++++++++-------
 1 file changed, 64 insertions(+), 40 deletions(-)

diff --git a/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs b/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs
index b7c0a70b3d..d9c54fd745 100644
--- a/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs
+++ b/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs
@@ -1,7 +1,7 @@
 use model::entity::{
     access_token, antenna, app, emoji, gallery_post, hashtag, messaging_message, meta,
     newtype::{I32Vec, StringVec},
-    note, note_edit, poll, registry_item, user, user_profile, webhook,
+    note, note_edit, page, poll, registry_item, user, user_profile, webhook,
 };
 use sea_orm_migration::{
     prelude::*,
@@ -181,37 +181,13 @@ impl MigrationTrait for Migration {
             note_edit,
             file_ids
         );
-
-        // Convert poll here because its primary key is not id, but note_id.
-        let query = select_query(Poll::Table, Poll::NoteId, Poll::Choices);
-        let res = get_vec::<Vec<String>>(db, query).await?;
-        convert_col(manager, Poll::Table, Poll::Choices).await?;
-        let poll_models: Vec<poll::ActiveModel> = res
-            .iter()
-            .map(|(id, r)| poll::ActiveModel {
-                note_id: sea_orm::Set(id.to_owned()),
-                choices: sea_orm::Set(StringVec::from(r.to_owned())),
-                ..Default::default()
-            })
-            .collect();
-        for model in poll_models {
-            poll::Entity::update(model).exec(db).await?;
-        }
-        let query = select_query(Poll::Table, Poll::NoteId, Poll::Votes);
-        let res = get_vec::<Vec<i32>>(db, query).await?;
-        convert_col(manager, Poll::Table, Poll::Votes).await?;
-        let poll_models: Vec<poll::ActiveModel> = res
-            .iter()
-            .map(|(id, r)| poll::ActiveModel {
-                note_id: sea_orm::Set(id.to_owned()),
-                votes: sea_orm::Set(I32Vec::from(r.to_owned())),
-                ..Default::default()
-            })
-            .collect();
-        for model in poll_models {
-            poll::Entity::update(model).exec(db).await?;
-        }
-
+        convert_to_stringvec_json!(
+            Page::Table,
+            Page::Id,
+            Page::VisibleUserIds,
+            page,
+            visible_user_ids
+        );
         convert_to_stringvec_json!(
             RegistryItem::Table,
             RegistryItem::Id,
@@ -221,15 +197,63 @@ impl MigrationTrait for Migration {
         );
         convert_to_stringvec_json!(User::Table, User::Id, User::Tags, user, tags);
         convert_to_stringvec_json!(User::Table, User::Id, User::Emojis, user, emojis);
-        convert_to_stringvec_json!(
-            UserProfile::Table,
-            UserProfile::Id,
-            UserProfile::MutingNotificationTypes,
-            user_profile,
-            muting_notification_types
-        );
         convert_to_stringvec_json!(Webhook::Table, Webhook::Id, Webhook::On, webhook, on);
 
+        // Convert poll here because its primary key is not id, but note_id.
+        let query = select_query(Poll::Table, Poll::NoteId, Poll::Choices);
+        let res = get_vec::<Vec<String>>(db, query).await?;
+        convert_col(manager, Poll::Table, Poll::Choices).await?;
+        let models: Vec<poll::ActiveModel> = res
+            .iter()
+            .map(|(id, r)| poll::ActiveModel {
+                note_id: sea_orm::Set(id.to_owned()),
+                choices: sea_orm::Set(StringVec::from(r.to_owned())),
+                ..Default::default()
+            })
+            .collect();
+        for model in models {
+            poll::Entity::update(model).exec(db).await?;
+        }
+        let query = select_query(Poll::Table, Poll::NoteId, Poll::Votes);
+        let res = get_vec::<Vec<i32>>(db, query).await?;
+        convert_col(manager, Poll::Table, Poll::Votes).await?;
+        let models: Vec<poll::ActiveModel> = res
+            .iter()
+            .map(|(id, r)| poll::ActiveModel {
+                note_id: sea_orm::Set(id.to_owned()),
+                votes: sea_orm::Set(I32Vec::from(r.to_owned())),
+                ..Default::default()
+            })
+            .collect();
+        for model in models {
+            poll::Entity::update(model).exec(db).await?;
+        }
+
+        // Convert user_profile here because its primary key is not id, but user_id.
+        let query = select_query(
+            UserProfile::Table,
+            UserProfile::UserId,
+            UserProfile::MutingNotificationTypes,
+        );
+        let res = get_vec::<Vec<String>>(db, query).await?;
+        convert_col(
+            manager,
+            UserProfile::Table,
+            UserProfile::MutingNotificationTypes,
+        )
+        .await?;
+        let models: Vec<user_profile::ActiveModel> = res
+            .iter()
+            .map(|(id, r)| user_profile::ActiveModel {
+                user_id: sea_orm::Set(id.to_owned()),
+                muting_notification_types: sea_orm::Set(StringVec::from(r.to_owned())),
+                ..Default::default()
+            })
+            .collect();
+        for model in models {
+            user_profile::Entity::update(model).exec(db).await?;
+        }
+
         Ok(())
     }
 
@@ -346,7 +370,7 @@ enum User {
 #[derive(Iden, Clone)]
 enum UserProfile {
     Table,
-    Id,
+    UserId,
     MutingNotificationTypes,
 }
 #[derive(Iden, Clone)]

From 3010ac9e745d16663e0fe75568728b2ee450de17 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Thu, 1 Jun 2023 04:24:45 -0400
Subject: [PATCH 233/319] use iden enum

---
 .../src/m20230531_180824_stringvec.rs          | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs b/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs
index d9c54fd745..e561e18d5c 100644
--- a/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs
+++ b/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs
@@ -16,13 +16,19 @@ pub struct Migration;
 impl MigrationTrait for Migration {
     async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
         manager
-            .drop_table(Table::drop().table(Alias::new("reversi_game")).to_owned())
+            .drop_table(
+                Table::drop()
+                    .if_exists()
+                    .table(ReversiGame::Table)
+                    .to_owned(),
+            )
             .await?;
 
         manager
             .drop_table(
                 Table::drop()
-                    .table(Alias::new("reversi_matching"))
+                    .if_exists()
+                    .table(ReversiMatching::Table)
                     .to_owned(),
             )
             .await?;
@@ -379,6 +385,14 @@ enum Webhook {
     Id,
     On,
 }
+#[derive(Iden)]
+enum ReversiGame {
+    Table,
+}
+#[derive(Iden)]
+enum ReversiMatching {
+    Table,
+}
 
 fn select_query<T: Iden + 'static>(table: T, id: T, col: T) -> String {
     Query::select()

From d9d2673939e1cae99fe6df9b061d50bbacb68c60 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Thu, 1 Jun 2023 12:32:15 -0400
Subject: [PATCH 234/319] use thread to copy data

---
 .../native-utils/crates/migration/Cargo.toml  |   7 +
 .../native-utils/crates/migration/src/lib.rs  |   4 +-
 .../src/m20230531_180824_drop_reversi.rs      |  49 ++
 .../src/m20230531_180824_stringvec.rs         | 437 ------------------
 .../native-utils/crates/migration/src/main.rs |   5 +
 .../crates/migration/src/vec_to_json.rs       | 279 +++++++++++
 6 files changed, 342 insertions(+), 439 deletions(-)
 create mode 100644 packages/backend/native-utils/crates/migration/src/m20230531_180824_drop_reversi.rs
 delete mode 100644 packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs
 create mode 100644 packages/backend/native-utils/crates/migration/src/vec_to_json.rs

diff --git a/packages/backend/native-utils/crates/migration/Cargo.toml b/packages/backend/native-utils/crates/migration/Cargo.toml
index 46108c68c5..49accc9a20 100644
--- a/packages/backend/native-utils/crates/migration/Cargo.toml
+++ b/packages/backend/native-utils/crates/migration/Cargo.toml
@@ -8,10 +8,17 @@ publish = false
 name = "migration"
 path = "src/lib.rs"
 
+[features]
+default = []
+convert = []
+
 [dependencies]
 async-std = { version = "1", features = ["attributes", "tokio1"] }
 serde_json = "1.0.96"
 model = { path = "../model" }
+indicatif = { version = "0.17.4", features = ["tokio"] }
+tokio = { version = "1.28.2", features = ["full"] }
+futures = "0.3.28"
 
 [dependencies.sea-orm-migration]
 version = "0.11.0"
diff --git a/packages/backend/native-utils/crates/migration/src/lib.rs b/packages/backend/native-utils/crates/migration/src/lib.rs
index a2a1b932f2..4835c2d3d7 100644
--- a/packages/backend/native-utils/crates/migration/src/lib.rs
+++ b/packages/backend/native-utils/crates/migration/src/lib.rs
@@ -1,12 +1,12 @@
 pub use sea_orm_migration::prelude::*;
 
-mod m20230531_180824_stringvec;
+mod m20230531_180824_drop_reversi;
 
 pub struct Migrator;
 
 #[async_trait::async_trait]
 impl MigratorTrait for Migrator {
     fn migrations() -> Vec<Box<dyn MigrationTrait>> {
-        vec![Box::new(m20230531_180824_stringvec::Migration)]
+        vec![Box::new(m20230531_180824_drop_reversi::Migration)]
     }
 }
diff --git a/packages/backend/native-utils/crates/migration/src/m20230531_180824_drop_reversi.rs b/packages/backend/native-utils/crates/migration/src/m20230531_180824_drop_reversi.rs
new file mode 100644
index 0000000000..c2726dd765
--- /dev/null
+++ b/packages/backend/native-utils/crates/migration/src/m20230531_180824_drop_reversi.rs
@@ -0,0 +1,49 @@
+use sea_orm_migration::{
+    prelude::*,
+    sea_orm::{DbBackend, Statement},
+};
+
+#[derive(DeriveMigrationName)]
+pub struct Migration;
+
+#[async_trait::async_trait]
+impl MigrationTrait for Migration {
+    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
+        if manager.get_database_backend() == DbBackend::Sqlite {
+            return Ok(());
+        }
+
+        let db = manager.get_connection();
+        db.query_one(Statement::from_string(
+            DbBackend::Postgres,
+            Table::drop()
+                .table(ReversiGame::Table)
+                .to_string(PostgresQueryBuilder),
+        ))
+        .await?;
+        db.query_one(Statement::from_string(
+            DbBackend::Postgres,
+            Table::drop()
+                .table(ReversiMatching::Table)
+                .to_string(PostgresQueryBuilder),
+        ))
+        .await?;
+
+        Ok(())
+    }
+
+    async fn down(&self, _manager: &SchemaManager) -> Result<(), DbErr> {
+        // Replace the sample below with your own migration scripts
+        Ok(())
+    }
+}
+
+/// Learn more at https://docs.rs/sea-query#iden
+#[derive(Iden)]
+enum ReversiGame {
+    Table,
+}
+#[derive(Iden)]
+enum ReversiMatching {
+    Table,
+}
diff --git a/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs b/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs
deleted file mode 100644
index e561e18d5c..0000000000
--- a/packages/backend/native-utils/crates/migration/src/m20230531_180824_stringvec.rs
+++ /dev/null
@@ -1,437 +0,0 @@
-use model::entity::{
-    access_token, antenna, app, emoji, gallery_post, hashtag, messaging_message, meta,
-    newtype::{I32Vec, StringVec},
-    note, note_edit, page, poll, registry_item, user, user_profile, webhook,
-};
-use sea_orm_migration::{
-    prelude::*,
-    sea_orm::{DbBackend, EntityTrait, Statement, TryGetable},
-};
-use serde_json::json;
-
-#[derive(DeriveMigrationName)]
-pub struct Migration;
-
-#[async_trait::async_trait]
-impl MigrationTrait for Migration {
-    async fn up(&self, manager: &SchemaManager) -> Result<(), DbErr> {
-        manager
-            .drop_table(
-                Table::drop()
-                    .if_exists()
-                    .table(ReversiGame::Table)
-                    .to_owned(),
-            )
-            .await?;
-
-        manager
-            .drop_table(
-                Table::drop()
-                    .if_exists()
-                    .table(ReversiMatching::Table)
-                    .to_owned(),
-            )
-            .await?;
-
-        if manager.get_database_backend() == DbBackend::Sqlite {
-            return Ok(());
-        }
-
-        let db = manager.get_connection();
-
-        macro_rules! copy_data {
-            ($data:ident, $ent:ident, $col:tt) => {
-                let models: Vec<$ent::ActiveModel> = $data
-                    .iter()
-                    .map(|(id, r)| $ent::ActiveModel {
-                        id: sea_orm::Set(id.to_owned()),
-                        $col: sea_orm::Set(StringVec::from(r.to_owned())),
-                        ..Default::default()
-                    })
-                    .collect();
-                for model in models {
-                    $ent::Entity::update(model).exec(db).await?;
-                }
-            };
-        }
-
-        macro_rules! convert_to_stringvec_json {
-            ($table:expr, $id:expr, $col:expr, $ent:ident, $col_name:tt) => {
-                let query = select_query($table, $id, $col);
-                let res = get_vec::<Vec<String>>(db, query).await?;
-                convert_col(manager, $table, $col).await?;
-                copy_data!(res, $ent, $col_name);
-            };
-        }
-
-        convert_to_stringvec_json!(
-            AccessToken::Table,
-            AccessToken::Id,
-            AccessToken::Permission,
-            access_token,
-            permission
-        );
-        convert_to_stringvec_json!(Antenna::Table, Antenna::Id, Antenna::Users, antenna, users);
-        convert_to_stringvec_json!(App::Table, App::Id, App::Permission, app, permission);
-        convert_to_stringvec_json!(Emoji::Table, Emoji::Id, Emoji::Aliases, emoji, aliases);
-        convert_to_stringvec_json!(
-            GalleryPost::Table,
-            GalleryPost::Id,
-            GalleryPost::FileIds,
-            gallery_post,
-            file_ids
-        );
-        convert_to_stringvec_json!(
-            GalleryPost::Table,
-            GalleryPost::Id,
-            GalleryPost::Tags,
-            gallery_post,
-            tags
-        );
-        convert_to_stringvec_json!(
-            Hashtag::Table,
-            Hashtag::Id,
-            Hashtag::MentionedUserIds,
-            hashtag,
-            mentioned_user_ids
-        );
-        convert_to_stringvec_json!(
-            Hashtag::Table,
-            Hashtag::Id,
-            Hashtag::MentionedLocalUserIds,
-            hashtag,
-            mentioned_local_user_ids
-        );
-        convert_to_stringvec_json!(
-            Hashtag::Table,
-            Hashtag::Id,
-            Hashtag::MentionedRemoteUserIds,
-            hashtag,
-            mentioned_remote_user_ids
-        );
-        convert_to_stringvec_json!(
-            Hashtag::Table,
-            Hashtag::Id,
-            Hashtag::AttachedUserIds,
-            hashtag,
-            attached_user_ids
-        );
-        convert_to_stringvec_json!(
-            Hashtag::Table,
-            Hashtag::Id,
-            Hashtag::AttachedLocalUserIds,
-            hashtag,
-            attached_local_user_ids
-        );
-        convert_to_stringvec_json!(
-            Hashtag::Table,
-            Hashtag::Id,
-            Hashtag::AttachedRemoteUserIds,
-            hashtag,
-            attached_remote_user_ids
-        );
-        convert_to_stringvec_json!(
-            MessagingMessage::Table,
-            MessagingMessage::Id,
-            MessagingMessage::Reads,
-            messaging_message,
-            reads
-        );
-        convert_to_stringvec_json!(Meta::Table, Meta::Id, Meta::Langs, meta, langs);
-        convert_to_stringvec_json!(
-            Meta::Table,
-            Meta::Id,
-            Meta::BlockedHosts,
-            meta,
-            blocked_hosts
-        );
-        convert_to_stringvec_json!(Meta::Table, Meta::Id, Meta::HiddenTags, meta, hidden_tags);
-        convert_to_stringvec_json!(Meta::Table, Meta::Id, Meta::PinnedUsers, meta, pinned_users);
-        convert_to_stringvec_json!(Meta::Table, Meta::Id, Meta::PinnedPages, meta, pinned_pages);
-        convert_to_stringvec_json!(
-            Meta::Table,
-            Meta::Id,
-            Meta::RecommendedInstances,
-            meta,
-            recommended_instances
-        );
-        convert_to_stringvec_json!(
-            Meta::Table,
-            Meta::Id,
-            Meta::SilencedHosts,
-            meta,
-            silenced_hosts
-        );
-        convert_to_stringvec_json!(Note::Table, Note::Id, Note::FileIds, note, file_ids);
-        convert_to_stringvec_json!(
-            Note::Table,
-            Note::Id,
-            Note::AttachedFileTypes,
-            note,
-            attached_file_types
-        );
-        convert_to_stringvec_json!(
-            Note::Table,
-            Note::Id,
-            Note::VisibleUserIds,
-            note,
-            visible_user_ids
-        );
-        convert_to_stringvec_json!(Note::Table, Note::Id, Note::Mentions, note, mentions);
-        convert_to_stringvec_json!(Note::Table, Note::Id, Note::Emojis, note, emojis);
-        convert_to_stringvec_json!(Note::Table, Note::Id, Note::Tags, note, tags);
-        convert_to_stringvec_json!(
-            NoteEdit::Table,
-            NoteEdit::Id,
-            NoteEdit::FileIds,
-            note_edit,
-            file_ids
-        );
-        convert_to_stringvec_json!(
-            Page::Table,
-            Page::Id,
-            Page::VisibleUserIds,
-            page,
-            visible_user_ids
-        );
-        convert_to_stringvec_json!(
-            RegistryItem::Table,
-            RegistryItem::Id,
-            RegistryItem::Scope,
-            registry_item,
-            scope
-        );
-        convert_to_stringvec_json!(User::Table, User::Id, User::Tags, user, tags);
-        convert_to_stringvec_json!(User::Table, User::Id, User::Emojis, user, emojis);
-        convert_to_stringvec_json!(Webhook::Table, Webhook::Id, Webhook::On, webhook, on);
-
-        // Convert poll here because its primary key is not id, but note_id.
-        let query = select_query(Poll::Table, Poll::NoteId, Poll::Choices);
-        let res = get_vec::<Vec<String>>(db, query).await?;
-        convert_col(manager, Poll::Table, Poll::Choices).await?;
-        let models: Vec<poll::ActiveModel> = res
-            .iter()
-            .map(|(id, r)| poll::ActiveModel {
-                note_id: sea_orm::Set(id.to_owned()),
-                choices: sea_orm::Set(StringVec::from(r.to_owned())),
-                ..Default::default()
-            })
-            .collect();
-        for model in models {
-            poll::Entity::update(model).exec(db).await?;
-        }
-        let query = select_query(Poll::Table, Poll::NoteId, Poll::Votes);
-        let res = get_vec::<Vec<i32>>(db, query).await?;
-        convert_col(manager, Poll::Table, Poll::Votes).await?;
-        let models: Vec<poll::ActiveModel> = res
-            .iter()
-            .map(|(id, r)| poll::ActiveModel {
-                note_id: sea_orm::Set(id.to_owned()),
-                votes: sea_orm::Set(I32Vec::from(r.to_owned())),
-                ..Default::default()
-            })
-            .collect();
-        for model in models {
-            poll::Entity::update(model).exec(db).await?;
-        }
-
-        // Convert user_profile here because its primary key is not id, but user_id.
-        let query = select_query(
-            UserProfile::Table,
-            UserProfile::UserId,
-            UserProfile::MutingNotificationTypes,
-        );
-        let res = get_vec::<Vec<String>>(db, query).await?;
-        convert_col(
-            manager,
-            UserProfile::Table,
-            UserProfile::MutingNotificationTypes,
-        )
-        .await?;
-        let models: Vec<user_profile::ActiveModel> = res
-            .iter()
-            .map(|(id, r)| user_profile::ActiveModel {
-                user_id: sea_orm::Set(id.to_owned()),
-                muting_notification_types: sea_orm::Set(StringVec::from(r.to_owned())),
-                ..Default::default()
-            })
-            .collect();
-        for model in models {
-            user_profile::Entity::update(model).exec(db).await?;
-        }
-
-        Ok(())
-    }
-
-    async fn down(&self, _manager: &SchemaManager) -> Result<(), DbErr> {
-        // Replace the sample below with your own migration scripts
-        Ok(())
-    }
-}
-
-/// Learn more at https://docs.rs/sea-query#iden
-#[derive(Iden, Clone)]
-enum Antenna {
-    Table,
-    Id,
-    Users,
-}
-#[derive(Iden, Clone)]
-enum AccessToken {
-    Table,
-    Id,
-    Permission,
-}
-#[derive(Iden, Clone)]
-enum App {
-    Table,
-    Id,
-    Permission,
-}
-#[derive(Iden, Clone)]
-enum Emoji {
-    Table,
-    Id,
-    Aliases,
-}
-#[derive(Iden, Clone)]
-enum GalleryPost {
-    Table,
-    Id,
-    FileIds,
-    Tags,
-}
-#[derive(Iden, Clone)]
-enum Hashtag {
-    Table,
-    Id,
-    MentionedUserIds,
-    MentionedLocalUserIds,
-    MentionedRemoteUserIds,
-    AttachedUserIds,
-    AttachedLocalUserIds,
-    AttachedRemoteUserIds,
-}
-#[derive(Iden, Clone)]
-enum MessagingMessage {
-    Table,
-    Id,
-    Reads,
-}
-#[derive(Iden, Clone)]
-enum Meta {
-    Table,
-    Id,
-    Langs,
-    HiddenTags,
-    BlockedHosts,
-    PinnedUsers,
-    PinnedPages,
-    RecommendedInstances,
-    SilencedHosts,
-}
-#[derive(Iden, Clone)]
-enum Note {
-    Table,
-    Id,
-    FileIds,
-    AttachedFileTypes,
-    VisibleUserIds,
-    Mentions,
-    Emojis,
-    Tags,
-}
-#[derive(Iden, Clone)]
-enum NoteEdit {
-    Table,
-    Id,
-    FileIds,
-}
-#[derive(Iden, Clone)]
-enum Page {
-    Table,
-    Id,
-    VisibleUserIds,
-}
-#[derive(Iden, Clone)]
-enum Poll {
-    Table,
-    NoteId,
-    Choices,
-    Votes, // I32Vec
-}
-#[derive(Iden, Clone)]
-enum RegistryItem {
-    Table,
-    Id,
-    Scope,
-}
-#[derive(Iden, Clone)]
-enum User {
-    Table,
-    Id,
-    Tags,
-    Emojis,
-}
-#[derive(Iden, Clone)]
-enum UserProfile {
-    Table,
-    UserId,
-    MutingNotificationTypes,
-}
-#[derive(Iden, Clone)]
-enum Webhook {
-    Table,
-    Id,
-    On,
-}
-#[derive(Iden)]
-enum ReversiGame {
-    Table,
-}
-#[derive(Iden)]
-enum ReversiMatching {
-    Table,
-}
-
-fn select_query<T: Iden + 'static>(table: T, id: T, col: T) -> String {
-    Query::select()
-        .column(id)
-        .column(col)
-        .from(table)
-        .to_string(PostgresQueryBuilder)
-}
-
-async fn get_vec<'a, T: TryGetable>(
-    db: &SchemaManagerConnection<'a>,
-    query: String,
-) -> Result<Vec<(String, T)>, DbErr> {
-    let res: Vec<(String, T)> = db
-        .query_all(Statement::from_string(DbBackend::Postgres, query))
-        .await?
-        .iter()
-        .filter_map(|r| r.try_get_many_by_index().ok())
-        .collect();
-    Ok(res)
-}
-
-async fn convert_col<'a, T: Iden + Clone + 'static>(
-    manager: &SchemaManager<'a>,
-    table: T,
-    col: T,
-) -> Result<(), DbErr> {
-    manager
-        .alter_table(
-            Table::alter()
-                .table(table)
-                .drop_column(col.to_owned())
-                .add_column(
-                    ColumnDef::new(col.to_owned())
-                        .json_binary()
-                        .not_null()
-                        .default(json!([])),
-                )
-                .to_owned(),
-        )
-        .await
-}
diff --git a/packages/backend/native-utils/crates/migration/src/main.rs b/packages/backend/native-utils/crates/migration/src/main.rs
index c6b6e48dbc..31a72026ee 100644
--- a/packages/backend/native-utils/crates/migration/src/main.rs
+++ b/packages/backend/native-utils/crates/migration/src/main.rs
@@ -1,6 +1,11 @@
 use sea_orm_migration::prelude::*;
 
+mod vec_to_json;
+
 #[async_std::main]
 async fn main() {
     cli::run_cli(migration::Migrator).await;
+
+    #[cfg(feature = "convert")]
+    vec_to_json::convert().await;
 }
diff --git a/packages/backend/native-utils/crates/migration/src/vec_to_json.rs b/packages/backend/native-utils/crates/migration/src/vec_to_json.rs
new file mode 100644
index 0000000000..eccd801149
--- /dev/null
+++ b/packages/backend/native-utils/crates/migration/src/vec_to_json.rs
@@ -0,0 +1,279 @@
+#![allow(dead_code)]
+
+use sea_orm_migration::{prelude::*, sea_orm::{DbConn, DbBackend, Statement, TryGetable, Database}};
+use serde_json::json;
+use std::time::Duration;
+use indicatif::{ProgressBar, ProgressStyle, MultiProgress};
+use model::entity::newtype::{I32Vec, StringVec};
+use std::env;
+
+pub async fn convert() {
+    let uri = env::var("DATABASE_URL").expect("Environment variable 'DATABASE_URL' not set");
+
+    let db = Database::connect(uri).await.expect("Unable to connect");
+    let mp = MultiProgress::new();
+
+    let handlers = vec![
+        tokio::spawn(to_json::<AccessToken, Vec<String>, StringVec>(db.clone(), mp.clone(), AccessToken::Table, AccessToken::Id, AccessToken::Permission)),
+        tokio::spawn(to_json::<Antenna, Vec<String>, StringVec>(db.clone(), mp.clone(), Antenna::Table, Antenna::Id, Antenna::Users)),
+        tokio::spawn(to_json::<App, Vec<String>, StringVec>(db.clone(), mp.clone(), App::Table, App::Id, App::Permission)),
+        tokio::spawn(to_json::<Emoji, Vec<String>, StringVec>(db.clone(), mp.clone(), Emoji::Table, Emoji::Id, Emoji::Aliases)),
+        tokio::spawn(to_json::<GalleryPost, Vec<String>, StringVec>(db.clone(), mp.clone(), GalleryPost::Table, GalleryPost::Id, GalleryPost::FileIds)),
+        tokio::spawn(to_json::<GalleryPost, Vec<String>, StringVec>(db.clone(), mp.clone(), GalleryPost::Table, GalleryPost::Id, GalleryPost::Tags)),
+        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(db.clone(), mp.clone(), Hashtag::Table, Hashtag::Id, Hashtag::MentionedUserIds)),
+        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(db.clone(), mp.clone(), Hashtag::Table, Hashtag::Id, Hashtag::MentionedLocalUserIds)),
+        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(db.clone(), mp.clone(), Hashtag::Table, Hashtag::Id, Hashtag::MentionedRemoteUserIds)),
+        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(db.clone(), mp.clone(), Hashtag::Table, Hashtag::Id, Hashtag::AttachedUserIds)),
+        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(db.clone(), mp.clone(), Hashtag::Table, Hashtag::Id, Hashtag::AttachedLocalUserIds)),
+        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(db.clone(), mp.clone(), Hashtag::Table, Hashtag::Id, Hashtag::AttachedRemoteUserIds)),
+        tokio::spawn(to_json::<MessagingMessage, Vec<String>, StringVec>(db.clone(), mp.clone(), MessagingMessage::Table, MessagingMessage::Id, MessagingMessage::Reads)),
+        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(db.clone(), mp.clone(), Meta::Table, Meta::Id, Meta::Langs)),
+        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(db.clone(), mp.clone(), Meta::Table, Meta::Id, Meta::BlockedHosts)),
+        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(db.clone(), mp.clone(), Meta::Table, Meta::Id, Meta::HiddenTags)),
+        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(db.clone(), mp.clone(), Meta::Table, Meta::Id, Meta::PinnedUsers)),
+        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(db.clone(), mp.clone(), Meta::Table, Meta::Id, Meta::PinnedPages)),
+        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(db.clone(), mp.clone(), Meta::Table, Meta::Id, Meta::RecommendedInstances)),
+        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(db.clone(), mp.clone(), Meta::Table, Meta::Id, Meta::SilencedHosts)),
+        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(db.clone(), mp.clone(), Note::Table, Note::Id, Note::FileIds)),
+        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(db.clone(), mp.clone(), Note::Table, Note::Id, Note::AttachedFileTypes)),
+        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(db.clone(), mp.clone(), Note::Table, Note::Id, Note::VisibleUserIds)),
+        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(db.clone(), mp.clone(), Note::Table, Note::Id, Note::Mentions)),
+        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(db.clone(), mp.clone(), Note::Table, Note::Id, Note::Emojis)),
+        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(db.clone(), mp.clone(), Note::Table, Note::Id, Note::Tags)),
+        tokio::spawn(to_json::<NoteEdit, Vec<String>, StringVec>(db.clone(), mp.clone(), NoteEdit::Table, NoteEdit::Id, NoteEdit::FileIds)),
+        tokio::spawn(to_json::<Page, Vec<String>, StringVec>(db.clone(), mp.clone(), Page::Table, Page::Id, Page::VisibleUserIds)),
+        tokio::spawn(to_json::<RegistryItem, Vec<String>, StringVec>(db.clone(), mp.clone(), RegistryItem::Table, RegistryItem::Id, RegistryItem::Scope)),
+        tokio::spawn(to_json::<User, Vec<String>, StringVec>(db.clone(), mp.clone(), User::Table, User::Id, User::Tags)),
+        tokio::spawn(to_json::<User, Vec<String>, StringVec>(db.clone(), mp.clone(), User::Table, User::Id, User::Emojis)),
+        tokio::spawn(to_json::<Webhook, Vec<String>, StringVec>(db.clone(), mp.clone(), Webhook::Table, Webhook::Id, Webhook::On)),
+        tokio::spawn(to_json::<Poll, Vec<String>, StringVec>(db.clone(), mp.clone(), Poll::Table, Poll::NoteId, Poll::Choices)),
+        tokio::spawn(to_json::<Poll, Vec<i32>, I32Vec>(db.clone(), mp.clone(), Poll::Table, Poll::NoteId, Poll::Votes)),
+        tokio::spawn(to_json::<UserProfile, Vec<String>, StringVec>(db.clone(), mp.clone(), UserProfile::Table, UserProfile::UserId, UserProfile::MutingNotificationTypes)),
+    ];
+
+    futures::future::join_all(handlers).await;
+}
+
+fn select_query<T: Iden + 'static>(table: T, id: T, col: T) -> String {
+    Query::select()
+        .column(id)
+        .column(col)
+        .from(table)
+        .to_string(PostgresQueryBuilder)
+}
+
+async fn get_vec<T: TryGetable>(
+    db: &DbConn,
+    query: String,
+) -> Result<Vec<(String, T)>, DbErr> {
+    let res: Vec<(String, T)> = db
+        .query_all(Statement::from_string(DbBackend::Postgres, query))
+        .await?
+        .iter()
+        .filter_map(|r| r.try_get_many_by_index().ok())
+        .collect();
+    Ok(res)
+}
+
+async fn convert_col<T: Iden + Clone + 'static>(
+    db: &DbConn,
+    table: T,
+    col: T,
+) -> Result<(), DbErr> {
+    let stmt = Table::alter()
+                .table(table)
+                .drop_column(col.to_owned())
+                .add_column(
+                    ColumnDef::new(col.to_owned())
+                        .json_binary()
+                        .not_null()
+                        .default(json!([])),
+                ).to_string(PostgresQueryBuilder);
+    db.query_one(Statement::from_string(DbBackend::Postgres, stmt)).await?;
+    Ok(())
+}
+
+async fn to_json<T, U, V>(
+    db: DbConn,
+    mp: MultiProgress,
+    table: T,
+    id: T,
+    col: T,
+) -> Result<(), DbErr>
+where
+    T: Iden + Clone + 'static,
+    U: TryGetable + Clone,
+    V: From<U> + Into<SimpleExpr>,
+{
+    let query = select_query(table.clone(), id.clone(), col.clone());
+    let loading = ProgressBar::new_spinner()
+        .with_style(ProgressStyle::with_template("{prefix} {msg} {spinner}").unwrap())
+        .with_prefix("[-]")
+        .with_message(format!("Loading data from {}.{}", table.to_string(), col.to_string()));
+    loading.enable_steady_tick(Duration::from_millis(100));
+    let loading = mp.add(loading);
+    let res = get_vec::<U>(&db, query).await?;
+    let models: Vec<(String, V)> = res
+        .iter()
+        .map(|(id, r)| (id.clone(), <V>::from(r.clone())))
+        .collect();
+    loading.finish_and_clear();
+    convert_col(&db, table.clone(), col.clone()).await?;
+
+    let progress = ProgressBar::new(models.len() as u64)
+        .with_style(ProgressStyle::with_template("{prefix} {msg} {wide_bar} {pos}/{len}").unwrap().progress_chars("##-"))
+        .with_prefix("[*]")
+        .with_message(format!("Copying {}.{}", table.to_string(), col.to_string()));
+    let progress = mp.add(progress);
+
+    for model in models {
+        progress.inc(1);
+        let q = Query::update()
+            .table(table.clone())
+            .values([(col.clone(), model.1.into())])
+            .and_where(Expr::col(id.clone()).eq(model.0))
+            .to_string(PostgresQueryBuilder);
+        db.query_one(Statement::from_string(DbBackend::Postgres, q))
+            .await?;
+    }
+    progress.finish_with_message(format!("Complete {}.{}", table.to_string(), col.to_string()));
+
+    Ok(())
+}
+
+#[derive(Iden, Clone)]
+enum AccessToken {
+    Table,
+    Id,
+    Permission,
+}
+#[derive(Iden, Clone)]
+enum Antenna {
+    Table,
+    Id,
+    Users,
+}
+#[derive(Iden, Clone)]
+enum App {
+    Table,
+    Id,
+    Permission,
+}
+#[derive(Iden, Clone)]
+enum Emoji {
+    Table,
+    Id,
+    Aliases,
+}
+#[derive(Iden, Clone)]
+enum GalleryPost {
+    Table,
+    Id,
+    #[iden = "fileIds"]
+    FileIds,
+    Tags,
+}
+#[derive(Iden, Clone)]
+enum Hashtag {
+    Table,
+    Id,
+    #[iden = "mentionedUserIds"]
+    MentionedUserIds,
+    #[iden = "mentionedLocalUserIds"]
+    MentionedLocalUserIds,
+    #[iden = "mentionedRemoteUserIds"]
+    MentionedRemoteUserIds,
+    #[iden = "attachedUserIds"]
+    AttachedUserIds,
+    #[iden = "attachedLocalUserIds"]
+    AttachedLocalUserIds,
+    #[iden = "attachedRemoteUserIds"]
+    AttachedRemoteUserIds,
+}
+#[derive(Iden, Clone)]
+enum MessagingMessage {
+    Table,
+    Id,
+    Reads,
+}
+#[derive(Iden, Clone)]
+enum Meta {
+    Table,
+    Id,
+    Langs,
+    #[iden = "hiddenTags"]
+    HiddenTags,
+    #[iden = "blockedHosts"]
+    BlockedHosts,
+    #[iden = "pinnedUsers"]
+    PinnedUsers,
+    #[iden = "pinnedPages"]
+    PinnedPages,
+    #[iden = "recommendedInstances"]
+    RecommendedInstances,
+    #[iden = "silencedHosts"]
+    SilencedHosts,
+}
+#[derive(Iden, Clone)]
+enum Note {
+    Table,
+    Id,
+    #[iden = "fileIds"]
+    FileIds,
+    #[iden = "attachedFileTypes"]
+    AttachedFileTypes,
+    #[iden = "visibleUserIds"]
+    VisibleUserIds,
+    Mentions,
+    Emojis,
+    Tags,
+}
+#[derive(Iden, Clone)]
+enum NoteEdit {
+    Table,
+    Id,
+    #[iden = "fileIds"]
+    FileIds,
+}
+#[derive(Iden, Clone)]
+enum Page {
+    Table,
+    Id,
+    #[iden = "visibleUserIds"]
+    VisibleUserIds,
+}
+#[derive(Iden, Clone)]
+enum Poll {
+    Table,
+    #[iden = "noteId"]
+    NoteId,
+    Choices,
+    Votes, // I32Vec
+}
+#[derive(Iden, Clone)]
+enum RegistryItem {
+    Table,
+    Id,
+    Scope,
+}
+#[derive(Iden, Clone)]
+enum User {
+    Table,
+    Id,
+    Tags,
+    Emojis,
+}
+#[derive(Iden, Clone)]
+enum UserProfile {
+    Table,
+    #[iden = "userId"]
+    UserId,
+    #[iden = "mutingNotificationTypes"]
+    MutingNotificationTypes,
+}
+#[derive(Iden, Clone)]
+enum Webhook {
+    Table,
+    Id,
+    On,
+}

From 193c75a2bb7be7a69e6abb29f3ccb26207d79e7c Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Thu, 1 Jun 2023 12:56:23 -0400
Subject: [PATCH 235/319] skip empty array

---
 .../crates/migration/src/vec_to_json.rs       | 335 +++++++++++++++---
 1 file changed, 278 insertions(+), 57 deletions(-)

diff --git a/packages/backend/native-utils/crates/migration/src/vec_to_json.rs b/packages/backend/native-utils/crates/migration/src/vec_to_json.rs
index eccd801149..c762dcf1cc 100644
--- a/packages/backend/native-utils/crates/migration/src/vec_to_json.rs
+++ b/packages/backend/native-utils/crates/migration/src/vec_to_json.rs
@@ -1,11 +1,14 @@
 #![allow(dead_code)]
 
-use sea_orm_migration::{prelude::*, sea_orm::{DbConn, DbBackend, Statement, TryGetable, Database}};
-use serde_json::json;
-use std::time::Duration;
-use indicatif::{ProgressBar, ProgressStyle, MultiProgress};
+use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
 use model::entity::newtype::{I32Vec, StringVec};
+use sea_orm_migration::{
+    prelude::*,
+    sea_orm::{Database, DbBackend, DbConn, Statement, TryGetable},
+};
+use serde_json::json;
 use std::env;
+use std::time::Duration;
 
 pub async fn convert() {
     let uri = env::var("DATABASE_URL").expect("Environment variable 'DATABASE_URL' not set");
@@ -14,41 +17,251 @@ pub async fn convert() {
     let mp = MultiProgress::new();
 
     let handlers = vec![
-        tokio::spawn(to_json::<AccessToken, Vec<String>, StringVec>(db.clone(), mp.clone(), AccessToken::Table, AccessToken::Id, AccessToken::Permission)),
-        tokio::spawn(to_json::<Antenna, Vec<String>, StringVec>(db.clone(), mp.clone(), Antenna::Table, Antenna::Id, Antenna::Users)),
-        tokio::spawn(to_json::<App, Vec<String>, StringVec>(db.clone(), mp.clone(), App::Table, App::Id, App::Permission)),
-        tokio::spawn(to_json::<Emoji, Vec<String>, StringVec>(db.clone(), mp.clone(), Emoji::Table, Emoji::Id, Emoji::Aliases)),
-        tokio::spawn(to_json::<GalleryPost, Vec<String>, StringVec>(db.clone(), mp.clone(), GalleryPost::Table, GalleryPost::Id, GalleryPost::FileIds)),
-        tokio::spawn(to_json::<GalleryPost, Vec<String>, StringVec>(db.clone(), mp.clone(), GalleryPost::Table, GalleryPost::Id, GalleryPost::Tags)),
-        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(db.clone(), mp.clone(), Hashtag::Table, Hashtag::Id, Hashtag::MentionedUserIds)),
-        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(db.clone(), mp.clone(), Hashtag::Table, Hashtag::Id, Hashtag::MentionedLocalUserIds)),
-        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(db.clone(), mp.clone(), Hashtag::Table, Hashtag::Id, Hashtag::MentionedRemoteUserIds)),
-        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(db.clone(), mp.clone(), Hashtag::Table, Hashtag::Id, Hashtag::AttachedUserIds)),
-        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(db.clone(), mp.clone(), Hashtag::Table, Hashtag::Id, Hashtag::AttachedLocalUserIds)),
-        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(db.clone(), mp.clone(), Hashtag::Table, Hashtag::Id, Hashtag::AttachedRemoteUserIds)),
-        tokio::spawn(to_json::<MessagingMessage, Vec<String>, StringVec>(db.clone(), mp.clone(), MessagingMessage::Table, MessagingMessage::Id, MessagingMessage::Reads)),
-        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(db.clone(), mp.clone(), Meta::Table, Meta::Id, Meta::Langs)),
-        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(db.clone(), mp.clone(), Meta::Table, Meta::Id, Meta::BlockedHosts)),
-        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(db.clone(), mp.clone(), Meta::Table, Meta::Id, Meta::HiddenTags)),
-        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(db.clone(), mp.clone(), Meta::Table, Meta::Id, Meta::PinnedUsers)),
-        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(db.clone(), mp.clone(), Meta::Table, Meta::Id, Meta::PinnedPages)),
-        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(db.clone(), mp.clone(), Meta::Table, Meta::Id, Meta::RecommendedInstances)),
-        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(db.clone(), mp.clone(), Meta::Table, Meta::Id, Meta::SilencedHosts)),
-        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(db.clone(), mp.clone(), Note::Table, Note::Id, Note::FileIds)),
-        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(db.clone(), mp.clone(), Note::Table, Note::Id, Note::AttachedFileTypes)),
-        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(db.clone(), mp.clone(), Note::Table, Note::Id, Note::VisibleUserIds)),
-        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(db.clone(), mp.clone(), Note::Table, Note::Id, Note::Mentions)),
-        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(db.clone(), mp.clone(), Note::Table, Note::Id, Note::Emojis)),
-        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(db.clone(), mp.clone(), Note::Table, Note::Id, Note::Tags)),
-        tokio::spawn(to_json::<NoteEdit, Vec<String>, StringVec>(db.clone(), mp.clone(), NoteEdit::Table, NoteEdit::Id, NoteEdit::FileIds)),
-        tokio::spawn(to_json::<Page, Vec<String>, StringVec>(db.clone(), mp.clone(), Page::Table, Page::Id, Page::VisibleUserIds)),
-        tokio::spawn(to_json::<RegistryItem, Vec<String>, StringVec>(db.clone(), mp.clone(), RegistryItem::Table, RegistryItem::Id, RegistryItem::Scope)),
-        tokio::spawn(to_json::<User, Vec<String>, StringVec>(db.clone(), mp.clone(), User::Table, User::Id, User::Tags)),
-        tokio::spawn(to_json::<User, Vec<String>, StringVec>(db.clone(), mp.clone(), User::Table, User::Id, User::Emojis)),
-        tokio::spawn(to_json::<Webhook, Vec<String>, StringVec>(db.clone(), mp.clone(), Webhook::Table, Webhook::Id, Webhook::On)),
-        tokio::spawn(to_json::<Poll, Vec<String>, StringVec>(db.clone(), mp.clone(), Poll::Table, Poll::NoteId, Poll::Choices)),
-        tokio::spawn(to_json::<Poll, Vec<i32>, I32Vec>(db.clone(), mp.clone(), Poll::Table, Poll::NoteId, Poll::Votes)),
-        tokio::spawn(to_json::<UserProfile, Vec<String>, StringVec>(db.clone(), mp.clone(), UserProfile::Table, UserProfile::UserId, UserProfile::MutingNotificationTypes)),
+        tokio::spawn(to_json::<AccessToken, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            AccessToken::Table,
+            AccessToken::Id,
+            AccessToken::Permission,
+        )),
+        tokio::spawn(to_json::<Antenna, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Antenna::Table,
+            Antenna::Id,
+            Antenna::Users,
+        )),
+        tokio::spawn(to_json::<App, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            App::Table,
+            App::Id,
+            App::Permission,
+        )),
+        tokio::spawn(to_json::<Emoji, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Emoji::Table,
+            Emoji::Id,
+            Emoji::Aliases,
+        )),
+        tokio::spawn(to_json::<GalleryPost, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            GalleryPost::Table,
+            GalleryPost::Id,
+            GalleryPost::FileIds,
+        )),
+        tokio::spawn(to_json::<GalleryPost, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            GalleryPost::Table,
+            GalleryPost::Id,
+            GalleryPost::Tags,
+        )),
+        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Hashtag::Table,
+            Hashtag::Id,
+            Hashtag::MentionedUserIds,
+        )),
+        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Hashtag::Table,
+            Hashtag::Id,
+            Hashtag::MentionedLocalUserIds,
+        )),
+        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Hashtag::Table,
+            Hashtag::Id,
+            Hashtag::MentionedRemoteUserIds,
+        )),
+        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Hashtag::Table,
+            Hashtag::Id,
+            Hashtag::AttachedUserIds,
+        )),
+        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Hashtag::Table,
+            Hashtag::Id,
+            Hashtag::AttachedLocalUserIds,
+        )),
+        tokio::spawn(to_json::<Hashtag, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Hashtag::Table,
+            Hashtag::Id,
+            Hashtag::AttachedRemoteUserIds,
+        )),
+        tokio::spawn(to_json::<MessagingMessage, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            MessagingMessage::Table,
+            MessagingMessage::Id,
+            MessagingMessage::Reads,
+        )),
+        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Meta::Table,
+            Meta::Id,
+            Meta::Langs,
+        )),
+        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Meta::Table,
+            Meta::Id,
+            Meta::BlockedHosts,
+        )),
+        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Meta::Table,
+            Meta::Id,
+            Meta::HiddenTags,
+        )),
+        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Meta::Table,
+            Meta::Id,
+            Meta::PinnedUsers,
+        )),
+        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Meta::Table,
+            Meta::Id,
+            Meta::PinnedPages,
+        )),
+        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Meta::Table,
+            Meta::Id,
+            Meta::RecommendedInstances,
+        )),
+        tokio::spawn(to_json::<Meta, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Meta::Table,
+            Meta::Id,
+            Meta::SilencedHosts,
+        )),
+        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Note::Table,
+            Note::Id,
+            Note::FileIds,
+        )),
+        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Note::Table,
+            Note::Id,
+            Note::AttachedFileTypes,
+        )),
+        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Note::Table,
+            Note::Id,
+            Note::VisibleUserIds,
+        )),
+        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Note::Table,
+            Note::Id,
+            Note::Mentions,
+        )),
+        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Note::Table,
+            Note::Id,
+            Note::Emojis,
+        )),
+        tokio::spawn(to_json::<Note, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Note::Table,
+            Note::Id,
+            Note::Tags,
+        )),
+        tokio::spawn(to_json::<NoteEdit, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            NoteEdit::Table,
+            NoteEdit::Id,
+            NoteEdit::FileIds,
+        )),
+        tokio::spawn(to_json::<Page, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Page::Table,
+            Page::Id,
+            Page::VisibleUserIds,
+        )),
+        tokio::spawn(to_json::<RegistryItem, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            RegistryItem::Table,
+            RegistryItem::Id,
+            RegistryItem::Scope,
+        )),
+        tokio::spawn(to_json::<User, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            User::Table,
+            User::Id,
+            User::Tags,
+        )),
+        tokio::spawn(to_json::<User, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            User::Table,
+            User::Id,
+            User::Emojis,
+        )),
+        tokio::spawn(to_json::<Webhook, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Webhook::Table,
+            Webhook::Id,
+            Webhook::On,
+        )),
+        tokio::spawn(to_json::<Poll, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            Poll::Table,
+            Poll::NoteId,
+            Poll::Choices,
+        )),
+        tokio::spawn(to_json::<Poll, Vec<i32>, I32Vec>(
+            db.clone(),
+            mp.clone(),
+            Poll::Table,
+            Poll::NoteId,
+            Poll::Votes,
+        )),
+        tokio::spawn(to_json::<UserProfile, Vec<String>, StringVec>(
+            db.clone(),
+            mp.clone(),
+            UserProfile::Table,
+            UserProfile::UserId,
+            UserProfile::MutingNotificationTypes,
+        )),
     ];
 
     futures::future::join_all(handlers).await;
@@ -62,10 +275,7 @@ fn select_query<T: Iden + 'static>(table: T, id: T, col: T) -> String {
         .to_string(PostgresQueryBuilder)
 }
 
-async fn get_vec<T: TryGetable>(
-    db: &DbConn,
-    query: String,
-) -> Result<Vec<(String, T)>, DbErr> {
+async fn get_vec<T: TryGetable>(db: &DbConn, query: String) -> Result<Vec<(String, T)>, DbErr> {
     let res: Vec<(String, T)> = db
         .query_all(Statement::from_string(DbBackend::Postgres, query))
         .await?
@@ -81,15 +291,17 @@ async fn convert_col<T: Iden + Clone + 'static>(
     col: T,
 ) -> Result<(), DbErr> {
     let stmt = Table::alter()
-                .table(table)
-                .drop_column(col.to_owned())
-                .add_column(
-                    ColumnDef::new(col.to_owned())
-                        .json_binary()
-                        .not_null()
-                        .default(json!([])),
-                ).to_string(PostgresQueryBuilder);
-    db.query_one(Statement::from_string(DbBackend::Postgres, stmt)).await?;
+        .table(table)
+        .drop_column(col.to_owned())
+        .add_column(
+            ColumnDef::new(col.to_owned())
+                .json_binary()
+                .not_null()
+                .default(json!([])),
+        )
+        .to_string(PostgresQueryBuilder);
+    db.query_one(Statement::from_string(DbBackend::Postgres, stmt))
+        .await?;
     Ok(())
 }
 
@@ -102,26 +314,35 @@ async fn to_json<T, U, V>(
 ) -> Result<(), DbErr>
 where
     T: Iden + Clone + 'static,
-    U: TryGetable + Clone,
+    U: TryGetable + IntoIterator + Clone,
     V: From<U> + Into<SimpleExpr>,
 {
     let query = select_query(table.clone(), id.clone(), col.clone());
     let loading = ProgressBar::new_spinner()
         .with_style(ProgressStyle::with_template("{prefix} {msg} {spinner}").unwrap())
         .with_prefix("[-]")
-        .with_message(format!("Loading data from {}.{}", table.to_string(), col.to_string()));
-    loading.enable_steady_tick(Duration::from_millis(100));
+        .with_message(format!(
+            "Loading data from {}.{}",
+            table.to_string(),
+            col.to_string()
+        ));
     let loading = mp.add(loading);
+    loading.enable_steady_tick(Duration::from_millis(100));
     let res = get_vec::<U>(&db, query).await?;
     let models: Vec<(String, V)> = res
         .iter()
+        .filter(|(_, r)| r.clone().into_iter().count() > 0)
         .map(|(id, r)| (id.clone(), <V>::from(r.clone())))
         .collect();
     loading.finish_and_clear();
     convert_col(&db, table.clone(), col.clone()).await?;
 
     let progress = ProgressBar::new(models.len() as u64)
-        .with_style(ProgressStyle::with_template("{prefix} {msg} {wide_bar} {pos}/{len}").unwrap().progress_chars("##-"))
+        .with_style(
+            ProgressStyle::with_template("{prefix} {msg} {wide_bar} {pos}/{len}")
+                .unwrap()
+                .progress_chars("##-"),
+        )
         .with_prefix("[*]")
         .with_message(format!("Copying {}.{}", table.to_string(), col.to_string()));
     let progress = mp.add(progress);
@@ -136,7 +357,7 @@ where
         db.query_one(Statement::from_string(DbBackend::Postgres, q))
             .await?;
     }
-    progress.finish_with_message(format!("Complete {}.{}", table.to_string(), col.to_string()));
+    progress.finish_with_message(format!("Done {}.{}", table.to_string(), col.to_string()));
 
     Ok(())
 }

From 3eb87c8f041e03ef771a5c266befe37ff1dfb074 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 01:10:23 -0400
Subject: [PATCH 236/319] rename feature

---
 packages/backend/native-utils/crates/migration/Cargo.toml | 2 +-
 packages/backend/native-utils/crates/model/Cargo.toml     | 2 +-
 .../native-utils/crates/model/src/entity/newtype/mod.rs   | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/backend/native-utils/crates/migration/Cargo.toml b/packages/backend/native-utils/crates/migration/Cargo.toml
index 49accc9a20..dbfd41be69 100644
--- a/packages/backend/native-utils/crates/migration/Cargo.toml
+++ b/packages/backend/native-utils/crates/migration/Cargo.toml
@@ -10,7 +10,7 @@ path = "src/lib.rs"
 
 [features]
 default = []
-convert = []
+convert = ["model/noarray"]
 
 [dependencies]
 async-std = { version = "1", features = ["attributes", "tokio1"] }
diff --git a/packages/backend/native-utils/crates/model/Cargo.toml b/packages/backend/native-utils/crates/model/Cargo.toml
index a511e6e997..e9a3260c42 100644
--- a/packages/backend/native-utils/crates/model/Cargo.toml
+++ b/packages/backend/native-utils/crates/model/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [features]
 default = []
-legacy = []
+noarray = []
 
 [dependencies]
 async-trait = "0.1.68"
diff --git a/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs b/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
index bd43024416..45aa175409 100644
--- a/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
@@ -20,11 +20,11 @@ pub struct JsonI32Vec(pub Vec<i32>);
 impl_json_newtype!(JsonI32Vec);
 
 cfg_if! {
-    if #[cfg(feature = "legacy")] {
-        pub type StringVec = Vec<String>;
-        pub type I32Vec = Vec<i32>;
-    } else {
+    if #[cfg(feature = "noarray")] {
         pub type StringVec = JsonStringVec;
         pub type I32Vec = JsonI32Vec;
+    } else {
+        pub type StringVec = Vec<String>;
+        pub type I32Vec = Vec<i32>;
     }
 }

From c9f31aef9bb443b4f6a8c04c03dae951eac13502 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 03:39:52 -0400
Subject: [PATCH 237/319] add default values

---
 .../model/src/entity/abuse_user_report.rs     |   2 +-
 .../crates/model/src/entity/access_token.rs   |   2 +-
 .../crates/model/src/entity/ad.rs             |   2 +-
 .../crates/model/src/entity/announcement.rs   |   2 +-
 .../model/src/entity/announcement_read.rs     |   2 +-
 .../crates/model/src/entity/antenna.rs        |   2 +-
 .../crates/model/src/entity/antenna_note.rs   |   2 +-
 .../crates/model/src/entity/app.rs            |   2 +-
 .../model/src/entity/attestation_challenge.rs |   2 +-
 .../crates/model/src/entity/auth_session.rs   |   2 +-
 .../crates/model/src/entity/blocking.rs       |   2 +-
 .../crates/model/src/entity/channel.rs        |   2 +-
 .../model/src/entity/channel_following.rs     |   2 +-
 .../model/src/entity/channel_note_pining.rs   |   2 +-
 .../crates/model/src/entity/clip.rs           |   2 +-
 .../crates/model/src/entity/clip_note.rs      |   2 +-
 .../crates/model/src/entity/drive_file.rs     |   2 +-
 .../crates/model/src/entity/drive_folder.rs   |   2 +-
 .../crates/model/src/entity/emoji.rs          |   2 +-
 .../crates/model/src/entity/follow_request.rs |   2 +-
 .../crates/model/src/entity/following.rs      |   2 +-
 .../crates/model/src/entity/gallery_like.rs   |   2 +-
 .../crates/model/src/entity/gallery_post.rs   |   2 +-
 .../crates/model/src/entity/hashtag.rs        |   2 +-
 .../crates/model/src/entity/instance.rs       |   2 +-
 .../model/src/entity/messaging_message.rs     |   2 +-
 .../crates/model/src/entity/meta.rs           |   2 +-
 .../crates/model/src/entity/migrations.rs     |   2 +-
 .../crates/model/src/entity/moderation_log.rs |   2 +-
 .../crates/model/src/entity/muted_note.rs     |   2 +-
 .../crates/model/src/entity/muting.rs         |   2 +-
 .../crates/model/src/entity/newtype/mod.rs    |   6 +-
 .../crates/model/src/entity/note.rs           |   2 +-
 .../crates/model/src/entity/note_edit.rs      |   2 +-
 .../crates/model/src/entity/note_favorite.rs  |   2 +-
 .../crates/model/src/entity/note_reaction.rs  |   2 +-
 .../model/src/entity/note_thread_muting.rs    |   2 +-
 .../crates/model/src/entity/note_unread.rs    |   2 +-
 .../crates/model/src/entity/note_watching.rs  |   2 +-
 .../crates/model/src/entity/notification.rs   |   2 +-
 .../crates/model/src/entity/page.rs           |   2 +-
 .../crates/model/src/entity/page_like.rs      |   2 +-
 .../src/entity/password_reset_request.rs      |   2 +-
 .../crates/model/src/entity/poll.rs           |   2 +-
 .../crates/model/src/entity/poll_vote.rs      |   2 +-
 .../crates/model/src/entity/promo_note.rs     |   2 +-
 .../crates/model/src/entity/promo_read.rs     |   2 +-
 .../model/src/entity/registration_ticket.rs   |   2 +-
 .../crates/model/src/entity/registry_item.rs  |   2 +-
 .../crates/model/src/entity/relay.rs          |   2 +-
 .../crates/model/src/entity/renote_muting.rs  |   2 +-
 .../model/src/entity/sea_orm_active_enums.rs  |  30 ++-
 .../crates/model/src/entity/signin.rs         |   2 +-
 .../model/src/entity/sw_subscription.rs       |   2 +-
 .../crates/model/src/entity/used_username.rs  |   2 +-
 .../crates/model/src/entity/user.rs           |   2 +-
 .../crates/model/src/entity/user_group.rs     |   2 +-
 .../model/src/entity/user_group_invitation.rs |   2 +-
 .../model/src/entity/user_group_invite.rs     |   2 +-
 .../model/src/entity/user_group_joining.rs    |   2 +-
 .../crates/model/src/entity/user_ip.rs        |   2 +-
 .../crates/model/src/entity/user_keypair.rs   |   2 +-
 .../crates/model/src/entity/user_list.rs      |   2 +-
 .../model/src/entity/user_list_joining.rs     |   2 +-
 .../model/src/entity/user_note_pining.rs      |   2 +-
 .../crates/model/src/entity/user_pending.rs   |   2 +-
 .../crates/model/src/entity/user_profile.rs   |   2 +-
 .../crates/model/src/entity/user_publickey.rs |   2 +-
 .../model/src/entity/user_security_key.rs     |   2 +-
 .../crates/model/src/entity/webhook.rs        |   2 +-
 .../native-utils/crates/model/tests/common.rs | 184 +++++++++++++-----
 71 files changed, 226 insertions(+), 130 deletions(-)

diff --git a/packages/backend/native-utils/crates/model/src/entity/abuse_user_report.rs b/packages/backend/native-utils/crates/model/src/entity/abuse_user_report.rs
index 270837973c..24230b3949 100644
--- a/packages/backend/native-utils/crates/model/src/entity/abuse_user_report.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/abuse_user_report.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "abuse_user_report")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/access_token.rs b/packages/backend/native-utils/crates/model/src/entity/access_token.rs
index f84971605f..dd9289224f 100644
--- a/packages/backend/native-utils/crates/model/src/entity/access_token.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/access_token.rs
@@ -4,7 +4,7 @@ use sea_orm::entity::prelude::*;
 
 use super::newtype::StringVec;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "access_token")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/ad.rs b/packages/backend/native-utils/crates/model/src/entity/ad.rs
index 708ed69ce7..2cf7a6fc87 100644
--- a/packages/backend/native-utils/crates/model/src/entity/ad.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/ad.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "ad")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/announcement.rs b/packages/backend/native-utils/crates/model/src/entity/announcement.rs
index 3e9b916879..e8a2a28aa8 100644
--- a/packages/backend/native-utils/crates/model/src/entity/announcement.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/announcement.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "announcement")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/announcement_read.rs b/packages/backend/native-utils/crates/model/src/entity/announcement_read.rs
index 7fc51d475e..53ff8d6cef 100644
--- a/packages/backend/native-utils/crates/model/src/entity/announcement_read.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/announcement_read.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "announcement_read")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/antenna.rs b/packages/backend/native-utils/crates/model/src/entity/antenna.rs
index 0ebd1cf45b..85bdfbfeac 100644
--- a/packages/backend/native-utils/crates/model/src/entity/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/antenna.rs
@@ -3,7 +3,7 @@
 use super::{newtype, sea_orm_active_enums::AntennaSrcEnum};
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "antenna")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/antenna_note.rs b/packages/backend/native-utils/crates/model/src/entity/antenna_note.rs
index d4c850bfce..c86fb349d4 100644
--- a/packages/backend/native-utils/crates/model/src/entity/antenna_note.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/antenna_note.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "antenna_note")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/app.rs b/packages/backend/native-utils/crates/model/src/entity/app.rs
index 3102945689..6400d0b24e 100644
--- a/packages/backend/native-utils/crates/model/src/entity/app.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/app.rs
@@ -4,7 +4,7 @@ use sea_orm::entity::prelude::*;
 
 use super::newtype::StringVec;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "app")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/attestation_challenge.rs b/packages/backend/native-utils/crates/model/src/entity/attestation_challenge.rs
index 135a4f1fb9..5217b2796d 100644
--- a/packages/backend/native-utils/crates/model/src/entity/attestation_challenge.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/attestation_challenge.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "attestation_challenge")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/auth_session.rs b/packages/backend/native-utils/crates/model/src/entity/auth_session.rs
index 83aecbaa65..8ced191c3b 100644
--- a/packages/backend/native-utils/crates/model/src/entity/auth_session.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/auth_session.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "auth_session")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/blocking.rs b/packages/backend/native-utils/crates/model/src/entity/blocking.rs
index 4667e60c68..4f326f6faa 100644
--- a/packages/backend/native-utils/crates/model/src/entity/blocking.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/blocking.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "blocking")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/channel.rs b/packages/backend/native-utils/crates/model/src/entity/channel.rs
index 9132d9d4e1..abc79b4f57 100644
--- a/packages/backend/native-utils/crates/model/src/entity/channel.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/channel.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "channel")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/channel_following.rs b/packages/backend/native-utils/crates/model/src/entity/channel_following.rs
index bd1b16dcee..93739459aa 100644
--- a/packages/backend/native-utils/crates/model/src/entity/channel_following.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/channel_following.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "channel_following")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/channel_note_pining.rs b/packages/backend/native-utils/crates/model/src/entity/channel_note_pining.rs
index 2c9089ac45..50ec1ecefb 100644
--- a/packages/backend/native-utils/crates/model/src/entity/channel_note_pining.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/channel_note_pining.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "channel_note_pining")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/clip.rs b/packages/backend/native-utils/crates/model/src/entity/clip.rs
index 209bd047e3..a51ef720ed 100644
--- a/packages/backend/native-utils/crates/model/src/entity/clip.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/clip.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "clip")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/clip_note.rs b/packages/backend/native-utils/crates/model/src/entity/clip_note.rs
index 953c5511cb..a8bfd4564c 100644
--- a/packages/backend/native-utils/crates/model/src/entity/clip_note.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/clip_note.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "clip_note")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/drive_file.rs b/packages/backend/native-utils/crates/model/src/entity/drive_file.rs
index abc191ba3a..7c42b98815 100644
--- a/packages/backend/native-utils/crates/model/src/entity/drive_file.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/drive_file.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "drive_file")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/drive_folder.rs b/packages/backend/native-utils/crates/model/src/entity/drive_folder.rs
index f0b7162835..98a9f89011 100644
--- a/packages/backend/native-utils/crates/model/src/entity/drive_folder.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/drive_folder.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "drive_folder")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/emoji.rs b/packages/backend/native-utils/crates/model/src/entity/emoji.rs
index fdb99a2c3f..00fc6184a8 100644
--- a/packages/backend/native-utils/crates/model/src/entity/emoji.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/emoji.rs
@@ -4,7 +4,7 @@ use sea_orm::entity::prelude::*;
 
 use super::newtype::StringVec;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "emoji")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/follow_request.rs b/packages/backend/native-utils/crates/model/src/entity/follow_request.rs
index af763baa6d..6f8b00b791 100644
--- a/packages/backend/native-utils/crates/model/src/entity/follow_request.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/follow_request.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "follow_request")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/following.rs b/packages/backend/native-utils/crates/model/src/entity/following.rs
index 087ca270b6..641e415300 100644
--- a/packages/backend/native-utils/crates/model/src/entity/following.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/following.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "following")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/gallery_like.rs b/packages/backend/native-utils/crates/model/src/entity/gallery_like.rs
index 186c92703d..e90dfedb36 100644
--- a/packages/backend/native-utils/crates/model/src/entity/gallery_like.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/gallery_like.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "gallery_like")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/gallery_post.rs b/packages/backend/native-utils/crates/model/src/entity/gallery_post.rs
index 875d3af589..7e53e6bf39 100644
--- a/packages/backend/native-utils/crates/model/src/entity/gallery_post.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/gallery_post.rs
@@ -4,7 +4,7 @@ use sea_orm::entity::prelude::*;
 
 use super::newtype::StringVec;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "gallery_post")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/hashtag.rs b/packages/backend/native-utils/crates/model/src/entity/hashtag.rs
index 917f4ea1b0..7a8722a5fd 100644
--- a/packages/backend/native-utils/crates/model/src/entity/hashtag.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/hashtag.rs
@@ -4,7 +4,7 @@ use sea_orm::entity::prelude::*;
 
 use super::newtype::StringVec;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "hashtag")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/instance.rs b/packages/backend/native-utils/crates/model/src/entity/instance.rs
index 3f3af2a5d8..fc9c5bf8b4 100644
--- a/packages/backend/native-utils/crates/model/src/entity/instance.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/instance.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "instance")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/messaging_message.rs b/packages/backend/native-utils/crates/model/src/entity/messaging_message.rs
index b66c01fc9b..8d7c7b8cc4 100644
--- a/packages/backend/native-utils/crates/model/src/entity/messaging_message.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/messaging_message.rs
@@ -4,7 +4,7 @@ use sea_orm::entity::prelude::*;
 
 use super::newtype::StringVec;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "messaging_message")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/meta.rs b/packages/backend/native-utils/crates/model/src/entity/meta.rs
index a97cb89c4d..2c0dc315c6 100644
--- a/packages/backend/native-utils/crates/model/src/entity/meta.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/meta.rs
@@ -6,7 +6,7 @@ use sea_orm::entity::prelude::*;
 
 use super::newtype::StringVec;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "meta")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/migrations.rs b/packages/backend/native-utils/crates/model/src/entity/migrations.rs
index c03df11802..54e44f2fdb 100644
--- a/packages/backend/native-utils/crates/model/src/entity/migrations.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/migrations.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "migrations")]
 pub struct Model {
     #[sea_orm(primary_key)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/moderation_log.rs b/packages/backend/native-utils/crates/model/src/entity/moderation_log.rs
index 3306853927..eb882b8964 100644
--- a/packages/backend/native-utils/crates/model/src/entity/moderation_log.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/moderation_log.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "moderation_log")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/muted_note.rs b/packages/backend/native-utils/crates/model/src/entity/muted_note.rs
index 1740e90783..2388985497 100644
--- a/packages/backend/native-utils/crates/model/src/entity/muted_note.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/muted_note.rs
@@ -3,7 +3,7 @@
 use super::sea_orm_active_enums::MutedNoteReasonEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "muted_note")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/muting.rs b/packages/backend/native-utils/crates/model/src/entity/muting.rs
index 83885034c6..7b46a0b246 100644
--- a/packages/backend/native-utils/crates/model/src/entity/muting.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/muting.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "muting")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs b/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
index 45aa175409..3dc2d7553d 100644
--- a/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
@@ -7,15 +7,15 @@ use serde::{Deserialize, Serialize};
 
 use crate::impl_json_newtype;
 
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, From, Into)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, From, Into, Default)]
 pub struct JsonKeyword(pub Vec<Vec<String>>);
 impl_json_newtype!(JsonKeyword);
 
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, From, Into)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, From, Into, Default)]
 pub struct JsonStringVec(pub Vec<String>);
 impl_json_newtype!(JsonStringVec);
 
-#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, From, Into)]
+#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, From, Into, Default)]
 pub struct JsonI32Vec(pub Vec<i32>);
 impl_json_newtype!(JsonI32Vec);
 
diff --git a/packages/backend/native-utils/crates/model/src/entity/note.rs b/packages/backend/native-utils/crates/model/src/entity/note.rs
index c2f20c11be..077841e48b 100644
--- a/packages/backend/native-utils/crates/model/src/entity/note.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/note.rs
@@ -5,7 +5,7 @@ use sea_orm::entity::prelude::*;
 
 use super::newtype::StringVec;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "note")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_edit.rs b/packages/backend/native-utils/crates/model/src/entity/note_edit.rs
index 4e8f420833..ea9b9eabd5 100644
--- a/packages/backend/native-utils/crates/model/src/entity/note_edit.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/note_edit.rs
@@ -4,7 +4,7 @@ use sea_orm::entity::prelude::*;
 
 use super::newtype::StringVec;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "note_edit")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_favorite.rs b/packages/backend/native-utils/crates/model/src/entity/note_favorite.rs
index 42f3c400f1..470ad55d26 100644
--- a/packages/backend/native-utils/crates/model/src/entity/note_favorite.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/note_favorite.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "note_favorite")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_reaction.rs b/packages/backend/native-utils/crates/model/src/entity/note_reaction.rs
index c740d994f5..a4e9f490dc 100644
--- a/packages/backend/native-utils/crates/model/src/entity/note_reaction.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/note_reaction.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "note_reaction")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_thread_muting.rs b/packages/backend/native-utils/crates/model/src/entity/note_thread_muting.rs
index f1dbfb5985..51688a0889 100644
--- a/packages/backend/native-utils/crates/model/src/entity/note_thread_muting.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/note_thread_muting.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "note_thread_muting")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_unread.rs b/packages/backend/native-utils/crates/model/src/entity/note_unread.rs
index 7468156113..a444eb35dd 100644
--- a/packages/backend/native-utils/crates/model/src/entity/note_unread.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/note_unread.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "note_unread")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_watching.rs b/packages/backend/native-utils/crates/model/src/entity/note_watching.rs
index 4a87a44950..962ef081e0 100644
--- a/packages/backend/native-utils/crates/model/src/entity/note_watching.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/note_watching.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "note_watching")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/notification.rs b/packages/backend/native-utils/crates/model/src/entity/notification.rs
index 4500e59d9f..896b6c2da3 100644
--- a/packages/backend/native-utils/crates/model/src/entity/notification.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/notification.rs
@@ -3,7 +3,7 @@
 use super::sea_orm_active_enums::NotificationTypeEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "notification")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/page.rs b/packages/backend/native-utils/crates/model/src/entity/page.rs
index c3d09fa8c2..dabb5c9f06 100644
--- a/packages/backend/native-utils/crates/model/src/entity/page.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/page.rs
@@ -5,7 +5,7 @@ use sea_orm::entity::prelude::*;
 
 use super::newtype::StringVec;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "page")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/page_like.rs b/packages/backend/native-utils/crates/model/src/entity/page_like.rs
index 3d3d2f3ac7..108b6b929f 100644
--- a/packages/backend/native-utils/crates/model/src/entity/page_like.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/page_like.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "page_like")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/password_reset_request.rs b/packages/backend/native-utils/crates/model/src/entity/password_reset_request.rs
index 3b24d70d90..45cc3de107 100644
--- a/packages/backend/native-utils/crates/model/src/entity/password_reset_request.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/password_reset_request.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "password_reset_request")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/poll.rs b/packages/backend/native-utils/crates/model/src/entity/poll.rs
index 81953cfbac..4d64594c76 100644
--- a/packages/backend/native-utils/crates/model/src/entity/poll.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/poll.rs
@@ -5,7 +5,7 @@ use sea_orm::entity::prelude::*;
 
 use super::newtype::{I32Vec, StringVec};
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "poll")]
 pub struct Model {
     #[sea_orm(column_name = "noteId", primary_key, auto_increment = false, unique)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/poll_vote.rs b/packages/backend/native-utils/crates/model/src/entity/poll_vote.rs
index 1b8b3ba1c0..bf26bf5dd5 100644
--- a/packages/backend/native-utils/crates/model/src/entity/poll_vote.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/poll_vote.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "poll_vote")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/promo_note.rs b/packages/backend/native-utils/crates/model/src/entity/promo_note.rs
index aa5eb2f3d1..288a0ea812 100644
--- a/packages/backend/native-utils/crates/model/src/entity/promo_note.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/promo_note.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "promo_note")]
 pub struct Model {
     #[sea_orm(column_name = "noteId", primary_key, auto_increment = false, unique)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/promo_read.rs b/packages/backend/native-utils/crates/model/src/entity/promo_read.rs
index d7dcacfb87..4e6224cf29 100644
--- a/packages/backend/native-utils/crates/model/src/entity/promo_read.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/promo_read.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "promo_read")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/registration_ticket.rs b/packages/backend/native-utils/crates/model/src/entity/registration_ticket.rs
index f71c87327b..798f19586f 100644
--- a/packages/backend/native-utils/crates/model/src/entity/registration_ticket.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/registration_ticket.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "registration_ticket")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/registry_item.rs b/packages/backend/native-utils/crates/model/src/entity/registry_item.rs
index 54d72d5d89..904c43abfe 100644
--- a/packages/backend/native-utils/crates/model/src/entity/registry_item.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/registry_item.rs
@@ -4,7 +4,7 @@ use sea_orm::entity::prelude::*;
 
 use super::newtype::StringVec;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "registry_item")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/relay.rs b/packages/backend/native-utils/crates/model/src/entity/relay.rs
index 736b48b780..bed89c849f 100644
--- a/packages/backend/native-utils/crates/model/src/entity/relay.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/relay.rs
@@ -3,7 +3,7 @@
 use super::sea_orm_active_enums::RelayStatusEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "relay")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/renote_muting.rs b/packages/backend/native-utils/crates/model/src/entity/renote_muting.rs
index b5e7d38f24..44751c14c5 100644
--- a/packages/backend/native-utils/crates/model/src/entity/renote_muting.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/renote_muting.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "renote_muting")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/sea_orm_active_enums.rs b/packages/backend/native-utils/crates/model/src/entity/sea_orm_active_enums.rs
index 14ef7002a2..f269952246 100644
--- a/packages/backend/native-utils/crates/model/src/entity/sea_orm_active_enums.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/sea_orm_active_enums.rs
@@ -2,9 +2,10 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Default)]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "antenna_src_enum")]
 pub enum AntennaSrcEnum {
+    #[default]
     #[sea_orm(string_value = "all")]
     All,
     #[sea_orm(string_value = "group")]
@@ -18,13 +19,14 @@ pub enum AntennaSrcEnum {
     #[sea_orm(string_value = "users")]
     Users,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Default)]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",
     enum_name = "meta_sensitivemediadetection_enum"
 )]
 pub enum MetaSensitivemediadetectionEnum {
+    #[default]
     #[sea_orm(string_value = "all")]
     All,
     #[sea_orm(string_value = "local")]
@@ -34,7 +36,7 @@ pub enum MetaSensitivemediadetectionEnum {
     #[sea_orm(string_value = "remote")]
     Remote,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Default)]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",
@@ -45,6 +47,7 @@ pub enum MetaSensitivemediadetectionsensitivityEnum {
     High,
     #[sea_orm(string_value = "low")]
     Low,
+    #[default]
     #[sea_orm(string_value = "medium")]
     Medium,
     #[sea_orm(string_value = "veryHigh")]
@@ -52,13 +55,14 @@ pub enum MetaSensitivemediadetectionsensitivityEnum {
     #[sea_orm(string_value = "veryLow")]
     VeryLow,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Default)]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",
     enum_name = "muted_note_reason_enum"
 )]
 pub enum MutedNoteReasonEnum {
+    #[default]
     #[sea_orm(string_value = "manual")]
     Manual,
     #[sea_orm(string_value = "other")]
@@ -68,7 +72,7 @@ pub enum MutedNoteReasonEnum {
     #[sea_orm(string_value = "word")]
     Word,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Default)]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",
@@ -81,12 +85,13 @@ pub enum NoteVisibilityEnum {
     Hidden,
     #[sea_orm(string_value = "home")]
     Home,
+    #[default]
     #[sea_orm(string_value = "public")]
     Public,
     #[sea_orm(string_value = "specified")]
     Specified,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Default)]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",
@@ -115,10 +120,11 @@ pub enum NotificationTypeEnum {
     ReceiveFollowRequest,
     #[sea_orm(string_value = "renote")]
     Renote,
+    #[default]
     #[sea_orm(string_value = "reply")]
     Reply,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Default)]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",
@@ -127,12 +133,13 @@ pub enum NotificationTypeEnum {
 pub enum PageVisibilityEnum {
     #[sea_orm(string_value = "followers")]
     Followers,
+    #[default]
     #[sea_orm(string_value = "public")]
     Public,
     #[sea_orm(string_value = "specified")]
     Specified,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Default)]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",
@@ -143,22 +150,24 @@ pub enum PollNotevisibilityEnum {
     Followers,
     #[sea_orm(string_value = "home")]
     Home,
+    #[default]
     #[sea_orm(string_value = "public")]
     Public,
     #[sea_orm(string_value = "specified")]
     Specified,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Default)]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "relay_status_enum")]
 pub enum RelayStatusEnum {
     #[sea_orm(string_value = "accepted")]
     Accepted,
     #[sea_orm(string_value = "rejected")]
     Rejected,
+    #[default]
     #[sea_orm(string_value = "requesting")]
     Requesting,
 }
-#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum, Default)]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",
@@ -169,6 +178,7 @@ pub enum UserProfileFfvisibilityEnum {
     Followers,
     #[sea_orm(string_value = "private")]
     Private,
+    #[default]
     #[sea_orm(string_value = "public")]
     Public,
 }
diff --git a/packages/backend/native-utils/crates/model/src/entity/signin.rs b/packages/backend/native-utils/crates/model/src/entity/signin.rs
index 6220973c11..60bbc33d20 100644
--- a/packages/backend/native-utils/crates/model/src/entity/signin.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/signin.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "signin")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/sw_subscription.rs b/packages/backend/native-utils/crates/model/src/entity/sw_subscription.rs
index eaa332d8c6..1be9e046a0 100644
--- a/packages/backend/native-utils/crates/model/src/entity/sw_subscription.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/sw_subscription.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "sw_subscription")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/used_username.rs b/packages/backend/native-utils/crates/model/src/entity/used_username.rs
index e9e8eb0978..620950b643 100644
--- a/packages/backend/native-utils/crates/model/src/entity/used_username.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/used_username.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "used_username")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user.rs b/packages/backend/native-utils/crates/model/src/entity/user.rs
index 1cf6ac6b7b..f30fd8ace8 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user.rs
@@ -4,7 +4,7 @@ use sea_orm::entity::prelude::*;
 
 use super::newtype::StringVec;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "user")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_group.rs b/packages/backend/native-utils/crates/model/src/entity/user_group.rs
index 680f78b9ed..74ee4f22fb 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_group.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_group.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "user_group")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_group_invitation.rs b/packages/backend/native-utils/crates/model/src/entity/user_group_invitation.rs
index 5a6f6f4a16..baa6fea83e 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_group_invitation.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_group_invitation.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "user_group_invitation")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_group_invite.rs b/packages/backend/native-utils/crates/model/src/entity/user_group_invite.rs
index 786dd1f315..dbbc055f01 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_group_invite.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_group_invite.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "user_group_invite")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_group_joining.rs b/packages/backend/native-utils/crates/model/src/entity/user_group_joining.rs
index 2baa0b9a72..e7741520cd 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_group_joining.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_group_joining.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "user_group_joining")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_ip.rs b/packages/backend/native-utils/crates/model/src/entity/user_ip.rs
index 872cfd860e..ce0af264d9 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_ip.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_ip.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "user_ip")]
 pub struct Model {
     #[sea_orm(primary_key)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_keypair.rs b/packages/backend/native-utils/crates/model/src/entity/user_keypair.rs
index df23b506b3..0382d5d768 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_keypair.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_keypair.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "user_keypair")]
 pub struct Model {
     #[sea_orm(column_name = "userId", primary_key, auto_increment = false, unique)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_list.rs b/packages/backend/native-utils/crates/model/src/entity/user_list.rs
index ff05f2c440..7cc972133a 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_list.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_list.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "user_list")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_list_joining.rs b/packages/backend/native-utils/crates/model/src/entity/user_list_joining.rs
index 27899a8c5f..4f28a21dba 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_list_joining.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_list_joining.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "user_list_joining")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_note_pining.rs b/packages/backend/native-utils/crates/model/src/entity/user_note_pining.rs
index bcb3ec8b02..e657fcb532 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_note_pining.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_note_pining.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "user_note_pining")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_pending.rs b/packages/backend/native-utils/crates/model/src/entity/user_pending.rs
index 1fb3b4fdcf..297fe553cc 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_pending.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_pending.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "user_pending")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_profile.rs b/packages/backend/native-utils/crates/model/src/entity/user_profile.rs
index d62607f162..4c2f903d4b 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_profile.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_profile.rs
@@ -5,7 +5,7 @@ use sea_orm::entity::prelude::*;
 
 use super::newtype::StringVec;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "user_profile")]
 pub struct Model {
     #[sea_orm(column_name = "userId", primary_key, auto_increment = false, unique)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_publickey.rs b/packages/backend/native-utils/crates/model/src/entity/user_publickey.rs
index c3c6dbf1f0..b1f426c5b0 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_publickey.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_publickey.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "user_publickey")]
 pub struct Model {
     #[sea_orm(column_name = "userId", primary_key, auto_increment = false, unique)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_security_key.rs b/packages/backend/native-utils/crates/model/src/entity/user_security_key.rs
index cbb31e1b0d..4bc9763365 100644
--- a/packages/backend/native-utils/crates/model/src/entity/user_security_key.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/user_security_key.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "user_security_key")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/src/entity/webhook.rs b/packages/backend/native-utils/crates/model/src/entity/webhook.rs
index dd3c3c7389..06ea1516b3 100644
--- a/packages/backend/native-utils/crates/model/src/entity/webhook.rs
+++ b/packages/backend/native-utils/crates/model/src/entity/webhook.rs
@@ -4,7 +4,7 @@ use sea_orm::entity::prelude::*;
 
 use super::newtype::StringVec;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
 #[sea_orm(table_name = "webhook")]
 pub struct Model {
     #[sea_orm(primary_key, auto_increment = false)]
diff --git a/packages/backend/native-utils/crates/model/tests/common.rs b/packages/backend/native-utils/crates/model/tests/common.rs
index 0fd32d8f96..add8c12b24 100644
--- a/packages/backend/native-utils/crates/model/tests/common.rs
+++ b/packages/backend/native-utils/crates/model/tests/common.rs
@@ -3,12 +3,12 @@ extern crate model;
 mod repository;
 
 use chrono::Utc;
-use model::entity::{antenna, sea_orm_active_enums::AntennaSrcEnum, user};
+use model::entity;
+use model::entity::sea_orm_active_enums::AntennaSrcEnum;
 use sea_orm::{
-    ActiveModelTrait, ActiveValue::Set, ConnectionTrait, DbBackend, DbConn, DbErr, EntityTrait,
-    TransactionTrait,
+    sea_query::TableCreateStatement, ActiveModelTrait, ConnectionTrait, DbBackend, DbConn, DbErr,
+    EntityTrait, IntoActiveModel, TransactionTrait,
 };
-use std::env;
 use util::{
     id::{create_id, init_id},
     random::gen_string,
@@ -16,31 +16,119 @@ use util::{
 
 /// Insert predefined entries in the database.
 async fn prepare() {
-    let conn_uri = env::var("DATABASE_URL")
-        .unwrap_or("postgres://calckey:calckey@localhost/calckey".to_string());
-    database::init_database(conn_uri)
+    database::init_database("sqlite::memory:")
         .await
         .expect("Unable to initialize database connection");
     let db = database::get_database().expect("Unable to get database connection from pool");
+    setup_schema(db).await;
     setup_model(db).await;
 }
 
-async fn setup_schema(db: DbConn) {
-    // Setup Schema helper
+/// Setup schemas in the database.
+async fn setup_schema(db: &DbConn) {
     let schema = sea_orm::Schema::new(DbBackend::Sqlite);
-    let stmt = schema.create_table_from_entity(antenna::Entity);
-    db.execute(db.get_database_backend().build(&stmt))
-        .await
-        .expect("Unable to setup schemas for in-memoty sqlite");
+    let mut stmts: Vec<TableCreateStatement> = Vec::new();
+    macro_rules! create_table_statement {
+        ($a:tt) => {
+            stmts.push(schema.create_table_from_entity(entity::$a::Entity).if_not_exists().to_owned());
+        };
+        ($a:tt, $($b:tt),+) => {
+            create_table_statement!($a);
+            create_table_statement!($($b),+);
+        };
+    }
+    create_table_statement!(
+        abuse_user_report,
+        access_token,
+        ad,
+        announcement_read,
+        announcement,
+        antenna_note,
+        antenna,
+        app,
+        attestation_challenge,
+        auth_session,
+        blocking,
+        channel_following,
+        channel_note_pining,
+        channel,
+        clip_note,
+        clip,
+        drive_file,
+        drive_folder,
+        emoji,
+        following,
+        follow_request,
+        gallery_like,
+        gallery_post,
+        hashtag,
+        instance,
+        messaging_message,
+        meta,
+        migrations,
+        moderation_log,
+        muted_note,
+        muting,
+        note_edit,
+        note_favorite,
+        note_reaction,
+        note,
+        note_thread_muting,
+        note_unread,
+        note_watching,
+        notification,
+        page_like,
+        page,
+        password_reset_request,
+        poll,
+        poll_vote,
+        promo_note,
+        promo_read,
+        registration_ticket,
+        registry_item,
+        relay,
+        renote_muting,
+        signin,
+        sw_subscription,
+        used_username,
+        user_group_invitation,
+        user_group_invite,
+        user_group_joining,
+        user_group,
+        user_ip,
+        user_keypair,
+        user_list_joining,
+        user_list,
+        user_note_pining,
+        user_pending,
+        user_profile,
+        user_publickey,
+        user,
+        user_security_key,
+        webhook
+    );
+    db.transaction::<_, (), DbErr>(|txn| {
+        Box::pin(async move {
+            for stmt in stmts {
+                txn.execute(txn.get_database_backend().build(&stmt)).await?;
+            }
+            Ok(())
+        })
+    })
+    .await
+    .expect("Unable to setup schemas");
 }
 
 /// Delete all entries in the database.
 async fn cleanup() {
-    let db = database::get_database().unwrap();
+    let db = database::get_database().expect("Unable to get database connection from pool");
     db.transaction::<_, (), DbErr>(|txn| {
         Box::pin(async move {
-            user::Entity::delete_many().exec(txn).await.unwrap();
-            antenna::Entity::delete_many().exec(txn).await.unwrap();
+            entity::user::Entity::delete_many().exec(txn).await.unwrap();
+            entity::antenna::Entity::delete_many()
+                .exec(txn)
+                .await
+                .unwrap();
 
             Ok(())
         })
@@ -56,40 +144,46 @@ async fn setup_model(db: &DbConn) {
         Box::pin(async move {
             let user_id = create_id().unwrap();
             let name = "Alice";
-            let user_model = user::ActiveModel {
-                id: Set(user_id.to_owned()),
-                created_at: Set(Utc::now().into()),
-                username: Set(name.to_lowercase().to_string()),
-                username_lower: Set(name.to_lowercase().to_string()),
-                name: Set(Some(name.to_string())),
-                token: Set(Some(gen_string(16))),
-                is_admin: Set(true),
+            let user_model = entity::user::Model {
+                id: user_id.to_owned(),
+                created_at: Utc::now().into(),
+                username: name.to_lowercase().to_string(),
+                username_lower: name.to_lowercase().to_string(),
+                name: Some(name.to_string()),
+                token: Some(gen_string(16)),
+                is_admin: true,
                 ..Default::default()
             };
-            user_model.insert(txn).await?;
-            let antenna_model = antenna::ActiveModel {
-                id: Set(create_id().unwrap()),
-                created_at: Set(Utc::now().into()),
-                user_id: Set(user_id.to_owned()),
-                name: Set("Test Antenna".to_string()),
-                src: Set(AntennaSrcEnum::All),
-                keywords: Set(vec![
+            user_model
+                .into_active_model()
+                .reset_all()
+                .insert(txn)
+                .await?;
+            let antenna_model = entity::antenna::Model {
+                id: create_id().unwrap(),
+                created_at: Utc::now().into(),
+                user_id: user_id.to_owned(),
+                name: "Test Antenna".to_string(),
+                src: AntennaSrcEnum::All,
+                keywords: vec![
                     vec!["foo".to_string(), "bar".to_string()],
                     vec!["foobar".to_string()],
                 ]
-                .into()),
-                exclude_keywords: Set(vec![
+                .into(),
+                exclude_keywords: vec![
                     vec!["abc".to_string()],
                     vec!["def".to_string(), "ghi".to_string()],
                 ]
-                .into()),
-                with_file: Set(false),
-                notify: Set(true),
-                case_sensitive: Set(true),
-                with_replies: Set(false),
+                .into(),
+                notify: true,
+                case_sensitive: true,
                 ..Default::default()
             };
-            antenna_model.insert(txn).await?;
+            antenna_model
+                .into_active_model()
+                .reset_all()
+                .insert(txn)
+                .await?;
 
             Ok(())
         })
@@ -99,19 +193,11 @@ async fn setup_model(db: &DbConn) {
 }
 
 mod int_test {
-    use sea_orm::Database;
-
-    use super::{cleanup, prepare, setup_schema};
+    use super::{cleanup, prepare};
 
     #[tokio::test]
     async fn can_prepare_and_cleanup() {
         prepare().await;
         cleanup().await;
     }
-
-    #[tokio::test]
-    async fn can_setup_sqlite_schema() {
-        let db = Database::connect("sqlite::memory:").await.unwrap();
-        setup_schema(db).await;
-    }
 }

From d0734ef4c93901f31b01322e88836babd0e6c536 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 04:34:49 -0400
Subject: [PATCH 238/319] add pack_by_id

---
 .../native-utils/crates/model/src/error.rs    |  4 +-
 .../crates/model/src/repository/antenna.rs    |  5 ++
 .../crates/model/src/repository/mod.rs        | 14 +++++
 .../crates/model/src/schema/mod.rs            |  2 +-
 .../crates/model/tests/repository/antenna.rs  | 60 ++++++++++---------
 5 files changed, 55 insertions(+), 30 deletions(-)

diff --git a/packages/backend/native-utils/crates/model/src/error.rs b/packages/backend/native-utils/crates/model/src/error.rs
index 7686312ec4..c90f3f5a32 100644
--- a/packages/backend/native-utils/crates/model/src/error.rs
+++ b/packages/backend/native-utils/crates/model/src/error.rs
@@ -5,5 +5,7 @@ pub enum Error {
     #[error("Failed to get database connection")]
     DbConnError(#[from] database::error::Error),
     #[error("Database operation error: {0}")]
-    DatabaseOperationError(#[from] sea_orm::DbErr),
+    DbOperationError(#[from] sea_orm::DbErr),
+    #[error("Requested entity not found")]
+    NotFound,
 }
diff --git a/packages/backend/native-utils/crates/model/src/repository/antenna.rs b/packages/backend/native-utils/crates/model/src/repository/antenna.rs
index f9ef012a6e..d3ad6ececb 100644
--- a/packages/backend/native-utils/crates/model/src/repository/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/repository/antenna.rs
@@ -5,6 +5,7 @@ use crate::entity::{antenna, antenna_note, user_group_joining};
 use crate::error::Error;
 use crate::schema::antenna::Antenna;
 
+use super::macros::impl_pack_by_id;
 use super::Repository;
 
 #[async_trait]
@@ -44,4 +45,8 @@ impl Repository<Antenna> for antenna::Model {
             has_unread_note,
         })
     }
+
+    async fn pack_by_id(id: String) -> Result<Antenna, Error> {
+        impl_pack_by_id!(antenna::Entity, id)
+    }
 }
diff --git a/packages/backend/native-utils/crates/model/src/repository/mod.rs b/packages/backend/native-utils/crates/model/src/repository/mod.rs
index 01e11412db..83573ab160 100644
--- a/packages/backend/native-utils/crates/model/src/repository/mod.rs
+++ b/packages/backend/native-utils/crates/model/src/repository/mod.rs
@@ -8,4 +8,18 @@ use crate::error::Error;
 #[async_trait]
 pub trait Repository<T: JsonSchema> {
     async fn pack(self) -> Result<T, Error>;
+    async fn pack_by_id(id: String) -> Result<T, Error>;
+}
+
+mod macros {
+    macro_rules! impl_pack_by_id {
+        ($a:ty, $b:ident) => {
+            match <$a>::find_by_id($b).one(database::get_database()?).await? {
+                None => Err(Error::NotFound),
+                Some(m) => m.pack().await,
+            }
+        };
+    }
+
+    pub(crate) use impl_pack_by_id;
 }
diff --git a/packages/backend/native-utils/crates/model/src/schema/mod.rs b/packages/backend/native-utils/crates/model/src/schema/mod.rs
index cc495aac1b..a647510200 100644
--- a/packages/backend/native-utils/crates/model/src/schema/mod.rs
+++ b/packages/backend/native-utils/crates/model/src/schema/mod.rs
@@ -6,7 +6,7 @@ use schemars::{schema_for, JsonSchema};
 
 /// Structs of schema defitions implement this trait in order to
 /// provide the JSON Schema validator [`jsonschema::JSONSchema`].
-trait Schema<T: JsonSchema> {
+pub trait Schema<T: JsonSchema> {
     /// Returns the validator of [JSON Schema Draft
     /// 7](https://json-schema.org/specification-links.html#draft-7) with the
     /// default settings of [`schemars::gen::SchemaSettings`].
diff --git a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
index e07a16c072..193efcba2b 100644
--- a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
+++ b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
@@ -29,34 +29,38 @@ mod int_test {
             .await
             .expect("Unable to pack");
 
-        assert_eq!(
-            packed,
-            schema::antenna::Antenna {
-                id: alice_antenna.id,
-                created_at: alice_antenna.created_at.into(),
-                name: "Test Antenna".to_string(),
-                keywords: vec![
-                    vec!["foo".to_string(), "bar".to_string()],
-                    vec!["foobar".to_string()]
-                ]
-                .into(),
-                exclude_keywords: vec![
-                    vec!["abc".to_string()],
-                    vec!["def".to_string(), "ghi".to_string()]
-                ]
-                .into(),
-                src: schema::antenna::AntennaSrc::All,
-                user_list_id: None,
-                user_group_id: None,
-                users: vec![].into(),
-                instances: vec![].into(),
-                case_sensitive: true,
-                notify: true,
-                with_replies: false,
-                with_file: false,
-                has_unread_note: false,
-            }
-        );
+        let packed_by_id = antenna::Model::pack_by_id(alice_antenna.id.to_owned())
+            .await
+            .expect("Unable to pack");
+
+        let result = schema::antenna::Antenna {
+            id: alice_antenna.id,
+            created_at: alice_antenna.created_at.into(),
+            name: "Test Antenna".to_string(),
+            keywords: vec![
+                vec!["foo".to_string(), "bar".to_string()],
+                vec!["foobar".to_string()],
+            ]
+            .into(),
+            exclude_keywords: vec![
+                vec!["abc".to_string()],
+                vec!["def".to_string(), "ghi".to_string()],
+            ]
+            .into(),
+            src: schema::antenna::AntennaSrc::All,
+            user_list_id: None,
+            user_group_id: None,
+            users: vec![].into(),
+            instances: vec![].into(),
+            case_sensitive: true,
+            notify: true,
+            with_replies: false,
+            with_file: false,
+            has_unread_note: false,
+        };
+
+        assert_eq!(packed, result);
+        assert_eq!(packed_by_id, result);
 
         cleanup().await;
     }

From e51deb379417a5bce6ac0f0f123c8c1ad4219a99 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 06:22:09 -0400
Subject: [PATCH 239/319] add napi schema

---
 .../native-utils/crates/model/Cargo.toml      |  5 ++
 .../model/src/{entity/mod.rs => entity.rs}    |  0
 .../src/{repository/mod.rs => repository.rs}  |  0
 .../crates/model/src/repository/antenna.rs    | 13 ++++-
 .../model/src/{schema/mod.rs => schema.rs}    | 12 +++++
 .../crates/model/src/schema/antenna.rs        |  6 +--
 .../crates/model/src/schema/napi.rs           |  1 +
 .../crates/model/src/schema/napi/antenna.rs   | 47 +++++++++++++++++++
 .../native-utils/crates/model/tests/common.rs |  2 +
 .../crates/model/tests/repository/antenna.rs  |  4 +-
 10 files changed, 83 insertions(+), 7 deletions(-)
 rename packages/backend/native-utils/crates/model/src/{entity/mod.rs => entity.rs} (100%)
 rename packages/backend/native-utils/crates/model/src/{repository/mod.rs => repository.rs} (100%)
 rename packages/backend/native-utils/crates/model/src/{schema/mod.rs => schema.rs} (75%)
 create mode 100644 packages/backend/native-utils/crates/model/src/schema/napi.rs
 create mode 100644 packages/backend/native-utils/crates/model/src/schema/napi/antenna.rs

diff --git a/packages/backend/native-utils/crates/model/Cargo.toml b/packages/backend/native-utils/crates/model/Cargo.toml
index e9a3260c42..c2002443d6 100644
--- a/packages/backend/native-utils/crates/model/Cargo.toml
+++ b/packages/backend/native-utils/crates/model/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 [features]
 default = []
 noarray = []
+napi = ["dep:napi", "dep:napi-derive"]
 
 [dependencies]
 async-trait = "0.1.68"
@@ -25,3 +26,7 @@ thiserror = "1.0.40"
 tokio = { version = "1.28.1", features = ["sync"] }
 util = { path = "../util" }
 utoipa = "3.3.0"
+
+# 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"], optional = true }
+napi-derive = { version = "2.12.0", optional = true }
diff --git a/packages/backend/native-utils/crates/model/src/entity/mod.rs b/packages/backend/native-utils/crates/model/src/entity.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/mod.rs
rename to packages/backend/native-utils/crates/model/src/entity.rs
diff --git a/packages/backend/native-utils/crates/model/src/repository/mod.rs b/packages/backend/native-utils/crates/model/src/repository.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/repository/mod.rs
rename to packages/backend/native-utils/crates/model/src/repository.rs
diff --git a/packages/backend/native-utils/crates/model/src/repository/antenna.rs b/packages/backend/native-utils/crates/model/src/repository/antenna.rs
index d3ad6ececb..c8324edd34 100644
--- a/packages/backend/native-utils/crates/model/src/repository/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/repository/antenna.rs
@@ -1,9 +1,10 @@
 use async_trait::async_trait;
+use cfg_if::cfg_if;
 use sea_orm::{ColumnTrait, EntityTrait, QueryFilter};
 
 use crate::entity::{antenna, antenna_note, user_group_joining};
 use crate::error::Error;
-use crate::schema::antenna::Antenna;
+use crate::schema::Antenna;
 
 use super::macros::impl_pack_by_id;
 use super::Repository;
@@ -27,9 +28,17 @@ impl Repository<Antenna> for antenna::Model {
             Some(m) => Some(m.user_group_id),
         };
 
+        cfg_if! {
+            if #[cfg(feature = "napi")] {
+                let created_at: String = self.created_at.to_rfc3339();
+            } else {
+                let created_at: chrono::DateTime<chrono::Utc> = self.created_at.into();
+            }
+        }
+
         Ok(Antenna {
             id: self.id,
-            created_at: self.created_at.into(),
+            created_at,
             name: self.name,
             keywords: self.keywords.into(),
             exclude_keywords: self.exclude_keywords.into(),
diff --git a/packages/backend/native-utils/crates/model/src/schema/mod.rs b/packages/backend/native-utils/crates/model/src/schema.rs
similarity index 75%
rename from packages/backend/native-utils/crates/model/src/schema/mod.rs
rename to packages/backend/native-utils/crates/model/src/schema.rs
index a647510200..78a0887fe4 100644
--- a/packages/backend/native-utils/crates/model/src/schema/mod.rs
+++ b/packages/backend/native-utils/crates/model/src/schema.rs
@@ -1,9 +1,21 @@
 pub mod antenna;
 pub mod app;
 
+use cfg_if::cfg_if;
 use jsonschema::JSONSchema;
 use schemars::{schema_for, JsonSchema};
 
+cfg_if! {
+    if #[cfg(feature = "napi")] {
+        mod napi;
+        pub use napi::antenna::Antenna;
+        pub use napi::antenna::AntennaSrc;
+    } else {
+        pub use antenna::Antenna;
+        pub use antenna::AntennaSrc;
+    }
+}
+
 /// Structs of schema defitions implement this trait in order to
 /// provide the JSON Schema validator [`jsonschema::JSONSchema`].
 pub trait Schema<T: JsonSchema> {
diff --git a/packages/backend/native-utils/crates/model/src/schema/antenna.rs b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
index fa7902b924..2f13a563d8 100644
--- a/packages/backend/native-utils/crates/model/src/schema/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
@@ -47,10 +47,10 @@ pub enum AntennaSrc {
 }
 
 impl TryFrom<AntennaSrcEnum> for AntennaSrc {
-    type Error = parse_display::ParseError;
+    type Error = crate::error::Error;
 
     fn try_from(value: AntennaSrcEnum) -> Result<Self, Self::Error> {
-        value.to_string().parse()
+        value.to_string().parse().map_err(crate::error::Error::from)
     }
 }
 
@@ -63,7 +63,7 @@ pub static VALIDATOR: Lazy<JSONSchema> = Lazy::new(|| Antenna::validator());
 mod unit_test {
     use serde_json::json;
 
-    use crate::{entity::sea_orm_active_enums::AntennaSrcEnum, schema::antenna::AntennaSrc};
+    use crate::{entity::sea_orm_active_enums::AntennaSrcEnum, schema::AntennaSrc};
 
     use super::VALIDATOR;
 
diff --git a/packages/backend/native-utils/crates/model/src/schema/napi.rs b/packages/backend/native-utils/crates/model/src/schema/napi.rs
new file mode 100644
index 0000000000..16130e4ccd
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/schema/napi.rs
@@ -0,0 +1 @@
+pub mod antenna;
diff --git a/packages/backend/native-utils/crates/model/src/schema/napi/antenna.rs b/packages/backend/native-utils/crates/model/src/schema/napi/antenna.rs
new file mode 100644
index 0000000000..cfba50d7f6
--- /dev/null
+++ b/packages/backend/native-utils/crates/model/src/schema/napi/antenna.rs
@@ -0,0 +1,47 @@
+use parse_display::FromStr;
+use schemars::JsonSchema;
+use utoipa::ToSchema;
+
+use napi::bindgen_prelude::{FromNapiValue, ToNapiValue};
+use napi_derive::napi;
+
+#[napi]
+#[derive(Clone, Debug, PartialEq, Eq, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct Antenna {
+    pub id: String,
+    pub created_at: String,
+    pub name: String,
+    pub keywords: Vec<Vec<String>>,
+    pub exclude_keywords: Vec<Vec<String>>,
+    #[schema(inline)]
+    pub src: AntennaSrc,
+    pub user_list_id: Option<String>,
+    pub user_group_id: Option<String>,
+    pub users: Vec<String>,
+    pub instances: Vec<String>,
+    #[serde(default)]
+    pub case_sensitive: bool,
+    #[serde(default)]
+    pub notify: bool,
+    #[serde(default)]
+    pub with_replies: bool,
+    #[serde(default)]
+    pub with_file: bool,
+    #[serde(default)]
+    pub has_unread_note: bool,
+}
+
+#[napi]
+#[derive(Debug, FromStr, PartialEq, Eq, JsonSchema, ToSchema)]
+#[serde(rename_all = "camelCase")]
+#[display(style = "camelCase")]
+#[display("'{}'")]
+pub enum AntennaSrc {
+    Home,
+    All,
+    Users,
+    List,
+    Group,
+    Instances,
+}
diff --git a/packages/backend/native-utils/crates/model/tests/common.rs b/packages/backend/native-utils/crates/model/tests/common.rs
index add8c12b24..554a8ca735 100644
--- a/packages/backend/native-utils/crates/model/tests/common.rs
+++ b/packages/backend/native-utils/crates/model/tests/common.rs
@@ -1,3 +1,5 @@
+#![cfg(not(feature = "napi"))]
+
 extern crate model;
 
 mod repository;
diff --git a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
index 193efcba2b..90732130a9 100644
--- a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
+++ b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
@@ -33,7 +33,7 @@ mod int_test {
             .await
             .expect("Unable to pack");
 
-        let result = schema::antenna::Antenna {
+        let result = schema::Antenna {
             id: alice_antenna.id,
             created_at: alice_antenna.created_at.into(),
             name: "Test Antenna".to_string(),
@@ -47,7 +47,7 @@ mod int_test {
                 vec!["def".to_string(), "ghi".to_string()],
             ]
             .into(),
-            src: schema::antenna::AntennaSrc::All,
+            src: schema::AntennaSrc::All,
             user_list_id: None,
             user_group_id: None,
             users: vec![].into(),

From 403e95b673fa5a4a03da7a03931d18f54db8e8f9 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 07:08:58 -0400
Subject: [PATCH 240/319] fix unit test

---
 .../native-utils/crates/model/Cargo.toml      |  5 +++-
 .../native-utils/crates/model/src/schema.rs   |  6 ++--
 .../crates/model/src/schema/antenna.rs        | 30 +++++++++++--------
 .../crates/model/src/schema/app.rs            |  4 +--
 .../crates/model/src/schema/napi/antenna.rs   |  5 ++--
 .../crates/model/tests/repository/antenna.rs  |  1 +
 .../native-utils/crates/util/Cargo.toml       |  3 ++
 .../native-utils/crates/util/src/id.rs        |  1 +
 .../native-utils/crates/util/src/random.rs    |  1 +
 9 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/packages/backend/native-utils/crates/model/Cargo.toml b/packages/backend/native-utils/crates/model/Cargo.toml
index c2002443d6..4925fb702f 100644
--- a/packages/backend/native-utils/crates/model/Cargo.toml
+++ b/packages/backend/native-utils/crates/model/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 [features]
-default = []
+default = ["napi"]
 noarray = []
 napi = ["dep:napi", "dep:napi-derive"]
 
@@ -30,3 +30,6 @@ utoipa = "3.3.0"
 # 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"], optional = true }
 napi-derive = { version = "2.12.0", optional = true }
+
+[dev-dependencies]
+pretty_assertions = "1.3.0"
diff --git a/packages/backend/native-utils/crates/model/src/schema.rs b/packages/backend/native-utils/crates/model/src/schema.rs
index 78a0887fe4..71f9348b32 100644
--- a/packages/backend/native-utils/crates/model/src/schema.rs
+++ b/packages/backend/native-utils/crates/model/src/schema.rs
@@ -8,11 +8,13 @@ use schemars::{schema_for, JsonSchema};
 cfg_if! {
     if #[cfg(feature = "napi")] {
         mod napi;
-        pub use napi::antenna::Antenna;
-        pub use napi::antenna::AntennaSrc;
+        pub use self::napi::antenna::Antenna;
+        pub use self::napi::antenna::AntennaSrc;
     } else {
         pub use antenna::Antenna;
         pub use antenna::AntennaSrc;
+        pub use app::App;
+        pub use app::AppPermission;
     }
 }
 
diff --git a/packages/backend/native-utils/crates/model/src/schema/antenna.rs b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
index 2f13a563d8..338998019c 100644
--- a/packages/backend/native-utils/crates/model/src/schema/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/schema/antenna.rs
@@ -46,7 +46,7 @@ pub enum AntennaSrc {
     Instances,
 }
 
-impl TryFrom<AntennaSrcEnum> for AntennaSrc {
+impl TryFrom<AntennaSrcEnum> for super::AntennaSrc {
     type Error = crate::error::Error;
 
     fn try_from(value: AntennaSrcEnum) -> Result<Self, Self::Error> {
@@ -55,12 +55,13 @@ impl TryFrom<AntennaSrcEnum> for AntennaSrc {
 }
 
 // ---- TODO: could be macro
-impl Schema<Self> for Antenna {}
-pub static VALIDATOR: Lazy<JSONSchema> = Lazy::new(|| Antenna::validator());
+impl Schema<Self> for super::Antenna {}
+pub static VALIDATOR: Lazy<JSONSchema> = Lazy::new(|| super::Antenna::validator());
 // ----
 
 #[cfg(test)]
 mod unit_test {
+    use pretty_assertions::assert_eq;
     use serde_json::json;
 
     use crate::{entity::sea_orm_active_enums::AntennaSrcEnum, schema::AntennaSrc};
@@ -128,20 +129,23 @@ mod unit_test {
         let result = VALIDATOR
             .validate(&instance)
             .expect_err("validation must fail");
-        let mut paths: Vec<String> = result.map(|e| e.schema_path.to_string()).collect();
+        let mut paths: Vec<String> = result
+            .map(|e| e.instance_path.to_string())
+            .filter(|e| !e.is_empty())
+            .collect();
         paths.sort();
         assert_eq!(
             paths,
             vec![
-                "/properties/caseSensitive/type",
-                "/properties/createdAt/format",
-                "/properties/excludeKeywords/type",
-                "/properties/id/type",
-                "/properties/keywords/type",
-                "/properties/src/enum",
-                "/properties/userListId/type",
-                "/properties/users/items/type",
-                "/required"
+                "/caseSensitive",
+                #[cfg(not(feature = "napi"))]
+                "/createdAt",
+                "/excludeKeywords",
+                "/id",
+                "/keywords",
+                "/src",
+                "/userListId",
+                "/users/0"
             ]
         );
     }
diff --git a/packages/backend/native-utils/crates/model/src/schema/app.rs b/packages/backend/native-utils/crates/model/src/schema/app.rs
index b45cad6d66..f24c1387be 100644
--- a/packages/backend/native-utils/crates/model/src/schema/app.rs
+++ b/packages/backend/native-utils/crates/model/src/schema/app.rs
@@ -13,14 +13,14 @@ pub struct App {
     #[schemars(url)]
     pub callback_url: Option<String>,
     #[schema(inline)]
-    pub permission: Vec<Permission>,
+    pub permission: Vec<AppPermission>,
     pub secret: Option<String>,
     pub is_authorized: Option<bool>,
 }
 
 /// This represents `permissions` in `packages/calckey-js/src/consts.ts`.
 #[derive(Clone, Debug, PartialEq, Eq, JsonSchema, ToSchema)]
-pub enum Permission {
+pub enum AppPermission {
     #[serde(rename = "read:account")]
     ReadAccount,
     #[serde(rename = "write:account")]
diff --git a/packages/backend/native-utils/crates/model/src/schema/napi/antenna.rs b/packages/backend/native-utils/crates/model/src/schema/napi/antenna.rs
index cfba50d7f6..ffb817c123 100644
--- a/packages/backend/native-utils/crates/model/src/schema/napi/antenna.rs
+++ b/packages/backend/native-utils/crates/model/src/schema/napi/antenna.rs
@@ -1,10 +1,9 @@
+use napi::bindgen_prelude::{FromNapiValue, ToNapiValue};
+use napi_derive::napi;
 use parse_display::FromStr;
 use schemars::JsonSchema;
 use utoipa::ToSchema;
 
-use napi::bindgen_prelude::{FromNapiValue, ToNapiValue};
-use napi_derive::napi;
-
 #[napi]
 #[derive(Clone, Debug, PartialEq, Eq, JsonSchema, ToSchema)]
 #[serde(rename_all = "camelCase")]
diff --git a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
index 90732130a9..2da1e59d44 100644
--- a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
+++ b/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
@@ -4,6 +4,7 @@ mod int_test {
         repository::Repository,
         schema,
     };
+    use pretty_assertions::assert_eq;
     use sea_orm::{ColumnTrait, EntityTrait, QueryFilter};
 
     use crate::{cleanup, prepare};
diff --git a/packages/backend/native-utils/crates/util/Cargo.toml b/packages/backend/native-utils/crates/util/Cargo.toml
index ad5486b4b6..6050342dd9 100644
--- a/packages/backend/native-utils/crates/util/Cargo.toml
+++ b/packages/backend/native-utils/crates/util/Cargo.toml
@@ -10,3 +10,6 @@ cuid2 = "0.1.0"
 once_cell = "1.17.1"
 rand = "0.8.5"
 thiserror = "1.0.40"
+
+[dev-dependencies]
+pretty_assertions = "1.3.0"
diff --git a/packages/backend/native-utils/crates/util/src/id.rs b/packages/backend/native-utils/crates/util/src/id.rs
index 2831ef79dd..d3c5809ea5 100644
--- a/packages/backend/native-utils/crates/util/src/id.rs
+++ b/packages/backend/native-utils/crates/util/src/id.rs
@@ -22,6 +22,7 @@ pub fn create_id() -> Result<String, ErrorUninitialized> {
 
 #[cfg(test)]
 mod unit_test {
+    use pretty_assertions::{assert_eq, assert_ne};
     use std::thread;
 
     use crate::id;
diff --git a/packages/backend/native-utils/crates/util/src/random.rs b/packages/backend/native-utils/crates/util/src/random.rs
index 1c4a20d50f..5ee06d1282 100644
--- a/packages/backend/native-utils/crates/util/src/random.rs
+++ b/packages/backend/native-utils/crates/util/src/random.rs
@@ -10,6 +10,7 @@ pub fn gen_string(length: u16) -> String {
 
 #[cfg(test)]
 mod unit_test {
+    use pretty_assertions::{assert_eq, assert_ne};
     use std::thread;
 
     use super::gen_string;

From 148dbbe56d578a8b0fbceb246f6588276cabce7b Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 08:48:12 -0400
Subject: [PATCH 241/319] move files out from crate

---
 packages/backend/native-utils/Cargo.toml      | 33 ++++++++++++++---
 .../native-utils/crates/database/Cargo.toml   | 12 -------
 .../native-utils/crates/model/Cargo.toml      | 35 -------------------
 .../native-utils/crates/util/Cargo.toml       | 15 --------
 .../{crates => }/migration/Cargo.toml         |  0
 .../{crates => }/migration/README.md          |  0
 .../{crates => }/migration/src/lib.rs         |  0
 .../src/m20230531_180824_drop_reversi.rs      |  0
 .../{crates => }/migration/src/main.rs        |  0
 .../{crates => }/migration/src/vec_to_json.rs |  0
 .../database/src => src/database}/error.rs    |  0
 .../src/lib.rs => src/database/mod.rs}        |  6 ++--
 packages/backend/native-utils/src/lib.rs      |  5 +++
 .../{crates/model/src => src/model}/entity.rs |  0
 .../model}/entity/abuse_user_report.rs        |  0
 .../src => src/model}/entity/access_token.rs  |  0
 .../model/src => src/model}/entity/ad.rs      |  0
 .../src => src/model}/entity/announcement.rs  |  0
 .../model}/entity/announcement_read.rs        |  0
 .../model/src => src/model}/entity/antenna.rs |  0
 .../src => src/model}/entity/antenna_note.rs  |  0
 .../model/src => src/model}/entity/app.rs     |  0
 .../model}/entity/attestation_challenge.rs    |  0
 .../src => src/model}/entity/auth_session.rs  |  0
 .../src => src/model}/entity/blocking.rs      |  0
 .../model/src => src/model}/entity/channel.rs |  0
 .../model}/entity/channel_following.rs        |  0
 .../model}/entity/channel_note_pining.rs      |  0
 .../model/src => src/model}/entity/clip.rs    |  0
 .../src => src/model}/entity/clip_note.rs     |  0
 .../src => src/model}/entity/drive_file.rs    |  0
 .../src => src/model}/entity/drive_folder.rs  |  0
 .../model/src => src/model}/entity/emoji.rs   |  0
 .../model}/entity/follow_request.rs           |  0
 .../src => src/model}/entity/following.rs     |  0
 .../src => src/model}/entity/gallery_like.rs  |  0
 .../src => src/model}/entity/gallery_post.rs  |  0
 .../model/src => src/model}/entity/hashtag.rs |  0
 .../src => src/model}/entity/instance.rs      |  0
 .../model}/entity/messaging_message.rs        |  0
 .../model/src => src/model}/entity/meta.rs    |  0
 .../src => src/model}/entity/migrations.rs    |  0
 .../model}/entity/moderation_log.rs           |  0
 .../src => src/model}/entity/muted_note.rs    |  0
 .../model/src => src/model}/entity/muting.rs  |  0
 .../model}/entity/newtype/macros.rs           |  0
 .../src => src/model}/entity/newtype/mod.rs   |  0
 .../model/src => src/model}/entity/note.rs    |  0
 .../src => src/model}/entity/note_edit.rs     |  0
 .../src => src/model}/entity/note_favorite.rs |  0
 .../src => src/model}/entity/note_reaction.rs |  0
 .../model}/entity/note_thread_muting.rs       |  0
 .../src => src/model}/entity/note_unread.rs   |  0
 .../src => src/model}/entity/note_watching.rs |  0
 .../src => src/model}/entity/notification.rs  |  0
 .../model/src => src/model}/entity/page.rs    |  0
 .../src => src/model}/entity/page_like.rs     |  0
 .../model}/entity/password_reset_request.rs   |  0
 .../model/src => src/model}/entity/poll.rs    |  0
 .../src => src/model}/entity/poll_vote.rs     |  0
 .../model/src => src/model}/entity/prelude.rs |  0
 .../src => src/model}/entity/promo_note.rs    |  0
 .../src => src/model}/entity/promo_read.rs    |  0
 .../model}/entity/registration_ticket.rs      |  0
 .../src => src/model}/entity/registry_item.rs |  0
 .../model/src => src/model}/entity/relay.rs   |  0
 .../src => src/model}/entity/renote_muting.rs |  0
 .../model}/entity/sea_orm_active_enums.rs     |  0
 .../model/src => src/model}/entity/signin.rs  |  0
 .../model}/entity/sw_subscription.rs          |  0
 .../src => src/model}/entity/used_username.rs |  0
 .../model/src => src/model}/entity/user.rs    |  0
 .../src => src/model}/entity/user_group.rs    |  0
 .../model}/entity/user_group_invitation.rs    |  0
 .../model}/entity/user_group_invite.rs        |  0
 .../model}/entity/user_group_joining.rs       |  0
 .../model/src => src/model}/entity/user_ip.rs |  0
 .../src => src/model}/entity/user_keypair.rs  |  0
 .../src => src/model}/entity/user_list.rs     |  0
 .../model}/entity/user_list_joining.rs        |  0
 .../model}/entity/user_note_pining.rs         |  0
 .../src => src/model}/entity/user_pending.rs  |  0
 .../src => src/model}/entity/user_profile.rs  |  0
 .../model}/entity/user_publickey.rs           |  0
 .../model}/entity/user_security_key.rs        |  0
 .../model/src => src/model}/entity/webhook.rs |  0
 .../{crates/model/src => src/model}/error.rs  |  9 ++++-
 .../model/src/lib.rs => src/model/mod.rs}     |  0
 .../model/src => src/model}/repository.rs     |  7 ++--
 .../src => src/model}/repository/antenna.rs   |  7 ++--
 .../{crates/model/src => src/model}/schema.rs |  0
 .../model/src => src/model}/schema/antenna.rs |  9 ++---
 .../model/src => src/model}/schema/app.rs     |  0
 .../model/src => src/model}/schema/napi.rs    |  0
 .../src => src/model}/schema/napi/antenna.rs  | 13 ++++++-
 .../{crates/util/src => src/util}/id.rs       |  2 +-
 .../util/src/lib.rs => src/util/mod.rs}       |  0
 .../{crates/util/src => src/util}/random.rs   |  0
 .../{crates/model => }/tests/common.rs        | 17 +++++----
 .../backend/native-utils/tests/model/mod.rs   |  1 +
 .../mod.rs => tests/model/repository.rs}      |  0
 .../model}/repository/antenna.rs              |  2 ++
 102 files changed, 82 insertions(+), 91 deletions(-)
 delete mode 100644 packages/backend/native-utils/crates/database/Cargo.toml
 delete mode 100644 packages/backend/native-utils/crates/model/Cargo.toml
 delete mode 100644 packages/backend/native-utils/crates/util/Cargo.toml
 rename packages/backend/native-utils/{crates => }/migration/Cargo.toml (100%)
 rename packages/backend/native-utils/{crates => }/migration/README.md (100%)
 rename packages/backend/native-utils/{crates => }/migration/src/lib.rs (100%)
 rename packages/backend/native-utils/{crates => }/migration/src/m20230531_180824_drop_reversi.rs (100%)
 rename packages/backend/native-utils/{crates => }/migration/src/main.rs (100%)
 rename packages/backend/native-utils/{crates => }/migration/src/vec_to_json.rs (100%)
 rename packages/backend/native-utils/{crates/database/src => src/database}/error.rs (100%)
 rename packages/backend/native-utils/{crates/database/src/lib.rs => src/database/mod.rs} (87%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/abuse_user_report.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/access_token.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/ad.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/announcement.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/announcement_read.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/antenna.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/antenna_note.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/app.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/attestation_challenge.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/auth_session.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/blocking.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/channel.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/channel_following.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/channel_note_pining.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/clip.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/clip_note.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/drive_file.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/drive_folder.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/emoji.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/follow_request.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/following.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/gallery_like.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/gallery_post.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/hashtag.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/instance.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/messaging_message.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/meta.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/migrations.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/moderation_log.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/muted_note.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/muting.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/newtype/macros.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/newtype/mod.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/note.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/note_edit.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/note_favorite.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/note_reaction.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/note_thread_muting.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/note_unread.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/note_watching.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/notification.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/page.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/page_like.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/password_reset_request.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/poll.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/poll_vote.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/prelude.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/promo_note.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/promo_read.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/registration_ticket.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/registry_item.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/relay.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/renote_muting.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/sea_orm_active_enums.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/signin.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/sw_subscription.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/used_username.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/user.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/user_group.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/user_group_invitation.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/user_group_invite.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/user_group_joining.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/user_ip.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/user_keypair.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/user_list.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/user_list_joining.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/user_note_pining.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/user_pending.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/user_profile.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/user_publickey.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/user_security_key.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/entity/webhook.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/error.rs (62%)
 rename packages/backend/native-utils/{crates/model/src/lib.rs => src/model/mod.rs} (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/repository.rs (75%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/repository/antenna.rs (92%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/schema.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/schema/antenna.rs (93%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/schema/app.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/schema/napi.rs (100%)
 rename packages/backend/native-utils/{crates/model/src => src/model}/schema/napi/antenna.rs (78%)
 rename packages/backend/native-utils/{crates/util/src => src/util}/id.rs (97%)
 rename packages/backend/native-utils/{crates/util/src/lib.rs => src/util/mod.rs} (100%)
 rename packages/backend/native-utils/{crates/util/src => src/util}/random.rs (100%)
 rename packages/backend/native-utils/{crates/model => }/tests/common.rs (96%)
 create mode 100644 packages/backend/native-utils/tests/model/mod.rs
 rename packages/backend/native-utils/{crates/model/tests/repository/mod.rs => tests/model/repository.rs} (100%)
 rename packages/backend/native-utils/{crates/model/tests => tests/model}/repository/antenna.rs (97%)

diff --git a/packages/backend/native-utils/Cargo.toml b/packages/backend/native-utils/Cargo.toml
index 6f3c0e23f8..3c70a0209b 100644
--- a/packages/backend/native-utils/Cargo.toml
+++ b/packages/backend/native-utils/Cargo.toml
@@ -4,15 +4,40 @@ name = "native-utils"
 version = "0.0.0"
 
 [workspace]
-members = ["crates/*"]
+members = ["migration/Cargo.toml"]
+
+[features]
+default = ["napi"]
+noarray = []
+napi = ["dep:napi", "dep:napi-derive"]
 
 [lib]
-crate-type = ["cdylib"]
+crate-type = ["cdylib", "lib"]
 
 [dependencies]
+async-trait = "0.1.68"
+cfg-if = "1.0.0"
+chrono = "0.4.24"
+cuid2 = "0.1.0"
+derive_more = "0.99.17"
+jsonschema = "0.17.0"
+once_cell = "1.17.1"
+parse-display = "0.8.0"
+rand = "0.8.5"
+schemars = { version = "0.8.12", features = ["chrono"] }
+sea-orm = { version = "0.11.3", features = ["sqlx-postgres", "postgres-array", "sqlx-sqlite", "runtime-tokio-rustls"] }
+serde = { version = "1.0.163", features = ["derive"] }
+serde_json = "1.0.96"
+thiserror = "1.0.40"
+tokio = { version = "1.28.1", features = ["full"] }
+utoipa = "3.3.0"
+
 # 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"
+napi = { version = "2.12.0", default-features = false, features = ["napi4", "tokio_rt"], optional = true }
+napi-derive = { version = "2.12.0", optional = true }
+
+[dev-dependencies]
+pretty_assertions = "1.3.0"
 
 [build-dependencies]
 napi-build = "2.0.1"
diff --git a/packages/backend/native-utils/crates/database/Cargo.toml b/packages/backend/native-utils/crates/database/Cargo.toml
deleted file mode 100644
index 440a76cf58..0000000000
--- a/packages/backend/native-utils/crates/database/Cargo.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[package]
-name = "database"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-once_cell = "1.17.1"
-sea-orm = { version = "0.11.3", features = ["sqlx-postgres", "runtime-tokio-rustls"] }
-thiserror = "1.0.40"
-tokio = { version = "1.28.1", features = ["macros"] }
diff --git a/packages/backend/native-utils/crates/model/Cargo.toml b/packages/backend/native-utils/crates/model/Cargo.toml
deleted file mode 100644
index 4925fb702f..0000000000
--- a/packages/backend/native-utils/crates/model/Cargo.toml
+++ /dev/null
@@ -1,35 +0,0 @@
-[package]
-name = "model"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-[features]
-default = ["napi"]
-noarray = []
-napi = ["dep:napi", "dep:napi-derive"]
-
-[dependencies]
-async-trait = "0.1.68"
-cfg-if = "1.0.0"
-chrono = "0.4.24"
-database = { path = "../database" }
-derive_more = "0.99.17"
-jsonschema = "0.17.0"
-once_cell = "1.17.1"
-parse-display = "0.8.0"
-schemars = { version = "0.8.12", features = ["chrono"] }
-sea-orm = { version = "0.11.3", features = ["sqlx-postgres", "postgres-array", "sqlx-sqlite", "runtime-tokio-rustls"] }
-serde = { version = "1.0.163", features = ["derive"] }
-serde_json = "1.0.96"
-thiserror = "1.0.40"
-tokio = { version = "1.28.1", features = ["sync"] }
-util = { path = "../util" }
-utoipa = "3.3.0"
-
-# 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"], optional = true }
-napi-derive = { version = "2.12.0", optional = true }
-
-[dev-dependencies]
-pretty_assertions = "1.3.0"
diff --git a/packages/backend/native-utils/crates/util/Cargo.toml b/packages/backend/native-utils/crates/util/Cargo.toml
deleted file mode 100644
index 6050342dd9..0000000000
--- a/packages/backend/native-utils/crates/util/Cargo.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-[package]
-name = "util"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-cuid2 = "0.1.0"
-once_cell = "1.17.1"
-rand = "0.8.5"
-thiserror = "1.0.40"
-
-[dev-dependencies]
-pretty_assertions = "1.3.0"
diff --git a/packages/backend/native-utils/crates/migration/Cargo.toml b/packages/backend/native-utils/migration/Cargo.toml
similarity index 100%
rename from packages/backend/native-utils/crates/migration/Cargo.toml
rename to packages/backend/native-utils/migration/Cargo.toml
diff --git a/packages/backend/native-utils/crates/migration/README.md b/packages/backend/native-utils/migration/README.md
similarity index 100%
rename from packages/backend/native-utils/crates/migration/README.md
rename to packages/backend/native-utils/migration/README.md
diff --git a/packages/backend/native-utils/crates/migration/src/lib.rs b/packages/backend/native-utils/migration/src/lib.rs
similarity index 100%
rename from packages/backend/native-utils/crates/migration/src/lib.rs
rename to packages/backend/native-utils/migration/src/lib.rs
diff --git a/packages/backend/native-utils/crates/migration/src/m20230531_180824_drop_reversi.rs b/packages/backend/native-utils/migration/src/m20230531_180824_drop_reversi.rs
similarity index 100%
rename from packages/backend/native-utils/crates/migration/src/m20230531_180824_drop_reversi.rs
rename to packages/backend/native-utils/migration/src/m20230531_180824_drop_reversi.rs
diff --git a/packages/backend/native-utils/crates/migration/src/main.rs b/packages/backend/native-utils/migration/src/main.rs
similarity index 100%
rename from packages/backend/native-utils/crates/migration/src/main.rs
rename to packages/backend/native-utils/migration/src/main.rs
diff --git a/packages/backend/native-utils/crates/migration/src/vec_to_json.rs b/packages/backend/native-utils/migration/src/vec_to_json.rs
similarity index 100%
rename from packages/backend/native-utils/crates/migration/src/vec_to_json.rs
rename to packages/backend/native-utils/migration/src/vec_to_json.rs
diff --git a/packages/backend/native-utils/crates/database/src/error.rs b/packages/backend/native-utils/src/database/error.rs
similarity index 100%
rename from packages/backend/native-utils/crates/database/src/error.rs
rename to packages/backend/native-utils/src/database/error.rs
diff --git a/packages/backend/native-utils/crates/database/src/lib.rs b/packages/backend/native-utils/src/database/mod.rs
similarity index 87%
rename from packages/backend/native-utils/crates/database/src/lib.rs
rename to packages/backend/native-utils/src/database/mod.rs
index 0012d2292f..c3cdea7278 100644
--- a/packages/backend/native-utils/crates/database/src/lib.rs
+++ b/packages/backend/native-utils/src/database/mod.rs
@@ -1,9 +1,8 @@
 pub mod error;
 
+use error::Error;
 use sea_orm::{Database, DbConn};
 
-use crate::error::Error;
-
 static DB_CONN: once_cell::sync::OnceCell<DbConn> = once_cell::sync::OnceCell::new();
 
 pub async fn init_database(connection_uri: impl Into<String>) -> Result<(), Error> {
@@ -18,8 +17,7 @@ pub fn get_database() -> Result<&'static DbConn, Error> {
 
 #[cfg(test)]
 mod unit_test {
-    use super::get_database;
-    use crate::error::Error;
+    use super::{error::Error, get_database};
 
     #[test]
     fn error_uninitialized() {
diff --git a/packages/backend/native-utils/src/lib.rs b/packages/backend/native-utils/src/lib.rs
index e131901406..6a5e3f7f2c 100644
--- a/packages/backend/native-utils/src/lib.rs
+++ b/packages/backend/native-utils/src/lib.rs
@@ -1 +1,6 @@
+pub mod database;
+pub mod model;
+pub mod util;
+
+#[cfg(feature = "napi")]
 pub mod mastodon_api;
diff --git a/packages/backend/native-utils/crates/model/src/entity.rs b/packages/backend/native-utils/src/model/entity.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity.rs
rename to packages/backend/native-utils/src/model/entity.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/abuse_user_report.rs b/packages/backend/native-utils/src/model/entity/abuse_user_report.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/abuse_user_report.rs
rename to packages/backend/native-utils/src/model/entity/abuse_user_report.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/access_token.rs b/packages/backend/native-utils/src/model/entity/access_token.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/access_token.rs
rename to packages/backend/native-utils/src/model/entity/access_token.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/ad.rs b/packages/backend/native-utils/src/model/entity/ad.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/ad.rs
rename to packages/backend/native-utils/src/model/entity/ad.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/announcement.rs b/packages/backend/native-utils/src/model/entity/announcement.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/announcement.rs
rename to packages/backend/native-utils/src/model/entity/announcement.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/announcement_read.rs b/packages/backend/native-utils/src/model/entity/announcement_read.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/announcement_read.rs
rename to packages/backend/native-utils/src/model/entity/announcement_read.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/antenna.rs b/packages/backend/native-utils/src/model/entity/antenna.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/antenna.rs
rename to packages/backend/native-utils/src/model/entity/antenna.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/antenna_note.rs b/packages/backend/native-utils/src/model/entity/antenna_note.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/antenna_note.rs
rename to packages/backend/native-utils/src/model/entity/antenna_note.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/app.rs b/packages/backend/native-utils/src/model/entity/app.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/app.rs
rename to packages/backend/native-utils/src/model/entity/app.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/attestation_challenge.rs b/packages/backend/native-utils/src/model/entity/attestation_challenge.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/attestation_challenge.rs
rename to packages/backend/native-utils/src/model/entity/attestation_challenge.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/auth_session.rs b/packages/backend/native-utils/src/model/entity/auth_session.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/auth_session.rs
rename to packages/backend/native-utils/src/model/entity/auth_session.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/blocking.rs b/packages/backend/native-utils/src/model/entity/blocking.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/blocking.rs
rename to packages/backend/native-utils/src/model/entity/blocking.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/channel.rs b/packages/backend/native-utils/src/model/entity/channel.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/channel.rs
rename to packages/backend/native-utils/src/model/entity/channel.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/channel_following.rs b/packages/backend/native-utils/src/model/entity/channel_following.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/channel_following.rs
rename to packages/backend/native-utils/src/model/entity/channel_following.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/channel_note_pining.rs b/packages/backend/native-utils/src/model/entity/channel_note_pining.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/channel_note_pining.rs
rename to packages/backend/native-utils/src/model/entity/channel_note_pining.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/clip.rs b/packages/backend/native-utils/src/model/entity/clip.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/clip.rs
rename to packages/backend/native-utils/src/model/entity/clip.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/clip_note.rs b/packages/backend/native-utils/src/model/entity/clip_note.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/clip_note.rs
rename to packages/backend/native-utils/src/model/entity/clip_note.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/drive_file.rs b/packages/backend/native-utils/src/model/entity/drive_file.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/drive_file.rs
rename to packages/backend/native-utils/src/model/entity/drive_file.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/drive_folder.rs b/packages/backend/native-utils/src/model/entity/drive_folder.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/drive_folder.rs
rename to packages/backend/native-utils/src/model/entity/drive_folder.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/emoji.rs b/packages/backend/native-utils/src/model/entity/emoji.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/emoji.rs
rename to packages/backend/native-utils/src/model/entity/emoji.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/follow_request.rs b/packages/backend/native-utils/src/model/entity/follow_request.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/follow_request.rs
rename to packages/backend/native-utils/src/model/entity/follow_request.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/following.rs b/packages/backend/native-utils/src/model/entity/following.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/following.rs
rename to packages/backend/native-utils/src/model/entity/following.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/gallery_like.rs b/packages/backend/native-utils/src/model/entity/gallery_like.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/gallery_like.rs
rename to packages/backend/native-utils/src/model/entity/gallery_like.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/gallery_post.rs b/packages/backend/native-utils/src/model/entity/gallery_post.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/gallery_post.rs
rename to packages/backend/native-utils/src/model/entity/gallery_post.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/hashtag.rs b/packages/backend/native-utils/src/model/entity/hashtag.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/hashtag.rs
rename to packages/backend/native-utils/src/model/entity/hashtag.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/instance.rs b/packages/backend/native-utils/src/model/entity/instance.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/instance.rs
rename to packages/backend/native-utils/src/model/entity/instance.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/messaging_message.rs b/packages/backend/native-utils/src/model/entity/messaging_message.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/messaging_message.rs
rename to packages/backend/native-utils/src/model/entity/messaging_message.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/meta.rs b/packages/backend/native-utils/src/model/entity/meta.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/meta.rs
rename to packages/backend/native-utils/src/model/entity/meta.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/migrations.rs b/packages/backend/native-utils/src/model/entity/migrations.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/migrations.rs
rename to packages/backend/native-utils/src/model/entity/migrations.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/moderation_log.rs b/packages/backend/native-utils/src/model/entity/moderation_log.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/moderation_log.rs
rename to packages/backend/native-utils/src/model/entity/moderation_log.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/muted_note.rs b/packages/backend/native-utils/src/model/entity/muted_note.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/muted_note.rs
rename to packages/backend/native-utils/src/model/entity/muted_note.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/muting.rs b/packages/backend/native-utils/src/model/entity/muting.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/muting.rs
rename to packages/backend/native-utils/src/model/entity/muting.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/newtype/macros.rs b/packages/backend/native-utils/src/model/entity/newtype/macros.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/newtype/macros.rs
rename to packages/backend/native-utils/src/model/entity/newtype/macros.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs b/packages/backend/native-utils/src/model/entity/newtype/mod.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/newtype/mod.rs
rename to packages/backend/native-utils/src/model/entity/newtype/mod.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/note.rs b/packages/backend/native-utils/src/model/entity/note.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/note.rs
rename to packages/backend/native-utils/src/model/entity/note.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_edit.rs b/packages/backend/native-utils/src/model/entity/note_edit.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/note_edit.rs
rename to packages/backend/native-utils/src/model/entity/note_edit.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_favorite.rs b/packages/backend/native-utils/src/model/entity/note_favorite.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/note_favorite.rs
rename to packages/backend/native-utils/src/model/entity/note_favorite.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_reaction.rs b/packages/backend/native-utils/src/model/entity/note_reaction.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/note_reaction.rs
rename to packages/backend/native-utils/src/model/entity/note_reaction.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_thread_muting.rs b/packages/backend/native-utils/src/model/entity/note_thread_muting.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/note_thread_muting.rs
rename to packages/backend/native-utils/src/model/entity/note_thread_muting.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_unread.rs b/packages/backend/native-utils/src/model/entity/note_unread.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/note_unread.rs
rename to packages/backend/native-utils/src/model/entity/note_unread.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/note_watching.rs b/packages/backend/native-utils/src/model/entity/note_watching.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/note_watching.rs
rename to packages/backend/native-utils/src/model/entity/note_watching.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/notification.rs b/packages/backend/native-utils/src/model/entity/notification.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/notification.rs
rename to packages/backend/native-utils/src/model/entity/notification.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/page.rs b/packages/backend/native-utils/src/model/entity/page.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/page.rs
rename to packages/backend/native-utils/src/model/entity/page.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/page_like.rs b/packages/backend/native-utils/src/model/entity/page_like.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/page_like.rs
rename to packages/backend/native-utils/src/model/entity/page_like.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/password_reset_request.rs b/packages/backend/native-utils/src/model/entity/password_reset_request.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/password_reset_request.rs
rename to packages/backend/native-utils/src/model/entity/password_reset_request.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/poll.rs b/packages/backend/native-utils/src/model/entity/poll.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/poll.rs
rename to packages/backend/native-utils/src/model/entity/poll.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/poll_vote.rs b/packages/backend/native-utils/src/model/entity/poll_vote.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/poll_vote.rs
rename to packages/backend/native-utils/src/model/entity/poll_vote.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/prelude.rs b/packages/backend/native-utils/src/model/entity/prelude.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/prelude.rs
rename to packages/backend/native-utils/src/model/entity/prelude.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/promo_note.rs b/packages/backend/native-utils/src/model/entity/promo_note.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/promo_note.rs
rename to packages/backend/native-utils/src/model/entity/promo_note.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/promo_read.rs b/packages/backend/native-utils/src/model/entity/promo_read.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/promo_read.rs
rename to packages/backend/native-utils/src/model/entity/promo_read.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/registration_ticket.rs b/packages/backend/native-utils/src/model/entity/registration_ticket.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/registration_ticket.rs
rename to packages/backend/native-utils/src/model/entity/registration_ticket.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/registry_item.rs b/packages/backend/native-utils/src/model/entity/registry_item.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/registry_item.rs
rename to packages/backend/native-utils/src/model/entity/registry_item.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/relay.rs b/packages/backend/native-utils/src/model/entity/relay.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/relay.rs
rename to packages/backend/native-utils/src/model/entity/relay.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/renote_muting.rs b/packages/backend/native-utils/src/model/entity/renote_muting.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/renote_muting.rs
rename to packages/backend/native-utils/src/model/entity/renote_muting.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/sea_orm_active_enums.rs b/packages/backend/native-utils/src/model/entity/sea_orm_active_enums.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/sea_orm_active_enums.rs
rename to packages/backend/native-utils/src/model/entity/sea_orm_active_enums.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/signin.rs b/packages/backend/native-utils/src/model/entity/signin.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/signin.rs
rename to packages/backend/native-utils/src/model/entity/signin.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/sw_subscription.rs b/packages/backend/native-utils/src/model/entity/sw_subscription.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/sw_subscription.rs
rename to packages/backend/native-utils/src/model/entity/sw_subscription.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/used_username.rs b/packages/backend/native-utils/src/model/entity/used_username.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/used_username.rs
rename to packages/backend/native-utils/src/model/entity/used_username.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/user.rs b/packages/backend/native-utils/src/model/entity/user.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/user.rs
rename to packages/backend/native-utils/src/model/entity/user.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_group.rs b/packages/backend/native-utils/src/model/entity/user_group.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/user_group.rs
rename to packages/backend/native-utils/src/model/entity/user_group.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_group_invitation.rs b/packages/backend/native-utils/src/model/entity/user_group_invitation.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/user_group_invitation.rs
rename to packages/backend/native-utils/src/model/entity/user_group_invitation.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_group_invite.rs b/packages/backend/native-utils/src/model/entity/user_group_invite.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/user_group_invite.rs
rename to packages/backend/native-utils/src/model/entity/user_group_invite.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_group_joining.rs b/packages/backend/native-utils/src/model/entity/user_group_joining.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/user_group_joining.rs
rename to packages/backend/native-utils/src/model/entity/user_group_joining.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_ip.rs b/packages/backend/native-utils/src/model/entity/user_ip.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/user_ip.rs
rename to packages/backend/native-utils/src/model/entity/user_ip.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_keypair.rs b/packages/backend/native-utils/src/model/entity/user_keypair.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/user_keypair.rs
rename to packages/backend/native-utils/src/model/entity/user_keypair.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_list.rs b/packages/backend/native-utils/src/model/entity/user_list.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/user_list.rs
rename to packages/backend/native-utils/src/model/entity/user_list.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_list_joining.rs b/packages/backend/native-utils/src/model/entity/user_list_joining.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/user_list_joining.rs
rename to packages/backend/native-utils/src/model/entity/user_list_joining.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_note_pining.rs b/packages/backend/native-utils/src/model/entity/user_note_pining.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/user_note_pining.rs
rename to packages/backend/native-utils/src/model/entity/user_note_pining.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_pending.rs b/packages/backend/native-utils/src/model/entity/user_pending.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/user_pending.rs
rename to packages/backend/native-utils/src/model/entity/user_pending.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_profile.rs b/packages/backend/native-utils/src/model/entity/user_profile.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/user_profile.rs
rename to packages/backend/native-utils/src/model/entity/user_profile.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_publickey.rs b/packages/backend/native-utils/src/model/entity/user_publickey.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/user_publickey.rs
rename to packages/backend/native-utils/src/model/entity/user_publickey.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/user_security_key.rs b/packages/backend/native-utils/src/model/entity/user_security_key.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/user_security_key.rs
rename to packages/backend/native-utils/src/model/entity/user_security_key.rs
diff --git a/packages/backend/native-utils/crates/model/src/entity/webhook.rs b/packages/backend/native-utils/src/model/entity/webhook.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/entity/webhook.rs
rename to packages/backend/native-utils/src/model/entity/webhook.rs
diff --git a/packages/backend/native-utils/crates/model/src/error.rs b/packages/backend/native-utils/src/model/error.rs
similarity index 62%
rename from packages/backend/native-utils/crates/model/src/error.rs
rename to packages/backend/native-utils/src/model/error.rs
index c90f3f5a32..2292246aed 100644
--- a/packages/backend/native-utils/crates/model/src/error.rs
+++ b/packages/backend/native-utils/src/model/error.rs
@@ -3,9 +3,16 @@ pub enum Error {
     #[error("Failed to parse string")]
     ParseError(#[from] parse_display::ParseError),
     #[error("Failed to get database connection")]
-    DbConnError(#[from] database::error::Error),
+    DbConnError(#[from] crate::database::error::Error),
     #[error("Database operation error: {0}")]
     DbOperationError(#[from] sea_orm::DbErr),
     #[error("Requested entity not found")]
     NotFound,
 }
+
+#[cfg(feature = "napi")]
+impl Into<napi::Error> for Error {
+    fn into(self) -> napi::Error {
+        napi::Error::from_reason(self.to_string())
+    }
+}
diff --git a/packages/backend/native-utils/crates/model/src/lib.rs b/packages/backend/native-utils/src/model/mod.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/lib.rs
rename to packages/backend/native-utils/src/model/mod.rs
diff --git a/packages/backend/native-utils/crates/model/src/repository.rs b/packages/backend/native-utils/src/model/repository.rs
similarity index 75%
rename from packages/backend/native-utils/crates/model/src/repository.rs
rename to packages/backend/native-utils/src/model/repository.rs
index 83573ab160..0f9f7de329 100644
--- a/packages/backend/native-utils/crates/model/src/repository.rs
+++ b/packages/backend/native-utils/src/model/repository.rs
@@ -3,7 +3,7 @@ pub mod antenna;
 use async_trait::async_trait;
 use schemars::JsonSchema;
 
-use crate::error::Error;
+use super::error::Error;
 
 #[async_trait]
 pub trait Repository<T: JsonSchema> {
@@ -14,7 +14,10 @@ pub trait Repository<T: JsonSchema> {
 mod macros {
     macro_rules! impl_pack_by_id {
         ($a:ty, $b:ident) => {
-            match <$a>::find_by_id($b).one(database::get_database()?).await? {
+            match <$a>::find_by_id($b)
+                .one(crate::database::get_database()?)
+                .await?
+            {
                 None => Err(Error::NotFound),
                 Some(m) => m.pack().await,
             }
diff --git a/packages/backend/native-utils/crates/model/src/repository/antenna.rs b/packages/backend/native-utils/src/model/repository/antenna.rs
similarity index 92%
rename from packages/backend/native-utils/crates/model/src/repository/antenna.rs
rename to packages/backend/native-utils/src/model/repository/antenna.rs
index c8324edd34..7c614b954b 100644
--- a/packages/backend/native-utils/crates/model/src/repository/antenna.rs
+++ b/packages/backend/native-utils/src/model/repository/antenna.rs
@@ -2,9 +2,10 @@ use async_trait::async_trait;
 use cfg_if::cfg_if;
 use sea_orm::{ColumnTrait, EntityTrait, QueryFilter};
 
-use crate::entity::{antenna, antenna_note, user_group_joining};
-use crate::error::Error;
-use crate::schema::Antenna;
+use crate::database;
+use crate::model::entity::{antenna, antenna_note, user_group_joining};
+use crate::model::error::Error;
+use crate::model::schema::Antenna;
 
 use super::macros::impl_pack_by_id;
 use super::Repository;
diff --git a/packages/backend/native-utils/crates/model/src/schema.rs b/packages/backend/native-utils/src/model/schema.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/schema.rs
rename to packages/backend/native-utils/src/model/schema.rs
diff --git a/packages/backend/native-utils/crates/model/src/schema/antenna.rs b/packages/backend/native-utils/src/model/schema/antenna.rs
similarity index 93%
rename from packages/backend/native-utils/crates/model/src/schema/antenna.rs
rename to packages/backend/native-utils/src/model/schema/antenna.rs
index 338998019c..6376b3bc73 100644
--- a/packages/backend/native-utils/crates/model/src/schema/antenna.rs
+++ b/packages/backend/native-utils/src/model/schema/antenna.rs
@@ -5,7 +5,8 @@ use schemars::JsonSchema;
 use utoipa::ToSchema;
 
 use super::Schema;
-use crate::entity::sea_orm_active_enums::AntennaSrcEnum;
+use crate::model;
+use crate::model::entity::sea_orm_active_enums::AntennaSrcEnum;
 
 #[derive(Clone, Debug, PartialEq, Eq, JsonSchema, ToSchema)]
 #[serde(rename_all = "camelCase")]
@@ -47,10 +48,10 @@ pub enum AntennaSrc {
 }
 
 impl TryFrom<AntennaSrcEnum> for super::AntennaSrc {
-    type Error = crate::error::Error;
+    type Error = model::error::Error;
 
     fn try_from(value: AntennaSrcEnum) -> Result<Self, Self::Error> {
-        value.to_string().parse().map_err(crate::error::Error::from)
+        value.to_string().parse().map_err(model::error::Error::from)
     }
 }
 
@@ -64,7 +65,7 @@ mod unit_test {
     use pretty_assertions::assert_eq;
     use serde_json::json;
 
-    use crate::{entity::sea_orm_active_enums::AntennaSrcEnum, schema::AntennaSrc};
+    use crate::model::{entity::sea_orm_active_enums::AntennaSrcEnum, schema::AntennaSrc};
 
     use super::VALIDATOR;
 
diff --git a/packages/backend/native-utils/crates/model/src/schema/app.rs b/packages/backend/native-utils/src/model/schema/app.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/schema/app.rs
rename to packages/backend/native-utils/src/model/schema/app.rs
diff --git a/packages/backend/native-utils/crates/model/src/schema/napi.rs b/packages/backend/native-utils/src/model/schema/napi.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/src/schema/napi.rs
rename to packages/backend/native-utils/src/model/schema/napi.rs
diff --git a/packages/backend/native-utils/crates/model/src/schema/napi/antenna.rs b/packages/backend/native-utils/src/model/schema/napi/antenna.rs
similarity index 78%
rename from packages/backend/native-utils/crates/model/src/schema/napi/antenna.rs
rename to packages/backend/native-utils/src/model/schema/napi/antenna.rs
index ffb817c123..e5c156efad 100644
--- a/packages/backend/native-utils/crates/model/src/schema/napi/antenna.rs
+++ b/packages/backend/native-utils/src/model/schema/napi/antenna.rs
@@ -1,9 +1,12 @@
-use napi::bindgen_prelude::{FromNapiValue, ToNapiValue};
+use napi::bindgen_prelude::*;
 use napi_derive::napi;
 use parse_display::FromStr;
 use schemars::JsonSchema;
 use utoipa::ToSchema;
 
+use crate::model::entity::antenna::Model;
+use crate::model::repository::Repository;
+
 #[napi]
 #[derive(Clone, Debug, PartialEq, Eq, JsonSchema, ToSchema)]
 #[serde(rename_all = "camelCase")]
@@ -44,3 +47,11 @@ pub enum AntennaSrc {
     Group,
     Instances,
 }
+
+#[napi]
+impl Antenna {
+    #[napi]
+    pub async fn pack_by_id(id: String) -> napi::Result<Antenna> {
+        Model::pack_by_id(id).await.map_err(Into::into)
+    }
+}
diff --git a/packages/backend/native-utils/crates/util/src/id.rs b/packages/backend/native-utils/src/util/id.rs
similarity index 97%
rename from packages/backend/native-utils/crates/util/src/id.rs
rename to packages/backend/native-utils/src/util/id.rs
index d3c5809ea5..98dd63c4e5 100644
--- a/packages/backend/native-utils/crates/util/src/id.rs
+++ b/packages/backend/native-utils/src/util/id.rs
@@ -25,7 +25,7 @@ mod unit_test {
     use pretty_assertions::{assert_eq, assert_ne};
     use std::thread;
 
-    use crate::id;
+    use crate::util::id;
 
     #[test]
     fn can_generate_unique_ids() {
diff --git a/packages/backend/native-utils/crates/util/src/lib.rs b/packages/backend/native-utils/src/util/mod.rs
similarity index 100%
rename from packages/backend/native-utils/crates/util/src/lib.rs
rename to packages/backend/native-utils/src/util/mod.rs
diff --git a/packages/backend/native-utils/crates/util/src/random.rs b/packages/backend/native-utils/src/util/random.rs
similarity index 100%
rename from packages/backend/native-utils/crates/util/src/random.rs
rename to packages/backend/native-utils/src/util/random.rs
diff --git a/packages/backend/native-utils/crates/model/tests/common.rs b/packages/backend/native-utils/tests/common.rs
similarity index 96%
rename from packages/backend/native-utils/crates/model/tests/common.rs
rename to packages/backend/native-utils/tests/common.rs
index 554a8ca735..775b372126 100644
--- a/packages/backend/native-utils/crates/model/tests/common.rs
+++ b/packages/backend/native-utils/tests/common.rs
@@ -1,20 +1,19 @@
 #![cfg(not(feature = "napi"))]
 
-extern crate model;
-
-mod repository;
+mod model;
 
 use chrono::Utc;
-use model::entity;
-use model::entity::sea_orm_active_enums::AntennaSrcEnum;
+use native_utils::database;
+use native_utils::model::entity;
+use native_utils::model::entity::sea_orm_active_enums::AntennaSrcEnum;
+use native_utils::util::{
+    id::{create_id, init_id},
+    random::gen_string,
+};
 use sea_orm::{
     sea_query::TableCreateStatement, ActiveModelTrait, ConnectionTrait, DbBackend, DbConn, DbErr,
     EntityTrait, IntoActiveModel, TransactionTrait,
 };
-use util::{
-    id::{create_id, init_id},
-    random::gen_string,
-};
 
 /// Insert predefined entries in the database.
 async fn prepare() {
diff --git a/packages/backend/native-utils/tests/model/mod.rs b/packages/backend/native-utils/tests/model/mod.rs
new file mode 100644
index 0000000000..a35bac056b
--- /dev/null
+++ b/packages/backend/native-utils/tests/model/mod.rs
@@ -0,0 +1 @@
+mod repository;
diff --git a/packages/backend/native-utils/crates/model/tests/repository/mod.rs b/packages/backend/native-utils/tests/model/repository.rs
similarity index 100%
rename from packages/backend/native-utils/crates/model/tests/repository/mod.rs
rename to packages/backend/native-utils/tests/model/repository.rs
diff --git a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs b/packages/backend/native-utils/tests/model/repository/antenna.rs
similarity index 97%
rename from packages/backend/native-utils/crates/model/tests/repository/antenna.rs
rename to packages/backend/native-utils/tests/model/repository/antenna.rs
index 2da1e59d44..a370073987 100644
--- a/packages/backend/native-utils/crates/model/tests/repository/antenna.rs
+++ b/packages/backend/native-utils/tests/model/repository/antenna.rs
@@ -1,4 +1,6 @@
 mod int_test {
+    use native_utils::{database, model};
+
     use model::{
         entity::{antenna, user},
         repository::Repository,

From 5e9dce3e8c4c87d25b2fb20f51824365e9ad268c Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 09:29:52 -0400
Subject: [PATCH 242/319] adjust module structure

---
 .../backend/native-utils/src/model/schema.rs  | 25 ++++----
 .../native-utils/src/model/schema/antenna.rs  | 60 +++++++++++++++++++
 .../native-utils/src/model/schema/napi.rs     |  1 -
 .../src/model/schema/napi/antenna.rs          | 57 ------------------
 4 files changed, 72 insertions(+), 71 deletions(-)
 delete mode 100644 packages/backend/native-utils/src/model/schema/napi.rs
 delete mode 100644 packages/backend/native-utils/src/model/schema/napi/antenna.rs

diff --git a/packages/backend/native-utils/src/model/schema.rs b/packages/backend/native-utils/src/model/schema.rs
index 71f9348b32..ef4368dda1 100644
--- a/packages/backend/native-utils/src/model/schema.rs
+++ b/packages/backend/native-utils/src/model/schema.rs
@@ -5,19 +5,6 @@ use cfg_if::cfg_if;
 use jsonschema::JSONSchema;
 use schemars::{schema_for, JsonSchema};
 
-cfg_if! {
-    if #[cfg(feature = "napi")] {
-        mod napi;
-        pub use self::napi::antenna::Antenna;
-        pub use self::napi::antenna::AntennaSrc;
-    } else {
-        pub use antenna::Antenna;
-        pub use antenna::AntennaSrc;
-        pub use app::App;
-        pub use app::AppPermission;
-    }
-}
-
 /// Structs of schema defitions implement this trait in order to
 /// provide the JSON Schema validator [`jsonschema::JSONSchema`].
 pub trait Schema<T: JsonSchema> {
@@ -33,3 +20,15 @@ pub trait Schema<T: JsonSchema> {
             .expect("Unable to compile schema")
     }
 }
+
+cfg_if! {
+    if #[cfg(feature = "napi")] {
+        pub use antenna::napi::AntennaSchema as Antenna;
+        pub use antenna::napi::AntennaSrc;
+    } else {
+        pub use antenna::Antenna;
+        pub use antenna::AntennaSrc;
+        pub use app::App;
+        pub use app::AppPermission;
+    }
+}
diff --git a/packages/backend/native-utils/src/model/schema/antenna.rs b/packages/backend/native-utils/src/model/schema/antenna.rs
index 6376b3bc73..8b553c0820 100644
--- a/packages/backend/native-utils/src/model/schema/antenna.rs
+++ b/packages/backend/native-utils/src/model/schema/antenna.rs
@@ -60,6 +60,66 @@ impl Schema<Self> for super::Antenna {}
 pub static VALIDATOR: Lazy<JSONSchema> = Lazy::new(|| super::Antenna::validator());
 // ----
 
+#[cfg(feature = "napi")]
+pub mod napi {
+    use napi::bindgen_prelude::*;
+    use napi_derive::napi;
+    use parse_display::FromStr;
+    use schemars::JsonSchema;
+    use utoipa::ToSchema;
+
+    use crate::model::{entity::antenna, repository::Repository};
+
+    #[napi]
+    #[derive(Clone, Debug, PartialEq, Eq, JsonSchema, ToSchema)]
+    #[serde(rename_all = "camelCase")]
+    pub struct AntennaSchema {
+        pub id: String,
+        pub created_at: String,
+        pub name: String,
+        pub keywords: Vec<Vec<String>>,
+        pub exclude_keywords: Vec<Vec<String>>,
+        #[schema(inline)]
+        pub src: AntennaSrc,
+        pub user_list_id: Option<String>,
+        pub user_group_id: Option<String>,
+        pub users: Vec<String>,
+        pub instances: Vec<String>,
+        #[serde(default)]
+        pub case_sensitive: bool,
+        #[serde(default)]
+        pub notify: bool,
+        #[serde(default)]
+        pub with_replies: bool,
+        #[serde(default)]
+        pub with_file: bool,
+        #[serde(default)]
+        pub has_unread_note: bool,
+    }
+
+    #[napi]
+    #[derive(Debug, FromStr, PartialEq, Eq, JsonSchema, ToSchema)]
+    #[serde(rename_all = "camelCase")]
+    #[display(style = "camelCase")]
+    #[display("'{}'")]
+    pub enum AntennaSrc {
+        Home,
+        All,
+        Users,
+        List,
+        Group,
+        Instances,
+    }
+
+    #[napi]
+    impl AntennaSchema {
+        #[napi]
+        pub async fn pack_by_id(id: String) -> napi::Result<AntennaSchema> {
+            antenna::Model::pack_by_id(id).await.map_err(Into::into)
+        }
+    }
+}
+
 #[cfg(test)]
 mod unit_test {
     use pretty_assertions::assert_eq;
diff --git a/packages/backend/native-utils/src/model/schema/napi.rs b/packages/backend/native-utils/src/model/schema/napi.rs
deleted file mode 100644
index 16130e4ccd..0000000000
--- a/packages/backend/native-utils/src/model/schema/napi.rs
+++ /dev/null
@@ -1 +0,0 @@
-pub mod antenna;
diff --git a/packages/backend/native-utils/src/model/schema/napi/antenna.rs b/packages/backend/native-utils/src/model/schema/napi/antenna.rs
deleted file mode 100644
index e5c156efad..0000000000
--- a/packages/backend/native-utils/src/model/schema/napi/antenna.rs
+++ /dev/null
@@ -1,57 +0,0 @@
-use napi::bindgen_prelude::*;
-use napi_derive::napi;
-use parse_display::FromStr;
-use schemars::JsonSchema;
-use utoipa::ToSchema;
-
-use crate::model::entity::antenna::Model;
-use crate::model::repository::Repository;
-
-#[napi]
-#[derive(Clone, Debug, PartialEq, Eq, JsonSchema, ToSchema)]
-#[serde(rename_all = "camelCase")]
-pub struct Antenna {
-    pub id: String,
-    pub created_at: String,
-    pub name: String,
-    pub keywords: Vec<Vec<String>>,
-    pub exclude_keywords: Vec<Vec<String>>,
-    #[schema(inline)]
-    pub src: AntennaSrc,
-    pub user_list_id: Option<String>,
-    pub user_group_id: Option<String>,
-    pub users: Vec<String>,
-    pub instances: Vec<String>,
-    #[serde(default)]
-    pub case_sensitive: bool,
-    #[serde(default)]
-    pub notify: bool,
-    #[serde(default)]
-    pub with_replies: bool,
-    #[serde(default)]
-    pub with_file: bool,
-    #[serde(default)]
-    pub has_unread_note: bool,
-}
-
-#[napi]
-#[derive(Debug, FromStr, PartialEq, Eq, JsonSchema, ToSchema)]
-#[serde(rename_all = "camelCase")]
-#[display(style = "camelCase")]
-#[display("'{}'")]
-pub enum AntennaSrc {
-    Home,
-    All,
-    Users,
-    List,
-    Group,
-    Instances,
-}
-
-#[napi]
-impl Antenna {
-    #[napi]
-    pub async fn pack_by_id(id: String) -> napi::Result<Antenna> {
-        Model::pack_by_id(id).await.map_err(Into::into)
-    }
-}

From e932d6effa8f941f435e7865038a7f67cae87f6e Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 09:55:57 -0400
Subject: [PATCH 243/319] use schema in native-utils

---
 packages/backend/native-utils/package.json    |  8 ++---
 packages/backend/package.json                 |  2 +-
 .../src/models/repositories/antenna.ts        | 34 +++----------------
 pnpm-workspace.yaml                           |  1 +
 4 files changed, 11 insertions(+), 34 deletions(-)

diff --git a/packages/backend/native-utils/package.json b/packages/backend/native-utils/package.json
index aa194bad3a..f1ea2c9b41 100644
--- a/packages/backend/native-utils/package.json
+++ b/packages/backend/native-utils/package.json
@@ -23,8 +23,8 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@napi-rs/cli": "^2.15.0",
-    "ava": "^5.1.1"
+    "@napi-rs/cli": "2.15.0",
+    "ava": "5.1.1"
   },
   "ava": {
     "timeout": "3m"
@@ -40,7 +40,7 @@
     "test": "ava",
     "universal": "napi universal",
     "version": "napi version",
-    "cargo:unit": "cargo test --workspace unit_test",
-    "cargo:integration": "cargo test --workspace int_test -- --test-threads=1"
+    "cargo:unit": "cargo test unit_test",
+    "cargo:integration": "cargo test --no-default-features int_test -- --test-threads=1"
   }
 }
diff --git a/packages/backend/package.json b/packages/backend/package.json
index c084d67bc6..0b0315a069 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": "napi build --platform --release --cargo-cwd native-utils ./native-utils/built/ && pnpm swc src -d built -D",
+		"build": "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",
diff --git a/packages/backend/src/models/repositories/antenna.ts b/packages/backend/src/models/repositories/antenna.ts
index c325e25895..d9405f4a99 100644
--- a/packages/backend/src/models/repositories/antenna.ts
+++ b/packages/backend/src/models/repositories/antenna.ts
@@ -1,36 +1,12 @@
 import { db } from "@/db/postgre.js";
 import { Antenna } from "@/models/entities/antenna.js";
-import type { Packed } from "@/misc/schema.js";
-import { AntennaNotes, UserGroupJoinings } from "../index.js";
+import { AntennaSchema } from "native-utils/built/index.js";
 
 export const AntennaRepository = db.getRepository(Antenna).extend({
-	async pack(src: Antenna["id"] | Antenna): Promise<Packed<"Antenna">> {
-		const antenna =
-			typeof src === "object" ? src : await this.findOneByOrFail({ id: src });
+	async pack(src: Antenna["id"] | Antenna): Promise<AntennaSchema> {
+		const id =
+			typeof src === "object" ? src.id : src;
 
-		const hasUnreadNote =
-			(await AntennaNotes.findOneBy({ antennaId: antenna.id, read: false })) !=
-			null;
-		const userGroupJoining = antenna.userGroupJoiningId
-			? await UserGroupJoinings.findOneBy({ id: antenna.userGroupJoiningId })
-			: null;
-
-		return {
-			id: antenna.id,
-			createdAt: antenna.createdAt.toISOString(),
-			name: antenna.name,
-			keywords: antenna.keywords,
-			excludeKeywords: antenna.excludeKeywords,
-			src: antenna.src,
-			userListId: antenna.userListId,
-			userGroupId: userGroupJoining ? userGroupJoining.userGroupId : null,
-			users: antenna.users,
-			instances: antenna.instances,
-			caseSensitive: antenna.caseSensitive,
-			notify: antenna.notify,
-			withReplies: antenna.withReplies,
-			withFile: antenna.withFile,
-			hasUnreadNote,
-		};
+		return await AntennaSchema.packById(id);
 	},
 });
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index a2ebb0465b..2bf4474f06 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,5 +1,6 @@
 packages:
  - 'packages/backend'
+ - 'packages/backend/native-utils'
  - 'packages/client'
  - 'packages/sw'
  - 'packages/calckey-js'

From 752d63e6de4532bb8b0b20630c863c5f35c52332 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 11:55:14 -0400
Subject: [PATCH 244/319] add native calls

---
 packages/backend/native-utils/Cargo.toml      |   5 +-
 packages/backend/native-utils/package.json    |   4 +-
 .../native-utils/src/database/error.rs        |   4 +
 .../backend/native-utils/src/database/mod.rs  |  16 ++-
 packages/backend/native-utils/src/lib.rs      |   1 +
 packages/backend/native-utils/src/macros.rs   |  11 ++
 .../backend/native-utils/src/model/error.rs   |  13 +--
 .../native-utils/src/model/repository.rs      |   5 +
 .../backend/native-utils/src/model/schema.rs  |   5 +-
 .../native-utils/src/model/schema/antenna.rs  | 107 +++++++++---------
 packages/backend/native-utils/src/util/id.rs  |  47 +++++++-
 .../backend/native-utils/src/util/random.rs   |   7 ++
 12 files changed, 151 insertions(+), 74 deletions(-)
 create mode 100644 packages/backend/native-utils/src/macros.rs

diff --git a/packages/backend/native-utils/Cargo.toml b/packages/backend/native-utils/Cargo.toml
index 3c70a0209b..ba7a48b8d3 100644
--- a/packages/backend/native-utils/Cargo.toml
+++ b/packages/backend/native-utils/Cargo.toml
@@ -9,7 +9,7 @@ members = ["migration/Cargo.toml"]
 [features]
 default = ["napi"]
 noarray = []
-napi = ["dep:napi", "dep:napi-derive"]
+napi = ["dep:napi", "dep:napi-derive", "dep:radix_fmt"]
 
 [lib]
 crate-type = ["cdylib", "lib"]
@@ -33,8 +33,9 @@ tokio = { version = "1.28.1", features = ["full"] }
 utoipa = "3.3.0"
 
 # 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", "tokio_rt"], optional = true }
+napi = { version = "2.12.0", default-features = false, features = ["napi6", "tokio_rt"], optional = true }
 napi-derive = { version = "2.12.0", optional = true }
+radix_fmt = { version = "1.0.0", optional = true }
 
 [dev-dependencies]
 pretty_assertions = "1.3.0"
diff --git a/packages/backend/native-utils/package.json b/packages/backend/native-utils/package.json
index f1ea2c9b41..8423f569b1 100644
--- a/packages/backend/native-utils/package.json
+++ b/packages/backend/native-utils/package.json
@@ -34,13 +34,13 @@
   },
   "scripts": {
     "artifacts": "napi artifacts",
-    "build": "napi build --platform --release ./built/",
+    "build": "napi build --features napi --platform --release ./built/",
     "build:debug": "napi build --platform",
     "prepublishOnly": "napi prepublish -t npm",
     "test": "ava",
     "universal": "napi universal",
     "version": "napi version",
     "cargo:unit": "cargo test unit_test",
-    "cargo:integration": "cargo test --no-default-features int_test -- --test-threads=1"
+    "cargo:integration": "cargo test --no-default-features -F noarray int_test -- --test-threads=1"
   }
 }
diff --git a/packages/backend/native-utils/src/database/error.rs b/packages/backend/native-utils/src/database/error.rs
index babdd68318..68e959e0af 100644
--- a/packages/backend/native-utils/src/database/error.rs
+++ b/packages/backend/native-utils/src/database/error.rs
@@ -1,5 +1,7 @@
 use sea_orm::error::DbErr;
 
+use crate::impl_into_napi_error;
+
 #[derive(thiserror::Error, Debug, PartialEq, Eq)]
 pub enum Error {
     #[error("The database connections have not been initialized yet")]
@@ -7,3 +9,5 @@ pub enum Error {
     #[error("ORM error: {0}")]
     OrmError(#[from] DbErr),
 }
+
+impl_into_napi_error!(Error);
diff --git a/packages/backend/native-utils/src/database/mod.rs b/packages/backend/native-utils/src/database/mod.rs
index c3cdea7278..80189a8135 100644
--- a/packages/backend/native-utils/src/database/mod.rs
+++ b/packages/backend/native-utils/src/database/mod.rs
@@ -1,12 +1,13 @@
 pub mod error;
 
+use cfg_if::cfg_if;
 use error::Error;
 use sea_orm::{Database, DbConn};
 
 static DB_CONN: once_cell::sync::OnceCell<DbConn> = once_cell::sync::OnceCell::new();
 
-pub async fn init_database(connection_uri: impl Into<String>) -> Result<(), Error> {
-    let conn = Database::connect(connection_uri.into()).await?;
+pub async fn init_database(conn_uri: impl Into<String>) -> Result<(), Error> {
+    let conn = Database::connect(conn_uri.into()).await?;
     DB_CONN.get_or_init(move || conn);
     Ok(())
 }
@@ -15,6 +16,17 @@ pub fn get_database() -> Result<&'static DbConn, Error> {
     DB_CONN.get().ok_or(Error::Uninitialized)
 }
 
+cfg_if! {
+    if #[cfg(feature = "napi")] {
+        use napi_derive::napi;
+
+        #[napi]
+        pub async fn native_init_database(conn_uri: String) -> napi::Result<()> {
+            init_database(conn_uri).await.map_err(Into::into)
+        }
+    }
+}
+
 #[cfg(test)]
 mod unit_test {
     use super::{error::Error, get_database};
diff --git a/packages/backend/native-utils/src/lib.rs b/packages/backend/native-utils/src/lib.rs
index 6a5e3f7f2c..f18e69a48f 100644
--- a/packages/backend/native-utils/src/lib.rs
+++ b/packages/backend/native-utils/src/lib.rs
@@ -1,4 +1,5 @@
 pub mod database;
+pub mod macros;
 pub mod model;
 pub mod util;
 
diff --git a/packages/backend/native-utils/src/macros.rs b/packages/backend/native-utils/src/macros.rs
new file mode 100644
index 0000000000..49ab826329
--- /dev/null
+++ b/packages/backend/native-utils/src/macros.rs
@@ -0,0 +1,11 @@
+#[macro_export]
+macro_rules! impl_into_napi_error {
+    ($a:ty) => {
+        #[cfg(feature = "napi")]
+        impl Into<napi::Error> for $a {
+            fn into(self) -> napi::Error {
+                napi::Error::from_reason(self.to_string())
+            }
+        }
+    };
+}
diff --git a/packages/backend/native-utils/src/model/error.rs b/packages/backend/native-utils/src/model/error.rs
index 2292246aed..8e9213066b 100644
--- a/packages/backend/native-utils/src/model/error.rs
+++ b/packages/backend/native-utils/src/model/error.rs
@@ -1,8 +1,10 @@
+use crate::impl_into_napi_error;
+
 #[derive(thiserror::Error, Debug, PartialEq, Eq)]
 pub enum Error {
-    #[error("Failed to parse string")]
+    #[error("Failed to parse string: {0}")]
     ParseError(#[from] parse_display::ParseError),
-    #[error("Failed to get database connection")]
+    #[error("Failed to get database connection: {0}")]
     DbConnError(#[from] crate::database::error::Error),
     #[error("Database operation error: {0}")]
     DbOperationError(#[from] sea_orm::DbErr),
@@ -10,9 +12,4 @@ pub enum Error {
     NotFound,
 }
 
-#[cfg(feature = "napi")]
-impl Into<napi::Error> for Error {
-    fn into(self) -> napi::Error {
-        napi::Error::from_reason(self.to_string())
-    }
-}
+impl_into_napi_error!(Error);
diff --git a/packages/backend/native-utils/src/model/repository.rs b/packages/backend/native-utils/src/model/repository.rs
index 0f9f7de329..5abf7907fe 100644
--- a/packages/backend/native-utils/src/model/repository.rs
+++ b/packages/backend/native-utils/src/model/repository.rs
@@ -5,13 +5,18 @@ use schemars::JsonSchema;
 
 use super::error::Error;
 
+/// Repositories have a packer that converts a database model to its
+/// corresponding API schema.
 #[async_trait]
 pub trait Repository<T: JsonSchema> {
     async fn pack(self) -> Result<T, Error>;
+    /// Retrieves one model by its id and pack it.
     async fn pack_by_id(id: String) -> Result<T, Error>;
 }
 
 mod macros {
+    /// Provides the default implementation of
+    /// [crate::model::repository::Repository::pack_by_id].
     macro_rules! impl_pack_by_id {
         ($a:ty, $b:ident) => {
             match <$a>::find_by_id($b)
diff --git a/packages/backend/native-utils/src/model/schema.rs b/packages/backend/native-utils/src/model/schema.rs
index ef4368dda1..4c0ca7941c 100644
--- a/packages/backend/native-utils/src/model/schema.rs
+++ b/packages/backend/native-utils/src/model/schema.rs
@@ -23,8 +23,9 @@ pub trait Schema<T: JsonSchema> {
 
 cfg_if! {
     if #[cfg(feature = "napi")] {
-        pub use antenna::napi::AntennaSchema as Antenna;
-        pub use antenna::napi::AntennaSrc;
+        // Will be disabled once we completely migrate to rust
+        pub use antenna::NativeAntennaSchema as Antenna;
+        pub use antenna::NativeAntennaSrc as AntennaSrc;
     } else {
         pub use antenna::Antenna;
         pub use antenna::AntennaSrc;
diff --git a/packages/backend/native-utils/src/model/schema/antenna.rs b/packages/backend/native-utils/src/model/schema/antenna.rs
index 8b553c0820..99521a98b0 100644
--- a/packages/backend/native-utils/src/model/schema/antenna.rs
+++ b/packages/backend/native-utils/src/model/schema/antenna.rs
@@ -1,3 +1,4 @@
+use cfg_if::cfg_if;
 use jsonschema::JSONSchema;
 use once_cell::sync::Lazy;
 use parse_display::FromStr;
@@ -60,62 +61,62 @@ impl Schema<Self> for super::Antenna {}
 pub static VALIDATOR: Lazy<JSONSchema> = Lazy::new(|| super::Antenna::validator());
 // ----
 
-#[cfg(feature = "napi")]
-pub mod napi {
-    use napi::bindgen_prelude::*;
-    use napi_derive::napi;
-    use parse_display::FromStr;
-    use schemars::JsonSchema;
-    use utoipa::ToSchema;
+cfg_if! {
+    if #[cfg(feature = "napi")] {
+        use napi::bindgen_prelude::{FromNapiValue, ToNapiValue};
+        use napi_derive::napi;
 
-    use crate::model::{entity::antenna, repository::Repository};
+        use crate::model::entity::antenna;
+        use crate::model::repository::Repository;
 
-    #[napi]
-    #[derive(Clone, Debug, PartialEq, Eq, JsonSchema, ToSchema)]
-    #[serde(rename_all = "camelCase")]
-    pub struct AntennaSchema {
-        pub id: String,
-        pub created_at: String,
-        pub name: String,
-        pub keywords: Vec<Vec<String>>,
-        pub exclude_keywords: Vec<Vec<String>>,
-        #[schema(inline)]
-        pub src: AntennaSrc,
-        pub user_list_id: Option<String>,
-        pub user_group_id: Option<String>,
-        pub users: Vec<String>,
-        pub instances: Vec<String>,
-        #[serde(default)]
-        pub case_sensitive: bool,
-        #[serde(default)]
-        pub notify: bool,
-        #[serde(default)]
-        pub with_replies: bool,
-        #[serde(default)]
-        pub with_file: bool,
-        #[serde(default)]
-        pub has_unread_note: bool,
-    }
-
-    #[napi]
-    #[derive(Debug, FromStr, PartialEq, Eq, JsonSchema, ToSchema)]
-    #[serde(rename_all = "camelCase")]
-    #[display(style = "camelCase")]
-    #[display("'{}'")]
-    pub enum AntennaSrc {
-        Home,
-        All,
-        Users,
-        List,
-        Group,
-        Instances,
-    }
-
-    #[napi]
-    impl AntennaSchema {
+        /// For NAPI because [chrono] is not supported.
         #[napi]
-        pub async fn pack_by_id(id: String) -> napi::Result<AntennaSchema> {
-            antenna::Model::pack_by_id(id).await.map_err(Into::into)
+        #[derive(Clone, Debug, PartialEq, Eq, JsonSchema, ToSchema)]
+        #[serde(rename_all = "camelCase")]
+        pub struct NativeAntennaSchema {
+            pub id: String,
+            pub created_at: String,
+            pub name: String,
+            pub keywords: Vec<Vec<String>>,
+            pub exclude_keywords: Vec<Vec<String>>,
+            #[schema(inline)]
+            pub src: NativeAntennaSrc,
+            pub user_list_id: Option<String>,
+            pub user_group_id: Option<String>,
+            pub users: Vec<String>,
+            pub instances: Vec<String>,
+            #[serde(default)]
+            pub case_sensitive: bool,
+            #[serde(default)]
+            pub notify: bool,
+            #[serde(default)]
+            pub with_replies: bool,
+            #[serde(default)]
+            pub with_file: bool,
+            #[serde(default)]
+            pub has_unread_note: bool,
+        }
+
+        #[napi]
+        #[derive(Debug, FromStr, PartialEq, Eq, JsonSchema, ToSchema)]
+        #[serde(rename_all = "camelCase")]
+        #[display(style = "camelCase")]
+        #[display("'{}'")]
+        pub enum NativeAntennaSrc {
+            Home,
+            All,
+            Users,
+            List,
+            Group,
+            Instances,
+        }
+
+        #[napi]
+        impl NativeAntennaSchema {
+            #[napi]
+            pub async fn pack_by_id(id: String) -> napi::Result<NativeAntennaSchema> {
+                antenna::Model::pack_by_id(id).await.map_err(Into::into)
+            }
         }
     }
 }
diff --git a/packages/backend/native-utils/src/util/id.rs b/packages/backend/native-utils/src/util/id.rs
index 98dd63c4e5..1d28b80c05 100644
--- a/packages/backend/native-utils/src/util/id.rs
+++ b/packages/backend/native-utils/src/util/id.rs
@@ -1,18 +1,31 @@
 //! ID generation utility based on [cuid2]
 
-use cuid2::CuidConstructor;
+use cfg_if::cfg_if;
 use once_cell::sync::OnceCell;
 
+use crate::impl_into_napi_error;
+
 #[derive(thiserror::Error, Debug, PartialEq, Eq)]
 #[error("ID generator has not been initialized yet")]
 pub struct ErrorUninitialized;
 
-static GENERATOR: OnceCell<CuidConstructor> = OnceCell::new();
+impl_into_napi_error!(ErrorUninitialized);
 
-pub fn init_id(length: u16) {
-    GENERATOR.get_or_init(move || CuidConstructor::new().with_length(length));
+static FINGERPRINT: OnceCell<String> = OnceCell::new();
+static GENERATOR: OnceCell<cuid2::CuidConstructor> = OnceCell::new();
+
+/// Initializes Cuid2 generator. Must be called before any [create_id].
+pub fn init_id(length: u16, fingerprint: impl Into<String>) {
+    FINGERPRINT.get_or_init(move || format!("{}{}", fingerprint.into(), cuid2::create_id()));
+    GENERATOR.get_or_init(move || {
+        cuid2::CuidConstructor::new()
+            .with_length(length)
+            .with_fingerprinter(|| FINGERPRINT.get().unwrap().clone())
+    });
 }
 
+/// Returns Cuid2 with the length specified by [init_id]. Must be called after
+/// [init_id], otherwise returns [ErrorUninitialized].
 pub fn create_id() -> Result<String, ErrorUninitialized> {
     match GENERATOR.get() {
         None => Err(ErrorUninitialized),
@@ -20,6 +33,30 @@ pub fn create_id() -> Result<String, ErrorUninitialized> {
     }
 }
 
+cfg_if! {
+    if #[cfg(feature = "napi")] {
+        use radix_fmt::radix_36;
+        use std::cmp;
+        use napi::bindgen_prelude::BigInt;
+        use napi_derive::napi;
+
+        const TIME_2000: u64 = 946_684_800_000;
+
+        /// Calls [init_id] inside. Must be called before [native_create_id].
+        #[napi]
+        pub fn native_init_id_generator(length: u16, fingerprint: String) {
+            init_id(length, fingerprint);
+        }
+
+        /// Generates
+        #[napi]
+        pub fn native_create_id(date_num: BigInt) -> String {
+            let time = cmp::max(date_num.get_u64().1 - TIME_2000, 0);
+            format!("{:0>8}{}", radix_36(time).to_string(), create_id().unwrap())
+        }
+    }
+}
+
 #[cfg(test)]
 mod unit_test {
     use pretty_assertions::{assert_eq, assert_ne};
@@ -30,7 +67,7 @@ mod unit_test {
     #[test]
     fn can_generate_unique_ids() {
         assert_eq!(id::create_id(), Err(id::ErrorUninitialized));
-        id::init_id(12);
+        id::init_id(12, "");
         assert_eq!(id::create_id().unwrap().len(), 12);
         assert_ne!(id::create_id().unwrap(), id::create_id().unwrap());
         let id1 = thread::spawn(|| id::create_id().unwrap());
diff --git a/packages/backend/native-utils/src/util/random.rs b/packages/backend/native-utils/src/util/random.rs
index 5ee06d1282..ffcbca980f 100644
--- a/packages/backend/native-utils/src/util/random.rs
+++ b/packages/backend/native-utils/src/util/random.rs
@@ -1,5 +1,6 @@
 use rand::{distributions::Alphanumeric, thread_rng, Rng};
 
+/// Generate random string based on [thread_rng] and [Alphanumeric].
 pub fn gen_string(length: u16) -> String {
     thread_rng()
         .sample_iter(Alphanumeric)
@@ -8,6 +9,12 @@ pub fn gen_string(length: u16) -> String {
         .collect()
 }
 
+#[cfg(feature = "napi")]
+#[napi_derive::napi]
+pub fn native_random_str(length: u16) -> String {
+    gen_string(length)
+}
+
 #[cfg(test)]
 mod unit_test {
     use pretty_assertions::{assert_eq, assert_ne};

From a10ade8cf5672fb6fc904f2bef77d7d382797cad Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 12:19:36 -0400
Subject: [PATCH 245/319] fix unit test

---
 packages/backend/native-utils/Cargo.toml      |  2 +-
 packages/backend/native-utils/src/util/id.rs  | 43 ++++++++++++++-----
 packages/backend/native-utils/tests/common.rs |  2 +-
 3 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/packages/backend/native-utils/Cargo.toml b/packages/backend/native-utils/Cargo.toml
index ba7a48b8d3..071d0f331b 100644
--- a/packages/backend/native-utils/Cargo.toml
+++ b/packages/backend/native-utils/Cargo.toml
@@ -7,7 +7,7 @@ version = "0.0.0"
 members = ["migration/Cargo.toml"]
 
 [features]
-default = ["napi"]
+default = []
 noarray = []
 napi = ["dep:napi", "dep:napi-derive", "dep:radix_fmt"]
 
diff --git a/packages/backend/native-utils/src/util/id.rs b/packages/backend/native-utils/src/util/id.rs
index 1d28b80c05..539b0415e8 100644
--- a/packages/backend/native-utils/src/util/id.rs
+++ b/packages/backend/native-utils/src/util/id.rs
@@ -41,11 +41,13 @@ cfg_if! {
         use napi_derive::napi;
 
         const TIME_2000: u64 = 946_684_800_000;
+        const TIMESTAMP_LENGTH: u16 = 8;
 
         /// Calls [init_id] inside. Must be called before [native_create_id].
         #[napi]
         pub fn native_init_id_generator(length: u16, fingerprint: String) {
-            init_id(length, fingerprint);
+            // length to pass init_id shoule be greater than or equal to 8.
+            init_id(cmp::max(length - TIMESTAMP_LENGTH, 8), fingerprint);
         }
 
         /// Generates
@@ -59,19 +61,38 @@ cfg_if! {
 
 #[cfg(test)]
 mod unit_test {
+    use cfg_if::cfg_if;
     use pretty_assertions::{assert_eq, assert_ne};
     use std::thread;
-
     use crate::util::id;
 
-    #[test]
-    fn can_generate_unique_ids() {
-        assert_eq!(id::create_id(), Err(id::ErrorUninitialized));
-        id::init_id(12, "");
-        assert_eq!(id::create_id().unwrap().len(), 12);
-        assert_ne!(id::create_id().unwrap(), id::create_id().unwrap());
-        let id1 = thread::spawn(|| id::create_id().unwrap());
-        let id2 = thread::spawn(|| id::create_id().unwrap());
-        assert_ne!(id1.join().unwrap(), id2.join().unwrap())
+    cfg_if! {
+        if #[cfg(feature = "napi")] {
+            use chrono::Utc;
+
+            #[test]
+            fn can_generate_aid_compat_ids() {
+                id::native_init_id_generator(16, "".to_string());
+                let id1 = id::native_create_id(Utc::now().timestamp_millis().into());
+                assert_eq!(id1.len(), 16);
+                let id1 = id::native_create_id(Utc::now().timestamp_millis().into());
+                let id2 = id::native_create_id(Utc::now().timestamp_millis().into());
+                assert_ne!(id1, id2);
+                let id1 = thread::spawn(|| id::native_create_id(Utc::now().timestamp_millis().into()));
+                let id2 = thread::spawn(|| id::native_create_id(Utc::now().timestamp_millis().into()));
+                assert_ne!(id1.join().unwrap(), id2.join().unwrap());
+            }
+        } else {
+            #[test]
+            fn can_generate_unique_ids() {
+                assert_eq!(id::create_id(), Err(id::ErrorUninitialized));
+                id::init_id(12, "");
+                assert_eq!(id::create_id().unwrap().len(), 12);
+                assert_ne!(id::create_id().unwrap(), id::create_id().unwrap());
+                let id1 = thread::spawn(|| id::create_id().unwrap());
+                let id2 = thread::spawn(|| id::create_id().unwrap());
+                assert_ne!(id1.join().unwrap(), id2.join().unwrap())
+            }
+        }
     }
 }
diff --git a/packages/backend/native-utils/tests/common.rs b/packages/backend/native-utils/tests/common.rs
index 775b372126..61dd20aac7 100644
--- a/packages/backend/native-utils/tests/common.rs
+++ b/packages/backend/native-utils/tests/common.rs
@@ -139,7 +139,7 @@ async fn cleanup() {
 }
 
 async fn setup_model(db: &DbConn) {
-    init_id(12);
+    init_id(12, "");
 
     db.transaction::<_, (), DbErr>(|txn| {
         Box::pin(async move {

From 55118df53842fc08ae3b2f29fa25d91013ed9281 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 15:00:48 -0400
Subject: [PATCH 246/319] add test

---
 .../native-utils/__test__/index.spec.mjs      | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/backend/native-utils/__test__/index.spec.mjs b/packages/backend/native-utils/__test__/index.spec.mjs
index 1788dbb061..6e6a91858c 100644
--- a/packages/backend/native-utils/__test__/index.spec.mjs
+++ b/packages/backend/native-utils/__test__/index.spec.mjs
@@ -1,6 +1,12 @@
 import test from "ava";
 
-import { convertId, IdConvertType } from "../built/index.js";
+import {
+	convertId,
+	IdConvertType,
+	nativeInitIdGenerator,
+	nativeCreateId,
+	nativeRandomStr,
+} from "../built/index.js";
 
 test("convert to mastodon id", (t) => {
 	t.is(convertId("9gf61ehcxv", IdConvertType.MastodonId), "960365976481219");
@@ -13,3 +19,14 @@ test("convert to mastodon id", (t) => {
 		"3494513243013053824",
 	);
 });
+
+test("create cuid2 with timestamp prefix", (t) => {
+	nativeInitIdGenerator(16, "");
+	t.not(nativeCreateId(BigInt(Date.now())), nativeCreateId(BigInt(Date.now())));
+	t.is(nativeCreateId(BigInt(Date.now())).length, 16);
+});
+
+test("create random string", (t) => {
+	t.not(nativeRandomStr(16), nativeRandomStr(16));
+	t.is(nativeRandomStr(24).length, 24);
+});

From 8bb87f9ea4589b606dd28538038ed8bb15bafa79 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 15:01:03 -0400
Subject: [PATCH 247/319] use native generators

---
 packages/backend/src/misc/gen-id.ts        | 19 +++++-----------
 packages/backend/src/misc/secure-rndstr.ts | 25 +++-------------------
 2 files changed, 8 insertions(+), 36 deletions(-)

diff --git a/packages/backend/src/misc/gen-id.ts b/packages/backend/src/misc/gen-id.ts
index fb92dd808c..c9e52c8295 100644
--- a/packages/backend/src/misc/gen-id.ts
+++ b/packages/backend/src/misc/gen-id.ts
@@ -1,14 +1,9 @@
-import { init, createId } from "@paralleldrive/cuid2";
 import config from "@/config/index.js";
+import { nativeCreateId, nativeInitIdGenerator } from "native-utils/built";
 
-const TIME2000 = 946684800000;
-const TIMESTAMP_LENGTH = 8;
-
-const length =
-	Math.min(Math.max(config.cuid?.length ?? 16, 16), 24) - TIMESTAMP_LENGTH;
-const fingerprint = `${config.cuid?.fingerprint ?? ""}${createId()}`;
-
-const genCuid2 = init({ length, fingerprint });
+const length = Math.min(Math.max(config.cuid?.length ?? 16, 16), 24);
+const fingerprint = config.cuid?.fingerprint ?? "";
+nativeInitIdGenerator(length, fingerprint);
 
 /**
  * The generated ID results in the form of `[8 chars timestamp] + [cuid2]`.
@@ -19,9 +14,5 @@ const genCuid2 = init({ length, fingerprint });
  * Ref: https://github.com/paralleldrive/cuid2#parameterized-length
  */
 export function genId(date?: Date): string {
-	const now = (date ?? new Date()).getTime();
-	const time = Math.max(now - TIME2000, 0);
-	const timestamp = time.toString(36).padStart(TIMESTAMP_LENGTH, "0");
-
-	return `${timestamp}${genCuid2()}`;
+	return nativeCreateId(BigInt((date ?? new Date()).getTime()));
 }
diff --git a/packages/backend/src/misc/secure-rndstr.ts b/packages/backend/src/misc/secure-rndstr.ts
index 7f5754e1c5..4f4c9884ae 100644
--- a/packages/backend/src/misc/secure-rndstr.ts
+++ b/packages/backend/src/misc/secure-rndstr.ts
@@ -1,24 +1,5 @@
-import * as crypto from "node:crypto";
+import { nativeRandomStr } from "native-utils/built";
 
-const L_CHARS = "0123456789abcdefghijklmnopqrstuvwxyz";
-const LU_CHARS =
-	"0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-
-export function secureRndstr(length = 32, useLU = true): string {
-	const chars = useLU ? LU_CHARS : L_CHARS;
-	const chars_len = chars.length;
-
-	let str = "";
-
-	for (let i = 0; i < length; i++) {
-		let rand = Math.floor(
-			(crypto.randomBytes(1).readUInt8(0) / 0xff) * chars_len,
-		);
-		if (rand === chars_len) {
-			rand = chars_len - 1;
-		}
-		str += chars.charAt(rand);
-	}
-
-	return str;
+export function secureRndstr(length = 32, _ = true): string {
+	return nativeRandomStr(length);
 }

From ba578c87019b0fd6abb154339b6f8ef401680dcc Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 15:01:29 -0400
Subject: [PATCH 248/319] initialize native database on boot

---
 packages/backend/src/db/postgre.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/backend/src/db/postgre.ts b/packages/backend/src/db/postgre.ts
index dd202b3def..9ffaf596c8 100644
--- a/packages/backend/src/db/postgre.ts
+++ b/packages/backend/src/db/postgre.ts
@@ -78,6 +78,7 @@ import { entities as charts } from "@/services/chart/entities.js";
 import { envOption } from "../env.js";
 import { dbLogger } from "./logger.js";
 import { redisClient } from "./redis.js";
+import { nativeInitDatabase } from "native-utils/built/index.js";
 
 const sqlLogger = dbLogger.createSubLogger("sql", "gray", false);
 
@@ -220,6 +221,9 @@ export const db = new DataSource({
 });
 
 export async function initDb(force = false) {
+	await nativeInitDatabase(
+		`postgres://${config.db.user}:${config.db.pass}@${config.db.host}:${config.db.port}/${config.db.db}`,
+	);
 	if (force) {
 		if (db.isInitialized) {
 			await db.destroy();

From 10072d6e4d407993362b304de37e15c0f4f50763 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 15:04:25 -0400
Subject: [PATCH 249/319] remove node cuid2

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

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 0b0315a069..020257dd82 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -32,7 +32,6 @@
 		"@koa/cors": "3.4.3",
 		"@koa/multer": "3.0.0",
 		"@koa/router": "9.0.1",
-		"@paralleldrive/cuid2": "2.2.0",
 		"@peertube/http-signature": "1.7.0",
 		"@redocly/openapi-core": "1.0.0-beta.120",
 		"@sinonjs/fake-timers": "9.1.2",

From 0224824a36b25f89a41a33e89d80d8509b38ae30 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 15:50:40 -0400
Subject: [PATCH 250/319] fix native import

---
 .../native-utils/src/model/schema/antenna.rs  | 26 ++++++++-----------
 packages/backend/src/misc/gen-id.ts           |  2 +-
 packages/backend/src/misc/secure-rndstr.ts    |  2 +-
 .../src/models/repositories/antenna.ts        | 12 +++++----
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/packages/backend/native-utils/src/model/schema/antenna.rs b/packages/backend/native-utils/src/model/schema/antenna.rs
index 99521a98b0..198230e9a2 100644
--- a/packages/backend/native-utils/src/model/schema/antenna.rs
+++ b/packages/backend/native-utils/src/model/schema/antenna.rs
@@ -70,7 +70,7 @@ cfg_if! {
         use crate::model::repository::Repository;
 
         /// For NAPI because [chrono] is not supported.
-        #[napi]
+        #[napi(object)]
         #[derive(Clone, Debug, PartialEq, Eq, JsonSchema, ToSchema)]
         #[serde(rename_all = "camelCase")]
         pub struct NativeAntennaSchema {
@@ -97,26 +97,22 @@ cfg_if! {
             pub has_unread_note: bool,
         }
 
-        #[napi]
+        #[napi(string_enum)]
         #[derive(Debug, FromStr, PartialEq, Eq, JsonSchema, ToSchema)]
-        #[serde(rename_all = "camelCase")]
-        #[display(style = "camelCase")]
         #[display("'{}'")]
+        #[allow(non_camel_case_types)]
         pub enum NativeAntennaSrc {
-            Home,
-            All,
-            Users,
-            List,
-            Group,
-            Instances,
+            home,
+            all,
+            users,
+            list,
+            group,
+            instances,
         }
 
         #[napi]
-        impl NativeAntennaSchema {
-            #[napi]
-            pub async fn pack_by_id(id: String) -> napi::Result<NativeAntennaSchema> {
-                antenna::Model::pack_by_id(id).await.map_err(Into::into)
-            }
+        pub async fn native_pack_antenna_by_id(id: String) -> napi::Result<NativeAntennaSchema> {
+            antenna::Model::pack_by_id(id).await.map_err(Into::into)
         }
     }
 }
diff --git a/packages/backend/src/misc/gen-id.ts b/packages/backend/src/misc/gen-id.ts
index c9e52c8295..a016111ca9 100644
--- a/packages/backend/src/misc/gen-id.ts
+++ b/packages/backend/src/misc/gen-id.ts
@@ -1,5 +1,5 @@
 import config from "@/config/index.js";
-import { nativeCreateId, nativeInitIdGenerator } from "native-utils/built";
+import { nativeCreateId, nativeInitIdGenerator } from "native-utils/built/index.js";
 
 const length = Math.min(Math.max(config.cuid?.length ?? 16, 16), 24);
 const fingerprint = config.cuid?.fingerprint ?? "";
diff --git a/packages/backend/src/misc/secure-rndstr.ts b/packages/backend/src/misc/secure-rndstr.ts
index 4f4c9884ae..3d69a4d4a5 100644
--- a/packages/backend/src/misc/secure-rndstr.ts
+++ b/packages/backend/src/misc/secure-rndstr.ts
@@ -1,4 +1,4 @@
-import { nativeRandomStr } from "native-utils/built";
+import { nativeRandomStr } from "native-utils/built/index.js";
 
 export function secureRndstr(length = 32, _ = true): string {
 	return nativeRandomStr(length);
diff --git a/packages/backend/src/models/repositories/antenna.ts b/packages/backend/src/models/repositories/antenna.ts
index d9405f4a99..d66aab4eef 100644
--- a/packages/backend/src/models/repositories/antenna.ts
+++ b/packages/backend/src/models/repositories/antenna.ts
@@ -1,12 +1,14 @@
 import { db } from "@/db/postgre.js";
 import { Antenna } from "@/models/entities/antenna.js";
-import { AntennaSchema } from "native-utils/built/index.js";
+import {
+	NativeAntennaSchema,
+	nativePackAntennaById,
+} from "native-utils/built/index.js";
 
 export const AntennaRepository = db.getRepository(Antenna).extend({
-	async pack(src: Antenna["id"] | Antenna): Promise<AntennaSchema> {
-		const id =
-			typeof src === "object" ? src.id : src;
+	async pack(src: Antenna["id"] | Antenna): Promise<NativeAntennaSchema> {
+		const id = typeof src === "object" ? src.id : src;
 
-		return await AntennaSchema.packById(id);
+		return await nativePackAntennaById(id);
 	},
 });

From 80e5d25698500f70e747be13e016e5077db5237f Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 16:05:29 -0400
Subject: [PATCH 251/319] pnpm install

---
 pnpm-lock.yaml | 499 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 480 insertions(+), 19 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1c06f87dd8..0d65da71e0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -108,9 +108,6 @@ importers:
       '@koa/router':
         specifier: 9.0.1
         version: 9.0.1
-      '@paralleldrive/cuid2':
-        specifier: 2.2.0
-        version: 2.2.0
       '@peertube/http-signature':
         specifier: 1.7.0
         version: 1.7.0
@@ -612,6 +609,15 @@ importers:
         specifier: 8.11.0
         version: 8.11.0
 
+  packages/backend/native-utils:
+    devDependencies:
+      '@napi-rs/cli':
+        specifier: 2.15.0
+        version: 2.15.0
+      ava:
+        specifier: 5.1.1
+        version: 5.1.1
+
   packages/calckey-js:
     dependencies:
       autobind-decorator:
@@ -2288,11 +2294,6 @@ packages:
     resolution: {integrity: sha512-RDDr7ZF0cgbd37+NBGeQOjP7Tm/iNM+y3FmrT5bVQBXLePOTuKVC/dBsdN5UZv3Sl2XAwEvBfaGR90E0d8AA6g==}
     engines: {node: '>= 10'}
     hasBin: true
-    dev: false
-
-  /@noble/hashes@1.3.0:
-    resolution: {integrity: sha512-ilHEACi9DwqJB0pw7kv+Apvh50jiiSyR/cQ3y4W7lOR5mhvn/50FLUfsnfJz0BDZtl/RR16kXvptiv6q1msYZg==}
-    dev: false
 
   /@nodelib/fs.scandir@2.1.5:
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
@@ -2347,12 +2348,6 @@ packages:
       through: 2.3.4
     dev: false
 
-  /@paralleldrive/cuid2@2.2.0:
-    resolution: {integrity: sha512-CVQDpPIUHrUGGLdrMGz1NmqZvqmsB2j2rCIQEu1EvxWjlFh4fhvEGmgR409cY20/67/WlJsggenq0no3p3kYsw==}
-    dependencies:
-      '@noble/hashes': 1.3.0
-    dev: false
-
   /@peertube/http-signature@1.7.0:
     resolution: {integrity: sha512-aGQIwo6/sWtyyqhVK4e1MtxYz4N1X8CNt6SOtCc+Wnczs5S5ONaLHDDR8LYaGn0MgOwvGgXyuZ5sJIfd7iyoUw==}
     engines: {node: '>=0.10'}
@@ -4170,6 +4165,14 @@ packages:
       clean-stack: 2.2.0
       indent-string: 4.0.0
 
+  /aggregate-error@4.0.1:
+    resolution: {integrity: sha512-0poP0T7el6Vq3rstR8Mn4V/IQrpBLO6POkUSrN7RhyY+GF/InCFShQzsQ39T25gkHhLgSLByyAz+Kjb+c2L98w==}
+    engines: {node: '>=12'}
+    dependencies:
+      clean-stack: 4.2.0
+      indent-string: 5.0.0
+    dev: true
+
   /ajv-keywords@3.5.2(ajv@6.12.6):
     resolution: {integrity: sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==}
     peerDependencies:
@@ -4239,6 +4242,11 @@ packages:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
 
+  /ansi-regex@6.0.1:
+    resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
+    engines: {node: '>=12'}
+    dev: true
+
   /ansi-styles@2.2.1:
     resolution: {integrity: sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==}
     engines: {node: '>=0.10.0'}
@@ -4261,6 +4269,11 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  /ansi-styles@6.2.1:
+    resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
+    engines: {node: '>=12'}
+    dev: true
+
   /ansi-wrap@0.1.0:
     resolution: {integrity: sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==}
     engines: {node: '>=0.10.0'}
@@ -4420,6 +4433,11 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /array-find-index@1.0.2:
+    resolution: {integrity: sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /array-initial@1.1.0:
     resolution: {integrity: sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw==}
     engines: {node: '>=0.10.0'}
@@ -4459,11 +4477,21 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /arrgv@1.0.2:
+    resolution: {integrity: sha512-a4eg4yhp7mmruZDQFqVMlxNRFGi/i1r87pt8SDHy0/I8PqSXoUTlWZRdAZo0VXgvEARcujbtTk8kiZRi1uDGRw==}
+    engines: {node: '>=8.0.0'}
+    dev: true
+
   /arrify@1.0.1:
     resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==}
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /arrify@3.0.0:
+    resolution: {integrity: sha512-tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw==}
+    engines: {node: '>=12'}
+    dev: true
+
   /asap@2.0.6:
     resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
 
@@ -4569,6 +4597,65 @@ packages:
       oauth: 0.9.15
     dev: false
 
+  /ava@5.1.1:
+    resolution: {integrity: sha512-od1CWgWVIKZSdEc1dhQWhbsd6KBs0EYjek7eqZNGPvy+NyC9Q1bXixcadlgOXwDG9aM0zLMQZwRXfe9gMb1LQQ==}
+    engines: {node: '>=14.19 <15 || >=16.15 <17 || >=18'}
+    hasBin: true
+    peerDependencies:
+      '@ava/typescript': '*'
+    peerDependenciesMeta:
+      '@ava/typescript':
+        optional: true
+    dependencies:
+      acorn: 8.8.1
+      acorn-walk: 8.2.0
+      ansi-styles: 6.2.1
+      arrgv: 1.0.2
+      arrify: 3.0.0
+      callsites: 4.0.0
+      cbor: 8.1.0
+      chalk: 5.2.0
+      chokidar: 3.5.3
+      chunkd: 2.0.1
+      ci-info: 3.7.1
+      ci-parallel-vars: 1.0.1
+      clean-yaml-object: 0.1.0
+      cli-truncate: 3.1.0
+      code-excerpt: 4.0.0
+      common-path-prefix: 3.0.0
+      concordance: 5.0.4
+      currently-unhandled: 0.4.1
+      debug: 4.3.4(supports-color@8.1.1)
+      del: 7.0.0
+      emittery: 1.0.1
+      figures: 5.0.0
+      globby: 13.1.4
+      ignore-by-default: 2.1.0
+      indent-string: 5.0.0
+      is-error: 2.2.2
+      is-plain-object: 5.0.0
+      is-promise: 4.0.0
+      matcher: 5.0.0
+      mem: 9.0.2
+      ms: 2.1.3
+      p-event: 5.0.1
+      p-map: 5.5.0
+      picomatch: 2.3.1
+      pkg-conf: 4.0.0
+      plur: 5.1.0
+      pretty-ms: 8.0.0
+      resolve-cwd: 3.0.0
+      slash: 3.0.0
+      stack-utils: 2.0.6
+      strip-ansi: 7.1.0
+      supertap: 3.0.1
+      temp-dir: 3.0.0
+      write-file-atomic: 5.0.1
+      yargs: 17.6.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /available-typed-arrays@1.0.5:
     resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==}
     engines: {node: '>= 0.4'}
@@ -4833,6 +4920,10 @@ packages:
   /bluebird@3.7.2:
     resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
 
+  /blueimp-md5@2.19.0:
+    resolution: {integrity: sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==}
+    dev: true
+
   /blurhash@1.1.5:
     resolution: {integrity: sha512-a+LO3A2DfxTaTztsmkbLYmUzUeApi0LZuKalwbNmqAHR6HhJGMt1qSV/R3wc+w4DL28holjqO3Bg74aUGavGjg==}
 
@@ -5109,6 +5200,11 @@ packages:
     resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
     engines: {node: '>=6'}
 
+  /callsites@4.0.0:
+    resolution: {integrity: sha512-y3jRROutgpKdz5vzEhWM34TidDU8vkJppF8dszITeb1PQmSqV3DTxyV8G/lyO/DNvtE1YTedehmw9MPZsCBHxQ==}
+    engines: {node: '>=12.20'}
+    dev: true
+
   /camelcase-keys@6.2.2:
     resolution: {integrity: sha512-YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==}
     engines: {node: '>=8'}
@@ -5205,7 +5301,6 @@ packages:
   /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:
     resolution: {integrity: sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==}
@@ -5315,11 +5410,19 @@ packages:
     engines: {node: '>=6.0'}
     dev: true
 
+  /chunkd@2.0.1:
+    resolution: {integrity: sha512-7d58XsFmOq0j6el67Ug9mHf9ELUXsQXYJBkyxhH/k+6Ke0qXRnv0kbemx+Twc6fRJ07C49lcbdgm9FL1Ei/6SQ==}
+    dev: true
+
   /ci-info@3.7.1:
     resolution: {integrity: sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==}
     engines: {node: '>=8'}
     dev: true
 
+  /ci-parallel-vars@1.0.1:
+    resolution: {integrity: sha512-uvzpYrpmidaoxvIQHM+rKSrigjOe9feHYbw4uOI2gdfe1C3xIlxO+kVXq83WQWNniTf8bAxVpy+cQeFQsMERKg==}
+    dev: true
+
   /city-timezones@1.2.1:
     resolution: {integrity: sha512-hruuB611QFoUFMsan7xd9B2VPMrA8XC716O/999WW34kmaJUT1hxKF2W8TSXAWkhSqgvbu70DjcDv7/wpM6vow==}
     dependencies:
@@ -5351,6 +5454,18 @@ packages:
     resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
     engines: {node: '>=6'}
 
+  /clean-stack@4.2.0:
+    resolution: {integrity: sha512-LYv6XPxoyODi36Dp976riBtSY27VmFo+MKqEU9QCCWyTrdEPDog+RWA7xQWHi6Vbp61j5c4cdzzX1NidnwtUWg==}
+    engines: {node: '>=12'}
+    dependencies:
+      escape-string-regexp: 5.0.0
+    dev: true
+
+  /clean-yaml-object@0.1.0:
+    resolution: {integrity: sha512-3yONmlN9CSAkzNwnRCiJQ7Q2xK5mWuEfL3PuTZcAUzhObbXsfsnMptJzXwz93nc5zn9V9TwCVMmV7w4xsm43dw==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /cli-cursor@3.1.0:
     resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
     engines: {node: '>=8'}
@@ -5388,6 +5503,14 @@ packages:
       string-width: 4.2.3
     dev: true
 
+  /cli-truncate@3.1.0:
+    resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      slice-ansi: 5.0.0
+      string-width: 5.1.2
+    dev: true
+
   /cliui@3.2.0:
     resolution: {integrity: sha512-0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==}
     dependencies:
@@ -5418,7 +5541,6 @@ packages:
       string-width: 4.2.3
       strip-ansi: 6.0.1
       wrap-ansi: 7.0.0
-    dev: false
 
   /clone-buffer@1.0.0:
     resolution: {integrity: sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==}
@@ -5499,6 +5621,13 @@ packages:
       q: 1.5.1
     dev: true
 
+  /code-excerpt@4.0.0:
+    resolution: {integrity: sha512-xxodCmBen3iy2i0WtAK8FlFNrRzjUqjRsMfho58xT/wvZU1YTM3fCnRjcy1gJPMepaRlgm/0e6w8SpWHpn3/cA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      convert-to-spaces: 2.0.1
+    dev: true
+
   /code-point-at@1.1.0:
     resolution: {integrity: sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==}
     engines: {node: '>=0.10.0'}
@@ -5630,6 +5759,10 @@ packages:
     engines: {node: ^12.20.0 || >=14}
     dev: true
 
+  /common-path-prefix@3.0.0:
+    resolution: {integrity: sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==}
+    dev: true
+
   /common-tags@1.8.2:
     resolution: {integrity: sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==}
     engines: {node: '>=4.0.0'}
@@ -5665,6 +5798,20 @@ packages:
       readable-stream: 2.3.7
       typedarray: 0.0.6
 
+  /concordance@5.0.4:
+    resolution: {integrity: sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==}
+    engines: {node: '>=10.18.0 <11 || >=12.14.0 <13 || >=14'}
+    dependencies:
+      date-time: 3.1.0
+      esutils: 2.0.3
+      fast-diff: 1.3.0
+      js-string-escape: 1.0.1
+      lodash: 4.17.21
+      md5-hex: 3.0.1
+      semver: 7.3.8
+      well-known-symbols: 2.0.0
+    dev: true
+
   /condense-newlines@0.2.1:
     resolution: {integrity: sha512-P7X+QL9Hb9B/c8HI5BFFKmjgBu2XpQuF98WZ9XkO+dBGgk5XgwiQz7o1SmpglNWId3581UcS0SFAWfoIhMHPfg==}
     engines: {node: '>=0.10.0'}
@@ -5873,6 +6020,11 @@ packages:
     resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
     dev: true
 
+  /convert-to-spaces@2.0.1:
+    resolution: {integrity: sha512-rcQ1bsQO9799wq24uE5AM2tAILy4gXGIK/njFWcVQkGNZ96edlpY+A7bjwvzjYvLDyzmG1MmMLZhpcsb+klNMQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dev: true
+
   /cookies@0.8.0:
     resolution: {integrity: sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==}
     engines: {node: '>= 0.8'}
@@ -6075,6 +6227,13 @@ packages:
     resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
     dev: true
 
+  /currently-unhandled@0.4.1:
+    resolution: {integrity: sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==}
+    engines: {node: '>=0.10.0'}
+    dependencies:
+      array-find-index: 1.0.2
+    dev: true
+
   /custom-event-polyfill@1.0.7:
     resolution: {integrity: sha512-TDDkd5DkaZxZFM8p+1I3yAlvM3rSr1wbrOliG4yJiwinMZN8z/iGL7BTlDkrJcYTmgUSb4ywVCc3ZaUtOtC76w==}
     dev: true
@@ -6177,6 +6336,13 @@ packages:
     resolution: {integrity: sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==}
     engines: {node: '>=0.11'}
 
+  /date-time@3.1.0:
+    resolution: {integrity: sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg==}
+    engines: {node: '>=6'}
+    dependencies:
+      time-zone: 1.0.0
+    dev: true
+
   /dayjs@1.11.7:
     resolution: {integrity: sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==}
 
@@ -6341,6 +6507,20 @@ packages:
     resolution: {integrity: sha512-hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==}
     dev: true
 
+  /del@7.0.0:
+    resolution: {integrity: sha512-tQbV/4u5WVB8HMJr08pgw0b6nG4RGt/tj+7Numvq+zqcvUFeMaIWWOUFltiU+6go8BSO2/ogsB4EasDaj0y68Q==}
+    engines: {node: '>=14.16'}
+    dependencies:
+      globby: 13.1.4
+      graceful-fs: 4.2.11
+      is-glob: 4.0.3
+      is-path-cwd: 3.0.0
+      is-path-inside: 4.0.0
+      p-map: 5.5.0
+      rimraf: 3.0.2
+      slash: 4.0.0
+    dev: true
+
   /delayed-stream@1.0.0:
     resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
     engines: {node: '>=0.4.0'}
@@ -6520,6 +6700,10 @@ packages:
       object.defaults: 1.1.0
     dev: true
 
+  /eastasianwidth@0.2.0:
+    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
+    dev: true
+
   /ecc-jsbn@0.1.2:
     resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==}
     dependencies:
@@ -6561,9 +6745,18 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  /emittery@1.0.1:
+    resolution: {integrity: sha512-2ID6FdrMD9KDLldGesP6317G78K7km/kMcwItRtVFva7I/cSEOIaLpewaUb+YLXVwdAp3Ctfxh/V5zIl1sj7dQ==}
+    engines: {node: '>=14.16'}
+    dev: true
+
   /emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
+  /emoji-regex@9.2.2:
+    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
+    dev: true
+
   /emojis-list@3.0.0:
     resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==}
     engines: {node: '>= 4'}
@@ -7198,6 +7391,10 @@ packages:
   /fast-deep-equal@3.1.3:
     resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
 
+  /fast-diff@1.3.0:
+    resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==}
+    dev: true
+
   /fast-glob@3.2.12:
     resolution: {integrity: sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==}
     engines: {node: '>=8.6.0'}
@@ -7269,6 +7466,14 @@ packages:
       escape-string-regexp: 1.0.5
     dev: true
 
+  /figures@5.0.0:
+    resolution: {integrity: sha512-ej8ksPF4x6e5wvK9yevct0UCXh8TTFlWGVLlgjZuoBH1HwjIfKE/IdL5mq89sFA7zELi1VhKpmtDnrs7zWyeyg==}
+    engines: {node: '>=14'}
+    dependencies:
+      escape-string-regexp: 5.0.0
+      is-unicode-supported: 1.3.0
+    dev: true
+
   /file-entry-cache@6.0.1:
     resolution: {integrity: sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==}
     engines: {node: ^10.12.0 || >=12.0.0}
@@ -7345,6 +7550,14 @@ packages:
       locate-path: 6.0.0
       path-exists: 4.0.0
 
+  /find-up@6.3.0:
+    resolution: {integrity: sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      locate-path: 7.2.0
+      path-exists: 5.0.0
+    dev: true
+
   /find-versions@5.1.0:
     resolution: {integrity: sha512-+iwzCJ7C5v5KgcBuueqVoNiHVoQpwiUK5XFLjf0affFTep+Wcw93tPvmb8tqujDNmzhBDPddnWV/qgWSXgq+Hg==}
     engines: {node: '>=12'}
@@ -7571,7 +7784,7 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       at-least-node: 1.0.0
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jsonfile: 6.1.0
       universalify: 2.0.0
     dev: true
@@ -7882,6 +8095,17 @@ packages:
       slash: 3.0.0
     dev: true
 
+  /globby@13.1.4:
+    resolution: {integrity: sha512-iui/IiiW+QrJ1X1hKH5qwlMQyv34wJAYwH1vrf8b9kBA4sNiif3gKsMHa+BrdnOpEudWjpotfa7LrTzB1ERS/g==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      dir-glob: 3.0.1
+      fast-glob: 3.2.12
+      ignore: 5.2.4
+      merge2: 1.4.1
+      slash: 4.0.0
+    dev: true
+
   /glogg@1.0.2:
     resolution: {integrity: sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==}
     engines: {node: '>= 0.10'}
@@ -8393,6 +8617,11 @@ packages:
   /ieee754@1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
+  /ignore-by-default@2.1.0:
+    resolution: {integrity: sha512-yiWd4GVmJp0Q6ghmM2B/V3oZGRmjrKLXvHR3TE1nfoXsmoggllfZUQe74EN0fJdPFZu2NIvNdrMMLm3OsV7Ohw==}
+    engines: {node: '>=10 <11 || >=12 <13 || >=14'}
+    dev: true
+
   /ignore@4.0.6:
     resolution: {integrity: sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==}
     engines: {node: '>= 4'}
@@ -8435,6 +8664,11 @@ packages:
     resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
     engines: {node: '>=8'}
 
+  /indent-string@5.0.0:
+    resolution: {integrity: sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==}
+    engines: {node: '>=12'}
+    dev: true
+
   /indexes-of@1.0.1:
     resolution: {integrity: sha512-bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA==}
     dev: true
@@ -8659,6 +8893,10 @@ packages:
     resolution: {integrity: sha512-r8EEQQsqT+Gn0aXFx7lTFygYQhILLCB+wn0WCDL5LZRINeLH/Rvw1j2oKodELLXYNImQ3CRlVsY8wW4cGOsyuw==}
     dev: false
 
+  /is-error@2.2.2:
+    resolution: {integrity: sha512-IOQqts/aHWbiisY5DuPJQ0gcbvaLFCa7fBa9xoLfxBZvQ+ZI/Zh9xoI7Gk+G64N0FdK4AbibytHht2tWgpJWLg==}
+    dev: true
+
   /is-expression@4.0.0:
     resolution: {integrity: sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==}
     dependencies:
@@ -8691,6 +8929,11 @@ packages:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
+  /is-fullwidth-code-point@4.0.0:
+    resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}
+    engines: {node: '>=12'}
+    dev: true
+
   /is-generator-fn@2.1.0:
     resolution: {integrity: sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==}
     engines: {node: '>=6'}
@@ -8756,10 +8999,20 @@ packages:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
 
+  /is-path-cwd@3.0.0:
+    resolution: {integrity: sha512-kyiNFFLU0Ampr6SDZitD/DwUo4Zs1nSdnygUBqsu3LooL00Qvb5j+UnvApUn/TTj1J3OuE6BTdQ5rudKmU2ZaA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dev: true
+
   /is-path-inside@3.0.3:
     resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==}
     engines: {node: '>=8'}
 
+  /is-path-inside@4.0.0:
+    resolution: {integrity: sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==}
+    engines: {node: '>=12'}
+    dev: true
+
   /is-plain-obj@1.1.0:
     resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
     engines: {node: '>=0.10.0'}
@@ -8787,6 +9040,10 @@ packages:
   /is-promise@2.2.2:
     resolution: {integrity: sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==}
 
+  /is-promise@4.0.0:
+    resolution: {integrity: sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==}
+    dev: true
+
   /is-regex@1.1.4:
     resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
     engines: {node: '>= 0.4'}
@@ -8856,6 +9113,11 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  /is-unicode-supported@1.3.0:
+    resolution: {integrity: sha512-43r2mRvz+8JRIKnWJ+3j8JtjRKZ6GmjzfaE/qiBJnikNnYv/6bagRJ1kUhNk8R5EX/GkobD+r+sfxCPJsiKBLQ==}
+    engines: {node: '>=12'}
+    dev: true
+
   /is-url@1.2.4:
     resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
     dev: false
@@ -9501,6 +9763,11 @@ packages:
   /js-sdsl@4.2.0:
     resolution: {integrity: sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==}
 
+  /js-string-escape@1.0.1:
+    resolution: {integrity: sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==}
+    engines: {node: '>= 0.8'}
+    dev: true
+
   /js-stringify@1.0.2:
     resolution: {integrity: sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==}
 
@@ -10133,6 +10400,11 @@ packages:
       strip-bom: 2.0.0
     dev: true
 
+  /load-json-file@7.0.1:
+    resolution: {integrity: sha512-Gnxj3ev3mB5TkVBGad0JM6dmLiQL+o0t23JPBZ9sd+yvSLk05mFoqKBw5N8gbbkU4TNXyqCgIrl/VM17OgUIgQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dev: true
+
   /loader-runner@4.3.0:
     resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==}
     engines: {node: '>=6.11.5'}
@@ -10163,6 +10435,13 @@ packages:
     dependencies:
       p-locate: 5.0.0
 
+  /locate-path@7.2.0:
+    resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      p-locate: 6.0.0
+    dev: true
+
   /lodash.assignin@4.2.0:
     resolution: {integrity: sha512-yX/rx6d/UTVh7sSVWVSIMjfnz95evAgDFdb1ZozC35I9mSFCkmzptOzevxjgbQUsc78NR44LVHWjsoMQXy9FDg==}
     dev: false
@@ -10365,6 +10644,13 @@ packages:
       tmpl: 1.0.5
     dev: true
 
+  /map-age-cleaner@0.1.3:
+    resolution: {integrity: sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==}
+    engines: {node: '>=6'}
+    dependencies:
+      p-defer: 1.0.0
+    dev: true
+
   /map-cache@0.2.2:
     resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
     engines: {node: '>=0.10.0'}
@@ -10403,6 +10689,13 @@ packages:
       - supports-color
     dev: true
 
+  /matcher@5.0.0:
+    resolution: {integrity: sha512-s2EMBOWtXFc8dgqvoAzKJXxNHibcdJMV0gwqKUaw9E2JBJuGUK7DrNKrA6g/i+v72TT16+6sVm5mS3thaMLQUw==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      escape-string-regexp: 5.0.0
+    dev: true
+
   /math-expression-evaluator@1.4.0:
     resolution: {integrity: sha512-4vRUvPyxdO8cWULGTh9dZWL2tZK6LDBvj+OGHBER7poH9Qdt7kXEoj20wiz4lQUbUXQZFjPbe5mVDo9nutizCw==}
     dev: true
@@ -10411,6 +10704,13 @@ packages:
     resolution: {integrity: sha512-/ZVem4WygUnbmo/iE4oHZpZS97btfBtYy5Iwn1396vUZU7YhgVEN8J4UWwfZwY1ZqoTYlPgjvSw9WXauuXL0mg==}
     dev: true
 
+  /md5-hex@3.0.1:
+    resolution: {integrity: sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==}
+    engines: {node: '>=8'}
+    dependencies:
+      blueimp-md5: 2.19.0
+    dev: true
+
   /media-typer@0.3.0:
     resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
     engines: {node: '>= 0.6'}
@@ -10424,6 +10724,14 @@ packages:
       - encoding
     dev: false
 
+  /mem@9.0.2:
+    resolution: {integrity: sha512-F2t4YIv9XQUBHt6AOJ0y7lSmP1+cY7Fm1DRh9GClTGzKST7UWLMx6ly9WZdLH/G/ppM5RL4MlQfRT71ri9t19A==}
+    engines: {node: '>=12.20'}
+    dependencies:
+      map-age-cleaner: 0.1.3
+      mimic-fn: 4.0.0
+    dev: true
+
   /meow@9.0.0:
     resolution: {integrity: sha512-+obSblOQmRhcyBt62furQqRAQpNyWXo8BuQ5bN7dG8wmwQ+vwHKp/rCFD4CrTP8CsDQD1sjoZ94K417XEUk8IQ==}
     engines: {node: '>=10'}
@@ -11322,6 +11630,18 @@ packages:
     engines: {node: '>=12.20'}
     dev: false
 
+  /p-defer@1.0.0:
+    resolution: {integrity: sha512-wB3wfAxZpk2AzOfUMJNL+d36xothRSyj8EXOa4f6GMqYDN9BJaaSISbsk+wS9abmnebVw95C2Kb5t85UmpCxuw==}
+    engines: {node: '>=4'}
+    dev: true
+
+  /p-event@5.0.1:
+    resolution: {integrity: sha512-dd589iCQ7m1L0bmC5NLlVYfy3TbBEsMUfWx9PyAgPeIcFZ/E2yaTZ4Rz4MiBmmJShviiftHVXOqfnfzJ6kyMrQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      p-timeout: 5.1.0
+    dev: true
+
   /p-finally@1.0.0:
     resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
     engines: {node: '>=4'}
@@ -11339,6 +11659,13 @@ packages:
     dependencies:
       yocto-queue: 0.1.0
 
+  /p-limit@4.0.0:
+    resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      yocto-queue: 1.0.0
+    dev: true
+
   /p-locate@4.1.0:
     resolution: {integrity: sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==}
     engines: {node: '>=8'}
@@ -11351,12 +11678,26 @@ packages:
     dependencies:
       p-limit: 3.1.0
 
+  /p-locate@6.0.0:
+    resolution: {integrity: sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      p-limit: 4.0.0
+    dev: true
+
   /p-map@4.0.0:
     resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
     engines: {node: '>=10'}
     dependencies:
       aggregate-error: 3.1.0
 
+  /p-map@5.5.0:
+    resolution: {integrity: sha512-VFqfGDHlx87K66yZrNdI4YGtD70IRyd+zSvgks6mzHPRNkoKy+9EKP4SFC77/vTTQYmRmti7dvqC+m5jBrBAcg==}
+    engines: {node: '>=12'}
+    dependencies:
+      aggregate-error: 4.0.1
+    dev: true
+
   /p-queue@6.6.2:
     resolution: {integrity: sha512-RwFpb72c/BhQLEXIZ5K2e+AhgNVmIejGlTgiB9MzZ0e93GRvqZ7uSi0dvRF7/XIXDeNkra2fNHBxTyPDGySpjQ==}
     engines: {node: '>=8'}
@@ -11372,6 +11713,11 @@ packages:
       p-finally: 1.0.0
     dev: true
 
+  /p-timeout@5.1.0:
+    resolution: {integrity: sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew==}
+    engines: {node: '>=12'}
+    dev: true
+
   /p-try@2.2.0:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
@@ -11424,6 +11770,11 @@ packages:
       xtend: 4.0.2
     dev: false
 
+  /parse-ms@3.0.0:
+    resolution: {integrity: sha512-Tpb8Z7r7XbbtBTrM9UhpkzzaMrqA2VXMT3YChzYltwV3P3pM6t8wl7TvpMnSTosz1aQAdVib7kdoys7vYOPerw==}
+    engines: {node: '>=12'}
+    dev: true
+
   /parse-node-version@1.0.1:
     resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==}
     engines: {node: '>= 0.10'}
@@ -11485,6 +11836,11 @@ packages:
     resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
     engines: {node: '>=8'}
 
+  /path-exists@5.0.0:
+    resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dev: true
+
   /path-is-absolute@1.0.1:
     resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
     engines: {node: '>=0.10.0'}
@@ -11647,6 +12003,14 @@ packages:
     engines: {node: '>= 6'}
     dev: true
 
+  /pkg-conf@4.0.0:
+    resolution: {integrity: sha512-7dmgi4UY4qk+4mj5Cd8v/GExPo0K+SlY+hulOSdfZ/T6jVH6//y7NtzZo5WrfhDBxuQ0jCa7fLZmNaNh7EWL/w==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      find-up: 6.3.0
+      load-json-file: 7.0.1
+    dev: true
+
   /pkg-dir@4.2.0:
     resolution: {integrity: sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==}
     engines: {node: '>=8'}
@@ -11677,6 +12041,13 @@ packages:
       irregular-plurals: 3.5.0
     dev: true
 
+  /plur@5.1.0:
+    resolution: {integrity: sha512-VP/72JeXqak2KiOzjgKtQen5y3IZHn+9GOuLDafPv0eXa47xq0At93XahYBs26MsifCQ4enGKwbjBTKgb9QJXg==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      irregular-plurals: 3.5.0
+    dev: true
+
   /pluralize@8.0.0:
     resolution: {integrity: sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==}
     engines: {node: '>=4'}
@@ -12015,6 +12386,13 @@ packages:
     engines: {node: '>= 0.8'}
     dev: true
 
+  /pretty-ms@8.0.0:
+    resolution: {integrity: sha512-ASJqOugUF1bbzI35STMBUpZqdfYKlJugy6JBziGi2EE+AL5JPJGSzvpeVXojxrr0ViUYoToUjb5kjSEGf7Y83Q==}
+    engines: {node: '>=14.16'}
+    dependencies:
+      parse-ms: 3.0.0
+    dev: true
+
   /pretty@2.0.0:
     resolution: {integrity: sha512-G9xUchgTEiNpormdYBl+Pha50gOUovT18IvAe7EYMZ1/f9W/WWMPRn+xI68yXNMUk3QXHDwo/1wV/4NejVNe1w==}
     engines: {node: '>=0.10.0'}
@@ -12985,6 +13363,13 @@ packages:
     dependencies:
       lru-cache: 6.0.0
 
+  /serialize-error@7.0.1:
+    resolution: {integrity: sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==}
+    engines: {node: '>=10'}
+    dependencies:
+      type-fest: 0.13.1
+    dev: true
+
   /serialize-javascript@6.0.0:
     resolution: {integrity: sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==}
     dependencies:
@@ -13086,6 +13471,11 @@ packages:
   /signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
 
+  /signal-exit@4.0.2:
+    resolution: {integrity: sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==}
+    engines: {node: '>=14'}
+    dev: true
+
   /simple-concat@1.0.1:
     resolution: {integrity: sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==}
     dev: false
@@ -13113,6 +13503,11 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /slash@4.0.0:
+    resolution: {integrity: sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==}
+    engines: {node: '>=12'}
+    dev: true
+
   /slice-ansi@3.0.0:
     resolution: {integrity: sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==}
     engines: {node: '>=8'}
@@ -13131,6 +13526,14 @@ packages:
       is-fullwidth-code-point: 3.0.0
     dev: true
 
+  /slice-ansi@5.0.0:
+    resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      ansi-styles: 6.2.1
+      is-fullwidth-code-point: 4.0.0
+    dev: true
+
   /smart-buffer@4.2.0:
     resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
     engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
@@ -13454,6 +13857,15 @@ packages:
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
 
+  /string-width@5.1.2:
+    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
+    engines: {node: '>=12'}
+    dependencies:
+      eastasianwidth: 0.2.0
+      emoji-regex: 9.2.2
+      strip-ansi: 7.1.0
+    dev: true
+
   /string_decoder@0.10.31:
     resolution: {integrity: sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==}
     dev: false
@@ -13486,6 +13898,13 @@ packages:
     dependencies:
       ansi-regex: 5.0.1
 
+  /strip-ansi@7.1.0:
+    resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      ansi-regex: 6.0.1
+    dev: true
+
   /strip-bom@2.0.0:
     resolution: {integrity: sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==}
     engines: {node: '>=0.10.0'}
@@ -13568,6 +13987,16 @@ packages:
       - supports-color
     dev: false
 
+  /supertap@3.0.1:
+    resolution: {integrity: sha512-u1ZpIBCawJnO+0QePsEiOknOfCRq0yERxiAchT0i4li0WHNUJbf0evXXSXOcCAR4M8iMDoajXYmstm/qO81Isw==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      indent-string: 5.0.0
+      js-yaml: 3.14.1
+      serialize-error: 7.0.1
+      strip-ansi: 7.1.0
+    dev: true
+
   /supports-color@2.0.0:
     resolution: {integrity: sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==}
     engines: {node: '>=0.8.0'}
@@ -13725,6 +14154,11 @@ packages:
       yallist: 4.0.0
     dev: false
 
+  /temp-dir@3.0.0:
+    resolution: {integrity: sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==}
+    engines: {node: '>=14.16'}
+    dev: true
+
   /terminal-link@2.1.1:
     resolution: {integrity: sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==}
     engines: {node: '>=8'}
@@ -13877,6 +14311,11 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
+  /time-zone@1.0.0:
+    resolution: {integrity: sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==}
+    engines: {node: '>=4'}
+    dev: true
+
   /timsort@0.3.0:
     resolution: {integrity: sha512-qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A==}
     dev: true
@@ -14201,6 +14640,11 @@ packages:
     resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==}
     engines: {node: '>=4'}
 
+  /type-fest@0.13.1:
+    resolution: {integrity: sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==}
+    engines: {node: '>=10'}
+    dev: true
+
   /type-fest@0.18.1:
     resolution: {integrity: sha512-OIAYXk8+ISY+qTOwkHtKqzAuxchoMiD9Udx+FSGQDuiRR+PJKJHc2NJAXlbhkGwTt/4/nKZxELY1w3ReWOL8mw==}
     engines: {node: '>=10'}
@@ -14609,7 +15053,7 @@ packages:
     dependencies:
       fs-mkdirp-stream: 1.0.0
       glob-stream: 6.1.0
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       is-valid-glob: 1.0.0
       lazystream: 1.0.1
       lead: 1.0.0
@@ -14945,6 +15389,11 @@ packages:
       - supports-color
     dev: false
 
+  /well-known-symbols@2.0.0:
+    resolution: {integrity: sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==}
+    engines: {node: '>=6'}
+    dev: true
+
   /whatwg-encoding@1.0.5:
     resolution: {integrity: sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==}
     dependencies:
@@ -15091,6 +15540,14 @@ packages:
       typedarray-to-buffer: 3.1.5
     dev: true
 
+  /write-file-atomic@5.0.1:
+    resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+    dependencies:
+      imurmurhash: 0.1.4
+      signal-exit: 4.0.2
+    dev: true
+
   /ws@7.5.9:
     resolution: {integrity: sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==}
     engines: {node: '>=8.3.0'}
@@ -15289,7 +15746,6 @@ packages:
       string-width: 4.2.3
       y18n: 5.0.8
       yargs-parser: 21.1.1
-    dev: false
 
   /yargs@7.1.2:
     resolution: {integrity: sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==}
@@ -15329,6 +15785,11 @@ packages:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}
 
+  /yocto-queue@1.0.0:
+    resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==}
+    engines: {node: '>=12.20'}
+    dev: true
+
   /z-schema@5.0.5:
     resolution: {integrity: sha512-D7eujBWkLa3p2sIpJA0d1pr7es+a7m0vFAnZLlCEKq/Ij2k0MLi9Br2UPxoxdYystm5K1yeBGzub0FlYUEWj2Q==}
     engines: {node: '>=8.0.0'}

From c443a5601cb6f1d2bebe98b1ae427c9f6ecd8f70 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 16:10:01 -0400
Subject: [PATCH 252/319] add format script

---
 package.json                                 | 2 +-
 packages/backend/native-utils/package.json   | 1 +
 packages/backend/native-utils/src/util/id.rs | 2 +-
 packages/backend/src/misc/gen-id.ts          | 5 ++++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 5c57c79cf2..41fc1e666e 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": "pnpm rome format packages/**/* --write && pnpm --filter client run format",
+		"format": "pnpm rome format packages/**/* --write && pnpm -r 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/backend/native-utils/package.json b/packages/backend/native-utils/package.json
index 8423f569b1..1503bca19d 100644
--- a/packages/backend/native-utils/package.json
+++ b/packages/backend/native-utils/package.json
@@ -40,6 +40,7 @@
     "test": "ava",
     "universal": "napi universal",
     "version": "napi version",
+		"format": "cargo fmt",
     "cargo:unit": "cargo test unit_test",
     "cargo:integration": "cargo test --no-default-features -F noarray int_test -- --test-threads=1"
   }
diff --git a/packages/backend/native-utils/src/util/id.rs b/packages/backend/native-utils/src/util/id.rs
index 539b0415e8..b8bf54747f 100644
--- a/packages/backend/native-utils/src/util/id.rs
+++ b/packages/backend/native-utils/src/util/id.rs
@@ -61,10 +61,10 @@ cfg_if! {
 
 #[cfg(test)]
 mod unit_test {
+    use crate::util::id;
     use cfg_if::cfg_if;
     use pretty_assertions::{assert_eq, assert_ne};
     use std::thread;
-    use crate::util::id;
 
     cfg_if! {
         if #[cfg(feature = "napi")] {
diff --git a/packages/backend/src/misc/gen-id.ts b/packages/backend/src/misc/gen-id.ts
index a016111ca9..ea0d414e77 100644
--- a/packages/backend/src/misc/gen-id.ts
+++ b/packages/backend/src/misc/gen-id.ts
@@ -1,5 +1,8 @@
 import config from "@/config/index.js";
-import { nativeCreateId, nativeInitIdGenerator } from "native-utils/built/index.js";
+import {
+	nativeCreateId,
+	nativeInitIdGenerator,
+} from "native-utils/built/index.js";
 
 const length = Math.min(Math.max(config.cuid?.length ?? 16, 16), 24);
 const fingerprint = config.cuid?.fingerprint ?? "";

From 7cf2b39cde3ec793767ba2652bb7a3e8a1c20024 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 16:34:45 -0400
Subject: [PATCH 253/319] fix unit tests

---
 .../backend/native-utils/src/model/schema/antenna.rs     | 9 ++++++++-
 packages/backend/native-utils/src/util/id.rs             | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/backend/native-utils/src/model/schema/antenna.rs b/packages/backend/native-utils/src/model/schema/antenna.rs
index 198230e9a2..00f1216ac1 100644
--- a/packages/backend/native-utils/src/model/schema/antenna.rs
+++ b/packages/backend/native-utils/src/model/schema/antenna.rs
@@ -119,6 +119,7 @@ cfg_if! {
 
 #[cfg(test)]
 mod unit_test {
+    use cfg_if::cfg_if;
     use pretty_assertions::assert_eq;
     use serde_json::json;
 
@@ -129,7 +130,13 @@ mod unit_test {
     #[test]
     fn src_from_active_enum() {
         let src = AntennaSrc::try_from(AntennaSrcEnum::All).unwrap();
-        assert_eq!(src, AntennaSrc::All);
+        cfg_if! {
+            if #[cfg(feature = "napi")] {
+                assert_eq!(src, AntennaSrc::all);
+            } else {
+                assert_eq!(src, AntennaSrc::All);
+            }
+        }
     }
 
     #[test]
diff --git a/packages/backend/native-utils/src/util/id.rs b/packages/backend/native-utils/src/util/id.rs
index b8bf54747f..b17b112d74 100644
--- a/packages/backend/native-utils/src/util/id.rs
+++ b/packages/backend/native-utils/src/util/id.rs
@@ -91,7 +91,7 @@ mod unit_test {
                 assert_ne!(id::create_id().unwrap(), id::create_id().unwrap());
                 let id1 = thread::spawn(|| id::create_id().unwrap());
                 let id2 = thread::spawn(|| id::create_id().unwrap());
-                assert_ne!(id1.join().unwrap(), id2.join().unwrap())
+                assert_ne!(id1.join().unwrap(), id2.join().unwrap());
             }
         }
     }

From 874b0a2c697da3f2e934b09745fc1747b65a30d7 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 23:01:53 -0400
Subject: [PATCH 254/319] add unit test

---
 packages/backend/native-utils/package.json    |  4 +-
 .../native-utils/src/model/schema/antenna.rs  | 10 ++--
 .../native-utils/src/model/schema/app.rs      | 48 +++++++++++++++++--
 packages/backend/native-utils/src/util/id.rs  |  4 +-
 4 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/packages/backend/native-utils/package.json b/packages/backend/native-utils/package.json
index 1503bca19d..029372548a 100644
--- a/packages/backend/native-utils/package.json
+++ b/packages/backend/native-utils/package.json
@@ -41,7 +41,7 @@
     "universal": "napi universal",
     "version": "napi version",
 		"format": "cargo fmt",
-    "cargo:unit": "cargo test unit_test",
-    "cargo:integration": "cargo test --no-default-features -F noarray int_test -- --test-threads=1"
+    "cargo:unit": "cargo test unit_test && cargo test -F napi unit_test",
+    "cargo:integration": "cargo test -F noarray int_test -- --test-threads=1"
   }
 }
diff --git a/packages/backend/native-utils/src/model/schema/antenna.rs b/packages/backend/native-utils/src/model/schema/antenna.rs
index 00f1216ac1..4ec1e07946 100644
--- a/packages/backend/native-utils/src/model/schema/antenna.rs
+++ b/packages/backend/native-utils/src/model/schema/antenna.rs
@@ -142,7 +142,7 @@ mod unit_test {
     #[test]
     fn antenna_valid() {
         let instance = json!({
-            "id": "9f4x0bkx1u",
+            "id": "9fil64s6g7cskdrb",
             "createdAt": "2023-05-24T06:56:14.323Z",
             "name": "Valid Antenna",
             "keywords": [["first", "keyword"], ["second"]],
@@ -150,7 +150,7 @@ mod unit_test {
             "src": "users",
             // "userListId" and "userGroupId" can be null or be omitted
             "userListId": null,
-            "users": ["9f4yjw6m13", "9f4yk2cp6d"],
+            "users": ["9fil64s6g7cskdrb", "9fil66brl1udxau2"],
             "instances": [],
             // "caseSensitive", "notify", "withReplies", "withFile", and
             // "hasUnreadNote" are false if ommited
@@ -175,14 +175,14 @@ mod unit_test {
             "keywords": "invalid keyword",
             // "excludeKeywords" is required
             "excludeKeywords": null,
-            // "src" should be one of "home", "all", "users", "list", "group", and
+            // "src" must be one of "home", "all", "users", "list", "group", and
             // "instances"
             "src": "invalid_src",
             // "userListId" is string
             "userListId": ["9f4ziiqfxw"],
             // "users" must be an array of strings
-            "users": [1, "9f4ykyuza6"],
-            "instances": ["9f4ykyuybo"],
+            "users": [1, "9fil64s6g7cskdrb"],
+            "instances": ["9fil65jzhtjpi3xn"],
             // "caseSensitive" is boolean
             "caseSensitive": 0,
             "notify": true,
diff --git a/packages/backend/native-utils/src/model/schema/app.rs b/packages/backend/native-utils/src/model/schema/app.rs
index f24c1387be..682b82ec07 100644
--- a/packages/backend/native-utils/src/model/schema/app.rs
+++ b/packages/backend/native-utils/src/model/schema/app.rs
@@ -95,13 +95,53 @@ pub static VALIDATOR: Lazy<JSONSchema> = Lazy::new(|| App::validator());
 
 #[cfg(test)]
 mod unit_test {
+    use pretty_assertions::assert_eq;
+    use serde_json::json;
+
+    use crate::util::id::{create_id, init_id};
+    use crate::util::random::gen_string;
+
+    use super::VALIDATOR;
+
     #[test]
-    fn valid() {
-        todo!();
+    fn app_valid() {
+        init_id(12, "");
+        let instance = json!({
+            "id": create_id().unwrap(),
+            "name": "Test App",
+            "secret": gen_string(24),
+            "callbackUrl": "urn:ietf:wg:oauth:2.0:oob",
+            "permission": ["read:account", "write:account", "read:notes"],
+        });
+
+        assert!(VALIDATOR.is_valid(&instance));
     }
 
     #[test]
-    fn invalid() {
-        todo!();
+    fn app_invalid() {
+        init_id(12, "");
+        let instance = json!({
+            "id": create_id().unwrap(),
+            // "name" is required
+            "name": null,
+            // "permission" must be one of the app permissions
+            "permission": ["write:invalid_perm", "write:notes"],
+            // "secret" is a nullable string
+            "secret": 123,
+            // "is_authorized" is a nullable boolean
+            "isAuthorized": "true-ish",
+        });
+        let result = VALIDATOR
+            .validate(&instance)
+            .expect_err("validation must fail");
+        let mut paths: Vec<String> = result
+            .map(|e| e.instance_path.to_string())
+            .filter(|e| !e.is_empty())
+            .collect();
+        paths.sort();
+        assert_eq!(
+            paths,
+            vec!["/isAuthorized", "/name", "/permission/0", "/secret"]
+        );
     }
 }
diff --git a/packages/backend/native-utils/src/util/id.rs b/packages/backend/native-utils/src/util/id.rs
index b17b112d74..d922518f9d 100644
--- a/packages/backend/native-utils/src/util/id.rs
+++ b/packages/backend/native-utils/src/util/id.rs
@@ -72,9 +72,9 @@ mod unit_test {
 
             #[test]
             fn can_generate_aid_compat_ids() {
-                id::native_init_id_generator(16, "".to_string());
+                id::native_init_id_generator(20, "".to_string());
                 let id1 = id::native_create_id(Utc::now().timestamp_millis().into());
-                assert_eq!(id1.len(), 16);
+                assert_eq!(id1.len(), 20);
                 let id1 = id::native_create_id(Utc::now().timestamp_millis().into());
                 let id2 = id::native_create_id(Utc::now().timestamp_millis().into());
                 assert_ne!(id1, id2);

From d3d30bbbc246e559bc8ddd3dc2faaed53d768ff3 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 23:29:48 -0400
Subject: [PATCH 255/319] add integration test of antenna

---
 packages/backend/native-utils/tests/common.rs | 14 ++++-
 .../tests/model/repository/antenna.rs         | 53 +++++++++++++++++--
 2 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/packages/backend/native-utils/tests/common.rs b/packages/backend/native-utils/tests/common.rs
index 61dd20aac7..186e862bd5 100644
--- a/packages/backend/native-utils/tests/common.rs
+++ b/packages/backend/native-utils/tests/common.rs
@@ -164,7 +164,7 @@ async fn setup_model(db: &DbConn) {
                 id: create_id().unwrap(),
                 created_at: Utc::now().into(),
                 user_id: user_id.to_owned(),
-                name: "Test Antenna".to_string(),
+                name: "Alice Antenna".to_string(),
                 src: AntennaSrcEnum::All,
                 keywords: vec![
                     vec!["foo".to_string(), "bar".to_string()],
@@ -185,6 +185,18 @@ async fn setup_model(db: &DbConn) {
                 .reset_all()
                 .insert(txn)
                 .await?;
+            let note_model = entity::note::Model {
+                id: create_id().unwrap(),
+                created_at: Utc::now().into(),
+                text: Some("Testing 123".to_string()),
+                user_id: user_id.to_owned(),
+                ..Default::default()
+            };
+            note_model
+                .into_active_model()
+                .reset_all()
+                .insert(txn)
+                .await?;
 
             Ok(())
         })
diff --git a/packages/backend/native-utils/tests/model/repository/antenna.rs b/packages/backend/native-utils/tests/model/repository/antenna.rs
index a370073987..3bda2ca183 100644
--- a/packages/backend/native-utils/tests/model/repository/antenna.rs
+++ b/packages/backend/native-utils/tests/model/repository/antenna.rs
@@ -1,13 +1,13 @@
 mod int_test {
-    use native_utils::{database, model};
+    use native_utils::{database, model, util};
 
     use model::{
-        entity::{antenna, user},
+        entity::{antenna, antenna_note, note, user},
         repository::Repository,
         schema,
     };
     use pretty_assertions::assert_eq;
-    use sea_orm::{ColumnTrait, EntityTrait, QueryFilter};
+    use sea_orm::{ActiveModelTrait, ColumnTrait, EntityTrait, IntoActiveModel, QueryFilter};
 
     use crate::{cleanup, prepare};
 
@@ -39,7 +39,7 @@ mod int_test {
         let result = schema::Antenna {
             id: alice_antenna.id,
             created_at: alice_antenna.created_at.into(),
-            name: "Test Antenna".to_string(),
+            name: "Alice Antenna".to_string(),
             keywords: vec![
                 vec!["foo".to_string(), "bar".to_string()],
                 vec!["foobar".to_string()],
@@ -70,6 +70,49 @@ mod int_test {
 
     #[tokio::test]
     async fn unread_note() {
-        todo!();
+        prepare().await;
+        let db = database::get_database().unwrap();
+
+        let (alice, alice_antenna) = user::Entity::find()
+            .filter(user::Column::Username.eq("alice"))
+            .find_also_related(antenna::Entity)
+            .one(db)
+            .await
+            .unwrap()
+            .expect("alice not found");
+        let alice_antenna = alice_antenna.expect("alice's antenna not found");
+        let packed = alice_antenna
+            .to_owned()
+            .pack()
+            .await
+            .expect("Unable to pack");
+        assert_eq!(packed.has_unread_note, false);
+
+        let note_model = note::Entity::find()
+            .filter(note::Column::UserId.eq(alice.id))
+            .one(db)
+            .await
+            .unwrap()
+            .expect("note not found");
+        let antenna_note = antenna_note::Model {
+            id: util::id::create_id().unwrap(),
+            antenna_id: alice_antenna.id.to_owned(),
+            note_id: note_model.id.to_owned(),
+            read: false,
+        };
+        antenna_note
+            .into_active_model()
+            .reset_all()
+            .insert(db)
+            .await
+            .unwrap();
+        let packed = alice_antenna
+            .to_owned()
+            .pack()
+            .await
+            .expect("Unable to pack");
+        assert_eq!(packed.has_unread_note, true);
+
+        cleanup().await;
     }
 }

From afe4c76392ddea602f8775b090714e3bf20378af Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Fri, 2 Jun 2023 23:37:36 -0400
Subject: [PATCH 256/319] fix migration

---
 packages/backend/native-utils/Cargo.toml                      | 2 +-
 packages/backend/native-utils/migration/Cargo.toml            | 4 ++--
 .../migration/src/m20230531_180824_drop_reversi.rs            | 2 ++
 packages/backend/native-utils/migration/src/vec_to_json.rs    | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/packages/backend/native-utils/Cargo.toml b/packages/backend/native-utils/Cargo.toml
index 071d0f331b..9b030e37da 100644
--- a/packages/backend/native-utils/Cargo.toml
+++ b/packages/backend/native-utils/Cargo.toml
@@ -4,7 +4,7 @@ name = "native-utils"
 version = "0.0.0"
 
 [workspace]
-members = ["migration/Cargo.toml"]
+members = ["migration"]
 
 [features]
 default = []
diff --git a/packages/backend/native-utils/migration/Cargo.toml b/packages/backend/native-utils/migration/Cargo.toml
index dbfd41be69..0b4b2b2e7f 100644
--- a/packages/backend/native-utils/migration/Cargo.toml
+++ b/packages/backend/native-utils/migration/Cargo.toml
@@ -10,12 +10,12 @@ path = "src/lib.rs"
 
 [features]
 default = []
-convert = ["model/noarray"]
+convert = ["dep:native-utils"]
 
 [dependencies]
 async-std = { version = "1", features = ["attributes", "tokio1"] }
 serde_json = "1.0.96"
-model = { path = "../model" }
+native-utils = { path = "../", optional = true }
 indicatif = { version = "0.17.4", features = ["tokio"] }
 tokio = { version = "1.28.2", features = ["full"] }
 futures = "0.3.28"
diff --git a/packages/backend/native-utils/migration/src/m20230531_180824_drop_reversi.rs b/packages/backend/native-utils/migration/src/m20230531_180824_drop_reversi.rs
index c2726dd765..32b8dae223 100644
--- a/packages/backend/native-utils/migration/src/m20230531_180824_drop_reversi.rs
+++ b/packages/backend/native-utils/migration/src/m20230531_180824_drop_reversi.rs
@@ -18,6 +18,7 @@ impl MigrationTrait for Migration {
             DbBackend::Postgres,
             Table::drop()
                 .table(ReversiGame::Table)
+                .if_exists()
                 .to_string(PostgresQueryBuilder),
         ))
         .await?;
@@ -25,6 +26,7 @@ impl MigrationTrait for Migration {
             DbBackend::Postgres,
             Table::drop()
                 .table(ReversiMatching::Table)
+                .if_exists()
                 .to_string(PostgresQueryBuilder),
         ))
         .await?;
diff --git a/packages/backend/native-utils/migration/src/vec_to_json.rs b/packages/backend/native-utils/migration/src/vec_to_json.rs
index c762dcf1cc..c4a6d9b073 100644
--- a/packages/backend/native-utils/migration/src/vec_to_json.rs
+++ b/packages/backend/native-utils/migration/src/vec_to_json.rs
@@ -1,7 +1,7 @@
-#![allow(dead_code)]
+#![cfg(feature = "convert")]
 
 use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
-use model::entity::newtype::{I32Vec, StringVec};
+use native_utils::model::entity::newtype::{I32Vec, StringVec};
 use sea_orm_migration::{
     prelude::*,
     sea_orm::{Database, DbBackend, DbConn, Statement, TryGetable},

From d7f80edbea231916af9aa32ab328422dd53d6c3b Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Sat, 3 Jun 2023 00:27:00 -0400
Subject: [PATCH 257/319] call seaorm migrations after typeorm

---
 .../backend/native-utils/migration/Cargo.toml |  2 ++
 .../native-utils/migration/src/main.rs        | 34 +++++++++++++++++++
 .../native-utils/migration/src/vec_to_json.rs |  2 --
 packages/backend/package.json                 |  8 +++--
 4 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/packages/backend/native-utils/migration/Cargo.toml b/packages/backend/native-utils/migration/Cargo.toml
index 0b4b2b2e7f..3813eccd80 100644
--- a/packages/backend/native-utils/migration/Cargo.toml
+++ b/packages/backend/native-utils/migration/Cargo.toml
@@ -19,6 +19,8 @@ native-utils = { path = "../", optional = true }
 indicatif = { version = "0.17.4", features = ["tokio"] }
 tokio = { version = "1.28.2", features = ["full"] }
 futures = "0.3.28"
+serde_yaml = "0.9.21"
+serde = { version = "1.0.163", features = ["derive"] }
 
 [dependencies.sea-orm-migration]
 version = "0.11.0"
diff --git a/packages/backend/native-utils/migration/src/main.rs b/packages/backend/native-utils/migration/src/main.rs
index 31a72026ee..a845a41ff4 100644
--- a/packages/backend/native-utils/migration/src/main.rs
+++ b/packages/backend/native-utils/migration/src/main.rs
@@ -1,11 +1,45 @@
+use serde::Deserialize;
+use std::env;
+use std::fs;
+
 use sea_orm_migration::prelude::*;
 
+#[cfg(feature = "convert")]
 mod vec_to_json;
 
 #[async_std::main]
 async fn main() {
+    let cwd = env::current_dir().unwrap();
+    let yml = fs::File::open(cwd.join("../../.config/default.yml"))
+        .expect("Unable to read '.config/default.yml'");
+    let config: Config = serde_yaml::from_reader(yml).expect("Unable to parse");
+
+    env::set_var(
+        "DATABASE_URL",
+        format!(
+            "postgres://{}:{}@{}:{}/{}",
+            config.db.user, config.db.pass, config.db.host, config.db.port, config.db.db
+        ),
+    );
+
     cli::run_cli(migration::Migrator).await;
 
     #[cfg(feature = "convert")]
     vec_to_json::convert().await;
 }
+
+#[derive(Debug, PartialEq, Deserialize)]
+#[serde(rename = "camelCase")]
+pub struct Config {
+    pub db: DbConfig,
+}
+
+#[derive(Debug, PartialEq, Deserialize)]
+#[serde(rename = "camelCase")]
+pub struct DbConfig {
+    pub host: String,
+    pub port: u32,
+    pub db: String,
+    pub user: String,
+    pub pass: String,
+}
diff --git a/packages/backend/native-utils/migration/src/vec_to_json.rs b/packages/backend/native-utils/migration/src/vec_to_json.rs
index c4a6d9b073..104357a496 100644
--- a/packages/backend/native-utils/migration/src/vec_to_json.rs
+++ b/packages/backend/native-utils/migration/src/vec_to_json.rs
@@ -1,5 +1,3 @@
-#![cfg(feature = "convert")]
-
 use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
 use native_utils::model::entity::newtype::{I32Vec, StringVec};
 use sea_orm_migration::{
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 020257dd82..ca916576b3 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -6,8 +6,12 @@
 	"scripts": {
 		"start": "pnpm node ./built/index.js",
 		"start:test": "NODE_ENV=test pnpm node ./built/index.js",
-		"migrate": "typeorm migration:run -d ormconfig.js",
-		"revertmigration": "typeorm migration:revert -d ormconfig.js",
+		"migrate": "pnpm run migrate:typeorm && pnpm run migrate:cargo",
+		"migrate:typeorm": "typeorm migration:run -d ormconfig.js",
+		"migrate:cargo": "cargo run --manifest-path native-utils/migration/Cargo.toml -- up",
+		"revertmigration": "pnpm run revertmigration:cargo && pnpm run revertmigration:typeorm",
+		"revertmigration:typeorm": "typeorm migration:revert -d ormconfig.js",
+		"revertmigration:cargo": "cargo run --manifest-path native-utils/migration/Cargo.toml -- down",
 		"check:connect": "node ./check_connect.js",
 		"build": "pnpm swc src -d built -D",
 		"watch": "pnpm swc src -d built -D -w",

From 15f8a4cbba2589fe6afcedd95644479564700805 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Sat, 3 Jun 2023 00:36:51 -0400
Subject: [PATCH 258/319] cargo formats all modules

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

diff --git a/packages/backend/native-utils/package.json b/packages/backend/native-utils/package.json
index 029372548a..6919141712 100644
--- a/packages/backend/native-utils/package.json
+++ b/packages/backend/native-utils/package.json
@@ -40,7 +40,7 @@
     "test": "ava",
     "universal": "napi universal",
     "version": "napi version",
-		"format": "cargo fmt",
+		"format": "cargo fmt --all",
     "cargo:unit": "cargo test unit_test && cargo test -F napi unit_test",
     "cargo:integration": "cargo test -F noarray int_test -- --test-threads=1"
   }

From 382b009ffdd6bbd388fdf2b1c7857ecf83ff5e0a Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Sat, 3 Jun 2023 00:40:51 -0400
Subject: [PATCH 259/319] add cargo test script

---
 packages/backend/native-utils/package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/backend/native-utils/package.json b/packages/backend/native-utils/package.json
index 6919141712..64f9e0e50f 100644
--- a/packages/backend/native-utils/package.json
+++ b/packages/backend/native-utils/package.json
@@ -37,10 +37,11 @@
     "build": "napi build --features napi --platform --release ./built/",
     "build:debug": "napi build --platform",
     "prepublishOnly": "napi prepublish -t npm",
-    "test": "ava",
+    "test": "pnpm run cargo:test && pnpm run build && ava",
     "universal": "napi universal",
     "version": "napi version",
 		"format": "cargo fmt --all",
+		"cargo:test": "pnpm run cargo:unit && pnpm run cargo:integration",
     "cargo:unit": "cargo test unit_test && cargo test -F napi unit_test",
     "cargo:integration": "cargo test -F noarray int_test -- --test-threads=1"
   }

From 7ea4c39fb7618981718a841b0f2f1b025a0e5468 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 21:45:11 -0700
Subject: [PATCH 260/319] refactor: :recycle: ssr views

Correct og:type for users, format docs, deprecate _info_card_
---
 packages/backend/src/server/web/index.ts      | 18 -------
 .../backend/src/server/web/views/channel.pug  |  2 +-
 .../backend/src/server/web/views/clip.pug     |  2 +-
 .../src/server/web/views/gallery-post.pug     |  2 +-
 .../src/server/web/views/info-card.pug        | 50 -------------------
 .../backend/src/server/web/views/note.pug     |  4 +-
 .../backend/src/server/web/views/page.pug     |  2 +-
 .../backend/src/server/web/views/user.pug     | 11 ++--
 8 files changed, 12 insertions(+), 79 deletions(-)
 delete mode 100644 packages/backend/src/server/web/views/info-card.pug

diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index f1e0ed6920..0d4034f55d 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -590,24 +590,6 @@ router.get("/channels/:channel", async (ctx, next) => {
 });
 //#endregion
 
-router.get("/_info_card_", async (ctx) => {
-	const meta = await fetchMeta(true);
-	if (meta.privateMode) {
-		ctx.status = 403;
-		return;
-	}
-
-	ctx.remove("X-Frame-Options");
-
-	await ctx.render("info-card", {
-		version: config.version,
-		host: config.host,
-		meta: meta,
-		originalUsersCount: await Users.countBy({ host: IsNull() }),
-		originalNotesCount: await Notes.countBy({ userHost: IsNull() }),
-	});
-});
-
 router.get("/bios", async (ctx) => {
 	await ctx.render("bios", {
 		version: config.version,
diff --git a/packages/backend/src/server/web/views/channel.pug b/packages/backend/src/server/web/views/channel.pug
index c4594b7666..2427144fb9 100644
--- a/packages/backend/src/server/web/views/channel.pug
+++ b/packages/backend/src/server/web/views/channel.pug
@@ -13,7 +13,7 @@ block desc
 
 block og
 	unless privateMode
-		meta(property='og:type'        content='article')
+		meta(property='og:type' content='article')
 		meta(property='og:title'       content= title)
 		meta(property='og:description' content= channel.description)
 		meta(property='og:url'         content= url)
diff --git a/packages/backend/src/server/web/views/clip.pug b/packages/backend/src/server/web/views/clip.pug
index 4c29d64d1b..79d6293808 100644
--- a/packages/backend/src/server/web/views/clip.pug
+++ b/packages/backend/src/server/web/views/clip.pug
@@ -14,7 +14,7 @@ block desc
 
 block og
 	unless privateMode
-		meta(property='og:type'        content='article')
+		meta(property='og:type' content='article')
 		meta(property='og:title'       content= title)
 		meta(property='og:description' content= clip.description)
 		meta(property='og:url'         content= url)
diff --git a/packages/backend/src/server/web/views/gallery-post.pug b/packages/backend/src/server/web/views/gallery-post.pug
index 86bbb4769d..561a19b25c 100644
--- a/packages/backend/src/server/web/views/gallery-post.pug
+++ b/packages/backend/src/server/web/views/gallery-post.pug
@@ -14,7 +14,7 @@ block desc
 
 block og
 	unless privateMode
-		meta(property='og:type'        content='article')
+		meta(property='og:type' content='article')
 		meta(property='og:title'       content= title)
 		meta(property='og:description' content= post.description)
 		meta(property='og:url'         content= url)
diff --git a/packages/backend/src/server/web/views/info-card.pug b/packages/backend/src/server/web/views/info-card.pug
deleted file mode 100644
index be52d0c39f..0000000000
--- a/packages/backend/src/server/web/views/info-card.pug
+++ /dev/null
@@ -1,50 +0,0 @@
-doctype html
-
-html
-
-	head
-		meta(charset='utf-8')
-		meta(name='application-name' content='Calckey')
-		title= meta.name || host
-		style.
-			html, body {
-				margin: 0;
-				padding: 0;
-				min-height: 100vh;
-				background: #fff;
-			}
-
-			#a {
-				display: block;
-			}
-
-			#banner {
-				background-size: cover;
-				background-position: center center;
-			}
-
-			#title {
-				display: inline-block;
-				margin: 24px;
-				padding: 0.5em 0.8em;
-				color: #fff;
-				background: rgba(0, 0, 0, 0.5);
-				font-weight: bold;
-				font-size: 1.3em;
-			}
-
-			#content {
-				overflow: auto;
-				color: #353c3e;
-			}
-
-			#description {
-				margin: 24px;
-			}
-
-	body
-		a#a(href=`https://${host}` target="_blank")
-			header#banner(style=`background-image: url(${meta.bannerUrl})`)
-				div#title= meta.name || host
-		div#content
-			div#description= meta.description
diff --git a/packages/backend/src/server/web/views/note.pug b/packages/backend/src/server/web/views/note.pug
index ff2a771658..dae0a82d5e 100644
--- a/packages/backend/src/server/web/views/note.pug
+++ b/packages/backend/src/server/web/views/note.pug
@@ -18,7 +18,7 @@ block desc
 
 block og
 	unless privateMode
-		meta(property='og:type'        content='article')
+		meta(property='og:type' content='article')
 		meta(property='og:title'       content= title)
 		meta(property='og:description' content= summary)
 		meta(property='og:url'         content= url)
@@ -27,7 +27,7 @@ block og
 			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)
-			meta(property='twitter:card'       content="summary_large_image")
+			meta(property='twitter:card' content="summary_large_image")
 		if isVideo
 			meta(property='og:video:type'      content=note.files[0].type)
 			meta(property='og:video'           content=note.files[0].url)
diff --git a/packages/backend/src/server/web/views/page.pug b/packages/backend/src/server/web/views/page.pug
index eacaaab984..bfc7ebf79f 100644
--- a/packages/backend/src/server/web/views/page.pug
+++ b/packages/backend/src/server/web/views/page.pug
@@ -14,7 +14,7 @@ block desc
 
 block og
 	unless privateMode
-		meta(property='og:type'        content='article')
+		meta(property='og:type' content='article')
 		meta(property='og:title'       content= title)
 		meta(property='og:description' content= page.summary)
 		meta(property='og:url'         content= url)
diff --git a/packages/backend/src/server/web/views/user.pug b/packages/backend/src/server/web/views/user.pug
index 1cc429156b..f5820f55fc 100644
--- a/packages/backend/src/server/web/views/user.pug
+++ b/packages/backend/src/server/web/views/user.pug
@@ -13,11 +13,12 @@ block desc
 
 block og
 	unless privateMode
-		meta(property='og:type'        content='blog')
-		meta(property='og:title'       content= title)
-		meta(property='og:description' content= profile.description)
-		meta(property='og:url'         content= url)
-		meta(property='og:image'       content= avatarUrl)
+		meta(property='og:type' content='profile')
+		meta(property='og:title'         content= title)
+		meta(property='og:description'   content= profile.description)
+		meta(property='og:url'           content= url)
+		meta(property='og:image'         content= avatarUrl)
+		meta(property='profile:username' content= user.username)
 
 block meta
 	unless privateMode

From f3bd82b074644f62c62a724520accf235c770a83 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 22:11:34 -0700
Subject: [PATCH 261/319] refactor: :recycle: sync note summaries

---
 locales/ar-SA.yml                               | 1 -
 locales/bn-BD.yml                               | 1 -
 locales/ca-ES.yml                               | 1 -
 locales/cs-CZ.yml                               | 1 -
 locales/da-DK.yml                               | 1 -
 locales/de-DE.yml                               | 1 -
 locales/el-GR.yml                               | 1 -
 locales/en-US.yml                               | 1 -
 locales/es-ES.yml                               | 1 -
 locales/fi.yml                                  | 1 -
 locales/fr-FR.yml                               | 1 -
 locales/id-ID.yml                               | 1 -
 locales/it-IT.yml                               | 1 -
 locales/ja-JP.yml                               | 1 -
 locales/ja-KS.yml                               | 1 -
 locales/ko-KR.yml                               | 1 -
 locales/nl-NL.yml                               | 1 -
 locales/pl-PL.yml                               | 1 -
 locales/pt-PT.yml                               | 1 -
 locales/ro-RO.yml                               | 1 -
 locales/ru-RU.yml                               | 1 -
 locales/sk-SK.yml                               | 1 -
 locales/sv-SE.yml                               | 1 -
 locales/th-TH.yml                               | 1 -
 locales/uk-UA.yml                               | 1 -
 locales/vi-VN.yml                               | 1 -
 locales/zh-CN.yml                               | 1 -
 locales/zh-TW.yml                               | 1 -
 packages/backend/src/misc/get-note-summary.ts   | 5 +++--
 packages/client/src/scripts/get-note-summary.ts | 5 +++--
 30 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index 148cd32a04..3ce83ebcc8 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -176,7 +176,6 @@ operations: "الإجراءات"
 software: "البرمجية"
 version: "الإصدار"
 metadata: "البيانات الوصفية"
-withNFiles: "{n} ملف (ملفات)"
 monitor: "شاشة التحكم"
 jobQueue: "قائمة الانتظار"
 cpuAndMemory: "وحدة المعالجة المركزية والذاكرة"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index cde425d7fd..f08e4bfc2d 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -177,7 +177,6 @@ operations: "ক্রিয়াকলাপ"
 software: "সফটওয়্যার"
 version: "সংস্করণ"
 metadata: "মেটাডাটা"
-withNFiles: "{n} টি ফাইল"
 monitor: "মনিটর"
 jobQueue: "জব কিউ"
 cpuAndMemory: "সিপিউ এবং মেমরি"
diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index f438b4f9a8..857caac1fe 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -791,7 +791,6 @@ selectUser: Selecciona un usuari
 latestStatus: Últim estat
 storageUsage: Ús del emmagatzematge
 metadata: Metadades
-withNFiles: '{n} fitxer(s)'
 monitor: Seguiment
 software: Programari
 version: Versió
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index 1d12e69aba..8b502762fe 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -189,7 +189,6 @@ operations: "Operace"
 software: "Software"
 version: "Verze"
 metadata: "Metadata"
-withNFiles: "{n} soubor(ů)"
 monitor: "Monitorovat"
 jobQueue: "Fronta úloh"
 cpuAndMemory: "CPU a paměť"
diff --git a/locales/da-DK.yml b/locales/da-DK.yml
index c6d339a2e3..878273c65b 100644
--- a/locales/da-DK.yml
+++ b/locales/da-DK.yml
@@ -117,7 +117,6 @@ operations: Operationer
 software: Software
 metadata: Metadata
 version: Version
-withNFiles: '{n} fil(er)'
 monitor: Vagt
 jobQueue: Jobkø
 statistics: Statistik
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 2a039af4cf..45edbe045b 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -200,7 +200,6 @@ operations: "Tätigkeiten"
 software: "Software"
 version: "Version"
 metadata: "Metadaten"
-withNFiles: "{n} Datei(en)"
 monitor: "Überwachung"
 jobQueue: "Auftragswarteschlange"
 cpuAndMemory: "CPU und Speicher"
diff --git a/locales/el-GR.yml b/locales/el-GR.yml
index 57270f7aa0..d444882b44 100644
--- a/locales/el-GR.yml
+++ b/locales/el-GR.yml
@@ -435,7 +435,6 @@ nothing: Δεν υπάρχει τίποτα να δείτε εδώ
 newNoteRecived: Υπάρχουν νέες δημοσιεύσεις
 passwordMatched: Ταιριάζει
 unmarkAsSensitive: Αναίρεση επισήμανσης ως Ευαίσθητο Περιεχόμενο (NSFW)
-withNFiles: '{n} αρχείο(-α)'
 blockedUsers: Μπλοκαρισμένα μέλη
 noteDeleteConfirm: Θέλετε σίγουρα να διαγράψετε αυτή τη δημοσίευση;
 preview: Προεπισκόπηση
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 5b6abcc35e..127b2d0fe9 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -211,7 +211,6 @@ operations: "Operations"
 software: "Software"
 version: "Version"
 metadata: "Metadata"
-withNFiles: "{n} file(s)"
 monitor: "Monitor"
 jobQueue: "Job Queue"
 cpuAndMemory: "CPU and Memory"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 49f51bff6e..2dc40f3597 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -195,7 +195,6 @@ operations: "Operaciones"
 software: "Software"
 version: "Versión"
 metadata: "Metadatos"
-withNFiles: "{n} archivos"
 monitor: "Monitor"
 jobQueue: "Cola de trabajos"
 cpuAndMemory: "CPU y Memoria"
diff --git a/locales/fi.yml b/locales/fi.yml
index ec7438096a..aa9699cca8 100644
--- a/locales/fi.yml
+++ b/locales/fi.yml
@@ -182,7 +182,6 @@ followsYou: Seuraa sinua
 pageLoadErrorDescription: Tämä yleensä johtuu verkkovirheistä tai selaimen välimuistista.
   Kokeile tyhjentämällä välimuisti ja yritä sitten hetken kuluttua uudelleen.
 enterListName: Anna listalle nimi
-withNFiles: '{n} tiedosto(t)'
 instanceInfo: Instanssin tiedot
 clearQueue: Tyhjennä jono
 suspendConfirm: Oletko varma, että haluat keskeyttää tämän tilin?
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index e7416f5775..dad0956880 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -201,7 +201,6 @@ operations: "Opérations"
 software: "Logiciel"
 version: "Version"
 metadata: "Métadonnées"
-withNFiles: "{n} fichier(s)"
 monitor: "Contrôle"
 jobQueue: "File d’attente"
 cpuAndMemory: "Processeur et mémoire"
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index 4caca44399..f9859c2c72 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -197,7 +197,6 @@ operations: "Tindakan"
 software: "Perangkat lunak"
 version: "Versi"
 metadata: "Metadata"
-withNFiles: "{n} berkas"
 monitor: "Pantau"
 jobQueue: "Antrian kerja"
 cpuAndMemory: "CPU dan Memori"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 6dc4b68b56..ed3632ec67 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -175,7 +175,6 @@ operations: "Operazioni"
 software: "Software"
 version: "Versione"
 metadata: "Metadato"
-withNFiles: "{n} file in allegato"
 monitor: "Monitorare"
 jobQueue: "Coda di lavoro"
 cpuAndMemory: "CPU e Memoria"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 94454f3f9d..1bbc38c497 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -188,7 +188,6 @@ operations: "操作"
 software: "ソフトウェア"
 version: "バージョン"
 metadata: "メタデータ"
-withNFiles: "{n}つのファイル"
 monitor: "モニター"
 jobQueue: "ジョブキュー"
 cpuAndMemory: "CPUとメモリ"
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index d5c48276f4..8a9b91486e 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -177,7 +177,6 @@ operations: "操作"
 software: "ソフトウェア"
 version: "バージョン"
 metadata: "メタデータ"
-withNFiles: "{n}個のファイル"
 monitor: "モニター"
 jobQueue: "ジョブキュー"
 cpuAndMemory: "CPUとメモリ"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 15e776faf0..7143cf2f98 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -177,7 +177,6 @@ operations: "작업"
 software: "소프트웨어"
 version: "버전"
 metadata: "메타데이터"
-withNFiles: "{n}개의 파일"
 monitor: "모니터"
 jobQueue: "작업 대기열"
 cpuAndMemory: "CPU와 메모리"
diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index 49b737e918..115c003e35 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -179,7 +179,6 @@ operations: "Verwerkingen"
 software: "Software"
 version: "Versie"
 metadata: "Metadata"
-withNFiles: "{n} bestand(en)"
 monitor: "Monitor"
 jobQueue: "Job Queue"
 cpuAndMemory: "CPU en geheugen"
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index 659e204af5..a1b0f0c152 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -187,7 +187,6 @@ operations: "Działania"
 software: "Oprogramowanie"
 version: "Wersja"
 metadata: "Metadane"
-withNFiles: "{n} plik(i/ów)"
 monitor: "Monitor"
 jobQueue: "Kolejka zadań"
 cpuAndMemory: "CPU i pamięć"
diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml
index 2803df928f..3e15beebba 100644
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -177,7 +177,6 @@ operations: "operar"
 software: "Programas"
 version: "versão"
 metadata: "Metadados"
-withNFiles: "{n} Um arquivo"
 monitor: "monitor"
 jobQueue: "Fila de trabalhos"
 cpuAndMemory: "CPU e memória"
diff --git a/locales/ro-RO.yml b/locales/ro-RO.yml
index 92a35ffa8f..ba51950e34 100644
--- a/locales/ro-RO.yml
+++ b/locales/ro-RO.yml
@@ -177,7 +177,6 @@ operations: "Operațiuni"
 software: "Software"
 version: "Versiune"
 metadata: "Metadata"
-withNFiles: "{n} fișier(e)"
 monitor: "Monitor"
 jobQueue: "coada de job-uri"
 cpuAndMemory: "CPU și memorie"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index ad47d7d37c..01b21b0fcb 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -192,7 +192,6 @@ operations: "Операции"
 software: "Программы"
 version: "Версия"
 metadata: "Метаданные"
-withNFiles: "Файлы, {n} шт"
 monitor: "Монитор"
 jobQueue: "Очередь заданий"
 cpuAndMemory: "Процессор и память"
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index a36caf1fd0..462f34ed2d 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -177,7 +177,6 @@ operations: "Operácie"
 software: "Softvér"
 version: "Verzia"
 metadata: "Metadáta"
-withNFiles: "{n} súbor(ov)"
 monitor: "Monitor"
 jobQueue: "Fronta úloh"
 cpuAndMemory: "CPU a pamäť"
diff --git a/locales/sv-SE.yml b/locales/sv-SE.yml
index 993af2a23d..6523ce068f 100644
--- a/locales/sv-SE.yml
+++ b/locales/sv-SE.yml
@@ -176,7 +176,6 @@ operations: "Operationer"
 software: "Mjukvara"
 version: "Version"
 metadata: "Metadata"
-withNFiles: "{n} fil(er)"
 monitor: "Övervakning"
 jobQueue: "Jobbkö"
 cpuAndMemory: "CPU och minne"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index b6d81d8f53..9666737ee2 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -177,7 +177,6 @@ operations: "ดำเนินการ"
 software: "ซอฟต์แวร์"
 version: "เวอร์ชั่น"
 metadata: "ข้อมูลเมตา"
-withNFiles: "{n} ไฟล์(s)"
 monitor: "มอนิเตอร์"
 jobQueue: "คิวงาน"
 cpuAndMemory: "ซีพียู และ หน่วยความจำ"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index 0368a0897e..549dce666c 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -177,7 +177,6 @@ operations: "Операції"
 software: "Програмне забезпечення"
 version: "Версія"
 metadata: "Метадані"
-withNFiles: "файли: {n}"
 monitor: "Монітор"
 jobQueue: "Черга завдань"
 cpuAndMemory: "ЦП та пам'ять"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index 7662af4095..4b254fe943 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -177,7 +177,6 @@ operations: "Vận hành"
 software: "Phần mềm"
 version: "Phiên bản"
 metadata: "Metadata"
-withNFiles: "{n} tập tin"
 monitor: "Giám sát"
 jobQueue: "Công việc chờ xử lý"
 cpuAndMemory: "CPU và Dung lượng"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 8ca19e5969..5359cb6efb 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -181,7 +181,6 @@ operations: "操作"
 software: "软件"
 version: "版本"
 metadata: "元数据"
-withNFiles: "{n}个文件"
 monitor: "服务器状态"
 jobQueue: "作业队列"
 cpuAndMemory: "CPU和内存"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index fd5117f48c..61b5afbe63 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -180,7 +180,6 @@ operations: "操作"
 software: "軟體"
 version: "版本"
 metadata: "元資料"
-withNFiles: "{n}個檔案"
 monitor: "監視器"
 jobQueue: "佇列"
 cpuAndMemory: "CPU及記憶體用量"
diff --git a/packages/backend/src/misc/get-note-summary.ts b/packages/backend/src/misc/get-note-summary.ts
index 446e3fc140..285dcffd37 100644
--- a/packages/backend/src/misc/get-note-summary.ts
+++ b/packages/backend/src/misc/get-note-summary.ts
@@ -20,12 +20,13 @@ export const getNoteSummary = (note: Packed<"Note">): string => {
 
 	// ファイルが添付されているとき
 	if ((note.files || []).length !== 0) {
-		summary += ` (📎${note.files!.length})`;
+		const len = note.files?.length;
+		summary += ` 📎 (${len !== 1 ? len : ''})`;
 	}
 
 	// 投票が添付されているとき
 	if (note.poll) {
-		summary += " (📊)";
+		summary += " 📊";
 	}
 
 	/*
diff --git a/packages/client/src/scripts/get-note-summary.ts b/packages/client/src/scripts/get-note-summary.ts
index 43bd1d3b91..4333bd6f0e 100644
--- a/packages/client/src/scripts/get-note-summary.ts
+++ b/packages/client/src/scripts/get-note-summary.ts
@@ -23,12 +23,13 @@ export const getNoteSummary = (note: misskey.entities.Note): string => {
 
 	// ファイルが添付されているとき
 	if ((note.files || []).length !== 0) {
-		summary += ` (${i18n.t("withNFiles", { n: note.files.length })})`;
+		const len = note.files?.length;
+		summary += ` 📎 (${len !== 1 ? len : ''})`;
 	}
 
 	// 投票が添付されているとき
 	if (note.poll) {
-		summary += ` (${i18n.ts.poll})`;
+		summary += " 📊";
 	}
 
 	/*

From 7017b1370614e34f295e247bdab9782c872fd6de Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Sat, 3 Jun 2023 06:02:47 +0000
Subject: [PATCH 262/319] dev39

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

diff --git a/package.json b/package.json
index 41fc1e666e..703fef6327 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev35",
+	"version": "14.0.0-dev39",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",

From 696c07b19a448a9e5bacd243fd29c89da0ab10d4 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 23:20:34 -0700
Subject: [PATCH 263/319] fix: remove unessicary extra line in note menu

---
 packages/client/src/scripts/get-note-menu.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/client/src/scripts/get-note-menu.ts b/packages/client/src/scripts/get-note-menu.ts
index 6eeecf4a66..aaec3099d2 100644
--- a/packages/client/src/scripts/get-note-menu.ts
+++ b/packages/client/src/scripts/get-note-menu.ts
@@ -399,8 +399,6 @@ export function getNoteMenu(props: {
 				  ]
 				: []),
 
-			null,
-
 			isAppearAuthor || isModerator
 				? {
 						icon: "ph-trash ph-bold ph-lg",

From c1f699789b54f7c02543065c523149e1faf722da Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 23:21:06 -0700
Subject: [PATCH 264/319] chore: formatting

---
 packages/backend/src/misc/get-note-summary.ts   | 2 +-
 packages/client/src/scripts/get-note-summary.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/misc/get-note-summary.ts b/packages/backend/src/misc/get-note-summary.ts
index 285dcffd37..63521c1c67 100644
--- a/packages/backend/src/misc/get-note-summary.ts
+++ b/packages/backend/src/misc/get-note-summary.ts
@@ -21,7 +21,7 @@ export const getNoteSummary = (note: Packed<"Note">): string => {
 	// ファイルが添付されているとき
 	if ((note.files || []).length !== 0) {
 		const len = note.files?.length;
-		summary += ` 📎 (${len !== 1 ? len : ''})`;
+		summary += ` 📎 (${len !== 1 ? len : ""})`;
 	}
 
 	// 投票が添付されているとき
diff --git a/packages/client/src/scripts/get-note-summary.ts b/packages/client/src/scripts/get-note-summary.ts
index 4333bd6f0e..4a15301629 100644
--- a/packages/client/src/scripts/get-note-summary.ts
+++ b/packages/client/src/scripts/get-note-summary.ts
@@ -24,7 +24,7 @@ export const getNoteSummary = (note: misskey.entities.Note): string => {
 	// ファイルが添付されているとき
 	if ((note.files || []).length !== 0) {
 		const len = note.files?.length;
-		summary += ` 📎 (${len !== 1 ? len : ''})`;
+		summary += ` 📎 (${len !== 1 ? len : ""})`;
 	}
 
 	// 投票が添付されているとき

From 0eb65d0f12894073f20b17cb3786e7e76bf95a34 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 3 Jun 2023 15:24:16 +0900
Subject: [PATCH 265/319] fix tutorial

---
 .../client/src/components/MkTutorialDialog.vue     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/client/src/components/MkTutorialDialog.vue b/packages/client/src/components/MkTutorialDialog.vue
index 6927e961c6..b4d8eee0a2 100644
--- a/packages/client/src/components/MkTutorialDialog.vue
+++ b/packages/client/src/components/MkTutorialDialog.vue
@@ -140,26 +140,26 @@
 										</template>
 									</I18n>
 								</li>
-								<li v-if="timelines.includes('recommended')">
+								<li v-if="timelines.includes('social')">
 									<I18n
 										:src="i18n.ts._tutorial.step5_5"
 										tag="div"
 									>
 										<template #icon>
 											<i
-												class="ph-thumbs-up ph-bold ph-lg"
+												class="ph-handshake ph-bold ph-lg"
 											/>
 										</template>
 									</I18n>
 								</li>
-								<li v-if="timelines.includes('social')">
+								<li v-if="timelines.includes('recommended')">
 									<I18n
 										:src="i18n.ts._tutorial.step5_6"
 										tag="div"
 									>
 										<template #icon>
 											<i
-												class="ph-handshake ph-bold ph-lg"
+												class="ph-thumbs-up ph-bold ph-lg"
 											/>
 										</template>
 									</I18n>
@@ -235,12 +235,12 @@ let timelines = ["home"];
 if (isLocalTimelineAvailable) {
 	timelines.push("local");
 }
-if (isRecommendedTimelineAvailable) {
-	timelines.push("recommended");
-}
 if (isLocalTimelineAvailable) {
 	timelines.push("social");
 }
+if (isRecommendedTimelineAvailable) {
+	timelines.push("recommended");
+}
 if (isGlobalTimelineAvailable) {
 	timelines.push("global");
 }

From 6956522694deb6ba3e14fc55bdb17753f7c1d7d0 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 23:28:21 -0700
Subject: [PATCH 266/319] =?UTF-8?q?perf:=20=E3=82=A4=E3=83=B3=E3=82=B9?=
 =?UTF-8?q?=E3=82=BF=E3=83=B3=E3=82=B9=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB?=
 =?UTF-8?q?=E3=83=88=E3=83=86=E3=83=BC=E3=83=9E=E3=82=92=E4=BA=88=E3=82=81?=
 =?UTF-8?q?json5=20->=20json=E3=81=AB=E5=A4=89=E6=8F=9B=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E3=81=8A=E3=81=8F=E3=81=93=E3=81=A8=E3=81=A7json5=E3=82=92?=
 =?UTF-8?q?=E5=88=9D=E6=9C=9F=E3=83=90=E3=83=B3=E3=83=89=E3=83=AB=E3=81=AB?=
 =?UTF-8?q?=E5=90=AB=E3=82=81=E3=81=9A=E3=81=AB=E6=B8=88=E3=82=80=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Syuilo <syuilotan@yahoo.co.jp>
---
 packages/backend/src/server/api/endpoints/meta.ts | 10 ++++++++--
 packages/client/src/init.ts                       |  5 ++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 139afc88ba..23cfe40184 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -1,3 +1,4 @@
+import * as JSON5 from "json5";
 import { IsNull, MoreThan } from "typeorm";
 import config from "@/config/index.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
@@ -462,8 +463,13 @@ export default define(meta, paramDef, async (ps, me) => {
 		maxNoteTextLength: MAX_NOTE_TEXT_LENGTH, // 後方互換性のため
 		maxCaptionTextLength: MAX_CAPTION_TEXT_LENGTH,
 		emojis: instance.privateMode && !me ? [] : await Emojis.packMany(emojis),
-		defaultLightTheme: instance.defaultLightTheme,
-		defaultDarkTheme: instance.defaultDarkTheme,
+		// クライアントの手間を減らすためあらかじめJSONに変換しておく
+		defaultLightTheme: instance.defaultLightTheme
+			? JSON.stringify(JSON5.parse(instance.defaultLightTheme))
+			: null,
+		defaultDarkTheme: instance.defaultDarkTheme
+			? JSON.stringify(JSON5.parse(instance.defaultDarkTheme))
+			: null,
 		ads:
 			instance.privateMode && !me
 				? []
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index 7a004688d6..5d9ae12f36 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -27,7 +27,6 @@ import {
 	defineAsyncComponent,
 } from "vue";
 import { compareVersions } from "compare-versions";
-import JSON5 from "json5";
 
 import widgets from "@/widgets";
 import directives from "@/directives";
@@ -312,12 +311,12 @@ import { getAccountFromId } from "@/scripts/get-account-from-id";
 			if (instance.defaultLightTheme != null)
 				ColdDeviceStorage.set(
 					"lightTheme",
-					JSON5.parse(instance.defaultLightTheme),
+					JSON.parse(instance.defaultLightTheme),
 				);
 			if (instance.defaultDarkTheme != null)
 				ColdDeviceStorage.set(
 					"darkTheme",
-					JSON5.parse(instance.defaultDarkTheme),
+					JSON.parse(instance.defaultDarkTheme),
 				);
 			defaultStore.set("themeInitial", false);
 		}

From dbe00078a3366afbf257258da473584baf30838f Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 23:30:51 -0700
Subject: [PATCH 267/319] refactor: remove mk remnants

---
 packages/backend/migration/1000000000000-Init.js        | 2 +-
 packages/backend/src/models/entities/meta.ts            | 4 ++--
 packages/backend/src/server/api/endpoints/admin/meta.ts | 4 ++--
 packages/backend/src/server/api/endpoints/meta.ts       | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/backend/migration/1000000000000-Init.js b/packages/backend/migration/1000000000000-Init.js
index c07500e358..d32a6e0d25 100644
--- a/packages/backend/migration/1000000000000-Init.js
+++ b/packages/backend/migration/1000000000000-Init.js
@@ -220,7 +220,7 @@ export class Init1000000000000 {
 			`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"))`,
+			`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 '/static-assets/badges/info.png', "bannerUrl" character varying(512), "errorImageUrl" character varying(512) DEFAULT '/static-assets/badges/error.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"))`,
diff --git a/packages/backend/src/models/entities/meta.ts b/packages/backend/src/models/entities/meta.ts
index 433ad0db56..b22c6510fa 100644
--- a/packages/backend/src/models/entities/meta.ts
+++ b/packages/backend/src/models/entities/meta.ts
@@ -162,7 +162,7 @@ export class Meta {
 	@Column("varchar", {
 		length: 512,
 		nullable: true,
-		default: "/assets/ai.png",
+		default: "/static-assets/badges/info.png",
 	})
 	public mascotImageUrl: string | null;
 
@@ -187,7 +187,7 @@ export class Meta {
 	@Column("varchar", {
 		length: 512,
 		nullable: true,
-		default: "https://xn--931a.moe/aiart/yubitun.png",
+		default: "/static-assets/badges/error.png",
 	})
 	public errorImageUrl: 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 24c895cbb3..ad70310633 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -64,7 +64,7 @@ export const meta = {
 				type: "string",
 				optional: false,
 				nullable: false,
-				default: "/assets/ai.png",
+				default: "/static-assets/badges/info.png",
 			},
 			bannerUrl: {
 				type: "string",
@@ -75,7 +75,7 @@ export const meta = {
 				type: "string",
 				optional: false,
 				nullable: false,
-				default: "https://xn--931a.moe/aiart/yubitun.png",
+				default: "/static-assets/badges/error.png",
 			},
 			iconUrl: {
 				type: "string",
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 23cfe40184..c603cb9acf 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -155,7 +155,7 @@ export const meta = {
 				type: "string",
 				optional: false,
 				nullable: false,
-				default: "/assets/ai.png",
+				default: "/static-assets/badges/info.png",
 			},
 			bannerUrl: {
 				type: "string",
@@ -166,7 +166,7 @@ export const meta = {
 				type: "string",
 				optional: false,
 				nullable: false,
-				default: "https://xn--931a.moe/aiart/yubitun.png",
+				default: "/static-assets/badges/error.png",
 			},
 			iconUrl: {
 				type: "string",

From 2ec387de4abbf4514feb630ab87b7b0560abb6ac Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 23:38:05 -0700
Subject: [PATCH 268/319] regress: no metrics in dashboard for now

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

diff --git a/packages/client/src/pages/admin/overview.vue b/packages/client/src/pages/admin/overview.vue
index 67da86746e..d880225950 100644
--- a/packages/client/src/pages/admin/overview.vue
+++ b/packages/client/src/pages/admin/overview.vue
@@ -51,10 +51,10 @@
 				<XQueue domain="inbox" />
 			</MkFolder>
 
-			<MkFolder class="item">
+			<!-- <MkFolder class="item">
 				<template #header>Server metrics</template>
 				<XMetrics domain="inbox" />
-			</MkFolder>
+			</MkFolder> -->
 		</div>
 	</MkSpacer>
 </template>
@@ -76,7 +76,7 @@ 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 XMetrics from "./overview.metrics.vue";
+// import XMetrics from "./overview.metrics.vue";
 import MkTagCloud from "@/components/MkTagCloud.vue";
 import { version, url } from "@/config";
 import * as os from "@/os";

From 99df1dcbd7cadd382cdadd22055bfd7bb5ef9c88 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Fri, 2 Jun 2023 23:55:31 -0700
Subject: [PATCH 269/319] fix: summary if 1 attachment

---
 packages/backend/src/misc/get-note-summary.ts   | 2 +-
 packages/client/src/scripts/get-note-summary.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/misc/get-note-summary.ts b/packages/backend/src/misc/get-note-summary.ts
index 63521c1c67..0a662e434e 100644
--- a/packages/backend/src/misc/get-note-summary.ts
+++ b/packages/backend/src/misc/get-note-summary.ts
@@ -21,7 +21,7 @@ export const getNoteSummary = (note: Packed<"Note">): string => {
 	// ファイルが添付されているとき
 	if ((note.files || []).length !== 0) {
 		const len = note.files?.length;
-		summary += ` 📎 (${len !== 1 ? len : ""})`;
+		summary += ` 📎${len !== 1 ? ` (${len})` : ""}`;
 	}
 
 	// 投票が添付されているとき
diff --git a/packages/client/src/scripts/get-note-summary.ts b/packages/client/src/scripts/get-note-summary.ts
index 4a15301629..bbbe4afb8f 100644
--- a/packages/client/src/scripts/get-note-summary.ts
+++ b/packages/client/src/scripts/get-note-summary.ts
@@ -24,7 +24,7 @@ export const getNoteSummary = (note: misskey.entities.Note): string => {
 	// ファイルが添付されているとき
 	if ((note.files || []).length !== 0) {
 		const len = note.files?.length;
-		summary += ` 📎 (${len !== 1 ? len : ""})`;
+		summary += ` 📎${len !== 1 ? ` (${len})` : ""}`;
 	}
 
 	// 投票が添付されているとき

From 02658fee0b8f97413dae874b7bd10eec92e8901d Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sat, 3 Jun 2023 00:41:30 -0700
Subject: [PATCH 270/319] chore: :arrow_up: up various deps

---
 package.json                               |  4 +-
 packages/backend/native-utils/Cargo.toml   |  2 +-
 packages/backend/native-utils/package.json |  2 +-
 packages/backend/package.json              |  2 +-
 packages/client/.vscode/settings.json      | 11 ++-
 packages/client/package.json               | 10 +--
 pnpm-lock.yaml                             | 84 ++++++++++++----------
 7 files changed, 67 insertions(+), 48 deletions(-)

diff --git a/package.json b/package.json
index 703fef6327..6b6531fc6a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev39",
+	"version": "14.0.0-dev40",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
@@ -38,7 +38,7 @@
 	"dependencies": {
 		"@bull-board/api": "5.2.0",
 		"@bull-board/ui": "5.2.0",
-		"@napi-rs/cli": "^2.15.0",
+		"@napi-rs/cli": "^2.16.1",
 		"@tensorflow/tfjs": "^3.21.0",
 		"focus-trap": "^7.2.0",
 		"focus-trap-vue": "^4.0.1",
diff --git a/packages/backend/native-utils/Cargo.toml b/packages/backend/native-utils/Cargo.toml
index 9b030e37da..f93180fe43 100644
--- a/packages/backend/native-utils/Cargo.toml
+++ b/packages/backend/native-utils/Cargo.toml
@@ -33,7 +33,7 @@ tokio = { version = "1.28.1", features = ["full"] }
 utoipa = "3.3.0"
 
 # 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 = ["napi6", "tokio_rt"], optional = true }
+napi = { version = "2.13.1", default-features = false, features = ["napi6", "tokio_rt"], optional = true }
 napi-derive = { version = "2.12.0", optional = true }
 radix_fmt = { version = "1.0.0", optional = true }
 
diff --git a/packages/backend/native-utils/package.json b/packages/backend/native-utils/package.json
index 64f9e0e50f..2e6a721f4c 100644
--- a/packages/backend/native-utils/package.json
+++ b/packages/backend/native-utils/package.json
@@ -23,7 +23,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@napi-rs/cli": "2.15.0",
+    "@napi-rs/cli": "2.16.1",
     "ava": "5.1.1"
   },
   "ava": {
diff --git a/packages/backend/package.json b/packages/backend/package.json
index ca916576b3..47e9c415cb 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -63,7 +63,7 @@
 		"cli-highlight": "2.1.11",
 		"color-convert": "2.0.1",
 		"content-disposition": "0.5.4",
-		"date-fns": "2.29.3",
+		"date-fns": "2.30.0",
 		"deep-email-validator": "0.1.21",
 		"escape-regexp": "0.0.1",
 		"feed": "4.2.2",
diff --git a/packages/client/.vscode/settings.json b/packages/client/.vscode/settings.json
index 1950a66b9a..d654bb1662 100644
--- a/packages/client/.vscode/settings.json
+++ b/packages/client/.vscode/settings.json
@@ -1,6 +1,15 @@
 {
-	"typescript.tsdk": "node_modules\\typescript\\lib",
+	"typescript.tsdk": "node_modules/typescript/lib",
 	"path-intellisense.mappings": {
 		"@": "${workspaceRoot}/packages/client/src/"
 	},
+	"files.exclude": {
+		"**/.git": true,
+		"**/.svn": true,
+		"**/.hg": true,
+		"**/CVS": true,
+		"**/.DS_Store": true,
+		"**/Thumbs.db": true,
+		"**/_client_dist_": true
+	}
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index ccddda6b9c..83ea429c4f 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -33,17 +33,17 @@
 		"broadcast-channel": "4.19.1",
 		"browser-image-resizer": "github:misskey-dev/browser-image-resizer",
 		"calckey-js": "workspace:*",
-		"chart.js": "4.1.1",
-		"chartjs-adapter-date-fns": "2.0.1",
+		"chart.js": "4.3.0",
+		"chartjs-adapter-date-fns": "3.0.0",
 		"chartjs-chart-matrix": "^2.0.1",
-		"chartjs-plugin-gradient": "0.5.1",
-		"chartjs-plugin-zoom": "1.2.1",
+		"chartjs-plugin-gradient": "0.6.1",
+		"chartjs-plugin-zoom": "2.0.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",
+		"date-fns": "2.30.0",
 		"escape-regexp": "0.0.1",
 		"eventemitter3": "4.0.7",
 		"gsap": "^3.11.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0d65da71e0..f001fec77b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -18,8 +18,8 @@ importers:
         specifier: 5.2.0
         version: 5.2.0
       '@napi-rs/cli':
-        specifier: ^2.15.0
-        version: 2.15.0
+        specifier: ^2.16.1
+        version: 2.16.1
       '@tensorflow/tfjs':
         specifier: ^3.21.0
         version: 3.21.0(seedrandom@3.0.5)
@@ -190,8 +190,8 @@ importers:
         specifier: 0.5.4
         version: 0.5.4
       date-fns:
-        specifier: 2.29.3
-        version: 2.29.3
+        specifier: 2.30.0
+        version: 2.30.0
       deep-email-validator:
         specifier: 0.1.21
         version: 0.1.21
@@ -612,8 +612,8 @@ importers:
   packages/backend/native-utils:
     devDependencies:
       '@napi-rs/cli':
-        specifier: 2.15.0
-        version: 2.15.0
+        specifier: 2.16.1
+        version: 2.16.1
       ava:
         specifier: 5.1.1
         version: 5.1.1
@@ -754,20 +754,20 @@ importers:
         specifier: workspace:*
         version: link:../calckey-js
       chart.js:
-        specifier: 4.1.1
-        version: 4.1.1
+        specifier: 4.3.0
+        version: 4.3.0
       chartjs-adapter-date-fns:
-        specifier: 2.0.1
-        version: 2.0.1(chart.js@4.1.1)
+        specifier: 3.0.0
+        version: 3.0.0(chart.js@4.3.0)(date-fns@2.30.0)
       chartjs-chart-matrix:
         specifier: ^2.0.1
-        version: 2.0.1(chart.js@4.1.1)
+        version: 2.0.1(chart.js@4.3.0)
       chartjs-plugin-gradient:
-        specifier: 0.5.1
-        version: 0.5.1(chart.js@4.1.1)
+        specifier: 0.6.1
+        version: 0.6.1(chart.js@4.3.0)
       chartjs-plugin-zoom:
-        specifier: 1.2.1
-        version: 1.2.1(chart.js@4.1.1)
+        specifier: 2.0.1
+        version: 2.0.1(chart.js@4.3.0)
       city-timezones:
         specifier: ^1.2.1
         version: 1.2.1
@@ -784,8 +784,8 @@ importers:
         specifier: 10.11.0
         version: 10.11.0
       date-fns:
-        specifier: 2.29.3
-        version: 2.29.3
+        specifier: 2.30.0
+        version: 2.30.0
       escape-regexp:
         specifier: 0.0.1
         version: 0.0.1
@@ -1262,6 +1262,12 @@ packages:
       regenerator-runtime: 0.13.11
     dev: true
 
+  /@babel/runtime@7.22.3:
+    resolution: {integrity: sha512-XsDuspWKLUsxwCp6r7EhsExHtYfbe5oAGQ19kqngTdCPUoPQzOPdUbD/pB9PJiwb2ptYKQDjSJT3R6dC+EPqfQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      regenerator-runtime: 0.13.11
+
   /@babel/template@7.20.7:
     resolution: {integrity: sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==}
     engines: {node: '>=6.9.0'}
@@ -2290,8 +2296,8 @@ packages:
     dev: false
     optional: true
 
-  /@napi-rs/cli@2.15.0:
-    resolution: {integrity: sha512-RDDr7ZF0cgbd37+NBGeQOjP7Tm/iNM+y3FmrT5bVQBXLePOTuKVC/dBsdN5UZv3Sl2XAwEvBfaGR90E0d8AA6g==}
+  /@napi-rs/cli@2.16.1:
+    resolution: {integrity: sha512-L0Gr5iEQIDEbvWdDr1HUaBOxBSHL1VZhWSk1oryawoT8qJIY+KGfLFelU+Qma64ivCPbxYpkfPoKYVG3rcoGIA==}
     engines: {node: '>= 10'}
     hasBin: true
 
@@ -5315,43 +5321,45 @@ packages:
     resolution: {integrity: sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==}
     dev: true
 
-  /chart.js@4.1.1:
-    resolution: {integrity: sha512-P0pCosNXp+LR8zO/QTkZKT6Hb7p0DPFtypEeVOf+6x06hX13NIb75R0DXUA4Ksx/+48chDQKtCCmRCviQRTqsA==}
-    engines: {pnpm: ^7.0.0}
+  /chart.js@4.3.0:
+    resolution: {integrity: sha512-ynG0E79xGfMaV2xAHdbhwiPLczxnNNnasrmPEXriXsPJGjmhOBYzFVEsB65w2qMDz+CaBJJuJD0inE/ab/h36g==}
+    engines: {pnpm: '>=7'}
     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==}
+  /chartjs-adapter-date-fns@3.0.0(chart.js@4.3.0)(date-fns@2.30.0):
+    resolution: {integrity: sha512-Rs3iEB3Q5pJ973J93OBTpnP7qoGwvq3nUnoMdtxO+9aoJof7UFcRbWcIDteXuYd1fgAvct/32T9qaLyLuZVwCg==}
     peerDependencies:
       chart.js: '>=2.8.0'
+      date-fns: '>=2.0.0'
     dependencies:
-      chart.js: 4.1.1
+      chart.js: 4.3.0
+      date-fns: 2.30.0
     dev: true
 
-  /chartjs-chart-matrix@2.0.1(chart.js@4.1.1):
+  /chartjs-chart-matrix@2.0.1(chart.js@4.3.0):
     resolution: {integrity: sha512-BGfeY+/PHnITyDlc7WfnKJ1RyOfgOzIqWp/gxzzl7pUjyoGzHDcw51qd2xJF9gdT9Def7ZwOnOMm8GJUXDxI0w==}
     peerDependencies:
       chart.js: '>=3.0.0'
     dependencies:
-      chart.js: 4.1.1
+      chart.js: 4.3.0
     dev: true
 
-  /chartjs-plugin-gradient@0.5.1(chart.js@4.1.1):
-    resolution: {integrity: sha512-vhwlYGZWan4MGZZ4Wj64Y4aIql1uCPCU1JcggLWn3cgYEv4G7pXp1YgM4XH5ugmyn6BVCgQqAhiJ2h6hppzHmQ==}
+  /chartjs-plugin-gradient@0.6.1(chart.js@4.3.0):
+    resolution: {integrity: sha512-TGHNIh8KqQMLdb+UfY80cBHYRyOC47eeokmgkeajRdKGbFt462lJiyiq4ZJ25fiM7BGsmzoBLhmVyEw4B3gQxw==}
     peerDependencies:
       chart.js: '>=2.6.0'
     dependencies:
-      chart.js: 4.1.1
+      chart.js: 4.3.0
     dev: true
 
-  /chartjs-plugin-zoom@1.2.1(chart.js@4.1.1):
-    resolution: {integrity: sha512-2zbWvw2pljrtMLMXkKw1uxYzAne5PtjJiOZftcut4Lo3Ee8qUt95RpMKDWrZ+pBZxZKQKOD/etdU4pN2jxZUmg==}
+  /chartjs-plugin-zoom@2.0.1(chart.js@4.3.0):
+    resolution: {integrity: sha512-ogOmLu6e+Q7E1XWOCOz9YwybMslz9qNfGV2a+qjfmqJYpsw5ZMoRHZBUyW+NGhkpQ5PwwPA/+rikHpBZb7PZuA==}
     peerDependencies:
-      chart.js: ^3.2.0
+      chart.js: '>=3.2.0'
     dependencies:
-      chart.js: 4.1.1
+      chart.js: 4.3.0
       hammerjs: 2.0.8
     dev: true
 
@@ -6332,9 +6340,11 @@ packages:
       whatwg-url: 11.0.0
     dev: false
 
-  /date-fns@2.29.3:
-    resolution: {integrity: sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA==}
+  /date-fns@2.30.0:
+    resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==}
     engines: {node: '>=0.11'}
+    dependencies:
+      '@babel/runtime': 7.22.3
 
   /date-time@3.1.0:
     resolution: {integrity: sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg==}
@@ -14754,7 +14764,7 @@ packages:
       buffer: 6.0.3
       chalk: 4.1.2
       cli-highlight: 2.1.11
-      date-fns: 2.29.3
+      date-fns: 2.30.0
       debug: 4.3.4(supports-color@8.1.1)
       dotenv: 16.0.3
       glob: 7.2.3

From 554241e7c7b70afb03f4e192b7a2a43694705916 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Sat, 3 Jun 2023 09:12:32 +0000
Subject: [PATCH 271/319] fix outdated docker deps

---
 Dockerfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile b/Dockerfile
index c378444f76..0aa13aefeb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,6 +3,7 @@ FROM node:19-alpine as build
 WORKDIR /calckey
 
 # Install compilation dependencies
+RUN apk update
 RUN apk add --no-cache --no-progress git alpine-sdk python3 rust cargo vips
 
 # Copy only the dependency-related files first, to cache efficiently

From 9c424ee04186a2602f011f2edf3d6701e2191b7e Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Sat, 3 Jun 2023 10:47:41 -0400
Subject: [PATCH 272/319] Fix blue highlight on post tap

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

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 7eca22a734..bf05f01a3f 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -570,6 +570,7 @@ defineExpose({
 	font-size: 1.05em;
 	overflow: clip;
 	contain: content;
+	-webkit-tap-highlight-color: transparent;
 
 	// これらの指定はパフォーマンス向上には有効だが、ノートの高さは一定でないため、
 	// 下の方までスクロールすると上のノートの高さがここで決め打ちされたものに変化し、表示しているノートの位置が変わってしまう

From 3749f92cc8a348d4c25e41c8ff5a85c234403773 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Sat, 3 Jun 2023 16:00:46 +0000
Subject: [PATCH 273/319] =?UTF-8?q?docs:=20=F0=9F=93=9D=20rust=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/README.md b/README.md
index f4d7c4150a..f2913b9143 100644
--- a/README.md
+++ b/README.md
@@ -95,7 +95,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/)
+- 🦀 At least [Rust](https://www.rust-lang.org/) v1.65.0
 - 🦬 C/C++ compiler & build tools
   - `build-essential` on Debian/Ubuntu Linux
   - `base-devel` on Arch Linux

From f468fd57a6306513e73019eedc047316f915024f Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Sat, 3 Jun 2023 16:01:20 +0000
Subject: [PATCH 274/319] chore: Translated using Weblate (Catalan)

Currently translated at 100.0% (1753 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
---
 locales/ca-ES.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index d83b93e573..bb249c76f9 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1239,7 +1239,7 @@ sample: Exemple
 abuseReports: Informes
 reportAbuse: Informe
 reporter: Informador
-reporterOrigin: Origen d'el informador
+reporterOrigin: Origen informador
 forwardReport: Envia l'informe a un servidor remot
 abuseReported: El teu informe ha sigut enviat. Moltes gràcies.
 reporteeOrigin: Origen de l'informe

From 47a38969eb71b4e2bb2285ef6fae2306014145f9 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Sat, 3 Jun 2023 12:57:51 -0400
Subject: [PATCH 275/319] Highlight boost button if boosted!

---
 packages/client/src/components/MkNote.vue     |  4 +++
 packages/client/src/components/MkNoteSub.vue  |  4 +++
 .../client/src/components/MkRenoteButton.vue  | 29 ++++++++++++-------
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 58078200cd..00758e7e40 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -821,6 +821,10 @@ defineExpose({
 						color: var(--fgHighlighted);
 					}
 
+					> i {
+						display: inline !important;
+					}
+
 					> .count {
 						display: inline;
 						margin: 0 0 0 8px;
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index c26af16687..c006ebaff8 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -506,6 +506,10 @@ function noteClick(e) {
 						color: var(--fgHighlighted);
 					}
 
+					> i {
+						display: inline !important;
+					}
+
 					> .count {
 						display: inline;
 						margin: 0 0 0 8px;
diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue
index 4a8e329d02..b0fda56de6 100644
--- a/packages/client/src/components/MkRenoteButton.vue
+++ b/packages/client/src/components/MkRenoteButton.vue
@@ -4,6 +4,7 @@
 		ref="buttonRef"
 		v-tooltip.noDelay.bottom="i18n.ts.renote"
 		class="button _button canRenote"
+		:class="{ renoted: hasRenotedBefore }"
 		@click="renote(false, $event)"
 	>
 		<i class="ph-repeat ph-bold ph-lg"></i>
@@ -64,17 +65,18 @@ useTooltip(buttonRef, async (showing) => {
 	);
 });
 
-const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
+let hasRenotedBefore = $ref(false);
+os.api("notes/renotes", {
+	noteId: props.note.id,
+	userId: $i.id,
+	limit: 1,
+}).then((res) => {
+	hasRenotedBefore = res.length > 0;
+});
+
+const renote = (viaKeyboard = false, ev?: MouseEvent) => {
 	pleaseLogin();
 
-	const renotes = await os.api("notes/renotes", {
-		noteId: props.note.id,
-		userId: $i.id,
-		limit: 1,
-	});
-
-	const hasRenotedBefore = renotes.length > 0;
-
 	let buttonActions: Array<MenuItem> = [];
 
 	if (props.note.visibility === "public") {
@@ -88,6 +90,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 					renoteId: props.note.id,
 					visibility: "public",
 				});
+				hasRenotedBefore = true;
 				const el =
 					ev &&
 					((ev.currentTarget ?? ev.target) as
@@ -114,6 +117,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 					renoteId: props.note.id,
 					visibility: "home",
 				});
+				hasRenotedBefore = true;
 				const el =
 					ev &&
 					((ev.currentTarget ?? ev.target) as
@@ -141,6 +145,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 					visibility: "specified",
 					visibleUserIds: props.note.visibleUserIds,
 				});
+				hasRenotedBefore = true;
 				const el =
 					ev &&
 					((ev.currentTarget ?? ev.target) as
@@ -165,6 +170,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 					renoteId: props.note.id,
 					visibility: "followers",
 				});
+				hasRenotedBefore = true;
 				const el =
 					ev &&
 					((ev.currentTarget ?? ev.target) as
@@ -202,6 +208,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 								localOnly: true,
 						  }
 				);
+				hasRenotedBefore = true;
 				const el =
 					ev &&
 					((ev.currentTarget ?? ev.target) as
@@ -240,6 +247,7 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 				os.api("notes/unrenote", {
 					noteId: props.note.id,
 				});
+				hasRenotedBefore = false;
 			},
 		});
 	}
@@ -253,7 +261,8 @@ const renote = async (viaKeyboard = false, ev?: MouseEvent) => {
 		cursor: default;
 	}
 	&.renoted {
-		background: var(--accent);
+		color: var(--accent) !important;
+		opacity: 1 !important;
 	}
 }
 </style>

From 28780772cb83d39e911ba8fe5259b912a802ca15 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Sat, 3 Jun 2023 13:43:08 -0400
Subject: [PATCH 276/319] tweak

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

diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue
index b0fda56de6..6be8881c25 100644
--- a/packages/client/src/components/MkRenoteButton.vue
+++ b/packages/client/src/components/MkRenoteButton.vue
@@ -263,6 +263,7 @@ const renote = (viaKeyboard = false, ev?: MouseEvent) => {
 	&.renoted {
 		color: var(--accent) !important;
 		opacity: 1 !important;
+		font-weight: 700;
 	}
 }
 </style>

From c80e106fb5b54bf27f8c80b3025b7c5d2fc82768 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Sat, 3 Jun 2023 17:12:08 -0400
Subject: [PATCH 277/319] Advanced MFM toggle

---
 locales/en-US.yml                             |   2 +
 .../src/components/MkSubNoteContent.vue       |   9 +-
 .../global/MkMisskeyFlavoredMarkdown.vue      | 506 +++++++++---------
 .../client/src/pages/settings/general.vue     |  20 +-
 packages/client/src/store.ts                  |   4 +
 5 files changed, 290 insertions(+), 251 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 127b2d0fe9..7169367548 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1211,6 +1211,8 @@ _mfm:
   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"
+  advanced: "Advanced MFM"
+  advancedDescription: "If disabled, only allows for basic markup unless animated MFM is playing"
   mention: "Mention"
   mentionDescription: "You can specify a user by using an At-Symbol and a username."
   hashtag: "Hashtag"
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 5c965972ae..5dc443c495 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -42,7 +42,8 @@
 				isLong,
 				manyImages: note.files.length > 4,
 				showContent: note.cw && !showContent,
-				disableAnim: disableMfm,
+				animatedMfm: !disableMfm,
+				advancedMfm,
 			}"
 		>
 			<XShowMoreButton
@@ -231,7 +232,9 @@ const mfms = props.note.text
 
 const hasMfm = $ref(mfms && mfms.length > 0);
 
-let disableMfm = $ref(hasMfm && defaultStore.state.animatedMfm);
+let disableMfm = $ref(defaultStore.state.animatedMfm);
+
+const advancedMfm = defaultStore.state.advancedMfm;
 
 async function toggleMfm() {
 	if (disableMfm) {
@@ -385,7 +388,7 @@ function focusFooter(ev) {
 			}
 		}
 
-		&.disableAnim :deep(span) {
+		&:not(.animatedMfm) :deep(span) {
 			animation: none !important;
 		}
 	}
diff --git a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
index 4a5c2ec0f9..81dbeb89d8 100644
--- a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
+++ b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
@@ -6,7 +6,7 @@
 		:author="author"
 		:customEmojis="customEmojis"
 		:isNote="isNote"
-		class="havbbuyv"
+		class="mfm-object"
 		:class="{ nowrap }"
 	/>
 </template>
@@ -34,284 +34,306 @@ const props = withDefaults(
 </script>
 
 <style lang="scss">
-.mfm-x2 {
-	--mfm-zoom-size: 200%;
+.content:not(.advancedMfm):not(.animatedMfm) {
+	.mfm-object {
+		[style*="animation:"] {
+			animation: none !important;
+		}
+		[style*="transform:"] {
+			transform: none !important;
+		}
+		[style*="background-color:"] {
+			background: none !important;
+		}
+		[style*="color:"] {
+			color: inherit !important;
+		}
+		[style*="font-family:"] {
+			font-family: inherit !important;
+		}
+	}
 }
+.content.advancedMfm,
+.content.animatedMfm {
+	.mfm-x2 {
+		--mfm-zoom-size: 200%;
+	}
 
-.mfm-x3 {
-	--mfm-zoom-size: 400%;
-}
+	.mfm-x3 {
+		--mfm-zoom-size: 400%;
+	}
 
-.mfm-x4 {
-	--mfm-zoom-size: 600%;
-}
-
-.mfm-x2,
-.mfm-x3,
-.mfm-x4 {
-	font-size: var(--mfm-zoom-size);
+	.mfm-x4 {
+		--mfm-zoom-size: 600%;
+	}
 
 	.mfm-x2,
 	.mfm-x3,
 	.mfm-x4 {
-		/* only half effective */
-		font-size: calc(var(--mfm-zoom-size) / 2 + 50%);
+		font-size: var(--mfm-zoom-size);
 
 		.mfm-x2,
 		.mfm-x3,
 		.mfm-x4 {
-			/* disabled */
-			font-size: 100%;
+			/* only half effective */
+			font-size: calc(var(--mfm-zoom-size) / 2 + 50%);
+
+			.mfm-x2,
+			.mfm-x3,
+			.mfm-x4 {
+				/* disabled */
+				font-size: 100%;
+			}
 		}
 	}
-}
 
-@keyframes mfm-spin {
-	0% {
-		transform: rotate(0deg);
+	@keyframes mfm-spin {
+		0% {
+			transform: rotate(0deg);
+		}
+		100% {
+			transform: rotate(360deg);
+		}
 	}
-	100% {
-		transform: rotate(360deg);
-	}
-}
 
-@keyframes mfm-spinX {
-	0% {
-		transform: perspective(128px) rotateX(0deg);
+	@keyframes mfm-spinX {
+		0% {
+			transform: perspective(128px) rotateX(0deg);
+		}
+		100% {
+			transform: perspective(128px) rotateX(360deg);
+		}
 	}
-	100% {
-		transform: perspective(128px) rotateX(360deg);
-	}
-}
 
-@keyframes mfm-spinY {
-	0% {
-		transform: perspective(128px) rotateY(0deg);
+	@keyframes mfm-spinY {
+		0% {
+			transform: perspective(128px) rotateY(0deg);
+		}
+		100% {
+			transform: perspective(128px) rotateY(360deg);
+		}
 	}
-	100% {
-		transform: perspective(128px) rotateY(360deg);
-	}
-}
 
-@keyframes mfm-jump {
-	0% {
-		transform: translateY(0);
+	@keyframes mfm-jump {
+		0% {
+			transform: translateY(0);
+		}
+		25% {
+			transform: translateY(-16px);
+		}
+		50% {
+			transform: translateY(0);
+		}
+		75% {
+			transform: translateY(-8px);
+		}
+		100% {
+			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);
+	@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);
+		}
 	}
-	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);
+	// 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);
+		}
 	}
-	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);
+	// 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);
+		}
 	}
-	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);
+	@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);
+		}
 	}
-	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%);
+	@keyframes mfm-rainbow {
+		0% {
+			filter: hue-rotate(0deg) contrast(150%) saturate(150%);
+		}
+		100% {
+			filter: hue-rotate(360deg) contrast(150%) saturate(150%);
+		}
 	}
-	100% {
-		filter: hue-rotate(360deg) contrast(150%) saturate(150%);
-	}
-}
 
-@keyframes mfm-fade {
-	0% {
-		opacity: 0;
-	}
-	100% {
-		opacity: 1;
+	@keyframes mfm-fade {
+		0% {
+			opacity: 0;
+		}
+		100% {
+			opacity: 1;
+		}
 	}
 }
 </style>
 
 <style lang="scss" scoped>
-.havbbuyv {
+.mfm-object {
 	white-space: pre-wrap;
 
 	&.nowrap {
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index 030126a968..bce8b6561d 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -54,12 +54,6 @@
 			<FormSwitch v-model="disablePagesScript" class="_formBlock">{{
 				i18n.ts.disablePagesScript
 			}}</FormSwitch>
-			<FormSwitch v-model="expandOnNoteClick" class="_formBlock"
-				>{{ i18n.ts.expandOnNoteClick
-				}}<template #caption>{{
-					i18n.ts.expandOnNoteClickDesc
-				}}</template>
-			</FormSwitch>
 			<FormSwitch v-model="profile.showTimelineReplies" class="_formBlock"
 				>{{ i18n.ts.flagShowTimelineReplies
 				}}<template #caption
@@ -87,6 +81,18 @@
 
 		<FormSection>
 			<template #label>{{ i18n.ts.accessibility }}</template>
+			<FormSwitch v-model="expandOnNoteClick" class="_formBlock"
+				>{{ i18n.ts.expandOnNoteClick
+				}}<template #caption>{{
+					i18n.ts.expandOnNoteClickDesc
+				}}</template>
+			</FormSwitch>
+			<FormSwitch v-model="advancedMfm" class="_formBlock">
+				{{ i18n.ts._mfm.advanced
+				}}<template #caption>{{
+					i18n.ts._mfm.advancedDescription
+				}}</template>
+			</FormSwitch>
 			<FormSwitch v-model="autoplayMfm" class="_formBlock">
 				{{ i18n.ts._mfm.alwaysPlay }}
 				<template #caption>
@@ -285,6 +291,7 @@ const showGapBetweenNotesInTimeline = computed(
 	defaultStore.makeGetterSetter("showGapBetweenNotesInTimeline")
 );
 const showAds = computed(defaultStore.makeGetterSetter("showAds"));
+const advancedMfm = computed(defaultStore.makeGetterSetter("advancedMfm"));
 const autoplayMfm = computed(
 	defaultStore.makeGetterSetter(
 		"animatedMfm",
@@ -374,6 +381,7 @@ watch(
 		swipeOnDesktop,
 		seperateRenoteQuote,
 		showAdminUpdates,
+		advancedMfm,
 		autoplayMfm,
 		expandOnNoteClick,
 	],
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 68d299aa40..5199c336a4 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -174,6 +174,10 @@ export const defaultStore = markRaw(
 			where: "device",
 			default: true,
 		},
+		advancedMfm: {
+			where: "device",
+			default: true,
+		},
 		animatedMfm: {
 			where: "device",
 			default: true,

From 5a3e14fa32a690b7bc8eb685047b7bbc816903c2 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Sat, 3 Jun 2023 17:26:37 -0400
Subject: [PATCH 278/319] Forgot clip-path

---
 .../client/src/components/global/MkMisskeyFlavoredMarkdown.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
index 81dbeb89d8..ef09e8606f 100644
--- a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
+++ b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
@@ -51,6 +51,9 @@ const props = withDefaults(
 		[style*="font-family:"] {
 			font-family: inherit !important;
 		}
+		[style*="clip-path:"] {
+			clip-path: none !important;
+		}
 	}
 }
 .content.advancedMfm,

From 15b30231ebf71adfc27191e3f3c14ed9de97dba0 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Sat, 3 Jun 2023 22:15:38 -0400
Subject: [PATCH 279/319] Allow clicking pfp in header of note page

---
 packages/client/src/components/global/MkPageHeader.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index a000b16bce..f5dcf33c7e 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -36,9 +36,7 @@
 					v-if="metadata.avatar"
 					class="avatar"
 					:user="metadata.avatar"
-					:disable-preview="true"
 					:show-indicator="true"
-					disableLink
 				/>
 				<i
 					v-else-if="metadata.icon && !narrow"
@@ -427,7 +425,6 @@ onUnmounted(() => {
 				height: $size;
 				vertical-align: bottom;
 				margin: 0 8px;
-				pointer-events: none;
 			}
 
 			> .icon {

From 482c21d00e55e2ed80c37f75ca8517704a309a59 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 4 Jun 2023 12:02:34 -0700
Subject: [PATCH 280/319] chore: format

---
 .../src/pages/messaging/messaging-room.form.vue      | 12 ++++++++++--
 .../client/src/pages/messaging/messaging-room.vue    |  6 +++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/pages/messaging/messaging-room.form.vue b/packages/client/src/pages/messaging/messaging-room.form.vue
index f6565c25c5..eaa002f50b 100644
--- a/packages/client/src/pages/messaging/messaging-room.form.vue
+++ b/packages/client/src/pages/messaging/messaging-room.form.vue
@@ -17,10 +17,18 @@
 				{{ file.name }}
 			</div>
 			<div class="buttons">
-				<button class="_button" @click="chooseFile" :aria-label="i18n.t('attachFile')">
+				<button
+					class="_button"
+					@click="chooseFile"
+					:aria-label="i18n.t('attachFile')"
+				>
 					<i class="ph-upload ph-bold ph-lg"></i>
 				</button>
-				<button class="_button" @click="insertEmoji" :aria-label="i18n.t('chooseEmoji')">
+				<button
+					class="_button"
+					@click="insertEmoji"
+					:aria-label="i18n.t('chooseEmoji')"
+				>
 					<i class="ph-smiley ph-bold ph-lg"></i>
 				</button>
 				<button
diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue
index 08f993c107..3beea725c2 100644
--- a/packages/client/src/pages/messaging/messaging-room.vue
+++ b/packages/client/src/pages/messaging/messaging-room.vue
@@ -49,7 +49,11 @@
 					</MkPagination>
 				</div>
 				<footer>
-					<div v-if="typers.length > 0" class="typers" aria-live="polite">
+					<div
+						v-if="typers.length > 0"
+						class="typers"
+						aria-live="polite"
+					>
 						<I18n
 							:src="i18n.ts.typingUsers"
 							text-tag="span"

From 9e6a5534344bfbfc600a558cd11e00b68cdac6a6 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Sun, 4 Jun 2023 15:31:42 -0400
Subject: [PATCH 281/319] preload antennas & lists

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

diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 5d96d6dfd8..d093676280 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -152,8 +152,8 @@ function top(): void {
 	scroll(rootEl, { top: 0 });
 }
 
-async function chooseList(ev: MouseEvent): Promise<void> {
-	const lists = await os.api("users/lists/list");
+const lists = await os.api("users/lists/list");
+function chooseList(ev: MouseEvent) {
 	const items = [
 		{
 			type: "link" as const,
@@ -172,8 +172,8 @@ async function chooseList(ev: MouseEvent): Promise<void> {
 	os.popupMenu(items, ev.currentTarget ?? ev.target);
 }
 
-async function chooseAntenna(ev: MouseEvent): Promise<void> {
-	const antennas = await os.api("antennas/list");
+const antennas = await os.api("antennas/list");
+function chooseAntenna(ev: MouseEvent) {
 	const items = [
 		{
 			type: "link" as const,

From 49d2c87e50582b5fa86dfd878f715a41377767d6 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Sun, 4 Jun 2023 15:39:23 -0400
Subject: [PATCH 282/319] 'clip' to 'clips' #10255

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

diff --git a/packages/client/src/navbar.ts b/packages/client/src/navbar.ts
index 3dd71a5557..f8383357b5 100644
--- a/packages/client/src/navbar.ts
+++ b/packages/client/src/navbar.ts
@@ -91,7 +91,7 @@ export const navbarItemDef = reactive({
 		to: "/gallery",
 	},
 	clips: {
-		title: "clip",
+		title: "clips",
 		icon: "ph-paperclip ph-bold ph-lg",
 		show: computed(() => $i != null),
 		to: "/my/clips",

From c4fa29be5032e0a52e3ab3562f9d67175fb37875 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Sun, 4 Jun 2023 15:46:11 -0400
Subject: [PATCH 283/319] i18n to more button in navbar

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

diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index 68e4619ebb..e5c0a26762 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -92,7 +92,12 @@
 					><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">
+				<button 
+					v-click-anime
+					v-tooltip.noDelay.right="i18n.ts.more"
+					class="item _button"
+					@click="more"
+				>
 					<i
 						class="icon ph-dots-three-outline ph-bold ph-fw ph-lg"
 					></i

From 3b889d9c0587e4ec53bed66a120bb49d9faef582 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Sun, 4 Jun 2023 16:05:06 -0400
Subject: [PATCH 284/319] header spacing

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

diff --git a/packages/client/src/components/global/MkPageHeader.vue b/packages/client/src/components/global/MkPageHeader.vue
index f5dcf33c7e..499f7c042c 100644
--- a/packages/client/src/components/global/MkPageHeader.vue
+++ b/packages/client/src/components/global/MkPageHeader.vue
@@ -372,6 +372,7 @@ onUnmounted(() => {
 		display: flex;
 		> .buttons {
 			&:not(:empty) {
+				margin-right: 8px;
 				margin-left: calc(0px - var(--margin));
 			}
 			> .avatar {
@@ -424,7 +425,7 @@ onUnmounted(() => {
 				width: $size;
 				height: $size;
 				vertical-align: bottom;
-				margin: 0 8px;
+				margin-right: 8px;
 			}
 
 			> .icon {

From b0cd3b25fcb1795a5e332cf18239fdeeb2f01d45 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Sun, 4 Jun 2023 16:29:12 -0400
Subject: [PATCH 285/319] fix background of mentions

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

diff --git a/packages/client/src/components/MkMention.vue b/packages/client/src/components/MkMention.vue
index c191a08b2c..59e0fb92e4 100644
--- a/packages/client/src/components/MkMention.vue
+++ b/packages/client/src/components/MkMention.vue
@@ -2,7 +2,7 @@
 	<MkA
 		v-if="url.startsWith('/')"
 		v-user-preview="canonical"
-		class="akbvjaqn"
+		class="mention"
 		:class="{ isMe }"
 		:to="url"
 		@click.stop
@@ -19,7 +19,7 @@
 	</MkA>
 	<a
 		v-else
-		class="akbvjaqn"
+		class="mention"
 		:href="url"
 		target="_blank"
 		rel="noopener"
@@ -58,7 +58,7 @@ const isMe =
 </script>
 
 <style lang="scss" scoped>
-.akbvjaqn {
+.mention {
 	position: relative;
 	display: inline-block;
 	padding: 2px 8px 2px 2px;
@@ -68,6 +68,7 @@ const isMe =
 	white-space: nowrap;
 	text-overflow: ellipsis;
 	color: var(--mention);
+	isolation: isolate;
 
 	&::before {
 		content: "";

From 9a9c3d4c62ba7d6beeddb08abded6fb7449b1e52 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Sun, 4 Jun 2023 16:29:24 -0400
Subject: [PATCH 286/319] add rust to the runtime container for migrations

---
 Dockerfile                    | 2 +-
 docker-compose.yml            | 2 +-
 packages/backend/package.json | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0aa13aefeb..d8671911e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,7 @@ FROM node:19-alpine
 WORKDIR /calckey
 
 # Install runtime dependencies
-RUN apk add --no-cache --no-progress tini ffmpeg vips-dev zip unzip
+RUN apk add --no-cache --no-progress tini ffmpeg vips-dev zip unzip rust cargo
 
 COPY . ./
 
diff --git a/docker-compose.yml b/docker-compose.yml
index bf4e4fb8da..e4f751af08 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     depends_on:
       - db
       - redis
-      - meilisearch
+#     - meilisearch
     ports:
       - "3000:3000"
     networks:
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 47e9c415cb..c2e1e71131 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -8,10 +8,10 @@
 		"start:test": "NODE_ENV=test pnpm node ./built/index.js",
 		"migrate": "pnpm run migrate:typeorm && pnpm run migrate:cargo",
 		"migrate:typeorm": "typeorm migration:run -d ormconfig.js",
-		"migrate:cargo": "cargo run --manifest-path native-utils/migration/Cargo.toml -- up",
+		"migrate:cargo": "cargo run --manifest-path ./native-utils/migration/Cargo.toml -- up",
 		"revertmigration": "pnpm run revertmigration:cargo && pnpm run revertmigration:typeorm",
 		"revertmigration:typeorm": "typeorm migration:revert -d ormconfig.js",
-		"revertmigration:cargo": "cargo run --manifest-path native-utils/migration/Cargo.toml -- down",
+		"revertmigration:cargo": "cargo run --manifest-path ./native-utils/migration/Cargo.toml -- down",
 		"check:connect": "node ./check_connect.js",
 		"build": "pnpm swc src -d built -D",
 		"watch": "pnpm swc src -d built -D -w",

From 0151b256fcc514bca9e83509900b81461a742c47 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Sun, 4 Jun 2023 17:03:47 -0400
Subject: [PATCH 287/319] cache cargo artifacts

---
 .gitignore         | 4 ++++
 docker-compose.yml | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 63ee4f35fc..3a667851c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,3 +62,7 @@ yarn*
 # Nix Development shell items
 .devenv
 .direnv
+
+# Cargo cache for Docker
+/.cargo-cache
+/.cargo-target
diff --git a/docker-compose.yml b/docker-compose.yml
index e4f751af08..bc986ada9f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,8 @@ services:
     environment:
       NODE_ENV: production
     volumes:
+      - ./.cargo-cache:/root/.cargo
+      - ./.cargo-target:/calckey/packages/backend/native-utils/target
       - ./files:/calckey/files
       - ./.config:/calckey/.config:ro
 

From 535fa9f506a4fad3afa1f55ed091692b3069a34a Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 4 Jun 2023 14:41:18 -0700
Subject: [PATCH 288/319] fix: :bug: prevent null date insertion

https://calckey.aokaga.work/notes/9f6ksv2oov
---
 packages/backend/src/services/note/create.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index bd54db7e24..31fddfc4e0 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -596,20 +596,20 @@ export default async (
 				lastNotedAt: new Date(),
 			});
 
-			const count = await Notes.countBy({
+			await Notes.countBy({
 				userId: user.id,
 				channelId: data.channel.id,
 			}).then((count) => {
 				// この処理が行われるのはノート作成後なので、ノートが一つしかなかったら最初の投稿だと判断できる
 				// TODO: とはいえノートを削除して何回も投稿すればその分だけインクリメントされる雑さもあるのでどうにかしたい
-				if (count === 1) {
-					Channels.increment({ id: data.channel!.id }, "usersCount", 1);
+				if (count === 1 && data.channel != null) {
+					Channels.increment({ id: data.channel.id }, "usersCount", 1);
 				}
 			});
 		}
 
 		// Register to search database
-		await index(note);
+		await index(note, false);
 	});
 
 async function renderNoteOrRenoteActivity(data: Option, note: Note) {
@@ -649,9 +649,12 @@ async function insertNote(
 	emojis: string[],
 	mentionedUsers: MinimumUser[],
 ) {
+	if (data.createdAt === null || data.createdAt === undefined ) {
+		data.createdAt = new Date();
+	}
 	const insert = new Note({
-		id: genId(data.createdAt!),
-		createdAt: data.createdAt!,
+		id: genId(data.createdAt),
+		createdAt: data.createdAt,
 		fileIds: data.files ? data.files.map((file) => file.id) : [],
 		replyId: data.reply ? data.reply.id : null,
 		renoteId: data.renote ? data.renote.id : null,
@@ -668,7 +671,7 @@ async function insertNote(
 		tags: tags.map((tag) => normalizeForSearch(tag)),
 		emojis,
 		userId: user.id,
-		localOnly: data.localOnly!,
+		localOnly: data.localOnly || false,
 		visibility: data.visibility as any,
 		visibleUserIds:
 			data.visibility === "specified"

From 6a7e950f21972cb7bc15f0553afdafe30428191e Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Sun, 4 Jun 2023 14:42:22 -0700
Subject: [PATCH 289/319] chore: formatting

---
 packages/backend/src/services/note/create.ts | 2 +-
 packages/client/src/ui/_common_/navbar.vue   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 31fddfc4e0..abb8d94e88 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -649,7 +649,7 @@ async function insertNote(
 	emojis: string[],
 	mentionedUsers: MinimumUser[],
 ) {
-	if (data.createdAt === null || data.createdAt === undefined ) {
+	if (data.createdAt === null || data.createdAt === undefined) {
 		data.createdAt = new Date();
 	}
 	const insert = new Note({
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index e5c0a26762..b884f5c306 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -92,7 +92,7 @@
 					><i class="icon ph-door ph-bold ph-fw ph-lg"></i
 					><span class="text">{{ i18n.ts.controlPanel }}</span>
 				</MkA>
-				<button 
+				<button
 					v-click-anime
 					v-tooltip.noDelay.right="i18n.ts.more"
 					class="item _button"

From 7c436d0a414ba357f6544114931469f0e7a96bcd Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Sun, 4 Jun 2023 17:52:44 -0400
Subject: [PATCH 290/319] Prevent newly-made unlisted posts from showing in
 antennas

---
 packages/backend/src/misc/check-hit-antenna.ts | 1 +
 packages/client/src/ui/_common_/navbar.vue     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/misc/check-hit-antenna.ts b/packages/backend/src/misc/check-hit-antenna.ts
index adcdd190f8..358fba0f37 100644
--- a/packages/backend/src/misc/check-hit-antenna.ts
+++ b/packages/backend/src/misc/check-hit-antenna.ts
@@ -26,6 +26,7 @@ export async function checkHitAntenna(
 	antennaUserFollowing?: User["id"][],
 ): Promise<boolean> {
 	if (note.visibility === "specified") return false;
+	if (note.visibility === "home") return false;
 
 	// アンテナ作成者がノート作成者にブロックされていたらスキップ
 	const blockings = await blockingCache.fetch(noteUser.id, () =>
diff --git a/packages/client/src/ui/_common_/navbar.vue b/packages/client/src/ui/_common_/navbar.vue
index e5c0a26762..e7937eb6fc 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -177,7 +177,7 @@ const calcViewState = () => {
 
 calcViewState();
 
-window.addEventListener("resize", calcViewState);
+matchMedia("(max-width: 1279px)").onchange = (mql) => calcViewState();
 
 watch(defaultStore.reactiveState.menuDisplay, () => {
 	calcViewState();

From 3fb246f9622f6f283c9da409f6c27fecf9b46513 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Sun, 4 Jun 2023 21:55:35 +0000
Subject: [PATCH 291/319] Update 'docker-compose.yml'

---
 docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index bc986ada9f..d6ad26a059 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,9 @@ services:
     depends_on:
       - db
       - redis
+### Uncomment one of the following to use a search engine
 #     - meilisearch
+#     - sonic
     ports:
       - "3000:3000"
     networks:

From 47e3acd233bc42f5faf650cc79ddafca170d6a35 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Sun, 4 Jun 2023 18:16:54 -0400
Subject: [PATCH 292/319] center-align navbar icons

---
 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 f7fbe58c16..7905c331c7 100644
--- a/packages/client/src/ui/_common_/navbar.vue
+++ b/packages/client/src/ui/_common_/navbar.vue
@@ -396,7 +396,8 @@ function more(ev: MouseEvent) {
 
 				> .item {
 					position: relative;
-					display: block;
+					display: flex;
+					align-items: center;
 					padding-left: 30px;
 					line-height: 2.85rem;
 					margin-bottom: 0.5rem;

From c25b80d39a70c6a8d928625b7b1b3028aac93a56 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Mon, 5 Jun 2023 11:33:48 -0400
Subject: [PATCH 293/319] Fix animated MFM not playing in posting form preview

---
 packages/client/src/components/MkNotePreview.vue | 2 +-
 packages/client/src/components/MkNoteSimple.vue  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/client/src/components/MkNotePreview.vue b/packages/client/src/components/MkNotePreview.vue
index 6fdd79dc63..b8cc70ec9b 100644
--- a/packages/client/src/components/MkNotePreview.vue
+++ b/packages/client/src/components/MkNotePreview.vue
@@ -6,7 +6,7 @@
 				<MkUserName :user="$i" />
 			</div>
 			<div class="body">
-				<div class="content">
+				<div class="content advancedMfm animatedMfm">
 					<Mfm :text="preprocess(text).trim()" :author="$i" :i="$i" />
 				</div>
 			</div>
diff --git a/packages/client/src/components/MkNoteSimple.vue b/packages/client/src/components/MkNoteSimple.vue
index df5dceb927..49b5f93aae 100644
--- a/packages/client/src/components/MkNoteSimple.vue
+++ b/packages/client/src/components/MkNoteSimple.vue
@@ -20,8 +20,6 @@ const props = defineProps<{
 	note: misskey.entities.Note;
 	pinned?: boolean;
 }>();
-
-const showContent = $ref(false);
 </script>
 
 <style lang="scss" scoped>

From 60960d659dde7edc86315bd631186c970318638e Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Mon, 5 Jun 2023 11:41:56 -0400
Subject: [PATCH 294/319] fix in cheat sheet also, I've realized I will need to
 do it a different at some point but this works for now.

---
 packages/client/src/pages/mfm-cheat-sheet.vue | 72 +++++++++----------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index 6c284bee01..20dadb93cd 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -7,7 +7,7 @@
 				<br />
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.mention }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.mentionDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_mention" />
@@ -19,7 +19,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.hashtag }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.hashtagDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_hashtag" />
@@ -31,7 +31,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.link }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.linkDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_link" />
@@ -43,7 +43,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.emoji }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.emojiDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_emoji" />
@@ -55,7 +55,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.bold }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.boldDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_bold" />
@@ -67,7 +67,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.small }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.smallDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_small" />
@@ -79,7 +79,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.quote }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.quoteDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_quote" />
@@ -91,7 +91,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.center }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.centerDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_center" />
@@ -103,7 +103,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.inlineCode }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.inlineCodeDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_inlineCode" />
@@ -115,7 +115,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.blockCode }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.blockCodeDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_blockCode" />
@@ -127,7 +127,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.inlineMath }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.inlineMathDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_inlineMath" />
@@ -139,7 +139,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.blockMath }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.blockMathDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_blockMath" />
@@ -152,7 +152,7 @@
 				<!-- deprecated
 		<div class="section _block">
 			<div class="title">{{ i18n.ts._mfm.search }}</div>
-			<div class="content">
+			<div class="content advancedMfm animatedMfm">
 				<p>{{ i18n.ts._mfm.searchDescription }}</p>
 				<div class="preview">
 					<Mfm :text="preview_search"/>
@@ -163,7 +163,7 @@
 		-->
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.flip }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.flipDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_flip" />
@@ -175,7 +175,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.font }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.fontDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_font" />
@@ -187,7 +187,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.x2 }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.x2Description }}</p>
 						<div class="preview">
 							<Mfm :text="preview_x2" />
@@ -199,7 +199,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.x3 }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.x3Description }}</p>
 						<div class="preview">
 							<Mfm :text="preview_x3" />
@@ -211,7 +211,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.x4 }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.x4Description }}</p>
 						<div class="preview">
 							<Mfm :text="preview_x4" />
@@ -223,7 +223,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.blur }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.blurDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_blur" />
@@ -235,7 +235,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.jelly }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.jellyDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_jelly" />
@@ -247,7 +247,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.tada }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.tadaDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_tada" />
@@ -259,7 +259,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.jump }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.jumpDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_jump" />
@@ -271,7 +271,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.bounce }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.bounceDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_bounce" />
@@ -283,7 +283,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.spin }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.spinDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_spin" />
@@ -295,7 +295,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.shake }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.shakeDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_shake" />
@@ -307,7 +307,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.twitch }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.twitchDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_twitch" />
@@ -319,7 +319,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.rainbow }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.rainbowDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_rainbow" />
@@ -331,7 +331,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.sparkle }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.sparkleDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_sparkle" />
@@ -343,7 +343,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.rotate }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.rotateDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_rotate" />
@@ -355,7 +355,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.fade }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.fadeDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_fade" />
@@ -367,7 +367,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.crop }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.cropDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_crop" />
@@ -379,7 +379,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.position }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.positionDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_position" />
@@ -391,7 +391,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.scale }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.scaleDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_scale" />
@@ -403,7 +403,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.foreground }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.foregroundDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_fg" />
@@ -415,7 +415,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.background }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.backgroundDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_bg" />
@@ -427,7 +427,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.plain }}</div>
-					<div class="content">
+					<div class="content advancedMfm animatedMfm">
 						<p>{{ i18n.ts._mfm.plainDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_plain" />

From de65c3c3f6e0714d4782ff7cf77050d7e13fbf3c Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Mon, 5 Jun 2023 11:55:21 -0400
Subject: [PATCH 295/319] =?UTF-8?q?the=20better=20way=20of=20doing=20advan?=
 =?UTF-8?q?ced=20MFM=E2=84=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../client/src/components/MkNotePreview.vue   |  2 +-
 .../src/components/MkSubNoteContent.vue       |  5 +-
 .../global/MkMisskeyFlavoredMarkdown.vue      | 12 ++--
 packages/client/src/pages/mfm-cheat-sheet.vue | 72 +++++++++----------
 4 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/packages/client/src/components/MkNotePreview.vue b/packages/client/src/components/MkNotePreview.vue
index b8cc70ec9b..6fdd79dc63 100644
--- a/packages/client/src/components/MkNotePreview.vue
+++ b/packages/client/src/components/MkNotePreview.vue
@@ -6,7 +6,7 @@
 				<MkUserName :user="$i" />
 			</div>
 			<div class="body">
-				<div class="content advancedMfm animatedMfm">
+				<div class="content">
 					<Mfm :text="preprocess(text).trim()" :author="$i" :i="$i" />
 				</div>
 			</div>
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 5dc443c495..0f2941e081 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -42,8 +42,7 @@
 				isLong,
 				manyImages: note.files.length > 4,
 				showContent: note.cw && !showContent,
-				animatedMfm: !disableMfm,
-				advancedMfm,
+				animatedMfm: !disableMfm
 			}"
 		>
 			<XShowMoreButton
@@ -234,8 +233,6 @@ const hasMfm = $ref(mfms && mfms.length > 0);
 
 let disableMfm = $ref(defaultStore.state.animatedMfm);
 
-const advancedMfm = defaultStore.state.advancedMfm;
-
 async function toggleMfm() {
 	if (disableMfm) {
 		if (!defaultStore.state.animatedMfmWarnShown) {
diff --git a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
index ef09e8606f..5c366418d9 100644
--- a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
+++ b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
@@ -7,13 +7,17 @@
 		:customEmojis="customEmojis"
 		:isNote="isNote"
 		class="mfm-object"
-		:class="{ nowrap }"
+		:class="{ 
+			nowrap, 
+			advancedMfm: defaultStore.state.advancedMfm
+		}"
 	/>
 </template>
 
 <script lang="ts" setup>
 import {} from "vue";
 import MfmCore from "@/components/mfm";
+import { defaultStore } from "@/store";
 
 const props = withDefaults(
 	defineProps<{
@@ -34,8 +38,8 @@ const props = withDefaults(
 </script>
 
 <style lang="scss">
-.content:not(.advancedMfm):not(.animatedMfm) {
-	.mfm-object {
+.content:not(.animatedMfm) {
+	.mfm-object:not(.advancedMfm) {
 		[style*="animation:"] {
 			animation: none !important;
 		}
@@ -56,7 +60,7 @@ const props = withDefaults(
 		}
 	}
 }
-.content.advancedMfm,
+.mfm-object.advancedMfm,
 .content.animatedMfm {
 	.mfm-x2 {
 		--mfm-zoom-size: 200%;
diff --git a/packages/client/src/pages/mfm-cheat-sheet.vue b/packages/client/src/pages/mfm-cheat-sheet.vue
index 20dadb93cd..6c284bee01 100644
--- a/packages/client/src/pages/mfm-cheat-sheet.vue
+++ b/packages/client/src/pages/mfm-cheat-sheet.vue
@@ -7,7 +7,7 @@
 				<br />
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.mention }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.mentionDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_mention" />
@@ -19,7 +19,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.hashtag }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.hashtagDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_hashtag" />
@@ -31,7 +31,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.link }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.linkDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_link" />
@@ -43,7 +43,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.emoji }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.emojiDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_emoji" />
@@ -55,7 +55,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.bold }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.boldDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_bold" />
@@ -67,7 +67,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.small }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.smallDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_small" />
@@ -79,7 +79,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.quote }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.quoteDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_quote" />
@@ -91,7 +91,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.center }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.centerDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_center" />
@@ -103,7 +103,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.inlineCode }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.inlineCodeDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_inlineCode" />
@@ -115,7 +115,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.blockCode }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.blockCodeDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_blockCode" />
@@ -127,7 +127,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.inlineMath }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.inlineMathDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_inlineMath" />
@@ -139,7 +139,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.blockMath }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.blockMathDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_blockMath" />
@@ -152,7 +152,7 @@
 				<!-- deprecated
 		<div class="section _block">
 			<div class="title">{{ i18n.ts._mfm.search }}</div>
-			<div class="content advancedMfm animatedMfm">
+			<div class="content">
 				<p>{{ i18n.ts._mfm.searchDescription }}</p>
 				<div class="preview">
 					<Mfm :text="preview_search"/>
@@ -163,7 +163,7 @@
 		-->
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.flip }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.flipDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_flip" />
@@ -175,7 +175,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.font }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.fontDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_font" />
@@ -187,7 +187,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.x2 }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.x2Description }}</p>
 						<div class="preview">
 							<Mfm :text="preview_x2" />
@@ -199,7 +199,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.x3 }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.x3Description }}</p>
 						<div class="preview">
 							<Mfm :text="preview_x3" />
@@ -211,7 +211,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.x4 }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.x4Description }}</p>
 						<div class="preview">
 							<Mfm :text="preview_x4" />
@@ -223,7 +223,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.blur }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.blurDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_blur" />
@@ -235,7 +235,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.jelly }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.jellyDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_jelly" />
@@ -247,7 +247,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.tada }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.tadaDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_tada" />
@@ -259,7 +259,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.jump }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.jumpDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_jump" />
@@ -271,7 +271,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.bounce }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.bounceDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_bounce" />
@@ -283,7 +283,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.spin }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.spinDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_spin" />
@@ -295,7 +295,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.shake }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.shakeDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_shake" />
@@ -307,7 +307,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.twitch }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.twitchDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_twitch" />
@@ -319,7 +319,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.rainbow }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.rainbowDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_rainbow" />
@@ -331,7 +331,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.sparkle }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.sparkleDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_sparkle" />
@@ -343,7 +343,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.rotate }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.rotateDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_rotate" />
@@ -355,7 +355,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.fade }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.fadeDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_fade" />
@@ -367,7 +367,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.crop }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.cropDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_crop" />
@@ -379,7 +379,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.position }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.positionDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_position" />
@@ -391,7 +391,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.scale }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.scaleDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_scale" />
@@ -403,7 +403,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.foreground }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.foregroundDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_fg" />
@@ -415,7 +415,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.background }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.backgroundDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_bg" />
@@ -427,7 +427,7 @@
 				</div>
 				<div class="section _block">
 					<div class="title">{{ i18n.ts._mfm.plain }}</div>
-					<div class="content advancedMfm animatedMfm">
+					<div class="content">
 						<p>{{ i18n.ts._mfm.plainDescription }}</p>
 						<div class="preview">
 							<Mfm :text="preview_plain" />

From cf3f566e0682d53210480e9e9bad4aaff0551688 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@wahh.foo>
Date: Mon, 5 Jun 2023 11:59:45 -0400
Subject: [PATCH 296/319] escape database password as it may contain special
 characters

---
 packages/backend/native-utils/migration/Cargo.toml  |  2 +-
 packages/backend/native-utils/migration/src/main.rs | 13 +++++++++----
 packages/backend/src/db/postgre.ts                  |  4 +++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/packages/backend/native-utils/migration/Cargo.toml b/packages/backend/native-utils/migration/Cargo.toml
index 3813eccd80..4dee156ef3 100644
--- a/packages/backend/native-utils/migration/Cargo.toml
+++ b/packages/backend/native-utils/migration/Cargo.toml
@@ -13,7 +13,6 @@ default = []
 convert = ["dep:native-utils"]
 
 [dependencies]
-async-std = { version = "1", features = ["attributes", "tokio1"] }
 serde_json = "1.0.96"
 native-utils = { path = "../", optional = true }
 indicatif = { version = "0.17.4", features = ["tokio"] }
@@ -21,6 +20,7 @@ tokio = { version = "1.28.2", features = ["full"] }
 futures = "0.3.28"
 serde_yaml = "0.9.21"
 serde = { version = "1.0.163", features = ["derive"] }
+urlencoding = "2.1.2"
 
 [dependencies.sea-orm-migration]
 version = "0.11.0"
diff --git a/packages/backend/native-utils/migration/src/main.rs b/packages/backend/native-utils/migration/src/main.rs
index a845a41ff4..f0f761f657 100644
--- a/packages/backend/native-utils/migration/src/main.rs
+++ b/packages/backend/native-utils/migration/src/main.rs
@@ -1,24 +1,29 @@
 use serde::Deserialize;
 use std::env;
 use std::fs;
+use urlencoding::encode;
 
 use sea_orm_migration::prelude::*;
 
 #[cfg(feature = "convert")]
 mod vec_to_json;
 
-#[async_std::main]
+#[tokio::main]
 async fn main() {
     let cwd = env::current_dir().unwrap();
     let yml = fs::File::open(cwd.join("../../.config/default.yml"))
-        .expect("Unable to read '.config/default.yml'");
-    let config: Config = serde_yaml::from_reader(yml).expect("Unable to parse");
+        .expect("Failed to open '.config/default.yml'");
+    let config: Config = serde_yaml::from_reader(yml).expect("Failed to parse yaml");
 
     env::set_var(
         "DATABASE_URL",
         format!(
             "postgres://{}:{}@{}:{}/{}",
-            config.db.user, config.db.pass, config.db.host, config.db.port, config.db.db
+            config.db.user,
+            encode(&config.db.pass),
+            config.db.host,
+            config.db.port,
+            config.db.db,
         ),
     );
 
diff --git a/packages/backend/src/db/postgre.ts b/packages/backend/src/db/postgre.ts
index 9ffaf596c8..0fa5fdff67 100644
--- a/packages/backend/src/db/postgre.ts
+++ b/packages/backend/src/db/postgre.ts
@@ -222,7 +222,9 @@ export const db = new DataSource({
 
 export async function initDb(force = false) {
 	await nativeInitDatabase(
-		`postgres://${config.db.user}:${config.db.pass}@${config.db.host}:${config.db.port}/${config.db.db}`,
+		`postgres://${config.db.user}:${encodeURIComponent(config.db.pass)}@${
+			config.db.host
+		}:${config.db.port}/${config.db.db}`,
 	);
 	if (force) {
 		if (db.isInitialized) {

From 807093b94c7e071e15252246a5c6e7909c54970f Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Mon, 5 Jun 2023 13:11:14 -0400
Subject: [PATCH 297/319] Better post clipping

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

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index ff8264a606..264bd9660e 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -559,7 +559,7 @@ onUnmounted(() => {
 				inset: 0px 8px;
 			}
 			&:not(.max-width_450px)::before {
-				bottom: 12px;
+				bottom: 16px;
 			}
 			&:first-of-type::before {
 				top: 12px;
@@ -614,8 +614,16 @@ onUnmounted(() => {
 		font-size: 0.9em;
 	}
 	&.max-width_450px {
-		> .reply-to:first-child {
-			padding-top: 14px;
+		> .reply-to {
+			&::before {
+				inset-inline: -24px;
+			}
+			&:first-child {
+				padding-top: 14px;
+				&::before {
+					top: -24px;
+				}
+			}
 		}
 
 		> :deep(.note-container) {
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index c006ebaff8..5112ae17f4 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -543,6 +543,14 @@ function noteClick(e) {
 			border-radius: var(--radius);
 		}
 	}
+	&.reply-to {
+		> .main > .body {
+			margin-left: calc(0px - var(--avatarSize) - 38px);
+			padding-left: calc(var(--avatarSize) + 38px);
+			margin-top: -16px;
+			padding-top: 16px;
+		}
+	}
 	&.reply {
 		--avatarSize: 38px;
 		.avatar-container {
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 0f2941e081..8694dacd2d 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -348,10 +348,10 @@ function focusFooter(ev) {
 					black calc(100% - 64px),
 					transparent
 				);
-				padding-inline: 50px;
-				margin-inline: -50px;
-				margin-top: -50px;
-				padding-top: 50px;
+				padding-inline: 100px;
+				margin-inline: -100px;
+				margin-top: -100px;
+				padding-top: 100px;
 				overflow: hidden;
 				user-select: none;
 				-webkit-user-select: none;

From 6f1bdf79cd3b5735a70dfab49df4e7d8db2a9ab8 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Mon, 5 Jun 2023 15:07:04 -0400
Subject: [PATCH 298/319] fix collapsed height

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

diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 8694dacd2d..93f6d55675 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -213,8 +213,8 @@ const isLong =
 	!props.detailedView &&
 	((props.note.cw == null &&
 		props.note.text != null &&
-		(props.note.text.split("\n").length > 9 ||
-			props.note.text.length > 500)) ||
+		(props.note.text.split("\n").length > 10 ||
+			props.note.text.length > 800)) ||
 		props.note.files.length > 4);
 
 const collapsed = $ref(props.note.cw == null && isLong);
@@ -340,7 +340,7 @@ function focusFooter(ev) {
 		&.collapsed,
 		&.showContent {
 			position: relative;
-			max-height: calc(9em + 50px);
+			max-height: calc(15em + 100px);
 			> .body {
 				max-height: inherit;
 				mask: linear-gradient(black calc(100% - 64px), transparent);
@@ -360,7 +360,7 @@ function focusFooter(ev) {
 		}
 		&.collapsed {
 			&.manyImages {
-				max-height: calc(9em + 200px);
+				max-height: calc(15em + 250px);
 			}
 			> .body {
 				box-sizing: border-box;

From 9382afeb5ebf25804510b327114c20be8cd768d6 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Mon, 5 Jun 2023 15:28:42 -0400
Subject: [PATCH 299/319] comment out easing part for now

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

diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 86a9aba2ed..50a566d331 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -57,12 +57,12 @@ export default defineComponent({
 			if (t == null) return null;
 			return t.match(/^[0-9.]+s$/) ? t : null;
 		};
-		const validEase = (e: string | null | undefined) => {
-			if (e == null) return null;
-			return e.match(/(steps)?\(-?[0-9.]+,-?[0-9.]+,-?[0-9.]+,-?[0-9.]+\)/) 
-				? (e.startsWith("steps") ? e : "cubic-bezier" + e)
-				: null
-		}
+		// const validEase = (e: string | null | undefined) => {
+		// 	if (e == null) return null;
+		// 	return e.match(/(steps)?\(-?[0-9.]+,-?[0-9.]+,-?[0-9.]+,-?[0-9.]+\)/) 
+		// 		? (e.startsWith("steps") ? e : "cubic-bezier" + e)
+		// 		: null
+		// }
 
 		const genEl = (ast: mfm.MfmNode[]) =>
 			concat(
@@ -109,8 +109,8 @@ export default defineComponent({
 								case "tada": {
 									const speed = validTime(token.props.args.speed) || "1s";
 									const delay = validTime(token.props.args.delay) || "0s";
-									const ease = validEase(token.props.args.ease) || "linear";
-									style = `font-size: 150%; animation: tada ${speed} ${delay} ${ease} infinite both;`;
+									// const ease = validEase(token.props.args.ease) || "linear";
+									style = `font-size: 150%; animation: tada ${speed} ${delay} linear infinite both;`;
 									break;
 								}
 								case "jelly": {

From 4f16bdea781af2aa195c057738cb81aff91d00db Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Jun 2023 14:54:43 -0700
Subject: [PATCH 300/319] chore: :arrow_up: up deps

---
 package.json                  |    4 +-
 packages/backend/package.json |   64 +-
 packages/client/package.json  |   40 +-
 packages/sw/package.json      |    9 +-
 pnpm-lock.yaml                | 2075 +++++++++++++++++++--------------
 5 files changed, 1287 insertions(+), 905 deletions(-)

diff --git a/package.json b/package.json
index 6b6531fc6a..3269caa81e 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
 		"type": "git",
 		"url": "https://codeberg.org/calckey/calckey.git"
 	},
-	"packageManager": "pnpm@8.6.0",
+	"packageManager": "pnpm@8.6.1",
 	"private": true,
 	"scripts": {
 		"rebuild": "pnpm run clean && pnpm -r run build && pnpm run gulp",
@@ -40,8 +40,6 @@
 		"@bull-board/ui": "5.2.0",
 		"@napi-rs/cli": "^2.16.1",
 		"@tensorflow/tfjs": "^3.21.0",
-		"focus-trap": "^7.2.0",
-		"focus-trap-vue": "^4.0.1",
 		"js-yaml": "4.1.0",
 		"seedrandom": "^3.0.5"
 	},
diff --git a/packages/backend/package.json b/packages/backend/package.json
index c2e1e71131..2e29fa72a0 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -31,10 +31,10 @@
 		"@bull-board/koa": "5.2.0",
 		"@bull-board/ui": "5.2.0",
 		"@calckey/megalodon": "5.2.0",
-		"@discordapp/twemoji": "14.0.2",
+		"@discordapp/twemoji": "14.1.2",
 		"@elastic/elasticsearch": "7.17.0",
 		"@koa/cors": "3.4.3",
-		"@koa/multer": "3.0.0",
+		"@koa/multer": "3.0.2",
 		"@koa/router": "9.0.1",
 		"@peertube/http-signature": "1.7.0",
 		"@redocly/openapi-core": "1.0.0-beta.120",
@@ -42,7 +42,7 @@
 		"@syuilo/aiscript": "0.11.1",
 		"@tensorflow/tfjs": "^4.2.0",
 		"adm-zip": "^0.5.10",
-		"ajv": "8.11.2",
+		"ajv": "8.12.0",
 		"archiver": "5.3.1",
 		"argon2": "^0.30.3",
 		"async-mutex": "^0.4.0",
@@ -50,7 +50,7 @@
 		"autolinker": "4.0.0",
 		"autwh": "0.1.0",
 		"aws-sdk": "2.1277.0",
-		"axios": "^1.3.2",
+		"axios": "^1.4.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "1.1.5",
 		"bull": "4.10.4",
@@ -76,7 +76,7 @@
 		"is-svg": "4.3.2",
 		"js-yaml": "4.1.0",
 		"jsdom": "20.0.3",
-		"jsonld": "6.0.0",
+		"jsonld": "8.2.0",
 		"jsrsasign": "10.6.1",
 		"koa": "2.13.4",
 		"koa-body": "^6.0.1",
@@ -89,58 +89,58 @@
 		"koa-send": "5.0.1",
 		"koa-slow": "2.1.0",
 		"koa-views": "7.0.2",
-		"meilisearch": "0.32.4",
+		"meilisearch": "0.33.0",
 		"mfm-js": "0.23.3",
 		"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",
+		"node-fetch": "3.3.1",
+		"nodemailer": "6.9.3",
 		"nsfwjs": "2.4.2",
 		"oauth": "^0.10.0",
 		"os-utils": "0.0.14",
 		"parse5": "7.1.2",
-		"pg": "8.8.0",
+		"pg": "8.11.0",
 		"private-ip": "2.3.4",
 		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
-		"punycode": "2.1.1",
+		"punycode": "2.3.0",
 		"pureimage": "0.3.15",
-		"qrcode": "1.5.1",
-		"qs": "6.9.7",
+		"qrcode": "1.5.3",
+		"qs": "6.11.2",
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
-		"re2": "1.18.0",
-		"redis-lock": "0.1.4",
+		"re2": "1.19.0",
+		"redis-lock": "1.0.0",
 		"reflect-metadata": "0.1.13",
 		"rename": "1.0.4",
 		"rndstr": "1.0.0",
-		"rss-parser": "3.12.0",
-		"sanitize-html": "2.8.1",
+		"rss-parser": "3.13.0",
+		"sanitize-html": "2.10.0",
 		"seedrandom": "^3.0.5",
-		"semver": "7.3.8",
-		"sharp": "0.31.3",
+		"semver": "7.5.1",
+		"sharp": "0.32.1",
 		"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",
+		"systeminformation": "5.17.17",
 		"tesseract.js": "^3.0.3",
 		"tinycolor2": "1.5.2",
 		"tmp": "0.2.1",
 		"twemoji-parser": "14.0.0",
-		"typeorm": "0.3.11",
+		"typeorm": "0.3.16",
 		"ulid": "2.3.0",
 		"uuid": "9.0.0",
-		"web-push": "3.5.0",
+		"web-push": "3.6.1",
 		"websocket": "1.0.34",
 		"xev": "3.0.2"
 	},
 	"devDependencies": {
 		"@swc/cli": "^0.1.62",
-		"@swc/core": "^1.3.50",
+		"@swc/core": "^1.3.62",
 		"@types/adm-zip": "^0.5.0",
 		"@types/bcryptjs": "2.4.2",
 		"@types/bull": "3.15.9",
@@ -165,7 +165,7 @@
 		"@types/mocha": "9.1.1",
 		"@types/node": "18.11.18",
 		"@types/node-fetch": "3.0.3",
-		"@types/nodemailer": "6.4.7",
+		"@types/nodemailer": "6.4.8",
 		"@types/oauth": "0.9.1",
 		"@types/probe-image-size": "^7.2.0",
 		"@types/pug": "2.0.6",
@@ -176,8 +176,8 @@
 		"@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/sanitize-html": "2.9.0",
+		"@types/semver": "7.5.0",
 		"@types/sharp": "0.31.1",
 		"@types/sinonjs__fake-timers": "8.1.2",
 		"@types/speakeasy": "2.0.7",
@@ -186,10 +186,10 @@
 		"@types/uuid": "8.3.4",
 		"@types/web-push": "3.3.2",
 		"@types/websocket": "1.0.5",
-		"@types/ws": "8.5.3",
+		"@types/ws": "8.5.4",
 		"autobind-decorator": "2.4.0",
 		"cross-env": "7.0.3",
-		"eslint": "^8.31.0",
+		"eslint": "^8.42.0",
 		"execa": "6.1.0",
 		"json5": "2.2.3",
 		"json5-loader": "4.0.1",
@@ -197,11 +197,11 @@
 		"pug": "3.0.2",
 		"strict-event-emitter-types": "2.0.0",
 		"swc-loader": "^0.2.3",
-		"ts-loader": "9.4.2",
+		"ts-loader": "9.4.3",
 		"ts-node": "10.9.1",
-		"tsconfig-paths": "4.1.2",
-		"typescript": "4.9.4",
-		"webpack": "^5.75.0",
-		"ws": "8.11.0"
+		"tsconfig-paths": "4.2.0",
+		"typescript": "5.1.3",
+		"webpack": "^5.85.1",
+		"ws": "8.13.0"
 	}
 }
diff --git a/packages/client/package.json b/packages/client/package.json
index 83ea429c4f..2a1dadeb40 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -8,25 +8,25 @@
 		"format": "pnpm prettier --write '**/*.vue'"
 	},
 	"devDependencies": {
-		"@discordapp/twemoji": "14.0.2",
+		"@discordapp/twemoji": "14.1.2",
 		"@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/glob": "8.1.0",
+		"@types/gulp": "4.0.11",
+		"@types/gulp-rename": "2.0.2",
+		"@types/katex": "0.16.0",
 		"@types/matter-js": "0.18.2",
 		"@types/punycode": "2.1.0",
-		"@types/seedrandom": "3.0.4",
+		"@types/seedrandom": "3.0.5",
 		"@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",
+		"@vitejs/plugin-vue": "4.2.3",
+		"@vue/compiler-sfc": "3.3.4",
 		"autobind-decorator": "2.4.0",
 		"autosize": "5.0.2",
 		"blurhash": "1.1.5",
@@ -46,23 +46,25 @@
 		"date-fns": "2.30.0",
 		"escape-regexp": "0.0.1",
 		"eventemitter3": "4.0.7",
-		"gsap": "^3.11.4",
-		"idb-keyval": "6.2.0",
+		"focus-trap": "^7.4.3",
+		"focus-trap-vue": "^4.0.2",
+		"gsap": "^3.11.5",
+		"idb-keyval": "6.2.1",
 		"insert-text-at-cursor": "0.3.0",
 		"json5": "2.2.3",
-		"katex": "0.16.4",
+		"katex": "0.16.7",
 		"matter-js": "0.18.0",
 		"mfm-js": "0.23.3",
-		"photoswipe": "5.3.4",
-		"prettier": "2.8.7",
+		"photoswipe": "5.3.7",
+		"prettier": "2.8.8",
 		"prettier-plugin-vue": "1.1.6",
 		"prismjs": "1.29.0",
 		"punycode": "2.1.1",
 		"querystring": "0.2.1",
 		"rndstr": "1.0.0",
-		"rollup": "3.9.1",
+		"rollup": "3.23.1",
 		"s-age": "1.1.2",
-		"sass": "1.57.1",
+		"sass": "1.62.1",
 		"seedrandom": "3.0.5",
 		"start-server-and-test": "1.15.2",
 		"strict-event-emitter-types": "2.0.0",
@@ -73,15 +75,15 @@
 		"three": "0.146.0",
 		"throttle-debounce": "5.0.0",
 		"tinycolor2": "1.5.2",
-		"tsc-alias": "1.8.2",
-		"tsconfig-paths": "4.1.2",
+		"tsc-alias": "1.8.6",
+		"tsconfig-paths": "4.2.0",
 		"twemoji-parser": "14.0.0",
-		"typescript": "4.9.4",
+		"typescript": "5.1.3",
 		"uuid": "9.0.0",
 		"vanilla-tilt": "1.8.0",
 		"vite": "4.3.9",
 		"vite-plugin-compression": "^0.5.1",
-		"vue": "3.2.45",
+		"vue": "3.3.4",
 		"vue-isyourpasswordsafe": "^2.0.0",
 		"vue-plyr": "^7.0.0",
 		"vue-prism-editor": "2.0.0-alpha.2",
diff --git a/packages/sw/package.json b/packages/sw/package.json
index 0d0ac52dfb..bb8098dc30 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -6,15 +6,14 @@
 		"watch": "pnpm swc src -d built -D -w",
 		"lint": "pnpm rome check \"src/**/*.ts\""
 	},
-	"dependencies": {},
 	"devDependencies": {
 		"@swc/cli": "^0.1.62",
-		"@swc/core": "^1.3.50",
+		"@swc/core": "^1.3.62",
 		"@swc/core-android-arm64": "1.3.11",
 		"calckey-js": "workspace:*",
-		"idb-keyval": "^6.2.0",
+		"idb-keyval": "^6.2.1",
 		"swc-loader": "^0.2.3",
-		"webpack": "^5.75.0",
-		"webpack-cli": "^5.0.1"
+		"webpack": "^5.85.1",
+		"webpack-cli": "^5.1.3"
 	}
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f001fec77b..11c8c2122c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -23,12 +23,6 @@ importers:
       '@tensorflow/tfjs':
         specifier: ^3.21.0
         version: 3.21.0(seedrandom@3.0.5)
-      focus-trap:
-        specifier: ^7.2.0
-        version: 7.2.0
-      focus-trap-vue:
-        specifier: ^4.0.1
-        version: 4.0.1(focus-trap@7.2.0)(vue@3.2.45)
       js-yaml:
         specifier: 4.1.0
         version: 4.1.0
@@ -94,8 +88,8 @@ importers:
         specifier: 5.2.0
         version: 5.2.0
       '@discordapp/twemoji':
-        specifier: 14.0.2
-        version: 14.0.2
+        specifier: 14.1.2
+        version: 14.1.2
       '@elastic/elasticsearch':
         specifier: 7.17.0
         version: 7.17.0
@@ -103,8 +97,8 @@ importers:
         specifier: 3.4.3
         version: 3.4.3
       '@koa/multer':
-        specifier: 3.0.0
-        version: 3.0.0(multer@1.4.4-lts.1)
+        specifier: 3.0.2
+        version: 3.0.2(multer@1.4.4-lts.1)
       '@koa/router':
         specifier: 9.0.1
         version: 9.0.1
@@ -127,8 +121,8 @@ importers:
         specifier: ^0.5.10
         version: 0.5.10
       ajv:
-        specifier: 8.11.2
-        version: 8.11.2
+        specifier: 8.12.0
+        version: 8.12.0
       archiver:
         specifier: 5.3.1
         version: 5.3.1
@@ -151,8 +145,8 @@ importers:
         specifier: 2.1277.0
         version: 2.1277.0
       axios:
-        specifier: ^1.3.2
-        version: 1.3.2
+        specifier: ^1.4.0
+        version: 1.4.0
       bcryptjs:
         specifier: 2.4.3
         version: 2.4.3
@@ -229,8 +223,8 @@ importers:
         specifier: 20.0.3
         version: 20.0.3
       jsonld:
-        specifier: 6.0.0
-        version: 6.0.0
+        specifier: 8.2.0
+        version: 8.2.0
       jsrsasign:
         specifier: 10.6.1
         version: 10.6.1
@@ -268,8 +262,8 @@ importers:
         specifier: 7.0.2
         version: 7.0.2(@types/koa@2.13.5)(ejs@3.1.8)(pug@3.0.2)
       meilisearch:
-        specifier: 0.32.4
-        version: 0.32.4
+        specifier: 0.33.0
+        version: 0.33.0
       mfm-js:
         specifier: 0.23.3
         version: 0.23.3
@@ -286,11 +280,11 @@ importers:
         specifier: 4.0.0
         version: 4.0.0
       node-fetch:
-        specifier: 3.3.0
-        version: 3.3.0
+        specifier: 3.3.1
+        version: 3.3.1
       nodemailer:
-        specifier: 6.8.0
-        version: 6.8.0
+        specifier: 6.9.3
+        version: 6.9.3
       nsfwjs:
         specifier: 2.4.2
         version: 2.4.2(@tensorflow/tfjs@4.2.0)
@@ -304,8 +298,8 @@ importers:
         specifier: 7.1.2
         version: 7.1.2
       pg:
-        specifier: 8.8.0
-        version: 8.8.0
+        specifier: 8.11.0
+        version: 8.11.0
       private-ip:
         specifier: 2.3.4
         version: 2.3.4
@@ -316,17 +310,17 @@ importers:
         specifier: 2.7.0
         version: 2.7.0
       punycode:
-        specifier: 2.1.1
-        version: 2.1.1
+        specifier: 2.3.0
+        version: 2.3.0
       pureimage:
         specifier: 0.3.15
         version: 0.3.15
       qrcode:
-        specifier: 1.5.1
-        version: 1.5.1
+        specifier: 1.5.3
+        version: 1.5.3
       qs:
-        specifier: 6.9.7
-        version: 6.9.7
+        specifier: 6.11.2
+        version: 6.11.2
       random-seed:
         specifier: 0.3.0
         version: 0.3.0
@@ -334,11 +328,11 @@ importers:
         specifier: 3.4.1
         version: 3.4.1
       re2:
-        specifier: 1.18.0
-        version: 1.18.0
+        specifier: 1.19.0
+        version: 1.19.0
       redis-lock:
-        specifier: 0.1.4
-        version: 0.1.4
+        specifier: 1.0.0
+        version: 1.0.0
       reflect-metadata:
         specifier: 0.1.13
         version: 0.1.13
@@ -349,20 +343,20 @@ importers:
         specifier: 1.0.0
         version: 1.0.0
       rss-parser:
-        specifier: 3.12.0
-        version: 3.12.0
+        specifier: 3.13.0
+        version: 3.13.0
       sanitize-html:
-        specifier: 2.8.1
-        version: 2.8.1
+        specifier: 2.10.0
+        version: 2.10.0
       seedrandom:
         specifier: ^3.0.5
         version: 3.0.5
       semver:
-        specifier: 7.3.8
-        version: 7.3.8
+        specifier: 7.5.1
+        version: 7.5.1
       sharp:
-        specifier: 0.31.3
-        version: 0.31.3
+        specifier: 0.32.1
+        version: 0.32.1
       sonic-channel:
         specifier: ^1.3.1
         version: 1.3.1
@@ -379,11 +373,11 @@ importers:
         specifier: 1.0.0
         version: 1.0.0
       systeminformation:
-        specifier: 5.16.9
-        version: 5.16.9
+        specifier: 5.17.17
+        version: 5.17.17
       tesseract.js:
         specifier: ^3.0.3
-        version: 3.0.3(eslint@8.31.0)
+        version: 3.0.3(eslint@8.42.0)
       tinycolor2:
         specifier: 1.5.2
         version: 1.5.2
@@ -394,8 +388,8 @@ importers:
         specifier: 14.0.0
         version: 14.0.0
       typeorm:
-        specifier: 0.3.11
-        version: 0.3.11(ioredis@5.3.2)(pg@8.8.0)(ts-node@10.9.1)
+        specifier: 0.3.16
+        version: 0.3.16(ioredis@5.3.2)(pg@8.11.0)(ts-node@10.9.1)
       ulid:
         specifier: 2.3.0
         version: 2.3.0
@@ -403,8 +397,8 @@ importers:
         specifier: 9.0.0
         version: 9.0.0
       web-push:
-        specifier: 3.5.0
-        version: 3.5.0
+        specifier: 3.6.1
+        version: 3.6.1
       websocket:
         specifier: 1.0.34
         version: 1.0.34
@@ -421,10 +415,10 @@ importers:
     devDependencies:
       '@swc/cli':
         specifier: ^0.1.62
-        version: 0.1.62(@swc/core@1.3.50)(chokidar@3.5.3)
+        version: 0.1.62(@swc/core@1.3.62)(chokidar@3.5.3)
       '@swc/core':
-        specifier: ^1.3.50
-        version: 1.3.50
+        specifier: ^1.3.62
+        version: 1.3.62
       '@types/adm-zip':
         specifier: ^0.5.0
         version: 0.5.0
@@ -498,8 +492,8 @@ importers:
         specifier: 3.0.3
         version: 3.0.3
       '@types/nodemailer':
-        specifier: 6.4.7
-        version: 6.4.7
+        specifier: 6.4.8
+        version: 6.4.8
       '@types/oauth':
         specifier: 0.9.1
         version: 0.9.1
@@ -531,11 +525,11 @@ importers:
         specifier: 1.0.4
         version: 1.0.4
       '@types/sanitize-html':
-        specifier: 2.8.0
-        version: 2.8.0
+        specifier: 2.9.0
+        version: 2.9.0
       '@types/semver':
-        specifier: 7.3.13
-        version: 7.3.13
+        specifier: 7.5.0
+        version: 7.5.0
       '@types/sharp':
         specifier: 0.31.1
         version: 0.31.1
@@ -561,14 +555,14 @@ importers:
         specifier: 1.0.5
         version: 1.0.5
       '@types/ws':
-        specifier: 8.5.3
-        version: 8.5.3
+        specifier: 8.5.4
+        version: 8.5.4
       cross-env:
         specifier: 7.0.3
         version: 7.0.3
       eslint:
-        specifier: ^8.31.0
-        version: 8.31.0
+        specifier: ^8.42.0
+        version: 8.42.0
       execa:
         specifier: 6.1.0
         version: 6.1.0
@@ -577,7 +571,7 @@ importers:
         version: 2.2.3
       json5-loader:
         specifier: 4.0.1
-        version: 4.0.1(webpack@5.75.0)
+        version: 4.0.1(webpack@5.85.1)
       mocha:
         specifier: 10.2.0
         version: 10.2.0
@@ -589,25 +583,25 @@ importers:
         version: 2.0.0
       swc-loader:
         specifier: ^0.2.3
-        version: 0.2.3(@swc/core@1.3.50)(webpack@5.75.0)
+        version: 0.2.3(@swc/core@1.3.62)(webpack@5.85.1)
       ts-loader:
-        specifier: 9.4.2
-        version: 9.4.2(typescript@4.9.4)(webpack@5.75.0)
+        specifier: 9.4.3
+        version: 9.4.3(typescript@5.1.3)(webpack@5.85.1)
       ts-node:
         specifier: 10.9.1
-        version: 10.9.1(@swc/core@1.3.50)(@types/node@18.11.18)(typescript@4.9.4)
+        version: 10.9.1(@swc/core@1.3.62)(@types/node@18.11.18)(typescript@5.1.3)
       tsconfig-paths:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.2.0
+        version: 4.2.0
       typescript:
-        specifier: 4.9.4
-        version: 4.9.4
+        specifier: 5.1.3
+        version: 5.1.3
       webpack:
-        specifier: ^5.75.0
-        version: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
+        specifier: ^5.85.1
+        version: 5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3)
       ws:
-        specifier: 8.11.0
-        version: 8.11.0
+        specifier: 8.13.0
+        version: 8.13.0
 
   packages/backend/native-utils:
     devDependencies:
@@ -679,17 +673,17 @@ importers:
   packages/client:
     devDependencies:
       '@discordapp/twemoji':
-        specifier: 14.0.2
-        version: 14.0.2
+        specifier: 14.1.2
+        version: 14.1.2
       '@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)
+        version: 3.1.9(rollup@3.23.1)
       '@rollup/plugin-json':
         specifier: 4.1.0
-        version: 4.1.0(rollup@3.9.1)
+        version: 4.1.0(rollup@3.23.1)
       '@rollup/pluginutils':
         specifier: ^4.2.1
         version: 4.2.1
@@ -700,17 +694,17 @@ importers:
         specifier: 0.0.1
         version: 0.0.1
       '@types/glob':
-        specifier: 8.0.0
-        version: 8.0.0
+        specifier: 8.1.0
+        version: 8.1.0
       '@types/gulp':
-        specifier: 4.0.10
-        version: 4.0.10
+        specifier: 4.0.11
+        version: 4.0.11
       '@types/gulp-rename':
-        specifier: 2.0.1
-        version: 2.0.1
+        specifier: 2.0.2
+        version: 2.0.2
       '@types/katex':
-        specifier: 0.14.0
-        version: 0.14.0
+        specifier: 0.16.0
+        version: 0.16.0
       '@types/matter-js':
         specifier: 0.18.2
         version: 0.18.2
@@ -718,8 +712,8 @@ importers:
         specifier: 2.1.0
         version: 2.1.0
       '@types/seedrandom':
-        specifier: 3.0.4
-        version: 3.0.4
+        specifier: 3.0.5
+        version: 3.0.5
       '@types/throttle-debounce':
         specifier: 5.0.0
         version: 5.0.0
@@ -730,11 +724,11 @@ importers:
         specifier: 8.3.4
         version: 8.3.4
       '@vitejs/plugin-vue':
-        specifier: 4.0.0
-        version: 4.0.0(vite@4.3.9)(vue@3.2.45)
+        specifier: 4.2.3
+        version: 4.2.3(vite@4.3.9)(vue@3.3.4)
       '@vue/compiler-sfc':
-        specifier: 3.2.45
-        version: 3.2.45
+        specifier: 3.3.4
+        version: 3.3.4
       autobind-decorator:
         specifier: 2.4.0
         version: 2.4.0
@@ -792,12 +786,18 @@ importers:
       eventemitter3:
         specifier: 4.0.7
         version: 4.0.7
+      focus-trap:
+        specifier: ^7.4.3
+        version: 7.4.3
+      focus-trap-vue:
+        specifier: ^4.0.2
+        version: 4.0.2(focus-trap@7.4.3)(vue@3.3.4)
       gsap:
-        specifier: ^3.11.4
-        version: 3.11.4
+        specifier: ^3.11.5
+        version: 3.11.5
       idb-keyval:
-        specifier: 6.2.0
-        version: 6.2.0
+        specifier: 6.2.1
+        version: 6.2.1
       insert-text-at-cursor:
         specifier: 0.3.0
         version: 0.3.0
@@ -805,8 +805,8 @@ importers:
         specifier: 2.2.3
         version: 2.2.3
       katex:
-        specifier: 0.16.4
-        version: 0.16.4
+        specifier: 0.16.7
+        version: 0.16.7
       matter-js:
         specifier: 0.18.0
         version: 0.18.0
@@ -814,11 +814,11 @@ importers:
         specifier: 0.23.3
         version: 0.23.3
       photoswipe:
-        specifier: 5.3.4
-        version: 5.3.4
+        specifier: 5.3.7
+        version: 5.3.7
       prettier:
-        specifier: 2.8.7
-        version: 2.8.7
+        specifier: 2.8.8
+        version: 2.8.8
       prettier-plugin-vue:
         specifier: 1.1.6
         version: 1.1.6
@@ -835,14 +835,14 @@ importers:
         specifier: 1.0.0
         version: 1.0.0
       rollup:
-        specifier: 3.9.1
-        version: 3.9.1
+        specifier: 3.23.1
+        version: 3.23.1
       s-age:
         specifier: 1.1.2
         version: 1.1.2
       sass:
-        specifier: 1.57.1
-        version: 1.57.1
+        specifier: 1.62.1
+        version: 1.62.1
       seedrandom:
         specifier: 3.0.5
         version: 3.0.5
@@ -874,17 +874,17 @@ importers:
         specifier: 1.5.2
         version: 1.5.2
       tsc-alias:
-        specifier: 1.8.2
-        version: 1.8.2
+        specifier: 1.8.6
+        version: 1.8.6
       tsconfig-paths:
-        specifier: 4.1.2
-        version: 4.1.2
+        specifier: 4.2.0
+        version: 4.2.0
       twemoji-parser:
         specifier: 14.0.0
         version: 14.0.0
       typescript:
-        specifier: 4.9.4
-        version: 4.9.4
+        specifier: 5.1.3
+        version: 5.1.3
       uuid:
         specifier: 9.0.0
         version: 9.0.0
@@ -893,13 +893,13 @@ importers:
         version: 1.8.0
       vite:
         specifier: 4.3.9
-        version: 4.3.9(sass@1.57.1)
+        version: 4.3.9(sass@1.62.1)
       vite-plugin-compression:
         specifier: ^0.5.1
         version: 0.5.1(vite@4.3.9)
       vue:
-        specifier: 3.2.45
-        version: 3.2.45
+        specifier: 3.3.4
+        version: 3.3.4
       vue-isyourpasswordsafe:
         specifier: ^2.0.0
         version: 2.0.0
@@ -908,19 +908,19 @@ importers:
         version: 7.0.0
       vue-prism-editor:
         specifier: 2.0.0-alpha.2
-        version: 2.0.0-alpha.2(vue@3.2.45)
+        version: 2.0.0-alpha.2(vue@3.3.4)
       vuedraggable:
         specifier: 4.1.0
-        version: 4.1.0(vue@3.2.45)
+        version: 4.1.0(vue@3.3.4)
 
   packages/sw:
     devDependencies:
       '@swc/cli':
         specifier: ^0.1.62
-        version: 0.1.62(@swc/core@1.3.50)(chokidar@3.5.3)
+        version: 0.1.62(@swc/core@1.3.62)(chokidar@3.5.3)
       '@swc/core':
-        specifier: ^1.3.50
-        version: 1.3.50
+        specifier: ^1.3.62
+        version: 1.3.62
       '@swc/core-android-arm64':
         specifier: 1.3.11
         version: 1.3.11
@@ -928,17 +928,17 @@ importers:
         specifier: workspace:*
         version: link:../calckey-js
       idb-keyval:
-        specifier: ^6.2.0
-        version: 6.2.0
+        specifier: ^6.2.1
+        version: 6.2.1
       swc-loader:
         specifier: ^0.2.3
-        version: 0.2.3(@swc/core@1.3.50)(webpack@5.75.0)
+        version: 0.2.3(@swc/core@1.3.62)(webpack@5.85.1)
       webpack:
-        specifier: ^5.75.0
-        version: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
+        specifier: ^5.85.1
+        version: 5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3)
       webpack-cli:
-        specifier: ^5.0.1
-        version: 5.0.1(webpack@5.75.0)
+        specifier: ^5.1.3
+        version: 5.1.3(webpack@5.85.1)
 
 packages:
 
@@ -947,8 +947,7 @@ packages:
     engines: {node: '>=6.0.0'}
     dependencies:
       '@jridgewell/gen-mapping': 0.3.2
-      '@jridgewell/trace-mapping': 0.3.17
-    dev: true
+      '@jridgewell/trace-mapping': 0.3.18
 
   /@babel/code-frame@7.18.6:
     resolution: {integrity: sha512-TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q==}
@@ -961,13 +960,16 @@ packages:
     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/compat-data@7.22.3:
+    resolution: {integrity: sha512-aNtko9OPOwVESUFp3MZfD8Uzxl7JzSeJpd7npIoxCasU37PFbAQRpKglkaKwlHOyeJdrREpo8TW8ldrkYWwvIQ==}
+    engines: {node: '>=6.9.0'}
+
   /@babel/core@7.21.4:
     resolution: {integrity: sha512-qt/YV149Jman/6AfmlxJ04LMIu8bMoyl3RB91yTFrxQmgbrSvQMy7cI8Q62FHx1t8wJ8B5fu0UDoLwHAhUo1QA==}
     engines: {node: '>=6.9.0'}
@@ -978,10 +980,10 @@ packages:
       '@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/parser': 7.22.4
       '@babel/template': 7.20.7
       '@babel/traverse': 7.21.4
-      '@babel/types': 7.21.4
+      '@babel/types': 7.22.4
       convert-source-map: 1.9.0
       debug: 4.3.4(supports-color@8.1.1)
       gensync: 1.0.0-beta.2
@@ -991,11 +993,33 @@ packages:
       - supports-color
     dev: true
 
+  /@babel/core@7.22.1:
+    resolution: {integrity: sha512-Hkqu7J4ynysSXxmAahpN1jjRwVJ+NdpraFLIWflgjpVob3KNyK3/tIUc7Q7szed8WMp0JNa7Qtd1E9Oo22F9gA==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@ampproject/remapping': 2.2.1
+      '@babel/code-frame': 7.21.4
+      '@babel/generator': 7.22.3
+      '@babel/helper-compilation-targets': 7.22.1(@babel/core@7.22.1)
+      '@babel/helper-module-transforms': 7.22.1
+      '@babel/helpers': 7.22.3
+      '@babel/parser': 7.22.4
+      '@babel/template': 7.21.9
+      '@babel/traverse': 7.22.4
+      '@babel/types': 7.22.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
+
   /@babel/generator@7.20.7:
     resolution: {integrity: sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.20.7
+      '@babel/types': 7.22.4
       '@jridgewell/gen-mapping': 0.3.2
       jsesc: 2.5.2
 
@@ -1003,12 +1027,21 @@ packages:
     resolution: {integrity: sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.21.4
+      '@babel/types': 7.22.4
       '@jridgewell/gen-mapping': 0.3.2
-      '@jridgewell/trace-mapping': 0.3.17
+      '@jridgewell/trace-mapping': 0.3.18
       jsesc: 2.5.2
     dev: true
 
+  /@babel/generator@7.22.3:
+    resolution: {integrity: sha512-C17MW4wlk//ES/CJDL51kPNwl+qiBQyN7b9SKyVp11BLGFeSPoVaHrv+MNt8jwQFhQWowW88z1eeBx3pFz9v8A==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/types': 7.22.4
+      '@jridgewell/gen-mapping': 0.3.3
+      '@jridgewell/trace-mapping': 0.3.18
+      jsesc: 2.5.2
+
   /@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'}
@@ -1018,42 +1051,57 @@ packages:
       '@babel/compat-data': 7.21.4
       '@babel/core': 7.21.4
       '@babel/helper-validator-option': 7.21.0
-      browserslist: 4.21.4
+      browserslist: 4.21.7
       lru-cache: 5.1.1
       semver: 6.3.0
     dev: true
 
+  /@babel/helper-compilation-targets@7.22.1(@babel/core@7.22.1):
+    resolution: {integrity: sha512-Rqx13UM3yVB5q0D/KwQ8+SPfX/+Rnsy1Lw1k/UwOC4KC6qrzIQoY3lYnBu5EHKBlEHHcj0M0W8ltPSkD8rqfsQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0
+    dependencies:
+      '@babel/compat-data': 7.22.3
+      '@babel/core': 7.22.1
+      '@babel/helper-validator-option': 7.21.0
+      browserslist: 4.21.7
+      lru-cache: 5.1.1
+      semver: 6.3.0
+
   /@babel/helper-environment-visitor@7.18.9:
     resolution: {integrity: sha512-3r/aACDJ3fhQ/EVgFy0hpj8oHyHpQc+LPtJoY9SzTThAsStm4Ptegq92vqKoE3vD706ZVFWITnMnxucw+S9Ipg==}
     engines: {node: '>=6.9.0'}
 
+  /@babel/helper-environment-visitor@7.22.1:
+    resolution: {integrity: sha512-Z2tgopurB/kTbidvzeBrc2To3PUP/9i5MUe+fU6QJCQDyPwSH2oRapkLw3KGECDYSjhQZCNxEvNvZlLw8JjGwA==}
+    engines: {node: '>=6.9.0'}
+
   /@babel/helper-function-name@7.19.0:
     resolution: {integrity: sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==}
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/template': 7.20.7
-      '@babel/types': 7.20.7
+      '@babel/types': 7.22.4
 
   /@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/types': 7.22.4
 
   /@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/types': 7.22.4
 
   /@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/types': 7.22.4
 
   /@babel/helper-module-transforms@7.21.2:
     resolution: {integrity: sha512-79yj2AR4U/Oqq/WOV7Lx6hUjau1Zfo4cI+JLAVYeMV5XIlbOhmjEk5ulbTc9fMpmlojzZHkUUxAiK+UKn+hNQQ==}
@@ -1061,36 +1109,55 @@ packages:
     dependencies:
       '@babel/helper-environment-visitor': 7.18.9
       '@babel/helper-module-imports': 7.21.4
-      '@babel/helper-simple-access': 7.20.2
+      '@babel/helper-simple-access': 7.21.5
       '@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
+      '@babel/types': 7.22.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
+  /@babel/helper-module-transforms@7.22.1:
+    resolution: {integrity: sha512-dxAe9E7ySDGbQdCVOY/4+UcD8M9ZFqZcZhSPsPacvCG4M+9lwtDDQfI2EoaSvmf7W/8yCBkGU0m7Pvt1ru3UZw==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/helper-environment-visitor': 7.22.1
+      '@babel/helper-module-imports': 7.21.4
+      '@babel/helper-simple-access': 7.21.5
+      '@babel/helper-split-export-declaration': 7.18.6
+      '@babel/helper-validator-identifier': 7.19.1
+      '@babel/template': 7.21.9
+      '@babel/traverse': 7.22.4
+      '@babel/types': 7.22.4
+    transitivePeerDependencies:
+      - supports-color
+
   /@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==}
+  /@babel/helper-plugin-utils@7.21.5:
+    resolution: {integrity: sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg==}
+    engines: {node: '>=6.9.0'}
+    dev: false
+
+  /@babel/helper-simple-access@7.21.5:
+    resolution: {integrity: sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/types': 7.21.4
-    dev: true
+      '@babel/types': 7.22.4
 
   /@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
+      '@babel/types': 7.22.4
 
-  /@babel/helper-string-parser@7.19.4:
-    resolution: {integrity: sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==}
+  /@babel/helper-string-parser@7.21.5:
+    resolution: {integrity: sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==}
     engines: {node: '>=6.9.0'}
 
   /@babel/helper-validator-identifier@7.19.1:
@@ -1100,7 +1167,6 @@ packages:
   /@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==}
@@ -1108,11 +1174,21 @@ packages:
     dependencies:
       '@babel/template': 7.20.7
       '@babel/traverse': 7.21.4
-      '@babel/types': 7.21.4
+      '@babel/types': 7.22.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
+  /@babel/helpers@7.22.3:
+    resolution: {integrity: sha512-jBJ7jWblbgr7r6wYZHMdIqKc73ycaTcCaWRq4/2LpuPHcx7xMlZvpGQkOYc9HeSjn6rcx15CPlgVcBtZ4WZJ2w==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/template': 7.21.9
+      '@babel/traverse': 7.22.4
+      '@babel/types': 7.22.4
+    transitivePeerDependencies:
+      - supports-color
+
   /@babel/highlight@7.18.6:
     resolution: {integrity: sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==}
     engines: {node: '>=6.9.0'}
@@ -1121,20 +1197,23 @@ packages:
       chalk: 2.4.2
       js-tokens: 4.0.0
 
-  /@babel/parser@7.20.7:
-    resolution: {integrity: sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==}
+  /@babel/parser@7.22.4:
+    resolution: {integrity: sha512-VLLsx06XkEYqBtE5YGPwfSGwfrjnyPP5oiGty3S8pQLFDFLaS8VwWSIxkTXpcvr5zeYLE6+MBNl2npl/YnfofA==}
     engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
-      '@babel/types': 7.20.7
+      '@babel/types': 7.22.4
 
-  /@babel/parser@7.21.4:
-    resolution: {integrity: sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
+  /@babel/plugin-proposal-export-namespace-from@7.18.9(@babel/core@7.22.1):
+    resolution: {integrity: sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/types': 7.21.4
-    dev: true
+      '@babel/core': 7.22.1
+      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/plugin-syntax-export-namespace-from': 7.8.3(@babel/core@7.22.1)
+    dev: false
 
   /@babel/plugin-syntax-async-generators@7.8.4(@babel/core@7.21.4):
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
@@ -1163,6 +1242,15 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
+  /@babel/plugin-syntax-export-namespace-from@7.8.3(@babel/core@7.22.1):
+    resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.22.1
+      '@babel/helper-plugin-utils': 7.21.5
+    dev: false
+
   /@babel/plugin-syntax-import-meta@7.10.4(@babel/core@7.21.4):
     resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
@@ -1255,6 +1343,20 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
+  /@babel/plugin-transform-modules-commonjs@7.21.5(@babel/core@7.22.1):
+    resolution: {integrity: sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ==}
+    engines: {node: '>=6.9.0'}
+    peerDependencies:
+      '@babel/core': ^7.0.0-0
+    dependencies:
+      '@babel/core': 7.22.1
+      '@babel/helper-module-transforms': 7.22.1
+      '@babel/helper-plugin-utils': 7.21.5
+      '@babel/helper-simple-access': 7.21.5
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /@babel/runtime@7.20.7:
     resolution: {integrity: sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==}
     engines: {node: '>=6.9.0'}
@@ -1273,8 +1375,16 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       '@babel/code-frame': 7.18.6
-      '@babel/parser': 7.20.7
-      '@babel/types': 7.20.7
+      '@babel/parser': 7.22.4
+      '@babel/types': 7.22.4
+
+  /@babel/template@7.21.9:
+    resolution: {integrity: sha512-MK0X5k8NKOuWRamiEfc3KEJiHMTkGZNUjzMipqCGDDc6ijRl/B7RGSKVGncu4Ro/HdyzzY6cmoXuKI2Gffk7vQ==}
+    engines: {node: '>=6.9.0'}
+    dependencies:
+      '@babel/code-frame': 7.21.4
+      '@babel/parser': 7.22.4
+      '@babel/types': 7.22.4
 
   /@babel/traverse@7.20.12:
     resolution: {integrity: sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==}
@@ -1286,8 +1396,8 @@ packages:
       '@babel/helper-function-name': 7.19.0
       '@babel/helper-hoist-variables': 7.18.6
       '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/parser': 7.20.7
-      '@babel/types': 7.20.7
+      '@babel/parser': 7.22.4
+      '@babel/types': 7.22.4
       debug: 4.3.4(supports-color@8.1.1)
       globals: 11.12.0
     transitivePeerDependencies:
@@ -1303,30 +1413,38 @@ packages:
       '@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
+      '@babel/parser': 7.22.4
+      '@babel/types': 7.22.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==}
+  /@babel/traverse@7.22.4:
+    resolution: {integrity: sha512-Tn1pDsjIcI+JcLKq1AVlZEr4226gpuAQTsLMorsYg9tuS/kG7nuwwJ4AB8jfQuEgb/COBwR/DqJxmoiYFu5/rQ==}
     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
+      '@babel/code-frame': 7.21.4
+      '@babel/generator': 7.22.3
+      '@babel/helper-environment-visitor': 7.22.1
+      '@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.22.4
+      '@babel/types': 7.22.4
+      debug: 4.3.4(supports-color@8.1.1)
+      globals: 11.12.0
+    transitivePeerDependencies:
+      - supports-color
 
-  /@babel/types@7.21.4:
-    resolution: {integrity: sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==}
+  /@babel/types@7.22.4:
+    resolution: {integrity: sha512-Tx9x3UBHTTsMSW85WB2kphxYQVvrZ/t1FxD88IpSgIjiUJlCm9z+xWIDwyo1vffTwSqteqyznB8ZE9vYYk16zA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/helper-string-parser': 7.19.4
+      '@babel/helper-string-parser': 7.21.5
       '@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==}
@@ -1585,19 +1703,19 @@ packages:
       - supports-color
     dev: true
 
-  /@digitalbazaar/http-client@3.2.0:
-    resolution: {integrity: sha512-NhYXcWE/JDE7AnJikNX7q0S6zNuUPA2NuIoRdUpmvHlarjmRqyr6hIO3Awu2FxlUzbdiI1uzuWrZyB9mD1tTvw==}
+  /@digitalbazaar/http-client@3.4.1:
+    resolution: {integrity: sha512-Ahk1N+s7urkgj7WvvUND5f8GiWEPfUw0D41hdElaqLgu8wZScI8gdI0q+qWw5N1d35x7GCRH2uk9mi+Uzo9M3g==}
     engines: {node: '>=14.0'}
     dependencies:
-      ky: 0.30.0
-      ky-universal: 0.10.1(ky@0.30.0)
-      undici: 5.15.0
+      ky: 0.33.3
+      ky-universal: 0.11.0(ky@0.33.3)
+      undici: 5.22.1
     transitivePeerDependencies:
       - web-streams-polyfill
     dev: false
 
-  /@discordapp/twemoji@14.0.2:
-    resolution: {integrity: sha512-eYJpFsjViDTYwq3f6v+tRu8iRc+yLAeGrlh6kmNRvvC6rroUE2bMlBfEQ/WNh+2Q1FtSEFXpxzuQPOHzRzbAyA==}
+  /@discordapp/twemoji@14.1.2:
+    resolution: {integrity: sha512-Rkuu30/biwy8Zss0r5qfFvQzoQGPTHXzA7Y/MPMkCQqFd0WskoYvjfJRTz0iuZwUpMfrgbM8eakSsptCxmOqog==}
     dependencies:
       fs-extra: 8.1.0
       jsonfile: 5.0.0
@@ -1819,6 +1937,19 @@ packages:
     dev: true
     optional: true
 
+  /@eslint-community/eslint-utils@4.4.0(eslint@8.42.0):
+    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
+    dependencies:
+      eslint: 8.42.0
+      eslint-visitor-keys: 3.4.1
+
+  /@eslint-community/regexpp@4.5.1:
+    resolution: {integrity: sha512-Z5ba73P98O1KUYCCJTUeVpja9RcGoMdncZ6T49FCUl2lN38JtCJ+3WgIDBv0AuY4WChU5PmtJmOCTlN6FZTFKQ==}
+    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
+
   /@eslint/eslintrc@1.4.1:
     resolution: {integrity: sha512-XXrH9Uarn0stsyldqDYq8r++mROmWRI1xKMXa640Bb//SY1+ECYX6VzT6Lcx5frD0V30XieqJ0oX9I2Xj5aoMA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
@@ -1834,6 +1965,27 @@ packages:
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
       - supports-color
+    dev: true
+
+  /@eslint/eslintrc@2.0.3:
+    resolution: {integrity: sha512-+5gy6OQfk+xx3q0d6jGZZC3f3KzAkXc/IanVxd1is/VIIziRqqt3ongQz0FiTUXqTk0c7aDB3OaFuKnuSoJicQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      ajv: 6.12.6
+      debug: 4.3.4(supports-color@8.1.1)
+      espree: 9.5.2
+      globals: 13.20.0
+      ignore: 5.2.4
+      import-fresh: 3.3.0
+      js-yaml: 4.1.0
+      minimatch: 3.1.2
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  /@eslint/js@8.42.0:
+    resolution: {integrity: sha512-6SWlXpWU5AvId8Ac7zjzmIOqMOba/JWY8XZ4A7q7Gn1Vlfg/SFFIlrtHXt9nPn4op9ZPAkl91Jao+QQv3r/ukw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
 
   /@gar/promisify@1.1.3:
     resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==}
@@ -1849,8 +2001,8 @@ packages:
       '@hapi/hoek': 9.3.0
     dev: true
 
-  /@humanwhocodes/config-array@0.11.8:
-    resolution: {integrity: sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==}
+  /@humanwhocodes/config-array@0.11.10:
+    resolution: {integrity: sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==}
     engines: {node: '>=10.10.0'}
     dependencies:
       '@humanwhocodes/object-schema': 1.2.1
@@ -1901,7 +2053,7 @@ packages:
     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
+      '@types/node': 17.0.5
       chalk: 4.1.2
       jest-message-util: 27.5.1
       jest-util: 27.5.1
@@ -1922,7 +2074,7 @@ packages:
       '@jest/test-result': 27.5.1
       '@jest/transform': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 18.11.18
+      '@types/node': 17.0.5
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.8.1
@@ -1959,7 +2111,7 @@ packages:
     dependencies:
       '@jest/fake-timers': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 18.11.18
+      '@types/node': 17.0.5
       jest-mock: 27.5.1
     dev: true
 
@@ -1969,7 +2121,7 @@ packages:
     dependencies:
       '@jest/types': 27.5.1
       '@sinonjs/fake-timers': 8.1.0
-      '@types/node': 18.11.18
+      '@types/node': 17.0.5
       jest-message-util: 27.5.1
       jest-mock: 27.5.1
       jest-util: 27.5.1
@@ -1998,7 +2150,7 @@ packages:
       '@jest/test-result': 27.5.1
       '@jest/transform': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 18.11.18
+      '@types/node': 17.0.5
       chalk: 4.1.2
       collect-v8-coverage: 1.0.1
       exit: 0.1.2
@@ -2082,7 +2234,7 @@ packages:
     dependencies:
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 18.11.18
+      '@types/node': 17.0.5
       '@types/yargs': 16.0.5
       chalk: 4.1.2
     dev: true
@@ -2092,9 +2244,17 @@ packages:
     engines: {node: '>=6.0.0'}
     dependencies:
       '@jridgewell/set-array': 1.1.2
-      '@jridgewell/sourcemap-codec': 1.4.14
+      '@jridgewell/sourcemap-codec': 1.4.15
       '@jridgewell/trace-mapping': 0.3.17
 
+  /@jridgewell/gen-mapping@0.3.3:
+    resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==}
+    engines: {node: '>=6.0.0'}
+    dependencies:
+      '@jridgewell/set-array': 1.1.2
+      '@jridgewell/sourcemap-codec': 1.4.15
+      '@jridgewell/trace-mapping': 0.3.18
+
   /@jridgewell/resolve-uri@3.1.0:
     resolution: {integrity: sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==}
     engines: {node: '>=6.0.0'}
@@ -2110,20 +2270,36 @@ packages:
       '@jridgewell/trace-mapping': 0.3.17
     dev: true
 
+  /@jridgewell/source-map@0.3.3:
+    resolution: {integrity: sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==}
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.3
+      '@jridgewell/trace-mapping': 0.3.18
+    dev: true
+
   /@jridgewell/sourcemap-codec@1.4.14:
     resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
 
+  /@jridgewell/sourcemap-codec@1.4.15:
+    resolution: {integrity: sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==}
+
   /@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.18:
+    resolution: {integrity: sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==}
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.0
+      '@jridgewell/sourcemap-codec': 1.4.14
+
   /@jridgewell/trace-mapping@0.3.9:
     resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
     dependencies:
       '@jridgewell/resolve-uri': 3.1.0
-      '@jridgewell/sourcemap-codec': 1.4.14
+      '@jridgewell/sourcemap-codec': 1.4.15
 
   /@koa/cors@3.4.3:
     resolution: {integrity: sha512-WPXQUaAeAMVaLTEFpoq3T2O1C+FstkjJnDQqy95Ck1UdILajsRhu6mhJ8H2f4NFPRBoCNN+qywTJfq/gGki5mw==}
@@ -2132,13 +2308,16 @@ packages:
       vary: 1.1.2
     dev: false
 
-  /@koa/multer@3.0.0(multer@1.4.4-lts.1):
-    resolution: {integrity: sha512-y+OQBmex5D1jIl723gAEUYcAWPEicIXppaAKw/zCMfpllQ08ZNweDPwoCLxEoatqd5pCu2XG6V8dl67JRq3RJw==}
+  /@koa/multer@3.0.2(multer@1.4.4-lts.1):
+    resolution: {integrity: sha512-Q6WfPpE06mJWyZD1fzxM6zWywaoo+zocAn2YA9QYz4RsecoASr1h/kSzG0c5seDpFVKCMZM9raEfuM7XfqbRLw==}
     engines: {node: '>= 8'}
     peerDependencies:
       multer: '*'
     dependencies:
+      fix-esm: 1.0.1
       multer: 1.4.4-lts.1
+    transitivePeerDependencies:
+      - supports-color
     dev: false
 
   /@koa/router@9.0.1:
@@ -2169,7 +2348,7 @@ packages:
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
-      semver: 7.3.8
+      semver: 7.5.1
       tar: 6.1.13
     transitivePeerDependencies:
       - encoding
@@ -2187,7 +2366,7 @@ packages:
       nopt: 5.0.0
       npmlog: 5.0.1
       rimraf: 3.0.2
-      semver: 7.3.8
+      semver: 7.5.1
       tar: 6.1.13
     transitivePeerDependencies:
       - encoding
@@ -2324,7 +2503,7 @@ packages:
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
       '@gar/promisify': 1.1.3
-      semver: 7.3.8
+      semver: 7.5.1
     dev: false
 
   /@npmcli/move-file@2.0.1:
@@ -2372,53 +2551,53 @@ packages:
     resolution: {integrity: sha512-9oYmohi2fo87w3DbtfjBoJxrklVojgXq2wuGcqxKccj2TxMq7UIusKDrGUZYOQHM9pUKkh+kvfmutETMGDR6gg==}
     dev: true
 
-  /@redis/bloom@1.1.0(@redis/client@1.4.2):
-    resolution: {integrity: sha512-9QovlxmpRtvxVbN0UBcv8WfdSMudNZZTFqCsnBszcQXqaZb/TVe30ScgGEO7u1EAIacTPAo7/oCYjYAxiHLanQ==}
+  /@redis/bloom@1.2.0(@redis/client@1.5.8):
+    resolution: {integrity: sha512-HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==}
     peerDependencies:
       '@redis/client': ^1.0.0
     dependencies:
-      '@redis/client': 1.4.2
+      '@redis/client': 1.5.8
     dev: true
 
-  /@redis/client@1.4.2:
-    resolution: {integrity: sha512-oUdEjE0I7JS5AyaAjkD3aOXn9NhO7XKyPyXEyrgFDu++VrVBHUPnV6dgEya9TcMuj5nIJRuCzCm8ZP+c9zCHPw==}
+  /@redis/client@1.5.8:
+    resolution: {integrity: sha512-xzElwHIO6rBAqzPeVnCzgvrnBEcFL1P0w8P65VNLRkdVW8rOE58f52hdj0BDgmsdOm4f1EoXPZtH4Fh7M/qUpw==}
     engines: {node: '>=14'}
     dependencies:
-      cluster-key-slot: 1.1.1
+      cluster-key-slot: 1.1.2
       generic-pool: 3.9.0
       yallist: 4.0.0
     dev: true
 
-  /@redis/graph@1.1.0(@redis/client@1.4.2):
+  /@redis/graph@1.1.0(@redis/client@1.5.8):
     resolution: {integrity: sha512-16yZWngxyXPd+MJxeSr0dqh2AIOi8j9yXKcKCwVaKDbH3HTuETpDVPcLujhFYVPtYrngSco31BUcSa9TH31Gqg==}
     peerDependencies:
       '@redis/client': ^1.0.0
     dependencies:
-      '@redis/client': 1.4.2
+      '@redis/client': 1.5.8
     dev: true
 
-  /@redis/json@1.0.4(@redis/client@1.4.2):
+  /@redis/json@1.0.4(@redis/client@1.5.8):
     resolution: {integrity: sha512-LUZE2Gdrhg0Rx7AN+cZkb1e6HjoSKaeeW8rYnt89Tly13GBI5eP4CwDVr+MY8BAYfCg4/N15OUrtLoona9uSgw==}
     peerDependencies:
       '@redis/client': ^1.0.0
     dependencies:
-      '@redis/client': 1.4.2
+      '@redis/client': 1.5.8
     dev: true
 
-  /@redis/search@1.1.0(@redis/client@1.4.2):
-    resolution: {integrity: sha512-NyFZEVnxIJEybpy+YskjgOJRNsfTYqaPbK/Buv6W2kmFNaRk85JiqjJZA5QkRmWvGbyQYwoO5QfDi2wHskKrQQ==}
+  /@redis/search@1.1.3(@redis/client@1.5.8):
+    resolution: {integrity: sha512-4Dg1JjvCevdiCBTZqjhKkGoC5/BcB7k9j99kdMnaXFXg8x4eyOIVg9487CMv7/BUVkFLZCaIh8ead9mU15DNng==}
     peerDependencies:
       '@redis/client': ^1.0.0
     dependencies:
-      '@redis/client': 1.4.2
+      '@redis/client': 1.5.8
     dev: true
 
-  /@redis/time-series@1.0.4(@redis/client@1.4.2):
+  /@redis/time-series@1.0.4(@redis/client@1.5.8):
     resolution: {integrity: sha512-ThUIgo2U/g7cCuZavucQTQzA9g9JbDDY2f64u3AbAoz/8vE2lt2U37LamDUVChhaDA3IRT9R6VvJwqnUfTJzng==}
     peerDependencies:
       '@redis/client': ^1.0.0
     dependencies:
-      '@redis/client': 1.4.2
+      '@redis/client': 1.5.8
     dev: true
 
   /@redocly/ajv@8.11.0:
@@ -2441,33 +2620,33 @@ packages:
       js-yaml: 4.1.0
       lodash.isequal: 4.5.0
       minimatch: 5.1.2
-      node-fetch: 2.6.8
+      node-fetch: 2.6.11
       pluralize: 8.0.0
       yaml-ast-parser: 0.0.43
     transitivePeerDependencies:
       - encoding
     dev: false
 
-  /@rollup/plugin-alias@3.1.9(rollup@3.9.1):
+  /@rollup/plugin-alias@3.1.9(rollup@3.23.1):
     resolution: {integrity: sha512-QI5fsEvm9bDzt32k39wpOwZhVzRcL5ydcffUHMyLVaVaLeC70I8TJZ17F1z1eMoLu4E/UOcH9BWVkKpIKdrfiw==}
     engines: {node: '>=8.0.0'}
     peerDependencies:
       rollup: ^1.20.0||^2.0.0
     dependencies:
-      rollup: 3.9.1
+      rollup: 3.23.1
       slash: 3.0.0
     dev: true
 
-  /@rollup/plugin-json@4.1.0(rollup@3.9.1):
+  /@rollup/plugin-json@4.1.0(rollup@3.23.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: 3.9.1
+      '@rollup/pluginutils': 3.1.0(rollup@3.23.1)
+      rollup: 3.23.1
     dev: true
 
-  /@rollup/pluginutils@3.1.0(rollup@3.9.1):
+  /@rollup/pluginutils@3.1.0(rollup@3.23.1):
     resolution: {integrity: sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==}
     engines: {node: '>= 8.0.0'}
     peerDependencies:
@@ -2476,7 +2655,7 @@ packages:
       '@types/estree': 0.0.39
       estree-walker: 1.0.1
       picomatch: 2.3.1
-      rollup: 3.9.1
+      rollup: 3.23.1
     dev: true
 
   /@rollup/pluginutils@4.2.1:
@@ -2609,7 +2788,7 @@ packages:
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
     dev: false
 
-  /@swc/cli@0.1.62(@swc/core@1.3.50)(chokidar@3.5.3):
+  /@swc/cli@0.1.62(@swc/core@1.3.62)(chokidar@3.5.3):
     resolution: {integrity: sha512-kOFLjKY3XH1DWLfXL1/B5MizeNorHR8wHKEi92S/Zi9Md/AK17KSqR8MgyRJ6C1fhKHvbBCl8wboyKAFXStkYw==}
     engines: {node: '>= 12.13'}
     hasBin: true
@@ -2621,11 +2800,11 @@ packages:
         optional: true
     dependencies:
       '@mole-inc/bin-wrapper': 8.0.1
-      '@swc/core': 1.3.50
+      '@swc/core': 1.3.62
       chokidar: 3.5.3
       commander: 7.2.0
       fast-glob: 3.2.12
-      semver: 7.3.8
+      semver: 7.5.1
       slash: 3.0.0
       source-map: 0.7.4
     dev: true
@@ -2639,88 +2818,88 @@ packages:
     dependencies:
       '@swc/wasm': 1.2.130
 
-  /@swc/core-darwin-arm64@1.3.50:
-    resolution: {integrity: sha512-riJGLORCFOMeUccEV0hzua0iyJFks7kef+5GfcmC93SLno+LHFDnaJ4mKVXcCAmQ7GYhVTPJs9gSHIW2fO5anQ==}
+  /@swc/core-darwin-arm64@1.3.62:
+    resolution: {integrity: sha512-MmGilibITz68LEje6vJlKzc2gUUSgzvB3wGLSjEORikTNeM7P8jXVxE4A8fgZqDeudJUm9HVWrxCV+pHDSwXhA==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     optional: true
 
-  /@swc/core-darwin-x64@1.3.50:
-    resolution: {integrity: sha512-XaAhpeUoAK8tOUYSXH/v35yEjIoSP6ClGV/EaqBmDuCzAPue6uJMlIAW+nTmdtqVm5ZNZy2cKtP4ZHhVlfl7xw==}
+  /@swc/core-darwin-x64@1.3.62:
+    resolution: {integrity: sha512-Xl93MMB3sCWVlYWuQIB+v6EQgzoiuQYK5tNt9lsHoIEVu2zLdkQjae+5FUHZb1VYqCXIiWcULFfVz0R4Sjb7JQ==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-arm-gnueabihf@1.3.50:
-    resolution: {integrity: sha512-8hDtXs0T5biMtA3I21JQG1uxL+Hb/D2t0NZENuajVK5Vky3GXmf+ICVeQzwGzSXiyftaDgyNAvBidbKPBlNEtw==}
+  /@swc/core-linux-arm-gnueabihf@1.3.62:
+    resolution: {integrity: sha512-nJsp6O7kCtAjTTMcIjVB0g5y1JNiYAa5q630eiwrnaHUusEFoANDdORI3Z9vXeikMkng+6yIv9/V8Rb093xLjQ==}
     engines: {node: '>=10'}
     cpu: [arm]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-arm64-gnu@1.3.50:
-    resolution: {integrity: sha512-iS908P5cNTHWus4QefSg2jn4lDYcl15sN1Fvx8fQgqYQra2O9CsR8lXBJYkvllykkzoKvWfcOLRCTquz3vsnVQ==}
+  /@swc/core-linux-arm64-gnu@1.3.62:
+    resolution: {integrity: sha512-XGsV93vpUAopDt5y6vPwbK1Nc/MlL55L77bAZUPIiosWD1cWWPHNtNSpriE6+I+JiMHe0pqtfS/SSTk6ZkFQVw==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-arm64-musl@1.3.50:
-    resolution: {integrity: sha512-ysh8MeaWjGqVwIPCDUhUOr4oczIx5qb8vFBoegI+SOUfcpWik22/+hG25LWzZY6PwAtqUGkhsJt/+5dY4IMhEA==}
+  /@swc/core-linux-arm64-musl@1.3.62:
+    resolution: {integrity: sha512-ESUmJjSlTTkoBy9dMG49opcNn8BmviqStMhwyeD1G8XRnmRVCZZgoBOKdvCXmJhw8bQXDhZumeaTUB+OFUKVXg==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-x64-gnu@1.3.50:
-    resolution: {integrity: sha512-Ci4LQaGIPweWNVWgR2f47nrYEfq7002Pj6WWKGrnO6g+k5cwR3izxHMOnZhcKyAD3cWOS904i/GbfgXs2wBCDQ==}
+  /@swc/core-linux-x64-gnu@1.3.62:
+    resolution: {integrity: sha512-wnHJkt3ZBrax3SFnUHDcncG6mrSg9ZZjMhQV9Mc3JL1x1s1Gy9rGZCoBNnV/BUZWTemxIBcQbANRSDut/WO+9A==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@swc/core-linux-x64-musl@1.3.50:
-    resolution: {integrity: sha512-SEXOhGjmC4rdBeucCvNmtO2vflUEhkmWLfqvkalHYDbPMA/gwLSoYu3D85u5XqB8DatDi4TOCUx80IR1b/vDBQ==}
+  /@swc/core-linux-x64-musl@1.3.62:
+    resolution: {integrity: sha512-9oRbuTC/VshB66Rgwi3pTq3sPxSTIb8k9L1vJjES+dDMKa29DAjPtWCXG/pyZ00ufpFZgkGEuAHH5uqUcr1JQg==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     optional: true
 
-  /@swc/core-win32-arm64-msvc@1.3.50:
-    resolution: {integrity: sha512-DPsJ2r9mYU8VzF9vhK323psyE8modj5be9M9diOsqF58Fu9ARtOfuulY+eiS5e41ya2XM/H2N/qOfsA+h2KRcg==}
+  /@swc/core-win32-arm64-msvc@1.3.62:
+    resolution: {integrity: sha512-zv14vlF2VRrxS061XkfzGjCYnOrEo5glKJjLK5PwUKysIoVrx/L8nAbFxjkX5cObdlyoqo+ekelyBPAO+4bS0w==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
     optional: true
 
-  /@swc/core-win32-ia32-msvc@1.3.50:
-    resolution: {integrity: sha512-2iyzHLat0C93S3XLp7QJ6RTA9Md+EcPl2fq1S/m2EZqofcq7wu5SuywaXoF89xOibOJBnWe6KwOnOFWFaXrPjQ==}
+  /@swc/core-win32-ia32-msvc@1.3.62:
+    resolution: {integrity: sha512-8MC/PZQSsOP2iA/81tAfNRqMWyEqTS/8zKUI67vPuLvpx6NAjRn3E9qBv7iFqH79iqZNzqSMo3awnLrKZyFbcw==}
     engines: {node: '>=10'}
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
     optional: true
 
-  /@swc/core-win32-x64-msvc@1.3.50:
-    resolution: {integrity: sha512-iFRU2Y5DVIEdjaWnlLij8QQBM5Q91UJotNNgzuevPSIOhOyhF6V2AQS1QC4mfkPCy3Bw0GrZDChu3GcuBj9Rzw==}
+  /@swc/core-win32-x64-msvc@1.3.62:
+    resolution: {integrity: sha512-GJSmUJ95HKHZXAxiuPUmrcm/S3ivQvEzXhOZaIqYBIwUsm02vFZkClsV7eIKzWjso1t0+I/8MjrnUNaSWqh1rQ==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
     optional: true
 
-  /@swc/core@1.3.50:
-    resolution: {integrity: sha512-soTAHlwkI8zukR9KftWZ0gZ7HKU99B/C3CtBxzSI3N23QG+EfSSOgrYARfuZk5g4yLWpsU0rEkojd78vixqkwg==}
+  /@swc/core@1.3.62:
+    resolution: {integrity: sha512-J58hWY+/G8vOr4J6ZH9hLg0lMSijZtqIIf4HofZezGog/pVX6sJyBJ40dZ1ploFkDIlWTWvJyqtpesBKS73gkQ==}
     engines: {node: '>=10'}
     requiresBuild: true
     peerDependencies:
@@ -2729,16 +2908,16 @@ packages:
       '@swc/helpers':
         optional: true
     optionalDependencies:
-      '@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/core-darwin-arm64': 1.3.62
+      '@swc/core-darwin-x64': 1.3.62
+      '@swc/core-linux-arm-gnueabihf': 1.3.62
+      '@swc/core-linux-arm64-gnu': 1.3.62
+      '@swc/core-linux-arm64-musl': 1.3.62
+      '@swc/core-linux-x64-gnu': 1.3.62
+      '@swc/core-linux-x64-musl': 1.3.62
+      '@swc/core-win32-arm64-msvc': 1.3.62
+      '@swc/core-win32-ia32-msvc': 1.3.62
+      '@swc/core-win32-x64-msvc': 1.3.62
 
   /@swc/wasm@1.2.130:
     resolution: {integrity: sha512-rNcJsBxS70+pv8YUWwf5fRlWX6JoY/HJc25HD/F8m6Kv7XhJdqPPMhyX6TKkUBPAG7TWlZYoxa+rHAjPy4Cj3Q==}
@@ -3019,8 +3198,8 @@ packages:
   /@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
+      '@babel/parser': 7.22.4
+      '@babel/types': 7.22.4
       '@types/babel__generator': 7.6.4
       '@types/babel__template': 7.4.1
       '@types/babel__traverse': 7.18.3
@@ -3029,20 +3208,20 @@ packages:
   /@types/babel__generator@7.6.4:
     resolution: {integrity: sha512-tFkciB9j2K755yrTALxD44McOrk+gfpIpvC3sxHjRawj6PfnQxrse4Clq5y/Rq+G3mrBurMax/lG8Qn2t9mSsg==}
     dependencies:
-      '@babel/types': 7.21.4
+      '@babel/types': 7.22.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
+      '@babel/parser': 7.22.4
+      '@babel/types': 7.22.4
     dev: true
 
   /@types/babel__traverse@7.18.3:
     resolution: {integrity: sha512-1kbcJ40lLB7MHsj39U4Sh1uTd2E7rLEa79kmDpI6cy+XiXsteB3POdQomoq4FxszMrO3ZYchkhYJw7A2862b3w==}
     dependencies:
-      '@babel/types': 7.20.7
+      '@babel/types': 7.22.4
     dev: true
 
   /@types/bcryptjs@2.4.2:
@@ -3113,30 +3292,30 @@ packages:
   /@types/eslint-scope@3.7.4:
     resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==}
     dependencies:
-      '@types/eslint': 8.4.10
-      '@types/estree': 0.0.51
+      '@types/eslint': 8.40.0
+      '@types/estree': 1.0.1
     dev: true
 
   /@types/eslint@7.29.0:
     resolution: {integrity: sha512-VNcvioYDH8/FxaeTKkM4/TiTwt6pBV9E3OfGmvaw8tPl0rrHCJ4Ll15HRT+pMiFAf/MLQvAzC+6RzUMEL9Ceng==}
     dependencies:
-      '@types/estree': 0.0.51
+      '@types/estree': 1.0.1
       '@types/json-schema': 7.0.11
     dev: true
 
-  /@types/eslint@8.4.10:
-    resolution: {integrity: sha512-Sl/HOqN8NKPmhWo2VBEPm0nvHnu2LL3v9vKo8MEq0EtbJ4eVzGPl41VNPvn5E1i5poMk4/XD8UriLHpJvEP/Nw==}
+  /@types/eslint@8.40.0:
+    resolution: {integrity: sha512-nbq2mvc/tBrK9zQQuItvjJl++GTN5j06DaPtp3hZCpngmG6Q3xoyEmd0TwZI0gAy/G1X0zhGBbr2imsGFdFV0g==}
     dependencies:
-      '@types/estree': 0.0.51
-      '@types/json-schema': 7.0.11
+      '@types/estree': 1.0.1
+      '@types/json-schema': 7.0.12
     dev: true
 
   /@types/estree@0.0.39:
     resolution: {integrity: sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==}
     dev: true
 
-  /@types/estree@0.0.51:
-    resolution: {integrity: sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==}
+  /@types/estree@1.0.1:
+    resolution: {integrity: sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==}
     dev: true
 
   /@types/expect@1.20.4:
@@ -3173,21 +3352,29 @@ packages:
   /@types/glob-stream@6.1.1:
     resolution: {integrity: sha512-AGOUTsTdbPkRS0qDeyeS+6KypmfVpbT5j23SN8UPG63qjKXNKjXn6V9wZUr8Fin0m9l8oGYaPK8b2WUMF8xI1A==}
     dependencies:
-      '@types/glob': 8.0.0
+      '@types/glob': 8.1.0
       '@types/node': 18.11.18
     dev: true
 
-  /@types/glob@8.0.0:
-    resolution: {integrity: sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA==}
+  /@types/glob-stream@8.0.0:
+    resolution: {integrity: sha512-fxTWwdQmX9LWSHD7ZLlv3BHR992mKcVcDnT/2v+l/QZZo7TfDdyasqlSYVzOnMGWhRbrWeWkbj/mgezFjKynhw==}
+    dependencies:
+      '@types/node': 20.2.5
+      '@types/picomatch': 2.3.0
+      '@types/streamx': 2.9.1
+    dev: true
+
+  /@types/glob@8.1.0:
+    resolution: {integrity: sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==}
     dependencies:
       '@types/minimatch': 5.1.2
-      '@types/node': 18.11.18
+      '@types/node': 20.2.5
     dev: true
 
   /@types/graceful-fs@4.1.6:
     resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
     dependencies:
-      '@types/node': 18.11.18
+      '@types/node': 17.0.5
     dev: true
 
   /@types/gulp-rename@2.0.1:
@@ -3197,6 +3384,13 @@ packages:
       '@types/vinyl': 2.0.7
     dev: true
 
+  /@types/gulp-rename@2.0.2:
+    resolution: {integrity: sha512-CQsXqTVtAXqrPd4IbrrlJEEzRkUR3RXsyZbrVoOVqjlchDDmnyRDatAUisjpQjjCg/wjJrSiNg8T1uAbJ/7Qqg==}
+    dependencies:
+      '@types/node': 20.2.5
+      '@types/vinyl': 2.0.7
+    dev: true
+
   /@types/gulp@4.0.10:
     resolution: {integrity: sha512-spgZHJFqiEJGwqGlf7T/k4nkBpBcLgP7T0EfN6G2vvnhUfvd4uO1h8RwpXOE8x/54DVYUs1XCAtBHkX/R3axAQ==}
     dependencies:
@@ -3205,6 +3399,14 @@ packages:
       chokidar: 3.5.3
     dev: true
 
+  /@types/gulp@4.0.11:
+    resolution: {integrity: sha512-jy0nfcsjiGqO1prNsYMK/bHkTblIBgG04sL2nxPpnP9MyNicHp1SUblomjOla6JoW1qkR67HjFHqIibpPoShNQ==}
+    dependencies:
+      '@types/undertaker': 1.2.8
+      '@types/vinyl-fs': 3.0.2
+      chokidar: 3.5.3
+    dev: true
+
   /@types/http-assert@1.5.3:
     resolution: {integrity: sha512-FyAOrDuQmBi8/or3ns4rwPno7/9tJTijVW6aQQjK02+kOQ8zmoNg2XJtAuQhvQcy1ASJq38wirX5//9J1EqoUA==}
 
@@ -3262,6 +3464,10 @@ packages:
     resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==}
     dev: true
 
+  /@types/json-schema@7.0.12:
+    resolution: {integrity: sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==}
+    dev: true
+
   /@types/jsonld@1.5.8:
     resolution: {integrity: sha512-4l5t/jDnJpqZ+i7CLTTgPcT5BYXnAnwJupb07aAokPufCV0SjDHcwctUkSTuhIuSU9yHok+WOOngIGCtpL96gw==}
     dev: true
@@ -3270,8 +3476,8 @@ packages:
     resolution: {integrity: sha512-05S2f4lGaWgCwFHsa3OEirc4VJf/sJRfhofzxUbuFbmm6NbffPXZrnJqquQAtS3g4C8Z0L9NHgW0znmtDxNoTQ==}
     dev: true
 
-  /@types/katex@0.14.0:
-    resolution: {integrity: sha512-+2FW2CcT0K3P+JMR8YG846bmDwplKUTsWgT2ENwdQ1UdVfRk3GQrh6Mi4sTopy30gI8Uau5CEqHTDZ6YvWIUPA==}
+  /@types/katex@0.16.0:
+    resolution: {integrity: sha512-hz+S3nV6Mym5xPbT9fnO8dDhBFQguMYpY0Ipxv06JMi1ORgnEM4M1ymWDUhUNer3ElLmT583opRo4RzxKmh9jw==}
     dev: true
 
   /@types/keygrip@1.0.2:
@@ -3456,7 +3662,7 @@ packages:
     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
+      node-fetch: 3.3.1
     dev: true
 
   /@types/node@12.20.24:
@@ -3473,8 +3679,12 @@ packages:
   /@types/node@18.11.18:
     resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==}
 
-  /@types/nodemailer@6.4.7:
-    resolution: {integrity: sha512-f5qCBGAn/f0qtRcd4SEn88c8Fp3Swct1731X4ryPKqS61/A3LmmzN8zaEz7hneJvpjFbUUgY7lru/B/7ODTazg==}
+  /@types/node@20.2.5:
+    resolution: {integrity: sha512-JJulVEQXmiY9Px5axXHeYGLSjhkZEnD+MDPDGbCbIAbMslkKwmygtZFy1X6s/075Yo94sf8GuSlFfPzysQrWZQ==}
+    dev: true
+
+  /@types/nodemailer@6.4.8:
+    resolution: {integrity: sha512-oVsJSCkqViCn8/pEu2hfjwVO+Gb3e+eTWjg3PcjeFKRItfKpKwHphQqbYmPQrlMk+op7pNNWPbsJIEthpFN/OQ==}
     dependencies:
       '@types/node': 18.11.18
     dev: true
@@ -3496,6 +3706,10 @@ packages:
     resolution: {integrity: sha512-PGcyveRIpL1XIqK8eBsmRBt76eFgtzuPiSTyKHZxnGemp2yzGzWpjYKAfK3wIMiU7eH+851yEpiuP8JZerTmWg==}
     dev: false
 
+  /@types/picomatch@2.3.0:
+    resolution: {integrity: sha512-O397rnSS9iQI4OirieAtsDqvCj4+3eY1J+EPdNTKuHuRWIfUoGyzX294o8C4KJYaLqgSrd2o60c5EqCU8Zv02g==}
+    dev: true
+
   /@types/prettier@2.7.2:
     resolution: {integrity: sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==}
     dev: true
@@ -3545,7 +3759,7 @@ packages:
     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
+      redis: 4.6.7
     dev: true
 
   /@types/rename@1.0.4:
@@ -3557,22 +3771,22 @@ packages:
     dependencies:
       '@types/node': 18.11.18
 
-  /@types/sanitize-html@2.8.0:
-    resolution: {integrity: sha512-Uih6caOm3DsBYnVGOYn0A9NoTNe1c4aPStmHC/YA2JrpP9kx//jzaRcIklFvSpvVQEcpl/ZCr4DgISSf/YxTvg==}
+  /@types/sanitize-html@2.9.0:
+    resolution: {integrity: sha512-4fP/kEcKNj2u39IzrxWYuf/FnCCwwQCpif6wwY6ROUS1EPRIfWJjGkY3HIowY1EX/VbX5e86yq8AAE7UPMgATg==}
     dependencies:
-      htmlparser2: 8.0.1
+      htmlparser2: 8.0.2
     dev: true
 
   /@types/seedrandom@2.4.30:
     resolution: {integrity: sha512-AnxLHewubLVzoF/A4qdxBGHCKifw8cY32iro3DQX9TPcetE95zBeVt3jnsvtvAUf1vwzMfwzp4t/L2yqPlnjkQ==}
     dev: false
 
-  /@types/seedrandom@3.0.4:
-    resolution: {integrity: sha512-/rWdxeiuZenlawrHU+XV6ZHMTKOqrC2hMfeDfLTIWJhDZP5aVqXRysduYHBbhD7CeJO6FJr/D2uBVXB7GT6v7w==}
+  /@types/seedrandom@3.0.5:
+    resolution: {integrity: sha512-kopEpYpFQvQdYsZkZVwht/0THHmTFFYXDaqV/lM45eweJ8kcGVDgZHs0RVTolSq55UPZNmjhKc9r7UvLu/mQQg==}
     dev: true
 
-  /@types/semver@7.3.13:
-    resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==}
+  /@types/semver@7.5.0:
+    resolution: {integrity: sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==}
     dev: true
 
   /@types/serve-static@1.15.0:
@@ -3609,6 +3823,12 @@ packages:
     resolution: {integrity: sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==}
     dev: true
 
+  /@types/streamx@2.9.1:
+    resolution: {integrity: sha512-9bywzhouyedmci7WCIPFwJ8zASDnxt2gaVUy52X0p0Tt085IJSAEP0L6j4SSNeDMSLzpYu6cPz0GrJZ7kPJ6Bg==}
+    dependencies:
+      '@types/node': 20.2.5
+    dev: true
+
   /@types/throttle-debounce@5.0.0:
     resolution: {integrity: sha512-Pb7k35iCGFcGPECoNE4DYp3Oyf2xcTd3FbFQxXUI9hEYKUl6YX+KLf7HrBmgVcD05nl50LIH6i+80js4iYmWbw==}
     dev: true
@@ -3649,6 +3869,14 @@ packages:
       '@types/vinyl': 2.0.7
     dev: true
 
+  /@types/vinyl-fs@3.0.2:
+    resolution: {integrity: sha512-ctNcmmzbMIKooXjRkyyUCOu2Z4AyqibL+RhXoF3pb7K7j+ezItnakmpm31LymkYHSIM5ey0tjIFzTvFOTSBCGw==}
+    dependencies:
+      '@types/glob-stream': 8.0.0
+      '@types/node': 20.2.5
+      '@types/vinyl': 2.0.7
+    dev: true
+
   /@types/vinyl@2.0.7:
     resolution: {integrity: sha512-4UqPv+2567NhMQuMLdKAyK4yzrfCqwaTt6bLhHEs8PFcxbHILsrxaY63n4wgE/BRLDWDQeI+WcTmkXKExh9hQg==}
     dependencies:
@@ -3676,17 +3904,10 @@ packages:
       '@types/node': 18.11.18
     dev: true
 
-  /@types/ws@8.5.3:
-    resolution: {integrity: sha512-6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w==}
-    dependencies:
-      '@types/node': 18.11.18
-    dev: true
-
   /@types/ws@8.5.4:
     resolution: {integrity: sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==}
     dependencies:
       '@types/node': 18.11.18
-    dev: false
 
   /@types/yargs-parser@21.0.0:
     resolution: {integrity: sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==}
@@ -3702,7 +3923,7 @@ packages:
     resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
     requiresBuild: true
     dependencies:
-      '@types/node': 18.11.18
+      '@types/node': 14.18.36
     dev: true
     optional: true
 
@@ -3809,204 +4030,214 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
       '@typescript-eslint/types': 5.8.1
-      eslint-visitor-keys: 3.3.0
+      eslint-visitor-keys: 3.4.1
     dev: true
 
-  /@vitejs/plugin-vue@4.0.0(vite@4.3.9)(vue@3.2.45):
-    resolution: {integrity: sha512-e0X4jErIxAB5oLtDqbHvHpJe/uWNkdpYV83AOG2xo2tEVSzCzewgJMtREZM30wXnM5ls90hxiOtAuVU6H5JgbA==}
+  /@vitejs/plugin-vue@4.2.3(vite@4.3.9)(vue@3.3.4):
+    resolution: {integrity: sha512-R6JDUfiZbJA9cMiguQ7jxALsgiprjBeHL5ikpXfJCH62pPHtI+JdJ5xWj6Ev73yXSlYl86+blXn1kZHQ7uElxw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
       vite: ^4.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 4.3.9(sass@1.57.1)
-      vue: 3.2.45
+      vite: 4.3.9(sass@1.62.1)
+      vue: 3.3.4
     dev: true
 
-  /@vue/compiler-core@3.2.45:
-    resolution: {integrity: sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==}
+  /@vue/compiler-core@3.3.4:
+    resolution: {integrity: sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==}
     dependencies:
-      '@babel/parser': 7.20.7
-      '@vue/shared': 3.2.45
+      '@babel/parser': 7.22.4
+      '@vue/shared': 3.3.4
       estree-walker: 2.0.2
-      source-map: 0.6.1
+      source-map-js: 1.0.2
+    dev: true
 
-  /@vue/compiler-dom@3.2.45:
-    resolution: {integrity: sha512-tyYeUEuKqqZO137WrZkpwfPCdiiIeXYCcJ8L4gWz9vqaxzIQRccTSwSWZ/Axx5YR2z+LvpUbmPNXxuBU45lyRw==}
+  /@vue/compiler-dom@3.3.4:
+    resolution: {integrity: sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==}
     dependencies:
-      '@vue/compiler-core': 3.2.45
-      '@vue/shared': 3.2.45
+      '@vue/compiler-core': 3.3.4
+      '@vue/shared': 3.3.4
+    dev: true
 
   /@vue/compiler-sfc@2.7.14:
     resolution: {integrity: sha512-aNmNHyLPsw+sVvlQFQ2/8sjNuLtK54TC6cuKnVzAY93ks4ZBrvwQSnkkIh7bsbNhum5hJBS00wSDipQ937f5DA==}
     dependencies:
-      '@babel/parser': 7.20.7
+      '@babel/parser': 7.22.4
       postcss: 8.4.24
       source-map: 0.6.1
     dev: true
 
-  /@vue/compiler-sfc@3.2.45:
-    resolution: {integrity: sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==}
+  /@vue/compiler-sfc@3.3.4:
+    resolution: {integrity: sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==}
     dependencies:
-      '@babel/parser': 7.20.7
-      '@vue/compiler-core': 3.2.45
-      '@vue/compiler-dom': 3.2.45
-      '@vue/compiler-ssr': 3.2.45
-      '@vue/reactivity-transform': 3.2.45
-      '@vue/shared': 3.2.45
+      '@babel/parser': 7.22.4
+      '@vue/compiler-core': 3.3.4
+      '@vue/compiler-dom': 3.3.4
+      '@vue/compiler-ssr': 3.3.4
+      '@vue/reactivity-transform': 3.3.4
+      '@vue/shared': 3.3.4
       estree-walker: 2.0.2
-      magic-string: 0.25.9
-      postcss: 8.4.21
-      source-map: 0.6.1
+      magic-string: 0.30.0
+      postcss: 8.4.24
+      source-map-js: 1.0.2
+    dev: true
 
-  /@vue/compiler-ssr@3.2.45:
-    resolution: {integrity: sha512-6BRaggEGqhWht3lt24CrIbQSRD5O07MTmd+LjAn5fJj568+R9eUD2F7wMQJjX859seSlrYog7sUtrZSd7feqrQ==}
+  /@vue/compiler-ssr@3.3.4:
+    resolution: {integrity: sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==}
     dependencies:
-      '@vue/compiler-dom': 3.2.45
-      '@vue/shared': 3.2.45
+      '@vue/compiler-dom': 3.3.4
+      '@vue/shared': 3.3.4
+    dev: true
 
-  /@vue/reactivity-transform@3.2.45:
-    resolution: {integrity: sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==}
+  /@vue/reactivity-transform@3.3.4:
+    resolution: {integrity: sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==}
     dependencies:
-      '@babel/parser': 7.20.7
-      '@vue/compiler-core': 3.2.45
-      '@vue/shared': 3.2.45
+      '@babel/parser': 7.22.4
+      '@vue/compiler-core': 3.3.4
+      '@vue/shared': 3.3.4
       estree-walker: 2.0.2
-      magic-string: 0.25.9
+      magic-string: 0.30.0
+    dev: true
 
-  /@vue/reactivity@3.2.45:
-    resolution: {integrity: sha512-PRvhCcQcyEVohW0P8iQ7HDcIOXRjZfAsOds3N99X/Dzewy8TVhTCT4uXpAHfoKjVTJRA0O0K+6QNkDIZAxNi3A==}
+  /@vue/reactivity@3.3.4:
+    resolution: {integrity: sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==}
     dependencies:
-      '@vue/shared': 3.2.45
+      '@vue/shared': 3.3.4
+    dev: true
 
-  /@vue/runtime-core@3.2.45:
-    resolution: {integrity: sha512-gzJiTA3f74cgARptqzYswmoQx0fIA+gGYBfokYVhF8YSXjWTUA2SngRzZRku2HbGbjzB6LBYSbKGIaK8IW+s0A==}
+  /@vue/runtime-core@3.3.4:
+    resolution: {integrity: sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==}
     dependencies:
-      '@vue/reactivity': 3.2.45
-      '@vue/shared': 3.2.45
+      '@vue/reactivity': 3.3.4
+      '@vue/shared': 3.3.4
+    dev: true
 
-  /@vue/runtime-dom@3.2.45:
-    resolution: {integrity: sha512-cy88YpfP5Ue2bDBbj75Cb4bIEZUMM/mAkDMfqDTpUYVgTf/kuQ2VQ8LebuZ8k6EudgH8pYhsGWHlY0lcxlvTwA==}
+  /@vue/runtime-dom@3.3.4:
+    resolution: {integrity: sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==}
     dependencies:
-      '@vue/runtime-core': 3.2.45
-      '@vue/shared': 3.2.45
-      csstype: 2.6.21
+      '@vue/runtime-core': 3.3.4
+      '@vue/shared': 3.3.4
+      csstype: 3.1.2
+    dev: true
 
-  /@vue/server-renderer@3.2.45(vue@3.2.45):
-    resolution: {integrity: sha512-ebiMq7q24WBU1D6uhPK//2OTR1iRIyxjF5iVq/1a5I1SDMDyDu4Ts6fJaMnjrvD3MqnaiFkKQj+LKAgz5WIK3g==}
+  /@vue/server-renderer@3.3.4(vue@3.3.4):
+    resolution: {integrity: sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==}
     peerDependencies:
-      vue: 3.2.45
+      vue: 3.3.4
     dependencies:
-      '@vue/compiler-ssr': 3.2.45
-      '@vue/shared': 3.2.45
-      vue: 3.2.45
+      '@vue/compiler-ssr': 3.3.4
+      '@vue/shared': 3.3.4
+      vue: 3.3.4
+    dev: true
 
-  /@vue/shared@3.2.45:
-    resolution: {integrity: sha512-Ewzq5Yhimg7pSztDV+RH1UDKBzmtqieXQlpTVm2AwraoRL/Rks96mvd8Vgi7Lj+h+TH8dv7mXD3FRZR3TUvbSg==}
+  /@vue/shared@3.3.4:
+    resolution: {integrity: sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ==}
+    dev: true
 
-  /@webassemblyjs/ast@1.11.1:
-    resolution: {integrity: sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==}
+  /@webassemblyjs/ast@1.11.6:
+    resolution: {integrity: sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==}
     dependencies:
-      '@webassemblyjs/helper-numbers': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
+      '@webassemblyjs/helper-numbers': 1.11.6
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
     dev: true
 
-  /@webassemblyjs/floating-point-hex-parser@1.11.1:
-    resolution: {integrity: sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==}
+  /@webassemblyjs/floating-point-hex-parser@1.11.6:
+    resolution: {integrity: sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==}
     dev: true
 
-  /@webassemblyjs/helper-api-error@1.11.1:
-    resolution: {integrity: sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==}
+  /@webassemblyjs/helper-api-error@1.11.6:
+    resolution: {integrity: sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==}
     dev: true
 
-  /@webassemblyjs/helper-buffer@1.11.1:
-    resolution: {integrity: sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==}
+  /@webassemblyjs/helper-buffer@1.11.6:
+    resolution: {integrity: sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==}
     dev: true
 
-  /@webassemblyjs/helper-numbers@1.11.1:
-    resolution: {integrity: sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==}
+  /@webassemblyjs/helper-numbers@1.11.6:
+    resolution: {integrity: sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==}
     dependencies:
-      '@webassemblyjs/floating-point-hex-parser': 1.11.1
-      '@webassemblyjs/helper-api-error': 1.11.1
+      '@webassemblyjs/floating-point-hex-parser': 1.11.6
+      '@webassemblyjs/helper-api-error': 1.11.6
       '@xtuc/long': 4.2.2
     dev: true
 
-  /@webassemblyjs/helper-wasm-bytecode@1.11.1:
-    resolution: {integrity: sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==}
+  /@webassemblyjs/helper-wasm-bytecode@1.11.6:
+    resolution: {integrity: sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==}
     dev: true
 
-  /@webassemblyjs/helper-wasm-section@1.11.1:
-    resolution: {integrity: sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==}
+  /@webassemblyjs/helper-wasm-section@1.11.6:
+    resolution: {integrity: sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==}
     dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-buffer': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-      '@webassemblyjs/wasm-gen': 1.11.1
+      '@webassemblyjs/ast': 1.11.6
+      '@webassemblyjs/helper-buffer': 1.11.6
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+      '@webassemblyjs/wasm-gen': 1.11.6
     dev: true
 
-  /@webassemblyjs/ieee754@1.11.1:
-    resolution: {integrity: sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==}
+  /@webassemblyjs/ieee754@1.11.6:
+    resolution: {integrity: sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==}
     dependencies:
       '@xtuc/ieee754': 1.2.0
     dev: true
 
-  /@webassemblyjs/leb128@1.11.1:
-    resolution: {integrity: sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==}
+  /@webassemblyjs/leb128@1.11.6:
+    resolution: {integrity: sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==}
     dependencies:
       '@xtuc/long': 4.2.2
     dev: true
 
-  /@webassemblyjs/utf8@1.11.1:
-    resolution: {integrity: sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==}
+  /@webassemblyjs/utf8@1.11.6:
+    resolution: {integrity: sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==}
     dev: true
 
-  /@webassemblyjs/wasm-edit@1.11.1:
-    resolution: {integrity: sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==}
+  /@webassemblyjs/wasm-edit@1.11.6:
+    resolution: {integrity: sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==}
     dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-buffer': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-      '@webassemblyjs/helper-wasm-section': 1.11.1
-      '@webassemblyjs/wasm-gen': 1.11.1
-      '@webassemblyjs/wasm-opt': 1.11.1
-      '@webassemblyjs/wasm-parser': 1.11.1
-      '@webassemblyjs/wast-printer': 1.11.1
+      '@webassemblyjs/ast': 1.11.6
+      '@webassemblyjs/helper-buffer': 1.11.6
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+      '@webassemblyjs/helper-wasm-section': 1.11.6
+      '@webassemblyjs/wasm-gen': 1.11.6
+      '@webassemblyjs/wasm-opt': 1.11.6
+      '@webassemblyjs/wasm-parser': 1.11.6
+      '@webassemblyjs/wast-printer': 1.11.6
     dev: true
 
-  /@webassemblyjs/wasm-gen@1.11.1:
-    resolution: {integrity: sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==}
+  /@webassemblyjs/wasm-gen@1.11.6:
+    resolution: {integrity: sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==}
     dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-      '@webassemblyjs/ieee754': 1.11.1
-      '@webassemblyjs/leb128': 1.11.1
-      '@webassemblyjs/utf8': 1.11.1
+      '@webassemblyjs/ast': 1.11.6
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+      '@webassemblyjs/ieee754': 1.11.6
+      '@webassemblyjs/leb128': 1.11.6
+      '@webassemblyjs/utf8': 1.11.6
     dev: true
 
-  /@webassemblyjs/wasm-opt@1.11.1:
-    resolution: {integrity: sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==}
+  /@webassemblyjs/wasm-opt@1.11.6:
+    resolution: {integrity: sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==}
     dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-buffer': 1.11.1
-      '@webassemblyjs/wasm-gen': 1.11.1
-      '@webassemblyjs/wasm-parser': 1.11.1
+      '@webassemblyjs/ast': 1.11.6
+      '@webassemblyjs/helper-buffer': 1.11.6
+      '@webassemblyjs/wasm-gen': 1.11.6
+      '@webassemblyjs/wasm-parser': 1.11.6
     dev: true
 
-  /@webassemblyjs/wasm-parser@1.11.1:
-    resolution: {integrity: sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==}
+  /@webassemblyjs/wasm-parser@1.11.6:
+    resolution: {integrity: sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==}
     dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-api-error': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-      '@webassemblyjs/ieee754': 1.11.1
-      '@webassemblyjs/leb128': 1.11.1
-      '@webassemblyjs/utf8': 1.11.1
+      '@webassemblyjs/ast': 1.11.6
+      '@webassemblyjs/helper-api-error': 1.11.6
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.6
+      '@webassemblyjs/ieee754': 1.11.6
+      '@webassemblyjs/leb128': 1.11.6
+      '@webassemblyjs/utf8': 1.11.6
     dev: true
 
-  /@webassemblyjs/wast-printer@1.11.1:
-    resolution: {integrity: sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==}
+  /@webassemblyjs/wast-printer@1.11.6:
+    resolution: {integrity: sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==}
     dependencies:
-      '@webassemblyjs/ast': 1.11.1
+      '@webassemblyjs/ast': 1.11.6
       '@xtuc/long': 4.2.2
     dev: true
 
@@ -4018,30 +4249,30 @@ packages:
     resolution: {integrity: sha512-pUrWq3V5PiSGFLeLxoGqReTZmiiXwY3jRkIG5sLLKjyqNxrwm/04b4nw7LSmGWJcKk59XOM/YRTUwOzo4MMlow==}
     dev: false
 
-  /@webpack-cli/configtest@2.0.1(webpack-cli@5.0.1)(webpack@5.75.0):
-    resolution: {integrity: sha512-njsdJXJSiS2iNbQVS0eT8A/KPnmyH4pv1APj2K0d1wrZcBLw+yppxOy4CGqa0OxDJkzfL/XELDhD8rocnIwB5A==}
+  /@webpack-cli/configtest@2.1.1(webpack-cli@5.1.3)(webpack@5.85.1):
+    resolution: {integrity: sha512-wy0mglZpDSiSS0XHrVR+BAdId2+yxPSoJW8fsna3ZpYSlufjvxnP4YbKTCBZnNIcGN4r6ZPXV55X4mYExOfLmw==}
     engines: {node: '>=14.15.0'}
     peerDependencies:
       webpack: 5.x.x
       webpack-cli: 5.x.x
     dependencies:
-      webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
-      webpack-cli: 5.0.1(webpack@5.75.0)
+      webpack: 5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3)
+      webpack-cli: 5.1.3(webpack@5.85.1)
     dev: true
 
-  /@webpack-cli/info@2.0.1(webpack-cli@5.0.1)(webpack@5.75.0):
-    resolution: {integrity: sha512-fE1UEWTwsAxRhrJNikE7v4EotYflkEhBL7EbajfkPlf6E37/2QshOy/D48Mw8G5XMFlQtS6YV42vtbG9zBpIQA==}
+  /@webpack-cli/info@2.0.2(webpack-cli@5.1.3)(webpack@5.85.1):
+    resolution: {integrity: sha512-zLHQdI/Qs1UyT5UBdWNqsARasIA+AaF8t+4u2aS2nEpBQh2mWIVb8qAklq0eUENnC5mOItrIB4LiS9xMtph18A==}
     engines: {node: '>=14.15.0'}
     peerDependencies:
       webpack: 5.x.x
       webpack-cli: 5.x.x
     dependencies:
-      webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
-      webpack-cli: 5.0.1(webpack@5.75.0)
+      webpack: 5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3)
+      webpack-cli: 5.1.3(webpack@5.85.1)
     dev: true
 
-  /@webpack-cli/serve@2.0.1(webpack-cli@5.0.1)(webpack@5.75.0):
-    resolution: {integrity: sha512-0G7tNyS+yW8TdgHwZKlDWYXFA6OJQnoLCQvYKkQP0Q2X205PSQ6RNUj0M+1OB/9gRQaUZ/ccYfaxd0nhaWKfjw==}
+  /@webpack-cli/serve@2.0.5(webpack-cli@5.1.3)(webpack@5.85.1):
+    resolution: {integrity: sha512-lqaoKnRYBdo1UgDX8uF24AfGMifWK19TxPmM5FHc2vAGxrJ/qtyUyFBWoY1tISZdelsQ5fBcOusifo5o5wSJxQ==}
     engines: {node: '>=14.15.0'}
     peerDependencies:
       webpack: 5.x.x
@@ -4051,8 +4282,8 @@ packages:
       webpack-dev-server:
         optional: true
     dependencies:
-      webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
-      webpack-cli: 5.0.1(webpack@5.75.0)
+      webpack: 5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3)
+      webpack-cli: 5.1.3(webpack@5.85.1)
     dev: true
 
   /@xtuc/ieee754@1.2.0:
@@ -4098,20 +4329,20 @@ packages:
       acorn-walk: 8.2.0
     dev: false
 
-  /acorn-import-assertions@1.8.0(acorn@8.8.1):
-    resolution: {integrity: sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==}
+  /acorn-import-assertions@1.9.0(acorn@8.8.2):
+    resolution: {integrity: sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==}
     peerDependencies:
       acorn: ^8
     dependencies:
-      acorn: 8.8.1
+      acorn: 8.8.2
     dev: true
 
-  /acorn-jsx@5.3.2(acorn@8.8.1):
+  /acorn-jsx@5.3.2(acorn@8.8.2):
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      acorn: 8.8.1
+      acorn: 8.8.2
 
   /acorn-walk@7.2.0:
     resolution: {integrity: sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==}
@@ -4132,6 +4363,11 @@ packages:
     engines: {node: '>=0.4.0'}
     hasBin: true
 
+  /acorn@8.8.2:
+    resolution: {integrity: sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
   /adm-zip@0.5.10:
     resolution: {integrity: sha512-x0HvcHqVJNTPk/Bw8JbLWlWoo6Wwnsug0fnYYro1HBrjxZ3G7/AZk7Ahv8JwDe1uIcz8eBqvu86FuF1POiG7vQ==}
     engines: {node: '>=6.0'}
@@ -4153,12 +4389,12 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /agentkeepalive@4.2.1:
-    resolution: {integrity: sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==}
+  /agentkeepalive@4.3.0:
+    resolution: {integrity: sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==}
     engines: {node: '>= 8.0.0'}
     dependencies:
       debug: 4.3.4(supports-color@8.1.1)
-      depd: 1.1.2
+      depd: 2.0.0
       humanize-ms: 1.2.1
     transitivePeerDependencies:
       - supports-color
@@ -4195,8 +4431,8 @@ packages:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
-  /ajv@8.11.2:
-    resolution: {integrity: sha512-E4bfmKAhGiSTvMfL1Myyycaub+cUEU2/IvpylXkUu7CHBkBj1f/ikdzbD7YQ6FKUbixDxeYvB/xY4fvyroDlQg==}
+  /ajv@8.12.0:
+    resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==}
     dependencies:
       fast-deep-equal: 3.1.3
       json-schema-traverse: 1.0.0
@@ -4374,7 +4610,7 @@ packages:
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
       delegates: 1.0.0
-      readable-stream: 3.6.0
+      readable-stream: 3.6.2
     dev: false
 
   /arg@4.1.3:
@@ -4715,8 +4951,8 @@ packages:
       - debug
     dev: false
 
-  /axios@1.3.2:
-    resolution: {integrity: sha512-1M3O703bYqYuPhbHeya5bnhpYVsDDRyQSabNja04mZtboLNSuZ4YrltestrLXfHgmzua4TpUqRiVKbiQuo2epw==}
+  /axios@1.4.0:
+    resolution: {integrity: sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==}
     dependencies:
       follow-redirects: 1.15.2(debug@4.3.4)
       form-data: 4.0.0
@@ -4725,7 +4961,7 @@ packages:
       - debug
     dev: false
 
-  /babel-eslint@10.1.0(eslint@8.31.0):
+  /babel-eslint@10.1.0(eslint@8.42.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.
@@ -4733,10 +4969,10 @@ packages:
       eslint: '>= 4.12.1'
     dependencies:
       '@babel/code-frame': 7.18.6
-      '@babel/parser': 7.20.7
+      '@babel/parser': 7.22.4
       '@babel/traverse': 7.20.12
-      '@babel/types': 7.20.7
-      eslint: 8.31.0
+      '@babel/types': 7.22.4
+      eslint: 8.42.0
       eslint-visitor-keys: 1.3.0
       resolve: 1.22.1
     transitivePeerDependencies:
@@ -4779,8 +5015,8 @@ packages:
     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
+      '@babel/template': 7.21.9
+      '@babel/types': 7.22.4
       '@types/babel__core': 7.20.0
       '@types/babel__traverse': 7.18.3
     dev: true
@@ -4820,7 +5056,7 @@ packages:
     resolution: {integrity: sha512-GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw==}
     engines: {node: '>= 10.0.0'}
     dependencies:
-      '@babel/types': 7.20.7
+      '@babel/types': 7.22.4
 
   /bach@1.2.0:
     resolution: {integrity: sha512-bZOOfCb3gXBXbTFXq3OZtGR88LwGeJvzu6szttaIzymOTS4ZttBNOWSv7aLZja2EMycKtRYV0Oa8SNKH/zkxvg==}
@@ -4890,7 +5126,7 @@ packages:
     engines: {node: '>=12'}
     dependencies:
       bin-version: 6.0.0
-      semver: 7.3.8
+      semver: 7.5.1
       semver-truncate: 2.0.0
     dev: true
 
@@ -5007,16 +5243,15 @@ packages:
       electron-to-chromium: 1.4.284
     dev: true
 
-  /browserslist@4.21.4:
-    resolution: {integrity: sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==}
+  /browserslist@4.21.7:
+    resolution: {integrity: sha512-BauCXrQ7I2ftSqd2mvKHGo85XR0u7Ru3C/Hxsy/0TkfCtjrmAbPdzLGasmoiBxplpDXlPvdjX9u7srIMfgasNA==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
     dependencies:
-      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)
-    dev: true
+      caniuse-lite: 1.0.30001495
+      electron-to-chromium: 1.4.420
+      node-releases: 2.0.12
+      update-browserslist-db: 1.0.11(browserslist@4.21.7)
 
   /bs-logger@0.2.6:
     resolution: {integrity: sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==}
@@ -5090,7 +5325,7 @@ packages:
       ioredis: 5.3.2
       lodash: 4.17.21
       msgpackr: 1.8.1
-      semver: 7.3.8
+      semver: 7.5.1
       uuid: 8.3.2
     transitivePeerDependencies:
       - supports-color
@@ -5116,9 +5351,9 @@ packages:
       '@npmcli/move-file': 2.0.1
       chownr: 2.0.0
       fs-minipass: 2.1.0
-      glob: 8.0.3
+      glob: 8.1.0
       infer-owner: 1.0.4
-      lru-cache: 7.14.1
+      lru-cache: 7.18.3
       minipass: 3.3.6
       minipass-collect: 1.0.2
       minipass-flush: 1.0.5
@@ -5128,7 +5363,7 @@ packages:
       promise-inflight: 1.0.1
       rimraf: 3.0.2
       ssri: 9.0.1
-      tar: 6.1.13
+      tar: 6.1.15
       unique-filename: 2.0.1
     transitivePeerDependencies:
       - bluebird
@@ -5247,9 +5482,8 @@ packages:
     resolution: {integrity: sha512-4KKthVYyooNIOhO1w0OJ13EhEwOGECMrZdkeyDydhvYXaTDA3WdhR8amoJnAgpSgcCR26aOAWk6N9ANVYlv2oQ==}
     dev: true
 
-  /caniuse-lite@1.0.30001443:
-    resolution: {integrity: sha512-jUo8svymO8+Mkj3qbUbVjR8zv8LUGpGkUM/jKvc9SO2BvjCI980dp9fQbf/dyLs6RascPzgR4nhAKFA4OHeSaA==}
-    dev: true
+  /caniuse-lite@1.0.30001495:
+    resolution: {integrity: sha512-F6x5IEuigtUfU5ZMQK2jsy5JqUUlEFRVZq8bO2a+ysq5K7jD6PPc9YXZj78xDNS3uNchesp1Jw47YXEqr+Viyg==}
 
   /canonicalize@1.0.8:
     resolution: {integrity: sha512-0CNTVCLZggSh7bc5VkX5WWPWO+cyZbNd07IHIsSXLia/eAq+r836hgk+8BKoEh7949Mda87VUOitx5OddVj64A==}
@@ -5591,11 +5825,6 @@ packages:
       readable-stream: 2.3.7
     dev: true
 
-  /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:
     resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
     engines: {node: '>=0.10.0'}
@@ -5604,7 +5833,7 @@ packages:
     resolution: {integrity: sha512-sX/LQ7LqUhgyaxzbe7IqwPeTr2yfpfUIQ/dgpKo6ZI4y4lpQA0YxAomWIY+7I7rHWcG02PG+OuPREzMW/5tszQ==}
     dependencies:
       inflation: 2.0.0
-      qs: 6.9.7
+      qs: 6.11.2
       raw-body: 2.5.1
       type-is: 1.6.18
     dev: false
@@ -5613,7 +5842,7 @@ packages:
     resolution: {integrity: sha512-m7pOT6CdLN7FuXUcpuz/8lfQ/L77x8SchHCF4G0RBTJO20Wzmhn5Sp4/5WsKy8OSpifBSUrmg83qEqaDHdyFuQ==}
     dependencies:
       inflation: 2.0.0
-      qs: 6.9.7
+      qs: 6.11.2
       raw-body: 2.5.1
       type-is: 1.6.18
     dev: false
@@ -5720,6 +5949,10 @@ packages:
     resolution: {integrity: sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==}
     dev: true
 
+  /colorette@2.0.20:
+    resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
+    dev: true
+
   /colormin@1.1.2:
     resolution: {integrity: sha512-XSEQUUQUR/lXqGyddiNH3XYFUPYlYr1vXy9rTFMsSOw+J7Q6EQkdlQIrTlYn4TccpsOaUE1PYQNjBn20gwCdgQ==}
     dependencies:
@@ -5744,6 +5977,11 @@ packages:
     dependencies:
       delayed-stream: 1.0.0
 
+  /commander@10.0.1:
+    resolution: {integrity: sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==}
+    engines: {node: '>=14'}
+    dev: true
+
   /commander@2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
 
@@ -5816,7 +6054,7 @@ packages:
       js-string-escape: 1.0.1
       lodash: 4.17.21
       md5-hex: 3.0.1
-      semver: 7.3.8
+      semver: 7.5.1
       well-known-symbols: 2.0.0
     dev: true
 
@@ -6010,8 +6248,8 @@ packages:
   /constantinople@4.0.1:
     resolution: {integrity: sha512-vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw==}
     dependencies:
-      '@babel/parser': 7.20.7
-      '@babel/types': 7.20.7
+      '@babel/parser': 7.22.4
+      '@babel/types': 7.22.4
 
   /content-disposition@0.5.4:
     resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
@@ -6026,7 +6264,6 @@ packages:
 
   /convert-source-map@1.9.0:
     resolution: {integrity: sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==}
-    dev: true
 
   /convert-to-spaces@2.0.1:
     resolution: {integrity: sha512-rcQ1bsQO9799wq24uE5AM2tAILy4gXGIK/njFWcVQkGNZ96edlpY+A7bjwvzjYvLDyzmG1MmMLZhpcsb+klNMQ==}
@@ -6228,11 +6465,8 @@ packages:
     dependencies:
       cssom: 0.3.8
 
-  /csstype@2.6.21:
-    resolution: {integrity: sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==}
-
-  /csstype@3.1.1:
-    resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
+  /csstype@3.1.2:
+    resolution: {integrity: sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==}
     dev: true
 
   /currently-unhandled@0.4.1:
@@ -6295,7 +6529,7 @@ packages:
       pretty-bytes: 5.6.0
       proxy-from-env: 1.0.0
       request-progress: 3.0.0
-      semver: 7.3.8
+      semver: 7.5.1
       supports-color: 8.1.1
       tmp: 0.2.1
       untildify: 4.0.0
@@ -6466,6 +6700,12 @@ packages:
   /deepmerge@4.2.2:
     resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
     engines: {node: '>=0.10.0'}
+    dev: true
+
+  /deepmerge@4.3.1:
+    resolution: {integrity: sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==}
+    engines: {node: '>=0.10.0'}
+    dev: false
 
   /default-compare@1.0.0:
     resolution: {integrity: sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==}
@@ -6593,8 +6833,8 @@ packages:
     engines: {node: '>=0.3.1'}
     dev: true
 
-  /dijkstrajs@1.0.2:
-    resolution: {integrity: sha512-QV6PMaHTCNmKSeP6QoXhVTw9snc9VD8MulTT0Bd99Pacp4SS1cjcrYPgBPmibqKVtMJJfqC6XvOXgPMEEPH/fg==}
+  /dijkstrajs@1.0.3:
+    resolution: {integrity: sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==}
     dev: false
 
   /dir-glob@3.0.1:
@@ -6629,7 +6869,7 @@ packages:
     dependencies:
       domelementtype: 2.3.0
       domhandler: 5.0.3
-      entities: 4.4.0
+      entities: 4.5.0
 
   /domelementtype@1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
@@ -6678,15 +6918,15 @@ packages:
       domelementtype: 1.3.1
     dev: false
 
-  /domutils@3.0.1:
-    resolution: {integrity: sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==}
+  /domutils@3.1.0:
+    resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==}
     dependencies:
       dom-serializer: 2.0.0
       domelementtype: 2.3.0
       domhandler: 5.0.3
 
-  /dotenv@16.0.3:
-    resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==}
+  /dotenv@16.1.4:
+    resolution: {integrity: sha512-m55RtE8AsPeJBpOIFKihEmqUcoVncQIwo7x9U8ZwLEZw9ZpXboz2c+rvog+jUaJvVrZ5kBOeYQBX5+8Aa/OZQw==}
     engines: {node: '>=12'}
     dev: false
 
@@ -6750,6 +6990,9 @@ packages:
     resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
     dev: true
 
+  /electron-to-chromium@1.4.420:
+    resolution: {integrity: sha512-BpPy2KXZc+UPbI8NGo2QdHU1Mkq11pO/zaNDHY57L09K/0ytrPw+IiLOUvZ1NjI5BlAVF5DkNr1UBUS76Tc4ow==}
+
   /emittery@0.8.1:
     resolution: {integrity: sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==}
     engines: {node: '>=10'}
@@ -6794,11 +7037,11 @@ packages:
     dependencies:
       once: 1.4.0
 
-  /enhanced-resolve@5.12.0:
-    resolution: {integrity: sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==}
+  /enhanced-resolve@5.14.1:
+    resolution: {integrity: sha512-Vklwq2vDKtl0y/vtwjSesgJ5MYS7Etuk5txS8VdKL4AOS1aUlD96zqIfsOSLQsdv3xgMRbtkWM8eG9XDfKUPow==}
     engines: {node: '>=10.13.0'}
     dependencies:
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       tapable: 2.2.1
     dev: true
 
@@ -6821,6 +7064,10 @@ packages:
     resolution: {integrity: sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==}
     engines: {node: '>=0.12'}
 
+  /entities@4.5.0:
+    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
+    engines: {node: '>=0.12'}
+
   /env-paths@2.2.1:
     resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
     engines: {node: '>=6'}
@@ -6842,8 +7089,8 @@ packages:
       is-arrayish: 0.2.1
     dev: true
 
-  /es-module-lexer@0.9.3:
-    resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==}
+  /es-module-lexer@1.2.1:
+    resolution: {integrity: sha512-9978wrXM50Y4rTMmW5kXIC09ZdXQZqkE4mxhwkd8VbzsGkXGPgV4zWuqQJgCEzYngdo2dYDa0l8xhX4fkSwJSg==}
     dev: true
 
   /es5-ext@0.10.62:
@@ -6992,15 +7239,14 @@ packages:
     dependencies:
       esrecurse: 4.3.0
       estraverse: 5.3.0
+    dev: true
 
-  /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:
-      eslint: '>=5'
+  /eslint-scope@7.2.0:
+    resolution: {integrity: sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      eslint: 8.31.0
-      eslint-visitor-keys: 2.1.0
+      esrecurse: 4.3.0
+      estraverse: 5.3.0
 
   /eslint-utils@3.0.0(eslint@8.6.0):
     resolution: {integrity: sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==}
@@ -7020,18 +7266,27 @@ packages:
   /eslint-visitor-keys@2.1.0:
     resolution: {integrity: sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==}
     engines: {node: '>=10'}
+    dev: true
 
   /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}
+    dev: true
 
-  /eslint@8.31.0:
-    resolution: {integrity: sha512-0tQQEVdmPZ1UtUKXjX7EMm9BlgJ08G90IhWh0PKDCb3ZLsgAOHI8fYSIzYVZej92zsgq+ft0FGsxhJ3xo2tbuA==}
+  /eslint-visitor-keys@3.4.1:
+    resolution: {integrity: sha512-pZnmmLwYzf+kWaM/Qgrvpen51upAktaaiI01nsJD/Yr3lMOdNtq0cxkrrg16w64VtisN6okbs7Q8AfGqj4c9fA==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  /eslint@8.42.0:
+    resolution: {integrity: sha512-ulg9Ms6E1WPf67PHaEY4/6E2tEn5/f7FXGzr3t9cBMugOmf1INYvuUwwh1aXQN4MfJ6a5K2iNwP3w4AColvI9A==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     hasBin: true
     dependencies:
-      '@eslint/eslintrc': 1.4.1
-      '@humanwhocodes/config-array': 0.11.8
+      '@eslint-community/eslint-utils': 4.4.0(eslint@8.42.0)
+      '@eslint-community/regexpp': 4.5.1
+      '@eslint/eslintrc': 2.0.3
+      '@eslint/js': 8.42.0
+      '@humanwhocodes/config-array': 0.11.10
       '@humanwhocodes/module-importer': 1.0.1
       '@nodelib/fs.walk': 1.2.8
       ajv: 6.12.6
@@ -7040,24 +7295,22 @@ packages:
       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-visitor-keys: 3.3.0
-      espree: 9.4.1
-      esquery: 1.4.0
+      eslint-scope: 7.2.0
+      eslint-visitor-keys: 3.4.1
+      espree: 9.5.2
+      esquery: 1.5.0
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
       file-entry-cache: 6.0.1
       find-up: 5.0.0
       glob-parent: 6.0.2
-      globals: 13.19.0
-      grapheme-splitter: 1.0.4
+      globals: 13.20.0
+      graphemer: 1.4.0
       ignore: 5.2.4
       import-fresh: 3.3.0
       imurmurhash: 0.1.4
       is-glob: 4.0.3
       is-path-inside: 3.0.3
-      js-sdsl: 4.2.0
       js-yaml: 4.1.0
       json-stable-stringify-without-jsonify: 1.0.1
       levn: 0.4.1
@@ -7065,7 +7318,6 @@ packages:
       minimatch: 3.1.2
       natural-compare: 1.4.0
       optionator: 0.9.1
-      regexpp: 3.2.0
       strip-ansi: 6.0.1
       strip-json-comments: 3.1.1
       text-table: 0.2.0
@@ -7123,9 +7375,18 @@ packages:
     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: 8.8.2
+      acorn-jsx: 5.3.2(acorn@8.8.2)
       eslint-visitor-keys: 3.3.0
+    dev: true
+
+  /espree@9.5.2:
+    resolution: {integrity: sha512-7OASN1Wma5fum5SrNhFMAMJxOUAbhyfQ8dQ//PJaJbNw0URTPWqIghHWt1MmAANKhHZIYOHruW4Kw4ruUWOdGw==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+    dependencies:
+      acorn: 8.8.2
+      acorn-jsx: 5.3.2(acorn@8.8.2)
+      eslint-visitor-keys: 3.4.1
 
   /esprima@2.7.3:
     resolution: {integrity: sha512-OarPfz0lFCiW4/AV2Oy1Rp9qu0iusTKqykwTspGCZtPxmF81JR4MmIebvF1F9+UOKth2ZubLQ4XGGaU+hSn99A==}
@@ -7143,6 +7404,13 @@ packages:
     engines: {node: '>=0.10'}
     dependencies:
       estraverse: 5.3.0
+    dev: true
+
+  /esquery@1.5.0:
+    resolution: {integrity: sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==}
+    engines: {node: '>=0.10'}
+    dependencies:
+      estraverse: 5.3.0
 
   /esrecurse@4.3.0:
     resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
@@ -7165,6 +7433,7 @@ packages:
 
   /estree-walker@2.0.2:
     resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
+    dev: true
 
   /esutils@2.0.3:
     resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
@@ -7506,7 +7775,7 @@ packages:
   /filelist@1.0.4:
     resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
     dependencies:
-      minimatch: 5.1.2
+      minimatch: 5.1.6
 
   /filename-reserved-regex@3.0.0:
     resolution: {integrity: sha512-hn4cQfU6GOT/7cFHXBqeBg2TbrMBgdD0kcjLhvSQYYwm3s4B6cjvBfb7nBALJLAXqmU5xajSa7X2NnUud/VCdw==}
@@ -7610,6 +7879,16 @@ packages:
       parse-filepath: 1.0.2
     dev: true
 
+  /fix-esm@1.0.1:
+    resolution: {integrity: sha512-EZtb7wPXZS54GaGxaWxMlhd1DUDCnAg5srlYdu/1ZVeW+7wwR3Tp59nu52dXByFs3MBRq+SByx1wDOJpRvLEXw==}
+    dependencies:
+      '@babel/core': 7.22.1
+      '@babel/plugin-proposal-export-namespace-from': 7.18.9(@babel/core@7.22.1)
+      '@babel/plugin-transform-modules-commonjs': 7.21.5(@babel/core@7.22.1)
+    transitivePeerDependencies:
+      - supports-color
+    dev: false
+
   /flagged-respawn@1.0.1:
     resolution: {integrity: sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==}
     engines: {node: '>= 0.10'}
@@ -7650,21 +7929,21 @@ packages:
       readable-stream: 2.3.7
     dev: true
 
-  /focus-trap-vue@4.0.1(focus-trap@7.2.0)(vue@3.2.45):
-    resolution: {integrity: sha512-2iqOeoSvgq7Um6aL+255a/wXPskj6waLq2oKCa4gOnMORPo15JX7wN6J5bl1SMhMlTlkHXGSrQ9uJPJLPZDl5w==}
+  /focus-trap-vue@4.0.2(focus-trap@7.4.3)(vue@3.3.4):
+    resolution: {integrity: sha512-2iQN2xKCSCzyhcD90VpueQcTIAhaCRxxo67fkz7RSqLmEd16QKjfGslCr3KxvBx0LfpVN9j0IAyKKuJKw3Intg==}
     peerDependencies:
       focus-trap: ^7.0.0
       vue: ^3.0.0
     dependencies:
-      focus-trap: 7.2.0
-      vue: 3.2.45
-    dev: false
+      focus-trap: 7.4.3
+      vue: 3.3.4
+    dev: true
 
-  /focus-trap@7.2.0:
-    resolution: {integrity: sha512-v4wY6HDDYvzkBy4735kW5BUEuw6Yz9ABqMYLuTNbzAFPcBOGiGHwwcNVMvUz4G0kgSYh13wa/7TG3XwTeT4O/A==}
+  /focus-trap@7.4.3:
+    resolution: {integrity: sha512-BgSSbK4GPnS2VbtZ50VtOv1Sti6DIkj3+LkVjiWMNjLeAp1SH1UlLx3ULu/DCu4vq5R4/uvTm+zrvsMsuYmGLg==}
     dependencies:
-      tabbable: 6.1.1
-    dev: false
+      tabbable: 6.1.2
+    dev: true
 
   /follow-redirects@1.15.2(debug@4.3.4):
     resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
@@ -7740,7 +8019,7 @@ packages:
       dezalgo: 1.0.4
       hexoid: 1.0.0
       once: 1.4.0
-      qs: 6.11.0
+      qs: 6.11.2
     dev: false
 
   /fragment-cache@0.2.1:
@@ -7785,7 +8064,7 @@ packages:
     resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
     engines: {node: '>=6 <7 || >=8'}
     dependencies:
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       jsonfile: 4.0.0
       universalify: 0.1.2
 
@@ -7880,7 +8159,6 @@ packages:
   /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==}
@@ -7897,6 +8175,14 @@ packages:
       has: 1.0.3
       has-symbols: 1.0.3
 
+  /get-intrinsic@1.2.1:
+    resolution: {integrity: sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==}
+    dependencies:
+      function-bind: 1.1.1
+      has: 1.0.3
+      has-proto: 1.0.1
+      has-symbols: 1.0.3
+
   /get-package-type@0.1.0:
     resolution: {integrity: sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==}
     engines: {node: '>=8.0.0'}
@@ -8053,9 +8339,20 @@ packages:
       fs.realpath: 1.0.0
       inflight: 1.0.6
       inherits: 2.0.4
-      minimatch: 5.1.2
+      minimatch: 5.1.6
       once: 1.4.0
 
+  /glob@8.1.0:
+    resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      fs.realpath: 1.0.0
+      inflight: 1.0.6
+      inherits: 2.0.4
+      minimatch: 5.1.6
+      once: 1.4.0
+    dev: false
+
   /global-dirs@3.0.1:
     resolution: {integrity: sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==}
     engines: {node: '>=10'}
@@ -8092,6 +8389,13 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       type-fest: 0.20.2
+    dev: true
+
+  /globals@13.20.0:
+    resolution: {integrity: sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==}
+    engines: {node: '>=8'}
+    dependencies:
+      type-fest: 0.20.2
 
   /globby@11.1.0:
     resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
@@ -8167,17 +8471,14 @@ packages:
       responselike: 3.0.0
     dev: false
 
-  /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==}
+  /graphemer@1.4.0:
+    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
 
-  /gsap@3.11.4:
-    resolution: {integrity: sha512-McHhEguHyExMMnjqKA8G+7TvxmlKQGMbjgwAilnFe1e4id7V/tFveRQ2YMZhTYu0oxHGWvbPltdVYQOu3z1SCA==}
+  /gsap@3.11.5:
+    resolution: {integrity: sha512-Q89nKCLgoX5xUjznh9LcaIUkz54k1voNucT1Rpf9SJNFIQznBwFqt5qUUQbeVInFyN/n18OUJkpeI6CNEDt74w==}
     dev: true
 
   /gulp-cli@2.3.0:
@@ -8313,6 +8614,10 @@ packages:
       get-intrinsic: 1.1.3
     dev: true
 
+  /has-proto@1.0.1:
+    resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==}
+    engines: {node: '>= 0.4'}
+
   /has-symbols@1.0.3:
     resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
     engines: {node: '>= 0.4'}
@@ -8437,13 +8742,13 @@ packages:
       readable-stream: 3.6.0
     dev: false
 
-  /htmlparser2@8.0.1:
-    resolution: {integrity: sha512-4lVbmc1diZC7GUJQtRQ5yBAeUCL1exyMwmForWkRLnwyzWBFxN633SALPMGYaWZvKe9j1pRZJpauvmxENSp/EA==}
+  /htmlparser2@8.0.2:
+    resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==}
     dependencies:
       domelementtype: 2.3.0
       domhandler: 5.0.3
-      domutils: 3.0.1
-      entities: 4.4.0
+      domutils: 3.1.0
+      entities: 4.5.0
 
   /http-assert@1.5.0:
     resolution: {integrity: sha512-uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w==}
@@ -8614,10 +8919,8 @@ packages:
     resolution: {integrity: sha512-slx8Q6oywCCSfKgPgL0sEsXtPVnSbTLWpyiDcu6msHOyKOLari1TD1qocXVCft80umnkk3/Qqh3lwoFt8T/BPQ==}
     dev: false
 
-  /idb-keyval@6.2.0:
-    resolution: {integrity: sha512-uw+MIyQn2jl3+hroD7hF8J7PUviBU7BPKWw4f/ISf32D4LoGu98yHjrzWWJDASu9QNrX10tCJqk9YY0ClWm8Ng==}
-    dependencies:
-      safari-14-idb-fix: 3.0.0
+  /idb-keyval@6.2.1:
+    resolution: {integrity: sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg==}
     dev: true
 
   /ieee754@1.1.13:
@@ -8641,8 +8944,8 @@ packages:
     resolution: {integrity: sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==}
     engines: {node: '>= 4'}
 
-  /immutable@4.2.2:
-    resolution: {integrity: sha512-fTMKDwtbvO5tldky9QZ2fMX7slR0mYpY5nbnFWYp0fOzDhHqhgIw9KoYgxLWsoNTS9ZHGauHj18DTyEw6BK3Og==}
+  /immutable@4.3.0:
+    resolution: {integrity: sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==}
     dev: true
 
   /import-fresh@3.3.0:
@@ -8716,8 +9019,8 @@ packages:
     resolution: {integrity: sha512-/nPtyeX9xPUvxZf+r0518B7uqNKlP+LqNJqSiXFEaa2T71rWIwTVXGH7hB9xO/EVdwa5/pWlFCPwShOW81XIxQ==}
     dev: true
 
-  /install-artifact-from-github@1.3.2:
-    resolution: {integrity: sha512-yCFcLvqk0yQdxx0uJz4t9Z3adDMLAYrcGYv546uRXCSvxE+GqNYhhz/KmrGcUKGI/gVLR9n/e/zM9jX/+ASMJQ==}
+  /install-artifact-from-github@1.3.3:
+    resolution: {integrity: sha512-x79SL0d8WOi1ZjXSTUqqs0GPQZ92YArJAN9O46wgU9wdH2U9ecyyhB9YGDbPe2OLV4ptmt6AZYRQZ2GydQZosQ==}
     hasBin: true
     dev: false
 
@@ -8867,6 +9170,12 @@ packages:
     dependencies:
       has: 1.0.3
 
+  /is-core-module@2.12.1:
+    resolution: {integrity: sha512-Q4ZuBAe2FUsKtyQJoQHlvP8OvBERxO3jEmy1I7hcRXcJBGGHFh/aJBswbXuS9sgrDH2QUO8ilkwNPHvHMd8clg==}
+    dependencies:
+      has: 1.0.3
+    dev: true
+
   /is-data-descriptor@0.1.4:
     resolution: {integrity: sha512-+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg==}
     engines: {node: '>=0.10.0'}
@@ -9184,8 +9493,8 @@ packages:
     resolution: {integrity: sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==}
     engines: {node: '>=8'}
     dependencies:
-      '@babel/core': 7.21.4
-      '@babel/parser': 7.20.7
+      '@babel/core': 7.22.1
+      '@babel/parser': 7.22.4
       '@istanbuljs/schema': 0.1.3
       istanbul-lib-coverage: 3.2.0
       semver: 6.3.0
@@ -9255,7 +9564,7 @@ packages:
       '@jest/environment': 27.5.1
       '@jest/test-result': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 18.11.18
+      '@types/node': 17.0.5
       chalk: 4.1.2
       co: 4.6.0
       dedent: 0.7.0
@@ -9381,7 +9690,7 @@ packages:
       '@jest/environment': 27.5.1
       '@jest/fake-timers': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 18.11.18
+      '@types/node': 17.0.5
       jest-mock: 27.5.1
       jest-util: 27.5.1
       jsdom: 16.7.0
@@ -9399,7 +9708,7 @@ packages:
       '@jest/environment': 27.5.1
       '@jest/fake-timers': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 18.11.18
+      '@types/node': 17.0.5
       jest-mock: 27.5.1
       jest-util: 27.5.1
     dev: true
@@ -9424,7 +9733,7 @@ packages:
     dependencies:
       '@jest/types': 27.5.1
       '@types/graceful-fs': 4.1.6
-      '@types/node': 18.11.18
+      '@types/node': 17.0.5
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.11
@@ -9446,7 +9755,7 @@ packages:
       '@jest/source-map': 27.5.1
       '@jest/test-result': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 18.11.18
+      '@types/node': 17.0.5
       chalk: 4.1.2
       co: 4.6.0
       expect: 27.5.1
@@ -9501,7 +9810,7 @@ packages:
     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
+      '@types/node': 17.0.5
     dev: true
 
   /jest-pnp-resolver@1.2.3(jest-resolve@27.5.1):
@@ -9557,7 +9866,7 @@ packages:
       '@jest/test-result': 27.5.1
       '@jest/transform': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 18.11.18
+      '@types/node': 17.0.5
       chalk: 4.1.2
       emittery: 0.8.1
       graceful-fs: 4.2.11
@@ -9614,7 +9923,7 @@ packages:
     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
+      '@types/node': 17.0.5
       graceful-fs: 4.2.11
     dev: true
 
@@ -9626,7 +9935,7 @@ packages:
       '@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
+      '@babel/types': 7.22.4
       '@jest/transform': 27.5.1
       '@jest/types': 27.5.1
       '@types/babel__traverse': 7.18.3
@@ -9653,7 +9962,7 @@ packages:
     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
+      '@types/node': 17.0.5
       chalk: 4.1.2
       ci-info: 3.7.1
       graceful-fs: 4.2.11
@@ -9678,7 +9987,7 @@ packages:
     dependencies:
       '@jest/test-result': 27.5.1
       '@jest/types': 27.5.1
-      '@types/node': 18.11.18
+      '@types/node': 17.0.5
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       jest-util: 27.5.1
@@ -9698,7 +10007,7 @@ packages:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
     engines: {node: '>= 10.13.0'}
     dependencies:
-      '@types/node': 18.11.18
+      '@types/node': 17.0.5
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
@@ -9770,9 +10079,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: false
 
-  /js-sdsl@4.2.0:
-    resolution: {integrity: sha512-dyBIzQBDkCqCu+0upx25Y2jGdbTGxE9fshMsCdK0ViOongpV+n5tXRcZY9v7CaVQ79AGS9KA1KHtojxiM7aXSQ==}
-
   /js-string-escape@1.0.1:
     resolution: {integrity: sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==}
     engines: {node: '>= 0.8'}
@@ -9828,7 +10134,7 @@ packages:
         optional: true
     dependencies:
       abab: 2.0.6
-      acorn: 8.8.1
+      acorn: 8.8.2
       acorn-globals: 6.0.0
       cssom: 0.4.4
       cssstyle: 2.3.0
@@ -9893,7 +10199,7 @@ packages:
       whatwg-encoding: 2.0.0
       whatwg-mimetype: 3.0.0
       whatwg-url: 11.0.0
-      ws: 8.11.0
+      ws: 8.13.0
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - bufferutil
@@ -9929,7 +10235,7 @@ packages:
   /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.85.1):
     resolution: {integrity: sha512-c9viNZlZTz0MTIcf/4qvek5Dz1/PU3DNCB4PwUhlEZIV3qb1bSD6vQQymlV17/Wm6ncra1aCvmIPsuRj+KfEEg==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
@@ -9938,14 +10244,13 @@ packages:
       json5: 2.2.3
       loader-utils: 2.0.4
       schema-utils: 3.1.1
-      webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
+      webpack: 5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3)
     dev: true
 
   /json5@2.2.3:
     resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
     engines: {node: '>=6'}
     hasBin: true
-    dev: true
 
   /jsonfile@4.0.0:
     resolution: {integrity: sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==}
@@ -9967,14 +10272,14 @@ packages:
       graceful-fs: 4.2.11
     dev: true
 
-  /jsonld@6.0.0:
-    resolution: {integrity: sha512-1SkN2RXhMCTCSkX+bzHvr9ycM2HTmjWyV41hn2xG7k6BqlCgRjw0zHmuqfphjBRPqi1gKMIqgBCe/0RZMcWrAA==}
+  /jsonld@8.2.0:
+    resolution: {integrity: sha512-qHUa9pn3/cdAZw26HY1Jmy9+sHOxaLrveTRWUcrSDx5apTa20bBTe+X4nzI7dlqc+M5GkwQW6RgRdqO6LF5nkw==}
     engines: {node: '>=14'}
     dependencies:
-      '@digitalbazaar/http-client': 3.2.0
+      '@digitalbazaar/http-client': 3.4.1
       canonicalize: 1.0.8
       lru-cache: 6.0.0
-      rdf-canonize: 3.3.0
+      rdf-canonize: 3.4.0
     transitivePeerDependencies:
       - web-streams-polyfill
     dev: false
@@ -10028,8 +10333,8 @@ packages:
       safe-buffer: 5.2.1
     dev: false
 
-  /katex@0.16.4:
-    resolution: {integrity: sha512-WudRKUj8yyBeVDI4aYMNxhx5Vhh2PjpzQw1GRu/LVGqL4m1AxwD1GcUp0IMbdJaf5zsjtj8ghP0DOQRYhroNkw==}
+  /katex@0.16.7:
+    resolution: {integrity: sha512-Xk9C6oGKRwJTfqfIbtr0Kes9OSv6IFsuhFGc7tW4urlpMJtuh+7YhzU6YEG9n8gmWKcMAFzkp7nr+r69kV0zrA==}
     hasBin: true
     dependencies:
       commander: 8.3.0
@@ -10287,24 +10592,24 @@ packages:
       - supports-color
     dev: false
 
-  /ky-universal@0.10.1(ky@0.30.0):
-    resolution: {integrity: sha512-r8909k+ELKZAxhVA5c440x22hqw5XcMRwLRbgpPQk4JHy3/ddJnvzcnSo5Ww3HdKdNeS3Y8dBgcIYyVahMa46g==}
-    engines: {node: '>=14'}
+  /ky-universal@0.11.0(ky@0.33.3):
+    resolution: {integrity: sha512-65KyweaWvk+uKKkCrfAf+xqN2/epw1IJDtlyCPxYffFCMR8u1sp2U65NtWpnozYfZxQ6IUzIlvUcw+hQ82U2Xw==}
+    engines: {node: '>=14.16'}
     peerDependencies:
-      ky: '>=0.26.0'
-      web-streams-polyfill: '>=3.0.1'
+      ky: '>=0.31.4'
+      web-streams-polyfill: '>=3.2.1'
     peerDependenciesMeta:
       web-streams-polyfill:
         optional: true
     dependencies:
       abort-controller: 3.0.0
-      ky: 0.30.0
-      node-fetch: 3.3.0
+      ky: 0.33.3
+      node-fetch: 3.3.1
     dev: false
 
-  /ky@0.30.0:
-    resolution: {integrity: sha512-X/u76z4JtDVq10u1JA5UQfatPxgPaVDMYTrgHyiTpGN2z4TMEJkIHsoSBBSg9SWZEIXTKsi9kHgiQ9o3Y/4yog==}
-    engines: {node: '>=12'}
+  /ky@0.33.3:
+    resolution: {integrity: sha512-CasD9OCEQSFIam2U8efFK81Yeg8vNMTBUqtMOHlrcWQHqUX3HeCl9Dr31u4toV7emlH8Mymk5+9p0lL6mKb/Xw==}
+    engines: {node: '>=14.16'}
     dev: false
 
   /last-run@1.1.1:
@@ -10580,7 +10885,6 @@ packages:
     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==}
@@ -10588,8 +10892,8 @@ packages:
     dependencies:
       yallist: 4.0.0
 
-  /lru-cache@7.14.1:
-    resolution: {integrity: sha512-ysxwsnTKdAx96aTRdhDOCQfDgbHnt8SK0KY8SEjO0wHinhWOFTESbjVCMPbU1uGXg/ch4lifqx0wfjOawU2+WA==}
+  /lru-cache@7.18.3:
+    resolution: {integrity: sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==}
     engines: {node: '>=12'}
     dev: false
 
@@ -10598,10 +10902,12 @@ packages:
     engines: {node: '>=12'}
     dev: false
 
-  /magic-string@0.25.9:
-    resolution: {integrity: sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==}
+  /magic-string@0.30.0:
+    resolution: {integrity: sha512-LA+31JYDJLs82r2ScLrlz1GjSgu66ZV518eyWT+S8VhyQn/JL0u9MeBOvQMGYiPk1DBiSN9DDMOcXvigJZaViQ==}
+    engines: {node: '>=12'}
     dependencies:
-      sourcemap-codec: 1.4.8
+      '@jridgewell/sourcemap-codec': 1.4.15
+    dev: true
 
   /mailcheck@1.1.1:
     resolution: {integrity: sha512-3WjL8+ZDouZwKlyJBMp/4LeziLFXgleOdsYu87piGcMLqhBzCsy2QFdbtAwv757TFC/rtqd738fgJw1tFQCSgA==}
@@ -10620,13 +10926,13 @@ packages:
     resolution: {integrity: sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==}
     engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0}
     dependencies:
-      agentkeepalive: 4.2.1
+      agentkeepalive: 4.3.0
       cacache: 16.1.3
       http-cache-semantics: 4.1.1
       http-proxy-agent: 5.0.0
       https-proxy-agent: 5.0.1
       is-lambda: 1.0.1
-      lru-cache: 7.14.1
+      lru-cache: 7.18.3
       minipass: 3.3.6
       minipass-collect: 1.0.2
       minipass-fetch: 2.1.2
@@ -10726,8 +11032,8 @@ packages:
     engines: {node: '>= 0.6'}
     dev: false
 
-  /meilisearch@0.32.4:
-    resolution: {integrity: sha512-QvPtQ6F2TaqAT9fw072/MDjSCMpQifdtUBFeIk3M5jSnFpeSiv1iwfJWNfP6ByaCgR/s++K1Cqtf9vjcZe7prg==}
+  /meilisearch@0.33.0:
+    resolution: {integrity: sha512-bYPb9WyITnJfzf92e7QFK8Rc50DmshFWxypXCs3ILlpNh8pT15A7KSu9Xgnnk/K3G/4vb3wkxxtFS4sxNkWB8w==}
     dependencies:
       cross-fetch: 3.1.6
     transitivePeerDependencies:
@@ -10867,6 +11173,13 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       brace-expansion: 2.0.1
+    dev: false
+
+  /minimatch@5.1.6:
+    resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
+    engines: {node: '>=10'}
+    dependencies:
+      brace-expansion: 2.0.1
 
   /minimist-options@4.1.0:
     resolution: {integrity: sha512-Q4r8ghd80yhO/0j1O3B2BjweX3fiHg9cdOwjJd2J76Q135c+NDxGCqdYKQ1SKBuFfgWbAUzBfvYjPUEeNgqN1A==}
@@ -10879,6 +11192,10 @@ packages:
 
   /minimist@1.2.7:
     resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
+    dev: true
+
+  /minimist@1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
   /minipass-collect@1.0.2:
     resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==}
@@ -10941,6 +11258,11 @@ packages:
       yallist: 4.0.0
     dev: false
 
+  /minipass@5.0.0:
+    resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
+    engines: {node: '>=8'}
+    dev: false
+
   /minizlib@1.3.3:
     resolution: {integrity: sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==}
     dependencies:
@@ -10979,7 +11301,7 @@ packages:
     resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
     hasBin: true
     dependencies:
-      minimist: 1.2.7
+      minimist: 1.2.8
 
   /mkdirp@1.0.4:
     resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
@@ -10987,6 +11309,12 @@ packages:
     hasBin: true
     dev: false
 
+  /mkdirp@2.1.6:
+    resolution: {integrity: sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dev: false
+
   /mocha@10.2.0:
     resolution: {integrity: sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==}
     engines: {node: '>= 14.0.0'}
@@ -11190,17 +11518,21 @@ packages:
   /next-tick@1.1.0:
     resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
 
-  /node-abi@3.31.0:
-    resolution: {integrity: sha512-eSKV6s+APenqVh8ubJyiu/YhZgxQpGP66ntzUb3lY1xB9ukSRaGnx0AIxI+IM+1+IVYC1oWobgG5L3Lt9ARykQ==}
+  /node-abi@3.43.0:
+    resolution: {integrity: sha512-QB0MMv+tn9Ur2DtJrc8y09n0n6sw88CyDniWSX2cHW10goQXYPK9ZpFJOktDS4ron501edPX6h9i7Pg+RnH5nQ==}
     engines: {node: '>=10'}
     dependencies:
-      semver: 7.3.8
+      semver: 7.5.1
     dev: false
 
   /node-addon-api@5.0.0:
     resolution: {integrity: sha512-CvkDw2OEnme7ybCykJpVcKH+uAOLV2qLqiyla128dN9TkEWfrYmxG6C2boDe5KcNQqZF3orkqzGgOMvZ/JNekA==}
     dev: false
 
+  /node-addon-api@6.1.0:
+    resolution: {integrity: sha512-+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==}
+    dev: false
+
   /node-bitmap@0.0.1:
     resolution: {integrity: sha512-Jx5lPaaLdIaOsj2mVLWMWulXF6GQVdyLvNSxmiYCvZ8Ma2hfKX0POoR2kgKOqz+oFsRreq0yYZjQ2wjE9VNzCA==}
     engines: {node: '>=v0.6.5'}
@@ -11234,20 +11566,8 @@ packages:
       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}
-    peerDependencies:
-      encoding: ^0.1.0
-    peerDependenciesMeta:
-      encoding:
-        optional: true
-    dependencies:
-      whatwg-url: 5.0.0
-    dev: false
-
-  /node-fetch@3.3.0:
-    resolution: {integrity: sha512-BKwRP/O0UvoMKp7GNdwPlObhYGB5DQqwhEDQlNKuoqwVYSxkSZCSbHjnFFmUEtwSKRPU4kNK8PbDYYitwaE3QA==}
+  /node-fetch@3.3.1:
+    resolution: {integrity: sha512-cRVc/kyto/7E5shrWca1Wsea4y6tL9iYJE5FBCius3JQfb/4P4I295PfhgbJQBLTx6lATE4z+wK0rPM4VS2uow==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dependencies:
       data-uri-to-buffer: 4.0.1
@@ -11277,8 +11597,8 @@ packages:
       nopt: 6.0.0
       npmlog: 6.0.2
       rimraf: 3.0.2
-      semver: 7.3.8
-      tar: 6.1.13
+      semver: 7.5.1
+      tar: 6.1.15
       which: 2.0.2
     transitivePeerDependencies:
       - bluebird
@@ -11289,12 +11609,11 @@ packages:
     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
+  /node-releases@2.0.12:
+    resolution: {integrity: sha512-QzsYKWhXTWx8h1kIvqfnC++o0pEmpRQA/aenALsL2F4pqNVr7YzcdMlDij5WBnwftRbJCNJL/O7zdKaxKPHqgQ==}
 
-  /nodemailer@6.8.0:
-    resolution: {integrity: sha512-EjYvSmHzekz6VNkNd12aUqAco+bOkRe3Of5jVhltqKhEsjw/y0PYPJfp83+s9Wzh1dspYAkUW/YNQ350NATbSQ==}
+  /nodemailer@6.9.3:
+    resolution: {integrity: sha512-fy9v3NgTzBngrMFkDsKEj0r02U7jm6XfC3b52eoNV+GCrGj+s8pt5OqhiJdWKuw51zCTdiNR/IUD1z33LIIGpg==}
     engines: {node: '>=6.0.0'}
     dev: false
 
@@ -11919,8 +12238,14 @@ packages:
   /performance-now@2.1.0:
     resolution: {integrity: sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==}
 
-  /pg-connection-string@2.5.0:
-    resolution: {integrity: sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ==}
+  /pg-cloudflare@1.1.0:
+    resolution: {integrity: sha512-tGM8/s6frwuAIyRcJ6nWcIvd3+3NmUKIs6OjviIm1HPPFEt5MzQDOTBQyhPWg/m0kCl95M6gA1JaIXtS8KovOA==}
+    requiresBuild: true
+    dev: false
+    optional: true
+
+  /pg-connection-string@2.6.0:
+    resolution: {integrity: sha512-x14ibktcwlHKoHxx9X3uTVW9zIGR41ZB6QNhHb21OPNdCCO3NaRnpJuwKIQSR4u+Yqjx4HCvy7Hh7VSy1U4dGg==}
     dev: false
 
   /pg-int8@1.0.1:
@@ -11928,16 +12253,16 @@ packages:
     engines: {node: '>=4.0.0'}
     dev: false
 
-  /pg-pool@3.5.2(pg@8.8.0):
-    resolution: {integrity: sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==}
+  /pg-pool@3.6.0(pg@8.11.0):
+    resolution: {integrity: sha512-clFRf2ksqd+F497kWFyM21tMjeikn60oGDmqMT8UBrynEwVEX/5R5xd2sdvdo1cZCFlguORNpVuqxIj+aK4cfQ==}
     peerDependencies:
       pg: '>=8.0'
     dependencies:
-      pg: 8.8.0
+      pg: 8.11.0
     dev: false
 
-  /pg-protocol@1.5.0:
-    resolution: {integrity: sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ==}
+  /pg-protocol@1.6.0:
+    resolution: {integrity: sha512-M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q==}
     dev: false
 
   /pg-types@2.2.0:
@@ -11951,8 +12276,8 @@ packages:
       postgres-interval: 1.2.0
     dev: false
 
-  /pg@8.8.0:
-    resolution: {integrity: sha512-UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw==}
+  /pg@8.11.0:
+    resolution: {integrity: sha512-meLUVPn2TWgJyLmy7el3fQQVwft4gU5NGyvV0XbD41iU9Jbg8lCH4zexhIkihDzVHJStlt6r088G6/fWeNjhXA==}
     engines: {node: '>= 8.0.0'}
     peerDependencies:
       pg-native: '>=3.0.1'
@@ -11962,21 +12287,23 @@ packages:
     dependencies:
       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-protocol: 1.5.0
+      pg-connection-string: 2.6.0
+      pg-pool: 3.6.0(pg@8.11.0)
+      pg-protocol: 1.6.0
       pg-types: 2.2.0
       pgpass: 1.0.5
+    optionalDependencies:
+      pg-cloudflare: 1.1.0
     dev: false
 
   /pgpass@1.0.5:
     resolution: {integrity: sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==}
     dependencies:
-      split2: 4.1.0
+      split2: 4.2.0
     dev: false
 
-  /photoswipe@5.3.4:
-    resolution: {integrity: sha512-SN+RWHqxJvdwzXJsh8KrG+ajjPpdTX5HpKglEd0k9o6o5fW+QHPkW8//Bo11MB+NQwTa/hFw8BDv2EdxiDXjNw==}
+  /photoswipe@5.3.7:
+    resolution: {integrity: sha512-zsyLsTTLFrj0XR1m4/hO7qNooboFKUrDy+Zt5i2d6qjFPAtBjzaj/Xtydso4uxzcXpcqbTmyxDibb3BcSISseg==}
     engines: {node: '>= 0.12.0'}
     dev: true
 
@@ -12294,14 +12621,6 @@ packages:
       supports-color: 3.2.3
     dev: true
 
-  /postcss@8.4.21:
-    resolution: {integrity: sha512-tP7u/Sn/dVxK2NnruI4H9BG+x+Wxz6oeZ1cJ8P6G/PZY0IKk4k/63TDsQf2kQq3+qoJeLm2kIBUNlZe3zgb4Zg==}
-    engines: {node: ^10 || ^12 || >=14}
-    dependencies:
-      nanoid: 3.3.6
-      picocolors: 1.0.0
-      source-map-js: 1.0.2
-
   /postcss@8.4.24:
     resolution: {integrity: sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==}
     engines: {node: ^10 || ^12 || >=14}
@@ -12309,7 +12628,6 @@ packages:
       nanoid: 3.3.6
       picocolors: 1.0.0
       source-map-js: 1.0.2
-    dev: true
 
   /postgres-array@2.0.0:
     resolution: {integrity: sha512-VpZrUqU5A69eQyW2c5CA1jtLecCsN2U/bD6VilrFDWq5+5UIEVO7nazS3TEcHf1zuPYO/sqGvUvW62g86RXZuA==}
@@ -12341,10 +12659,10 @@ packages:
       detect-libc: 2.0.1
       expand-template: 2.0.3
       github-from-package: 0.0.0
-      minimist: 1.2.7
+      minimist: 1.2.8
       mkdirp-classic: 0.5.3
       napi-build-utils: 1.0.2
-      node-abi: 3.31.0
+      node-abi: 3.43.0
       pump: 3.0.0
       rc: 1.2.8
       simple-get: 4.0.1
@@ -12368,11 +12686,11 @@ packages:
   /prettier-plugin-vue@1.1.6:
     resolution: {integrity: sha512-trQ/oY+6hSsGe2zPIFThXMIM0TbxMEbk2VOrKjwHWuSz7OEo0rnumbz9a47OxVPCaAnGY9vZG8qDTiTmk9bq0A==}
     dependencies:
-      prettier: 2.8.7
+      prettier: 2.8.8
     dev: true
 
-  /prettier@2.8.7:
-    resolution: {integrity: sha512-yPngTo3aXUUmyuTjeTUT75txrf+aMh9FiD7q9ZE/i6r0bPb22g4FsE6Y338PQX1bmfy08i9QQCB7/rcUAVntfw==}
+  /prettier@2.8.8:
+    resolution: {integrity: sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==}
     engines: {node: '>=10.13.0'}
     hasBin: true
     dev: true
@@ -12621,9 +12939,10 @@ packages:
   /punycode@2.1.1:
     resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}
     engines: {node: '>=6'}
+    dev: true
 
-  /punycode@2.2.0:
-    resolution: {integrity: sha512-LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw==}
+  /punycode@2.3.0:
+    resolution: {integrity: sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==}
     engines: {node: '>=6'}
 
   /pureimage@0.3.15:
@@ -12645,12 +12964,12 @@ packages:
     engines: {node: '>=0.6.0', teleport: '>=0.2.0'}
     dev: true
 
-  /qrcode@1.5.1:
-    resolution: {integrity: sha512-nS8NJ1Z3md8uTjKtP+SGGhfqmTCs5flU/xR623oI0JX+Wepz9R8UrRVCTBTJm3qGw3rH6jJ6MUHjkDx15cxSSg==}
+  /qrcode@1.5.3:
+    resolution: {integrity: sha512-puyri6ApkEHYiVl4CFzo1tDkAZ+ATcnbJrJ6RiBM1Fhctdn/ix9MTE3hRph33omisEbC/2fcfemsseiKgBPKZg==}
     engines: {node: '>=10.13.0'}
     hasBin: true
     dependencies:
-      dijkstrajs: 1.0.2
+      dijkstrajs: 1.0.3
       encode-utf8: 1.0.3
       pngjs: 5.0.0
       yargs: 15.4.1
@@ -12663,8 +12982,8 @@ packages:
       side-channel: 1.0.4
     dev: true
 
-  /qs@6.11.0:
-    resolution: {integrity: sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==}
+  /qs@6.11.2:
+    resolution: {integrity: sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==}
     engines: {node: '>=0.6'}
     dependencies:
       side-channel: 1.0.4
@@ -12675,11 +12994,6 @@ 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'}
@@ -12759,22 +13073,22 @@ packages:
     dependencies:
       deep-extend: 0.6.0
       ini: 1.3.8
-      minimist: 1.2.7
+      minimist: 1.2.8
       strip-json-comments: 2.0.1
     dev: false
 
-  /rdf-canonize@3.3.0:
-    resolution: {integrity: sha512-gfSNkMua/VWC1eYbSkVaL/9LQhFeOh0QULwv7Or0f+po8pMgQ1blYQFe1r9Mv2GJZXw88Cz/drnAnB9UlNnHfQ==}
+  /rdf-canonize@3.4.0:
+    resolution: {integrity: sha512-fUeWjrkOO0t1rg7B2fdyDTvngj+9RlUyL92vOdiB7c0FPguWVsniIMjEtHH+meLBO9rzkUlUzBVXgWrjI8P9LA==}
     engines: {node: '>=12'}
     dependencies:
       setimmediate: 1.0.5
     dev: false
 
-  /re2@1.18.0:
-    resolution: {integrity: sha512-MoCYZlJ9YUgksND9asyNF2/x532daXU/ARp1UeJbQ5flMY6ryKNEhrWt85aw3YluzOJlC3vXpGgK2a1jb0b4GA==}
+  /re2@1.19.0:
+    resolution: {integrity: sha512-y0LcLZgBF3L7mDtNfbghb7dCmChYQO2QsUGklNueAJUH+HAZO8UZUubgNsf6OxRTAQpeE4KMPR7vcpK3+Q+GiA==}
     requiresBuild: true
     dependencies:
-      install-artifact-from-github: 1.3.2
+      install-artifact-from-github: 1.3.3
       nan: 2.17.0
       node-gyp: 9.3.1
     transitivePeerDependencies:
@@ -12850,6 +13164,15 @@ packages:
       string_decoder: 1.3.0
       util-deprecate: 1.0.2
 
+  /readable-stream@3.6.2:
+    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
+    engines: {node: '>= 6'}
+    dependencies:
+      inherits: 2.0.4
+      string_decoder: 1.3.0
+      util-deprecate: 1.0.2
+    dev: false
+
   /readable-web-to-node-stream@3.0.2:
     resolution: {integrity: sha512-ePeK6cc1EcKLEhJFt/AebMCLL+GgSKhuygrZ/GLaKZYEecIgIECf4UaUuaByiGtzckwR4ain9VzUh95T1exYGw==}
     engines: {node: '>=8'}
@@ -12879,7 +13202,7 @@ packages:
     resolution: {integrity: sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==}
     engines: {node: '>= 10.13.0'}
     dependencies:
-      resolve: 1.22.1
+      resolve: 1.22.2
     dev: true
 
   /reconnecting-websocket@4.4.0:
@@ -12904,9 +13227,9 @@ packages:
       lodash: 4.17.21
     dev: false
 
-  /redis-lock@0.1.4:
-    resolution: {integrity: sha512-7/+zu86XVQfJVx1nHTzux5reglDiyUCDwmW7TSlvVezfhH2YLc/Rc8NE0ejQG+8/0lwKzm29/u/4+ogKeLosiA==}
-    engines: {node: '>=0.6'}
+  /redis-lock@1.0.0:
+    resolution: {integrity: sha512-zfI+Il36jXwRT/W8SBsG132Bc2yp3tMuf3KTGjSzXimadI17NEGBvb/KrDkCuAC2hzVxW5uR5ns/rxuqiWeV3Q==}
+    engines: {node: '>=12'}
     dev: false
 
   /redis-parser@3.0.0:
@@ -12915,15 +13238,15 @@ packages:
     dependencies:
       redis-errors: 1.2.0
 
-  /redis@4.5.1:
-    resolution: {integrity: sha512-oxXSoIqMJCQVBTfxP6BNTCtDMyh9G6Vi5wjdPdV/sRKkufyZslDqCScSGcOr6XGR/reAWZefz7E4leM31RgdBA==}
+  /redis@4.6.7:
+    resolution: {integrity: sha512-KrkuNJNpCwRm5vFJh0tteMxW8SaUzkm5fBH7eL5hd/D0fAkzvapxbfGPP/r+4JAXdQuX7nebsBkBqA2RHB7Usw==}
     dependencies:
-      '@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/bloom': 1.2.0(@redis/client@1.5.8)
+      '@redis/client': 1.5.8
+      '@redis/graph': 1.1.0(@redis/client@1.5.8)
+      '@redis/json': 1.0.4(@redis/client@1.5.8)
+      '@redis/search': 1.1.3(@redis/client@1.5.8)
+      '@redis/time-series': 1.0.4(@redis/client@1.5.8)
     dev: true
 
   /reduce-css-calc@1.3.0:
@@ -12958,6 +13281,7 @@ packages:
   /regexpp@3.2.0:
     resolution: {integrity: sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==}
     engines: {node: '>=8'}
+    dev: true
 
   /remove-bom-buffer@3.0.0:
     resolution: {integrity: sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==}
@@ -13149,6 +13473,15 @@ packages:
       path-parse: 1.0.7
       supports-preserve-symlinks-flag: 1.0.0
 
+  /resolve@1.22.2:
+    resolution: {integrity: sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==}
+    hasBin: true
+    dependencies:
+      is-core-module: 2.12.1
+      path-parse: 1.0.7
+      supports-preserve-symlinks-flag: 1.0.0
+    dev: true
+
   /responselike@2.0.1:
     resolution: {integrity: sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==}
     dependencies:
@@ -13207,16 +13540,8 @@ packages:
       rangestr: 0.0.1
       seedrandom: 2.4.2
 
-  /rollup@3.23.0:
-    resolution: {integrity: sha512-h31UlwEi7FHihLe1zbk+3Q7z1k/84rb9BSwmBSr/XjOCEaBJ2YyedQDuM0t/kfOS0IxM+vk1/zI9XxYj9V+NJQ==}
-    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
-    hasBin: true
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: true
-
-  /rollup@3.9.1:
-    resolution: {integrity: sha512-GswCYHXftN8ZKGVgQhTFUJB/NBXxrRGgO2NCy6E8s1rwEJ4Q9/VttNqcYfEvx4dTo4j58YqdC3OVztPzlKSX8w==}
+  /rollup@3.23.1:
+    resolution: {integrity: sha512-ybRdFVHOoljGEFILHLd2g/qateqUdjE6YS41WXq4p3C/WwD3xtWxV4FYWETA1u9TeXQc5K8L8zHE5d/scOvrOQ==}
     engines: {node: '>=14.18.0', npm: '>=8.0.0'}
     hasBin: true
     optionalDependencies:
@@ -13237,11 +13562,11 @@ packages:
       '@rometools/cli-win32-x64': 11.0.0
     dev: true
 
-  /rss-parser@3.12.0:
-    resolution: {integrity: sha512-aqD3E8iavcCdkhVxNDIdg1nkBI17jgqF+9OqPS1orwNaOgySdpvq6B+DoONLhzjzwV8mWg37sb60e4bmLK117A==}
+  /rss-parser@3.13.0:
+    resolution: {integrity: sha512-7jWUBV5yGN3rqMMj7CZufl/291QAhvrrGpDNE4k/02ZchL0npisiYYqULF71jCEKoIiHvK/Q2e6IkDwPziT7+w==}
     dependencies:
       entities: 2.2.0
-      xml2js: 0.4.23
+      xml2js: 0.5.0
     dev: false
 
   /run-parallel@1.2.0:
@@ -13259,10 +13584,6 @@ packages:
     resolution: {integrity: sha512-aSN2TlF39WLoZA/6cgYSJZhKt63kJ4EaadejPWjWY9/h4rksIqvfWY3gfd+3uAegSM1IXsA9aWeEhJtkxkFQtA==}
     dev: true
 
-  /safari-14-idb-fix@3.0.0:
-    resolution: {integrity: sha512-eBNFLob4PMq8JA1dGyFn6G97q3/WzNtFK4RnzT1fnLq+9RyrGknzYiM/9B12MnKAxuj1IXr7UKYtTNtjyKMBog==}
-    dev: true
-
   /safe-buffer@5.1.2:
     resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
 
@@ -13278,24 +13599,24 @@ packages:
   /safer-buffer@2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
-  /sanitize-html@2.8.1:
-    resolution: {integrity: sha512-qK5neD0SaMxGwVv5txOYv05huC3o6ZAA4h5+7nJJgWMNFUNRjcjLO6FpwAtKzfKCZ0jrG6xTk6eVFskbvOGblg==}
+  /sanitize-html@2.10.0:
+    resolution: {integrity: sha512-JqdovUd81dG4k87vZt6uA6YhDfWkUGruUu/aPmXLxXi45gZExnt9Bnw/qeQU8oGf82vPyaE0vO4aH0PbobB9JQ==}
     dependencies:
-      deepmerge: 4.2.2
+      deepmerge: 4.3.1
       escape-string-regexp: 4.0.0
-      htmlparser2: 8.0.1
+      htmlparser2: 8.0.2
       is-plain-object: 5.0.0
       parse-srcset: 1.0.2
-      postcss: 8.4.21
+      postcss: 8.4.24
     dev: false
 
-  /sass@1.57.1:
-    resolution: {integrity: sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==}
-    engines: {node: '>=12.0.0'}
+  /sass@1.62.1:
+    resolution: {integrity: sha512-NHpxIzN29MXvWiuswfc1W3I0N8SXBd8UR26WntmDlRYf0bSADnwnOjsyMZ3lMezSlArD33Vs3YFhp7dWvL770A==}
+    engines: {node: '>=14.0.0'}
     hasBin: true
     dependencies:
       chokidar: 3.5.3
-      immutable: 4.2.2
+      immutable: 4.3.0
       source-map-js: 1.0.2
     dev: true
 
@@ -13329,6 +13650,15 @@ packages:
       ajv-keywords: 3.5.2(ajv@6.12.6)
     dev: true
 
+  /schema-utils@3.1.2:
+    resolution: {integrity: sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==}
+    engines: {node: '>= 10.13.0'}
+    dependencies:
+      '@types/json-schema': 7.0.12
+      ajv: 6.12.6
+      ajv-keywords: 3.5.2(ajv@6.12.6)
+    dev: true
+
   /secure-json-parse@2.7.0:
     resolution: {integrity: sha512-6aU+Rwsezw7VR8/nyvKTx8QpWH9FrcYiXXlqC4z5d5XQBDRqtbfsRjnwGyqbi3gddNtWHuEk9OANUotL26qKUw==}
     dev: false
@@ -13373,6 +13703,13 @@ packages:
     dependencies:
       lru-cache: 6.0.0
 
+  /semver@7.5.1:
+    resolution: {integrity: sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      lru-cache: 6.0.0
+
   /serialize-error@7.0.1:
     resolution: {integrity: sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==}
     engines: {node: '>=10'}
@@ -13386,6 +13723,12 @@ packages:
       randombytes: 2.1.0
     dev: true
 
+  /serialize-javascript@6.0.1:
+    resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==}
+    dependencies:
+      randombytes: 2.1.0
+    dev: true
+
   /set-blocking@2.0.0:
     resolution: {integrity: sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==}
 
@@ -13431,16 +13774,16 @@ packages:
       kind-of: 6.0.3
     dev: true
 
-  /sharp@0.31.3:
-    resolution: {integrity: sha512-XcR4+FCLBFKw1bdB+GEhnUNXNXvnt0tDo4WsBsraKymuo/IAuPuCBVAL2wIkUw2r/dwFW5Q5+g66Kwl2dgDFVg==}
+  /sharp@0.32.1:
+    resolution: {integrity: sha512-kQTFtj7ldpUqSe8kDxoGLZc1rnMFU0AO2pqbX6pLy3b7Oj8ivJIdoKNwxHVQG2HN6XpHPJqCSM2nsma2gOXvOg==}
     engines: {node: '>=14.15.0'}
     requiresBuild: true
     dependencies:
       color: 4.2.3
       detect-libc: 2.0.1
-      node-addon-api: 5.0.0
+      node-addon-api: 6.1.0
       prebuild-install: 7.1.1
-      semver: 7.3.8
+      semver: 7.5.1
       simple-get: 4.0.1
       tar-fs: 2.1.1
       tunnel-agent: 0.6.0
@@ -13472,7 +13815,7 @@ packages:
     resolution: {integrity: sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==}
     dependencies:
       call-bind: 1.0.2
-      get-intrinsic: 1.1.3
+      get-intrinsic: 1.2.1
       object-inspect: 1.12.3
 
   /sigmund@1.0.1:
@@ -13664,10 +14007,6 @@ packages:
     engines: {node: '>= 8'}
     dev: true
 
-  /sourcemap-codec@1.4.8:
-    resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
-    deprecated: Please use @jridgewell/sourcemap-codec instead
-
   /sparkles@1.0.1:
     resolution: {integrity: sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==}
     engines: {node: '>= 0.10'}
@@ -13709,8 +14048,8 @@ packages:
       extend-shallow: 3.0.2
     dev: true
 
-  /split2@4.1.0:
-    resolution: {integrity: sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==}
+  /split2@4.2.0:
+    resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
     engines: {node: '>= 10.x'}
     dev: false
 
@@ -14071,14 +14410,14 @@ packages:
       whet.extend: 0.9.9
     dev: true
 
-  /swc-loader@0.2.3(@swc/core@1.3.50)(webpack@5.75.0):
+  /swc-loader@0.2.3(@swc/core@1.3.62)(webpack@5.85.1):
     resolution: {integrity: sha512-D1p6XXURfSPleZZA/Lipb3A8pZ17fP4NObZvFCDjK/OKljroqDpPmsBdTraWhVBqUNpcWBQY1imWdoPScRlQ7A==}
     peerDependencies:
       '@swc/core': ^1.2.147
       webpack: '>=2'
     dependencies:
-      '@swc/core': 1.3.50
-      webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
+      '@swc/core': 1.3.62
+      webpack: 5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3)
     dev: true
 
   /swiper@9.3.2:
@@ -14098,8 +14437,8 @@ packages:
       moment: 2.29.4
     dev: false
 
-  /systeminformation@5.16.9:
-    resolution: {integrity: sha512-QTlv3GGSromPeLVW3pzM6uxU8RbkacW9e0+ZX23GAXaX+XE0UToSygAxCJDHSty6RB9lAFHCHg+FfiXFChi/+w==}
+  /systeminformation@5.17.17:
+    resolution: {integrity: sha512-iIuX4P7fHPmTgiwjQrWx1e3/HsUXrEwE71saGZ2vGUiIvIHU5hXiyZs4cBrOzA66UoefycBTxCpbNf0v7uHiEQ==}
     engines: {node: '>=8.0.0'}
     os: [darwin, linux, win32, freebsd, openbsd, netbsd, sunos, android]
     hasBin: true
@@ -14109,9 +14448,9 @@ packages:
     resolution: {integrity: sha512-g9rPT3V1Q4WjWFZ/t5BdGC1mT/FpYnsLdBl+M5e6MlRkuE1RSR+R43wcY/3mKI59B9KEr+vxdWCuWNMD3oNHKA==}
     dev: true
 
-  /tabbable@6.1.1:
-    resolution: {integrity: sha512-4kl5w+nCB44EVRdO0g/UGoOp3vlwgycUVtkk/7DPyeLZUCuNFFKCFG6/t/DgHLrUPHjrZg6s5tNm+56Q2B0xyg==}
-    dev: false
+  /tabbable@6.1.2:
+    resolution: {integrity: sha512-qCN98uP7i9z0fIS4amQ5zbGBOq+OSigYeGvPy7NDk8Y9yncqDZ9pRPgfsc2PJIVM9RrJj7GIfuRgmjoUU9zTHQ==}
+    dev: true
 
   /tapable@2.2.1:
     resolution: {integrity: sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==}
@@ -14164,6 +14503,18 @@ packages:
       yallist: 4.0.0
     dev: false
 
+  /tar@6.1.15:
+    resolution: {integrity: sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==}
+    engines: {node: '>=10'}
+    dependencies:
+      chownr: 2.0.0
+      fs-minipass: 2.1.0
+      minipass: 5.0.0
+      minizlib: 2.1.2
+      mkdirp: 1.0.4
+      yallist: 4.0.0
+    dev: false
+
   /temp-dir@3.0.0:
     resolution: {integrity: sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==}
     engines: {node: '>=14.16'}
@@ -14177,8 +14528,8 @@ packages:
       supports-hyperlinks: 2.3.0
     dev: true
 
-  /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==}
+  /terser-webpack-plugin@5.3.9(@swc/core@1.3.62)(webpack@5.85.1):
+    resolution: {integrity: sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
       '@swc/core': '*'
@@ -14193,13 +14544,13 @@ packages:
       uglify-js:
         optional: true
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.17
-      '@swc/core': 1.3.50
+      '@jridgewell/trace-mapping': 0.3.18
+      '@swc/core': 1.3.62
       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.50)(webpack-cli@5.0.1)
+      schema-utils: 3.1.2
+      serialize-javascript: 6.0.1
+      terser: 5.17.7
+      webpack: 5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3)
     dev: true
 
   /terser@5.16.1:
@@ -14213,21 +14564,32 @@ packages:
       source-map-support: 0.5.21
     dev: true
 
+  /terser@5.17.7:
+    resolution: {integrity: sha512-/bi0Zm2C6VAexlGgLlVxA0P2lru/sdLyfCVaRMfKVo9nWxbmz7f/sD8VPybPeSUJaJcwmCJis9pBIhcVcG1QcQ==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dependencies:
+      '@jridgewell/source-map': 0.3.3
+      acorn: 8.8.2
+      commander: 2.20.3
+      source-map-support: 0.5.21
+    dev: true
+
   /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.42.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.42.0)
       bmp-js: 0.1.0
       file-type: 12.4.2
       idb-keyval: 3.2.0
       is-electron: 2.2.1
       is-url: 1.2.4
-      node-fetch: 2.6.8
+      node-fetch: 2.6.11
       opencollective-postinstall: 2.0.3
       regenerator-runtime: 0.13.11
       resolve-url: 0.2.1
@@ -14412,14 +14774,14 @@ packages:
     engines: {node: '>=0.8'}
     dependencies:
       psl: 1.9.0
-      punycode: 2.1.1
+      punycode: 2.3.0
 
   /tough-cookie@4.1.2:
     resolution: {integrity: sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==}
     engines: {node: '>=6'}
     dependencies:
       psl: 1.9.0
-      punycode: 2.2.0
+      punycode: 2.3.0
       universalify: 0.2.0
       url-parse: 1.5.10
 
@@ -14430,14 +14792,14 @@ packages:
     resolution: {integrity: sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==}
     engines: {node: '>=8'}
     dependencies:
-      punycode: 2.1.1
+      punycode: 2.3.0
     dev: true
 
   /tr46@3.0.0:
     resolution: {integrity: sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==}
     engines: {node: '>=12'}
     dependencies:
-      punycode: 2.1.1
+      punycode: 2.3.0
     dev: false
 
   /trace-redirect@1.0.6:
@@ -14491,19 +14853,19 @@ packages:
       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==}
+  /ts-loader@9.4.3(typescript@5.1.3)(webpack@5.85.1):
+    resolution: {integrity: sha512-n3hBnm6ozJYzwiwt5YRiJZkzktftRpMiBApHaJPoWLA+qetQBAXkHqCLM6nwSdRDimqVtA5ocIkcTRLMTt7yzA==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
       typescript: '*'
       webpack: ^5.0.0
     dependencies:
       chalk: 4.1.2
-      enhanced-resolve: 5.12.0
+      enhanced-resolve: 5.14.1
       micromatch: 4.0.5
-      semver: 7.3.8
-      typescript: 4.9.4
-      webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
+      semver: 7.5.1
+      typescript: 5.1.3
+      webpack: 5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3)
     dev: true
 
   /ts-node@10.4.0(@types/node@17.0.5)(typescript@4.5.4):
@@ -14536,7 +14898,7 @@ packages:
       yn: 3.1.1
     dev: true
 
-  /ts-node@10.9.1(@swc/core@1.3.50)(@types/node@18.11.18)(typescript@4.9.4):
+  /ts-node@10.9.1(@swc/core@1.3.62)(@types/node@18.11.18)(typescript@5.1.3):
     resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==}
     hasBin: true
     peerDependencies:
@@ -14551,7 +14913,7 @@ packages:
         optional: true
     dependencies:
       '@cspotcode/source-map-support': 0.8.1
-      '@swc/core': 1.3.50
+      '@swc/core': 1.3.62
       '@tsconfig/node10': 1.0.9
       '@tsconfig/node12': 1.0.11
       '@tsconfig/node14': 1.0.3
@@ -14563,12 +14925,12 @@ packages:
       create-require: 1.1.1
       diff: 4.0.2
       make-error: 1.3.6
-      typescript: 4.9.4
+      typescript: 5.1.3
       v8-compile-cache-lib: 3.0.1
       yn: 3.1.1
 
-  /tsc-alias@1.8.2:
-    resolution: {integrity: sha512-ukBkcNekOgwtnSWYLD5QsMX3yQWg7JviAs8zg3qJGgu4LGtY3tsV4G6vnqvOXIDkbC+XL9vbhObWSpRA5/6wbg==}
+  /tsc-alias@1.8.6:
+    resolution: {integrity: sha512-vq+i6VpE83IeMsSJVcFN03ZBofADhr8/gIJXjxpbnTRfN/MFXy0+SBaKG2o7p95QqXBGkeG98HYz3IkOOveFbg==}
     hasBin: true
     dependencies:
       chokidar: 3.5.3
@@ -14579,12 +14941,12 @@ packages:
       plimit-lit: 1.5.0
     dev: true
 
-  /tsconfig-paths@4.1.2:
-    resolution: {integrity: sha512-uhxiMgnXQp1IR622dUXI+9Ehnws7i/y6xvpZB9IbUVOPy0muvdvgXeZOn88UcGPiT98Vp3rJPTa8bFoalZ3Qhw==}
+  /tsconfig-paths@4.2.0:
+    resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==}
     engines: {node: '>=6'}
     dependencies:
       json5: 2.2.3
-      minimist: 1.2.7
+      minimist: 1.2.8
       strip-bom: 3.0.0
     dev: true
 
@@ -14608,6 +14970,10 @@ packages:
   /tslib@2.4.1:
     resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}
 
+  /tslib@2.5.3:
+    resolution: {integrity: sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==}
+    dev: false
+
   /tsscmp@1.0.6:
     resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
     engines: {node: '>=0.6.x'}
@@ -14701,8 +15067,8 @@ packages:
   /typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
-  /typeorm@0.3.11(ioredis@5.3.2)(pg@8.8.0)(ts-node@10.9.1):
-    resolution: {integrity: sha512-pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg==}
+  /typeorm@0.3.16(ioredis@5.3.2)(pg@8.11.0)(ts-node@10.9.1):
+    resolution: {integrity: sha512-wJ4Qy1oqRKNDdZiBTTaVMqwo/XxC52Q7uNPTjltPgLhvIW173bL6Iad0lhptMOsFlpixFPaUu3PNziaRBwX2Zw==}
     engines: {node: '>= 12.9.0'}
     hasBin: true
     peerDependencies:
@@ -14711,9 +15077,9 @@ packages:
       better-sqlite3: ^7.1.2 || ^8.0.0
       hdb-pool: ^0.1.6
       ioredis: ^5.0.4
-      mongodb: ^3.6.0
-      mssql: ^7.3.0
-      mysql2: ^2.2.5
+      mongodb: ^5.2.0
+      mssql: ^9.1.1
+      mysql2: ^2.2.5 || ^3.0.1
       oracledb: ^5.1.0
       pg: ^8.5.1
       pg-native: ^3.0.0
@@ -14766,19 +15132,17 @@ packages:
       cli-highlight: 2.1.11
       date-fns: 2.30.0
       debug: 4.3.4(supports-color@8.1.1)
-      dotenv: 16.0.3
-      glob: 7.2.3
+      dotenv: 16.1.4
+      glob: 8.1.0
       ioredis: 5.3.2
-      js-yaml: 4.1.0
-      mkdirp: 1.0.4
-      pg: 8.8.0
+      mkdirp: 2.1.6
+      pg: 8.11.0
       reflect-metadata: 0.1.13
       sha.js: 2.4.11
-      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
-      yargs: 17.6.2
+      ts-node: 10.9.1(@swc/core@1.3.62)(@types/node@18.11.18)(typescript@5.1.3)
+      tslib: 2.5.3
+      uuid: 9.0.0
+      yargs: 17.7.2
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -14794,6 +15158,11 @@ packages:
     engines: {node: '>=4.2.0'}
     hasBin: true
 
+  /typescript@5.1.3:
+    resolution: {integrity: sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
   /ulid@2.3.0:
     resolution: {integrity: sha512-keqHubrlpvT6G2wH0OEfSW4mquYRcbe/J8NMmveoQOjUqmo+hXtO+ORCpWhdbZ7k72UtY61BL7haGxW6enBnjw==}
     hasBin: true
@@ -14825,9 +15194,9 @@ packages:
       undertaker-registry: 1.0.1
     dev: true
 
-  /undici@5.15.0:
-    resolution: {integrity: sha512-wCAZJDyjw9Myv+Ay62LAoB+hZLPW9SmKbQkbHIhMw/acKSlpn7WohdMUc/Vd4j1iSMBO0hWwU8mjB7a5p5bl8g==}
-    engines: {node: '>=12.18'}
+  /undici@5.22.1:
+    resolution: {integrity: sha512-Ji2IJhFXZY0x/0tVBXeQwgPlLWw13GVzpsWPQ3rV50IFMMof2I55PZZxtm4P6iNq+L5znYN9nSTAq0ZyE6lSJw==}
+    engines: {node: '>=14.0'}
     dependencies:
       busboy: 1.6.0
     dev: false
@@ -14905,21 +15274,20 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /update-browserslist-db@1.0.10(browserslist@4.21.4):
-    resolution: {integrity: sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==}
+  /update-browserslist-db@1.0.11(browserslist@4.21.7):
+    resolution: {integrity: sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==}
     hasBin: true
     peerDependencies:
       browserslist: '>= 4.21.0'
     dependencies:
-      browserslist: 4.21.4
+      browserslist: 4.21.7
       escalade: 3.1.1
       picocolors: 1.0.0
-    dev: true
 
   /uri-js@4.4.1:
     resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
     dependencies:
-      punycode: 2.2.0
+      punycode: 2.3.0
 
   /urix@0.1.0:
     resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==}
@@ -15119,12 +15487,12 @@ packages:
       chalk: 4.1.2
       debug: 4.3.4(supports-color@8.1.1)
       fs-extra: 10.1.0
-      vite: 4.3.9(sass@1.57.1)
+      vite: 4.3.9(sass@1.62.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /vite@4.3.9(sass@1.57.1):
+  /vite@4.3.9(sass@1.62.1):
     resolution: {integrity: sha512-qsTNZjO9NoJNW7KnOrgYwczm0WctJ8m/yqYAMAK9Lxt4SoySUfS5S8ia9K7JHpa3KEeMfyF8LoJ3c5NeBJy6pg==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -15151,8 +15519,8 @@ packages:
     dependencies:
       esbuild: 0.17.19
       postcss: 8.4.24
-      rollup: 3.23.0
-      sass: 1.57.1
+      rollup: 3.23.1
+      sass: 1.62.1
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
@@ -15174,38 +15542,39 @@ packages:
       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.3.4):
     resolution: {integrity: sha512-Gu42ba9nosrE+gJpnAEuEkDMqG9zSUysIR8SdXUw8MQKDjBnnNR9lHC18uOr/ICz7yrA/5c7jHJr9lpElODC7w==}
     engines: {node: '>=10'}
     peerDependencies:
       vue: ^3.0.0
     dependencies:
-      vue: 3.2.45
+      vue: 3.3.4
     dev: true
 
   /vue@2.7.14:
     resolution: {integrity: sha512-b2qkFyOM0kwqWFuQmgd4o+uHGU7T+2z3T+WQp8UBjADfEv2n4FEMffzBmCKNP0IGzOEEfYjvtcC62xaSKeQDrQ==}
     dependencies:
       '@vue/compiler-sfc': 2.7.14
-      csstype: 3.1.1
+      csstype: 3.1.2
     dev: true
 
-  /vue@3.2.45:
-    resolution: {integrity: sha512-9Nx/Mg2b2xWlXykmCwiTUCWHbWIj53bnkizBxKai1g61f2Xit700A1ljowpTIM11e3uipOeiPcSqnmBg6gyiaA==}
+  /vue@3.3.4:
+    resolution: {integrity: sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==}
     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/shared': 3.2.45
+      '@vue/compiler-dom': 3.3.4
+      '@vue/compiler-sfc': 3.3.4
+      '@vue/runtime-dom': 3.3.4
+      '@vue/server-renderer': 3.3.4(vue@3.3.4)
+      '@vue/shared': 3.3.4
+    dev: true
 
-  /vuedraggable@4.1.0(vue@3.2.45):
+  /vuedraggable@4.1.0(vue@3.3.4):
     resolution: {integrity: sha512-FU5HCWBmsf20GpP3eudURW3WdWTKIbEIQxh9/8GE806hydR9qZqRRxRE3RjqX7PkuLuMQG/A7n3cfj9rCEchww==}
     peerDependencies:
       vue: ^3.0.1
     dependencies:
       sortablejs: 1.14.0
-      vue: 3.2.45
+      vue: 3.3.4
     dev: true
 
   /w3c-hr-time@1.0.2:
@@ -15237,7 +15606,7 @@ packages:
       axios: 0.25.0(debug@4.3.4)
       joi: 17.7.0
       lodash: 4.17.21
-      minimist: 1.2.7
+      minimist: 1.2.8
       rxjs: 7.8.0
     transitivePeerDependencies:
       - debug
@@ -15258,11 +15627,11 @@ packages:
     engines: {node: '>=10.13.0'}
     dependencies:
       glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
     dev: true
 
-  /web-push@3.5.0:
-    resolution: {integrity: sha512-JC0V9hzKTqlDYJ+LTZUXtW7B175qwwaqzbbMSWDxHWxZvd3xY0C2rcotMGDavub2nAAFw+sXTsqR65/KY2A5AQ==}
+  /web-push@3.6.1:
+    resolution: {integrity: sha512-+eN2/4Ybu+nkRgXqlPXUzqeA5BgQ7J4StYJM/e2uJpsSIGhkZJFrTlCx+ow9sD0mn+4jgbo2FkFoMBKftl49ZQ==}
     engines: {node: '>= 6'}
     hasBin: true
     dependencies:
@@ -15270,7 +15639,7 @@ packages:
       http_ece: 1.1.0
       https-proxy-agent: 5.0.1
       jws: 4.0.0
-      minimist: 1.2.7
+      minimist: 1.2.8
       urlsafe-base64: 1.0.0
     transitivePeerDependencies:
       - supports-color
@@ -15298,8 +15667,8 @@ packages:
     engines: {node: '>=12'}
     dev: false
 
-  /webpack-cli@5.0.1(webpack@5.75.0):
-    resolution: {integrity: sha512-S3KVAyfwUqr0Mo/ur3NzIp6jnerNpo7GUO6so51mxLi1spqsA17YcMXy0WOIJtBSnj748lthxC6XLbNKh/ZC+A==}
+  /webpack-cli@5.1.3(webpack@5.85.1):
+    resolution: {integrity: sha512-MTuk7NUMvEHQUSXCpvUrF1q2p0FJS40dPFfqQvG3jTWcgv/8plBNz2Kv2HXZiLGPnfmSAA5uCtCILO1JBmmkfw==}
     engines: {node: '>=14.15.0'}
     hasBin: true
     peerDependencies:
@@ -15316,27 +15685,27 @@ packages:
         optional: true
     dependencies:
       '@discoveryjs/json-ext': 0.5.7
-      '@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
+      '@webpack-cli/configtest': 2.1.1(webpack-cli@5.1.3)(webpack@5.85.1)
+      '@webpack-cli/info': 2.0.2(webpack-cli@5.1.3)(webpack@5.85.1)
+      '@webpack-cli/serve': 2.0.5(webpack-cli@5.1.3)(webpack@5.85.1)
+      colorette: 2.0.20
+      commander: 10.0.1
       cross-spawn: 7.0.3
       envinfo: 7.8.1
       fastest-levenshtein: 1.0.16
       import-local: 3.1.0
       interpret: 3.1.1
       rechoir: 0.8.0
-      webpack: 5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1)
-      webpack-merge: 5.8.0
+      webpack: 5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3)
+      webpack-merge: 5.9.0
     dev: true
 
-  /webpack-merge@5.8.0:
-    resolution: {integrity: sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==}
+  /webpack-merge@5.9.0:
+    resolution: {integrity: sha512-6NbRQw4+Sy50vYNTw7EyOn41OZItPiXB8GNv3INSoe3PSFaHJEz3SHTrYVaRm2LilNGnFUzh0FAwqPEmU/CwDg==}
     engines: {node: '>=10.0.0'}
     dependencies:
       clone-deep: 4.0.1
-      wildcard: 2.0.0
+      wildcard: 2.0.1
     dev: true
 
   /webpack-sources@3.2.3:
@@ -15344,8 +15713,8 @@ packages:
     engines: {node: '>=10.13.0'}
     dev: true
 
-  /webpack@5.75.0(@swc/core@1.3.50)(webpack-cli@5.0.1):
-    resolution: {integrity: sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==}
+  /webpack@5.85.1(@swc/core@1.3.62)(webpack-cli@5.1.3):
+    resolution: {integrity: sha512-xTb7MRf4LY8Z5rzn7aIx4TDrwYJrjcHnIfU1TqtyZOoObyuGSpAUwIvVuqq5wPnv7WEgQr8UvO1q/dgoGG4HjA==}
     engines: {node: '>=10.13.0'}
     hasBin: true
     peerDependencies:
@@ -15355,29 +15724,29 @@ packages:
         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
+      '@types/estree': 1.0.1
+      '@webassemblyjs/ast': 1.11.6
+      '@webassemblyjs/wasm-edit': 1.11.6
+      '@webassemblyjs/wasm-parser': 1.11.6
+      acorn: 8.8.2
+      acorn-import-assertions: 1.9.0(acorn@8.8.2)
+      browserslist: 4.21.7
       chrome-trace-event: 1.0.3
-      enhanced-resolve: 5.12.0
-      es-module-lexer: 0.9.3
+      enhanced-resolve: 5.14.1
+      es-module-lexer: 1.2.1
       eslint-scope: 5.1.1
       events: 3.3.0
       glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.10
+      graceful-fs: 4.2.11
       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
+      schema-utils: 3.1.2
       tapable: 2.2.1
-      terser-webpack-plugin: 5.3.6(@swc/core@1.3.50)(webpack@5.75.0)
+      terser-webpack-plugin: 5.3.9(@swc/core@1.3.62)(webpack@5.85.1)
       watchpack: 2.4.0
-      webpack-cli: 5.0.1(webpack@5.75.0)
+      webpack-cli: 5.1.3(webpack@5.85.1)
       webpack-sources: 3.2.3
     transitivePeerDependencies:
       - '@swc/core'
@@ -15458,8 +15827,8 @@ packages:
     resolution: {integrity: sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==}
     dev: true
 
-  /which-module@2.0.0:
-    resolution: {integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==}
+  /which-module@2.0.1:
+    resolution: {integrity: sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==}
     dev: false
 
   /which-typed-array@1.1.9:
@@ -15493,16 +15862,16 @@ packages:
       string-width: 4.2.3
     dev: false
 
-  /wildcard@2.0.0:
-    resolution: {integrity: sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==}
+  /wildcard@2.0.1:
+    resolution: {integrity: sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==}
     dev: true
 
   /with@7.0.2:
     resolution: {integrity: sha512-RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w==}
     engines: {node: '>= 10.0.0'}
     dependencies:
-      '@babel/parser': 7.20.7
-      '@babel/types': 7.20.7
+      '@babel/parser': 7.22.4
+      '@babel/types': 7.22.4
       assert-never: 1.2.1
       babel-walk: 3.0.0-canary-5
 
@@ -15571,18 +15940,6 @@ packages:
         optional: true
     dev: true
 
-  /ws@8.11.0:
-    resolution: {integrity: sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: ^5.0.2
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-
   /ws@8.12.0:
     resolution: {integrity: sha512-kU62emKIdKVeEIOIKVegvqpXMSTAMLJozpHZaJNDYqBjzlSYXQGviYwN1osDLJ9av68qHd4a2oSjd7yD4pacig==}
     engines: {node: '>=10.0.0'}
@@ -15596,6 +15953,18 @@ packages:
         optional: true
     dev: false
 
+  /ws@8.13.0:
+    resolution: {integrity: sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
   /xev@3.0.2:
     resolution: {integrity: sha512-8kxuH95iMXzHZj+fwqfA4UrPcYOy6bGIgfWzo9Ji23JoEc30ge/Z++Ubkiuy8c0+M64nXmmxrmJ7C8wnuBhluw==}
     dev: false
@@ -15623,8 +15992,8 @@ packages:
       xmlbuilder: 9.0.7
     dev: false
 
-  /xml2js@0.4.23:
-    resolution: {integrity: sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==}
+  /xml2js@0.5.0:
+    resolution: {integrity: sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==}
     engines: {node: '>=4.0.0'}
     dependencies:
       sax: 1.2.4
@@ -15728,7 +16097,7 @@ packages:
       require-main-filename: 2.0.0
       set-blocking: 2.0.0
       string-width: 4.2.3
-      which-module: 2.0.0
+      which-module: 2.0.1
       y18n: 4.0.3
       yargs-parser: 18.1.3
     dev: false
@@ -15756,6 +16125,20 @@ packages:
       string-width: 4.2.3
       y18n: 5.0.8
       yargs-parser: 21.1.1
+    dev: true
+
+  /yargs@17.7.2:
+    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
+    engines: {node: '>=12'}
+    dependencies:
+      cliui: 8.0.1
+      escalade: 3.1.1
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 21.1.1
+    dev: false
 
   /yargs@7.1.2:
     resolution: {integrity: sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==}

From a018bfca9a19ed798b01fe4e31f3c39496107ba2 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Jun 2023 15:02:59 -0700
Subject: [PATCH 301/319] dep: down typeorm

---
 packages/backend/package.json |  2 +-
 pnpm-lock.yaml                | 53 +++++++++++++++--------------------
 2 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 2e29fa72a0..5146c0cc21 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -131,7 +131,7 @@
 		"tinycolor2": "1.5.2",
 		"tmp": "0.2.1",
 		"twemoji-parser": "14.0.0",
-		"typeorm": "0.3.16",
+		"typeorm": "0.3.11",
 		"ulid": "2.3.0",
 		"uuid": "9.0.0",
 		"web-push": "3.6.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 11c8c2122c..1bc394d621 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -388,8 +388,8 @@ importers:
         specifier: 14.0.0
         version: 14.0.0
       typeorm:
-        specifier: 0.3.16
-        version: 0.3.16(ioredis@5.3.2)(pg@8.11.0)(ts-node@10.9.1)
+        specifier: 0.3.11
+        version: 0.3.11(ioredis@5.3.2)(pg@8.11.0)(ts-node@10.9.1)
       ulid:
         specifier: 2.3.0
         version: 2.3.0
@@ -8332,16 +8332,6 @@ packages:
       once: 1.4.0
       path-is-absolute: 1.0.1
 
-  /glob@8.0.3:
-    resolution: {integrity: sha512-ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ==}
-    engines: {node: '>=12'}
-    dependencies:
-      fs.realpath: 1.0.0
-      inflight: 1.0.6
-      inherits: 2.0.4
-      minimatch: 5.1.6
-      once: 1.4.0
-
   /glob@8.1.0:
     resolution: {integrity: sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==}
     engines: {node: '>=12'}
@@ -8351,7 +8341,6 @@ packages:
       inherits: 2.0.4
       minimatch: 5.1.6
       once: 1.4.0
-    dev: false
 
   /global-dirs@3.0.1:
     resolution: {integrity: sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==}
@@ -10071,7 +10060,7 @@ packages:
     dependencies:
       config-chain: 1.1.13
       editorconfig: 0.15.3
-      glob: 8.0.3
+      glob: 8.1.0
       nopt: 6.0.0
 
   /js-levenshtein@1.1.6:
@@ -11309,12 +11298,6 @@ packages:
     hasBin: true
     dev: false
 
-  /mkdirp@2.1.6:
-    resolution: {integrity: sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==}
-    engines: {node: '>=10'}
-    hasBin: true
-    dev: false
-
   /mocha@10.2.0:
     resolution: {integrity: sha512-IDY7fl/BecMwFHzoqF2sg/SHHANeBoMMXFlS9r0OXKDssYE1M5O43wUY/9BVPeIvfH2zmEbBfseqN9gBQZzXkg==}
     engines: {node: '>= 14.0.0'}
@@ -13577,7 +13560,7 @@ packages:
   /rxjs@7.8.0:
     resolution: {integrity: sha512-F2+gxDshqmIub1KdvZkaEfGDwLNpPvk9Fs6LD/MyQxNgMds/WH9OdDDXOmxUZpME+iSK3rQCctkL0DYyytUqMg==}
     dependencies:
-      tslib: 2.4.1
+      tslib: 2.5.3
     dev: true
 
   /s-age@1.1.2:
@@ -14969,10 +14952,10 @@ packages:
 
   /tslib@2.4.1:
     resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}
+    dev: false
 
   /tslib@2.5.3:
     resolution: {integrity: sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==}
-    dev: false
 
   /tsscmp@1.0.6:
     resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
@@ -15067,8 +15050,8 @@ packages:
   /typedarray@0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
-  /typeorm@0.3.16(ioredis@5.3.2)(pg@8.11.0)(ts-node@10.9.1):
-    resolution: {integrity: sha512-wJ4Qy1oqRKNDdZiBTTaVMqwo/XxC52Q7uNPTjltPgLhvIW173bL6Iad0lhptMOsFlpixFPaUu3PNziaRBwX2Zw==}
+  /typeorm@0.3.11(ioredis@5.3.2)(pg@8.11.0)(ts-node@10.9.1):
+    resolution: {integrity: sha512-pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg==}
     engines: {node: '>= 12.9.0'}
     hasBin: true
     peerDependencies:
@@ -15077,9 +15060,9 @@ packages:
       better-sqlite3: ^7.1.2 || ^8.0.0
       hdb-pool: ^0.1.6
       ioredis: ^5.0.4
-      mongodb: ^5.2.0
-      mssql: ^9.1.1
-      mysql2: ^2.2.5 || ^3.0.1
+      mongodb: ^3.6.0
+      mssql: ^7.3.0
+      mysql2: ^2.2.5
       oracledb: ^5.1.0
       pg: ^8.5.1
       pg-native: ^3.0.0
@@ -15133,15 +15116,17 @@ packages:
       date-fns: 2.30.0
       debug: 4.3.4(supports-color@8.1.1)
       dotenv: 16.1.4
-      glob: 8.1.0
+      glob: 7.2.3
       ioredis: 5.3.2
-      mkdirp: 2.1.6
+      js-yaml: 4.1.0
+      mkdirp: 1.0.4
       pg: 8.11.0
       reflect-metadata: 0.1.13
       sha.js: 2.4.11
       ts-node: 10.9.1(@swc/core@1.3.62)(@types/node@18.11.18)(typescript@5.1.3)
       tslib: 2.5.3
-      uuid: 9.0.0
+      uuid: 8.3.2
+      xml2js: 0.4.23
       yargs: 17.7.2
     transitivePeerDependencies:
       - supports-color
@@ -15992,6 +15977,14 @@ packages:
       xmlbuilder: 9.0.7
     dev: false
 
+  /xml2js@0.4.23:
+    resolution: {integrity: sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==}
+    engines: {node: '>=4.0.0'}
+    dependencies:
+      sax: 1.2.4
+      xmlbuilder: 11.0.1
+    dev: false
+
   /xml2js@0.5.0:
     resolution: {integrity: sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==}
     engines: {node: '>=4.0.0'}

From 63798dd4b73f7fc8d5dee8e97271b2f9833e8618 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Mon, 5 Jun 2023 18:07:42 -0400
Subject: [PATCH 302/319] remove invalid css

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

diff --git a/packages/client/src/components/MkMenu.vue b/packages/client/src/components/MkMenu.vue
index e47f32e45d..4555527747 100644
--- a/packages/client/src/components/MkMenu.vue
+++ b/packages/client/src/components/MkMenu.vue
@@ -365,10 +365,6 @@ onBeforeUnmount(() => {
 			position: relative;
 		}
 
-		> &.icon {
-			transform: translateY(0em);
-		}
-
 		&:not(:disabled):hover,
 		&:focus-visible {
 			color: var(--accent);

From c664d7da085dd99c579fa529a97ff608ea5d64b6 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Jun 2023 15:08:35 -0700
Subject: [PATCH 303/319] fix

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

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 2e29fa72a0..6ea02e1be2 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -112,7 +112,7 @@
 		"random-seed": "0.3.0",
 		"ratelimiter": "3.4.1",
 		"re2": "1.19.0",
-		"redis-lock": "1.0.0",
+		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.1.13",
 		"rename": "1.0.4",
 		"rndstr": "1.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 11c8c2122c..557b317fa8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -331,8 +331,8 @@ importers:
         specifier: 1.19.0
         version: 1.19.0
       redis-lock:
-        specifier: 1.0.0
-        version: 1.0.0
+        specifier: 0.1.4
+        version: 0.1.4
       reflect-metadata:
         specifier: 0.1.13
         version: 0.1.13
@@ -13227,9 +13227,9 @@ packages:
       lodash: 4.17.21
     dev: false
 
-  /redis-lock@1.0.0:
-    resolution: {integrity: sha512-zfI+Il36jXwRT/W8SBsG132Bc2yp3tMuf3KTGjSzXimadI17NEGBvb/KrDkCuAC2hzVxW5uR5ns/rxuqiWeV3Q==}
-    engines: {node: '>=12'}
+  /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:

From 36283b9a358886bfcf6f40c04b5bed1fe6088ff5 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Jun 2023 16:40:48 -0700
Subject: [PATCH 304/319] chore: formatting

---
 cypress.config.ts                             |  20 +--
 cypress/e2e/basic.cy.js                       | 126 +++++++++---------
 cypress/e2e/widgets.cy.js                     |  78 +++++------
 cypress/plugins/index.js                      |   6 +-
 cypress/support/commands.js                   |  34 ++---
 cypress/support/e2e.js                        |  18 +--
 locales/index.js                              | 113 ++++++++++------
 package.json                                  |   4 +-
 .../1658656633972-note-replies-function.js    |   2 +-
 ...ddFkAbuseUserReportTargetUserIdToUserId.js |   2 +-
 .../migration/1680375641101-clean-charts.js   |  16 +--
 packages/backend/package.json                 |   3 +-
 packages/backend/src/boot/master.ts           |   2 +-
 .../remote/activitypub/misc/ld-signature.ts   |   8 +-
 .../src/remote/activitypub/models/image.ts    |   4 +-
 .../backend/src/server/api/endpoints/meta.ts  |   4 +-
 .../src/server/api/endpoints/notes/edit.ts    |   4 +-
 .../server/api/mastodon/endpoints/timeline.ts |   2 +-
 packages/backend/src/server/web/boot.js       |   4 +-
 packages/backend/src/services/note/create.ts  |   6 +-
 packages/backend/test/api-visibility.ts       |  16 +--
 packages/backend/test/get-file-info.ts        |  72 +++++-----
 packages/backend/test/streaming.ts            |   8 +-
 packages/backend/test/utils.ts                |  10 +-
 .../src/components/MkSubNoteContent.vue       |   2 +-
 .../global/MkMisskeyFlavoredMarkdown.vue      |   6 +-
 packages/client/src/components/mfm.ts         |   2 +-
 packages/sw/package.json                      |   3 +-
 scripts/clean-all.js                          |  44 ++++--
 scripts/clean.js                              |  19 ++-
 scripts/dev.js                                |  28 ++--
 31 files changed, 366 insertions(+), 300 deletions(-)

diff --git a/cypress.config.ts b/cypress.config.ts
index e390c41a54..25ff2aa075 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -1,12 +1,12 @@
-import { defineConfig } from 'cypress'
+import { defineConfig } from "cypress";
 
 export default defineConfig({
-  e2e: {
-    // We've imported your old cypress plugins here.
-    // You may want to clean this up later by importing these.
-    setupNodeEvents(on, config) {
-      return require('./cypress/plugins/index.js')(on, config)
-    },
-    baseUrl: 'http://localhost:61812',
-  },
-})
+	e2e: {
+		// We've imported your old cypress plugins here.
+		// You may want to clean this up later by importing these.
+		setupNodeEvents(on, config) {
+			return require("./cypress/plugins/index.js")(on, config);
+		},
+		baseUrl: "http://localhost:61812",
+	},
+});
diff --git a/cypress/e2e/basic.cy.js b/cypress/e2e/basic.cy.js
index eb5195c4b2..f73a25efbc 100644
--- a/cypress/e2e/basic.cy.js
+++ b/cypress/e2e/basic.cy.js
@@ -1,4 +1,4 @@
-describe('Before setup instance', () => {
+describe("Before setup instance", () => {
 	beforeEach(() => {
 		cy.resetState();
 	});
@@ -9,31 +9,31 @@ describe('Before setup instance', () => {
 		cy.wait(1000);
 	});
 
-  it('successfully loads', () => {
-    cy.visit('/');
-  });
+	it("successfully loads", () => {
+		cy.visit("/");
+	});
 
-	it('setup instance', () => {
-    cy.visit('/');
+	it("setup instance", () => {
+		cy.visit("/");
 
-		cy.intercept('POST', '/api/admin/accounts/create').as('signup');
-	
-		cy.get('[data-cy-admin-username] input').type('admin');
-		cy.get('[data-cy-admin-password] input').type('admin1234');
-		cy.get('[data-cy-admin-ok]').click();
+		cy.intercept("POST", "/api/admin/accounts/create").as("signup");
+
+		cy.get("[data-cy-admin-username] input").type("admin");
+		cy.get("[data-cy-admin-password] input").type("admin1234");
+		cy.get("[data-cy-admin-ok]").click();
 
 		// なぜか動かない
 		//cy.wait('@signup').should('have.property', 'response.statusCode');
-		cy.wait('@signup');
-  });
+		cy.wait("@signup");
+	});
 });
 
-describe('After setup instance', () => {
+describe("After setup instance", () => {
 	beforeEach(() => {
 		cy.resetState();
 
 		// インスタンス初期セットアップ
-		cy.registerUser('admin', 'pass', true);
+		cy.registerUser("admin", "pass", true);
 	});
 
 	afterEach(() => {
@@ -42,34 +42,34 @@ describe('After setup instance', () => {
 		cy.wait(1000);
 	});
 
-  it('successfully loads', () => {
-    cy.visit('/');
-  });
+	it("successfully loads", () => {
+		cy.visit("/");
+	});
 
-	it('signup', () => {
-		cy.visit('/');
+	it("signup", () => {
+		cy.visit("/");
 
-		cy.intercept('POST', '/api/signup').as('signup');
+		cy.intercept("POST", "/api/signup").as("signup");
 
-		cy.get('[data-cy-signup]').click();
-		cy.get('[data-cy-signup-username] input').type('alice');
-		cy.get('[data-cy-signup-password] input').type('alice1234');
-		cy.get('[data-cy-signup-password-retype] input').type('alice1234');
-		cy.get('[data-cy-signup-submit]').click();
+		cy.get("[data-cy-signup]").click();
+		cy.get("[data-cy-signup-username] input").type("alice");
+		cy.get("[data-cy-signup-password] input").type("alice1234");
+		cy.get("[data-cy-signup-password-retype] input").type("alice1234");
+		cy.get("[data-cy-signup-submit]").click();
 
-		cy.wait('@signup');
-  });
+		cy.wait("@signup");
+	});
 });
 
-describe('After user signup', () => {
+describe("After user signup", () => {
 	beforeEach(() => {
 		cy.resetState();
 
 		// インスタンス初期セットアップ
-		cy.registerUser('admin', 'pass', true);
+		cy.registerUser("admin", "pass", true);
 
 		// ユーザー作成
-		cy.registerUser('alice', 'alice1234');
+		cy.registerUser("alice", "alice1234");
 	});
 
 	afterEach(() => {
@@ -78,51 +78,53 @@ describe('After user signup', () => {
 		cy.wait(1000);
 	});
 
-  it('successfully loads', () => {
-    cy.visit('/');
-  });
+	it("successfully loads", () => {
+		cy.visit("/");
+	});
 
-	it('signin', () => {
-		cy.visit('/');
+	it("signin", () => {
+		cy.visit("/");
 
-		cy.intercept('POST', '/api/signin').as('signin');
+		cy.intercept("POST", "/api/signin").as("signin");
 
-		cy.get('[data-cy-signin]').click();
-		cy.get('[data-cy-signin-username] input').type('alice');
+		cy.get("[data-cy-signin]").click();
+		cy.get("[data-cy-signin-username] input").type("alice");
 		// Enterキーでサインインできるかの確認も兼ねる
-		cy.get('[data-cy-signin-password] input').type('alice1234{enter}');
+		cy.get("[data-cy-signin-password] input").type("alice1234{enter}");
 
-		cy.wait('@signin');
-  });
+		cy.wait("@signin");
+	});
 
-	it('suspend', function() {
-		cy.request('POST', '/api/admin/suspend-user', {
+	it("suspend", function () {
+		cy.request("POST", "/api/admin/suspend-user", {
 			i: this.admin.token,
 			userId: this.alice.id,
 		});
 
-		cy.visit('/');
+		cy.visit("/");
 
-		cy.get('[data-cy-signin]').click();
-		cy.get('[data-cy-signin-username] input').type('alice');
-		cy.get('[data-cy-signin-password] input').type('alice1234{enter}');
+		cy.get("[data-cy-signin]").click();
+		cy.get("[data-cy-signin-username] input").type("alice");
+		cy.get("[data-cy-signin-password] input").type("alice1234{enter}");
 
 		// TODO: cypressにブラウザの言語指定できる機能が実装され次第英語のみテストするようにする
-		cy.contains(/アカウントが凍結されています|This account has been suspended due to/gi);
+		cy.contains(
+			/アカウントが凍結されています|This account has been suspended due to/gi,
+		);
 	});
 });
 
-describe('After user singed in', () => {
+describe("After user singed in", () => {
 	beforeEach(() => {
 		cy.resetState();
 
 		// インスタンス初期セットアップ
-		cy.registerUser('admin', 'pass', true);
+		cy.registerUser("admin", "pass", true);
 
 		// ユーザー作成
-		cy.registerUser('alice', 'alice1234');
+		cy.registerUser("alice", "alice1234");
 
-		cy.login('alice', 'alice1234');
+		cy.login("alice", "alice1234");
 	});
 
 	afterEach(() => {
@@ -131,17 +133,17 @@ describe('After user singed in', () => {
 		cy.wait(1000);
 	});
 
-  it('successfully loads', () => {
-		cy.get('[data-cy-open-post-form]').should('be.visible');
-  });
+	it("successfully loads", () => {
+		cy.get("[data-cy-open-post-form]").should("be.visible");
+	});
 
-	it('note', () => {
-		cy.get('[data-cy-open-post-form]').click();
-		cy.get('[data-cy-post-form-text]').type('Hello, Misskey!');
-		cy.get('[data-cy-open-post-form-submit]').click();
+	it("note", () => {
+		cy.get("[data-cy-open-post-form]").click();
+		cy.get("[data-cy-post-form-text]").type("Hello, Misskey!");
+		cy.get("[data-cy-open-post-form-submit]").click();
 
-		cy.contains('Hello, Misskey!');
-  });
+		cy.contains("Hello, Misskey!");
+	});
 });
 
 // TODO: 投稿フォームの公開範囲指定のテスト
diff --git a/cypress/e2e/widgets.cy.js b/cypress/e2e/widgets.cy.js
index 9eea010bde..e3c9326db8 100644
--- a/cypress/e2e/widgets.cy.js
+++ b/cypress/e2e/widgets.cy.js
@@ -1,14 +1,14 @@
-describe('After user signed in', () => {
+describe("After user signed in", () => {
 	beforeEach(() => {
 		cy.resetState();
-		cy.viewport('macbook-16');
+		cy.viewport("macbook-16");
 		// インスタンス初期セットアップ
-		cy.registerUser('admin', 'pass', true);
+		cy.registerUser("admin", "pass", true);
 
 		// ユーザー作成
-		cy.registerUser('alice', 'alice1234');
+		cy.registerUser("alice", "alice1234");
 
-		cy.login('alice', 'alice1234');
+		cy.login("alice", "alice1234");
 	});
 
 	afterEach(() => {
@@ -17,47 +17,47 @@ describe('After user signed in', () => {
 		cy.wait(1000);
 	});
 
-  it('widget edit toggle is visible', () => {
-		cy.get('.mk-widget-edit').should('be.visible');
-  });
+	it("widget edit toggle is visible", () => {
+		cy.get(".mk-widget-edit").should("be.visible");
+	});
 
-	it('widget select should be visible in edit mode', () => {
-		cy.get('.mk-widget-edit').click();
-		cy.get('.mk-widget-select').should('be.visible');
-  });
+	it("widget select should be visible in edit mode", () => {
+		cy.get(".mk-widget-edit").click();
+		cy.get(".mk-widget-select").should("be.visible");
+	});
 
-	it('first widget should be removed', () => {
-		cy.get('.mk-widget-edit').click();
-		cy.get('.customize-container:first-child .remove._button').click();
-		cy.get('.customize-container').should('have.length', 2);
+	it("first widget should be removed", () => {
+		cy.get(".mk-widget-edit").click();
+		cy.get(".customize-container:first-child .remove._button").click();
+		cy.get(".customize-container").should("have.length", 2);
 	});
 
 	function buildWidgetTest(widgetName) {
 		it(`${widgetName} widget should get added`, () => {
-			cy.get('.mk-widget-edit').click();
-			cy.get('.mk-widget-select select').select(widgetName, { force: true });
-			cy.get('.bg._modalBg.transparent').click({ multiple: true, force: true });
-			cy.get('.mk-widget-add').click({ force: true });
-			cy.get(`.mkw-${widgetName}`).should('exist');
+			cy.get(".mk-widget-edit").click();
+			cy.get(".mk-widget-select select").select(widgetName, { force: true });
+			cy.get(".bg._modalBg.transparent").click({ multiple: true, force: true });
+			cy.get(".mk-widget-add").click({ force: true });
+			cy.get(`.mkw-${widgetName}`).should("exist");
 		});
 	}
 
-	buildWidgetTest('memo');
-	buildWidgetTest('notifications');
-	buildWidgetTest('timeline');
-	buildWidgetTest('calendar');
-	buildWidgetTest('rss');
-	buildWidgetTest('trends');
-	buildWidgetTest('clock');
-	buildWidgetTest('activity');
-	buildWidgetTest('photos');
-	buildWidgetTest('digitalClock');
-	buildWidgetTest('federation');
-	buildWidgetTest('postForm');
-	buildWidgetTest('slideshow');
-	buildWidgetTest('serverMetric');
-	buildWidgetTest('onlineUsers');
-	buildWidgetTest('jobQueue');
-	buildWidgetTest('button');
-	buildWidgetTest('aiscript');
+	buildWidgetTest("memo");
+	buildWidgetTest("notifications");
+	buildWidgetTest("timeline");
+	buildWidgetTest("calendar");
+	buildWidgetTest("rss");
+	buildWidgetTest("trends");
+	buildWidgetTest("clock");
+	buildWidgetTest("activity");
+	buildWidgetTest("photos");
+	buildWidgetTest("digitalClock");
+	buildWidgetTest("federation");
+	buildWidgetTest("postForm");
+	buildWidgetTest("slideshow");
+	buildWidgetTest("serverMetric");
+	buildWidgetTest("onlineUsers");
+	buildWidgetTest("jobQueue");
+	buildWidgetTest("button");
+	buildWidgetTest("aiscript");
 });
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
index aa9918d215..3a4b6deb18 100644
--- a/cypress/plugins/index.js
+++ b/cypress/plugins/index.js
@@ -16,6 +16,6 @@
  * @type {Cypress.PluginConfig}
  */
 module.exports = (on, config) => {
-  // `on` is used to hook into various events Cypress emits
-  // `config` is the resolved Cypress config
-}
+	// `on` is used to hook into various events Cypress emits
+	// `config` is the resolved Cypress config
+};
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 95bfcf6855..3fe95b93d0 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -24,32 +24,34 @@
 // -- This will overwrite an existing command --
 // Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
 
-Cypress.Commands.add('resetState', () => {
-	cy.window(win => {
-		win.indexedDB.deleteDatabase('keyval-store');
+Cypress.Commands.add("resetState", () => {
+	cy.window((win) => {
+		win.indexedDB.deleteDatabase("keyval-store");
 	});
-	cy.request('POST', '/api/reset-db').as('reset');
-	cy.get('@reset').its('status').should('equal', 204);
+	cy.request("POST", "/api/reset-db").as("reset");
+	cy.get("@reset").its("status").should("equal", 204);
 	cy.reload(true);
 });
 
-Cypress.Commands.add('registerUser', (username, password, isAdmin = false) => {
-	const route = isAdmin ? '/api/admin/accounts/create' : '/api/signup';
+Cypress.Commands.add("registerUser", (username, password, isAdmin = false) => {
+	const route = isAdmin ? "/api/admin/accounts/create" : "/api/signup";
 
-	cy.request('POST', route, {
+	cy.request("POST", route, {
 		username: username,
 		password: password,
-	}).its('body').as(username);
+	})
+		.its("body")
+		.as(username);
 });
 
-Cypress.Commands.add('login', (username, password) => {
-	cy.visit('/');
+Cypress.Commands.add("login", (username, password) => {
+	cy.visit("/");
 
-	cy.intercept('POST', '/api/signin').as('signin');
+	cy.intercept("POST", "/api/signin").as("signin");
 
-	cy.get('[data-cy-signin]').click();
-	cy.get('[data-cy-signin-username] input').type(username);
-	cy.get('[data-cy-signin-password] input').type(`${password}{enter}`);
+	cy.get("[data-cy-signin]").click();
+	cy.get("[data-cy-signin-username] input").type(username);
+	cy.get("[data-cy-signin-password] input").type(`${password}{enter}`);
 
-	cy.wait('@signin').as('signedIn');
+	cy.wait("@signin").as("signedIn");
 });
diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js
index 9185be344c..961c6ac888 100644
--- a/cypress/support/e2e.js
+++ b/cypress/support/e2e.js
@@ -14,19 +14,21 @@
 // ***********************************************************
 
 // Import commands.js using ES2015 syntax:
-import './commands'
+import "./commands";
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
 
-Cypress.on('uncaught:exception', (err, runnable) => {
-	if ([
-		// Chrome
-		'ResizeObserver loop limit exceeded',
+Cypress.on("uncaught:exception", (err, runnable) => {
+	if (
+		[
+			// Chrome
+			"ResizeObserver loop limit exceeded",
 
-		// Firefox
-		'ResizeObserver loop completed with undelivered notifications',
-	].some(msg => err.message.includes(msg))) {
+			// Firefox
+			"ResizeObserver loop completed with undelivered notifications",
+		].some((msg) => err.message.includes(msg))
+	) {
 		return false;
 	}
 });
diff --git a/locales/index.js b/locales/index.js
index 7399bb5a18..20e9593dad 100644
--- a/locales/index.js
+++ b/locales/index.js
@@ -2,59 +2,90 @@
  * Languages Loader
  */
 
-const fs = require('fs');
-const yaml = require('js-yaml');
-let languages = []
-let languages_custom = []
-
-const merge = (...args) => args.reduce((a, c) => ({
-	...a,
-	...c,
-	...Object.entries(a)
-		.filter(([k]) => c && typeof c[k] === 'object')
-		.reduce((a, [k, v]) => (a[k] = merge(v, c[k]), a), {})
-}), {});
+const fs = require("fs");
+const yaml = require("js-yaml");
+let languages = [];
+let languages_custom = [];
 
+const merge = (...args) =>
+	args.reduce(
+		(a, c) => ({
+			...a,
+			...c,
+			...Object.entries(a)
+				.filter(([k]) => c && typeof c[k] === "object")
+				.reduce((a, [k, v]) => ((a[k] = merge(v, c[k])), a), {}),
+		}),
+		{},
+	);
 
 fs.readdirSync(__dirname).forEach((file) => {
-	if (file.includes('.yml')){
-		file = file.slice(0, file.indexOf('.'))
+	if (file.includes(".yml")) {
+		file = file.slice(0, file.indexOf("."));
 		languages.push(file);
 	}
-})
+});
 
-fs.readdirSync(__dirname + '/../custom/locales').forEach((file) => {
-	if (file.includes('.yml')){
-		file = file.slice(0, file.indexOf('.'))
+fs.readdirSync(__dirname + "/../custom/locales").forEach((file) => {
+	if (file.includes(".yml")) {
+		file = file.slice(0, file.indexOf("."));
 		languages_custom.push(file);
 	}
-})
+});
 
 const primaries = {
-	'en': 'US',
-	'ja': 'JP',
-	'zh': 'CN',
+	en: "US",
+	ja: "JP",
+	zh: "CN",
 };
 
 // 何故か文字列にバックスペース文字が混入することがあり、YAMLが壊れるので取り除く
-const clean = (text) => text.replace(new RegExp(String.fromCodePoint(0x08), 'g'), '');
+const clean = (text) =>
+	text.replace(new RegExp(String.fromCodePoint(0x08), "g"), "");
 
-const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(`${__dirname}/${c}.yml`, 'utf-8'))) || {}, a), {});
-const locales_custom = languages_custom.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(`${__dirname}/../custom/locales/${c}.yml`, 'utf-8'))) || {}, a), {});
-Object.assign(locales, locales_custom)
+const locales = languages.reduce(
+	(a, c) => (
+		(a[c] =
+			yaml.load(clean(fs.readFileSync(`${__dirname}/${c}.yml`, "utf-8"))) ||
+			{}),
+		a
+	),
+	{},
+);
+const locales_custom = languages_custom.reduce(
+	(a, c) => (
+		(a[c] =
+			yaml.load(
+				clean(
+					fs.readFileSync(`${__dirname}/../custom/locales/${c}.yml`, "utf-8"),
+				),
+			) || {}),
+		a
+	),
+	{},
+);
+Object.assign(locales, locales_custom);
 
-module.exports = Object.entries(locales)
-	.reduce((a, [k ,v]) => (a[k] = (() => {
-		const [lang] = k.split('-');
-		switch (k) {
-			case 'ja-JP': return v;
-			case 'ja-KS':
-			case 'en-US': return merge(locales['ja-JP'], v);
-			default: return merge(
-				locales['ja-JP'],
-				locales['en-US'],
-				locales[`${lang}-${primaries[lang]}`] || {},
-				v
-			);
-		}
-	})(), a), {});
+module.exports = Object.entries(locales).reduce(
+	(a, [k, v]) => (
+		(a[k] = (() => {
+			const [lang] = k.split("-");
+			switch (k) {
+				case "ja-JP":
+					return v;
+				case "ja-KS":
+				case "en-US":
+					return merge(locales["ja-JP"], v);
+				default:
+					return merge(
+						locales["ja-JP"],
+						locales["en-US"],
+						locales[`${lang}-${primaries[lang]}`] || {},
+						v,
+					);
+			}
+		})()),
+		a
+	),
+	{},
+);
diff --git a/package.json b/package.json
index 3269caa81e..1118cc39d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "calckey",
-	"version": "14.0.0-dev40",
+	"version": "14.0.0-dev44",
 	"codename": "aqua",
 	"repository": {
 		"type": "git",
@@ -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": "pnpm rome format packages/**/* --write && pnpm -r run format",
+		"format": "pnpm -r 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/backend/migration/1658656633972-note-replies-function.js b/packages/backend/migration/1658656633972-note-replies-function.js
index 810e238439..705d1c9350 100644
--- a/packages/backend/migration/1658656633972-note-replies-function.js
+++ b/packages/backend/migration/1658656633972-note-replies-function.js
@@ -47,6 +47,6 @@ export class noteRepliesFunction1658656633972 {
 	}
 
 	async down(queryRunner) {
-		await queryRunner.query(`DROP FUNCTION note_replies`);
+		await queryRunner.query("DROP FUNCTION note_replies");
 	}
 }
diff --git a/packages/backend/migration/1671199573000-AddFkAbuseUserReportTargetUserIdToUserId.js b/packages/backend/migration/1671199573000-AddFkAbuseUserReportTargetUserIdToUserId.js
index 96ed8e1d6b..8fb5d08af8 100644
--- a/packages/backend/migration/1671199573000-AddFkAbuseUserReportTargetUserIdToUserId.js
+++ b/packages/backend/migration/1671199573000-AddFkAbuseUserReportTargetUserIdToUserId.js
@@ -12,7 +12,7 @@ export class addFkAbuseUserReportTargetUserIdToUserId1671199573000 {
 
 	async down(queryRunner) {
 		await queryRunner.query(
-			`ALTER TABLE abuse_user_report DROP CONSTRAINT fk_7f4e851a35d81b64dda28eee0`,
+			"ALTER TABLE abuse_user_report DROP CONSTRAINT fk_7f4e851a35d81b64dda28eee0",
 		);
 	}
 }
diff --git a/packages/backend/migration/1680375641101-clean-charts.js b/packages/backend/migration/1680375641101-clean-charts.js
index bfb8aa9d92..827dcd2ce2 100644
--- a/packages/backend/migration/1680375641101-clean-charts.js
+++ b/packages/backend/migration/1680375641101-clean-charts.js
@@ -4,22 +4,22 @@ export class CleanCharts1680375641101 {
 	}
 	async up(queryRunner) {
 		await queryRunner.query(
-			`delete from __chart__hashtag where ___local_users = 0 and ___remote_users = 0;`,
+			"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;`,
+			"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;`);
+		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;`,
+			"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;`,
+			"delete from __chart_day__hashtag where ___local_users = 0 and ___remote_users = 0;",
 		);
 	}
 }
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 6ea02e1be2..d0f549e9a1 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -17,7 +17,8 @@
 		"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",
-		"test": "pnpm run mocha"
+		"test": "pnpm run mocha",
+		"format": "pnpm rome format * --write && pnpm rome check --apply-suggested *"
 	},
 	"resolutions": {
 		"chokidar": "^3.3.1"
diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index f22fafb5a7..df5ad1d67a 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -93,7 +93,7 @@ export async function masterMain() {
 		true,
 	);
 
-	if (!envOption.noDaemons && !config.onlyQueueProcessor) {
+	if (!(envOption.noDaemons || config.onlyQueueProcessor)) {
 		import("../daemons/server-stats.js").then((x) => x.default());
 		import("../daemons/queue-stats.js").then((x) => x.default());
 		import("../daemons/janitor.js").then((x) => x.default());
diff --git a/packages/backend/src/remote/activitypub/misc/ld-signature.ts b/packages/backend/src/remote/activitypub/misc/ld-signature.ts
index 1657597ab6..0a4ec3a539 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",
 		};
-		delete transformedOptions["type"];
-		delete transformedOptions["id"];
-		delete transformedOptions["signatureValue"];
+		transformedOptions["type"] = undefined;
+		transformedOptions["id"] = undefined;
+		transformedOptions["signatureValue"] = undefined;
 		const canonizedOptions = await this.normalize(transformedOptions);
 		const optionsHash = this.sha256(canonizedOptions);
 		const transformedData = { ...data };
-		delete transformedData["signature"];
+		transformedData["signature"] = undefined;
 		const cannonidedData = await this.normalize(transformedData);
 		if (this.debug) console.debug(`cannonidedData: ${cannonidedData}`);
 		const documentHash = this.sha256(cannonidedData);
diff --git a/packages/backend/src/remote/activitypub/models/image.ts b/packages/backend/src/remote/activitypub/models/image.ts
index 211aa3931e..b47b16c86f 100644
--- a/packages/backend/src/remote/activitypub/models/image.ts
+++ b/packages/backend/src/remote/activitypub/models/image.ts
@@ -29,8 +29,8 @@ 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);
+	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}`);
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index c603cb9acf..4c222d7c33 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -529,8 +529,8 @@ export default define(meta, paramDef, async (ps, me) => {
 			github: instance.enableGithubIntegration,
 			discord: instance.enableDiscordIntegration,
 			serviceWorker: instance.enableServiceWorker,
-			postEditing: instance.experimentalFeatures?.postEditing || false,
-			postImports: instance.experimentalFeatures?.postImports || false,
+			postEditing: instance.experimentalFeatures?.postEditing,
+			postImports: instance.experimentalFeatures?.postImports,
 			miauth: true,
 		};
 	}
diff --git a/packages/backend/src/server/api/endpoints/notes/edit.ts b/packages/backend/src/server/api/endpoints/notes/edit.ts
index 66db6f644f..37d0f31701 100644
--- a/packages/backend/src/server/api/endpoints/notes/edit.ts
+++ b/packages/backend/src/server/api/endpoints/notes/edit.ts
@@ -614,13 +614,13 @@ export default define(meta, paramDef, async (ps, user) => {
 			}
 
 			// Post is a reply and remote user is the contributor of the original post
-			if (note.reply && note.reply.userHost !== null) {
+			if (note.reply?.userHost !== null) {
 				const u = await Users.findOneBy({ id: note.reply.userId });
 				if (u && Users.isRemoteUser(u)) dm.addDirectRecipe(u);
 			}
 
 			// Post is a renote and remote user is the contributor of the original post
-			if (note.renote && note.renote.userHost !== null) {
+			if (note.renote?.userHost !== null) {
 				const u = await Users.findOneBy({ id: note.renote.userId });
 				if (u && Users.isRemoteUser(u)) dm.addDirectRecipe(u);
 			}
diff --git a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
index b8ef0929ee..91841a19af 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
@@ -49,7 +49,7 @@ export function toTextWithReaction(status: Entity.Status[], host: string) {
 		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 ? `* ` : ""})`;
+			return `${emojiNotation} (${r.count}${r.me ? "* " : ""})`;
 		});
 		const reaction = t.emoji_reactions as Entity.Reaction[];
 		const emoji = t.emojis || [];
diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
index e7e859d20c..d80d3ca134 100644
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@@ -97,7 +97,7 @@
 
 	const fontSize = localStorage.getItem("fontSize");
 	if (fontSize) {
-		document.documentElement.classList.add("f-" + fontSize);
+		document.documentElement.classList.add(`f-${fontSize}`);
 	}
 
 	const useSystemFont = localStorage.getItem("useSystemFont");
@@ -292,7 +292,7 @@
 
 			const meta = await res.json();
 
-			if (meta.version != v) {
+			if (meta.version !== v) {
 				localStorage.setItem("v", meta.version);
 				refresh();
 			}
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index abb8d94e88..723a6be3df 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -564,13 +564,13 @@ export default async (
 					}
 
 					// 投稿がリプライかつ投稿者がローカルユーザーかつリプライ先の投稿の投稿者がリモートユーザーなら配送
-					if (data.reply && data.reply.userHost !== null) {
+					if (data.reply?.userHost !== null) {
 						const u = await Users.findOneBy({ id: data.reply.userId });
 						if (u && Users.isRemoteUser(u)) dm.addDirectRecipe(u);
 					}
 
 					// 投稿がRenoteかつ投稿者がローカルユーザーかつRenote元の投稿の投稿者がリモートユーザーなら配送
-					if (data.renote && data.renote.userHost !== null) {
+					if (data.renote?.userHost !== null) {
 						const u = await Users.findOneBy({ id: data.renote.userId });
 						if (u && Users.isRemoteUser(u)) dm.addDirectRecipe(u);
 					}
@@ -671,7 +671,7 @@ async function insertNote(
 		tags: tags.map((tag) => normalizeForSearch(tag)),
 		emojis,
 		userId: user.id,
-		localOnly: data.localOnly || false,
+		localOnly: data.localOnly,
 		visibility: data.visibility as any,
 		visibleUserIds:
 			data.visibility === "specified"
diff --git a/packages/backend/test/api-visibility.ts b/packages/backend/test/api-visibility.ts
index 0ee4a4d337..20a530fce4 100644
--- a/packages/backend/test/api-visibility.ts
+++ b/packages/backend/test/api-visibility.ts
@@ -462,21 +462,21 @@ describe("API visibility", () => {
 		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);
+			const notes = res.body.filter((n: any) => n.id === pub.id);
 			assert.strictEqual(notes[0].text, "x");
 		}));
 
 		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);
+			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);
 			assert.strictEqual(res.status, 200);
-			const notes = res.body.filter((n: any) => n.id == fol.id);
+			const notes = res.body.filter((n: any) => n.id === fol.id);
 			assert.strictEqual(notes[0].text, "x");
 		}));
 		//#endregion
@@ -489,7 +489,7 @@ describe("API visibility", () => {
 				follower,
 			);
 			assert.strictEqual(res.status, 200);
-			const notes = res.body.filter((n: any) => n.id == folR.id);
+			const notes = res.body.filter((n: any) => n.id === folR.id);
 			assert.strictEqual(notes[0].text, "x");
 		}));
 
@@ -500,7 +500,7 @@ describe("API visibility", () => {
 				other,
 			);
 			assert.strictEqual(res.status, 200);
-			const notes = res.body.filter((n: any) => n.id == folR.id);
+			const notes = res.body.filter((n: any) => n.id === folR.id);
 			assert.strictEqual(notes.length, 0);
 		}));
 
@@ -511,7 +511,7 @@ describe("API visibility", () => {
 				target,
 			);
 			assert.strictEqual(res.status, 200);
-			const notes = res.body.filter((n: any) => n.id == folR.id);
+			const notes = res.body.filter((n: any) => n.id === folR.id);
 			assert.strictEqual(notes[0].text, "x");
 		}));
 		//#endregion
@@ -520,14 +520,14 @@ describe("API visibility", () => {
 		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);
+			const notes = res.body.filter((n: any) => n.id === folR.id);
 			assert.strictEqual(notes[0].text, "x");
 		}));
 
 		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);
+			const notes = res.body.filter((n: any) => n.id === folM.id);
 			assert.strictEqual(notes[0].text, "@target x");
 		}));
 		//#endregion
diff --git a/packages/backend/test/get-file-info.ts b/packages/backend/test/get-file-info.ts
index 22dc28c8e0..d399005144 100644
--- a/packages/backend/test/get-file-info.ts
+++ b/packages/backend/test/get-file-info.ts
@@ -13,10 +13,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		delete info.warnings;
-		delete info.blurhash;
-		delete info.sensitive;
-		delete info.porn;
+		info.warnings = undefined;
+		info.blurhash = undefined;
+		info.sensitive = undefined;
+		info.porn = undefined;
 		assert.deepStrictEqual(info, {
 			size: 0,
 			md5: "d41d8cd98f00b204e9800998ecf8427e",
@@ -35,10 +35,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		delete info.warnings;
-		delete info.blurhash;
-		delete info.sensitive;
-		delete info.porn;
+		info.warnings = undefined;
+		info.blurhash = undefined;
+		info.sensitive = undefined;
+		info.porn = undefined;
 		assert.deepStrictEqual(info, {
 			size: 25360,
 			md5: "091b3f259662aa31e2ffef4519951168",
@@ -57,10 +57,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		delete info.warnings;
-		delete info.blurhash;
-		delete info.sensitive;
-		delete info.porn;
+		info.warnings = undefined;
+		info.blurhash = undefined;
+		info.sensitive = undefined;
+		info.porn = undefined;
 		assert.deepStrictEqual(info, {
 			size: 1868,
 			md5: "08189c607bea3b952704676bb3c979e0",
@@ -79,10 +79,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		delete info.warnings;
-		delete info.blurhash;
-		delete info.sensitive;
-		delete info.porn;
+		info.warnings = undefined;
+		info.blurhash = undefined;
+		info.sensitive = undefined;
+		info.porn = undefined;
 		assert.deepStrictEqual(info, {
 			size: 2248,
 			md5: "32c47a11555675d9267aee1a86571e7e",
@@ -101,10 +101,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		delete info.warnings;
-		delete info.blurhash;
-		delete info.sensitive;
-		delete info.porn;
+		info.warnings = undefined;
+		info.blurhash = undefined;
+		info.sensitive = undefined;
+		info.porn = undefined;
 		assert.deepStrictEqual(info, {
 			size: 3772,
 			md5: "f73535c3e1e27508885b69b10cf6e991",
@@ -123,10 +123,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		delete info.warnings;
-		delete info.blurhash;
-		delete info.sensitive;
-		delete info.porn;
+		info.warnings = undefined;
+		info.blurhash = undefined;
+		info.sensitive = undefined;
+		info.porn = undefined;
 		assert.deepStrictEqual(info, {
 			size: 505,
 			md5: "b6f52b4b021e7b92cdd04509c7267965",
@@ -146,10 +146,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		delete info.warnings;
-		delete info.blurhash;
-		delete info.sensitive;
-		delete info.porn;
+		info.warnings = undefined;
+		info.blurhash = undefined;
+		info.sensitive = undefined;
+		info.porn = undefined;
 		assert.deepStrictEqual(info, {
 			size: 544,
 			md5: "4b7a346cde9ccbeb267e812567e33397",
@@ -168,10 +168,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		delete info.warnings;
-		delete info.blurhash;
-		delete info.sensitive;
-		delete info.porn;
+		info.warnings = undefined;
+		info.blurhash = undefined;
+		info.sensitive = undefined;
+		info.porn = undefined;
 		assert.deepStrictEqual(info, {
 			size: 75933,
 			md5: "268c5dde99e17cf8fe09f1ab3f97df56",
@@ -190,10 +190,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		delete info.warnings;
-		delete info.blurhash;
-		delete info.sensitive;
-		delete info.porn;
+		info.warnings = undefined;
+		info.blurhash = undefined;
+		info.sensitive = undefined;
+		info.porn = undefined;
 		assert.deepStrictEqual(info, {
 			size: 12624,
 			md5: "68d5b2d8d1d1acbbce99203e3ec3857e",
diff --git a/packages/backend/test/streaming.ts b/packages/backend/test/streaming.ts
index 3292c66e17..05c972992d 100644
--- a/packages/backend/test/streaming.ts
+++ b/packages/backend/test/streaming.ts
@@ -599,7 +599,7 @@ describe("Streaming", () => {
 						chitose,
 						"hashtag",
 						({ type, body }) => {
-							if (type == "note") {
+							if (type === "note") {
 								assert.deepStrictEqual(body.text, "#foo");
 								ws.close();
 								done();
@@ -625,7 +625,7 @@ describe("Streaming", () => {
 						chitose,
 						"hashtag",
 						({ type, body }) => {
-							if (type == "note") {
+							if (type === "note") {
 								if (body.text === "#foo") fooCount++;
 								if (body.text === "#bar") barCount++;
 								if (body.text === "#foo #bar") fooBarCount++;
@@ -668,7 +668,7 @@ describe("Streaming", () => {
 						chitose,
 						"hashtag",
 						({ type, body }) => {
-							if (type == "note") {
+							if (type === "note") {
 								if (body.text === "#foo") fooCount++;
 								if (body.text === "#bar") barCount++;
 								if (body.text === "#foo #bar") fooBarCount++;
@@ -718,7 +718,7 @@ describe("Streaming", () => {
 						chitose,
 						"hashtag",
 						({ type, body }) => {
-							if (type == "note") {
+							if (type === "note") {
 								if (body.text === "#foo") fooCount++;
 								if (body.text === "#bar") barCount++;
 								if (body.text === "#foo #bar") fooBarCount++;
diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts
index f3f68b2609..28c1a7925f 100644
--- a/packages/backend/test/utils.ts
+++ b/packages/backend/test/utils.ts
@@ -53,7 +53,7 @@ export const api = async (endpoint: string, params: any, me?: any) => {
 			beforeError: [
 				(error) => {
 					const { response } = error;
-					if (response && response.body) console.warn(response.body);
+					if (response?.body) console.warn(response.body);
 					return error;
 				},
 			],
@@ -316,7 +316,7 @@ export function launchServer(
 	moreProcess: () => Promise<void> = async () => {},
 ) {
 	return (done: (err?: Error) => any) => {
-		const p = childProcess.spawn("node", [_dirname + "/../index.js"], {
+		const p = childProcess.spawn("node", [`${_dirname}/../index.js`], {
 			stdio: ["inherit", "inherit", "inherit", "ipc"],
 			env: { NODE_ENV: "test", PATH: process.env.PATH },
 		});
@@ -340,8 +340,8 @@ export async function initTestDb(justBorrow = false, initEntities?: any[]) {
 		username: config.db.user,
 		password: config.db.pass,
 		database: config.db.db,
-		synchronize: true && !justBorrow,
-		dropSchema: true && !justBorrow,
+		synchronize: !justBorrow,
+		dropSchema: !justBorrow,
 		entities: initEntities || entities,
 	});
 
@@ -359,7 +359,7 @@ export function startServer(
 			rej("timeout to start");
 		}, timeout);
 
-		const p = childProcess.spawn("node", [_dirname + "/../built/index.js"], {
+		const p = childProcess.spawn("node", [`${_dirname}/../built/index.js`], {
 			stdio: ["inherit", "inherit", "inherit", "ipc"],
 			env: { NODE_ENV: "test", PATH: process.env.PATH },
 		});
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 93f6d55675..6aaaa16e2d 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -42,7 +42,7 @@
 				isLong,
 				manyImages: note.files.length > 4,
 				showContent: note.cw && !showContent,
-				animatedMfm: !disableMfm
+				animatedMfm: !disableMfm,
 			}"
 		>
 			<XShowMoreButton
diff --git a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
index 5c366418d9..0ce5647fc7 100644
--- a/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
+++ b/packages/client/src/components/global/MkMisskeyFlavoredMarkdown.vue
@@ -7,9 +7,9 @@
 		:customEmojis="customEmojis"
 		:isNote="isNote"
 		class="mfm-object"
-		:class="{ 
-			nowrap, 
-			advancedMfm: defaultStore.state.advancedMfm
+		:class="{
+			nowrap,
+			advancedMfm: defaultStore.state.advancedMfm,
 		}"
 	/>
 </template>
diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 50a566d331..1521438082 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -59,7 +59,7 @@ export default defineComponent({
 		};
 		// const validEase = (e: string | null | undefined) => {
 		// 	if (e == null) return null;
-		// 	return e.match(/(steps)?\(-?[0-9.]+,-?[0-9.]+,-?[0-9.]+,-?[0-9.]+\)/) 
+		// 	return e.match(/(steps)?\(-?[0-9.]+,-?[0-9.]+,-?[0-9.]+,-?[0-9.]+\)/)
 		// 		? (e.startsWith("steps") ? e : "cubic-bezier" + e)
 		// 		: null
 		// }
diff --git a/packages/sw/package.json b/packages/sw/package.json
index bb8098dc30..6c052b5cca 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -4,7 +4,8 @@
 	"scripts": {
 		"build": "webpack",
 		"watch": "pnpm swc src -d built -D -w",
-		"lint": "pnpm rome check \"src/**/*.ts\""
+		"lint": "pnpm rome check \"src/**/*.ts\"",
+		"format": "pnpm rome format * --write && pnpm rome check --apply-suggested *"
 	},
 	"devDependencies": {
 		"@swc/cli": "^0.1.62",
diff --git a/scripts/clean-all.js b/scripts/clean-all.js
index e347ee6a9f..5b7469040c 100644
--- a/scripts/clean-all.js
+++ b/scripts/clean-all.js
@@ -1,21 +1,39 @@
-const fs = require('fs');
-const execa = require('execa');
+const fs = require("fs");
+const execa = require("execa");
 
 (async () => {
-	fs.rmSync(__dirname + '/../packages/backend/built', { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../packages/backend/node_modules', { recursive: true, force: true });
+	fs.rmSync(`${__dirname}/../packages/backend/built`, {
+		recursive: true,
+		force: true,
+	});
+	fs.rmSync(`${__dirname}/../packages/backend/node_modules`, {
+		recursive: true,
+		force: true,
+	});
 
-	fs.rmSync(__dirname + '/../packages/client/built', { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../packages/client/node_modules', { recursive: true, force: true });
+	fs.rmSync(`${__dirname}/../packages/client/built`, {
+		recursive: true,
+		force: true,
+	});
+	fs.rmSync(`${__dirname}/../packages/client/node_modules`, {
+		recursive: true,
+		force: true,
+	});
 
-	fs.rmSync(__dirname + '/../packages/sw/built', { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../packages/sw/node_modules', { recursive: true, force: true });
+	fs.rmSync(`${__dirname}/../packages/sw/built`, {
+		recursive: true,
+		force: true,
+	});
+	fs.rmSync(`${__dirname}/../packages/sw/node_modules`, {
+		recursive: true,
+		force: true,
+	});
 
-	fs.rmSync(__dirname + '/../built', { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../node_modules', { recursive: true, force: true });
+	fs.rmSync(`${__dirname}/../built`, { recursive: true, force: true });
+	fs.rmSync(`${__dirname}/../node_modules`, { recursive: true, force: true });
 
-	execa('pnpm', ['store', 'prune'], {
-		cwd: __dirname + '/../',
-		stdio: 'inherit'
+	execa("pnpm", ["store", "prune"], {
+		cwd: `${__dirname}/../`,
+		stdio: "inherit",
 	});
 })();
diff --git a/scripts/clean.js b/scripts/clean.js
index 70b9d882b5..e052e3defa 100644
--- a/scripts/clean.js
+++ b/scripts/clean.js
@@ -1,8 +1,17 @@
-const fs = require('fs');
+const fs = require("fs");
 
 (async () => {
-	fs.rmSync(__dirname + '/../packages/backend/built', { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../packages/client/built', { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../packages/sw/built', { recursive: true, force: true });
-	fs.rmSync(__dirname + '/../built', { recursive: true, force: true });
+	fs.rmSync(`${__dirname}/../packages/backend/built`, {
+		recursive: true,
+		force: true,
+	});
+	fs.rmSync(`${__dirname}/../packages/client/built`, {
+		recursive: true,
+		force: true,
+	});
+	fs.rmSync(`${__dirname}/../packages/sw/built`, {
+		recursive: true,
+		force: true,
+	});
+	fs.rmSync(`${__dirname}/../built`, { recursive: true, force: true });
 })();
diff --git a/scripts/dev.js b/scripts/dev.js
index 7a61070f5c..2a79e9b377 100644
--- a/scripts/dev.js
+++ b/scripts/dev.js
@@ -1,45 +1,45 @@
-const execa = require('execa');
+const execa = require("execa");
 
 (async () => {
-	await execa('pnpm', ['clean'], {
-		cwd: __dirname + '/../',
+	await execa("pnpm", ["clean"], {
+		cwd: `${__dirname}/../`,
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});
 
-	execa('pnpm', ['dlx', 'gulp', 'watch'], {
-		cwd: __dirname + '/../',
+	execa("pnpm", ["dlx", "gulp", "watch"], {
+		cwd: `${__dirname}/../`,
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});
 
-	execa('pnpm', ['--filter', 'backend', 'watch'], {
-		cwd: __dirname + '/../',
+	execa("pnpm", ["--filter", "backend", "watch"], {
+		cwd: `${__dirname}/../`,
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});
 
-	execa('pnpm', ['--filter', 'client', 'watch'], {
-		cwd: __dirname + '/../',
+	execa("pnpm", ["--filter", "client", "watch"], {
+		cwd: `${__dirname}/../`,
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});
 
-	execa('pnpm', ['--filter', 'sw', 'watch'], {
-		cwd: __dirname + '/../',
+	execa("pnpm", ["--filter", "sw", "watch"], {
+		cwd: `${__dirname}/../`,
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});
 
 	const start = async () => {
 		try {
-			await execa('pnpm', ['start'], {
-				cwd: __dirname + '/../',
+			await execa("pnpm", ["start"], {
+				cwd: `${__dirname}/../`,
 				stdout: process.stdout,
 				stderr: process.stderr,
 			});
 		} catch (e) {
-			await new Promise(resolve => setTimeout(resolve, 3000));
+			await new Promise((resolve) => setTimeout(resolve, 3000));
 			start();
 		}
 	};

From 6bddeac975411ead1b08cd62b0be8ee0e29253ca Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Mon, 5 Jun 2023 20:15:17 -0400
Subject: [PATCH 305/319] fix

---
 packages/client/src/pages/timeline.vue | 80 ++++++++++++++------------
 1 file changed, 42 insertions(+), 38 deletions(-)

diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index d093676280..8aec6496d9 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -152,46 +152,50 @@ function top(): void {
 	scroll(rootEl, { top: 0 });
 }
 
-const lists = await os.api("users/lists/list");
-function chooseList(ev: MouseEvent) {
-	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);
+const lists = os.api("users/lists/list");
+async function chooseList(ev: MouseEvent) {
+	await lists.then((res) => {
+		const items = [
+			{
+				type: "link" as const,
+				text: i18n.ts.manageLists,
+				icon: "ph-faders-horizontal ph-bold ph-lg",
+				to: "/my/lists",
+			},
+		].concat(
+			res.map((list) => ({
+				type: "link" as const,
+				text: list.name,
+				icon: "",
+				to: `/timeline/list/${list.id}`,
+			}))
+		);
+		os.popupMenu(items, ev.currentTarget ?? ev.target);
+	});
 }
 
-const antennas = await os.api("antennas/list");
-function chooseAntenna(ev: MouseEvent) {
-	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);
+const antennas = os.api("antennas/list");
+async function chooseAntenna(ev: MouseEvent) {
+	await antennas.then((res) => {
+		const items = [
+			{
+				type: "link" as const,
+				indicate: false,
+				text: i18n.ts.manageAntennas,
+				icon: "ph-faders-horizontal ph-bold ph-lg",
+				to: "/my/antennas",
+			},
+		].concat(
+			res.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(

From ed674f2dac37524c5b0a6e17c37246ce457c6bd1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Jun 2023 17:27:40 -0700
Subject: [PATCH 306/319] chore: format

---
 gulpfile.js                                   | 112 +++++++++++-------
 package.json                                  |   2 +-
 packages/backend/package.json                 |   2 +-
 packages/backend/src/boot/master.ts           |   2 +-
 .../src/remote/activitypub/db-resolver.ts     |   2 -
 .../remote/activitypub/misc/ld-signature.ts   |   2 -
 .../backend/src/server/api/stream/index.ts    |   2 +-
 .../src/services/drive/image-processor.ts     |   4 +-
 packages/client/src/scripts/katex-macro.ts    |   6 +-
 packages/client/src/scripts/sticky-sidebar.ts |   2 +-
 packages/sw/package.json                      |   2 +-
 pnpm-lock.yaml                                |  44 +++----
 rome.json                                     |   1 +
 13 files changed, 106 insertions(+), 77 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index f994f0029a..7220d8421a 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -2,66 +2,98 @@
  * Gulp tasks
  */
 
-const fs = require('fs');
-const gulp = require('gulp');
-const replace = require('gulp-replace');
-const terser = require('gulp-terser');
-const cssnano = require('gulp-cssnano');
+const fs = require("fs");
+const gulp = require("gulp");
+const replace = require("gulp-replace");
+const terser = require("gulp-terser");
+const cssnano = require("gulp-cssnano");
 
-const locales = require('./locales');
-const meta = require('./package.json');
+const locales = require("./locales");
+const meta = require("./package.json");
 
-gulp.task('copy:backend:views', () =>
-	gulp.src('./packages/backend/src/server/web/views/**/*').pipe(gulp.dest('./packages/backend/built/server/web/views'))
+gulp.task("copy:backend:views", () =>
+	gulp
+		.src("./packages/backend/src/server/web/views/**/*")
+		.pipe(gulp.dest("./packages/backend/built/server/web/views")),
 );
 
-
-gulp.task('copy:backend:custom', () =>
-	gulp.src('./custom/assets/**/*').pipe(gulp.dest('./packages/backend/assets/'))
+gulp.task("copy:backend:custom", () =>
+	gulp
+		.src("./custom/assets/**/*")
+		.pipe(gulp.dest("./packages/backend/assets/")),
 );
 
-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:fonts", () =>
+	gulp
+		.src("./packages/client/node_modules/three/examples/fonts/**/*")
+		.pipe(gulp.dest("./built/_client_dist_/fonts/")),
 );
 
-gulp.task('copy:client:locales', cb => {
-	fs.mkdirSync('./built/_client_dist_/locales', { recursive: true });
+gulp.task("copy:client:locales", (cb) => {
+	fs.mkdirSync("./built/_client_dist_/locales", { recursive: true });
 
-	const v = { '_version_': meta.version };
+	const v = { _version_: meta.version };
 
 	for (const [lang, locale] of Object.entries(locales)) {
-		fs.writeFileSync(`./built/_client_dist_/locales/${lang}.${meta.version}.json`, JSON.stringify({ ...locale, ...v }), 'utf-8');
+		fs.writeFileSync(
+			`./built/_client_dist_/locales/${lang}.${meta.version}.json`,
+			JSON.stringify({ ...locale, ...v }),
+			"utf-8",
+		);
 	}
 
 	cb();
 });
 
-
-gulp.task('build:backend:script', () => {
-	return gulp.src(['./packages/backend/src/server/web/boot.js', './packages/backend/src/server/web/bios.js', './packages/backend/src/server/web/cli.js'])
-		.pipe(replace('LANGS', JSON.stringify(Object.keys(locales))))
-		.pipe(terser({
-			toplevel: true
-		}))
-		.pipe(gulp.dest('./packages/backend/built/server/web/'));
+gulp.task("build:backend:script", () => {
+	return gulp
+		.src([
+			"./packages/backend/src/server/web/boot.js",
+			"./packages/backend/src/server/web/bios.js",
+			"./packages/backend/src/server/web/cli.js",
+		])
+		.pipe(replace("LANGS", JSON.stringify(Object.keys(locales))))
+		.pipe(
+			terser({
+				toplevel: true,
+			}),
+		)
+		.pipe(gulp.dest("./packages/backend/built/server/web/"));
 });
 
-gulp.task('build:backend:style', () => {
-	return gulp.src(['./packages/backend/src/server/web/style.css', './packages/backend/src/server/web/bios.css', './packages/backend/src/server/web/cli.css'])
-		.pipe(cssnano({
-			zindex: false
-		}))
-		.pipe(gulp.dest('./packages/backend/built/server/web/'));
+gulp.task("build:backend:style", () => {
+	return gulp
+		.src([
+			"./packages/backend/src/server/web/style.css",
+			"./packages/backend/src/server/web/bios.css",
+			"./packages/backend/src/server/web/cli.css",
+		])
+		.pipe(
+			cssnano({
+				zindex: false,
+			}),
+		)
+		.pipe(gulp.dest("./packages/backend/built/server/web/"));
 });
 
-gulp.task('build', gulp.parallel(
-	'copy:client:locales', 'copy:backend:views', 'copy:backend:custom', 'build:backend:script', 'build:backend:style', 'copy:client:fonts'
-));
+gulp.task(
+	"build",
+	gulp.parallel(
+		"copy:client:locales",
+		"copy:backend:views",
+		"copy:backend:custom",
+		"build:backend:script",
+		"build:backend:style",
+		"copy:client:fonts",
+	),
+);
 
-gulp.task('default', gulp.task('build'));
+gulp.task("default", gulp.task("build"));
 
-gulp.task('watch', () => {
-	gulp.watch([
-		'./packages/*/src/**/*',
-	], { ignoreInitial: false }, gulp.task('build'));
+gulp.task("watch", () => {
+	gulp.watch(
+		["./packages/*/src/**/*"],
+		{ ignoreInitial: false },
+		gulp.task("build"),
+	);
 });
diff --git a/package.json b/package.json
index 1118cc39d2..a03c5dff1b 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
 		"gulp-replace": "1.1.4",
 		"gulp-terser": "2.1.0",
 		"install-peers": "^1.0.4",
-		"rome": "^11.0.0",
+		"rome": "^12.1.3",
 		"start-server-and-test": "1.15.2",
 		"typescript": "4.9.4"
 	}
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 8ad4a46e75..0d7ea1f925 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -18,7 +18,7 @@
 		"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",
 		"test": "pnpm run mocha",
-		"format": "pnpm rome format * --write && pnpm rome check --apply-suggested *"
+		"format": "pnpm rome format * --write && pnpm rome check --apply *"
 	},
 	"resolutions": {
 		"chokidar": "^3.3.1"
diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index df5ad1d67a..17b84c74a5 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -167,7 +167,7 @@ async function connectDb(): Promise<void> {
 	}
 }
 
-async function spawnWorkers(limit: number = 1) {
+async function spawnWorkers(limit = 1) {
 	const workers = Math.min(limit, os.cpus().length);
 	bootLogger.info(`Starting ${workers} worker${workers === 1 ? "" : "s"}...`);
 	await Promise.all([...Array(workers)].map(spawnWorker));
diff --git a/packages/backend/src/remote/activitypub/db-resolver.ts b/packages/backend/src/remote/activitypub/db-resolver.ts
index 0a2aec9e85..44ff70c56c 100644
--- a/packages/backend/src/remote/activitypub/db-resolver.ts
+++ b/packages/backend/src/remote/activitypub/db-resolver.ts
@@ -67,8 +67,6 @@ export function parseUri(value: string | IObject): UriParseResult {
 }
 
 export default class DbResolver {
-	constructor() {}
-
 	/**
 	 * AP Note => Misskey Note in DB
 	 */
diff --git a/packages/backend/src/remote/activitypub/misc/ld-signature.ts b/packages/backend/src/remote/activitypub/misc/ld-signature.ts
index 0a4ec3a539..1fb452c079 100644
--- a/packages/backend/src/remote/activitypub/misc/ld-signature.ts
+++ b/packages/backend/src/remote/activitypub/misc/ld-signature.ts
@@ -11,8 +11,6 @@ export class LdSignature {
 	public preLoad = true;
 	public loderTimeout = 10 * 1000;
 
-	constructor() {}
-
 	public async signRsaSignature2017(
 		data: any,
 		privateKey: string,
diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts
index b8482c5686..e268b580f5 100644
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -46,7 +46,7 @@ export default class Connection {
 	private channels: Channel[] = [];
 	private subscribingNotes: Map<string, number> = new Map();
 	private cachedNotes: Packed<"Note">[] = [];
-	private isMastodonCompatible: boolean = false;
+	private isMastodonCompatible = false;
 	private host: string;
 	private accessToken: string;
 	private currentSubscribe: string[][] = [];
diff --git a/packages/backend/src/services/drive/image-processor.ts b/packages/backend/src/services/drive/image-processor.ts
index 55869f478f..da5bfee188 100644
--- a/packages/backend/src/services/drive/image-processor.ts
+++ b/packages/backend/src/services/drive/image-processor.ts
@@ -14,7 +14,7 @@ export async function convertToWebp(
 	path: string,
 	width: number,
 	height: number,
-	quality: number = 85,
+	quality = 85,
 ): Promise<IImage> {
 	return convertSharpToWebp(await sharp(path), width, height, quality);
 }
@@ -23,7 +23,7 @@ export async function convertSharpToWebp(
 	sharp: sharp.Sharp,
 	width: number,
 	height: number,
-	quality: number = 85,
+	quality = 85,
 ): Promise<IImage> {
 	const data = await sharp
 		.resize(width, height, {
diff --git a/packages/client/src/scripts/katex-macro.ts b/packages/client/src/scripts/katex-macro.ts
index 4c176b2962..f91e657da9 100644
--- a/packages/client/src/scripts/katex-macro.ts
+++ b/packages/client/src/scripts/katex-macro.ts
@@ -14,7 +14,7 @@ function parseSingleKaTeXMacro(src: string): [string, KaTeXMacro] {
 	if (!src.startsWith("\\newcommand") || src.slice(-1) !== "}") return invalid;
 
 	// current index we are checking (= "\\newcommand".length)
-	let currentPos: number = 11;
+	let currentPos = 11;
 	currentPos = skipSpaces(currentPos);
 
 	// parse {\name}, (\name), or [\name]
@@ -61,8 +61,8 @@ function parseSingleKaTeXMacro(src: string): [string, KaTeXMacro] {
 	currentPos = skipSpaces(currentPos);
 
 	while (currentPos < src.length - 1) {
-		let numbersignPos: number = -1;
-		let isEscaped: boolean = false;
+		let numbersignPos = -1;
+		let isEscaped = false;
 
 		for (let i = currentPos; i < src.length - 1; ++i) {
 			if (src[i] !== "\\" && src[i] !== "#") {
diff --git a/packages/client/src/scripts/sticky-sidebar.ts b/packages/client/src/scripts/sticky-sidebar.ts
index 6602d4a3d5..3c42ecb3b4 100644
--- a/packages/client/src/scripts/sticky-sidebar.ts
+++ b/packages/client/src/scripts/sticky-sidebar.ts
@@ -7,7 +7,7 @@ export class StickySidebar {
 	private isTop = false;
 	private isBottom = false;
 	private offsetTop: number;
-	private globalHeaderHeight: number = 59;
+	private globalHeaderHeight = 59;
 
 	constructor(
 		container: StickySidebar["container"],
diff --git a/packages/sw/package.json b/packages/sw/package.json
index 6c052b5cca..f64bbfd0a4 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -5,7 +5,7 @@
 		"build": "webpack",
 		"watch": "pnpm swc src -d built -D -w",
 		"lint": "pnpm rome check \"src/**/*.ts\"",
-		"format": "pnpm rome format * --write && pnpm rome check --apply-suggested *"
+		"format": "pnpm rome format * --write && pnpm rome check --apply *"
 	},
 	"devDependencies": {
 		"@swc/cli": "^0.1.62",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 205059075c..463f4247a6 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -64,8 +64,8 @@ importers:
         specifier: ^1.0.4
         version: 1.0.4
       rome:
-        specifier: ^11.0.0
-        version: 11.0.0
+        specifier: ^12.1.3
+        version: 12.1.3
       start-server-and-test:
         specifier: 1.15.2
         version: 1.15.2
@@ -2666,48 +2666,48 @@ packages:
       picomatch: 2.3.1
     dev: true
 
-  /@rometools/cli-darwin-arm64@11.0.0:
-    resolution: {integrity: sha512-F3vkdY+s3FLIEnAjSbyHTuIPB88cLpccimW4ecid5I7S6GzGG3iUJI4xT00JhH73K4P/qW20/9r+kH1T9Du8Xg==}
+  /@rometools/cli-darwin-arm64@12.1.3:
+    resolution: {integrity: sha512-AmFTUDYjBuEGQp/Wwps+2cqUr+qhR7gyXAUnkL5psCuNCz3807TrUq/ecOoct5MIavGJTH6R4aaSL6+f+VlBEg==}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rometools/cli-darwin-x64@11.0.0:
-    resolution: {integrity: sha512-X6jhtS6Iml4GOzgNtnLwIp/KXXhSdqeVyfv69m/AHnIzx3gQAjPZ7BPnJLvTCbhe4SKHL+uTZYFSCJpkUUKE6w==}
+  /@rometools/cli-darwin-x64@12.1.3:
+    resolution: {integrity: sha512-k8MbWna8q4LRlb005N2X+JS1UQ+s3ZLBBvwk4fP8TBxlAJXUz17jLLu/Fi+7DTTEmMhM84TWj4FDKW+rNar28g==}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rometools/cli-linux-arm64@11.0.0:
-    resolution: {integrity: sha512-dktTJJlTpmycBZ2TwhJBcAO8ztK8DdevdyZnFFxdYRvtmJgTjIsC2UFayf/SbKew8B8q1IhI0it+D6ihAeIpeg==}
+  /@rometools/cli-linux-arm64@12.1.3:
+    resolution: {integrity: sha512-X/uLhJ2/FNA3nu5TiyeNPqiD3OZoFfNfRvw6a3ut0jEREPvEn72NI7WPijH/gxSz55znfQ7UQ6iM4DZumUknJg==}
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rometools/cli-linux-x64@11.0.0:
-    resolution: {integrity: sha512-WVcnXPNdWGUWo0p4NU8YzuthjYR7q+b4vRcjdxtP1DlpphZmSsoC/RSE85nEqRAz8hChcKUansVzOPM8BSsuGA==}
+  /@rometools/cli-linux-x64@12.1.3:
+    resolution: {integrity: sha512-csP17q1eWiUXx9z6Jr/JJPibkplyKIwiWPYNzvPCGE8pHlKhwZj3YHRuu7Dm/4EOqx0XFIuqqWZUYm9bkIC8xg==}
     cpu: [x64]
     os: [linux]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rometools/cli-win32-arm64@11.0.0:
-    resolution: {integrity: sha512-tPj6RThQzS7Q45jqQll7NlTYvNcsg/BEP3LYiiazqSh9FAFnMkrV6ewUcMPKWyAfiyLs7jlz4rRvdNRUSygzfQ==}
+  /@rometools/cli-win32-arm64@12.1.3:
+    resolution: {integrity: sha512-RymHWeod57EBOJY4P636CgUwYA6BQdkQjh56XKk4pLEHO6X1bFyMet2XL7KlHw5qOTalzuzf5jJqUs+vf3jdXQ==}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rometools/cli-win32-x64@11.0.0:
-    resolution: {integrity: sha512-bmBai8WHxYjsGk1+je7ZTfCUCWq30WJI3pQM8pzTA674lfGTZ9ymJoZwTaIMSO4rL5V9mlO6uLunsBKso9VqOg==}
+  /@rometools/cli-win32-x64@12.1.3:
+    resolution: {integrity: sha512-yHSKYidqJMV9nADqg78GYA+cZ0hS1twANAjiFibQdXj9aGzD+s/IzIFEIi/U/OBLvWYg/SCw0QVozi2vTlKFDQ==}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
@@ -13531,18 +13531,18 @@ packages:
       fsevents: 2.3.2
     dev: true
 
-  /rome@11.0.0:
-    resolution: {integrity: sha512-rRo6JOwpMLc3OkeTDRXkrmrDqnxDvZ75GS4f0jLDBNmRgDXWbu0F8eVnJoRn+VbK2AE7vWvhVOMBjnWowcopkQ==}
+  /rome@12.1.3:
+    resolution: {integrity: sha512-e+ff72hxDpe/t5/Us7YRBVw3PBET7SeczTQNn6tvrWdrCaAw3qOukQQ+tDCkyFtS4yGsnhjrJbm43ctNbz27Yg==}
     engines: {node: '>=14.*'}
     hasBin: true
     requiresBuild: true
     optionalDependencies:
-      '@rometools/cli-darwin-arm64': 11.0.0
-      '@rometools/cli-darwin-x64': 11.0.0
-      '@rometools/cli-linux-arm64': 11.0.0
-      '@rometools/cli-linux-x64': 11.0.0
-      '@rometools/cli-win32-arm64': 11.0.0
-      '@rometools/cli-win32-x64': 11.0.0
+      '@rometools/cli-darwin-arm64': 12.1.3
+      '@rometools/cli-darwin-x64': 12.1.3
+      '@rometools/cli-linux-arm64': 12.1.3
+      '@rometools/cli-linux-x64': 12.1.3
+      '@rometools/cli-win32-arm64': 12.1.3
+      '@rometools/cli-win32-x64': 12.1.3
     dev: true
 
   /rss-parser@3.13.0:
diff --git a/rome.json b/rome.json
index 7a51b60e68..09db5f75e2 100644
--- a/rome.json
+++ b/rome.json
@@ -16,6 +16,7 @@
 			"packages/backend/nsfw-model/",
 			"packages/client/src/emojilist.json",
 			"*.md",
+			"**/tsconfig.json",
 			"*/.yml"
 		]
 	}

From 0c5246b6ab9e3dc3c25f7e75bf8dc3d629676980 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Jun 2023 17:36:58 -0700
Subject: [PATCH 307/319] changelog

---
 CHANGELOG.md | 9706 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 6053 insertions(+), 3653 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5377955d6a..5f1f76bf54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,19 +2,2413 @@
 
 All changes from v13.0.0 onwards, for a full list of differences read CALCKEY.md
 
-## [13.1.3] - 2023-02-09
+## [14.0.0-rc2] - 2023-06-06
 
 ### Bug Fixes
 
+- Fix deck view margins
+
+- Fix: Parse mastoAPI `limit` argument in more places & Improve converting arguments to boolean ([#9716](https://github.com/orhun/git-cliff/issues/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>
+
+- Fix: send button
+
+- Fix: intermediarily convert ids
+
+- Fix: mobile button alignment
+
+- Fix: when count is actually 0
+
+- Fix cli more
+
+- Fix: don't show smartphone UI when settings icon is double-clicked
+
+- Fix: unicode aliases
+
+- Fix: repo url
+
+- Fix: :bug: can't send blank messages
+
+Closes #9661
+
+- Fix: make sure cw button is on new line
+
+- Fix: local time for users
+
+- Fix: max user profile length to db field length
+
+Resolves: #9749
+
+- Fix: :bug: no nyaizing undefined text
+
+Closes #9752
+
+- Fix: a bug in ads
+
+- Fix color in follow button
+
+- 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
+
+- Fix
+
+- Fix
+
+- Fix callback url
+
+- Fix japanese locale
+
+- Fix?
+
+- Fix: allow announces with followers visibility
+
+- Fix: :bug: formlink -> button
+
+fixes notifications and drive in settings
+
+- Fix sounds settings
+
+- Fix doc link
+
+- Fix: direct boost ([#9783](https://github.com/orhun/git-cliff/issues/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>
+
+- Fix: don't nyaize quoted text
+
+- Fix: don't nyaize quoted text ([#9791](https://github.com/orhun/git-cliff/issues/9791))
+
+- Fix search import
+
+- Fix migration
+
+- Fix: :bug: make recently used group
+
+Closes #9784
+
+- Fix: add cargo to DOCKERFILE
+
+- Fix #9784
+
+- Fix help button alignment iconsOnly
+
+- Fix indexing description
+
+- Fix: :passport_control: no longer need 2fa for webauthn
+
+- Fix import
+
+- Fix button alignments
+
+- Fix: dialogs not coming up
+
+- Fix: dockerfile
+
+- Fix: add copy for build from native-utils
+
+- 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.
+
+- Fix: buttons not showing
+
+- Fix: :bug: go to last timeline selected
+
+- Fix: toggling the blocking state from the instance-info admin view ([#9809](https://github.com/orhun/git-cliff/issues/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>
+
+- Fix
+
+- Fix(client): userpage ui ([#9179](https://github.com/orhun/git-cliff/issues/9179))
+
+* fix(unverified): clip pages ui
+
+* fix(unverified): user page width
+
+Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
+
+- Fix id of move activity
+
+- Fix move inbox
+
+- Fix: format script; chore: format
+
+- Fix: typo
+
+- Fix
+
+- Fix chat metadata
+
+- Fix lookup instance
+
+- Fix: :lock: don't show notes with CW on welcome screen
+
+Closes #9849
+
+- Prevent crashes due to timezone === null
+
+- Fix a bug
+
+- Fix: disable "Search" keyword ([#9856](https://github.com/orhun/git-cliff/issues/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>
+
+- Fix
+
+- Fix tag on explore
+
+- Fix header tabs
+
+- Fix: ドライブアップロードで413が返ってきたときにエラーメッセージを表示 ([#10680](https://github.com/orhun/git-cliff/issues/10680))
+
+- Fix: boost muting in the recommended timeline ([#9906](https://github.com/orhun/git-cliff/issues/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>
+
+- Fix an instance ticker bug
+
+- Fix: add route
+
+- Fix?
+
+- Fix: style email with inline styles
+
+- Fix disabled, formatting
+
+- 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
+
+- 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
+
+- 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.
+
+- Fixes
+
+- Fixes?
+
+- Fix subnote
+
+- Fix
+
+- Fix: centering block math ([#9946](https://github.com/orhun/git-cliff/issues/9946))
+
+Similar to `inlineCode` and `blockCode`, MFM provides two types of formula syntax, `mathInline` and `mathBlock` (I'm curious why these aren't called `inlineMath`/`blockMath`, but oh well)
+
+Other platforms, like GitHub, **Math**todon, my blog, etc., also support these two types of formula representation, and math blocks are centered on (maybe) all such platforms.
+
+![](https://cdn.discordapp.com/attachments/823878222897741868/1101837026304720997/2023-04-29_201943.png)
+
+But Calckey (Misskey v12) don't center math blocks. I'd say this is a bug, and this makes `blockMath` useless (it's just `inlineMath` in a new line).
+
+![](https://cdn.discordapp.com/attachments/823878222897741868/1101837026027917342/2023-04-29_202008.png)
+
+So I fixed this.
+
+![](https://cdn.discordapp.com/attachments/823878222897741868/1101837183574355978/2023-04-29_202854.png)
+
+Co-authored-by: naskya <m@naskya.net>
+Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9946
+Co-authored-by: naskya <naskya@noreply.codeberg.org>
+Co-committed-by: naskya <naskya@noreply.codeberg.org>
+
+- BlockMath is not necessarily multi-line (is this copy-pasted from blockCode?)
+
+- Fix poll voting causing edit revisions.
+
+- Fix(ap): Use unique identifier for each follow request
+
+Closes #9677
+
+Co-authored-by: GitHub <hutchisr>
+
+- Fix meta fetch
+
+- Fix params
+
+- Fix email validation
+
+- Fix: Commit CI not running because cargo is not installed
+
+- Fix: Switch to node alpine image
+
+- Fix db migration
+
+- Fix lang
+
+- Fix translation box
+
+- Fix: correctly display links to self instance URL
+
+Closes #9270
+
+Co-authored-by: GitHub <futchitwo>
+
+- Fix typo
+
+- Fix tiny text on mobile
+
+- Fix: external link
+
+- Fix: dont stream hidden posts over websocket
+
+- Fix: only show signupsDisabled if signups disabled
+
+- Fix: hidden post federation
+
+- Fix: make userId optional cause its not used and
+should not be used lmao
+
+- Fix font size + remove unecessary class
+
+- Fix instance-info if moderator but not admin
+
+- Fix incomplete revert
+
+- Fix: only fetch admin/meta if admin
+
+- Fix hidden post behavior
+
+- Fix: Detach push notifications..
+..from "isRead" check. Apps will handle that theself.
+
+- Fix: dont stream hidden posts
+
+- Fix padding
+
+- Fix clicking audio & search mfm opening post
+
+- Fix click.stop
+
+- Fix: run post import async
+
+- Fix: allow disabled radio buttons when created from radios.vue
+
+- Fix: :bug: add zip/unzip to docker container
+
+Closes #9843
+
+- Fix quote attached styling, will prob improve later
+
+- Fix opening info button
+
+- Fix button
+
+- Fix typo
+
+- Fix
+
+- Fix
+
+- Fix typo
+
+- Fix meta update
+
+- Fix image not displaying if no text
+
+- Fix mobile navbar
+
+- Fix quote
+
+- Fix show replies toggle not saving
+
+- Fix noBg timeline BG's when wallpaper set
+
+- Fix border-radius of folder
+
+- Fix: dont show cheat sheet when not needed
+
+- Fix loading icon for boosts tab
+
+- Fix null error
+
+- Fix depth
+
+- Fix
+
+- Fix: show follow requests even if not locked
+
+- Fix api doc?
+
+- Fix import
+
+- Fix
+
+- Fixes!!
+
+- Fix avatar pos
+
+- Fix fade
+
+- Fix rogue :global() (would prevent text in toggles from wrapping)
+
+- Fix edit icon
+
+- Fix: Escape SQL LIKE
+
+* SQL LIKE escape
+
+- Fix
+
+- Fix
+
+- Fix z-index
+
+- Fix z-index
+
+- Fix: :lipstick: margin on expand tweet button
+
+- Fix style
+
+- Fix font size
+
+- Fix
+
+- Fix: MFM crop percentage parsing
+
+- Fix
+
+- Fix
+
+- Fix position
+
+- Fix: move isRenote check to note.vue
+
+- Fix: move isRenote check to note.vue
+
+- Fix
+
+- Fix example config format
+
+- Fix
+
+- Fixes
+
+- Fix: server info widget images
+
+- Fix query
+
+- Fix close button pos in compose box
+
+- Fix
+
+- Fix border w/ wallpaper
+
+- Fix
+
+- Fix
+
+- Fix: locale key
+
+- Fix: show message on error alert if text is null
+
+- Fix gap
+
+- Fix: :recycle: use locale for error
+
+https://calckey.social/notes/9fippqiwhl287b5m
+
+- Fix mfm-cheat-sheet styling
+
+- Fix: vue-plyr audio tag
+
+Co-authored-by: mappi <mappi-pr@github.com>
+
+- Fix features
+
+- Fix varchar array
+
+- Fix primary key specifier
+
+- Fix unit test
+
+- Fix unit test
+
+- Fix native import
+
+- Fix unit tests
+
+- Fix migration
+
+- Fix: remove unessicary extra line in note menu
+
+- Fix tutorial
+
+- Fix: summary if 1 attachment
+
+- Fix outdated docker deps
+
+- Fix background of mentions
+
+- Fix: :bug: prevent null date insertion
+
+https://calckey.aokaga.work/notes/9f6ksv2oov
+
+- Fix in cheat sheet also, I've realized I will need to do it a different at some point but this works for now.
+
+- Fix collapsed height
+
+- Fix
+
+- Fix
+
+
+### Documentation
+
+- Docs: changes
+
+- Docs: 📝 sonic instructions
+
+- Docs: 📝 sonic
+
+- Docs: sonic
+
+- Docs: add note about reverse  migration
+
+- Docs: hyperlink foundkey commits
+
+- Docs: hyperlink foundkey commits
+
+- Docs: rm yunohost
+
+has been broken for months, I don't maintain it either.
+
+- Docs
+
+- Docs: links
+
+- Docs: 📝 pm2 logrotate
+
+- Docs: fix k8s link
+
+- Docs: add opencollective
+
+- Docs: cleanup apache
+
+- Docs: Add configuration for Caddy
+
+- Docs: cleanup apache
+
+- Docs: notes
+
+- Docs: develop by default
+
+- Docs: searc providers
+
+- Docs: deps
+
+- Docs: 📝 versions
+
+- Docs: 📝 typos
+
+- Docs: 📝 full git clone
+
+- Docs: 📝 rust version
+
+
+### Features
+
+- Feat: Make follower counts for remote users correct ([#9705](https://github.com/orhun/git-cliff/issues/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>
+
+- Add 404 as replacements
+
+- Feat: set license information for custom emojis ([#9719](https://github.com/orhun/git-cliff/issues/9719))
+
+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>
+
+- Feat: compile time compression
+
+- Feat: spruce up CLI
+
+- Feat: :sparkles: more themes!
+
+- Feat: swap home timeline with social's functionality ([#9597](https://github.com/orhun/git-cliff/issues/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>
+
+- Feat: add sonic to docker
+
+- Feat: masto api add display name
+
+- Feat: :sparkles: post metadata uses full @
+
+Closes #9660
+
+- Feat: new chat button on mobile
+
+- Feat: experimental post import
+
+- Add info
+
+- Feat: :sparkles: button in admin dash to index posts
+
+- Feat: custom KaTeX macro ([#9779](https://github.com/orhun/git-cliff/issues/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>
+
+- Add rust to docker
+
+- 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
+
+- Add argon
+
+- Feat: add option to boost with Home and Followers-only visibility ([#9788](https://github.com/orhun/git-cliff/issues/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>
+
+- Feat: :sparkles: search now searches posts and users
+
+- Feat: :sparkles: help menu in navbar
+
+- Add top margin to help button
+
+- Add VIPS to dockerfile
+
+- Add "speak as cat" setting to ja-jp
+
+- Feat: :sparkles: push notifs button
+
+Co-authored-by: Tamania <tamaina@hotmail.co.jp>
+
+- 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.
+
+- Feat: blur muted text
+
+- 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.
+
+- Feat: per-user boost muting ([#9825](https://github.com/orhun/git-cliff/issues/9825))
+
+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>
+
+- Feat: messaging room banner
+
+- Feat: mark all as read action in chat
+
+- Feat: admin lookup files/instance
+
+- Feat: index posts action
+
+- Feat: lookup post action
+
+- Feat: rename workspaces
+
+- Feat: :sparkles: software name on hover icon in instance ticker
+
+- Feat: add an option to disable emoji reactions ([#9878](https://github.com/orhun/git-cliff/issues/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>
+
+- Feat: make it toggleable whether to disable emojis in notifications ([#9880](https://github.com/orhun/git-cliff/issues/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>
+
+- Feat: Implement reading Announcements from MastoAPI
+
+- Feat: heatmap option for activity widget
+
+- Feat: reserved usernames ([#9917](https://github.com/orhun/git-cliff/issues/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>
+
+- Feat: :sparkles: frontend interface for post-account creation email verification
+
+- Add kaiteki to example proxyBypassHosts
+
+- Add additional information & show more button in user preview popup
+
+- Add the focus trap thingies again
+
+- Add toggler
+
+- Add blockMath
+
+- Add silenced colour
+
+- Add db migration
+
+- Add catppuccin latte
+
+- Add migration patches and fix commands
+
+- Feat: show message if signups are disabled
+
+- Feat: チャンネルの検索用ページとAPIの追加
+
+* add channel search
+
+* move  channel search to channel list page
+
+---------
+
+Co-authored-by: tamaina <tamaina@hotmail.co.jp>
+Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
+Co-authored-by: atsuchan <83960488+atsu1125@users.noreply.github.com>
+Co-authored-by: Masaya Suzuki <15100604+massongit@users.noreply.github.com>
+Co-authored-by: Kagami Sascha Rosylight <saschanaz@outlook.com>
+Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com>
+Co-authored-by: xianon <xianon@hotmail.co.jp>
+Co-authored-by: kabo2468 <28654659+kabo2468@users.noreply.github.com>
+Co-authored-by: YS <47836716+yszkst@users.noreply.github.com>
+Co-authored-by: Khsmty <me@khsmty.com>
+Co-authored-by: Soni L <EnderMoneyMod@gmail.com>
+Co-authored-by: mei23 <m@m544.net>
+Co-authored-by: daima3629 <52790780+daima3629@users.noreply.github.com>
+Co-authored-by: Windymelt <1113940+windymelt@users.noreply.github.com>
+
+- Feat: Add Nix development flake with flake-parts
+
+- Add back #10067 except for media change
+
+- Feat: :sparkles: ability for moderators to send mod mail
+
+- Adding calckey helm chart
+
+- Adding example config
+
+- Feat: 投稿したコンテンツのAIによる学習を軽減するオプションを追加
+
+Co-authored-by: GitHub <syuilo>
+
+- Add (back) pwa install button to help menu
+
+- Add initial button
+
+- Add experimental feature gate
+
+- Feat: allow horizontal scaling
+
+- Add touch events for tooltip on range input
+
+- Add withChart prop to UserCardMini
+
+- Add back icons
+
+- Add ::before & ::after to themeChanging class
+
+- Add fade description
+
+- Add fade to cheat sheet
+
+- Add fade to MFM options
+
+- Feat: :necktie: add link to TOS in info icon
+
+Address #10117
+
+- Add sonic back to compose
+
+- Add semicolon after property
+
+- Add advanced search parameters in search popup
+
+- Add ability to crop content
+
+- Add channel federation warn
+
+- Feat: ✨ server info widget
+
+Co-authored-by: Syuilo <syuilotan@yahoo.co.jp>
+
+- Add pie chart to meili stats
+
+- Add tooltip to meili pie chart
+
+- Feat: :sparkles: server metrics in admin overview
+
+- Add entities and two schemas
+
+- Add repository trait
+
+- Add mock database
+
+- Add utility crate
+
+- Add random string generator
+
+- Add integration test in model
+
+- Add tests
+
+- Add newtype
+
+- Add abstraction of string array type
+
+- Add migration to convert array to jsonb
+
+- Add default values
+
+- Add pack_by_id
+
+- Add napi schema
+
+- Add native calls
+
+- Add test
+
+- Add format script
+
+- Add unit test
+
+- Add integration test of antenna
+
+- Add cargo test script
+
+- Add rust to the runtime container for migrations
+
+
+### Miscellaneous Tasks
+
+- Chore: update megalodon
+
+- Chore: update package locks
+
+- Chore: bump pnpm version
+
+- Chore: add emoji aliases
+
+- Chore: :package: upgrade megalodon
+
+- Chore: update patron list
+
+- Chore: update patrons
+
+- Chore: bump pnpm
+
+- Update post job
+
+- Chore: :globe_with_meridians: locale changes
+
+Closes #9781 #9773
+
+- Chore: :globe_with_meridians: locale changes
+
+Closes #9781 #9773
+
+- Chore: update patron list
+
+- Chore: up pnpm
+
+- Chore: add cleanup migration
+
+- Chore: :art: format
+
+- Chore: remove okteto
+
+- Chore: update Japanese locale ([#9802](https://github.com/orhun/git-cliff/issues/9802))
+
+- Chore: update patrons
+
+- Chore: pnpm 8.1.1
+
+- Chore: back button in control panel
+
+- Chore: back button in more places
+
+- Chore: rome formatting
+
+- Chore: formatting
+
+- Chore: up pnpm
+
+- Chore: formatting
+
+- Chore: update mfm-js version ([#9844](https://github.com/orhun/git-cliff/issues/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>
+
+- Chore: up swc
+
+- Update locale
+
+- Chore: formatting
+
+- Chore: add weblate config file
+
+- 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/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: formatting
+
+- Update locales for calckey
+
+- 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/
+
+- 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/
+
+- 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/
+
+- 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/
+
+- 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/
+
+- 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/
+
+- 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/
+
+- 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/
+
+- 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/
+
+- 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/
+
+- 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/
+
+- 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/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: formatting
+
+- Chore: update summaly
+
+- 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/
+
+- 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/
+
+- 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/
+
+- 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/
+
+- 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/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: formatting
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- 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/
+
+- 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/
+
+- Chore: up pakcages
+
+- 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/
+
+- 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/
+
+- 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/
+
+- 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/
+
+- 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/
+
+- 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/
+
+- 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/
+
+- Chore: formatting
+
+- Chore: more rpine for server activity widget
+
+- Chore: update examples
+
+- Update patrons
+
+- 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/
+
+- 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/
+
+- 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/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: update icons on post form
+
+- Chore: Added translation using Weblate (Finnish)
+
+- Chore: Translated using Weblate (Finnish)
+
+Currently translated at 2.4% (43 of 1735 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fi/
+
+- Chore: upgrade megalodon
+
+- Chore: Translated using Weblate (English)
+
+Currently translated at 100.0% (1735 of 1735 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/en/
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 37.1% (644 of 1735 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (Finnish)
+
+Currently translated at 11.7% (204 of 1735 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fi/
+
+- Chore: Translated using Weblate (Finnish)
+
+Currently translated at 11.7% (204 of 1735 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fi/
+
+- Chore: Translated using Weblate (Japanese)
+
+Currently translated at 99.3% (1724 of 1735 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ja/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: up browser-image-resizer
+
+- Chore: format
+
+- Chore: theme refactor
+
+- Update patrons
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 69.2% (1204 of 1739 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: patrons
+
+- Chore: formatting
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1739 of 1739 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Updates to include alt text editing
+
+- Update file sensitivity on note edit
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1739 of 1739 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (Chinese (Traditional))
+
+Currently translated at 96.8% (1685 of 1739 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hant/
+
+- Chore: Translated using Weblate (Finnish)
+
+Currently translated at 21.1% (367 of 1739 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fi/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Translated using Weblate (English)
+
+Currently translated at 100.0% (1742 of 1742 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/en/
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1742 of 1742 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1742 of 1742 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 94.0% (1639 of 1742 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 94.0% (1639 of 1742 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Translated using Weblate (Finnish)
+
+Currently translated at 43.4% (757 of 1742 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fi/
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1742 of 1742 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1742 of 1742 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (Finnish)
+
+Currently translated at 43.5% (759 of 1742 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fi/
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1742 of 1742 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 94.6% (1649 of 1742 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Translated using Weblate (Finnish)
+
+Currently translated at 48.9% (853 of 1742 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fi/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1744 of 1744 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 96.3% (1681 of 1744 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 96.5% (1683 of 1744 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 96.5% (1683 of 1744 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 96.5% (1683 of 1744 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1744 of 1744 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: format
+
+- Chore: patrons
+
+- Update tag
+
+- Chore: patrons
+
+- Chore: patrons
+
+- Chore: formatting
+
+- Chore: patrons
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1747 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 96.5% (1687 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 96.5% (1687 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Translated using Weblate (Finnish)
+
+Currently translated at 51.6% (902 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fi/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 96.6% (1688 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1750 of 1750 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 96.5% (1688 of 1748 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: formatting
+
+- Chore: pnpm 8.4.0
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 96.6% (1690 of 1749 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: format
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 97.3% (1703 of 1749 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Update import-export options
+
+- Chore: formatting
+
+- Chore: formatting
+
+- Chore: patrons
+
+- Chore: patrons
+
+- Chore: formatting
+
+- Chore: Translated using Weblate (English)
+
+Currently translated at 100.0% (1734 of 1734 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/en/
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 99.9% (1733 of 1734 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (Czech)
+
+Currently translated at 50.6% (879 of 1734 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/cs/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 97.6% (1693 of 1734 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Translated using Weblate (Spanish)
+
+Currently translated at 92.5% (1605 of 1734 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/es/
+
+- Chore: Translated using Weblate (French)
+
+Currently translated at 95.4% (1655 of 1734 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fr/
+
+- Chore: Translated using Weblate (French)
+
+Currently translated at 95.4% (1655 of 1734 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fr/
+
+- Chore: Translated using Weblate (Indonesian)
+
+Currently translated at 84.0% (1457 of 1734 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/id/
+
+- Chore: Translated using Weblate (Polish)
+
+Currently translated at 99.4% (1725 of 1734 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/pl/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1735 of 1735 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 97.5% (1693 of 1735 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 99.3% (1725 of 1737 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 99.3% (1725 of 1737 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Translated using Weblate (Polish)
+
+Currently translated at 99.3% (1725 of 1737 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/pl/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: up pnpm
+
+- Update locale
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1738 of 1738 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 99.4% (1729 of 1738 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: formatting
+
+- Update translation
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 99.9% (1746 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (French)
+
+Currently translated at 96.2% (1682 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fr/
+
+- Chore: Translated using Weblate (French)
+
+Currently translated at 96.2% (1682 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fr/
+
+- Chore: Translated using Weblate (French)
+
+Currently translated at 96.2% (1682 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fr/
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1747 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 99.0% (1730 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Translated using Weblate (French)
+
+Currently translated at 96.2% (1682 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/fr/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Translated using Weblate (English)
+
+Currently translated at 100.0% (1744 of 1744 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/en/
+
+- Chore: Translated using Weblate (Japanese)
+
+Currently translated at 99.9% (1743 of 1744 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ja/
+
+- Chore: Translated using Weblate (Japanese)
+
+Currently translated at 99.9% (1743 of 1744 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ja/
+
+- Chore: Translated using Weblate (Russian)
+
+Currently translated at 98.1% (1711 of 1744 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ru/
+
+- Chore: Translated using Weblate (Danish)
+
+Currently translated at 11.4% (200 of 1744 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/da/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 99.1% (1729 of 1744 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1745 of 1745 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: formatting
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1742 of 1742 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1743 of 1743 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Translated using Weblate (Chinese (Traditional))
+
+Currently translated at 98.6% (1719 of 1743 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/zh_Hant/
+
+- Chore: Translated using Weblate (Dutch)
+
+Currently translated at 19.7% (344 of 1743 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: formatting
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1746 of 1746 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: formatting
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1747 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (Dutch)
+
+Currently translated at 23.2% (407 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
+
+- Chore: formatting
+
+- Chore: up mfm-js in backend
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1747 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (Dutch)
+
+Currently translated at 24.9% (436 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
+
+- Chore: Translated using Weblate (Dutch)
+
+Currently translated at 24.9% (436 of 1747 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: upgrade swiper
+
+- Chore: formatting
+
+- Chore: up pnpm
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1748 of 1748 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (Dutch)
+
+Currently translated at 25.0% (438 of 1748 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: formatting
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1750 of 1750 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Merge branch 'origin/develop' into Weblate.
+
+- Chore: Translated using Weblate (Catalan)
+
+Currently translated at 100.0% (1753 of 1753 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ca/
+
+- Chore: Translated using Weblate (Dutch)
+
+Currently translated at 30.8% (541 of 1753 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 95.6% (1676 of 1753 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Translated using Weblate (German)
+
+Currently translated at 95.6% (1676 of 1753 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/de/
+
+- Chore: Translated using Weblate (Dutch)
+
+Currently translated at 31.6% (554 of 1753 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
+
+- Chore: formatting
+
+- Update post import
+
+- Update inbox import timeout
+
+- Chore: Translated using Weblate (Dutch)
+
+Currently translated at 32.1% (564 of 1753 strings)
+
+Translation: Calckey/locales
+Translate-URL: https://hosted.weblate.org/projects/calckey/locales/nl/
+
+- Chore: formatting
+
+- Chore: format
+
+- Chore: rebase to v13 MkFolder
+
+Co-authored-by: Syuilo <syuilotan@yahoo.co.jp>
+
+- Chore: formatting
+
+- Chore: :arrow_up: up pnpm
+
+- Chore: :bulb: meili
+
+- Chore: format
+
+- Chore: format
+
+- Chore: :technologist: pull request template
+
+- Chore: formatting
+
+- Chore: up bull-board deps
+
+- Chore: :arrow_up: up bull
+
+- Chore: formatting
+
+- Chore: formatting
+
+- Chore: update example config
+
+- Chore: formatting
+
+- Chore: formatting
+
+- Chore: :arrow_up: up various deps
+
+- Chore: format
+
+- Chore: formatting
+
+- Chore: :arrow_up: up deps
+
+- Chore: formatting
+
+- Chore: format
+
+
+### Performance
+
+- Perf: インスタンスデフォルトテーマを予めjson5 -> jsonに変換しておくことでjson5を初期バンドルに含めずに済むように
+
+Co-authored-by: Syuilo <syuilotan@yahoo.co.jp>
+
+
+### Refactor
+
+- Refactor: nyaize on the frontend
+
+- Refactor
+
+- Refactor: change import type to radio
+
+- Refactor: remove internal apps page
+
+- Enhance: emoji width and height
+
+- Refactor: make post imports an experiment
+
+- Refactor: :coffin: remove old metrics view
+
+- Refactor: add back old info display from mkv12
+
+- Refactor: :recycle: ssr views
+
+Correct og:type for users, format docs, deprecate _info_card_
+
+- Refactor: :recycle: sync note summaries
+
+- Refactor: remove mk remnants
+
+
+### Styling
+
+- Style
+
+- Style announcement image
+
+- Style: 💄 server metrics widgets
+
+
+## [13.2.0-beta3] - 2023-03-16
+
+### Documentation
+
+- Docs: :memo: accurate update instructions
+
+Closes #9709
+
+- Docs: :memo: accurate update instructions
+
+Closes #9709
+
+
+## [13.1.4.1] - 2023-03-16
+
+## [13.1.4] - 2023-03-16
+
+### Bug Fixes
+
+- Fix: Isolate unicode characters in display names ([#9702](https://github.com/orhun/git-cliff/issues/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>
+
+- 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.
+
+- Fix: Run to boolean conversion in mastoAPI public and hashtag timelines ([#9710](https://github.com/orhun/git-cliff/issues/9710))
+
+- Fix footer icons
+
+- Fix line in boosted text
+
+- Fix line alignment in smaller windows
+
+
+## [13.1.3] - 2023-03-14
+
+### Bug Fixes
+
+- Fix iconOnly for home tl
+
+- Fix import
+
+- Fix: some Masotdon API compat issues ([#9592](https://github.com/orhun/git-cliff/issues/9592))
+Co-authored-by: GeopJr <geopjr@noreply.codeberg.org>
+Co-committed-by: GeopJr <geopjr@noreply.codeberg.org>
+
+- Fix(client): validate urls to improve security
+
+- Fix: :lock: prevent issues
+
+- Fix(client): use proxied image for instance icon
+
+- Fix(client): use proxied image for instance icon
+
+- Fix: 🐛 100vh body background color
+
+- Fix timelines
+
+- Fix: correct megalodon import
+
+- Fix navbar hover thingy ([#9616](https://github.com/orhun/git-cliff/issues/9616))
+
+Co-authored-by: Freeplay <Freeplay@duck.com>
+Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9616
+Co-authored-by: Free <freeplay@duck.com>
+Co-committed-by: Free <freeplay@duck.com>
+
+- Fix
+
+- Fix
+
+- Fix submenu positioning
+
+- Fix: :bug: first user gets admin
+
+Closes #9620
+
+Co-authored-by: @Johann150
+
+- Fix
+
+- Fix wrong import
+
+- Fix: correctly use note.emojis
+
+- Fix import
+
+- Fix
+
+- Fix import
+
+- Fix: :lipstick: admin overview style
+
+- Fix: :bug: pagination for "/api/channels/followed"
+
+Co-authored-by: takonomura <@takonomura@github.com>
+
+- Fix: more readable icon bgs
+
+- Fix
+
+- Fix
+
+- Fix oopsie
+
+- Fix: city validation
+
+- Fix: :bug: Don't show image previews if NSFW
+
+Closes #9636
+
+- Fix: dialog
+
+- Fix?
+
+- Fix??
+
+- Fix
+
+- Fix
+
+- Fix MkUpdated
+
+- Fix broken style
+
+- Fix: :bug: url slicing
+
+- Fix: visibility picker
+
+- Fix mastodon api stats
+
+- Fixed what ever calc did here, masto app didnt
+
+- Fix click events
+
+- Fix not being able to click around there are new posts button
+
+- Fix not being able to click around there are new posts button
+
+- Fix: multiple Ads' bugs.
+feat: Ads widget
+
+https://codeberg.org/calckey/calckey/issues/9138
+https://codeberg.org/calckey/calckey/issues/9080
+
+- Fix alignment
+
+- Fix line alignment
+
+- Fix subnote body clip area™
+
+- Fix small window sizes
+
+- Fix indents on this ?
+
+- Fix errors
+
+- Fix import
+
+- Fix: post button text alignment
+
+- Fix mobile navbar
+
+- Fix?
+
+- Fix: mona is free
+
+
+### Documentation
+
+- Docs: 📝 custom assets
+
+- Docs: 📝 migration from mk
+
+- Docs: get patch
+
+- Docs: run mig step
+
+
+### Features
+
+- Feat: ✨ don't depend on an external service for urn:ietf:wg:oauth:2.0:oob ([#9602](https://github.com/orhun/git-cliff/issues/9602))
+Co-authored-by: GeopJr <evan@geopjr.dev>
+Co-committed-by: GeopJr <evan@geopjr.dev>
+
+- Add account lookup
+
+- Add webpack config to compile sw.js for browser
+
+- Feat: :sparkles: remote featured notes
+
+- Feat: ✨ Add in Misskey v13's reacted users view
+
+- Feat: :sparkles: add position, scale , fg, and bg MFM from v13
+
+- Feat: #9614
+
+- Add debug to error
+
+- Feat: :sparkles: new admin panel data from Mk v13
+
+- Add needed script
+
+- Add isActiveTab method
+
+- Feat: :sparkles: Show time for users
+
+- Feat: new modal
+
+- Add reply connectors, a
+
+- Add footer hover thingy to subnote too
+
+- Add some animations to reactions
+
+- Feat: 🔖 13.1.3
+
+
+### Miscellaneous Tasks
+
+- Update pnpm locks
+
+- Chore: :art: new dummy images
+
+- Chore: Rome Formatting
+
+- Chore: up calckey.js
+
+- Chore: calckey megalodon
+
+- Chore: tag dev1
+
+- Chore: formatting
+
+- Chore: formatting
+
+- Chore: formatting
+
+- Chore: remove hard-to-see gradient
+
+- Chore: formatting
+
+- Chore: formatting
+
+- Chore: :fire: remove ability to add Twitter integration
+
+- Chore: rm dead code
+
+- Update readme
+
+- Update thingy?
+
+- Chore: update Japanese locale ([#9673](https://github.com/orhun/git-cliff/issues/9673))
+Co-authored-by: Namekuji <nmkj@noreply.codeberg.org>
+Co-committed-by: Namekuji <nmkj@noreply.codeberg.org>
+
+- Chore: notes --> posts
+
+- Chore: apps
+
+- Chore: phosphor 2.0.2
+
+adds woff2 as of 2.0.2 (my pr)
+
+- Chore: update patrons list
+
+- Chore: up icons
+
+
+### Performance
+
+- Perf: :zap: emoji lib performance fix
+
+- Perf: :zap: MkPageHeader perf
+
+- Perf: :zap: emoji lib performance fix
+
+
+### Refactor
+
+- Refactor please signin component
+
+- Refactor: use MkAvatars for mods
+
+- Refactor: max 5 url previews
+
+Closes #9654
+
+- Refactor: :arrow_up: phosphor 2, sorta
+
+thank you sammy
+
+
+### Styling
+
+- Style
+
+- Style view thread continuation button + fix link underline
+
+- Style fixes
+
+- Style: inlie-flex on ph-fw
+
+
+### Testing
+
+- Test
+
+- Testing
+
+
+## [13.1.3-rc] - 2023-02-09
+
+### Bug Fixes
+
+- Fix some ctx stuff
+
+- Fixes
+
 - Fix: Hide unmute option when the user is blocked
 
+- Fix: Use theme --bg instead of a hardcoded color
+
+
+### Documentation
+
+- Docs: :memo: changelog
+
+- Docs: 📝 branches
+
+
 ### Features
 
 - Feat: Mute and unfollow when blocking a user
 
 - Feat: Unblock with follow button
 
-- Refresh user when changed
+* refresh user when changed
+
+- Feat: ✨ v1 Mastodon API
+This commit adds (maybe unstable) support for Mastodons v1 api
+also some v2 endpoints, maybe I miss stuff, I dont know.
+We will need to test this but it should be kinda stable
+and work like (old) butter.
+
+Co-authored-by: Natty <natty.sh.git@gmail.com>
+Co-authored-by: cutls <web-pro@cutls.com>
 
 - Feature/help_menu ([#9587](https://github.com/orhun/git-cliff/issues/9587))
 
@@ -31,6 +2425,8 @@ Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9587
 
 ## [13.1.2] - 2023-02-06
 
+## [13.1.1] - 2023-02-05
+
 ### Bug Fixes
 
 - Fix: :bug: federate fedibird quote properly
@@ -130,6 +2526,10 @@ Closes #9544
 
 - Fix: reactions using unicode weren't processed
 
+- Fixing a git merge error.
+
+- Fix: docker tags
+
 
 ### Documentation
 
@@ -1174,10 +3574,10 @@ fix: :fire: Remove meta implementation in routing for now
 
 - Feat: show header with current user avatar on TL ([#9051](https://github.com/orhun/git-cliff/issues/9051))
 
-* feat: show header with current user avatar on TL
-
-* refactor(client): use displayMyAvatar prop instead of metadata
-
+* feat: show header with current user avatar on TL
+
+* refactor(client): use displayMyAvatar prop instead of metadata
+
 * refactor(client): prefer v-if to `display: none;`
 - Feat: :bookmark: .1
 
@@ -1290,23 +3690,23 @@ From yarn upgrade-interactive
 
 - Chore(sw): only proxies HTML requests ([#9070](https://github.com/orhun/git-cliff/issues/9070))
 
-* chore(sw): only proxies HTML requests
-
-もはやHTMLじゃなさそうなリクエストにはSWで関与しないようにする
-
-こうするといろいろな面倒事が解決するはず…たぶん
-
-Resolve #9037
-Resolve #9038
-
-* align code style
-
-* Update packages/sw/src/sw.ts
-
-Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
-
-Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
-Co-authored-by: tamaina <tamaina@hotmail.co.jp>
+* chore(sw): only proxies HTML requests
+
+もはやHTMLじゃなさそうなリクエストにはSWで関与しないようにする
+
+こうするといろいろな面倒事が解決するはず…たぶん
+
+Resolve #9037
+Resolve #9038
+
+* align code style
+
+* Update packages/sw/src/sw.ts
+
+Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
+
+Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
+Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 - Chore: :twisted_rightwards_arrows: Merge upstream to 12.119.0
 
@@ -1434,57 +3834,57 @@ Fix #9043
 
 - Feature: Client Preferences Registry ([#8511](https://github.com/orhun/git-cliff/issues/8511))
 
-* Fix settings page
-
-* nanka iroiro
-
-* clean up
-
-* clean up
-
-* feature: Client Preferences Registry on the account
-
-* add changelog
-
-* インデックスに戻ってもタイトルが残ってしまうのを修正
-
-* fix createdAt -> updatedAt
-
-* remove console.log
-
-* 適用→このデバイスに適用
-
-* add wallpaper
-
-* ローカルのjsonファイルを保存・読み込みできるように
-
-* clean up
-
-* use apiWithDialog
-
-* Update packages/client/src/pages/settings/preferences-registry.vue
-
-Co-authored-by: Andreas Nedbal <github-bf215181b5140522137b3d4f6b73544a@desu.email>
-
-* Update packages/client/src/pages/settings/preferences-registry.vue
-
-Co-authored-by: Andreas Nedbal <github-bf215181b5140522137b3d4f6b73544a@desu.email>
-
-* Update packages/client/src/pages/settings/preferences-registry.vue
-
-Co-authored-by: Andreas Nedbal <github-bf215181b5140522137b3d4f6b73544a@desu.email>
-
-* fix lint
-
-* :v:
-
-* change router
-
-* nanka iroiro
-
-* tweak
-
-Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
+* Fix settings page
+
+* nanka iroiro
+
+* clean up
+
+* clean up
+
+* feature: Client Preferences Registry on the account
+
+* add changelog
+
+* インデックスに戻ってもタイトルが残ってしまうのを修正
+
+* fix createdAt -> updatedAt
+
+* remove console.log
+
+* 適用→このデバイスに適用
+
+* add wallpaper
+
+* ローカルのjsonファイルを保存・読み込みできるように
+
+* clean up
+
+* use apiWithDialog
+
+* Update packages/client/src/pages/settings/preferences-registry.vue
+
+Co-authored-by: Andreas Nedbal <github-bf215181b5140522137b3d4f6b73544a@desu.email>
+
+* Update packages/client/src/pages/settings/preferences-registry.vue
+
+Co-authored-by: Andreas Nedbal <github-bf215181b5140522137b3d4f6b73544a@desu.email>
+
+* Update packages/client/src/pages/settings/preferences-registry.vue
+
+Co-authored-by: Andreas Nedbal <github-bf215181b5140522137b3d4f6b73544a@desu.email>
+
+* fix lint
+
+* :v:
+
+* change router
+
+* nanka iroiro
+
+* tweak
+
+Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 Co-authored-by: Andreas Nedbal <github-bf215181b5140522137b3d4f6b73544a@desu.email>
 - Feat(client): improve widget
 
@@ -1573,10 +3973,10 @@ Fix #9026
 
 - Fix: broken chats ([#8983](https://github.com/orhun/git-cliff/issues/8983))
 
-* Fix broken chats
-
-Co-authored-by: @ltlapy
-
+* Fix broken chats
+
+Co-authored-by: @ltlapy
+
 * :art:
 - Fix
 
@@ -1608,19 +4008,19 @@ Co-authored-by: @ltlapy
 
 - Chore(deps): bump terser from 5.9.0 to 5.14.2 ([#9024](https://github.com/orhun/git-cliff/issues/9024))
 
-Bumps [terser](https://github.com/terser/terser) from 5.9.0 to 5.14.2.
-- [Release notes](https://github.com/terser/terser/releases)
-- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
-- [Commits](https://github.com/terser/terser/commits)
-
----
-updated-dependencies:
-- dependency-name: terser
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [terser](https://github.com/terser/terser) from 5.9.0 to 5.14.2.
+- [Release notes](https://github.com/terser/terser/releases)
+- [Changelog](https://github.com/terser/terser/blob/master/CHANGELOG.md)
+- [Commits](https://github.com/terser/terser/commits)
+
+---
+updated-dependencies:
+- dependency-name: terser
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(client): tweak theme select ui
 
@@ -1630,33 +4030,33 @@ Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.c
 
 - Chore(deps): bump file-type from 17.1.2 to 17.1.3 in /packages/backend ([#9030](https://github.com/orhun/git-cliff/issues/9030))
 
-Bumps [file-type](https://github.com/sindresorhus/file-type) from 17.1.2 to 17.1.3.
-- [Release notes](https://github.com/sindresorhus/file-type/releases)
-- [Commits](https://github.com/sindresorhus/file-type/compare/v17.1.2...v17.1.3)
-
----
-updated-dependencies:
-- dependency-name: file-type
-  dependency-type: direct:production
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [file-type](https://github.com/sindresorhus/file-type) from 17.1.2 to 17.1.3.
+- [Release notes](https://github.com/sindresorhus/file-type/releases)
+- [Commits](https://github.com/sindresorhus/file-type/compare/v17.1.2...v17.1.3)
+
+---
+updated-dependencies:
+- dependency-name: file-type
+  dependency-type: direct:production
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump undici from 5.5.1 to 5.8.0 in /packages/backend ([#9028](https://github.com/orhun/git-cliff/issues/9028))
 
-Bumps [undici](https://github.com/nodejs/undici) from 5.5.1 to 5.8.0.
-- [Release notes](https://github.com/nodejs/undici/releases)
-- [Commits](https://github.com/nodejs/undici/compare/v5.5.1...v5.8.0)
-
----
-updated-dependencies:
-- dependency-name: undici
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [undici](https://github.com/nodejs/undici) from 5.5.1 to 5.8.0.
+- [Release notes](https://github.com/nodejs/undici/releases)
+- [Commits](https://github.com/nodejs/undici/compare/v5.5.1...v5.8.0)
+
+---
+updated-dependencies:
+- dependency-name: undici
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(client): tweak style
 
@@ -2926,25 +5326,25 @@ Closes #2519
 - Fix(package): update @types/node to version 10.9.4
 - Fix #2315 ([#2339](https://github.com/orhun/git-cliff/issues/2339))
 
-* improve MFM to html
-
-* improve html to MFM
-
-* missing semicolon
-
-* missing semicolon
-
-* fix html to MFM
-
-タグのリンクは解除するように
-
-* fix bug
-
-* misssing semicolon
-
-* Update html-to-mfm.ts
-
-* Update html-to-mfm.ts
+* improve MFM to html
+
+* improve html to MFM
+
+* missing semicolon
+
+* missing semicolon
+
+* fix html to MFM
+
+タグのリンクは解除するように
+
+* fix bug
+
+* misssing semicolon
+
+* Update html-to-mfm.ts
+
+* Update html-to-mfm.ts
 
 - Fix
 
@@ -3213,11 +5613,11 @@ Closes #2986
 
 - Fix #5214 ウィジェットが選択されていないときは追加されないように ([#5227](https://github.com/orhun/git-cliff/issues/5227))
 
-* fix #5214
-
-* null削除の取り消し
-
-* 空白文字の調整
+* fix #5214
+
+* null削除の取り消し
+
+* 空白文字の調整
 
 - Fix typo in misskey.nginx ([#5445](https://github.com/orhun/git-cliff/issues/5445))
 
@@ -3300,15 +5700,15 @@ Close #6434
 
 - Fix サイドバーの設定に不具合があるとページが表示できなくなる ([#6473](https://github.com/orhun/git-cliff/issues/6473))
 
-* fix #6460
-
-* Update app.vue
-
+* fix #6460
+
+* Update app.vue
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Fix 非ログイン時に n または p キー押下で投稿フォームが出る ([#6508](https://github.com/orhun/git-cliff/issues/6508))
 
-* fix #5851
-
+* fix #5851
+
 * post-formのスポーンを弾く場所を変更
 - Fix(client): Fix style
 
@@ -3544,20 +5944,20 @@ Resolve #7540
 
 - Fix: truncate user information if it is too long ([#7629](https://github.com/orhun/git-cliff/issues/7629))
 
-* truncate user information if it is too long
-
-Some AP software allows for user names or summaries to be very long.
-Misskey can not handle this and the profile page can not be opened and
-no activities from such users can be seen.
-
-Instead, the user name and summary are cut off after the maximum length
-so misskey can still process the activities of the profile.
-
-Co-authored-by: Toast <toast@toast.cafe>
-
-* fix code style
-
-Co-authored-by: Toast <toast@toast.cafe>
+* truncate user information if it is too long
+
+Some AP software allows for user names or summaries to be very long.
+Misskey can not handle this and the profile page can not be opened and
+no activities from such users can be seen.
+
+Instead, the user name and summary are cut off after the maximum length
+so misskey can still process the activities of the profile.
+
+Co-authored-by: Toast <toast@toast.cafe>
+
+* fix code style
+
+Co-authored-by: Toast <toast@toast.cafe>
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Fix typo
 
@@ -3601,17 +6001,17 @@ Fix #7648
 
 - Fix missing strings ([#7674](https://github.com/orhun/git-cliff/issues/7674))
 
-* fix sort menu in federation panel
-
-* add missing strings in report menu
-
+* fix sort menu in federation panel
+
+* add missing strings in report menu
+
 * change i18n key too
 - Fix Dockerfile ([#7763](https://github.com/orhun/git-cliff/issues/7763))
 
-* fix Dockerfile
-
-* remove unnecessary change
-
+* fix Dockerfile
+
+* remove unnecessary change
+
 * add misskey-assets in .dockerignore
 - Fix(server): ノート翻訳時に公開範囲が考慮されていない問題を修正
 
@@ -3645,32 +6045,32 @@ from: https://gitlab.com/xianon/misskey/-/commit/a89742319caea378f9cdd70c8ebd83b
 
 - Fix: truncate image descriptions ([#7699](https://github.com/orhun/git-cliff/issues/7699))
 
-* move truncate function to separate file to reuse it
-
-* truncate image descriptions
-
-* show image description limit in UI
-
-* correctly treat null
-
-Co-authored-by: nullobsi <me@nullob.si>
-
-* make truncate Unicode-aware
-
-The strings that truncate returns should now be valid Unicode.
-
-PostgreSQL also counts Unicode Code Points instead of bytes so this
-should be correct.
-
-* move truncate to internal, validate in API
-
-Truncating could also be done in src/services/drive/add-file.ts or
-src/services/drive/upload-from-url.ts but those would also affect
-local images. But local images should result in a hard error if the
-image comment is too long.
-
-* avoid overwriting
-
+* move truncate function to separate file to reuse it
+
+* truncate image descriptions
+
+* show image description limit in UI
+
+* correctly treat null
+
+Co-authored-by: nullobsi <me@nullob.si>
+
+* make truncate Unicode-aware
+
+The strings that truncate returns should now be valid Unicode.
+
+PostgreSQL also counts Unicode Code Points instead of bytes so this
+should be correct.
+
+* move truncate to internal, validate in API
+
+Truncating could also be done in src/services/drive/add-file.ts or
+src/services/drive/upload-from-url.ts but those would also affect
+local images. But local images should result in a hard error if the
+image comment is too long.
+
+* avoid overwriting
+
 Co-authored-by: nullobsi <me@nullob.si>
 - Fix bug
 
@@ -3735,33 +6135,33 @@ Fix #7905
 
 - Fix: Fix #7895 ([#7937](https://github.com/orhun/git-cliff/issues/7937))
 
-* Fix #7895
-
+* Fix #7895
+
 * CHANGELOG
 - Fix: 削除したノートやユーザーがリモートから参照されると復活することがあるのを修正 ([#7918](https://github.com/orhun/git-cliff/issues/7918))
 
-* Fix #7557
-
-* CHANGELOG
-
-* Fix user
-
-* CHANGELOG
-
-* Tune CHANGELOG
-
-* Tune CHANGELOG
-
-* resolver
-
-* Remove check
-
-* Remove import
-
-* CHANGELOG
-
-* Tune
-
+* Fix #7557
+
+* CHANGELOG
+
+* Fix user
+
+* CHANGELOG
+
+* Tune CHANGELOG
+
+* Tune CHANGELOG
+
+* resolver
+
+* Remove check
+
+* Remove import
+
+* CHANGELOG
+
+* Tune
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Fix(client): ページ編集時のドロップダウンメニューなどが動作しない問題を修正
 
@@ -3775,10 +6175,10 @@ Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 
 - Fix(client): Add missing localization string ([#7944](https://github.com/orhun/git-cliff/issues/7944))
 
-* 欠けるi18nストリングの追加
-
-* Update ja-JP.yml
-
+* 欠けるi18nストリングの追加
+
+* Update ja-JP.yml
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Fix
 
@@ -3796,12 +6196,12 @@ Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 
 - Fix: mention local users in replies ([#7975](https://github.com/orhun/git-cliff/issues/7975))
 
-* mention local users in replies
-
+* mention local users in replies
+
 * fix merge
 - Fix(client): reaction viewer layout ([#7942](https://github.com/orhun/git-cliff/issues/7942))
 
-The profile picture and name should be grouped together as they belong, and
+The profile picture and name should be grouped together as they belong, and
 it should be clear which picture belongs to which name.
 - Fix for lint
 
@@ -3816,8 +6216,8 @@ it should be clear which picture belongs to which name.
 
 - Fix(client): fix plugin activate and uninstall ([#7991](https://github.com/orhun/git-cliff/issues/7991))
 
-* fix(client): fix plugin activate and uninstall
-
+* fix(client): fix plugin activate and uninstall
+
 * Fix(client): fix package activates
 - Fix(client): better error handling of file upload
 
@@ -3827,48 +6227,48 @@ it should be clear which picture belongs to which name.
 
 - Fix: toolsが動かないのを修正 ([#8008](https://github.com/orhun/git-cliff/issues/8008))
 
-* Move tools
-
+* Move tools
+
 * Fix DB
 - Fix: notification.vueのIntersectionObserverまわりを修正 ([#8010](https://github.com/orhun/git-cliff/issues/8010))
 
-* fix notification.vue
-
-* remove a blank line
-
-* disconnect intersection observer
-
-* disconnect2
-
-* Update packages/client/src/components/notification.vue
-
-Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
-
-* disconnect
-
-* oops
-
+* fix notification.vue
+
+* remove a blank line
+
+* disconnect intersection observer
+
+* disconnect2
+
+* Update packages/client/src/components/notification.vue
+
+Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
+
+* disconnect
+
+* oops
+
 Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 - Fix(client): モバイルでタップしたときにツールチップが表示される問題を修正
 
 - Fix: LTLやGTLが無効になっている場合でもUI上にタブが表示される問題を修正 ([#8026](https://github.com/orhun/git-cliff/issues/8026))
 
-* wip
-
-* add changelog
-
+* wip
+
+* add changelog
+
 * 変換ミス修正
 - Fix mentions in replies ([#8030](https://github.com/orhun/git-cliff/issues/8030))
 
 
 - Fix: 画像ファイルの縦横サイズの取得で Exif Orientation を考慮する ([#8014](https://github.com/orhun/git-cliff/issues/8014))
 
-* 画像ファイルの縦横サイズの取得で Exif Orientation を考慮する
-
-* test: Add rotate.jpg test
-
-* Webpublic 画像を返す時のみ Exif Orientation を考慮して縦横サイズを返す
-
+* 画像ファイルの縦横サイズの取得で Exif Orientation を考慮する
+
+* test: Add rotate.jpg test
+
+* Webpublic 画像を返す時のみ Exif Orientation を考慮して縦横サイズを返す
+
 * test: Support orientation
 - Fix(server): Fix #8032
 
@@ -3959,35 +6359,35 @@ https://github.com/misskey-dev/misskey/commit/d53795184cd0ee326b0da58b267e3460f9
 
 - Fix: proxyでsvgをpngに変換するように ([#8106](https://github.com/orhun/git-cliff/issues/8106))
 
-* wip
-
-* revert send-drive-file change
-
-* fix
-
-* Update packages/backend/src/server/proxy/proxy-media.ts
-
-Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>
-
+* wip
+
+* revert send-drive-file change
+
+* fix
+
+* Update packages/backend/src/server/proxy/proxy-media.ts
+
+Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>
+
 Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>
 - Fix: code url in documentation ([#8117](https://github.com/orhun/git-cliff/issues/8117))
 
 It seems this was not changed while refactoring the modules apart.
 - Fix([#8133](https://github.com/orhun/git-cliff/issues/8133)): hCaptcha の reCAPTCHA 互換挙動を無効化する ([#8135](https://github.com/orhun/git-cliff/issues/8135))
 
-* fix([#8133](https://github.com/orhun/git-cliff/issues/8133)): hCaptcha の reCAPTCHA 互換挙動を無効化する
-
-* Update packages/client/src/components/captcha.vue
-
-* fix: hCaptcha host
-
+* fix([#8133](https://github.com/orhun/git-cliff/issues/8133)): hCaptcha の reCAPTCHA 互換挙動を無効化する
+
+* Update packages/client/src/components/captcha.vue
+
+* fix: hCaptcha host
+
 Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 - Fix(client): タイムラインのkeep-aliveが効かなくなっているのを修正
 
 - Fix: アップロードエラー時の処理を修正 ([#8182](https://github.com/orhun/git-cliff/issues/8182))
 
-* アップロードのエラー応答で詰むのを修正
-
+* アップロードのエラー応答で詰むのを修正
+
 * CHANGELOG
 - Fix: change keypress to keydown ([#8192](https://github.com/orhun/git-cliff/issues/8192))
 
@@ -4018,41 +6418,41 @@ Fix #8212
 
 - Fix federation widged ([#8221](https://github.com/orhun/git-cliff/issues/8221))
 
-The variables accidentally shadowed the variables that contain the ref's
+The variables accidentally shadowed the variables that contain the ref's
 to be rendered into the template.
 - Fix federation widget
 - Fix eslint rule
 
 - Fix: ensure that specified users does not get duplicates ([#8233](https://github.com/orhun/git-cliff/issues/8233))
 
-* ensure that specified users does not get duplicates
-
-* Update packages/client/src/components/post-form.vue
-
-Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
-
+* ensure that specified users does not get duplicates
+
+* Update packages/client/src/components/post-form.vue
+
+Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Fix: Fix Sideview ([#8235](https://github.com/orhun/git-cliff/issues/8235))
 
-* Fix #7890
-
-* a-
-
-* 3度目の正直
-
-* fix
-
-* :v:
-
-* update CHANGELOG
-
+* Fix #7890
+
+* a-
+
+* 3度目の正直
+
+* fix
+
+* :v:
+
+* update CHANGELOG
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Fix(client): ツールチップの表示位置が正しくない問題を修正
 
 - Fix: ストリーミングからのAPIリクエストが出来ないのを修正 ([#8244](https://github.com/orhun/git-cliff/issues/8244))
 
-* Update call.ts
-
+* Update call.ts
+
 * あれ
 - Fix(client): fix compare-versions import
 
@@ -4062,30 +6462,30 @@ Fix #6831
 - Fix chart clean
 - Fix: NodeInfo のユーザー数と投稿数の内容を見直す ([#8255](https://github.com/orhun/git-cliff/issues/8255))
 
-* NodeInfoのアクティブユーザーの取得方法を変更する
-
+* NodeInfoのアクティブユーザーの取得方法を変更する
+
 * NodeInfoの投稿数の出力内容を見直す
 - Fix
 
 - Fix: v-sizeディレクティブの動作を修正 ([#8249](https://github.com/orhun/git-cliff/issues/8249))
 
-* Fix size directive behavior not activated
-
-* calc
-
-* wip
-
-* cache computed classes
-
-* fix Vue3では使えなくなった
-
-* 不要なIntersection Observerを削除
-
+* Fix size directive behavior not activated
+
+* calc
+
+* wip
+
+* cache computed classes
+
+* fix Vue3では使えなくなった
+
+* 不要なIntersection Observerを削除
+
 * comment
 - Fix: instance ticker ([#8260](https://github.com/orhun/git-cliff/issues/8260))
 
-* add type and default values
-
+* add type and default values
+
 * remove unnecessary string operation
 - Fix(server): system queueが動いていないのを修正
 
@@ -4119,23 +6519,23 @@ Fix #8252
 
 - Fix: regular expressions in word mutes ([#8254](https://github.com/orhun/git-cliff/issues/8254))
 
-* fix: handle regex exceptions for word mutes
-
-* add i18n strings
-
-Co-authored-by: rinsuki <428rinsuki+git@gmail.com>
-
-* stricter input validation in backend
-
-* add migration for hard mutes
-
-* fix
-
-* use correct regex library in migration
-
-* use query builder to avoid SQL injection
-
-Co-authored-by: Robin B <robflop98@outlook.com>
+* fix: handle regex exceptions for word mutes
+
+* add i18n strings
+
+Co-authored-by: rinsuki <428rinsuki+git@gmail.com>
+
+* stricter input validation in backend
+
+* add migration for hard mutes
+
+* fix
+
+* use correct regex library in migration
+
+* use query builder to avoid SQL injection
+
+Co-authored-by: Robin B <robflop98@outlook.com>
 Co-authored-by: rinsuki <428rinsuki+git@gmail.com>
 - Fix(client): word mute cannot save
 
@@ -4168,26 +6568,26 @@ Fix #8071
 
 - Fix: also recognize "shortcut icon" favicon ([#8220](https://github.com/orhun/git-cliff/issues/8220))
 
-* also recognize "shortcut icon" favicon
-
-Not using querySelector for this because it uses jsdom which might be slower.
-Reversing the order because WHATWG says the last appropriate link should be used.
-
-* also fetchIconUrl
-
-* br
-
-* improve readability
-
-* fix
-
-* フォールバックにhrefの評価を含める
-
-* fix val name
-
-* 将来的な拡張を考えたコードにした
-
-Co-authored-by: tamaina <tamaina@hotmail.co.jp>
+* also recognize "shortcut icon" favicon
+
+Not using querySelector for this because it uses jsdom which might be slower.
+Reversing the order because WHATWG says the last appropriate link should be used.
+
+* also fetchIconUrl
+
+* br
+
+* improve readability
+
+* fix
+
+* フォールバックにhrefの評価を含める
+
+* fix val name
+
+* 将来的な拡張を考えたコードにした
+
+Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Fix: better language settings
 
@@ -4235,12 +6635,12 @@ Fix #8318
 
 - Fix: iPhone X以降(?)でページの内容が全て表示しきれないのを修正 ([#8375](https://github.com/orhun/git-cliff/issues/8375))
 
-* add safe-area-inset-bottom to spacer
-
-* fix
-
-* :v:
-
+* add safe-area-inset-bottom to spacer
+
+* fix
+
+* :v:
+
 * fix
 - Fix federation chart
 
@@ -4259,7 +6659,7 @@ Fix #8392
 
 - Fix API console ([#8416](https://github.com/orhun/git-cliff/issues/8416))
 
-Adjusted the server to send the API description based on the new
+Adjusted the server to send the API description based on the new
 API type declarations introduced previously.
 - Fix(client): fix popup menu direction calclation
 
@@ -4280,10 +6680,10 @@ Fix #8455
 
 - Fix(federation): avoid duplicate activity delivery ([#8429](https://github.com/orhun/git-cliff/issues/8429))
 
-* prefer shared inbox over individual inbox
-
-* no new shared inbox for direct recipes
-
+* prefer shared inbox over individual inbox
+
+* no new shared inbox for direct recipes
+
 * fix type error
 - Fix syntax error
 
@@ -4294,12 +6694,12 @@ Fix #8455
 
 - Fix: validation ([#8456](https://github.com/orhun/git-cliff/issues/8456)) ([#8461](https://github.com/orhun/git-cliff/issues/8461))
 
-* Revert "revert 484e023c0"
-
-This reverts commit c03b70c949923b830a6d0361d1aa4d5f5614b7b7.
-
-* also allow pure renote
-
+* Revert "revert 484e023c0"
+
+This reverts commit c03b70c949923b830a6d0361d1aa4d5f5614b7b7.
+
+* also allow pure renote
+
 * fix checks for pure renote
 - Fix e2e test
 
@@ -4315,34 +6715,34 @@ This reverts commit c03b70c949923b830a6d0361d1aa4d5f5614b7b7.
 
 - Fix: アンテナ、クリップ、リストの表示を速くする ([#8518](https://github.com/orhun/git-cliff/issues/8518))
 
-* アンテナノートを取得するクエリがタイムアウトしないように速くする
-
-* テーブル名を直接指定しないようにする
-
-* クリップの取得を速くする
-
+* アンテナノートを取得するクエリがタイムアウトしないように速くする
+
+* テーブル名を直接指定しないようにする
+
+* クリップの取得を速くする
+
 * リストの取得を速くする
 - Fix: Fix settings page ([#8508](https://github.com/orhun/git-cliff/issues/8508))
 
-* Fix settings page
-
-* nanka iroiro
-
-* clean up
-
-* clean up
-
+* Fix settings page
+
+* nanka iroiro
+
+* clean up
+
+* clean up
+
 * インデックスに戻ってもタイトルが残ってしまうのを修正
 - Fix ogp rendering and refactor
 
 - Fix: アンテナ、クリップ、リストの表示を速くする ([#8518](https://github.com/orhun/git-cliff/issues/8518))
 
-* アンテナノートを取得するクエリがタイムアウトしないように速くする
-
-* テーブル名を直接指定しないようにする
-
-* クリップの取得を速くする
-
+* アンテナノートを取得するクエリがタイムアウトしないように速くする
+
+* テーブル名を直接指定しないようにする
+
+* クリップの取得を速くする
+
 * リストの取得を速くする
 - Fix: Promises -> Promise ([#8545](https://github.com/orhun/git-cliff/issues/8545))
 
@@ -4352,8 +6752,8 @@ This reverts commit c03b70c949923b830a6d0361d1aa4d5f5614b7b7.
 
 - Fix: Add rel attribute to host-meta ([#8583](https://github.com/orhun/git-cliff/issues/8583))
 
-* Add rel attribute to host-meta
-
+* Add rel attribute to host-meta
+
 * CHANGELOG
 - Fix _misskey_content of quote renotes ([#8533](https://github.com/orhun/git-cliff/issues/8533))
 
@@ -4377,8 +6777,8 @@ This reverts commit c03b70c949923b830a6d0361d1aa4d5f5614b7b7.
 
 - Fix: ユーザー検索で、クエリがusernameの条件を満たす場合はusernameもLIKE検索するように ([#8644](https://github.com/orhun/git-cliff/issues/8644))
 
-* Fix #8643
-
+* Fix #8643
+
 * 部分一致にする
 - Fix(client): additional background for acrylic popups if unsupported
 
@@ -4395,32 +6795,32 @@ Fix a bug introduced in #8659. Solution was already tested there.
 
 - Fix: ノートのインスタンス情報の文字に縁を付けて見やすくする ([#8697](https://github.com/orhun/git-cliff/issues/8697))
 
-* ノートのインスタンス情報の背景色が反映されないことがあるのを修正する
-
-* ノートのインスタンス情報の文字に縁を付けて見やすくする
-
-* Revert "ノートのインスタンス情報の背景色が反映されないことがあるのを修正する"
-
-This reverts commit de920dfc537d1f2c68804d0d6930520f2b3cbce7.
-
+* ノートのインスタンス情報の背景色が反映されないことがあるのを修正する
+
+* ノートのインスタンス情報の文字に縁を付けて見やすくする
+
+* Revert "ノートのインスタンス情報の背景色が反映されないことがあるのを修正する"
+
+This reverts commit de920dfc537d1f2c68804d0d6930520f2b3cbce7.
+
 * ノートのインスタンス情報の文字の影の数を増やしてさらに見やすくする
 - Fix: Unable to generate video thumbnails ([#8696](https://github.com/orhun/git-cliff/issues/8696))
 
-* fix: Unable to generate video thumbnails
-
+* fix: Unable to generate video thumbnails
+
 * CHANGELOG
 - Fix(client): fix lint issues in Deck UI components ([#8681](https://github.com/orhun/git-cliff/issues/8681))
 
 
 - Fix: ノート詳細ページの新しいノートを表示する機能の動作が正しくなるように修正する ([#8607](https://github.com/orhun/git-cliff/issues/8607))
 
-* ノート詳細で新しいノートの表示が正しくないのを修正する
-
+* ノート詳細で新しいノートの表示が正しくないのを修正する
+
 * ノート詳細から別のノート詳細を表示した時に前後の表示をリセットする
 - Fix(activitypub): add authorization checks ([#8534](https://github.com/orhun/git-cliff/issues/8534))
 
-* fix spelling
-
+* fix spelling
+
 * fix(activitypub): add authorization checks
 - Fix(client): make emoji stand out more on reaction button
 
@@ -4441,24 +6841,24 @@ Co-Authored-By: Johann150 <20990607+Johann150@users.noreply.github.com>
 
 - Fix: assume remote users are following each other ([#8734](https://github.com/orhun/git-cliff/issues/8734))
 
-Misskey does not know if two remote users are following each other.
-Because ActivityPub actions would otherwise fail on followers only
-notes, we have to assume that two remote users are following each other
+Misskey does not know if two remote users are following each other.
+Because ActivityPub actions would otherwise fail on followers only
+notes, we have to assume that two remote users are following each other
 when an interaction about a remote note occurs.
 - Fix lints ([#8737](https://github.com/orhun/git-cliff/issues/8737))
 
-* fix: emits use ev instead of e
-
-* fix: errors use err instead of e
-
-* fix: replace use of data where possible
-
-* fix: events use evt instead of e
-
-* fix: use strict equals
-
-* fix: use emoji instead of e
-
+* fix: emits use ev instead of e
+
+* fix: errors use err instead of e
+
+* fix: replace use of data where possible
+
+* fix: events use evt instead of e
+
+* fix: use strict equals
+
+* fix: use emoji instead of e
+
 * fix: vue lints
 - Fix(docs): correct information for drive upload ([#8736](https://github.com/orhun/git-cliff/issues/8736))
 
@@ -4468,12 +6868,12 @@ when an interaction about a remote note occurs.
 fix #8747
 - Fix(client): Vite related boot mechanism revision ([#8753](https://github.com/orhun/git-cliff/issues/8753))
 
-* preload app css
-
-* remove salt
-
-* APP_FETCH_FAILED error
-
+* preload app css
+
+* remove salt
+
+* APP_FETCH_FAILED error
+
 * set max-age to 15s
 - Fix(client): fix popout url ([#8494](https://github.com/orhun/git-cliff/issues/8494))
 
@@ -4505,56 +6905,56 @@ fix #8756
 
 - Fix: correctly render empty note text ([#8746](https://github.com/orhun/git-cliff/issues/8746))
 
-Ensure that the _misskey_content attribute will always exist. Because
-the API endpoint does not require the existence of the `text` field,
-that field may be `undefined`. By using `?? null` it can be ensured
-that the value is at least `null`.
-
-Furthermore, the rendered HTML of a note with empty text will also be
-the empty string. From git blame it seems that this behaviour was added
-because of a Mastodon bug that might have previously existed. Hoever,
-this seems to be no longer the case as I can find mastodon posts that
-have empty content.
-
-The code could be made a bit more succinct by using the null coercion
+Ensure that the _misskey_content attribute will always exist. Because
+the API endpoint does not require the existence of the `text` field,
+that field may be `undefined`. By using `?? null` it can be ensured
+that the value is at least `null`.
+
+Furthermore, the rendered HTML of a note with empty text will also be
+the empty string. From git blame it seems that this behaviour was added
+because of a Mastodon bug that might have previously existed. Hoever,
+this seems to be no longer the case as I can find mastodon posts that
+have empty content.
+
+The code could be made a bit more succinct by using the null coercion
 operator.
 - Fix: ensure resolver does not fetch local resources via HTTP(S) ([#8733](https://github.com/orhun/git-cliff/issues/8733))
 
-* refactor: parseUri types and checks
-
-The type has been refined to better represent what it actually is. Uses of
-parseUri are now also checking the parsed object type before resolving.
-
-* cannot resolve URLs with fragments
-
-* also take remaining part of URL into account
-
-Needed for parsing the follows URIs.
-
-* Resolver uses DbResolver for local
-
-* remove unnecessary use of DbResolver
-
-Using DbResolver would mean that the URL is parsed and handled again.
-This duplicated processing can be avoided by querying the database directly.
-
+* refactor: parseUri types and checks
+
+The type has been refined to better represent what it actually is. Uses of
+parseUri are now also checking the parsed object type before resolving.
+
+* cannot resolve URLs with fragments
+
+* also take remaining part of URL into account
+
+Needed for parsing the follows URIs.
+
+* Resolver uses DbResolver for local
+
+* remove unnecessary use of DbResolver
+
+Using DbResolver would mean that the URL is parsed and handled again.
+This duplicated processing can be avoided by querying the database directly.
+
 * fix missing property name
 - Fix: add id for activitypub follows ([#8689](https://github.com/orhun/git-cliff/issues/8689))
 
-* add id for activitypub follows
-
-* fix lint
-
-* fix: follower must be local, followee must be remote
-
-Misskey will only use ActivityPub follow requests for users that are local
-and are requesting to follow a remote user. This check is to ensure that
-this endpoint can not be used by other services or instances.
-
-* fix: missing import
-
-* render block with id
-
+* add id for activitypub follows
+
+* fix lint
+
+* fix: follower must be local, followee must be remote
+
+Misskey will only use ActivityPub follow requests for users that are local
+and are requesting to follow a remote user. This check is to ensure that
+this endpoint can not be used by other services or instances.
+
+* fix: missing import
+
+* render block with id
+
 * fix comment
 - Fix test
 
@@ -4587,10 +6987,10 @@ Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 
 - Fix: some fixes of multiple notification read ([#8819](https://github.com/orhun/git-cliff/issues/8819))
 
-* fix: limit multiple notification read
-
-* fix
-
+* fix: limit multiple notification read
+
+* fix
+
 * fix
 - Fix(client): デッキでウィジェットの情報が保存されない問題を修正
 
@@ -4605,24 +7005,24 @@ Fix #8818
 
 - Fix: add limit to i/notifications ([#8836](https://github.com/orhun/git-cliff/issues/8836))
 
-* fix: add limit to i/notifications
-
-* ms
-
+* fix: add limit to i/notifications
+
+* ms
+
 * remove ms
 - Fix: tmpdir cleanup removes contained files ([#8826](https://github.com/orhun/git-cliff/issues/8826))
 
 
 - Fix: GenerateVideoThumbnail ([#8825](https://github.com/orhun/git-cliff/issues/8825))
 
-* fix: GenerateVideoThumbnail
-
-* CHANGELOG
-
-* fix cleanup
-
-* Revert "fix cleanup"
-
+* fix: GenerateVideoThumbnail
+
+* CHANGELOG
+
+* fix cleanup
+
+* Revert "fix cleanup"
+
 This reverts commit d54cf8262ac01a3deb6b8dd7689ec144d4d09ea8.
 - Fix: correctly render note text
 
@@ -4661,17 +7061,17 @@ Instead of coercing to `null`, coercing to an empty string should simplify handl
 
 - Fix: always respect instance mutes ([#8854](https://github.com/orhun/git-cliff/issues/8854))
 
-* fix: muted user query also checks instances
-
-This way it can be ensured that the instance mute is used everywhere it
-is required without checking the whole codebase again. Muted users and
-muted instances should be used together anyways.
-
+* fix: muted user query also checks instances
+
+This way it can be ensured that the instance mute is used everywhere it
+is required without checking the whole codebase again. Muted users and
+muted instances should be used together anyways.
+
 * fix lint
 - Fix(client): only enable hotkeys for logged in users ([#8793](https://github.com/orhun/git-cliff/issues/8793))
 
-* fix(client): only enable hotkeys for logged in users
-
+* fix(client): only enable hotkeys for logged in users
+
 * fix(client): keep theme and search hotkeys for logged out users
 - Fix notification-setting-window.vue
 
@@ -4681,28 +7081,28 @@ muted instances should be used together anyways.
 
 - Fix: mocha テストが動かないのを修正 v2 ([#8892](https://github.com/orhun/git-cliff/issues/8892))
 
-* on push
-
-* Fix mute test
-
-* fix note test
-
-* api
-
-* inc timeout
-
-* uploadUrl
-
-* Revert "on push"
-
-This reverts commit 778a58df61ff9a22421f8ec5dcce96b364eab38d.
-
-* lint
-
-* waitFire
-
-* Wrap connectStream
-
+* on push
+
+* Fix mute test
+
+* fix note test
+
+* api
+
+* inc timeout
+
+* uploadUrl
+
+* Revert "on push"
+
+This reverts commit 778a58df61ff9a22421f8ec5dcce96b364eab38d.
+
+* lint
+
+* waitFire
+
+* Wrap connectStream
+
 * return
 - Fix(api): add missing themeColor property of instance
 
@@ -4785,8 +7185,8 @@ fixes #8944
 
 - Fix: QueryFailedError when logging user's IPs ([#8973](https://github.com/orhun/git-cliff/issues/8973))
 
-* fix QueryFailedError when logging user's IPs
-
+* fix QueryFailedError when logging user's IPs
+
 * use `orIgnore` to fix
 - Fix(client): fix style of mention
 
@@ -4796,25 +7196,25 @@ Fix #8878
 
 - Fix(sw, notification): Don't issue an event if there is no affect ([#8979](https://github.com/orhun/git-cliff/issues/8979))
 
-* test
-
+* test
+
 * ]v]
 - Fix: add `es2017` build target ([#8931](https://github.com/orhun/git-cliff/issues/8931))
 
-* remove top level awaits
-
-* add es2017 target
-
+* remove top level awaits
+
+* add es2017 target
+
 * refactor: use setup and ref sugar
 - Fix(client): hide bot protection warning with disabled registrations ([#8794](https://github.com/orhun/git-cliff/issues/8794))
 
-* fix(client): hide bot protection warning with disabled registrations
-
-* Apply review suggestion from @Johann150
-
-Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
-
-Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
+* fix(client): hide bot protection warning with disabled registrations
+
+* Apply review suggestion from @Johann150
+
+Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
+
+Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Fix
 
@@ -4867,11 +7267,11 @@ Fix #8474
 - Docs(readme): add Greenkeeper badge
 - Docs to run in production mode ([#4347](https://github.com/orhun/git-cliff/issues/4347))
 
-* run in production mode from systemd
-
-* NODE_ENV=production npm run build
-
-* npm start
+* run in production mode from systemd
+
+* NODE_ENV=production npm run build
+
+* npm start
 
 - Docs
 
@@ -4922,20 +7322,20 @@ Fix #8474
 
 - Add an endpoint users/lists/update ([#2585](https://github.com/orhun/git-cliff/issues/2585))
 
-* add an endpoint users/lists/update
-
-* add meta params
-
-* fix packing
+* add an endpoint users/lists/update
+
+* add meta params
+
+* fix packing
 
 - Adds ko-KR な to にゃ ([#3820](https://github.com/orhun/git-cliff/issues/3820))
 
-* adds ko-KR な to にゃ
-- this only take considers pre-composed "Hangul Syllables",
-not composable area "Hangul Jamo" which are not used commonly
-- 56 is '냐' - '나'
-
-* replace magic number as suggested
+* adds ko-KR な to にゃ
+- this only take considers pre-composed "Hangul Syllables",
+not composable area "Hangul Jamo" which are not used commonly
+- 56 is '냐' - '나'
+
+* replace magic number as suggested
 
 - ✨🌎✨ A federated blogging platform ✨🚀✨
 
@@ -4985,142 +7385,142 @@ Resolve #5819
 
 - Feat(client): 翻訳をIndexedDBに保存・プッシュ通知を翻訳 ([#6396](https://github.com/orhun/git-cliff/issues/6396))
 
-* wip
-
-* tabun ok
-
-* better msg
-
-* oops
-
-* fix lint
-
-* Update gulpfile.ts
-
-Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
-
-* Update src/client/scripts/set-i18n-contexts.ts
-
-Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
-
-* refactor
-
-Co-authored-by: acid-chicken <root@acid-chicken.com>
-
-* ✨
-
-* wip
-
-* fix lint
-
-* たぶんおk
-
-* fix flush
-
-* Translate Notification
-
-* remove console.log
-
-* fix
-
-* add notifications
-
-* remove san
-
-* wip
-
-* ok
-
-* :v:
-
-* Update src/prelude/array.ts
-
-Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
-
-* wip
-
-* i18n refactor
-
-* Update init.ts
-
-* :v:
-
-Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
+* wip
+
+* tabun ok
+
+* better msg
+
+* oops
+
+* fix lint
+
+* Update gulpfile.ts
+
+Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
+
+* Update src/client/scripts/set-i18n-contexts.ts
+
+Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
+
+* refactor
+
+Co-authored-by: acid-chicken <root@acid-chicken.com>
+
+* ✨
+
+* wip
+
+* fix lint
+
+* たぶんおk
+
+* fix flush
+
+* Translate Notification
+
+* remove console.log
+
+* fix
+
+* add notifications
+
+* remove san
+
+* wip
+
+* ok
+
+* :v:
+
+* Update src/prelude/array.ts
+
+Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
+
+* wip
+
+* i18n refactor
+
+* Update init.ts
+
+* :v:
+
+Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
 - Feat(client): 自動でもっと見るオプション ([#6403](https://github.com/orhun/git-cliff/issues/6403))
 
-* wip
-
-* ugokanai
-
-* wip
-
-* implement setting subscribing
-
-* fix lint
-
-* :v:
-
-* Update notifications.vue
-
+* wip
+
+* ugokanai
+
+* wip
+
+* implement setting subscribing
+
+* fix lint
+
+* :v:
+
+* Update notifications.vue
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Feat(client): Convert text mfm node to text (v)dom node instead of span tag ([#6399](https://github.com/orhun/git-cliff/issues/6399))
 
-* Convert text mfm node to text (v)dom node
-instead of span tag
-
-* Update mfm.ts
-
+* Convert text mfm node to text (v)dom node
+instead of span tag
+
+* Update mfm.ts
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Feat(client): 投稿フォームのボタンの説明を表示するように ([#6408](https://github.com/orhun/git-cliff/issues/6408))
 
-* Add title attr with buttons on the post form
-
-* fix
-
-* tooltip
-
-* missing ;
-
-* remove title attr
-
-* fix bug
-
-* Update reactions-viewer.details.vue
-
-* help wip
-
-* ok!
-
-* i18n
-
+* Add title attr with buttons on the post form
+
+* fix
+
+* tooltip
+
+* missing ;
+
+* remove title attr
+
+* fix bug
+
+* Update reactions-viewer.details.vue
+
+* help wip
+
+* ok!
+
+* i18n
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Feat: Observe notification read and fix #6406 ([#6407](https://github.com/orhun/git-cliff/issues/6407))
 
-* Resolve https://github.com/syuilo/misskey/pull/6406#issuecomment-633203670
-
-* Improve typing
-
-* Observe notification read
-
-* capture readAllNotifications
-
-* fix
-
-* fix
-
-* Refactor
-
-* Update src/client/components/notification.vue
-
-Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
-
-* Update src/client/components/notification.vue
-
-Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
-
-* missing ;
-
+* Resolve https://github.com/syuilo/misskey/pull/6406#issuecomment-633203670
+
+* Improve typing
+
+* Observe notification read
+
+* capture readAllNotifications
+
+* fix
+
+* fix
+
+* Refactor
+
+* Update src/client/components/notification.vue
+
+Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
+
+* Update src/client/components/notification.vue
+
+Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
+
+* missing ;
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Feat(theme): Add mentionMe property
 
@@ -5164,10 +7564,10 @@ Resolve #6544
 
 - Feat(server): Fetch icon url of an instance ([#6591](https://github.com/orhun/git-cliff/issues/6591))
 
-* feat(server): Fetch icon url of an instance
-
-Resolve #6589
-
+* feat(server): Fetch icon url of an instance
+
+Resolve #6589
+
 * chore: Rename the function
 - Feat(client): Display instance icon
 
@@ -5216,46 +7616,46 @@ Resolve #5213
 
 - Feat: Implement api sw/unregister ([#7611](https://github.com/orhun/git-cliff/issues/7611))
 
-* Implement api sw/unregister
-
-* remove all mode
-
-* add changelog
-
+* Implement api sw/unregister
+
+* remove all mode
+
+* add changelog
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Add setting to keep content warning ([#7682](https://github.com/orhun/git-cliff/issues/7682))
 
 
 - Feat: リモートからユーザー削除が飛んできたら削除するように ([#7768](https://github.com/orhun/git-cliff/issues/7768))
 
-* Delete Actor
-
-* Update src/remote/activitypub/kernel/delete/actor.ts
-
-Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
-
+* Delete Actor
+
+* Update src/remote/activitypub/kernel/delete/actor.ts
+
+Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Add sponsors section
 
 - Add resolver check for blocked instance ([#7777](https://github.com/orhun/git-cliff/issues/7777))
 
-* add resolver check for blocked instance
-
-* lint
-
+* add resolver check for blocked instance
+
+* lint
+
 * Update note.ts
 - Feat: 凍結された場合のダイアログを実装 ([#7811](https://github.com/orhun/git-cliff/issues/7811))
 
-* feat: 凍結された場合のダイアログを実装
-
-* Update CHANGELOG.md
-
-* Update basic.js
-
-* improve error handling
-
-* cypressなんもわからん
-
+* feat: 凍結された場合のダイアログを実装
+
+* Update CHANGELOG.md
+
+* Update basic.js
+
+* improve error handling
+
+* cypressなんもわからん
+
 * Update basic.js
 - Feat(server): 管理者用アカウント削除API実装
 
@@ -5264,29 +7664,29 @@ Resolve #7735
 
 - Feat: MFM Sparkle animation ([#7813](https://github.com/orhun/git-cliff/issues/7813))
 
-* Add sparkle mfm animation ✨
-
-* Cleanup sparkle effect
-
-+ spaces -> tabs and other codestyle
-+ use proper image
-+ listen for resizes
+* Add sparkle mfm animation ✨
+
+* Cleanup sparkle effect
+
++ spaces -> tabs and other codestyle
++ use proper image
++ listen for resizes
 + use font-size to determine particle size (for fun with x2/3/4 stacking)
 - Feat(client): MFM関数構文のサジェストを実装
 
 - Add todo
 - Feat: アカウント作成にメールアドレス必須にするオプション ([#7856](https://github.com/orhun/git-cliff/issues/7856))
 
-* feat: アカウント作成にメールアドレス必須にするオプション
-
-* ui
-
-* fix bug
-
-* fix bug
-
-* fix bug
-
+* feat: アカウント作成にメールアドレス必須にするオプション
+
+* ui
+
+* fix bug
+
+* fix bug
+
+* fix bug
+
 * :art:
 - Feat: 未読の通知のみ表示する機能
 
@@ -5298,18 +7698,18 @@ Resolve #7735
 
 - Feat: ノートプレビューを追加 ([#7596](https://github.com/orhun/git-cliff/issues/7596))
 
-* add note preview
-
-* use if
-
-* add draftedNote property
-
-* custom emojis work
-
-* Only show CW on preview when enabled
-
-* move button to top
-
+* add note preview
+
+* use if
+
+* add draftedNote property
+
+* custom emojis work
+
+* Only show CW on preview when enabled
+
+* move button to top
+
 * fix css style
 - Feat(api): add users/groups/leave
 
@@ -5333,21 +7733,21 @@ Close #7808
 
 - Feat: thread mute ([#7930](https://github.com/orhun/git-cliff/issues/7930))
 
-* feat: thread mute
-
-* chore: fix comment
-
-* fix test
-
-* fix
-
+* feat: thread mute
+
+* chore: fix comment
+
+* fix test
+
+* fix
+
 * refactor
 - Feat: クライアントでログインするアカウントidを指定するクエリ(loginId=:userId) ([#7929](https://github.com/orhun/git-cliff/issues/7929))
 
-* feat: ログインするアカウントのIDをクエリ文字列で指定する機能
-
-* await?
-
+* feat: ログインするアカウントのIDをクエリ文字列で指定する機能
+
+* await?
+
 * rename
 - Add some locales
 
@@ -5355,16 +7755,16 @@ Resolve #7940
 
 - Feat: make possible to configure following/followers visibility ([#7959](https://github.com/orhun/git-cliff/issues/7959))
 
-* feat: make possible to configure following/followers visibility
-
-* add test
-
-* ap
-
-* add ap test
-
-* set Cache-Control
-
+* feat: make possible to configure following/followers visibility
+
+* add test
+
+* ap
+
+* add ap test
+
+* set Cache-Control
+
 * hide following/followers count
 - Feat: improve email validation
 
@@ -5398,85 +7798,85 @@ Resolve #7025
 
 - Feat: Undo Accept ([#7980](https://github.com/orhun/git-cliff/issues/7980))
 
-* allow breaking of follow
-
-* send undo
-
+* allow breaking of follow
+
+* send undo
+
 * delete by using reject follow
 - Add note
 
 - Feat: user-level instance mute ([#7712](https://github.com/orhun/git-cliff/issues/7712))
 
-* Update ja-JP.yml
-
-* Added settable config for muted instances
-
-* added psql query for removal of muted notes
-
-* Added filtering and trimming for instance mutes
-
-* cleaned up filtering of bad instance mutes and added a refresh at the end for the list on the client
-
-* Added notification & streaming timeline muting
-
-* Updated changelog
-
-* Added missing semicolon
-
-* Apply japanese string suggestions from robflop
-
-Co-authored-by: Robin B. <robflop98@outlook.com>
-
-* Changed Ja-JP instance mute title string to one suggested by sousuke
-
-Co-authored-by: sousuke0422 <sousuke20xx@gmail.com>
-
-* Update ja-JP instanceMuteDescription based on sousuke's suggestion
-
-Co-authored-by: sousuke0422 <sousuke20xx@gmail.com>
-
-* added notification mute
-
-* added notification and note children muting
-
-* Fixed a bug where local notifications were getting filtered on cold start
-
-* Fixed instance mute imports
-
-* Fixed not saving/loading instance mutes
-
-* removed en-US translations for instance mute
-
-* moved instance mute migration to js
-
-* changed settings index back to spaces
-
-* removed destructuring assignment from notification stream in instance mute check call
-
-Co-authored-by: tamaina <tamaina@hotmail.co.jp>
-
-* added .note accessor for checking note data instead of notification data
-
-* changed note to use Packed<'Note'> instead of any and removed usage of snake case
-
-Co-authored-by: tamaina <tamaina@hotmail.co.jp>
-
-* changed notification mute check to check specifically for notification host
-
-* changed to using single quotes
-
-* moved @click to the end for the linter
-
-* revert unnecessary changes
-
-* restored newlines
-
-* whitespace removal
-
-Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
-Co-authored-by: Robin B. <robflop98@outlook.com>
-Co-authored-by: sousuke0422 <sousuke20xx@gmail.com>
-Co-authored-by: puffaboo <emilis@jigglypuff.club>
+* Update ja-JP.yml
+
+* Added settable config for muted instances
+
+* added psql query for removal of muted notes
+
+* Added filtering and trimming for instance mutes
+
+* cleaned up filtering of bad instance mutes and added a refresh at the end for the list on the client
+
+* Added notification & streaming timeline muting
+
+* Updated changelog
+
+* Added missing semicolon
+
+* Apply japanese string suggestions from robflop
+
+Co-authored-by: Robin B. <robflop98@outlook.com>
+
+* Changed Ja-JP instance mute title string to one suggested by sousuke
+
+Co-authored-by: sousuke0422 <sousuke20xx@gmail.com>
+
+* Update ja-JP instanceMuteDescription based on sousuke's suggestion
+
+Co-authored-by: sousuke0422 <sousuke20xx@gmail.com>
+
+* added notification mute
+
+* added notification and note children muting
+
+* Fixed a bug where local notifications were getting filtered on cold start
+
+* Fixed instance mute imports
+
+* Fixed not saving/loading instance mutes
+
+* removed en-US translations for instance mute
+
+* moved instance mute migration to js
+
+* changed settings index back to spaces
+
+* removed destructuring assignment from notification stream in instance mute check call
+
+Co-authored-by: tamaina <tamaina@hotmail.co.jp>
+
+* added .note accessor for checking note data instead of notification data
+
+* changed note to use Packed<'Note'> instead of any and removed usage of snake case
+
+Co-authored-by: tamaina <tamaina@hotmail.co.jp>
+
+* changed notification mute check to check specifically for notification host
+
+* changed to using single quotes
+
+* moved @click to the end for the linter
+
+* revert unnecessary changes
+
+* restored newlines
+
+* whitespace removal
+
+Co-authored-by: syuilo <syuilotan@yahoo.co.jp>
+Co-authored-by: Robin B. <robflop98@outlook.com>
+Co-authored-by: sousuke0422 <sousuke20xx@gmail.com>
+Co-authored-by: puffaboo <emilis@jigglypuff.club>
 Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 - Feat: improve follow export
 
@@ -5512,8 +7912,8 @@ Resolve #8231
 
 - Feat: Option to show replies in timeline ([#7685](https://github.com/orhun/git-cliff/issues/7685)) ([#8202](https://github.com/orhun/git-cliff/issues/8202))
 
-* Add an option for timeline replies. Credit to Emilis (puffaboo)
-
+* Add an option for timeline replies. Credit to Emilis (puffaboo)
+
 * update db on request
 - Feat(client): 自インスタンス情報ページでチャートを見れるように
 
@@ -5558,14 +7958,14 @@ Resolve #4664
 
 - Feat: Webhook ([#8457](https://github.com/orhun/git-cliff/issues/8457))
 
-* feat: introduce webhook
-
-* wip
-
-* wip
-
-* wip
-
+* feat: introduce webhook
+
+* wip
+
+* wip
+
+* wip
+
 * Update CHANGELOG.md
 - Add x,y parameters to rotate MFM
 
@@ -5573,270 +7973,270 @@ Resolve #4664
 
 - Feat: Improve Push Notification ([#7667](https://github.com/orhun/git-cliff/issues/7667))
 
-* clean up
-
-* ev => data
-
-* refactor
-
-* clean up
-
-* add type
-
-* antenna
-
-* channel
-
-* fix
-
-* add Packed type
-
-* add PackedRef
-
-* fix lint
-
-* add emoji schema
-
-* add reversiGame
-
-* add reversiMatching
-
-* remove signin schema (use Signin entity)
-
-* add schemas refs, fix Packed type
-
-* wip PackedHoge => Packed<'Hoge'>
-
-* add Packed type
-
-* note-reaction
-
-* user
-
-* user-group
-
-* user-list
-
-* note
-
-* app, messaging-message
-
-* notification
-
-* drive-file
-
-* drive-folder
-
-* following
-
-* muting
-
-* blocking
-
-* hashtag
-
-* page
-
-* app (with modifying schema)
-
-* import user?
-
-* channel
-
-* antenna
-
-* clip
-
-* gallery-post
-
-* emoji
-
-* Packed
-
-* reversi-matching
-
-* update stream.ts
-
-* https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339
-
-* fix lint
-
-* clean up?
-
-* add app
-
-* fix
-
-* nanka iroiro
-
-* wip
-
-* wip
-
-* fix lint
-
-* fix loginId
-
-* fix
-
-* refactor
-
-* refactor
-
-* remove follow action
-
-* clean up
-
-* Revert "remove follow action"
-
-This reverts commit defbb416480905af2150d1c92f10d8e1d1288c0a.
-
-* Revert "clean up"
-
-This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2.
-
-* remove fetch specification
-
-* renoteの条件追加
-
-* apiFetch => cli
-
-* bypass fetch?
-
-* fix
-
-* refactor: use path alias
-
-* temp: add submodule
-
-* remove submodule
-
-* enhane: unison-reloadに指定したパスに移動できるように
-
-* null
-
-* null
-
-* feat: ログインするアカウントのIDをクエリ文字列で指定する機能
-
-* null
-
-* await?
-
-* rename
-
-* rename
-
-* Update read.ts
-
-* merge
-
-* get-note-summary
-
-* fix
-
-* swパッケージに
-
-* add missing packages
-
-* fix getNoteSummary
-
-* add webpack-cli
-
-* :v:
-
-* remove plugins
-
-* sw-inject分離したがテストしてない
-
-* fix notification.vue
-
-* remove a blank line
-
-* disconnect intersection observer
-
-* disconnect2
-
-* fix notification.vue
-
-* remove a blank line
-
-* disconnect intersection observer
-
-* disconnect2
-
-* fix
-
-* :v:
-
-* clean up config
-
-* typesを戻した
-
-* Update packages/client/src/components/notification.vue
-
-Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
-
-* disconnect
-
-* oops
-
-* Failed to load the script unexpectedly回避
-sw.jsとlib.tsを分離してみた
-
-* truncate notification
-
-* Update packages/client/src/ui/_common_/common.vue
-
-Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
-
-* clean up
-
-* clean up
-
-* キャッシュ対策
-
-* Truncate push notification message
-
-* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正
-
-* components/drive-file-thumbnail.vue
-
-* components/drive-select-dialog.vue
-
-* components/drive-window.vue
-
-* merge
-
-* fix
-
-* Service Workerのビルドにesbuildを使うようにする
-
-* return createEmptyNotification()
-
-* fix
-
-* i18n.ts
-
-* update
-
-* :v:
-
-* remove ts-loader
-
-* fix
-
-* fix
-
-* enhance: Service Workerを常に登録するように
-
-* pollEnded
-
-* URLをsw.jsに戻す
-
-* clean up
-
-Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
+* clean up
+
+* ev => data
+
+* refactor
+
+* clean up
+
+* add type
+
+* antenna
+
+* channel
+
+* fix
+
+* add Packed type
+
+* add PackedRef
+
+* fix lint
+
+* add emoji schema
+
+* add reversiGame
+
+* add reversiMatching
+
+* remove signin schema (use Signin entity)
+
+* add schemas refs, fix Packed type
+
+* wip PackedHoge => Packed<'Hoge'>
+
+* add Packed type
+
+* note-reaction
+
+* user
+
+* user-group
+
+* user-list
+
+* note
+
+* app, messaging-message
+
+* notification
+
+* drive-file
+
+* drive-folder
+
+* following
+
+* muting
+
+* blocking
+
+* hashtag
+
+* page
+
+* app (with modifying schema)
+
+* import user?
+
+* channel
+
+* antenna
+
+* clip
+
+* gallery-post
+
+* emoji
+
+* Packed
+
+* reversi-matching
+
+* update stream.ts
+
+* https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339
+
+* fix lint
+
+* clean up?
+
+* add app
+
+* fix
+
+* nanka iroiro
+
+* wip
+
+* wip
+
+* fix lint
+
+* fix loginId
+
+* fix
+
+* refactor
+
+* refactor
+
+* remove follow action
+
+* clean up
+
+* Revert "remove follow action"
+
+This reverts commit defbb416480905af2150d1c92f10d8e1d1288c0a.
+
+* Revert "clean up"
+
+This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2.
+
+* remove fetch specification
+
+* renoteの条件追加
+
+* apiFetch => cli
+
+* bypass fetch?
+
+* fix
+
+* refactor: use path alias
+
+* temp: add submodule
+
+* remove submodule
+
+* enhane: unison-reloadに指定したパスに移動できるように
+
+* null
+
+* null
+
+* feat: ログインするアカウントのIDをクエリ文字列で指定する機能
+
+* null
+
+* await?
+
+* rename
+
+* rename
+
+* Update read.ts
+
+* merge
+
+* get-note-summary
+
+* fix
+
+* swパッケージに
+
+* add missing packages
+
+* fix getNoteSummary
+
+* add webpack-cli
+
+* :v:
+
+* remove plugins
+
+* sw-inject分離したがテストしてない
+
+* fix notification.vue
+
+* remove a blank line
+
+* disconnect intersection observer
+
+* disconnect2
+
+* fix notification.vue
+
+* remove a blank line
+
+* disconnect intersection observer
+
+* disconnect2
+
+* fix
+
+* :v:
+
+* clean up config
+
+* typesを戻した
+
+* Update packages/client/src/components/notification.vue
+
+Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
+
+* disconnect
+
+* oops
+
+* Failed to load the script unexpectedly回避
+sw.jsとlib.tsを分離してみた
+
+* truncate notification
+
+* Update packages/client/src/ui/_common_/common.vue
+
+Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
+
+* clean up
+
+* clean up
+
+* キャッシュ対策
+
+* Truncate push notification message
+
+* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正
+
+* components/drive-file-thumbnail.vue
+
+* components/drive-select-dialog.vue
+
+* components/drive-window.vue
+
+* merge
+
+* fix
+
+* Service Workerのビルドにesbuildを使うようにする
+
+* return createEmptyNotification()
+
+* fix
+
+* i18n.ts
+
+* update
+
+* :v:
+
+* remove ts-loader
+
+* fix
+
+* fix
+
+* enhance: Service Workerを常に登録するように
+
+* pollEnded
+
+* URLをsw.jsに戻す
+
+* clean up
+
+Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Feat: make captcha required when signin to improve security
 
@@ -5849,52 +8249,52 @@ Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 Highlight PRs that edit locales other than the ja-JP one so the author may see and fix it themselves.
 - Feat(tests): add e2e tests for widgets ([#8735](https://github.com/orhun/git-cliff/issues/8735))
 
-* test(e2e): add baseline for widget tests
-
-* chore(repo): enable test running in branch
-
-* fix(e2e): set viewport for widget tests
-
-* fix(client): add widget identifier classes to widgets
-
-* test(e2e): add memo widget test
-
-* fix(tests): force select value
-
-* fix(tests): force button press for widget addition
-
-* fix(tests): invoke select value differently
-
-* fix(tests): adjust widget submit
-
-* fix(tests): don't explicitly navigate for widget test
-
-* fix(tests): click label to hide select popup
-
-* fix(tests): just click modal background
-
-* fix(tests): adjust modal background selector
-
-* fix(tests): click all modal backgrounds
-
-* feat(e2e): add test for adding timeline widget
-
-* fix(client): add more widget identifier classes
-
-* feat(tests): add method abstraction for test cases
-
-* fix(tests): force-click overlays
-
-* fix(tests): force widget button press
-
-* fix(tests): remove timeout from final widget check
-
-* feat(tests): add widget removal test case
-
-* fix(client): use mk instead of msky as class prefix
-
-* fix(tests): check widgets for existence rather than visibility
-
+* test(e2e): add baseline for widget tests
+
+* chore(repo): enable test running in branch
+
+* fix(e2e): set viewport for widget tests
+
+* fix(client): add widget identifier classes to widgets
+
+* test(e2e): add memo widget test
+
+* fix(tests): force select value
+
+* fix(tests): force button press for widget addition
+
+* fix(tests): invoke select value differently
+
+* fix(tests): adjust widget submit
+
+* fix(tests): don't explicitly navigate for widget test
+
+* fix(tests): click label to hide select popup
+
+* fix(tests): just click modal background
+
+* fix(tests): adjust modal background selector
+
+* fix(tests): click all modal backgrounds
+
+* feat(e2e): add test for adding timeline widget
+
+* fix(client): add more widget identifier classes
+
+* feat(tests): add method abstraction for test cases
+
+* fix(tests): force-click overlays
+
+* fix(tests): force widget button press
+
+* fix(tests): remove timeout from final widget check
+
+* feat(tests): add widget removal test case
+
+* fix(client): use mk instead of msky as class prefix
+
+* fix(tests): check widgets for existence rather than visibility
+
 * chore(meta): don't run tests for specific feature branch
 - Add @rollup/pluginutils
 
@@ -5904,236 +8304,236 @@ Co-authored-by: acid-chicken <root@acid-chicken.com>
 
 - Feat: option to collapse long notes ([#8561](https://github.com/orhun/git-cliff/issues/8561))
 
-* feat: option to collapse long notes
-
-Closes #8559
-
-* do not collapse if cw exists
-
-* use '閉じる' to close / show less.
-
-* make it sticky
-
+* feat: option to collapse long notes
+
+Closes #8559
+
+* do not collapse if cw exists
+
+* use '閉じる' to close / show less.
+
+* make it sticky
+
 * Change style of the Show less button
 - Add packageExtensions
 
 - Feat: image cropping ([#8808](https://github.com/orhun/git-cliff/issues/8808))
 
-* wip
-
-* wip
-
+* wip
+
+* wip
+
 * wip
 - Feat: Add Badge Image to Push Notification ([#8012](https://github.com/orhun/git-cliff/issues/8012))
 
-* fix
-
-* nanka iroiro
-
-* wip
-
-* wip
-
-* fix lint
-
-* fix loginId
-
-* fix
-
-* refactor
-
-* refactor
-
-* remove follow action
-
-* clean up
-
-* Revert "remove follow action"
-
-This reverts commit defbb416480905af2150d1c92f10d8e1d1288c0a.
-
-* Revert "clean up"
-
-This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2.
-
-* remove fetch specification
-
-* renoteの条件追加
-
-* apiFetch => cli
-
-* bypass fetch?
-
-* fix
-
-* refactor: use path alias
-
-* temp: add submodule
-
-* remove submodule
-
-* enhane: unison-reloadに指定したパスに移動できるように
-
-* null
-
-* null
-
-* feat: ログインするアカウントのIDをクエリ文字列で指定する機能
-
-* null
-
-* await?
-
-* rename
-
-* rename
-
-* Update read.ts
-
-* merge
-
-* get-note-summary
-
-* fix
-
-* swパッケージに
-
-* add missing packages
-
-* fix getNoteSummary
-
-* add webpack-cli
-
-* :v:
-
-* remove plugins
-
-* sw-inject分離したがテストしてない
-
-* fix notification.vue
-
-* remove a blank line
-
-* disconnect intersection observer
-
-* disconnect2
-
-* fix notification.vue
-
-* remove a blank line
-
-* disconnect intersection observer
-
-* disconnect2
-
-* fix
-
-* :v:
-
-* clean up config
-
-* typesを戻した
-
-* backend/src/web/index.ts
-
-* notification-badges
-
-* add scripts
-
-* change create-notification.ts
-
-* Update packages/client/src/components/notification.vue
-
-Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
-
-* disconnect
-
-* oops
-
-* Failed to load the script unexpectedly回避
-sw.jsとlib.tsを分離してみた
-
-* truncate notification
-
-* Update packages/client/src/ui/_common_/common.vue
-
-Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
-
-* clean up
-
-* clean up
-
-* refactor
-
-* キャッシュ対策
-
-* Truncate push notification message
-
-* fix
-
-* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正
-
-* components/drive-file-thumbnail.vue
-
-* components/drive-select-dialog.vue
-
-* components/drive-window.vue
-
-* merge
-
-* fix
-
-* Service Workerのビルドにesbuildを使うようにする
-
-* return createEmptyNotification()
-
-* fix
-
-* fix
-
-* i18n.ts
-
-* update
-
-* :v:
-
-* remove ts-loader
-
-* fix
-
-* fix
-
-* enhance: Service Workerを常に登録するように
-
-* pollEnded
-
-* pollEnded
-
-* URLをsw.jsに戻す
-
-* clean up
-
-* fix lint
-
-* changelog
-
-* alpha-test
-
-* also with twemoji
-
-* add isMimeImage function
-
-* catch
-
-* Colour => Color
-
-* char2file => char2filePath
-
-* Update autocomplete.vue
-
-* remove clone?
-
-Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
+* fix
+
+* nanka iroiro
+
+* wip
+
+* wip
+
+* fix lint
+
+* fix loginId
+
+* fix
+
+* refactor
+
+* refactor
+
+* remove follow action
+
+* clean up
+
+* Revert "remove follow action"
+
+This reverts commit defbb416480905af2150d1c92f10d8e1d1288c0a.
+
+* Revert "clean up"
+
+This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2.
+
+* remove fetch specification
+
+* renoteの条件追加
+
+* apiFetch => cli
+
+* bypass fetch?
+
+* fix
+
+* refactor: use path alias
+
+* temp: add submodule
+
+* remove submodule
+
+* enhane: unison-reloadに指定したパスに移動できるように
+
+* null
+
+* null
+
+* feat: ログインするアカウントのIDをクエリ文字列で指定する機能
+
+* null
+
+* await?
+
+* rename
+
+* rename
+
+* Update read.ts
+
+* merge
+
+* get-note-summary
+
+* fix
+
+* swパッケージに
+
+* add missing packages
+
+* fix getNoteSummary
+
+* add webpack-cli
+
+* :v:
+
+* remove plugins
+
+* sw-inject分離したがテストしてない
+
+* fix notification.vue
+
+* remove a blank line
+
+* disconnect intersection observer
+
+* disconnect2
+
+* fix notification.vue
+
+* remove a blank line
+
+* disconnect intersection observer
+
+* disconnect2
+
+* fix
+
+* :v:
+
+* clean up config
+
+* typesを戻した
+
+* backend/src/web/index.ts
+
+* notification-badges
+
+* add scripts
+
+* change create-notification.ts
+
+* Update packages/client/src/components/notification.vue
+
+Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
+
+* disconnect
+
+* oops
+
+* Failed to load the script unexpectedly回避
+sw.jsとlib.tsを分離してみた
+
+* truncate notification
+
+* Update packages/client/src/ui/_common_/common.vue
+
+Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
+
+* clean up
+
+* clean up
+
+* refactor
+
+* キャッシュ対策
+
+* Truncate push notification message
+
+* fix
+
+* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正
+
+* components/drive-file-thumbnail.vue
+
+* components/drive-select-dialog.vue
+
+* components/drive-window.vue
+
+* merge
+
+* fix
+
+* Service Workerのビルドにesbuildを使うようにする
+
+* return createEmptyNotification()
+
+* fix
+
+* fix
+
+* i18n.ts
+
+* update
+
+* :v:
+
+* remove ts-loader
+
+* fix
+
+* fix
+
+* enhance: Service Workerを常に登録するように
+
+* pollEnded
+
+* pollEnded
+
+* URLをsw.jsに戻す
+
+* clean up
+
+* fix lint
+
+* changelog
+
+* alpha-test
+
+* also with twemoji
+
+* add isMimeImage function
+
+* catch
+
+* Colour => Color
+
+* char2file => char2filePath
+
+* Update autocomplete.vue
+
+* remove clone?
+
+Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Feat: 管理者が特定ユーザーのアップロードしたファイル一覧を見れるように
 
@@ -6159,22 +8559,22 @@ Resolve #8830
 
 - Feat: Log user ips ([#8872](https://github.com/orhun/git-cliff/issues/8872))
 
-* wip
-
-* store ip and headers
-
-* Update admin-file.vue
-
-* require admin for view ip/headers
-
-* IP (recent) 消した
-
-* admin必須
-
-* opt in
-
-* clean ips periodically
-
+* wip
+
+* store ip and headers
+
+* Update admin-file.vue
+
+* require admin for view ip/headers
+
+* IP (recent) 消した
+
+* admin必須
+
+* opt in
+
+* clean ips periodically
+
 * respect logging setting in drive/files/create
 - Feature(client): Timeline page for non-login users
 - Feat(server): add fetch-rss api to reduce dependency of external apis
@@ -6185,85 +8585,85 @@ Resolve #8830
 
 - Feat: styled error screen ([#8930](https://github.com/orhun/git-cliff/issues/8930))
 
-* Styled error screen
-
-* Make details margin auto
-
-* Update boot.css
-
-* Replace fontawesome with tabler svg
-
-* Remove hr
-
-* Add new style to flush screen
-
+* Styled error screen
+
+* Make details margin auto
+
+* Update boot.css
+
+* Replace fontawesome with tabler svg
+
+* Remove hr
+
+* Add new style to flush screen
+
 * Rename to `error.css`
 - Feat(client): メニューからページをリロードできるように
 
 - Feat: auto nsfw detection ([#8840](https://github.com/orhun/git-cliff/issues/8840))
 
-* feat: auto nsfw detection
-
-* :v:
-
-* Update ja-JP.yml
-
-* Update ja-JP.yml
-
-* ポルノ判定のしきい値を高めに
-
-* エラーハンドリングちゃんとした
-
-* Update ja-JP.yml
-
-* 感度設定を強化
-
-* refactor
-
-* feat: add video support for auto nsfw detection
-
-* rename: image -> media
-
-* .js
-
-* fix: add missing error handling
-
-* fix: use valid pathname instead of using filename due to invalid usage
-
-* perf(nsfw-detection): decode frames
-
-* disable detection of video for some reasons
-
-* perf(nsfw-detection): streamify detection process for video
-
-* disable disallowUploadWhenPredictedAsPorn option
-
-* fix(nsfw-detection): improve reliability
-
-* fix(nsfw-detection): use Math.ceil instead of Math.round
-
-* perf(nsfw-detection): delete tmp frames after used
-
-* fix(nsfw-detection): FSWatcher does not emit ready event
-
-* perf(nsfw-detection): skip black frames
-
-* refactor: strip exists check
-
-* Update package.json
-
-* めっちゃ変えた
-
-* lint
-
-* Update COPYING
-
-* オプションで動画解析できるように
-
-* Update yarn.lock
-
-* Update CHANGELOG.md
-
+* feat: auto nsfw detection
+
+* :v:
+
+* Update ja-JP.yml
+
+* Update ja-JP.yml
+
+* ポルノ判定のしきい値を高めに
+
+* エラーハンドリングちゃんとした
+
+* Update ja-JP.yml
+
+* 感度設定を強化
+
+* refactor
+
+* feat: add video support for auto nsfw detection
+
+* rename: image -> media
+
+* .js
+
+* fix: add missing error handling
+
+* fix: use valid pathname instead of using filename due to invalid usage
+
+* perf(nsfw-detection): decode frames
+
+* disable detection of video for some reasons
+
+* perf(nsfw-detection): streamify detection process for video
+
+* disable disallowUploadWhenPredictedAsPorn option
+
+* fix(nsfw-detection): improve reliability
+
+* fix(nsfw-detection): use Math.ceil instead of Math.round
+
+* perf(nsfw-detection): delete tmp frames after used
+
+* fix(nsfw-detection): FSWatcher does not emit ready event
+
+* perf(nsfw-detection): skip black frames
+
+* refactor: strip exists check
+
+* Update package.json
+
+* めっちゃ変えた
+
+* lint
+
+* Update COPYING
+
+* オプションで動画解析できるように
+
+* Update yarn.lock
+
+* Update CHANGELOG.md
+
 Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 - Feat: support <plain> syntax for mfm
 
@@ -6826,16 +9226,16 @@ Fix #6418
 
 - Update page editor ([#7317](https://github.com/orhun/git-cliff/issues/7317))
 
-* fix buttons visibility
+* fix buttons visibility
 * fix title of page editor
 - Update mfm.js ([#7435](https://github.com/orhun/git-cliff/issues/7435))
 
-* use mfm.js 0.14.0
-
-* use mfm.extract
-
-* use mfm.extract
-
+* use mfm.js 0.14.0
+
+* use mfm.extract
+
+* use mfm.extract
+
 * use mfm.extract
 - Update mfm-js
 
@@ -6871,31 +9271,31 @@ Fix #6418
 
 - Chore: APIドキュメントの修正 ([#7771](https://github.com/orhun/git-cliff/issues/7771))
 
-* packedNotificationSchemaを更新
-
-* read:gallery, write:gallery, read:gallery-likes, write:gallery-likesに翻訳を追加
-
-* fix
-
+* packedNotificationSchemaを更新
+
+* read:gallery, write:gallery, read:gallery-likes, write:gallery-likesに翻訳を追加
+
+* fix
+
 * add header, choice, invitation
 - Chore: .configをdockerイメージに入れないように ([#7625](https://github.com/orhun/git-cliff/issues/7625))
 
-* .configをdockerイメージに入れないように
-
-* Update docker-compose.yml
-
-Co-authored-by: tamaina <tamaina@hotmail.co.jp>
-
-Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>
+* .configをdockerイメージに入れないように
+
+* Update docker-compose.yml
+
+Co-authored-by: tamaina <tamaina@hotmail.co.jp>
+
+Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>
 Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 - Update deps
 
 - Chore, perf: Reduce redis memory ([#7816](https://github.com/orhun/git-cliff/issues/7816))
 
-* Reduce redis memory
-
-* CHANGELOG
-
+* Reduce redis memory
+
+* CHANGELOG
+
 * a
 - Update contribution guide
 
@@ -6975,20 +9375,20 @@ Close #7924
 
 - Chore(deps-dev): bump cypress from 9.3.1 to 9.4.1 ([#8239](https://github.com/orhun/git-cliff/issues/8239))
 
-Bumps [cypress](https://github.com/cypress-io/cypress) from 9.3.1 to 9.4.1.
-- [Release notes](https://github.com/cypress-io/cypress/releases)
-- [Changelog](https://github.com/cypress-io/cypress/blob/develop/.releaserc.base.js)
-- [Commits](https://github.com/cypress-io/cypress/compare/v9.3.1...v9.4.1)
-
----
-updated-dependencies:
-- dependency-name: cypress
-  dependency-type: direct:development
-  update-type: version-update:semver-minor
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [cypress](https://github.com/cypress-io/cypress) from 9.3.1 to 9.4.1.
+- [Release notes](https://github.com/cypress-io/cypress/releases)
+- [Changelog](https://github.com/cypress-io/cypress/blob/develop/.releaserc.base.js)
+- [Commits](https://github.com/cypress-io/cypress/compare/v9.3.1...v9.4.1)
+
+---
+updated-dependencies:
+- dependency-name: cypress
+  dependency-type: direct:development
+  update-type: version-update:semver-minor
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Update deps
 
@@ -7002,175 +9402,175 @@ Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.c
 
 - Chore(deps): bump axios from 0.21.1 to 0.21.4 in /packages/client ([#8286](https://github.com/orhun/git-cliff/issues/8286))
 
-Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.4.
-- [Release notes](https://github.com/axios/axios/releases)
-- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
-- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.4)
-
----
-updated-dependencies:
-- dependency-name: axios
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.4.
+- [Release notes](https://github.com/axios/axios/releases)
+- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
+- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.4)
+
+---
+updated-dependencies:
+- dependency-name: axios
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump path-parse from 1.0.6 to 1.0.7 in /packages/client ([#8288](https://github.com/orhun/git-cliff/issues/8288))
 
-Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
-- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
-- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)
-
----
-updated-dependencies:
-- dependency-name: path-parse
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
+- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
+- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)
+
+---
+updated-dependencies:
+- dependency-name: path-parse
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump glob-parent from 5.1.1 to 5.1.2 in /packages/client ([#8289](https://github.com/orhun/git-cliff/issues/8289))
 
-Bumps [glob-parent](https://github.com/gulpjs/glob-parent) from 5.1.1 to 5.1.2.
-- [Release notes](https://github.com/gulpjs/glob-parent/releases)
-- [Changelog](https://github.com/gulpjs/glob-parent/blob/main/CHANGELOG.md)
-- [Commits](https://github.com/gulpjs/glob-parent/compare/v5.1.1...v5.1.2)
-
----
-updated-dependencies:
-- dependency-name: glob-parent
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [glob-parent](https://github.com/gulpjs/glob-parent) from 5.1.1 to 5.1.2.
+- [Release notes](https://github.com/gulpjs/glob-parent/releases)
+- [Changelog](https://github.com/gulpjs/glob-parent/blob/main/CHANGELOG.md)
+- [Commits](https://github.com/gulpjs/glob-parent/compare/v5.1.1...v5.1.2)
+
+---
+updated-dependencies:
+- dependency-name: glob-parent
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump simple-get from 4.0.0 to 4.0.1 in /packages/backend ([#8292](https://github.com/orhun/git-cliff/issues/8292))
 
-Bumps [simple-get](https://github.com/feross/simple-get) from 4.0.0 to 4.0.1.
-- [Release notes](https://github.com/feross/simple-get/releases)
-- [Commits](https://github.com/feross/simple-get/compare/v4.0.0...v4.0.1)
-
----
-updated-dependencies:
-- dependency-name: simple-get
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [simple-get](https://github.com/feross/simple-get) from 4.0.0 to 4.0.1.
+- [Release notes](https://github.com/feross/simple-get/releases)
+- [Commits](https://github.com/feross/simple-get/compare/v4.0.0...v4.0.1)
+
+---
+updated-dependencies:
+- dependency-name: simple-get
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump node-fetch from 2.6.1 to 2.6.7 in /packages/client ([#8291](https://github.com/orhun/git-cliff/issues/8291))
 
-Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7.
-- [Release notes](https://github.com/node-fetch/node-fetch/releases)
-- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7)
-
----
-updated-dependencies:
-- dependency-name: node-fetch
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7.
+- [Release notes](https://github.com/node-fetch/node-fetch/releases)
+- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7)
+
+---
+updated-dependencies:
+- dependency-name: node-fetch
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump node-fetch from 2.6.1 to 2.6.7 in /packages/backend ([#8293](https://github.com/orhun/git-cliff/issues/8293))
 
-Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7.
-- [Release notes](https://github.com/node-fetch/node-fetch/releases)
-- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7)
-
----
-updated-dependencies:
-- dependency-name: node-fetch
-  dependency-type: direct:production
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7.
+- [Release notes](https://github.com/node-fetch/node-fetch/releases)
+- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7)
+
+---
+updated-dependencies:
+- dependency-name: node-fetch
+  dependency-type: direct:production
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump browserslist from 4.16.3 to 4.19.1 in /packages/client ([#8290](https://github.com/orhun/git-cliff/issues/8290))
 
-Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.16.3 to 4.19.1.
-- [Release notes](https://github.com/browserslist/browserslist/releases)
-- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
-- [Commits](https://github.com/browserslist/browserslist/compare/4.16.3...4.19.1)
-
----
-updated-dependencies:
-- dependency-name: browserslist
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.16.3 to 4.19.1.
+- [Release notes](https://github.com/browserslist/browserslist/releases)
+- [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
+- [Commits](https://github.com/browserslist/browserslist/compare/4.16.3...4.19.1)
+
+---
+updated-dependencies:
+- dependency-name: browserslist
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(client): tweak chart
 
 - Chore(deps): bump tar from 6.0.5 to 6.1.11 in /packages/backend ([#8294](https://github.com/orhun/git-cliff/issues/8294))
 
-Bumps [tar](https://github.com/npm/node-tar) from 6.0.5 to 6.1.11.
-- [Release notes](https://github.com/npm/node-tar/releases)
-- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
-- [Commits](https://github.com/npm/node-tar/compare/v6.0.5...v6.1.11)
-
----
-updated-dependencies:
-- dependency-name: tar
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [tar](https://github.com/npm/node-tar) from 6.0.5 to 6.1.11.
+- [Release notes](https://github.com/npm/node-tar/releases)
+- [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md)
+- [Commits](https://github.com/npm/node-tar/compare/v6.0.5...v6.1.11)
+
+---
+updated-dependencies:
+- dependency-name: tar
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump path-parse from 1.0.6 to 1.0.7 in /packages/backend ([#8301](https://github.com/orhun/git-cliff/issues/8301))
 
-Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
-- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
-- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)
-
----
-updated-dependencies:
-- dependency-name: path-parse
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
+- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
+- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)
+
+---
+updated-dependencies:
+- dependency-name: path-parse
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump normalize-url from 4.5.0 to 4.5.1 in /packages/backend ([#8302](https://github.com/orhun/git-cliff/issues/8302))
 
-Bumps [normalize-url](https://github.com/sindresorhus/normalize-url) from 4.5.0 to 4.5.1.
-- [Release notes](https://github.com/sindresorhus/normalize-url/releases)
-- [Commits](https://github.com/sindresorhus/normalize-url/commits)
-
----
-updated-dependencies:
-- dependency-name: normalize-url
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [normalize-url](https://github.com/sindresorhus/normalize-url) from 4.5.0 to 4.5.1.
+- [Release notes](https://github.com/sindresorhus/normalize-url/releases)
+- [Commits](https://github.com/sindresorhus/normalize-url/commits)
+
+---
+updated-dependencies:
+- dependency-name: normalize-url
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump glob-parent from 5.1.1 to 5.1.2 in /packages/backend ([#8303](https://github.com/orhun/git-cliff/issues/8303))
 
-Bumps [glob-parent](https://github.com/gulpjs/glob-parent) from 5.1.1 to 5.1.2.
-- [Release notes](https://github.com/gulpjs/glob-parent/releases)
-- [Changelog](https://github.com/gulpjs/glob-parent/blob/main/CHANGELOG.md)
-- [Commits](https://github.com/gulpjs/glob-parent/compare/v5.1.1...v5.1.2)
-
----
-updated-dependencies:
-- dependency-name: glob-parent
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [glob-parent](https://github.com/gulpjs/glob-parent) from 5.1.1 to 5.1.2.
+- [Release notes](https://github.com/gulpjs/glob-parent/releases)
+- [Changelog](https://github.com/gulpjs/glob-parent/blob/main/CHANGELOG.md)
+- [Commits](https://github.com/gulpjs/glob-parent/compare/v5.1.1...v5.1.2)
+
+---
+updated-dependencies:
+- dependency-name: glob-parent
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Update deps
 
@@ -7192,80 +9592,80 @@ Close #8327
 
 - Chore(deps): bump minimist from 1.2.5 to 1.2.6 in /packages/backend ([#8447](https://github.com/orhun/git-cliff/issues/8447))
 
-Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
-- [Release notes](https://github.com/substack/minimist/releases)
-- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)
-
----
-updated-dependencies:
-- dependency-name: minimist
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
+- [Release notes](https://github.com/substack/minimist/releases)
+- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)
+
+---
+updated-dependencies:
+- dependency-name: minimist
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Update deps
 
 - Chore(deps): bump minimist from 1.2.5 to 1.2.6 in /packages/client ([#8446](https://github.com/orhun/git-cliff/issues/8446))
 
-Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
-- [Release notes](https://github.com/substack/minimist/releases)
-- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)
-
----
-updated-dependencies:
-- dependency-name: minimist
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
+- [Release notes](https://github.com/substack/minimist/releases)
+- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)
+
+---
+updated-dependencies:
+- dependency-name: minimist
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump minimist from 1.2.5 to 1.2.6 ([#8445](https://github.com/orhun/git-cliff/issues/8445))
 
-Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
-- [Release notes](https://github.com/substack/minimist/releases)
-- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)
-
----
-updated-dependencies:
-- dependency-name: minimist
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6.
+- [Release notes](https://github.com/substack/minimist/releases)
+- [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6)
+
+---
+updated-dependencies:
+- dependency-name: minimist
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump follow-redirects in /packages/backend ([#8314](https://github.com/orhun/git-cliff/issues/8314))
 
-Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
-- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
-- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)
-
----
-updated-dependencies:
-- dependency-name: follow-redirects
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
+- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
+- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)
+
+---
+updated-dependencies:
+- dependency-name: follow-redirects
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump follow-redirects from 1.14.1 to 1.14.8 ([#8313](https://github.com/orhun/git-cliff/issues/8313))
 
-Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.1 to 1.14.8.
-- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
-- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.1...v1.14.8)
-
----
-updated-dependencies:
-- dependency-name: follow-redirects
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.1 to 1.14.8.
+- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
+- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.1...v1.14.8)
+
+---
+updated-dependencies:
+- dependency-name: follow-redirects
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Update deps
 
@@ -7277,19 +9677,19 @@ Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.c
 
 - Chore(deps): bump axios from 0.21.1 to 0.21.4 ([#8471](https://github.com/orhun/git-cliff/issues/8471))
 
-Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.4.
-- [Release notes](https://github.com/axios/axios/releases)
-- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
-- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.4)
-
----
-updated-dependencies:
-- dependency-name: axios
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.4.
+- [Release notes](https://github.com/axios/axios/releases)
+- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
+- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.4)
+
+---
+updated-dependencies:
+- dependency-name: axios
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Update deps
 
@@ -7301,27 +9701,27 @@ Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.c
 
 - Chore(deps): bump moment from 2.24.0 to 2.29.3 in /packages/backend ([#8531](https://github.com/orhun/git-cliff/issues/8531))
 
-Bumps [moment](https://github.com/moment/moment) from 2.24.0 to 2.29.3.
-- [Release notes](https://github.com/moment/moment/releases)
-- [Changelog](https://github.com/moment/moment/blob/2.29.3/CHANGELOG.md)
-- [Commits](https://github.com/moment/moment/compare/2.24.0...2.29.3)
-
----
-updated-dependencies:
-- dependency-name: moment
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [moment](https://github.com/moment/moment) from 2.24.0 to 2.29.3.
+- [Release notes](https://github.com/moment/moment/releases)
+- [Changelog](https://github.com/moment/moment/blob/2.29.3/CHANGELOG.md)
+- [Commits](https://github.com/moment/moment/compare/2.24.0...2.29.3)
+
+---
+updated-dependencies:
+- dependency-name: moment
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(lint): fix type definitions for jsrsasign ([#8528](https://github.com/orhun/git-cliff/issues/8528))
 
-* fix type definitions for jsrsasign
-
-The @types/jsrsasign is not available in exactly the same version as the jsrsa
-package misskey uses, so i used an earlier patch version of the same package.
-
+* fix type definitions for jsrsasign
+
+The @types/jsrsasign is not available in exactly the same version as the jsrsa
+package misskey uses, so i used an earlier patch version of the same package.
+
 * update yarn.lock
 - Chore: fix lint command for windows
 
@@ -7334,45 +9734,45 @@ add user facing changes to changelog
 
 - Chore(deps): bump ejs from 3.1.6 to 3.1.7 in /packages/backend ([#8560](https://github.com/orhun/git-cliff/issues/8560))
 
-Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.7.
-- [Release notes](https://github.com/mde/ejs/releases)
-- [Changelog](https://github.com/mde/ejs/blob/main/CHANGELOG.md)
-- [Commits](https://github.com/mde/ejs/compare/v3.1.6...v3.1.7)
-
----
-updated-dependencies:
-- dependency-name: ejs
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [ejs](https://github.com/mde/ejs) from 3.1.6 to 3.1.7.
+- [Release notes](https://github.com/mde/ejs/releases)
+- [Changelog](https://github.com/mde/ejs/blob/main/CHANGELOG.md)
+- [Commits](https://github.com/mde/ejs/compare/v3.1.6...v3.1.7)
+
+---
+updated-dependencies:
+- dependency-name: ejs
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump postcss from 8.2.8 to 8.4.13 in /packages/client ([#8588](https://github.com/orhun/git-cliff/issues/8588))
 
-Bumps [postcss](https://github.com/postcss/postcss) from 8.2.8 to 8.4.13.
-- [Release notes](https://github.com/postcss/postcss/releases)
-- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
-- [Commits](https://github.com/postcss/postcss/compare/8.2.8...8.4.13)
-
----
-updated-dependencies:
-- dependency-name: postcss
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [postcss](https://github.com/postcss/postcss) from 8.2.8 to 8.4.13.
+- [Release notes](https://github.com/postcss/postcss/releases)
+- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
+- [Commits](https://github.com/postcss/postcss/compare/8.2.8...8.4.13)
+
+---
+updated-dependencies:
+- dependency-name: postcss
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore: synchronize code and database schema ([#8577](https://github.com/orhun/git-cliff/issues/8577))
 
-* chore: remove default null
-
-null is always the default value if a table column is nullable, and typeorm's
-@Column only accepts strings for default.
-
-* chore: synchronize code with database schema
-
+* chore: remove default null
+
+null is always the default value if a table column is nullable, and typeorm's
+@Column only accepts strings for default.
+
+* chore: synchronize code with database schema
+
 * chore: sync generated migrations with code
 - Update deps
 
@@ -7382,34 +9782,34 @@ null is always the default value if a table column is nullable, and typeorm's
 
 - Chore(deps): bump path-parse from 1.0.6 to 1.0.7 ([#8705](https://github.com/orhun/git-cliff/issues/8705))
 
-Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
-- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
-- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)
-
----
-updated-dependencies:
-- dependency-name: path-parse
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [path-parse](https://github.com/jbgutierrez/path-parse) from 1.0.6 to 1.0.7.
+- [Release notes](https://github.com/jbgutierrez/path-parse/releases)
+- [Commits](https://github.com/jbgutierrez/path-parse/commits/v1.0.7)
+
+---
+updated-dependencies:
+- dependency-name: path-parse
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump async from 3.2.0 to 3.2.3 in /packages/backend ([#8706](https://github.com/orhun/git-cliff/issues/8706))
 
-Bumps [async](https://github.com/caolan/async) from 3.2.0 to 3.2.3.
-- [Release notes](https://github.com/caolan/async/releases)
-- [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md)
-- [Commits](https://github.com/caolan/async/compare/v3.2.0...v3.2.3)
-
----
-updated-dependencies:
-- dependency-name: async
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [async](https://github.com/caolan/async) from 3.2.0 to 3.2.3.
+- [Release notes](https://github.com/caolan/async/releases)
+- [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md)
+- [Commits](https://github.com/caolan/async/compare/v3.2.0...v3.2.3)
+
+---
+updated-dependencies:
+- dependency-name: async
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(client): tweak loading spinner design
 
@@ -7417,70 +9817,70 @@ Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.c
 
 - Chore(deps): bump async from 3.2.1 to 3.2.3 in /packages/client ([#8707](https://github.com/orhun/git-cliff/issues/8707))
 
-Bumps [async](https://github.com/caolan/async) from 3.2.1 to 3.2.3.
-- [Release notes](https://github.com/caolan/async/releases)
-- [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md)
-- [Commits](https://github.com/caolan/async/compare/v3.2.1...v3.2.3)
-
----
-updated-dependencies:
-- dependency-name: async
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [async](https://github.com/caolan/async) from 3.2.1 to 3.2.3.
+- [Release notes](https://github.com/caolan/async/releases)
+- [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md)
+- [Commits](https://github.com/caolan/async/compare/v3.2.1...v3.2.3)
+
+---
+updated-dependencies:
+- dependency-name: async
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump async from 3.2.1 to 3.2.3 ([#8501](https://github.com/orhun/git-cliff/issues/8501))
 
-Bumps [async](https://github.com/caolan/async) from 3.2.1 to 3.2.3.
-- [Release notes](https://github.com/caolan/async/releases)
-- [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md)
-- [Commits](https://github.com/caolan/async/compare/v3.2.1...v3.2.3)
-
----
-updated-dependencies:
-- dependency-name: async
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [async](https://github.com/caolan/async) from 3.2.1 to 3.2.3.
+- [Release notes](https://github.com/caolan/async/releases)
+- [Changelog](https://github.com/caolan/async/blob/master/CHANGELOG.md)
+- [Commits](https://github.com/caolan/async/compare/v3.2.1...v3.2.3)
+
+---
+updated-dependencies:
+- dependency-name: async
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump copy-props from 2.0.4 to 2.0.5 ([#8709](https://github.com/orhun/git-cliff/issues/8709))
 
-Bumps [copy-props](https://github.com/gulpjs/copy-props) from 2.0.4 to 2.0.5.
-- [Release notes](https://github.com/gulpjs/copy-props/releases)
-- [Changelog](https://github.com/gulpjs/copy-props/blob/master/CHANGELOG.md)
-- [Commits](https://github.com/gulpjs/copy-props/compare/2.0.4...2.0.5)
-
----
-updated-dependencies:
-- dependency-name: copy-props
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [copy-props](https://github.com/gulpjs/copy-props) from 2.0.4 to 2.0.5.
+- [Release notes](https://github.com/gulpjs/copy-props/releases)
+- [Changelog](https://github.com/gulpjs/copy-props/blob/master/CHANGELOG.md)
+- [Commits](https://github.com/gulpjs/copy-props/compare/2.0.4...2.0.5)
+
+---
+updated-dependencies:
+- dependency-name: copy-props
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(meta): add pixeldesu to patron list ([#8714](https://github.com/orhun/git-cliff/issues/8714))
 
 
 - Chore(deps): bump hosted-git-info from 2.8.8 to 2.8.9 ([#8708](https://github.com/orhun/git-cliff/issues/8708))
 
-Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
-- [Release notes](https://github.com/npm/hosted-git-info/releases)
-- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
-- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)
-
----
-updated-dependencies:
-- dependency-name: hosted-git-info
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.8.8 to 2.8.9.
+- [Release notes](https://github.com/npm/hosted-git-info/releases)
+- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
+- [Commits](https://github.com/npm/hosted-git-info/compare/v2.8.8...v2.8.9)
+
+---
+updated-dependencies:
+- dependency-name: hosted-git-info
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(dev): tweak text
 - Update deps
@@ -7506,12 +9906,12 @@ Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.c
 
 - Chore: fix some lints automatically ([#8788](https://github.com/orhun/git-cliff/issues/8788))
 
-* chore: fix some lints automatically
-
-Fixed lints that were automatically fixable with `eslint --fix`.
-
-* fix type
-
+* chore: fix some lints automatically
+
+Fixed lints that were automatically fixable with `eslint --fix`.
+
+* fix type
+
 * workaround for empty interface lint
 - Chore: tweak logo
 
@@ -7525,17 +9925,17 @@ Fixed lints that were automatically fixable with `eslint --fix`.
 
 - Chore: synchronize visibility checks ([#8687](https://github.com/orhun/git-cliff/issues/8687))
 
-* reuse single meId parameter
-
-* unify code style
-
-Use template string to avoid having to use escaped quote marks.
-
-* fix: follower only notes are visible to mentioned users
-
-This synchronizes the visibility rules with the Notes.isVisibleForMe
-method from packages/backend/src/models/repositories/note.ts
-
+* reuse single meId parameter
+
+* unify code style
+
+Use template string to avoid having to use escaped quote marks.
+
+* fix: follower only notes are visible to mentioned users
+
+This synchronizes the visibility rules with the Notes.isVisibleForMe
+method from packages/backend/src/models/repositories/note.ts
+
 * add comment
 - Chore(client): tweak range control design
 
@@ -7560,49 +9960,49 @@ method from packages/backend/src/models/repositories/note.ts
 
 - Chore(deps): bump undici from 5.4.0 to 5.5.1 in /packages/backend ([#8842](https://github.com/orhun/git-cliff/issues/8842))
 
-Bumps [undici](https://github.com/nodejs/undici) from 5.4.0 to 5.5.1.
-- [Release notes](https://github.com/nodejs/undici/releases)
-- [Commits](https://github.com/nodejs/undici/compare/v5.4.0...v5.5.1)
-
----
-updated-dependencies:
-- dependency-name: undici
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [undici](https://github.com/nodejs/undici) from 5.4.0 to 5.5.1.
+- [Release notes](https://github.com/nodejs/undici/releases)
+- [Commits](https://github.com/nodejs/undici/compare/v5.4.0...v5.5.1)
+
+---
+updated-dependencies:
+- dependency-name: undici
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump jpeg-js from 0.4.1 to 0.4.4 in /packages/backend ([#8843](https://github.com/orhun/git-cliff/issues/8843))
 
-Bumps [jpeg-js](https://github.com/eugeneware/jpeg-js) from 0.4.1 to 0.4.4.
-- [Release notes](https://github.com/eugeneware/jpeg-js/releases)
-- [Commits](https://github.com/eugeneware/jpeg-js/compare/v0.4.1...v0.4.4)
-
----
-updated-dependencies:
-- dependency-name: jpeg-js
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [jpeg-js](https://github.com/eugeneware/jpeg-js) from 0.4.1 to 0.4.4.
+- [Release notes](https://github.com/eugeneware/jpeg-js/releases)
+- [Commits](https://github.com/eugeneware/jpeg-js/compare/v0.4.1...v0.4.4)
+
+---
+updated-dependencies:
+- dependency-name: jpeg-js
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(deps): bump jsrsasign from 10.5.24 to 10.5.25 in /packages/backend ([#8889](https://github.com/orhun/git-cliff/issues/8889))
 
-Bumps [jsrsasign](https://github.com/kjur/jsrsasign) from 10.5.24 to 10.5.25.
-- [Release notes](https://github.com/kjur/jsrsasign/releases)
-- [Changelog](https://github.com/kjur/jsrsasign/blob/master/ChangeLog.txt)
-- [Commits](https://github.com/kjur/jsrsasign/compare/10.5.24...10.5.25)
-
----
-updated-dependencies:
-- dependency-name: jsrsasign
-  dependency-type: direct:production
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [jsrsasign](https://github.com/kjur/jsrsasign) from 10.5.24 to 10.5.25.
+- [Release notes](https://github.com/kjur/jsrsasign/releases)
+- [Changelog](https://github.com/kjur/jsrsasign/blob/master/ChangeLog.txt)
+- [Commits](https://github.com/kjur/jsrsasign/compare/10.5.24...10.5.25)
+
+---
+updated-dependencies:
+- dependency-name: jsrsasign
+  dependency-type: direct:production
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(client): tweak ui
 
@@ -7702,12 +10102,12 @@ Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.c
 
 - Chore: fix client lint errors ([#8934](https://github.com/orhun/git-cliff/issues/8934))
 
-* Fix client lint
-
-* Hide no-v-html
-
-* Ignore banned type
-
+* Fix client lint
+
+* Hide no-v-html
+
+* Ignore banned type
+
 * Update page-editor.vue
 - Chore(client): tweak ui
 
@@ -7747,19 +10147,19 @@ Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.c
 
 - Chore(deps): bump moment from 2.29.3 to 2.29.4 in /packages/backend ([#8958](https://github.com/orhun/git-cliff/issues/8958))
 
-Bumps [moment](https://github.com/moment/moment) from 2.29.3 to 2.29.4.
-- [Release notes](https://github.com/moment/moment/releases)
-- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
-- [Commits](https://github.com/moment/moment/compare/2.29.3...2.29.4)
-
----
-updated-dependencies:
-- dependency-name: moment
-  dependency-type: indirect
-...
-
-Signed-off-by: dependabot[bot] <support@github.com>
-
+Bumps [moment](https://github.com/moment/moment) from 2.29.3 to 2.29.4.
+- [Release notes](https://github.com/moment/moment/releases)
+- [Changelog](https://github.com/moment/moment/blob/develop/CHANGELOG.md)
+- [Commits](https://github.com/moment/moment/compare/2.29.3...2.29.4)
+
+---
+updated-dependencies:
+- dependency-name: moment
+  dependency-type: indirect
+...
+
+Signed-off-by: dependabot[bot] <support@github.com>
+
 Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 - Chore(server): tweak api for admin
 
@@ -7824,10 +10224,10 @@ Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.c
 
 - Chore: improve ad style ([#8995](https://github.com/orhun/git-cliff/issues/8995))
 
-* Improve ad style
-
-* :art:
-
+* Improve ad style
+
+* :art:
+
 * `ad` -> `info`
 - Chore(client): tweak style
 
@@ -7907,30 +10307,30 @@ See: https://forum.vuejs.org/t/how-to-avoid-non-function-value-encountered-for-d
 
 - Perf: Improve network request performance ([#7636](https://github.com/orhun/git-cliff/issues/7636))
 
-* perf: Improve fetch
-
-* CHANGELOG
-
+* perf: Improve fetch
+
+* CHANGELOG
+
 * lifo
 - Perf: Tune AP job queue timings ([#7635](https://github.com/orhun/git-cliff/issues/7635))
 
-* perf: Tune AP job queue timings
-
-* CHANGELOG
-
-* chore: add reference
-
+* perf: Tune AP job queue timings
+
+* CHANGELOG
+
+* chore: add reference
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Perf: delete-account処理を軽くする ([#7958](https://github.com/orhun/git-cliff/issues/7958))
 
-* Revert "#7892"
-
-This reverts commit 71d9c2a53d116a61f4c9b21ff98712a0000412b8.
-
-* アカウント削除処理でノート削除を重複して行なわないようにする
-
-* ドライブファイル削除時に参照しているノートを削除しないようにする
-
+* Revert "#7892"
+
+This reverts commit 71d9c2a53d116a61f4c9b21ff98712a0000412b8.
+
+* アカウント削除処理でノート削除を重複して行なわないようにする
+
+* ドライブファイル削除時に参照しているノートを削除しないようにする
+
 * 不要となったコードを削除する
 - Perf(server): reduce memory usage of redis
 - Perf(server): reduce db query
@@ -7957,9 +10357,9 @@ This reverts commit 71d9c2a53d116a61f4c9b21ff98712a0000412b8.
 
 - Perf: fix caching ([#8660](https://github.com/orhun/git-cliff/issues/8660))
 
-The cache implementation did previously not store the results of the
-computation and was thus not a cache at all. This can cause a significant
-number of database queries each time someone with a large number of
+The cache implementation did previously not store the results of the
+computation and was thus not a cache at all. This can cause a significant
+number of database queries each time someone with a large number of
 followers does something that causes an activity to be federated.
 - Perf(client): remove needless reactivity
 
@@ -8012,9 +10412,9 @@ followers does something that causes an activity to be federated.
 - Refactor(client): Add note
 - Refactor: use Object.fromEntries() instead of in-house implementation ([#6401](https://github.com/orhun/git-cliff/issues/6401))
 
-* refactor: use Object.fromEntries()
-instead of in-house implementation
-
+* refactor: use Object.fromEntries()
+instead of in-house implementation
+
 * Remove extra type assertions
 - Refactor
 
@@ -8095,16 +10495,16 @@ path aliasをサーバーサイドでも使ったりしたいため
 
 - Refactor mfm extract ([#7434](https://github.com/orhun/git-cliff/issues/7434))
 
-* refactor extractCustomEmojisFromMfm()
-
-* refactor extract-hashtags
-
-* refactor extract-mentions
-
-* refactor extract-hashtags
-
-* refactor extract-url-from-mfm
-
+* refactor extractCustomEmojisFromMfm()
+
+* refactor extract-hashtags
+
+* refactor extract-mentions
+
+* refactor extract-hashtags
+
+* refactor extract-url-from-mfm
+
 * refactor extract-mentions
 - Refactor
 
@@ -8131,24 +10531,24 @@ path aliasをサーバーサイドでも使ったりしたいため
 
 - Enhance(server): Improve user block ([#7640](https://github.com/orhun/git-cliff/issues/7640))
 
-* enhance(server): Improve user block
-
-* Update CHANGELOG.md
-
-* ユーザーリスト対応
-
-* 相手から見れなくなるように
-
-* Update 1629004542760-chart-reindex.ts
-
-https://github.com/misskey-dev/misskey/commit/2365761ba5445f26c8b66b3b20ef4be44e70d549#commitcomment-54919821
-
-* update test
-
-* add test
-
-* add todos
-
+* enhance(server): Improve user block
+
+* Update CHANGELOG.md
+
+* ユーザーリスト対応
+
+* 相手から見れなくなるように
+
+* Update 1629004542760-chart-reindex.ts
+
+https://github.com/misskey-dev/misskey/commit/2365761ba5445f26c8b66b3b20ef4be44e70d549#commitcomment-54919821
+
+* update test
+
+* add test
+
+* add todos
+
 * Update 1629004542760-chart-reindex.ts
 - Refactor
 
@@ -8164,23 +10564,23 @@ Related: #7658
 
 - Refactor: localStorageのaccountsはindexedDBで保持するように ([#7609](https://github.com/orhun/git-cliff/issues/7609))
 
-* accountsストアはindexedDBで保持するように
-
-* fix lint
-
-* fix indexeddb available detection
-
-* remove debugging code
-
-* fix lint
-
-* resolve https://github.com/misskey-dev/misskey/pull/7609/files/ba756204b77ce6e1189b8443e9641f2d02119621#diff-f565878e8202f0037b830c780b7c0932dc1bb5fd3d05ede14d72d10efbc3740c
-Firefoxでの動作を改善
-
-* fix lint
-
-* fix lint
-
+* accountsストアはindexedDBで保持するように
+
+* fix lint
+
+* fix indexeddb available detection
+
+* remove debugging code
+
+* fix lint
+
+* resolve https://github.com/misskey-dev/misskey/pull/7609/files/ba756204b77ce6e1189b8443e9641f2d02119621#diff-f565878e8202f0037b830c780b7c0932dc1bb5fd3d05ede14d72d10efbc3740c
+Firefoxでの動作を改善
+
+* fix lint
+
+* fix lint
+
 * add changelog
 - Enhance(client): Improve emoji autocomplete behaviour
 
@@ -8188,26 +10588,26 @@ cherry picked from https://github.com/kat-atat/misskey/commit/4b2c215e25a0bae47f
 
 - Enhance(server): Use job queue for account delete ([#7668](https://github.com/orhun/git-cliff/issues/7668))
 
-* enhance(server): Use job queue for account delete
-
-Fix #5336
-
-* ジョブをひとつに
-
-* remove done call
-
-* clean up
-
-* add User.isDeleted
-
-* コミット忘れ
-
-* Update 1629512953000-user-is-deleted.ts
-
-* show dialog
-
-* lint
-
+* enhance(server): Use job queue for account delete
+
+Fix #5336
+
+* ジョブをひとつに
+
+* remove done call
+
+* clean up
+
+* add User.isDeleted
+
+* コミット忘れ
+
+* Update 1629512953000-user-is-deleted.ts
+
+* show dialog
+
+* lint
+
 * Update 1629512953000-user-is-deleted.ts
 - Enhance: Improve account deletion experience
 
@@ -8219,32 +10619,32 @@ Fix #5336
 
 - Refactor: Expand schema ([#7772](https://github.com/orhun/git-cliff/issues/7772))
 
-* packedNotificationSchemaを更新
-
-* read:gallery, write:gallery, read:gallery-likes, write:gallery-likesに翻訳を追加
-
-* fix
-
-* add header, choice, invitation
-
-* test
-
-* fix
-
-* yatta
-
-* remove no longer needed "as PackedUser/PackedNote"
-
-* clean up
-
-* add simple-schema
-
-* fix lint
-
-* define items in full Schema
-
-* revert https://github.com/misskey-dev/misskey/pull/7772#discussion_r706627736
-
+* packedNotificationSchemaを更新
+
+* read:gallery, write:gallery, read:gallery-likes, write:gallery-likesに翻訳を追加
+
+* fix
+
+* add header, choice, invitation
+
+* test
+
+* fix
+
+* yatta
+
+* remove no longer needed "as PackedUser/PackedNote"
+
+* clean up
+
+* add simple-schema
+
+* fix lint
+
+* define items in full Schema
+
+* revert https://github.com/misskey-dev/misskey/pull/7772#discussion_r706627736
+
 * user packとnote packの型不整合を修正
 - Enhance(server): アカウントが凍結されたときのエラーを判定しやすく
 
@@ -8252,10 +10652,10 @@ Fix #5336
 
 - Enhance: ノートヘッダーにflex-shrinkを設定し、Acctを優先的に縮小して見栄えをよくするように ([#7752](https://github.com/orhun/git-cliff/issues/7752))
 
-* MAKE NOTE HEADER FLEX AGAIN
-
-* span => div
-
+* MAKE NOTE HEADER FLEX AGAIN
+
+* span => div
+
 * remove submodules
 - Enhance(client): リスト、アンテナタイムラインを個別ページとして分割
 
@@ -8265,106 +10665,106 @@ Resolve #7756
 
 - Refactor: PackedHoge型をPacked<'Hoge'>型に書き換える ([#7792](https://github.com/orhun/git-cliff/issues/7792))
 
-* packedNotificationSchemaを更新
-
-* read:gallery, write:gallery, read:gallery-likes, write:gallery-likesに翻訳を追加
-
-* fix
-
-* add header, choice, invitation
-
-* test
-
-* fix
-
-* yatta
-
-* remove no longer needed "as PackedUser/PackedNote"
-
-* clean up
-
-* add simple-schema
-
-* fix lint
-
-* define items in full Schema
-
-* revert https://github.com/misskey-dev/misskey/pull/7772#discussion_r706627736
-
-* user packとnote packの型不整合を修正
-
-* add prelude/types.ts
-
-* emoji
-
-* signin
-
-* game
-
-* matching
-
-* fix
-
-* add emoji schema
-
-* add reversiGame
-
-* add reversiMatching
-
-* remove signin schema (use Signin entity)
-
-* add Packed type
-
-* note-reaction
-
-* user
-
-* user-group
-
-* user-list
-
-* note
-
-* app, messaging-message
-
-* notification
-
-* drive-file
-
-* drive-folder
-
-* following
-
-* muting
-
-* blocking
-
-* hashtag
-
-* page
-
-* app (with modifying schema)
-
-* import user?
-
-* channel
-
-* antenna
-
-* clip
-
-* gallery-post
-
-* emoji
-
-* Packed
-
-* reversi-matching
-
-* add changelog
-
-* add changelog
-
+* packedNotificationSchemaを更新
+
+* read:gallery, write:gallery, read:gallery-likes, write:gallery-likesに翻訳を追加
+
+* fix
+
+* add header, choice, invitation
+
+* test
+
+* fix
+
+* yatta
+
+* remove no longer needed "as PackedUser/PackedNote"
+
+* clean up
+
+* add simple-schema
+
+* fix lint
+
+* define items in full Schema
+
+* revert https://github.com/misskey-dev/misskey/pull/7772#discussion_r706627736
+
+* user packとnote packの型不整合を修正
+
+* add prelude/types.ts
+
+* emoji
+
+* signin
+
+* game
+
+* matching
+
+* fix
+
+* add emoji schema
+
+* add reversiGame
+
+* add reversiMatching
+
+* remove signin schema (use Signin entity)
+
+* add Packed type
+
+* note-reaction
+
+* user
+
+* user-group
+
+* user-list
+
+* note
+
+* app, messaging-message
+
+* notification
+
+* drive-file
+
+* drive-folder
+
+* following
+
+* muting
+
+* blocking
+
+* hashtag
+
+* page
+
+* app (with modifying schema)
+
+* import user?
+
+* channel
+
+* antenna
+
+* clip
+
+* gallery-post
+
+* emoji
+
+* Packed
+
+* reversi-matching
+
+* add changelog
+
+* add changelog
+
 * revert fix
 - Enhance(client): アップデートが利用可能な場合エラー表示およびダイアログ表示しないように
 
@@ -8382,14 +10782,14 @@ Resolve #7854
 
 - Enhance: ページロードエラーページにリロードボタンを追加 ([#7835](https://github.com/orhun/git-cliff/issues/7835))
 
-* wip
-
-* modify page load error page
-
-* add changelog
-
-* サーバーが死んでるエラーを追加
-
+* wip
+
+* modify page load error page
+
+* add changelog
+
+* サーバーが死んでるエラーを追加
+
 * add MkLoading
 - Enhance(api): ap系のエンドポイントをログイン必須化+レートリミット追加
 
@@ -8411,223 +10811,223 @@ Resolve #7854
 
 - Enhance: shareページでより多くの情報を渡せるように ([#7606](https://github.com/orhun/git-cliff/issues/7606))
 
-* shareでより多くの情報を渡せるように
-
-* from chat ui post-form, remove instant and add share
-
-* fix await eating array, make document
-
-* add changelog
-
-* https://github.com/misskey-dev/misskey/pull/7606/files/3581bf9a060742dc59bf7fb8ea7316809cc60522#r692265037
-
-* reply, renoteにも型定義
-
-* :art:
-
+* shareでより多くの情報を渡せるように
+
+* from chat ui post-form, remove instant and add share
+
+* fix await eating array, make document
+
+* add changelog
+
+* https://github.com/misskey-dev/misskey/pull/7606/files/3581bf9a060742dc59bf7fb8ea7316809cc60522#r692265037
+
+* reply, renoteにも型定義
+
+* :art:
+
 * 閉じなければ100ms後タイムラインに
 - Refactor: publishHogeStreamとStreamのEventEmitterに型定義する ([#7769](https://github.com/orhun/git-cliff/issues/7769))
 
-* wip
-
-* wip
-
-* wip
-
-* :v:
-
-* add main stream
-
-* packedNotificationSchemaを更新
-
-* read:gallery, write:gallery, read:gallery-likes, write:gallery-likesに翻訳を追加
-
-* fix
-
-* ok
-
-* add header, choice, invitation
-
-* add header, choice, invitation
-
-* test
-
-* fix
-
-* fix
-
-* yatta
-
-* remove no longer needed "as PackedUser/PackedNote"
-
-* clean up
-
-* add simple-schema
-
-* fix lint
-
-* fix lint
-
-* wip
-
-* wip!
-
-* wip
-
-* fix
-
-* wip
-
-* wip
-
-* :v:
-
-* 送信側に型エラーがないことを3回確認した
-
-* :v:
-
-* wip
-
-* update typescript
-
-* define items in full Schema
-
-* edit comment
-
-* edit comment
-
-* edit comment
-
-* Update src/prelude/types.ts
-
-Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
-
-* https://github.com/misskey-dev/misskey/pull/7769#discussion_r703058458
-
-* user packとnote packの型不整合を修正
-
-* revert https://github.com/misskey-dev/misskey/pull/7772#discussion_r706627736
-
-* revert https://github.com/misskey-dev/misskey/pull/7772#discussion_r706627736
-
-* user packとnote packの型不整合を修正
-
-* add prelude/types.ts
-
-* emoji
-
-* signin
-
-* game
-
-* matching
-
-* clean up
-
-* ev => data
-
-* refactor
-
-* clean up
-
-* add type
-
-* antenna
-
-* channel
-
-* fix
-
-* add Packed type
-
-* add PackedRef
-
-* fix lint
-
-* add emoji schema
-
-* add reversiGame
-
-* add reversiMatching
-
-* remove signin schema (use Signin entity)
-
-* add schemas refs, fix Packed type
-
-* wip PackedHoge => Packed<'Hoge'>
-
-* add Packed type
-
-* note-reaction
-
-* user
-
-* user-group
-
-* user-list
-
-* note
-
-* app, messaging-message
-
-* notification
-
-* drive-file
-
-* drive-folder
-
-* following
-
-* muting
-
-* blocking
-
-* hashtag
-
-* page
-
-* app (with modifying schema)
-
-* import user?
-
-* channel
-
-* antenna
-
-* clip
-
-* gallery-post
-
-* emoji
-
-* Packed
-
-* reversi-matching
-
-* update stream.ts
-
-* https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339
-
-* fix lint
-
-* clean up?
-
-* add changelog
-
-* add changelog
-
-* add changelog
-
-* fix: アンテナが既読にならないのを修正
-
-* revert fix
-
-* https://github.com/misskey-dev/misskey/pull/7769#discussion_r711474875
-
-* spec => payload
-
-* edit commetn
-
+* wip
+
+* wip
+
+* wip
+
+* :v:
+
+* add main stream
+
+* packedNotificationSchemaを更新
+
+* read:gallery, write:gallery, read:gallery-likes, write:gallery-likesに翻訳を追加
+
+* fix
+
+* ok
+
+* add header, choice, invitation
+
+* add header, choice, invitation
+
+* test
+
+* fix
+
+* fix
+
+* yatta
+
+* remove no longer needed "as PackedUser/PackedNote"
+
+* clean up
+
+* add simple-schema
+
+* fix lint
+
+* fix lint
+
+* wip
+
+* wip!
+
+* wip
+
+* fix
+
+* wip
+
+* wip
+
+* :v:
+
+* 送信側に型エラーがないことを3回確認した
+
+* :v:
+
+* wip
+
+* update typescript
+
+* define items in full Schema
+
+* edit comment
+
+* edit comment
+
+* edit comment
+
+* Update src/prelude/types.ts
+
+Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
+
+* https://github.com/misskey-dev/misskey/pull/7769#discussion_r703058458
+
+* user packとnote packの型不整合を修正
+
+* revert https://github.com/misskey-dev/misskey/pull/7772#discussion_r706627736
+
+* revert https://github.com/misskey-dev/misskey/pull/7772#discussion_r706627736
+
+* user packとnote packの型不整合を修正
+
+* add prelude/types.ts
+
+* emoji
+
+* signin
+
+* game
+
+* matching
+
+* clean up
+
+* ev => data
+
+* refactor
+
+* clean up
+
+* add type
+
+* antenna
+
+* channel
+
+* fix
+
+* add Packed type
+
+* add PackedRef
+
+* fix lint
+
+* add emoji schema
+
+* add reversiGame
+
+* add reversiMatching
+
+* remove signin schema (use Signin entity)
+
+* add schemas refs, fix Packed type
+
+* wip PackedHoge => Packed<'Hoge'>
+
+* add Packed type
+
+* note-reaction
+
+* user
+
+* user-group
+
+* user-list
+
+* note
+
+* app, messaging-message
+
+* notification
+
+* drive-file
+
+* drive-folder
+
+* following
+
+* muting
+
+* blocking
+
+* hashtag
+
+* page
+
+* app (with modifying schema)
+
+* import user?
+
+* channel
+
+* antenna
+
+* clip
+
+* gallery-post
+
+* emoji
+
+* Packed
+
+* reversi-matching
+
+* update stream.ts
+
+* https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339
+
+* fix lint
+
+* clean up?
+
+* add changelog
+
+* add changelog
+
+* add changelog
+
+* fix: アンテナが既読にならないのを修正
+
+* revert fix
+
+* https://github.com/misskey-dev/misskey/pull/7769#discussion_r711474875
+
+* spec => payload
+
+* edit commetn
+
 Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 - Refactor clinet
 
@@ -8637,23 +11037,23 @@ Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 
 - Enhance: Provide Twemoji SVGs from Misskey server ([#2](https://github.com/orhun/git-cliff/issues/2)) ([#7897](https://github.com/orhun/git-cliff/issues/7897))
 
-* Selfhosting Twemoji
-
-* ちっ
-
-* うざっ
-
-* あ
-
-* add test
-
+* Selfhosting Twemoji
+
+* ちっ
+
+* うざっ
+
+* あ
+
+* add test
+
 Co-authored-by: mei23 <m@m544.net>
 - Refactor
 
 - Refactor: Introduce list of MFM Functions ([#7882](https://github.com/orhun/git-cliff/issues/7882))
 
-* introduce list of MFM Functions
-
+* introduce list of MFM Functions
+
 * add note
 - Refactoring
 
@@ -8669,21 +11069,21 @@ Resolve #7779
 
 - Enhance: show renoters ([#7954](https://github.com/orhun/git-cliff/issues/7954))
 
-* refactor: deduplicate renote button into component
-
-For now the renoters tooltip just uses the reaction viewer component
-with a fixed emoji symbol instead.
-
-* chore: remove unnecessary CSS
-
-* fix: forgot to rename variable
-
-* enhance: use own tooltip instead of reaction viewer
-
-* clean up style
-
-* fix additional renoters number
-
+* refactor: deduplicate renote button into component
+
+For now the renoters tooltip just uses the reaction viewer component
+with a fixed emoji symbol instead.
+
+* chore: remove unnecessary CSS
+
+* fix: forgot to rename variable
+
+* enhance: use own tooltip instead of reaction viewer
+
+* clean up style
+
+* fix additional renoters number
+
 * rename file to better represent content
 - Refactor(client): use composition api for tooltip logic
 
@@ -8750,22 +11150,22 @@ Fix #8029
 
 - Enhance: pizzaxでstreamingのuser storage updateイベントを監視して更新 ([#8095](https://github.com/orhun/git-cliff/issues/8095))
 
-* wip
-
-* wip?
-
-* ?
-
-* streamingのuser storage updateイベントを監視して更新
-
-* 必要な時以外はストレージを更新しない
-
-* fix?
-
-* wip
-
-* fix
-
+* wip
+
+* wip?
+
+* ?
+
+* streamingのuser storage updateイベントを監視して更新
+
+* 必要な時以外はストレージを更新しない
+
+* fix?
+
+* wip
+
+* fix
+
 * fix
 - Enhance(client): tweak ui
 
@@ -8777,8 +11177,8 @@ Fix #8029
 
 - Enhance: 許可されていないファイルタイプでは、オブジェクトストレージのファイル名に拡張子を付与しないように ([#8108](https://github.com/orhun/git-cliff/issues/8108))
 
-* 許可されていないファイルタイプでは、オブジェクトストレージのファイル名に拡張子を付与しないように
-
+* 許可されていないファイルタイプでは、オブジェクトストレージのファイル名に拡張子を付与しないように
+
 * add comment
 - Refactor(client): use composition api
 
@@ -8800,67 +11200,67 @@ Fix #8029
 
 - Refactor: Widgetのcomposition api移行 ([#8125](https://github.com/orhun/git-cliff/issues/8125))
 
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
 * fix
 - Refactor: Composition APIへ移行 ([#8121](https://github.com/orhun/git-cliff/issues/8121))
 
-* components/abuse-report-window.vue
-
-* use <script setup>
-
-* :v:
-
-* components/analog-clock.vue
-
-* wip components/autocomplete.vue
-
-* :v:
-
-* :v:
-
-* fix
-
-* wip components/captcha.vue
-
-* clean up
-
-* components/channel-follow-button
-
-* components/channel-preview.vue
-
-* components/core-core.vue
-
-* components/code.vue
-
-* wip components/date-separated-list.vue
-
-* fix
-
-* fix autocomplete.vue
-
-* :v:
-
-* remove global property
-
-* use <script setup>
-
-* components/dialog.vue
-
-* clena up
-
-* fix dialog.vue
-
+* components/abuse-report-window.vue
+
+* use <script setup>
+
+* :v:
+
+* components/analog-clock.vue
+
+* wip components/autocomplete.vue
+
+* :v:
+
+* :v:
+
+* fix
+
+* wip components/captcha.vue
+
+* clean up
+
+* components/channel-follow-button
+
+* components/channel-preview.vue
+
+* components/core-core.vue
+
+* components/code.vue
+
+* wip components/date-separated-list.vue
+
+* fix
+
+* fix autocomplete.vue
+
+* :v:
+
+* remove global property
+
+* use <script setup>
+
+* components/dialog.vue
+
+* clena up
+
+* fix dialog.vue
+
 * Resolve https://github.com/misskey-dev/misskey/pull/8121#discussion_r781250966
 - Refactor
 
@@ -8876,204 +11276,204 @@ Fix #8029
 
 - Refactor: APIエンドポイントファイルの定義を良い感じにする ([#8154](https://github.com/orhun/git-cliff/issues/8154))
 
-* Fix API Schema Error
-
-* Delete SimpleSchema/SimpleObj
-and Move schemas to dedicated files
-
-* Userのスキーマを分割してみる
-
-* define packMany type
-
-* add ,
-
-* Ensure enum schema and Make "as const" put once
-
-* test?
-
-* Revert "test?"
-
-This reverts commit 97dc9bfa70851bfb7d1cf38e883f8df20fb78b79.
-
-* Revert "Fix API Schema Error"
-
-This reverts commit 21b6176d974ed8e3eb73723ad21a105c5d297323.
-
-* :v:
-
-* clean up
-
-* test?
-
-* wip
-
-* wip
-
-* better schema def
-
-* :v:
-
-* fix
-
-* add minLength property
-
-* wip
-
-* wip
-
-* wip
-
-* anyOf/oneOf/allOfに対応？ ~ relation.ts
-
-* refactor!
-
-* Define MinimumSchema
-
-* wip
-
-* wip
-
-* anyOf/oneOf/allOfが動作するようにUnionSchemaTypeを修正
-
-* anyOf/oneOf/allOfが動作するようにUnionSchemaTypeを修正
-
-* Update packages/backend/src/misc/schema.ts
-
-Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
-
-* fix
-
-* array oneOfをより正確な型に
-
-* array oneOfをより正確な型に
-
-* wip
-
-* :v:
-
-* なんかもういろいろ
-
-* remove
-
-* very good schema
-
-* api schema
-
-* wip
-
-* refactor: awaitAllの型定義を変えてみる
-
-* fix
-
-* specify types in awaitAll
-
-* specify types in awaitAll
-
-* :v:
-
-* wip
-
-* ...
-
-* :v:
-
-* AllowDateはやめておく
-
-* 不必要なoptional: false, nullable: falseを廃止
-
-* Packedが展開されないように
-
-* 続packed
-
-* wip
-
-* define note type
-
-* wip
-
-* UserDetailedをMeDetailedかUserDetailedNotMeかを区別できるように
-
-* wip
-
-* wip
-
-* wip specify user type of other schemas
-
-* ok
-
-* convertSchemaToOpenApiSchemaを改修
-
-* convertSchemaToOpenApiSchemaを改修
-
-* Fix
-
-* fix
-
-* :v:
-
-* wip
-
-* 分割代入ではなくallOfで定義するように
-
+* Fix API Schema Error
+
+* Delete SimpleSchema/SimpleObj
+and Move schemas to dedicated files
+
+* Userのスキーマを分割してみる
+
+* define packMany type
+
+* add ,
+
+* Ensure enum schema and Make "as const" put once
+
+* test?
+
+* Revert "test?"
+
+This reverts commit 97dc9bfa70851bfb7d1cf38e883f8df20fb78b79.
+
+* Revert "Fix API Schema Error"
+
+This reverts commit 21b6176d974ed8e3eb73723ad21a105c5d297323.
+
+* :v:
+
+* clean up
+
+* test?
+
+* wip
+
+* wip
+
+* better schema def
+
+* :v:
+
+* fix
+
+* add minLength property
+
+* wip
+
+* wip
+
+* wip
+
+* anyOf/oneOf/allOfに対応？ ~ relation.ts
+
+* refactor!
+
+* Define MinimumSchema
+
+* wip
+
+* wip
+
+* anyOf/oneOf/allOfが動作するようにUnionSchemaTypeを修正
+
+* anyOf/oneOf/allOfが動作するようにUnionSchemaTypeを修正
+
+* Update packages/backend/src/misc/schema.ts
+
+Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
+
+* fix
+
+* array oneOfをより正確な型に
+
+* array oneOfをより正確な型に
+
+* wip
+
+* :v:
+
+* なんかもういろいろ
+
+* remove
+
+* very good schema
+
+* api schema
+
+* wip
+
+* refactor: awaitAllの型定義を変えてみる
+
+* fix
+
+* specify types in awaitAll
+
+* specify types in awaitAll
+
+* :v:
+
+* wip
+
+* ...
+
+* :v:
+
+* AllowDateはやめておく
+
+* 不必要なoptional: false, nullable: falseを廃止
+
+* Packedが展開されないように
+
+* 続packed
+
+* wip
+
+* define note type
+
+* wip
+
+* UserDetailedをMeDetailedかUserDetailedNotMeかを区別できるように
+
+* wip
+
+* wip
+
+* wip specify user type of other schemas
+
+* ok
+
+* convertSchemaToOpenApiSchemaを改修
+
+* convertSchemaToOpenApiSchemaを改修
+
+* Fix
+
+* fix
+
+* :v:
+
+* wip
+
+* 分割代入ではなくallOfで定義するように
+
 Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 - Refactor: Composition APIへ移行 ([#8138](https://github.com/orhun/git-cliff/issues/8138))
 
-* components/drive-file-thumbnail.vue
-
-* components/drive-select-dialog.vue
-
-* components/drive-window.vue
-
-* wip
-
-* wip drive.file.vue, drive.vue
-
-* fix prop
-
-* wip(
-
-* components/drive.folder.vue
-
-* maybe ok
-
-* :v:
-
-* fix variable
-
-* FIX FOLDER VARIABLE
-
-* components/emoji-picker-dialog.vue
-
-* Hate `$emit`
-
-* hate global property
-
-* components/emoji-picker-window.vue
-
-* components/emoji-picker.section.vue
-
-* fix
-
-* fixx
-
-* wip components/emoji-picker.vue
-
-* fix
-
-* defineExpose
-
-* ユニコード絵文字の型をもっといい感じに
-
-* components/featured-photos.vue
-
-* components/follow-button.vue
-
-* forgot-password.vue
-
-* forgot-password.vue
-
-* :art:
-
+* components/drive-file-thumbnail.vue
+
+* components/drive-select-dialog.vue
+
+* components/drive-window.vue
+
+* wip
+
+* wip drive.file.vue, drive.vue
+
+* fix prop
+
+* wip(
+
+* components/drive.folder.vue
+
+* maybe ok
+
+* :v:
+
+* fix variable
+
+* FIX FOLDER VARIABLE
+
+* components/emoji-picker-dialog.vue
+
+* Hate `$emit`
+
+* hate global property
+
+* components/emoji-picker-window.vue
+
+* components/emoji-picker.section.vue
+
+* fix
+
+* fixx
+
+* wip components/emoji-picker.vue
+
+* fix
+
+* defineExpose
+
+* ユニコード絵文字の型をもっといい感じに
+
+* components/featured-photos.vue
+
+* components/follow-button.vue
+
+* forgot-password.vue
+
+* forgot-password.vue
+
+* :art:
+
 * fix
 - Refactor
 
@@ -9085,147 +11485,147 @@ Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 
 - Enhance: Forward report ([#8001](https://github.com/orhun/git-cliff/issues/8001))
 
-* implement sending AP Flag object
-
-Optionally allow a user to select to forward a report about a remote
-user to the other instance. This is added in a backwards-compatible way.
-
-* add locale string
-
-* forward report only for moderators
-
-* add switch to moderator UI to forward report
-
-* fix report note url
-
-* return forwarded status from API
-
-apparently forgot to carry this over from my testing environment
-
-* object in Flag activity has to be an array
-
-For correct interoperability with Pleroma the "object" property of the Flag
-activity has to be an array.
-
-This array will in the future also hold the link to respective notes, so it
-makes sense to correct this on our side.
-
-* Update get-note-menu.ts
-
+* implement sending AP Flag object
+
+Optionally allow a user to select to forward a report about a remote
+user to the other instance. This is added in a backwards-compatible way.
+
+* add locale string
+
+* forward report only for moderators
+
+* add switch to moderator UI to forward report
+
+* fix report note url
+
+* return forwarded status from API
+
+apparently forgot to carry this over from my testing environment
+
+* object in Flag activity has to be an array
+
+For correct interoperability with Pleroma the "object" property of the Flag
+activity has to be an array.
+
+This array will in the future also hold the link to respective notes, so it
+makes sense to correct this on our side.
+
+* Update get-note-menu.ts
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Enhance: e2eテストをできるだけ改良してみた ([#8159](https://github.com/orhun/git-cliff/issues/8159))
 
-* update docker image?
-
-* 続
-
-* serial run delete from "${table}" cascade
-
-* use cypress official github action
-
-* refuse install by cypress action
-
-* clean up
-
-* use wait?
-
-* use more wait?
-
-* Revert "use more wait?"
-
-This reverts commit 18d0fcae9c7d8f98a4cafb4a846a031ece57350c.
-
-* Revert "use wait?"
-
-This reverts commit 5aa8feec9cdc3e2f79e566249f0a0eff6c0df6a0.
-
-* fix
-
-* test
-
-* test
-
-* log?
-
-* 握りつぶしてみる
-
-* clean up
-
-* env?
-
-* clean up?
-
-* disable video
-
-* add comment
-
-* remove test
-
-* 成功?
-
-* test browser
-
-* nodeインストール無効化
-
-* node16.13.0-chrome95-ff94
-
-* node.js復活
-
-* ？
-
-* ちょっと戻してみる
-
-* chrome?
-
-* cross browser test2
-
-* --shm-size=2g
-
-* artifact?
-
-* misskey.local?
-
-* firefoxはあきらめる
-
-* not headless?
-
-* oops
-
-* fix
-
-* ??
-
-* test1
-
-* if?
-
-* fail-fast: false
-
-* headless: false
-
-* easy error ignoreing describe
-
-* エラーの解消
-とちょっとリファクター
-
-* add browser name to artifact
-
-* Install mplayer for FireFox
-
-* no wait?
-
-* タイムアウトを甘くしてみる
-
-* firefoxをあきらめる(n回目)
-
-* remove timeout setting
-
-* wait復活
-
-* Update basic.js
-
-* Update index.js
-
+* update docker image?
+
+* 続
+
+* serial run delete from "${table}" cascade
+
+* use cypress official github action
+
+* refuse install by cypress action
+
+* clean up
+
+* use wait?
+
+* use more wait?
+
+* Revert "use more wait?"
+
+This reverts commit 18d0fcae9c7d8f98a4cafb4a846a031ece57350c.
+
+* Revert "use wait?"
+
+This reverts commit 5aa8feec9cdc3e2f79e566249f0a0eff6c0df6a0.
+
+* fix
+
+* test
+
+* test
+
+* log?
+
+* 握りつぶしてみる
+
+* clean up
+
+* env?
+
+* clean up?
+
+* disable video
+
+* add comment
+
+* remove test
+
+* 成功?
+
+* test browser
+
+* nodeインストール無効化
+
+* node16.13.0-chrome95-ff94
+
+* node.js復活
+
+* ？
+
+* ちょっと戻してみる
+
+* chrome?
+
+* cross browser test2
+
+* --shm-size=2g
+
+* artifact?
+
+* misskey.local?
+
+* firefoxはあきらめる
+
+* not headless?
+
+* oops
+
+* fix
+
+* ??
+
+* test1
+
+* if?
+
+* fail-fast: false
+
+* headless: false
+
+* easy error ignoreing describe
+
+* エラーの解消
+とちょっとリファクター
+
+* add browser name to artifact
+
+* Install mplayer for FireFox
+
+* no wait?
+
+* タイムアウトを甘くしてみる
+
+* firefoxをあきらめる(n回目)
+
+* remove timeout setting
+
+* wait復活
+
+* Update basic.js
+
+* Update index.js
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Refactor
 
@@ -9233,27 +11633,27 @@ Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 
 - Refactor, enhance: ドライブ引数のオブジェクト化, 追加時のcomment指定 ([#8180](https://github.com/orhun/git-cliff/issues/8180))
 
-* refactor: ドライブの引数をオブジェクト化する Resolve #8177
-
-* Resolve #8181
-
-* fix
-
+* refactor: ドライブの引数をオブジェクト化する Resolve #8177
+
+* Resolve #8181
+
+* fix
+
 * archivePath
 - Refactor(backend): use insert instead of save
 
 - Enhance: Improve poll-editor UI + composition port ([#8186](https://github.com/orhun/git-cliff/issues/8186))
 
-* Poll editor UI changes
-
-Use a horizontal layout when possible, wrap to vertical when constrained
-
-* Port poll-editor to composition API
-
-* Fix poll-editor `get` time calcs
-
-* fix
-
+* Poll editor UI changes
+
+Use a horizontal layout when possible, wrap to vertical when constrained
+
+* Port poll-editor to composition API
+
+* Fix poll-editor `get` time calcs
+
+* fix
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Refactor
 
@@ -9265,8 +11665,8 @@ Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 
 - Enhance: MediaListでは、サーバーで許可された形式しか表示しないように ([#8113](https://github.com/orhun/git-cliff/issues/8113))
 
-* wip
-
+* wip
+
 * fix
 - Refactor(client): use composition api
 
@@ -9286,26 +11686,26 @@ Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 
 - Enhance: メニュー関連をComposition API化、switchアイテム追加 ([#8215](https://github.com/orhun/git-cliff/issues/8215))
 
-* メニューをComposition API化、switchアイテム追加
-クライアントサイド画像圧縮の準備
-
-* メニュー型定義を分離 (TypeScriptの型支援が効かないので)
-
-* disabled
-
-* make keepOriginal to follow setting value
-
-* fix
-
-* fix
-
-* Fix
-
+* メニューをComposition API化、switchアイテム追加
+クライアントサイド画像圧縮の準備
+
+* メニュー型定義を分離 (TypeScriptの型支援が効かないので)
+
+* disabled
+
+* make keepOriginal to follow setting value
+
+* fix
+
+* fix
+
+* Fix
+
 * clean up
 - Refactor: APIで非JSON入力の型変換はendpointに渡す前に行うように ([#8229](https://github.com/orhun/git-cliff/issues/8229))
 
-* Resolve #8228
-
+* Resolve #8228
+
 * fix
 - Enhance(client): Chartjsのツールチップを自前に
 
@@ -9361,122 +11761,122 @@ Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 
 - Refactor: use ajv instead of cafy ([#8324](https://github.com/orhun/git-cliff/issues/8324))
 
-* wip
-
-* wip
-
-* Update abuse-user-reports.ts
-
-* Update files.ts
-
-* Update list-remote.ts
-
-* Update list.ts
-
-* Update show-users.ts
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* Update update.ts
-
-* Update search.ts
-
-* Update reactions.ts
-
-* Update search.ts
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* Update update.ts
-
-* Update relation.ts
-
-* Update available.ts
-
-* wip
-
-* wip
-
-* wip
-
-* Update packages/backend/src/server/api/define.ts
-
-Co-authored-by: Johann150 <johann.galle@protonmail.com>
-
-* Update define.ts
-
-* Update define.ts
-
-* typo
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* Update update.ts
-
-* wip
-
-* Update signup.ts
-
-* Update call.ts
-
-* minimum for limit
-
-* type
-
-* remove needless annotation
-
-* wip
-
-* Update signup.ts
-
-* wip
-
-* wip
-
-* fix
-
-* Update create.ts
-
+* wip
+
+* wip
+
+* Update abuse-user-reports.ts
+
+* Update files.ts
+
+* Update list-remote.ts
+
+* Update list.ts
+
+* Update show-users.ts
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* Update update.ts
+
+* Update search.ts
+
+* Update reactions.ts
+
+* Update search.ts
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* Update update.ts
+
+* Update relation.ts
+
+* Update available.ts
+
+* wip
+
+* wip
+
+* wip
+
+* Update packages/backend/src/server/api/define.ts
+
+Co-authored-by: Johann150 <johann.galle@protonmail.com>
+
+* Update define.ts
+
+* Update define.ts
+
+* typo
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* Update update.ts
+
+* wip
+
+* Update signup.ts
+
+* Update call.ts
+
+* minimum for limit
+
+* type
+
+* remove needless annotation
+
+* wip
+
+* Update signup.ts
+
+* wip
+
+* wip
+
+* fix
+
+* Update create.ts
+
 Co-authored-by: Johann150 <johann.galle@protonmail.com>
 - Refactor: fix type
 
@@ -9490,18 +11890,18 @@ Co-authored-by: Johann150 <johann.galle@protonmail.com>
 
 - Refactor: Use ESM ([#8358](https://github.com/orhun/git-cliff/issues/8358))
 
-* wip
-
-* wip
-
-* fix
-
-* clean up
-
-* Update tsconfig.json
-
-* Update activitypub.ts
-
+* wip
+
+* wip
+
+* fix
+
+* clean up
+
+* Update tsconfig.json
+
+* Update activitypub.ts
+
 * wip
 - Refactor
 
@@ -9519,26 +11919,26 @@ Co-authored-by: Johann150 <johann.galle@protonmail.com>
 
 - Refactor: migrate to typeorm 3.0 ([#8443](https://github.com/orhun/git-cliff/issues/8443))
 
-* wip
-
-* wip
-
-* wip
-
-* Update following.ts
-
-* wip
-
-* wip
-
-* wip
-
-* Update resolve-user.ts
-
-* maxQueryExecutionTime
-
-* wip
-
+* wip
+
+* wip
+
+* wip
+
+* Update following.ts
+
+* wip
+
+* wip
+
+* wip
+
+* Update resolve-user.ts
+
+* maxQueryExecutionTime
+
+* wip
+
 * wip
 - Refactor and performance improvements
 
@@ -9550,55 +11950,55 @@ Co-authored-by: Johann150 <johann.galle@protonmail.com>
 
 - Enhance(doc): required input fields ([#8456](https://github.com/orhun/git-cliff/issues/8456))
 
-* remove empty file
-
-If the endpoint is to be implemented later, the file can be added back,
-but for now it is confusing to have an empty file.
-
-* enhance(doc): document defaults
-
-Default for `isPublic` is based on the database schema default value.
-Defaults for `local` and `withFiles` are based on the behaviour of the endpoint.
-
-* enhance(doc): explain nullable emoji category
-
-* fix: make nullable if default is null
-
-* enhance(doc): explain mute attribute expiresAt
-
-* fix: define required fields
-
-- `notes/create`: the default for `text` has been removed because ajv can not handle
-  `default` inside of `anyOf`, see
-  https://ajv.js.org/guide/modifying-data.html#assigning-defaults
-  and the default value cannot be `null` if text is `nullable: false` in the `anyOf`
-  first alternative.
-- `notes/create`: The `mediaIds` property has been marked as deprecated because it
-  has the same behaviour as using `fileIds`, but the implementation tries to handlè
-  `fileIds` first.
-- The result schema for `admin/emoji/list` has been altered because the `host`
-  property will always be `null` as it is filtered this way in the database query.
-  See packages/backend/src/server/api/endpoints/admin/emoji/list.ts line 67.
-
-* enhance(doc): explain nullable hostname
-
-* update changelog
-
+* remove empty file
+
+If the endpoint is to be implemented later, the file can be added back,
+but for now it is confusing to have an empty file.
+
+* enhance(doc): document defaults
+
+Default for `isPublic` is based on the database schema default value.
+Defaults for `local` and `withFiles` are based on the behaviour of the endpoint.
+
+* enhance(doc): explain nullable emoji category
+
+* fix: make nullable if default is null
+
+* enhance(doc): explain mute attribute expiresAt
+
+* fix: define required fields
+
+- `notes/create`: the default for `text` has been removed because ajv can not handle
+  `default` inside of `anyOf`, see
+  https://ajv.js.org/guide/modifying-data.html#assigning-defaults
+  and the default value cannot be `null` if text is `nullable: false` in the `anyOf`
+  first alternative.
+- `notes/create`: The `mediaIds` property has been marked as deprecated because it
+  has the same behaviour as using `fileIds`, but the implementation tries to handlè
+  `fileIds` first.
+- The result schema for `admin/emoji/list` has been altered because the `host`
+  property will always be `null` as it is filtered this way in the database query.
+  See packages/backend/src/server/api/endpoints/admin/emoji/list.ts line 67.
+
+* enhance(doc): explain nullable hostname
+
+* update changelog
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Enhance: タッチパッド・タッチスクリーンでのデッキの操作性を向上 ([#8450](https://github.com/orhun/git-cliff/issues/8450))
 
-* enhance experience of deck with touchpad
-
-* test: 単純にdeltaYを加算してみる
-
-* clean up
-
-* ios bug fix?
-
-* :v:
-
-* use overflow-y
-
+* enhance experience of deck with touchpad
+
+* test: 単純にdeltaYを加算してみる
+
+* clean up
+
+* ios bug fix?
+
+* :v:
+
+* use overflow-y
+
 * Safari does not supports clip
 - Refactor actions
 
@@ -9648,86 +12048,86 @@ Resolve #8467
 
 - Enhance: only render public notes in HTML template ([#8527](https://github.com/orhun/git-cliff/issues/8527))
 
-* only render public notes in HTML template
-
+* only render public notes in HTML template
+
 * fix missing import
 - Refactor: use composition API ([#8541](https://github.com/orhun/git-cliff/issues/8541))
 
 
 - Enhance: ドライブに画像ファイルをアップロードするときオリジナル画像を破棄してwebpublicのみ保持するオプション ([#8216](https://github.com/orhun/git-cliff/issues/8216))
 
-* wip
-
-* Update packages/client/src/os.ts
-
-Co-authored-by: tamaina <tamaina@hotmail.co.jp>
-
-* メニューをComposition API化、switchアイテム追加
-クライアントサイド画像圧縮の準備
-
-* メニュー型定義を分離 (TypeScriptの型支援が効かないので)
-
-* disabled
-
-* make keepOriginal to follow setting value
-
-* :v:
-
-* fix
-
-* fix
-
-* :v:
-
-* WEBP
-
-* aaa
-
-* :v:
-
-* webp
-
-* lazy load browser-image-resizer
-
-* rename
-
-* rename 2
-
-* Fix
-
-* clean up
-
-* add comment
-
-* clean up
-
-* jpeg, pngにもどす
-
-* fix
-
-* fix name
-
-* webpでなくする ただしサムネやプレビューはwebpのまま (テスト)
-
-* 動画サムネイルはjpegに
-
-* エラーハンドリング
-
-* :v:
-
-* v2.2.1-misskey-beta.2
-
-* browser-image-resizer#v2.2.1-misskey.1
-
-* :v:
-
-* fix alert
-
-* update browser-image-resizer to v2.2.1-misskey.2
-
-* lockfile
-
-Co-authored-by: mei23 <m@m544.net>
+* wip
+
+* Update packages/client/src/os.ts
+
+Co-authored-by: tamaina <tamaina@hotmail.co.jp>
+
+* メニューをComposition API化、switchアイテム追加
+クライアントサイド画像圧縮の準備
+
+* メニュー型定義を分離 (TypeScriptの型支援が効かないので)
+
+* disabled
+
+* make keepOriginal to follow setting value
+
+* :v:
+
+* fix
+
+* fix
+
+* :v:
+
+* WEBP
+
+* aaa
+
+* :v:
+
+* webp
+
+* lazy load browser-image-resizer
+
+* rename
+
+* rename 2
+
+* Fix
+
+* clean up
+
+* add comment
+
+* clean up
+
+* jpeg, pngにもどす
+
+* fix
+
+* fix name
+
+* webpでなくする ただしサムネやプレビューはwebpのまま (テスト)
+
+* 動画サムネイルはjpegに
+
+* エラーハンドリング
+
+* :v:
+
+* v2.2.1-misskey-beta.2
+
+* browser-image-resizer#v2.2.1-misskey.1
+
+* :v:
+
+* fix alert
+
+* update browser-image-resizer to v2.2.1-misskey.2
+
+* lockfile
+
+Co-authored-by: mei23 <m@m544.net>
 Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>
 - Refactor(client): refactor api-console to use Composition API ([#8566](https://github.com/orhun/git-cliff/issues/8566))
 
@@ -9740,266 +12140,266 @@ Co-authored-by: MeiMei <30769358+mei23@users.noreply.github.com>
 
 - Refactor: use Vite to build instead of webpack ([#8575](https://github.com/orhun/git-cliff/issues/8575))
 
-* update stream.ts
-
-* https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339
-
-* fix lint
-
-* clean up?
-
-* add app
-
-* fix
-
-* nanka iroiro
-
-* wip
-
-* wip
-
-* fix lint
-
-* fix loginId
-
-* fix
-
-* refactor
-
-* refactor
-
-* remove follow action
-
-* clean up
-
-* Revert "remove follow action"
-
-This reverts commit defbb416480905af2150d1c92f10d8e1d1288c0a.
-
-* Revert "clean up"
-
-This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2.
-
-* remove fetch specification
-
-* renoteの条件追加
-
-* apiFetch => cli
-
-* bypass fetch?
-
-* fix
-
-* refactor: use path alias
-
-* temp: add submodule
-
-* remove submodule
-
-* enhane: unison-reloadに指定したパスに移動できるように
-
-* null
-
-* null
-
-* feat: ログインするアカウントのIDをクエリ文字列で指定する機能
-
-* null
-
-* await?
-
-* rename
-
-* rename
-
-* Update read.ts
-
-* merge
-
-* get-note-summary
-
-* fix
-
-* swパッケージに
-
-* add missing packages
-
-* fix getNoteSummary
-
-* add webpack-cli
-
-* :v:
-
-* remove plugins
-
-* sw-inject分離したがテストしてない
-
-* fix notification.vue
-
-* remove a blank line
-
-* disconnect intersection observer
-
-* disconnect2
-
-* fix notification.vue
-
-* remove a blank line
-
-* disconnect intersection observer
-
-* disconnect2
-
-* fix
-
-* :v:
-
-* clean up config
-
-* typesを戻した
-
-* Update packages/client/src/components/notification.vue
-
-Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
-
-* disconnect
-
-* oops
-
-* Failed to load the script unexpectedly回避
-sw.jsとlib.tsを分離してみた
-
-* truncate notification
-
-* Update packages/client/src/ui/_common_/common.vue
-
-Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
-
-* clean up
-
-* clean up
-
-* キャッシュ対策
-
-* Truncate push notification message
-
-* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正
-
-* components/drive-file-thumbnail.vue
-
-* components/drive-select-dialog.vue
-
-* components/drive-window.vue
-
-* merge
-
-* fix
-
-* Service Workerのビルドにesbuildを使うようにする
-
-* return createEmptyNotification()
-
-* fix
-
-* i18n.ts
-
-* update
-
-* :v:
-
-* remove ts-loader
-
-* fix
-
-* fix
-
-* enhance: Service Workerを常に登録するように
-
-* pollEnded
-
-* URLをsw.jsに戻す
-
-* clean up
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* wip
-
-* :v:
-
-* use import
-
-* fix
-
-* install rollup
-
-* use defineAsyncComponent.
-
-* fix emojilist
-
-* wip use defineAsyncComponent
-
-* popup(import -> popup(defineAsyncComponent(() => import
-
-* draggable?
-
-* fix init import
-
-* clean up
-
-* fix router
-
-* add comment
-
-* :v:
-
-* :v:
-
-* :v:
-
-* remove webpack
-
-* update vite
-
-* fix boot sequence
-
-* Revert "fix boot sequence"
-
-This reverts commit e893dbf37aed83bf9f12e427d98c78a7065b4a39.
-
-* revert boot import
-
-* never make two app div
-
-* ;
-
-* remove console.log
-
-* change clientEntry sequence
-
-* fix
-
-* Revert "fix"
-
-This reverts commit 12741b3d89950a31dbb1bb81477ddb27b0e9951a.
-
-* fix
-
-* add comment https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
-
-* add log
-
-* add comment
-
-Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
+* update stream.ts
+
+* https://github.com/misskey-dev/misskey/pull/7769#issuecomment-917542339
+
+* fix lint
+
+* clean up?
+
+* add app
+
+* fix
+
+* nanka iroiro
+
+* wip
+
+* wip
+
+* fix lint
+
+* fix loginId
+
+* fix
+
+* refactor
+
+* refactor
+
+* remove follow action
+
+* clean up
+
+* Revert "remove follow action"
+
+This reverts commit defbb416480905af2150d1c92f10d8e1d1288c0a.
+
+* Revert "clean up"
+
+This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2.
+
+* remove fetch specification
+
+* renoteの条件追加
+
+* apiFetch => cli
+
+* bypass fetch?
+
+* fix
+
+* refactor: use path alias
+
+* temp: add submodule
+
+* remove submodule
+
+* enhane: unison-reloadに指定したパスに移動できるように
+
+* null
+
+* null
+
+* feat: ログインするアカウントのIDをクエリ文字列で指定する機能
+
+* null
+
+* await?
+
+* rename
+
+* rename
+
+* Update read.ts
+
+* merge
+
+* get-note-summary
+
+* fix
+
+* swパッケージに
+
+* add missing packages
+
+* fix getNoteSummary
+
+* add webpack-cli
+
+* :v:
+
+* remove plugins
+
+* sw-inject分離したがテストしてない
+
+* fix notification.vue
+
+* remove a blank line
+
+* disconnect intersection observer
+
+* disconnect2
+
+* fix notification.vue
+
+* remove a blank line
+
+* disconnect intersection observer
+
+* disconnect2
+
+* fix
+
+* :v:
+
+* clean up config
+
+* typesを戻した
+
+* Update packages/client/src/components/notification.vue
+
+Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
+
+* disconnect
+
+* oops
+
+* Failed to load the script unexpectedly回避
+sw.jsとlib.tsを分離してみた
+
+* truncate notification
+
+* Update packages/client/src/ui/_common_/common.vue
+
+Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
+
+* clean up
+
+* clean up
+
+* キャッシュ対策
+
+* Truncate push notification message
+
+* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正
+
+* components/drive-file-thumbnail.vue
+
+* components/drive-select-dialog.vue
+
+* components/drive-window.vue
+
+* merge
+
+* fix
+
+* Service Workerのビルドにesbuildを使うようにする
+
+* return createEmptyNotification()
+
+* fix
+
+* i18n.ts
+
+* update
+
+* :v:
+
+* remove ts-loader
+
+* fix
+
+* fix
+
+* enhance: Service Workerを常に登録するように
+
+* pollEnded
+
+* URLをsw.jsに戻す
+
+* clean up
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* wip
+
+* :v:
+
+* use import
+
+* fix
+
+* install rollup
+
+* use defineAsyncComponent.
+
+* fix emojilist
+
+* wip use defineAsyncComponent
+
+* popup(import -> popup(defineAsyncComponent(() => import
+
+* draggable?
+
+* fix init import
+
+* clean up
+
+* fix router
+
+* add comment
+
+* :v:
+
+* :v:
+
+* :v:
+
+* remove webpack
+
+* update vite
+
+* fix boot sequence
+
+* Revert "fix boot sequence"
+
+This reverts commit e893dbf37aed83bf9f12e427d98c78a7065b4a39.
+
+* revert boot import
+
+* never make two app div
+
+* ;
+
+* remove console.log
+
+* change clientEntry sequence
+
+* fix
+
+* Revert "fix"
+
+This reverts commit 12741b3d89950a31dbb1bb81477ddb27b0e9951a.
+
+* fix
+
+* add comment https://github.com/misskey-dev/misskey/pull/8575#issuecomment-1114239210
+
+* add log
+
+* add comment
+
+Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Refactor(client): refactor settings/accounts to use Composition API ([#8604](https://github.com/orhun/git-cliff/issues/8604))
 
@@ -10063,57 +12463,57 @@ Co-Authored-By: tamaina <tamaina@hotmail.co.jp>
 
 - Enhance: Perform port diagnosis at startup only when Listen fails ([#8698](https://github.com/orhun/git-cliff/issues/8698))
 
-* Change port check
-
-* Comment: disableClustering
-
-* CHANGELOG
-
+* Change port check
+
+* Comment: disableClustering
+
+* CHANGELOG
+
 * Smart message
 - Enhance: uniform theme color ([#8702](https://github.com/orhun/git-cliff/issues/8702))
 
-* enhance: make theme color format uniform
-
-All newly fetched instance theme colors will be uniformely formatted
-as hashtag followed by 6 hexadecimal digits.
-
-Colors are checked for validity and invalid colors are not handled.
-
-* better input validation for own theme color
-
-* migration to unify theme color formats
-
-Fixes theme colors of other instances as well as the local instance.
-
-* add changelog entry
-
+* enhance: make theme color format uniform
+
+All newly fetched instance theme colors will be uniformely formatted
+as hashtag followed by 6 hexadecimal digits.
+
+Colors are checked for validity and invalid colors are not handled.
+
+* better input validation for own theme color
+
+* migration to unify theme color formats
+
+Fixes theme colors of other instances as well as the local instance.
+
+* add changelog entry
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Refactor(client): refactor admin/settings to use Composition API ([#8678](https://github.com/orhun/git-cliff/issues/8678))
 
 
 - Enhance(MFM): limit large MFM ([#8540](https://github.com/orhun/git-cliff/issues/8540))
 
-* add CSS classes for zoom MFM
-
-* limit nesting of x2, x3, x4 MFM
-
-* simplify CSS calculation
-
-Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
-
+* add CSS classes for zoom MFM
+
+* limit nesting of x2, x3, x4 MFM
+
+* simplify CSS calculation
+
+Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
+
 Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
 - Enhance: page image component with alt text ([#8634](https://github.com/orhun/git-cliff/issues/8634))
 
-* refactor to composition API
-
-* use existing image component
-
-This improves user experience because alt text is displayed correctly.
-
-* fix: correct image src
-
-* fix: defineProps
-
+* refactor to composition API
+
+* use existing image component
+
+This improves user experience because alt text is displayed correctly.
+
+* fix: correct image src
+
+* fix: defineProps
+
 * fix
 - Refactor
 
@@ -10122,33 +12522,33 @@ This improves user experience because alt text is displayed correctly.
 
 - Refactor: temporary files ([#8713](https://github.com/orhun/git-cliff/issues/8713))
 
-* simplify temporary files for thumbnails
-
-Because only a single file will be written to the directory, creating a
-separate directory seems unnecessary. If only a temporary file is created,
-the code from `createTemp` can be reused here as well.
-
-* refactor: deduplicate code for temporary files/directories
-
-To follow the DRY principle, the same code should not be duplicated
-across different files. Instead an already existing function is used.
-
-Because temporary directories are also create in multiple locations,
-a function for this is also newly added to reduce duplication.
-
-* fix: clean up identicon temp files
-
-The temporary files for identicons are not reused and can be deleted
-after they are fully read. This condition is met when the stream is closed
-and so the file can be cleaned up using the events API of the stream.
-
-* fix: ensure cleanup is called when download fails
-
-* fix: ensure cleanup is called in error conditions
-
-This covers import/export queue jobs and is mostly just wrapping all
-code in a try...finally statement where the finally runs the cleanup.
-
+* simplify temporary files for thumbnails
+
+Because only a single file will be written to the directory, creating a
+separate directory seems unnecessary. If only a temporary file is created,
+the code from `createTemp` can be reused here as well.
+
+* refactor: deduplicate code for temporary files/directories
+
+To follow the DRY principle, the same code should not be duplicated
+across different files. Instead an already existing function is used.
+
+Because temporary directories are also create in multiple locations,
+a function for this is also newly added to reduce duplication.
+
+* fix: clean up identicon temp files
+
+The temporary files for identicons are not reused and can be deleted
+after they are fully read. This condition is met when the stream is closed
+and so the file can be cleaned up using the events API of the stream.
+
+* fix: ensure cleanup is called when download fails
+
+* fix: ensure cleanup is called in error conditions
+
+This covers import/export queue jobs and is mostly just wrapping all
+code in a try...finally statement where the finally runs the cleanup.
+
 * fix: use correct type instead of `any`
 - Refactor: use ===
 
@@ -10157,123 +12557,123 @@ code in a try...finally statement where the finally runs the cleanup.
 fix #8744
 - Enhance: replace signin CAPTCHA with rate limit ([#8740](https://github.com/orhun/git-cliff/issues/8740))
 
-* enhance: rate limit works without signed in user
-
-* fix: make limit key required for limiter
-
-As before the fallback limiter key will be set from the endpoint name.
-
-* enhance: use limiter for signin
-
-* Revert "CAPTCHA求めるのは2fa認証が無効になっているときだけにした"
-
-This reverts commit 02a43a310f6ad0cc9e9beccc26e51ab5b339e15f.
-
-* Revert "feat: make captcha required when signin to improve security"
-
-This reverts commit b21b0580058c14532ff3f4033e2a9147643bfca6.
-
-* fix undefined reference
-
-* fix: better error message
-
+* enhance: rate limit works without signed in user
+
+* fix: make limit key required for limiter
+
+As before the fallback limiter key will be set from the endpoint name.
+
+* enhance: use limiter for signin
+
+* Revert "CAPTCHA求めるのは2fa認証が無効になっているときだけにした"
+
+This reverts commit 02a43a310f6ad0cc9e9beccc26e51ab5b339e15f.
+
+* Revert "feat: make captcha required when signin to improve security"
+
+This reverts commit b21b0580058c14532ff3f4033e2a9147643bfca6.
+
+* fix undefined reference
+
+* fix: better error message
+
 * enhance: only handle prefix of IPv6
 - Refactor: use css module at components/global/loading.vue ([#8750](https://github.com/orhun/git-cliff/issues/8750))
 
-* refactor: use css module at components/global/loading.vue
-
+* refactor: use css module at components/global/loading.vue
+
 * rename class name to "root"
 - Refactor: improve code quality ([#8751](https://github.com/orhun/git-cliff/issues/8751))
 
-* remove unnecessary if
-
-`Array.prototype.some` already returns a boolean so an if to return
-true or false is completely unnecessary in this case.
-
-* perf: use count instead of find
-
-When using `count` instead of `findOneBy`, the data is not
-unnecessarily loaded.
-
-* remove duplicate null check
-
-The variable is checked for null in the lines above and the function
-returns if so. Therefore, it can not be null at this point.
-
-* simplify `getJsonSchema`
-
-Because the assigned value is `null` and the used keys are only
-shallow, use of `nestedProperty.set` seems inappropriate. Because the
-value is not read, the initial for loop can be replaced by a `for..in`
-loop.
-
-Since all keys will be assigned `null`, the condition of the ternary
-expression in the nested function will always be true. Therefore the
-recursion case will never happen. With this the nested function can be
-eliminated.
-
-* remove duplicate condition
-
-The code above already checks `dragging` and returns if it is truthy.
-Checking it again later is therefore unnecessary.
-
-To make this more obvious the `return` is removed in favour of using
-an if...else construct.
-
-* remove impossible "unknown" time
-
-The `ago` variable will always be a number and all non-negative numbers
-are already covered by other cases, the negative case is handled with
+* remove unnecessary if
+
+`Array.prototype.some` already returns a boolean so an if to return
+true or false is completely unnecessary in this case.
+
+* perf: use count instead of find
+
+When using `count` instead of `findOneBy`, the data is not
+unnecessarily loaded.
+
+* remove duplicate null check
+
+The variable is checked for null in the lines above and the function
+returns if so. Therefore, it can not be null at this point.
+
+* simplify `getJsonSchema`
+
+Because the assigned value is `null` and the used keys are only
+shallow, use of `nestedProperty.set` seems inappropriate. Because the
+value is not read, the initial for loop can be replaced by a `for..in`
+loop.
+
+Since all keys will be assigned `null`, the condition of the ternary
+expression in the nested function will always be true. Therefore the
+recursion case will never happen. With this the nested function can be
+eliminated.
+
+* remove duplicate condition
+
+The code above already checks `dragging` and returns if it is truthy.
+Checking it again later is therefore unnecessary.
+
+To make this more obvious the `return` is removed in favour of using
+an if...else construct.
+
+* remove impossible "unknown" time
+
+The `ago` variable will always be a number and all non-negative numbers
+are already covered by other cases, the negative case is handled with
 `future` so there is no case when `unkown` could be achieved.
 - Enhance(dev): ask for log snippets
 - Refactor: use awaitAll to reduce duplication ([#8791](https://github.com/orhun/git-cliff/issues/8791))
 
-* refactor: use awaitAll to reduce duplication
-
-* fix lint
-
+* refactor: use awaitAll to reduce duplication
+
+* fix lint
+
 * fix typo
 - Enhance: improve documentation for `/users/` endpoints ([#8790](https://github.com/orhun/git-cliff/issues/8790))
 
-* docs: category & description for reset password
-
-* docs: category & description for testing
-
-* docs: descriptions for groups endpoints
-
-* docs: descriptions for drive file endpoints
-
-* docs: descriptions for sw endpoints
-
-* docs: descriptions for user list endpoints
-
-* docs: descriptions & result type for gallery posts
-
-* docs: descriptions & result type for user endpoints
-
+* docs: category & description for reset password
+
+* docs: category & description for testing
+
+* docs: descriptions for groups endpoints
+
+* docs: descriptions for drive file endpoints
+
+* docs: descriptions for sw endpoints
+
+* docs: descriptions for user list endpoints
+
+* docs: descriptions & result type for gallery posts
+
+* docs: descriptions & result type for user endpoints
+
 * docs: add return type for stats
 - Refactor: follow button ([#8789](https://github.com/orhun/git-cliff/issues/8789))
 
-* fix: display cancelling follow request
-
-* remove unnecessary branch
-
-The executed code is the same as in the else branch so this special
-condition is unnecessary.
-
-* remove code duplication
-
-Use the same callback as later for updating these variables.
-
-* use $ref sugar
-
-* remove unused import
-
+* fix: display cancelling follow request
+
+* remove unnecessary branch
+
+The executed code is the same as in the else branch so this special
+condition is unnecessary.
+
+* remove code duplication
+
+Use the same callback as later for updating these variables.
+
+* use $ref sugar
+
+* remove unused import
+
 Co-authored-by: blackskye-sx <saul.newman@gmail.com>
 - Enhance(federation): use ActivityPub defined property in favour of proprietary property. ([#8787](https://github.com/orhun/git-cliff/issues/8787))
 
-* add activitypub `source` property
-
+* add activitypub `source` property
+
 * parse MFM from new `source` attribute
 - Enhance(server): モデレーターであってもレートリミットを有効に
 
@@ -10283,29 +12683,29 @@ Co-authored-by: blackskye-sx <saul.newman@gmail.com>
 
 - Enhance: Improve player detection in URL preview ([#8849](https://github.com/orhun/git-cliff/issues/8849))
 
-* enhance: Improve player detection in URL preview
-
+* enhance: Improve player detection in URL preview
+
 * CHANGELOG
 - Refactor: チャットルームをComposition API化 ([#8850](https://github.com/orhun/git-cliff/issues/8850))
 
-* pick form
-
-* pick message
-
-* pick room
-
-* fix lint
-
-* fix scroll?
-
-* fix scroll.ts
-
-* fix directives/sticky-container
-
-* update global/sticky-container.vue
-
-* fix, :art:
-
+* pick form
+
+* pick message
+
+* pick room
+
+* fix lint
+
+* fix scroll?
+
+* fix scroll.ts
+
+* fix directives/sticky-container
+
+* update global/sticky-container.vue
+
+* fix, :art:
+
 * test.1
 - Refactor(client): Refine routing ([#8846](https://github.com/orhun/git-cliff/issues/8846))
 
@@ -10325,45 +12725,45 @@ Co-authored-by: blackskye-sx <saul.newman@gmail.com>
 
 - Refactor: simplify ap/show with DbResolver ([#8838](https://github.com/orhun/git-cliff/issues/8838))
 
-Using the existing code in DbResolver we can avoid separate code for
-parsing the URIs in this endpoint.
-
+Using the existing code in DbResolver we can avoid separate code for
+parsing the URIs in this endpoint.
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Refactor(client): use composition api
 
 - Enhance: Redisをioredisに統一してIPv6サポート ([#8869](https://github.com/orhun/git-cliff/issues/8869))
 
-* Use ioredis, Supports IPv6 host
-
-https://github.com/misskey-dev/misskey/issues/8862
-
-* Fix import
-
-* order
-
-* a
-
-* i
-
-* fix
-
-* flushdb
-
-* family
-
-* CHANGELOG
-
-* redis_version
-
+* Use ioredis, Supports IPv6 host
+
+https://github.com/misskey-dev/misskey/issues/8862
+
+* Fix import
+
+* order
+
+* a
+
+* i
+
+* fix
+
+* flushdb
+
+* family
+
+* CHANGELOG
+
+* redis_version
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Refactor: remove unused import
 
 - Refactor: notification setting window composition API ([#8860](https://github.com/orhun/git-cliff/issues/8860))
 
-* refactor: notification setting window composition API
-
-* fix lint vue/require-valid-default-prop
-
+* refactor: notification setting window composition API
+
+* fix lint vue/require-valid-default-prop
+
 * fix type
 - Refactor(client): extract tooltip logic of chart
 
@@ -10377,12 +12777,12 @@ Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 
 - Enhance(client): Enhance boot error display ([#8879](https://github.com/orhun/git-cliff/issues/8879))
 
-* Change boot error message
-
-* fix
-
-* :v:
-
+* Change boot error message
+
+* fix
+
+* :v:
+
 * fix
 - Refactor: remove duplicate code ([#8895](https://github.com/orhun/git-cliff/issues/8895))
 
@@ -10453,63 +12853,63 @@ more accurately.
 
 - Enhance: Styled error screen ([#8946](https://github.com/orhun/git-cliff/issues/8946))
 
-* Styled error screen
-
-* Make details margin auto
-
-* Update boot.css
-
-* Replace fontawesome with tabler svg
-
-* Remove hr
-
-* Add new style to flush screen
-
-* Rename to `error.css`
-
-* Fix
-
-* Update base.pug
-
-* Finally fix!
-
-* Wrap details in `<code>`
-
-* Add style to flush
-
-* Fix
-
-* BIOS -> Repair tool
-
-* Fix
-
-* Typo
-
-* Adjust style
-
-* Adjust text
-
-* Flush -> Clear
-
-* Revert flush changes
-
-* Responsive
-
+* Styled error screen
+
+* Make details margin auto
+
+* Update boot.css
+
+* Replace fontawesome with tabler svg
+
+* Remove hr
+
+* Add new style to flush screen
+
+* Rename to `error.css`
+
+* Fix
+
+* Update base.pug
+
+* Finally fix!
+
+* Wrap details in `<code>`
+
+* Add style to flush
+
+* Fix
+
+* BIOS -> Repair tool
+
+* Fix
+
+* Typo
+
+* Adjust style
+
+* Adjust text
+
+* Flush -> Clear
+
+* Revert flush changes
+
+* Responsive
+
 * Also hide splash
 - Enhance: show recipients of notes with specified visibility ([#8949](https://github.com/orhun/git-cliff/issues/8949))
 
-* enhance: reusable visibility component
-
-* rename renote tooltip component
-
-The tooltip that is used for renotes can be used in other cases as well.
-
-* add tooltip for specified recipients
-
-* add changelog entry
-
-* Update visibility.vue
-
+* enhance: reusable visibility component
+
+* rename renote tooltip component
+
+The tooltip that is used for renotes can be used in other cases as well.
+
+* add tooltip for specified recipients
+
+* add changelog entry
+
+* Update visibility.vue
+
 Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 - Enhance(server): tweak identicon generation
 
@@ -10517,14 +12917,14 @@ Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 
 - Enhance(sw): If receiving a push notification issued more than a day, ignore it. ([#8980](https://github.com/orhun/git-cliff/issues/8980))
 
-* enhance(sw): ignore old push notification
-
-* :v:
-
-* 半日
-
-* !==
-
+* enhance(sw): ignore old push notification
+
+* :v:
+
+* 半日
+
+* !==
+
 * 1日
 - Enhance(client): update themes
 
@@ -10532,22 +12932,22 @@ Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
 
 - Enhance: read theme color nodeinfo ([#8977](https://github.com/orhun/git-cliff/issues/8977))
 
-* provide theme color in nodeinfo metadata
-
-* read theme color from nodeinfo
-
-Prefer to read the theme color from the nodeinfo since it is more
+* provide theme color in nodeinfo metadata
+
+* read theme color from nodeinfo
+
+Prefer to read the theme color from the nodeinfo since it is more
 performant than performing selector search on a DOM.
 - Refactor(client): rename menu(sidebar) -> navbar
 
 - Refactor(client): remove useCssModule ([#8999](https://github.com/orhun/git-cliff/issues/8999))
 
-* refactor(client): remove useCssModule()
-
-* use MkStickyContainer
-
-* Revert "use MkStickyContainer"
-
+* refactor(client): remove useCssModule()
+
+* use MkStickyContainer
+
+* Revert "use MkStickyContainer"
+
 This reverts commit 639746786bb7e3342db9cbd3452854fc29aacf88.
 - Enhance(client): RSSティッカーで表示順序をシャッフルできるように
 
@@ -10620,26 +13020,26 @@ Fix #8817
 
 - Test: e2eテストがCIで失敗していた問題をいくつか修正 ([#8642](https://github.com/orhun/git-cliff/issues/8642))
 
-* test: indexeddbをテスト毎に初期化するように
-
-* fix: metaが無いときにfetch-metaを同時に呼ぶと死ぬことがある問題を修正
-
+* test: indexeddbをテスト毎に初期化するように
+
+* fix: metaが無いときにfetch-metaを同時に呼ぶと死ぬことがある問題を修正
+
 * test: ログイン後のクライアント側処理を待たずにリロードされてログイン出来ないことがあったのを修正
 - Test: `__dirname`はESModuleでは使えないので置き換えた ([#8626](https://github.com/orhun/git-cliff/issues/8626))
 
 
 - Test: Nodeのカスタムローダーを直してテストが動くように ([#8625](https://github.com/orhun/git-cliff/issues/8625))
 
-* test: Nodeのカスタムローダーを直してテストが動くように
-
-* dev: mochaを呼ぶコマンドにNODE_ENV=testを追加
-
-* Update packages/backend/test/loader.js
-
-Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
-
-* chore: change export style in loader.js
-
+* test: Nodeのカスタムローダーを直してテストが動くように
+
+* dev: mochaを呼ぶコマンドにNODE_ENV=testを追加
+
+* Update packages/backend/test/loader.js
+
+Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
+
+* chore: change export style in loader.js
+
 Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
 - Test
 

From 747a71ddc4bb254bf020ac5a985cbc45e57d9c89 Mon Sep 17 00:00:00 2001
From: Freeplay <freeplay@duck.com>
Date: Mon, 5 Jun 2023 20:54:21 -0400
Subject: [PATCH 308/319] fix cw button pos... oops

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

diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 6aaaa16e2d..ea1142e13e 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -381,7 +381,7 @@ function focusFooter(ev) {
 			}
 			:deep(.fade) {
 				inset: 0;
-				top: 40px;
+				top: 90px;
 			}
 		}
 

From 5483dd567f72eeef7c328052d46480cc8dcd0449 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Jun 2023 18:49:27 -0700
Subject: [PATCH 309/319] Don't ignore Cargo.lock

---
 packages/backend/native-utils/.gitignore |    1 -
 packages/backend/native-utils/Cargo.lock | 3542 ++++++++++++++++++++++
 2 files changed, 3542 insertions(+), 1 deletion(-)
 create mode 100644 packages/backend/native-utils/Cargo.lock

diff --git a/packages/backend/native-utils/.gitignore b/packages/backend/native-utils/.gitignore
index 78b75d55ad..0a2a1de408 100644
--- a/packages/backend/native-utils/.gitignore
+++ b/packages/backend/native-utils/.gitignore
@@ -187,7 +187,6 @@ built/
 #Added by cargo
 
 /target
-Cargo.lock
 
 .pnp.*
 .yarn/*
diff --git a/packages/backend/native-utils/Cargo.lock b/packages/backend/native-utils/Cargo.lock
new file mode 100644
index 0000000000..71169b10c7
--- /dev/null
+++ b/packages/backend/native-utils/Cargo.lock
@@ -0,0 +1,3542 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "Inflector"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe438c63458706e03479442743baae6c88256498e6431708f6dfc520a26515d3"
+
+[[package]]
+name = "ahash"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+dependencies = [
+ "getrandom",
+ "once_cell",
+ "version_check",
+]
+
+[[package]]
+name = "ahash"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+dependencies = [
+ "cfg-if",
+ "getrandom",
+ "once_cell",
+ "serde",
+ "version_check",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "aliasable"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
+
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anstream"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is-terminal",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
+dependencies = [
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.71"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
+
+[[package]]
+name = "async-attributes"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "async-channel"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
+dependencies = [
+ "concurrent-queue",
+ "event-listener",
+ "futures-core",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
+dependencies = [
+ "async-lock",
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-global-executor"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
+dependencies = [
+ "async-channel",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "blocking",
+ "futures-lite",
+ "once_cell",
+ "tokio",
+]
+
+[[package]]
+name = "async-io"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
+dependencies = [
+ "async-lock",
+ "autocfg",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-lite",
+ "log",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "socket2",
+ "waker-fn",
+]
+
+[[package]]
+name = "async-lock"
+version = "2.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
+dependencies = [
+ "event-listener",
+]
+
+[[package]]
+name = "async-std"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
+dependencies = [
+ "async-attributes",
+ "async-channel",
+ "async-global-executor",
+ "async-io",
+ "async-lock",
+ "crossbeam-utils",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite",
+ "gloo-timers",
+ "kv-log-macro",
+ "log",
+ "memchr",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "async-stream"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "async-task"
+version = "4.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
+
+[[package]]
+name = "async-trait"
+version = "0.1.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "atoi"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7c57d12312ff59c811c0643f4d80830505833c9ffaebd193d819392b265be8e"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "bae"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33b8de67cc41132507eeece2584804efcb15f85ba516e34c944b7667f480397a"
+dependencies = [
+ "heck 0.3.3",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "base64"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
+
+[[package]]
+name = "bigdecimal"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
+dependencies = [
+ "bit-vec",
+]
+
+[[package]]
+name = "bit-vec"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6776fc96284a0bb647b615056fc496d1fe1644a7ab01829818a6d91cae888b84"
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "blocking"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
+dependencies = [
+ "async-channel",
+ "async-lock",
+ "async-task",
+ "atomic-waker",
+ "fastrand",
+ "futures-lite",
+ "log",
+]
+
+[[package]]
+name = "borsh"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4114279215a005bc675e386011e594e1d9b800918cea18fcadadcce864a2046b"
+dependencies = [
+ "borsh-derive",
+ "hashbrown 0.13.2",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0754613691538d51f329cce9af41d7b7ca150bc973056f1156611489475f54f7"
+dependencies = [
+ "borsh-derive-internal",
+ "borsh-schema-derive-internal",
+ "proc-macro-crate",
+ "proc-macro2",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "borsh-derive-internal"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afb438156919598d2c7bad7e1c0adf3d26ed3840dbc010db1a882a65583ca2fb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "borsh-schema-derive-internal"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634205cc43f74a1b9046ef87c4540ebda95696ec0f315024860cad7c5b0f5ccd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+
+[[package]]
+name = "bytecheck"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627"
+dependencies = [
+ "bytecheck_derive",
+ "ptr_meta",
+ "simdutf8",
+]
+
+[[package]]
+name = "bytecheck_derive"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "bytecount"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c676a478f63e9fa2dd5368a42f28bba0d6c560b775f38583c8bbaa7fcd67c9c"
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "bytes"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+
+[[package]]
+name = "cc"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "chrono"
+version = "0.4.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+dependencies = [
+ "android-tzdata",
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "serde",
+ "time 0.1.45",
+ "wasm-bindgen",
+ "winapi",
+]
+
+[[package]]
+name = "clap"
+version = "3.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
+dependencies = [
+ "bitflags 1.3.2",
+ "clap_derive 3.2.25",
+ "clap_lex 0.2.4",
+ "indexmap",
+ "once_cell",
+ "textwrap",
+]
+
+[[package]]
+name = "clap"
+version = "4.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ed2379f8603fa2b7509891660e802b88c70a79a6427a70abb5968054de2c28"
+dependencies = [
+ "clap_builder",
+ "clap_derive 4.3.1",
+ "once_cell",
+]
+
+[[package]]
+name = "clap_builder"
+version = "4.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72394f3339a76daf211e57d4bcb374410f3965dcc606dd0e03738c7888766980"
+dependencies = [
+ "anstream",
+ "anstyle",
+ "bitflags 1.3.2",
+ "clap_lex 0.5.0",
+ "strsim",
+]
+
+[[package]]
+name = "clap_derive"
+version = "3.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59e9ef9a08ee1c0e1f2e162121665ac45ac3783b0f897db7244ae75ad9a8f65b"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
+dependencies = [
+ "os_str_bytes",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
+
+[[package]]
+name = "colorchoice"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+
+[[package]]
+name = "concurrent-queue"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "console"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+dependencies = [
+ "encode_unicode",
+ "lazy_static",
+ "libc",
+ "unicode-width",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c063cd8cc95f5c377ed0d4b49a4b21f632396ff690e8470c29b3359b346984b"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "ctor"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ctor"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b"
+dependencies = [
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "cuid2"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1debbff0c0f0b54e681296c6f064a78f8ecec8e89e7fcc472443d9f85b98ca9a"
+dependencies = [
+ "num",
+ "proptest",
+ "rand",
+ "sha3",
+]
+
+[[package]]
+name = "derive_more"
+version = "0.99.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+dependencies = [
+ "convert_case 0.4.0",
+ "proc-macro2",
+ "quote",
+ "rustc_version",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "dirs"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+dependencies = [
+ "libc",
+ "redox_users",
+ "winapi",
+]
+
+[[package]]
+name = "dotenvy"
+version = "0.15.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
+
+[[package]]
+name = "dyn-clone"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30"
+
+[[package]]
+name = "either"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+
+[[package]]
+name = "encode_unicode"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "errno"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "fancy-regex"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b95f7c0680e4142284cf8b22c14a476e87d61b004a3a0861872b32ef7ead40a2"
+dependencies = [
+ "bit-set",
+ "regex",
+]
+
+[[package]]
+name = "fastrand"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be"
+dependencies = [
+ "instant",
+]
+
+[[package]]
+name = "flume"
+version = "0.10.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+ "pin-project",
+ "spin 0.9.8",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "fraction"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3027ae1df8d41b4bed2241c8fdad4acc1e7af60c8e17743534b545e77182d678"
+dependencies = [
+ "lazy_static",
+ "num",
+]
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "futures"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-intrusive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a604f7a68fbf8103337523b1fadc8ade7361ee3f112f7c680ad179651616aed5"
+dependencies = [
+ "futures-core",
+ "lock_api",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
+
+[[package]]
+name = "futures-lite"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "memchr",
+ "parking",
+ "pin-project-lite",
+ "waker-fn",
+]
+
+[[package]]
+name = "futures-macro"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
+
+[[package]]
+name = "futures-task"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
+
+[[package]]
+name = "futures-util"
+version = "0.3.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "gloo-timers"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "h2"
+version = "0.3.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d357c7ae988e7d2182f7d7871d0b963962420b0678b0997ce7de72001aeab782"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash 0.7.6",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+dependencies = [
+ "ahash 0.8.3",
+]
+
+[[package]]
+name = "hashlink"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0761a1b9491c4f2e3d66aa0f62d0fba0af9a0e2852e4d48ea506632a4b56e6aa"
+dependencies = [
+ "hashbrown 0.13.2",
+]
+
+[[package]]
+name = "heck"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hkdf"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "http"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+dependencies = [
+ "bytes",
+ "http",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+
+[[package]]
+name = "httpdate"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
+
+[[package]]
+name = "hyper"
+version = "0.14.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab302d72a6f11a3b910431ff93aae7e773078c769f0a3ef15fb9ec692ed147d4"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.56"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0722cd7114b7de04316e7ea5456a0bbb20e4adb46fd27a3697adb812cff0f37c"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "wasm-bindgen",
+ "windows",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "idna"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+ "serde",
+]
+
+[[package]]
+name = "indicatif"
+version = "0.17.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db45317f37ef454e6519b6c3ed7d377e5f23346f0823f86e65ca36912d1d0ef8"
+dependencies = [
+ "console",
+ "instant",
+ "number_prefix",
+ "portable-atomic",
+ "tokio",
+ "unicode-width",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "io-lifetimes"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
+dependencies = [
+ "hermit-abi 0.3.1",
+ "libc",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12b6ee2129af8d4fb011108c73d99a1b83a85977f23b82460c0ae2e25bb4b57f"
+
+[[package]]
+name = "is-terminal"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f"
+dependencies = [
+ "hermit-abi 0.3.1",
+ "io-lifetimes",
+ "rustix",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "iso8601"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924e5d73ea28f59011fec52a0d12185d496a9b075d360657aed2a5707f701153"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+
+[[package]]
+name = "js-sys"
+version = "0.3.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f37a4a5928311ac501dee68b3c7613a1037d0edb30c8e5427bd832d55d1b790"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "jsonschema"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e48354c4c4f088714424ddf090de1ff84acc82b2f08c192d46d226ae2529a465"
+dependencies = [
+ "ahash 0.8.3",
+ "anyhow",
+ "base64 0.21.2",
+ "bytecount",
+ "clap 4.3.1",
+ "fancy-regex",
+ "fraction",
+ "getrandom",
+ "iso8601",
+ "itoa",
+ "memchr",
+ "num-cmp",
+ "once_cell",
+ "parking_lot 0.12.1",
+ "percent-encoding",
+ "regex",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "time 0.3.21",
+ "url",
+ "uuid",
+]
+
+[[package]]
+name = "keccak"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
+dependencies = [
+ "cpufeatures",
+]
+
+[[package]]
+name = "kv-log-macro"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.144"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
+
+[[package]]
+name = "libloading"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
+dependencies = [
+ "cfg-if",
+ "winapi",
+]
+
+[[package]]
+name = "libm"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
+
+[[package]]
+name = "libsqlite3-sys"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
+
+[[package]]
+name = "lock_api"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
+dependencies = [
+ "value-bag",
+]
+
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata",
+]
+
+[[package]]
+name = "md-5"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "memchr"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+
+[[package]]
+name = "migration"
+version = "0.1.0"
+dependencies = [
+ "async-std",
+ "futures",
+ "indicatif",
+ "native-utils",
+ "sea-orm-migration",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+ "tokio",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "mio"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
+dependencies = [
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "napi"
+version = "2.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7f0a2e93526dd9c8c522d72a4d0c88678be8966fabe9fb8f2947fde6339b682"
+dependencies = [
+ "bitflags 2.3.1",
+ "ctor 0.2.0",
+ "napi-derive",
+ "napi-sys",
+ "once_cell",
+ "tokio",
+]
+
+[[package]]
+name = "napi-build"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e"
+
+[[package]]
+name = "napi-derive"
+version = "2.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da1c6a8fa84d549aa8708fcd062372bf8ec6e849de39016ab921067d21bde367"
+dependencies = [
+ "cfg-if",
+ "convert_case 0.6.0",
+ "napi-derive-backend",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "napi-derive-backend"
+version = "1.0.52"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20bbc7c69168d06a848f925ec5f0e0997f98e8c8d4f2cc30157f0da51c009e17"
+dependencies = [
+ "convert_case 0.6.0",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "semver",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "napi-sys"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3"
+dependencies = [
+ "libloading",
+]
+
+[[package]]
+name = "native-utils"
+version = "0.0.0"
+dependencies = [
+ "async-trait",
+ "cfg-if",
+ "chrono",
+ "cuid2",
+ "derive_more",
+ "jsonschema",
+ "napi",
+ "napi-build",
+ "napi-derive",
+ "once_cell",
+ "parse-display",
+ "pretty_assertions",
+ "radix_fmt",
+ "rand",
+ "schemars",
+ "sea-orm",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "utoipa",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43db66d1170d347f9a065114077f7dccb00c1b9478c89384490a3425279a4606"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-cmp"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63335b2e2c34fae2fb0aa2cecfd9f0832a1e24b3b32ecec612c3426d46dc8aaa"
+
+[[package]]
+name = "num-complex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02e0d21255c828d6f128a1e41534206671e8c3ea0c62f32291e808dc82cff17d"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+dependencies = [
+ "autocfg",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "num_cpus"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fac9e2da13b5eb447a6ce3d392f23a29d8694bff781bf03a16cd9ac8697593b"
+dependencies = [
+ "hermit-abi 0.2.6",
+ "libc",
+]
+
+[[package]]
+name = "number_prefix"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
+
+[[package]]
+name = "once_cell"
+version = "1.17.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b"
+
+[[package]]
+name = "os_str_bytes"
+version = "6.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267"
+
+[[package]]
+name = "ouroboros"
+version = "0.15.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1358bd1558bd2a083fed428ffeda486fbfb323e698cdda7794259d592ca72db"
+dependencies = [
+ "aliasable",
+ "ouroboros_macro",
+]
+
+[[package]]
+name = "ouroboros_macro"
+version = "0.15.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f7d21ccd03305a674437ee1248f3ab5d4b1db095cf1caf49f1713ddf61956b7"
+dependencies = [
+ "Inflector",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "output_vt100"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "628223faebab4e3e40667ee0b2336d34a5b960ff60ea743ddfdbcf7770bcfb66"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "parking"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.7",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "parse-display"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f96cc033d72896bb9a2c239a14e1141c3e2eae6d649e7c10ef4e598d66bc86c"
+dependencies = [
+ "once_cell",
+ "parse-display-derive",
+ "regex",
+]
+
+[[package]]
+name = "parse-display-derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5587062be441f3d868f7c4c9d13c67f286b03aa679d7f8176ef80bf2ee79e5d"
+dependencies = [
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "regex-syntax 0.6.29",
+ "structmeta",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
+
+[[package]]
+name = "percent-encoding"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+
+[[package]]
+name = "pin-project"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c95a7476719eab1e366eaf73d0260af3021184f18177925b07f54b30089ceead"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39407670928234ebc5e6e580247dd567ad73a3578460c5990f9503df207e8f07"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
+
+[[package]]
+name = "polling"
+version = "2.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
+dependencies = [
+ "autocfg",
+ "bitflags 1.3.2",
+ "cfg-if",
+ "concurrent-queue",
+ "libc",
+ "log",
+ "pin-project-lite",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "767eb9f07d4a5ebcb39bbf2d452058a93c011373abf6832e24194a1c3f004794"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "pretty_assertions"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755"
+dependencies = [
+ "ctor 0.1.26",
+ "diff",
+ "output_vt100",
+ "yansi",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785"
+dependencies = [
+ "toml",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.59"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6aeca18b86b413c660b781aa319e4e2648a3e6f9eadc9b47e9038e6fe9f3451b"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "proptest"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e35c06b98bf36aba164cc17cb25f7e232f5c4aeea73baa14b8a9f0d92dbfa65"
+dependencies = [
+ "bit-set",
+ "bitflags 1.3.2",
+ "byteorder",
+ "lazy_static",
+ "num-traits",
+ "rand",
+ "rand_chacha",
+ "rand_xorshift",
+ "regex-syntax 0.6.29",
+ "rusty-fork",
+ "tempfile",
+ "unarray",
+]
+
+[[package]]
+name = "ptr_meta"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
+dependencies = [
+ "ptr_meta_derive",
+]
+
+[[package]]
+name = "ptr_meta_derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
+[[package]]
+name = "quote"
+version = "1.0.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9ab9c7eadfd8df19006f1cf1a4aed13540ed5cbc047010ece5826e10825488"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "radix_fmt"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce082a9940a7ace2ad4a8b7d0b1eac6aa378895f18be598230c5f2284ac05426"
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "rand_xorshift"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
+dependencies = [
+ "getrandom",
+ "redox_syscall 0.2.16",
+ "thiserror",
+]
+
+[[package]]
+name = "regex"
+version = "1.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax 0.7.2",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "regex-syntax"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
+
+[[package]]
+name = "rend"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581008d2099240d37fb08d77ad713bcaec2c4d89d50b5b21a8bb1996bbab68ab"
+dependencies = [
+ "bytecheck",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.11.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
+dependencies = [
+ "base64 0.21.2",
+ "bytes",
+ "encoding_rs",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "hyper",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "tokio",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "winreg",
+]
+
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin 0.5.2",
+ "untrusted",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "rkyv"
+version = "0.7.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58"
+dependencies = [
+ "bitvec",
+ "bytecheck",
+ "hashbrown 0.12.3",
+ "ptr_meta",
+ "rend",
+ "rkyv_derive",
+ "seahash",
+ "tinyvec",
+ "uuid",
+]
+
+[[package]]
+name = "rkyv_derive"
+version = "0.7.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "rust_decimal"
+version = "1.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26bd36b60561ee1fb5ec2817f198b6fd09fa571c897a5e86d1487cfc2b096dfc"
+dependencies = [
+ "arrayvec",
+ "borsh",
+ "bytecheck",
+ "byteorder",
+ "bytes",
+ "num-traits",
+ "rand",
+ "rkyv",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustix"
+version = "0.37.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acf8729d8542766f1b2cf77eb034d52f40d375bb8b615d0b147089946e16613d"
+dependencies = [
+ "bitflags 1.3.2",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "rustls"
+version = "0.20.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fff78fc74d175294f4e83b28343315ffcfb114b156f0185e9741cb5570f50e2f"
+dependencies = [
+ "log",
+ "ring",
+ "sct",
+ "webpki",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d194b56d58803a43635bdc398cd17e383d6f71f9182b9a192c127ca42494a59b"
+dependencies = [
+ "base64 0.21.2",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
+
+[[package]]
+name = "rusty-fork"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
+dependencies = [
+ "fnv",
+ "quick-error",
+ "tempfile",
+ "wait-timeout",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+
+[[package]]
+name = "schemars"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02c613288622e5f0c3fdc5dbd4db1c5fbe752746b1d1a56a0630b78fd00de44f"
+dependencies = [
+ "chrono",
+ "dyn-clone",
+ "schemars_derive",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "schemars_derive"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "109da1e6b197438deb6db99952990c7f959572794b80ff93707d55a232545e7c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde_derive_internals",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+
+[[package]]
+name = "sct"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "sea-orm"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fade86e8d41fd1a4721f84cb834f4ca2783f973cc30e6212b7fafc134f169214"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "bigdecimal",
+ "chrono",
+ "futures",
+ "log",
+ "ouroboros",
+ "rust_decimal",
+ "sea-orm-macros",
+ "sea-query",
+ "sea-query-binder",
+ "sea-strum",
+ "serde",
+ "serde_json",
+ "sqlx",
+ "thiserror",
+ "time 0.3.21",
+ "tracing",
+ "url",
+ "uuid",
+]
+
+[[package]]
+name = "sea-orm-cli"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "efbf34a2caf70c2e3be9bb1e674e9540f6dfd7c8f40f6f05daf3b9740e476005"
+dependencies = [
+ "chrono",
+ "clap 3.2.25",
+ "dotenvy",
+ "regex",
+ "sea-schema",
+ "tracing",
+ "tracing-subscriber",
+ "url",
+]
+
+[[package]]
+name = "sea-orm-macros"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28936f26d62234ff0be16f80115dbdeb3237fe9c25cf18fbcd1e3b3592360f20"
+dependencies = [
+ "bae",
+ "heck 0.3.3",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "sea-orm-migration"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "278d3adfd0832b6ffc17d3cfbc574d3695a5c1b38814e0bc8ac238d33f3d87cf"
+dependencies = [
+ "async-trait",
+ "clap 3.2.25",
+ "dotenvy",
+ "futures",
+ "sea-orm",
+ "sea-orm-cli",
+ "sea-schema",
+ "tracing",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "sea-query"
+version = "0.28.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbab99b8cd878ab7786157b7eb8df96333a6807cc6e45e8888c85b51534b401a"
+dependencies = [
+ "bigdecimal",
+ "chrono",
+ "rust_decimal",
+ "sea-query-derive",
+ "serde_json",
+ "time 0.3.21",
+ "uuid",
+]
+
+[[package]]
+name = "sea-query-binder"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cea85029985b40dfbf18318d85fe985c04db7c1b4e5e8e0a0a0cdff5f1e30f9"
+dependencies = [
+ "bigdecimal",
+ "chrono",
+ "rust_decimal",
+ "sea-query",
+ "serde_json",
+ "sqlx",
+ "time 0.3.21",
+ "uuid",
+]
+
+[[package]]
+name = "sea-query-derive"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "63f62030c60f3a691f5fe251713b4e220b306e50a71e1d6f9cce1f24bb781978"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "thiserror",
+]
+
+[[package]]
+name = "sea-schema"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eeb2940bb5a10bc6cd05b450ce6cd3993e27fddd7eface2becb97fc5af3a040e"
+dependencies = [
+ "futures",
+ "sea-query",
+ "sea-schema-derive",
+]
+
+[[package]]
+name = "sea-schema-derive"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56821b7076f5096b8f726e2791ad255a99c82498e08ec477a65a96c461ff1927"
+dependencies = [
+ "heck 0.3.3",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "sea-strum"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "391d06a6007842cfe79ac6f7f53911b76dfd69fc9a6769f1cf6569d12ce20e1b"
+dependencies = [
+ "sea-strum_macros",
+]
+
+[[package]]
+name = "sea-strum_macros"
+version = "0.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69b4397b825df6ccf1e98bcdabef3bbcfc47ff5853983467850eeab878384f21"
+dependencies = [
+ "heck 0.3.3",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "seahash"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
+
+[[package]]
+name = "semver"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+
+[[package]]
+name = "serde"
+version = "1.0.163"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2113ab51b87a539ae008b5c6c02dc020ffa39afd2d83cffcb3f4eb2722cebec2"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.163"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c805777e3930c8883389c602315a24224bcc738b63905ef87cd1420353ea93e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "serde_derive_internals"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.96"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.9.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c"
+dependencies = [
+ "indexmap",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha3"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
+dependencies = [
+ "digest",
+ "keccak",
+]
+
+[[package]]
+name = "sharded-slab"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+dependencies = [
+ "lazy_static",
+]
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "simdutf8"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
+
+[[package]]
+name = "slab"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+
+[[package]]
+name = "socket2"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+dependencies = [
+ "lock_api",
+]
+
+[[package]]
+name = "sqlformat"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c12bc9199d1db8234678b7051747c07f517cdcf019262d1847b94ec8b1aee3e"
+dependencies = [
+ "itertools",
+ "nom",
+ "unicode_categories",
+]
+
+[[package]]
+name = "sqlx"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8de3b03a925878ed54a954f621e64bf55a3c1bd29652d0d1a17830405350188"
+dependencies = [
+ "sqlx-core",
+ "sqlx-macros",
+]
+
+[[package]]
+name = "sqlx-core"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa8241483a83a3f33aa5fff7e7d9def398ff9990b2752b6c6112b83c6d246029"
+dependencies = [
+ "ahash 0.7.6",
+ "atoi",
+ "base64 0.13.1",
+ "bigdecimal",
+ "bitflags 1.3.2",
+ "byteorder",
+ "bytes",
+ "chrono",
+ "crossbeam-queue",
+ "dirs",
+ "dotenvy",
+ "either",
+ "event-listener",
+ "flume",
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-intrusive",
+ "futures-util",
+ "hashlink",
+ "hex",
+ "hkdf",
+ "hmac",
+ "indexmap",
+ "itoa",
+ "libc",
+ "libsqlite3-sys",
+ "log",
+ "md-5",
+ "memchr",
+ "num-bigint",
+ "once_cell",
+ "paste",
+ "percent-encoding",
+ "rand",
+ "rust_decimal",
+ "rustls",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "sha1",
+ "sha2",
+ "smallvec",
+ "sqlformat",
+ "sqlx-rt",
+ "stringprep",
+ "thiserror",
+ "time 0.3.21",
+ "tokio-stream",
+ "url",
+ "uuid",
+ "webpki-roots",
+ "whoami",
+]
+
+[[package]]
+name = "sqlx-macros"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9966e64ae989e7e575b19d7265cb79d7fc3cbbdf179835cb0d716f294c2049c9"
+dependencies = [
+ "dotenvy",
+ "either",
+ "heck 0.4.1",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "serde_json",
+ "sqlx-core",
+ "sqlx-rt",
+ "syn 1.0.109",
+ "url",
+]
+
+[[package]]
+name = "sqlx-rt"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "804d3f245f894e61b1e6263c84b23ca675d96753b5abfd5cc8597d86806e8024"
+dependencies = [
+ "once_cell",
+ "tokio",
+ "tokio-rustls",
+]
+
+[[package]]
+name = "stringprep"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ee348cb74b87454fff4b551cbf727025810a004f88aeacae7f85b87f4e9a1c1"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "structmeta"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "104842d6278bf64aa9d2f182ba4bde31e8aec7a131d29b7f444bb9b344a09e2a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "structmeta-derive",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "structmeta-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24420be405b590e2d746d83b01f09af673270cf80e9b003a5fa7b651c58c7d93"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "subtle"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32d41677bcbe24c20c52e7c70b0d8db04134c5d1066bf98662e2871ad200ea3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "tempfile"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9fbec84f381d5795b08656e4912bec604d162bff9291d6189a78f4c8ab87998"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "redox_syscall 0.3.5",
+ "rustix",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
+
+[[package]]
+name = "thiserror"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "thread_local"
+version = "1.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+]
+
+[[package]]
+name = "time"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a"
+dependencies = [
+ "libc",
+ "wasi 0.10.0+wasi-snapshot-preview1",
+ "winapi",
+]
+
+[[package]]
+name = "time"
+version = "0.3.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f3403384eaacbca9923fa06940178ac13e4edb725486d70e8e15881d0c836cc"
+dependencies = [
+ "itoa",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"
+
+[[package]]
+name = "time-macros"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "372950940a5f07bf38dbe211d7283c9e6d7327df53794992d293e534c733d09b"
+dependencies = [
+ "time-core",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.28.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
+dependencies = [
+ "autocfg",
+ "bytes",
+ "libc",
+ "mio",
+ "num_cpus",
+ "parking_lot 0.12.1",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2",
+ "tokio-macros",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.23.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59"
+dependencies = [
+ "rustls",
+ "tokio",
+ "webpki",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "toml"
+version = "0.5.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+
+[[package]]
+name = "tracing"
+version = "0.1.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+dependencies = [
+ "cfg-if",
+ "log",
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f57e3ca2a01450b1a921183a9c9cbfda207fd822cef4ccb00a65402cbba7a74"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "tracing-subscriber"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+dependencies = [
+ "matchers",
+ "once_cell",
+ "regex",
+ "sharded-slab",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+
+[[package]]
+name = "typenum"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+
+[[package]]
+name = "unarray"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15811caf2415fb889178633e7724bad2509101cde276048e013b9def5e51fa0"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
+[[package]]
+name = "unicode_categories"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
+
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6"
+
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "url"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "utf8parse"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+
+[[package]]
+name = "utoipa"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68ae74ef183fae36d650f063ae7bde1cacbe1cd7e72b617cbe1e985551878b98"
+dependencies = [
+ "indexmap",
+ "serde",
+ "serde_json",
+ "utoipa-gen",
+]
+
+[[package]]
+name = "utoipa-gen"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ea8ac818da7e746a63285594cce8a96f5e00ee31994e655bd827569cb8b137b"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+]
+
+[[package]]
+name = "uuid"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "value-bag"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wait-timeout"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "waker-fn"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
+
+[[package]]
+name = "want"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0"
+dependencies = [
+ "log",
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.10.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5bba0e8cb82ba49ff4e229459ff22a191bbe9a1cb3a341610c9c33efc27ddf73"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b04bc93f9d6bdee709f6bd2118f57dd6679cf1176a1af464fca3ab0d66d8fb"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d1985d03709c53167ce907ff394f5316aa22cb4e12761295c5dc57dacb6297e"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14d6b024f1a526bb0234f52840389927257beb670610081360e5a03c5df9c258"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e128beba882dd1eb6200e1dc92ae6c5dbaa4311aa7bb211ca035779e5efc39f8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.18",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed9d5b4305409d1fc9482fee2d7f9bcbf24b3972bf59817ef757e23982242a93"
+
+[[package]]
+name = "web-sys"
+version = "0.3.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3bdd9ef4e984da1187bf8110c5cf5b845fbc87a23602cdf912386a76fcd3a7c2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
+dependencies = [
+ "ring",
+ "untrusted",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
+dependencies = [
+ "webpki",
+]
+
+[[package]]
+name = "whoami"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c70234412ca409cc04e864e89523cb0fc37f5e1344ebed5a3ebf4192b6b9f68"
+dependencies = [
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
+dependencies = [
+ "windows-targets 0.48.0",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.0",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_msvc 0.48.0",
+ "windows_i686_gnu 0.48.0",
+ "windows_i686_msvc 0.48.0",
+ "windows_x86_64_gnu 0.48.0",
+ "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_msvc 0.48.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
+
+[[package]]
+name = "winreg"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "yansi"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"

From 9bd03cc92e42d12c98d3442b63743695c99a0e94 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Jun 2023 18:55:27 -0700
Subject: [PATCH 310/319] update cargo.lock

---
 packages/backend/native-utils/Cargo.lock | 292 ++++-------------------
 1 file changed, 41 insertions(+), 251 deletions(-)

diff --git a/packages/backend/native-utils/Cargo.lock b/packages/backend/native-utils/Cargo.lock
index 71169b10c7..1a20b792c2 100644
--- a/packages/backend/native-utils/Cargo.lock
+++ b/packages/backend/native-utils/Cargo.lock
@@ -34,9 +34,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
+checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
 dependencies = [
  "memchr",
 ]
@@ -123,113 +123,6 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
 
-[[package]]
-name = "async-attributes"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3203e79f4dd9bdda415ed03cf14dae5a2bf775c683a00f94e9cd1faf0f596e5"
-dependencies = [
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "async-channel"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf46fee83e5ccffc220104713af3292ff9bc7c64c7de289f66dae8e38d826833"
-dependencies = [
- "concurrent-queue",
- "event-listener",
- "futures-core",
-]
-
-[[package]]
-name = "async-executor"
-version = "1.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fa3dc5f2a8564f07759c008b9109dc0d39de92a88d5588b8a5036d286383afb"
-dependencies = [
- "async-lock",
- "async-task",
- "concurrent-queue",
- "fastrand",
- "futures-lite",
- "slab",
-]
-
-[[package]]
-name = "async-global-executor"
-version = "2.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
-dependencies = [
- "async-channel",
- "async-executor",
- "async-io",
- "async-lock",
- "blocking",
- "futures-lite",
- "once_cell",
- "tokio",
-]
-
-[[package]]
-name = "async-io"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
-dependencies = [
- "async-lock",
- "autocfg",
- "cfg-if",
- "concurrent-queue",
- "futures-lite",
- "log",
- "parking",
- "polling",
- "rustix",
- "slab",
- "socket2",
- "waker-fn",
-]
-
-[[package]]
-name = "async-lock"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa24f727524730b077666307f2734b4a1a1c57acb79193127dcc8914d5242dd7"
-dependencies = [
- "event-listener",
-]
-
-[[package]]
-name = "async-std"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
-dependencies = [
- "async-attributes",
- "async-channel",
- "async-global-executor",
- "async-io",
- "async-lock",
- "crossbeam-utils",
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-lite",
- "gloo-timers",
- "kv-log-macro",
- "log",
- "memchr",
- "once_cell",
- "pin-project-lite",
- "pin-utils",
- "slab",
- "wasm-bindgen-futures",
-]
-
 [[package]]
 name = "async-stream"
 version = "0.3.5"
@@ -252,12 +145,6 @@ dependencies = [
  "syn 2.0.18",
 ]
 
-[[package]]
-name = "async-task"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae"
-
 [[package]]
 name = "async-trait"
 version = "0.1.68"
@@ -278,12 +165,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "atomic-waker"
-version = "1.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3"
-
 [[package]]
 name = "autocfg"
 version = "1.1.0"
@@ -374,21 +255,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "blocking"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77231a1c8f801696fc0123ec6150ce92cffb8e164a02afb9c8ddee0e9b65ad65"
-dependencies = [
- "async-channel",
- "async-lock",
- "async-task",
- "atomic-waker",
- "fastrand",
- "futures-lite",
- "log",
-]
-
 [[package]]
 name = "borsh"
 version = "0.10.3"
@@ -524,12 +390,12 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.3.1"
+version = "4.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ed2379f8603fa2b7509891660e802b88c70a79a6427a70abb5968054de2c28"
+checksum = "401a4694d2bf92537b6867d94de48c4842089645fdcdf6c71865b175d836e9c2"
 dependencies = [
  "clap_builder",
- "clap_derive 4.3.1",
+ "clap_derive 4.3.2",
  "once_cell",
 ]
 
@@ -561,9 +427,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.3.1"
+version = "4.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59e9ef9a08ee1c0e1f2e162121665ac45ac3783b0f897db7244ae75ad9a8f65b"
+checksum = "b8cd2b2a819ad6eec39e8f1d6b53001af1e5469f8c177579cdaeb313115b825f"
 dependencies = [
  "heck 0.4.1",
  "proc-macro2",
@@ -592,15 +458,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
-[[package]]
-name = "concurrent-queue"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c"
-dependencies = [
- "crossbeam-utils",
-]
-
 [[package]]
 name = "console"
 version = "0.15.7"
@@ -685,9 +542,9 @@ dependencies = [
 
 [[package]]
 name = "ctor"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd4056f63fce3b82d852c3da92b08ea59959890813a7f4ce9c0ff85b10cf301b"
+checksum = "1586fa608b1dab41f667475b4a41faec5ba680aee428bfa5de4ea520fdc6e901"
 dependencies = [
  "quote",
  "syn 2.0.18",
@@ -854,9 +711,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
+checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
 dependencies = [
  "percent-encoding",
 ]
@@ -936,21 +793,6 @@ version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
 
-[[package]]
-name = "futures-lite"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce"
-dependencies = [
- "fastrand",
- "futures-core",
- "futures-io",
- "memchr",
- "parking",
- "pin-project-lite",
- "waker-fn",
-]
-
 [[package]]
 name = "futures-macro"
 version = "0.3.28"
@@ -1015,18 +857,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "gloo-timers"
-version = "0.2.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c"
-dependencies = [
- "futures-channel",
- "futures-core",
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "h2"
 version = "0.3.19"
@@ -1213,9 +1043,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
 dependencies = [
  "unicode-bidi",
  "unicode-normalization",
@@ -1234,9 +1064,9 @@ dependencies = [
 
 [[package]]
 name = "indicatif"
-version = "0.17.4"
+version = "0.17.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db45317f37ef454e6519b6c3ed7d377e5f23346f0823f86e65ca36912d1d0ef8"
+checksum = "8ff8cc23a7393a397ed1d7f56e6365cba772aba9f9912ab968b03043c395d057"
 dependencies = [
  "console",
  "instant",
@@ -1327,7 +1157,7 @@ dependencies = [
  "anyhow",
  "base64 0.21.2",
  "bytecount",
- "clap 4.3.1",
+ "clap 4.3.2",
  "fancy-regex",
  "fraction",
  "getrandom",
@@ -1356,15 +1186,6 @@ dependencies = [
  "cpufeatures",
 ]
 
-[[package]]
-name = "kv-log-macro"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
-dependencies = [
- "log",
-]
-
 [[package]]
 name = "lazy_static"
 version = "1.4.0"
@@ -1373,9 +1194,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.144"
+version = "0.2.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b00cc1c228a6782d0f076e7b232802e0c5689d41bb5df366f2a6b6621cfdfe1"
+checksum = "fc86cde3ff845662b8f4ef6cb50ea0e20c524eb3d29ae048287e06a1b3fa6a81"
 
 [[package]]
 name = "libloading"
@@ -1412,9 +1233,9 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "lock_api"
-version = "0.4.9"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -1425,9 +1246,6 @@ name = "log"
 version = "0.4.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
-dependencies = [
- "value-bag",
-]
 
 [[package]]
 name = "matchers"
@@ -1457,7 +1275,6 @@ checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
 name = "migration"
 version = "0.1.0"
 dependencies = [
- "async-std",
  "futures",
  "indicatif",
  "native-utils",
@@ -1466,6 +1283,7 @@ dependencies = [
  "serde_json",
  "serde_yaml",
  "tokio",
+ "urlencoding",
 ]
 
 [[package]]
@@ -1498,7 +1316,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7f0a2e93526dd9c8c522d72a4d0c88678be8966fabe9fb8f2947fde6339b682"
 dependencies = [
  "bitflags 2.3.1",
- "ctor 0.2.0",
+ "ctor 0.2.2",
  "napi-derive",
  "napi-sys",
  "once_cell",
@@ -1687,9 +1505,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
 
 [[package]]
 name = "once_cell"
-version = "1.17.2"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
 name = "os_str_bytes"
@@ -1729,12 +1547,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "parking"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e"
-
 [[package]]
 name = "parking_lot"
 version = "0.11.2"
@@ -1753,7 +1565,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.7",
+ "parking_lot_core 0.9.8",
 ]
 
 [[package]]
@@ -1772,15 +1584,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.7"
+version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
+checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.2.16",
+ "redox_syscall 0.3.5",
  "smallvec",
- "windows-sys 0.45.0",
+ "windows-targets 0.48.0",
 ]
 
 [[package]]
@@ -1817,9 +1629,9 @@ checksum = "9f746c4065a8fa3fe23974dd82f15431cc8d40779821001404d10d2e79ca7d79"
 
 [[package]]
 name = "percent-encoding"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
+checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
 
 [[package]]
 name = "pin-project"
@@ -1859,22 +1671,6 @@ version = "0.3.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
 
-[[package]]
-name = "polling"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
-dependencies = [
- "autocfg",
- "bitflags 1.3.2",
- "cfg-if",
- "concurrent-queue",
- "libc",
- "log",
- "pin-project-lite",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "portable-atomic"
 version = "1.3.3"
@@ -2078,9 +1874,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.8.3"
+version = "1.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
+checksum = "d0ab3ca65655bb1e41f2a8c8cd662eb4fb035e67c3f78da1d61dffe89d07300f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -3146,15 +2942,21 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
 
 [[package]]
 name = "url"
-version = "2.3.1"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
+checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
 ]
 
+[[package]]
+name = "urlencoding"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8db7427f936968176eaa7cdf81b7f98b980b18495ec28f1b5791ac3bfe3eea9"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.1"
@@ -3194,12 +2996,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "value-bag"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4d330786735ea358f3bc09eea4caa098569c1c93f342d9aca0514915022fe7e"
-
 [[package]]
 name = "vcpkg"
 version = "0.2.15"
@@ -3221,12 +3017,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "waker-fn"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
-
 [[package]]
 name = "want"
 version = "0.3.0"

From c5a0c01e4e9c20d1945153fb1eecd84f30d1f492 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Mon, 5 Jun 2023 21:15:49 -0700
Subject: [PATCH 311/319] Revert "chore: formatting"

This reverts commit 36283b9a358886bfcf6f40c04b5bed1fe6088ff5.
---
 cypress.config.ts                             |  20 +--
 cypress/e2e/basic.cy.js                       | 126 +++++++++---------
 cypress/e2e/widgets.cy.js                     |  78 +++++------
 cypress/plugins/index.js                      |   6 +-
 cypress/support/commands.js                   |  34 +++--
 cypress/support/e2e.js                        |  18 ++-
 locales/index.js                              | 113 ++++++----------
 .../1658656633972-note-replies-function.js    |   2 +-
 ...ddFkAbuseUserReportTargetUserIdToUserId.js |   2 +-
 .../migration/1680375641101-clean-charts.js   |  16 +--
 packages/backend/src/boot/master.ts           |   2 +-
 .../remote/activitypub/misc/ld-signature.ts   |   8 +-
 .../src/remote/activitypub/models/image.ts    |   4 +-
 .../backend/src/server/api/endpoints/meta.ts  |   4 +-
 .../src/server/api/endpoints/notes/edit.ts    |   4 +-
 .../server/api/mastodon/endpoints/timeline.ts |   2 +-
 packages/backend/src/server/web/boot.js       |   4 +-
 packages/backend/src/services/note/create.ts  |   6 +-
 packages/backend/test/api-visibility.ts       |  16 +--
 packages/backend/test/get-file-info.ts        |  72 +++++-----
 packages/backend/test/streaming.ts            |   8 +-
 packages/backend/test/utils.ts                |  10 +-
 packages/client/src/components/mfm.ts         |   2 +-
 scripts/clean-all.js                          |  44 ++----
 scripts/clean.js                              |  19 +--
 scripts/dev.js                                |  28 ++--
 26 files changed, 292 insertions(+), 356 deletions(-)

diff --git a/cypress.config.ts b/cypress.config.ts
index 25ff2aa075..e390c41a54 100644
--- a/cypress.config.ts
+++ b/cypress.config.ts
@@ -1,12 +1,12 @@
-import { defineConfig } from "cypress";
+import { defineConfig } from 'cypress'
 
 export default defineConfig({
-	e2e: {
-		// We've imported your old cypress plugins here.
-		// You may want to clean this up later by importing these.
-		setupNodeEvents(on, config) {
-			return require("./cypress/plugins/index.js")(on, config);
-		},
-		baseUrl: "http://localhost:61812",
-	},
-});
+  e2e: {
+    // We've imported your old cypress plugins here.
+    // You may want to clean this up later by importing these.
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.js')(on, config)
+    },
+    baseUrl: 'http://localhost:61812',
+  },
+})
diff --git a/cypress/e2e/basic.cy.js b/cypress/e2e/basic.cy.js
index f73a25efbc..eb5195c4b2 100644
--- a/cypress/e2e/basic.cy.js
+++ b/cypress/e2e/basic.cy.js
@@ -1,4 +1,4 @@
-describe("Before setup instance", () => {
+describe('Before setup instance', () => {
 	beforeEach(() => {
 		cy.resetState();
 	});
@@ -9,31 +9,31 @@ describe("Before setup instance", () => {
 		cy.wait(1000);
 	});
 
-	it("successfully loads", () => {
-		cy.visit("/");
-	});
+  it('successfully loads', () => {
+    cy.visit('/');
+  });
 
-	it("setup instance", () => {
-		cy.visit("/");
+	it('setup instance', () => {
+    cy.visit('/');
 
-		cy.intercept("POST", "/api/admin/accounts/create").as("signup");
-
-		cy.get("[data-cy-admin-username] input").type("admin");
-		cy.get("[data-cy-admin-password] input").type("admin1234");
-		cy.get("[data-cy-admin-ok]").click();
+		cy.intercept('POST', '/api/admin/accounts/create').as('signup');
+	
+		cy.get('[data-cy-admin-username] input').type('admin');
+		cy.get('[data-cy-admin-password] input').type('admin1234');
+		cy.get('[data-cy-admin-ok]').click();
 
 		// なぜか動かない
 		//cy.wait('@signup').should('have.property', 'response.statusCode');
-		cy.wait("@signup");
-	});
+		cy.wait('@signup');
+  });
 });
 
-describe("After setup instance", () => {
+describe('After setup instance', () => {
 	beforeEach(() => {
 		cy.resetState();
 
 		// インスタンス初期セットアップ
-		cy.registerUser("admin", "pass", true);
+		cy.registerUser('admin', 'pass', true);
 	});
 
 	afterEach(() => {
@@ -42,34 +42,34 @@ describe("After setup instance", () => {
 		cy.wait(1000);
 	});
 
-	it("successfully loads", () => {
-		cy.visit("/");
-	});
+  it('successfully loads', () => {
+    cy.visit('/');
+  });
 
-	it("signup", () => {
-		cy.visit("/");
+	it('signup', () => {
+		cy.visit('/');
 
-		cy.intercept("POST", "/api/signup").as("signup");
+		cy.intercept('POST', '/api/signup').as('signup');
 
-		cy.get("[data-cy-signup]").click();
-		cy.get("[data-cy-signup-username] input").type("alice");
-		cy.get("[data-cy-signup-password] input").type("alice1234");
-		cy.get("[data-cy-signup-password-retype] input").type("alice1234");
-		cy.get("[data-cy-signup-submit]").click();
+		cy.get('[data-cy-signup]').click();
+		cy.get('[data-cy-signup-username] input').type('alice');
+		cy.get('[data-cy-signup-password] input').type('alice1234');
+		cy.get('[data-cy-signup-password-retype] input').type('alice1234');
+		cy.get('[data-cy-signup-submit]').click();
 
-		cy.wait("@signup");
-	});
+		cy.wait('@signup');
+  });
 });
 
-describe("After user signup", () => {
+describe('After user signup', () => {
 	beforeEach(() => {
 		cy.resetState();
 
 		// インスタンス初期セットアップ
-		cy.registerUser("admin", "pass", true);
+		cy.registerUser('admin', 'pass', true);
 
 		// ユーザー作成
-		cy.registerUser("alice", "alice1234");
+		cy.registerUser('alice', 'alice1234');
 	});
 
 	afterEach(() => {
@@ -78,53 +78,51 @@ describe("After user signup", () => {
 		cy.wait(1000);
 	});
 
-	it("successfully loads", () => {
-		cy.visit("/");
-	});
+  it('successfully loads', () => {
+    cy.visit('/');
+  });
 
-	it("signin", () => {
-		cy.visit("/");
+	it('signin', () => {
+		cy.visit('/');
 
-		cy.intercept("POST", "/api/signin").as("signin");
+		cy.intercept('POST', '/api/signin').as('signin');
 
-		cy.get("[data-cy-signin]").click();
-		cy.get("[data-cy-signin-username] input").type("alice");
+		cy.get('[data-cy-signin]').click();
+		cy.get('[data-cy-signin-username] input').type('alice');
 		// Enterキーでサインインできるかの確認も兼ねる
-		cy.get("[data-cy-signin-password] input").type("alice1234{enter}");
+		cy.get('[data-cy-signin-password] input').type('alice1234{enter}');
 
-		cy.wait("@signin");
-	});
+		cy.wait('@signin');
+  });
 
-	it("suspend", function () {
-		cy.request("POST", "/api/admin/suspend-user", {
+	it('suspend', function() {
+		cy.request('POST', '/api/admin/suspend-user', {
 			i: this.admin.token,
 			userId: this.alice.id,
 		});
 
-		cy.visit("/");
+		cy.visit('/');
 
-		cy.get("[data-cy-signin]").click();
-		cy.get("[data-cy-signin-username] input").type("alice");
-		cy.get("[data-cy-signin-password] input").type("alice1234{enter}");
+		cy.get('[data-cy-signin]').click();
+		cy.get('[data-cy-signin-username] input').type('alice');
+		cy.get('[data-cy-signin-password] input').type('alice1234{enter}');
 
 		// TODO: cypressにブラウザの言語指定できる機能が実装され次第英語のみテストするようにする
-		cy.contains(
-			/アカウントが凍結されています|This account has been suspended due to/gi,
-		);
+		cy.contains(/アカウントが凍結されています|This account has been suspended due to/gi);
 	});
 });
 
-describe("After user singed in", () => {
+describe('After user singed in', () => {
 	beforeEach(() => {
 		cy.resetState();
 
 		// インスタンス初期セットアップ
-		cy.registerUser("admin", "pass", true);
+		cy.registerUser('admin', 'pass', true);
 
 		// ユーザー作成
-		cy.registerUser("alice", "alice1234");
+		cy.registerUser('alice', 'alice1234');
 
-		cy.login("alice", "alice1234");
+		cy.login('alice', 'alice1234');
 	});
 
 	afterEach(() => {
@@ -133,17 +131,17 @@ describe("After user singed in", () => {
 		cy.wait(1000);
 	});
 
-	it("successfully loads", () => {
-		cy.get("[data-cy-open-post-form]").should("be.visible");
-	});
+  it('successfully loads', () => {
+		cy.get('[data-cy-open-post-form]').should('be.visible');
+  });
 
-	it("note", () => {
-		cy.get("[data-cy-open-post-form]").click();
-		cy.get("[data-cy-post-form-text]").type("Hello, Misskey!");
-		cy.get("[data-cy-open-post-form-submit]").click();
+	it('note', () => {
+		cy.get('[data-cy-open-post-form]').click();
+		cy.get('[data-cy-post-form-text]').type('Hello, Misskey!');
+		cy.get('[data-cy-open-post-form-submit]').click();
 
-		cy.contains("Hello, Misskey!");
-	});
+		cy.contains('Hello, Misskey!');
+  });
 });
 
 // TODO: 投稿フォームの公開範囲指定のテスト
diff --git a/cypress/e2e/widgets.cy.js b/cypress/e2e/widgets.cy.js
index e3c9326db8..9eea010bde 100644
--- a/cypress/e2e/widgets.cy.js
+++ b/cypress/e2e/widgets.cy.js
@@ -1,14 +1,14 @@
-describe("After user signed in", () => {
+describe('After user signed in', () => {
 	beforeEach(() => {
 		cy.resetState();
-		cy.viewport("macbook-16");
+		cy.viewport('macbook-16');
 		// インスタンス初期セットアップ
-		cy.registerUser("admin", "pass", true);
+		cy.registerUser('admin', 'pass', true);
 
 		// ユーザー作成
-		cy.registerUser("alice", "alice1234");
+		cy.registerUser('alice', 'alice1234');
 
-		cy.login("alice", "alice1234");
+		cy.login('alice', 'alice1234');
 	});
 
 	afterEach(() => {
@@ -17,47 +17,47 @@ describe("After user signed in", () => {
 		cy.wait(1000);
 	});
 
-	it("widget edit toggle is visible", () => {
-		cy.get(".mk-widget-edit").should("be.visible");
-	});
+  it('widget edit toggle is visible', () => {
+		cy.get('.mk-widget-edit').should('be.visible');
+  });
 
-	it("widget select should be visible in edit mode", () => {
-		cy.get(".mk-widget-edit").click();
-		cy.get(".mk-widget-select").should("be.visible");
-	});
+	it('widget select should be visible in edit mode', () => {
+		cy.get('.mk-widget-edit').click();
+		cy.get('.mk-widget-select').should('be.visible');
+  });
 
-	it("first widget should be removed", () => {
-		cy.get(".mk-widget-edit").click();
-		cy.get(".customize-container:first-child .remove._button").click();
-		cy.get(".customize-container").should("have.length", 2);
+	it('first widget should be removed', () => {
+		cy.get('.mk-widget-edit').click();
+		cy.get('.customize-container:first-child .remove._button').click();
+		cy.get('.customize-container').should('have.length', 2);
 	});
 
 	function buildWidgetTest(widgetName) {
 		it(`${widgetName} widget should get added`, () => {
-			cy.get(".mk-widget-edit").click();
-			cy.get(".mk-widget-select select").select(widgetName, { force: true });
-			cy.get(".bg._modalBg.transparent").click({ multiple: true, force: true });
-			cy.get(".mk-widget-add").click({ force: true });
-			cy.get(`.mkw-${widgetName}`).should("exist");
+			cy.get('.mk-widget-edit').click();
+			cy.get('.mk-widget-select select').select(widgetName, { force: true });
+			cy.get('.bg._modalBg.transparent').click({ multiple: true, force: true });
+			cy.get('.mk-widget-add').click({ force: true });
+			cy.get(`.mkw-${widgetName}`).should('exist');
 		});
 	}
 
-	buildWidgetTest("memo");
-	buildWidgetTest("notifications");
-	buildWidgetTest("timeline");
-	buildWidgetTest("calendar");
-	buildWidgetTest("rss");
-	buildWidgetTest("trends");
-	buildWidgetTest("clock");
-	buildWidgetTest("activity");
-	buildWidgetTest("photos");
-	buildWidgetTest("digitalClock");
-	buildWidgetTest("federation");
-	buildWidgetTest("postForm");
-	buildWidgetTest("slideshow");
-	buildWidgetTest("serverMetric");
-	buildWidgetTest("onlineUsers");
-	buildWidgetTest("jobQueue");
-	buildWidgetTest("button");
-	buildWidgetTest("aiscript");
+	buildWidgetTest('memo');
+	buildWidgetTest('notifications');
+	buildWidgetTest('timeline');
+	buildWidgetTest('calendar');
+	buildWidgetTest('rss');
+	buildWidgetTest('trends');
+	buildWidgetTest('clock');
+	buildWidgetTest('activity');
+	buildWidgetTest('photos');
+	buildWidgetTest('digitalClock');
+	buildWidgetTest('federation');
+	buildWidgetTest('postForm');
+	buildWidgetTest('slideshow');
+	buildWidgetTest('serverMetric');
+	buildWidgetTest('onlineUsers');
+	buildWidgetTest('jobQueue');
+	buildWidgetTest('button');
+	buildWidgetTest('aiscript');
 });
diff --git a/cypress/plugins/index.js b/cypress/plugins/index.js
index 3a4b6deb18..aa9918d215 100644
--- a/cypress/plugins/index.js
+++ b/cypress/plugins/index.js
@@ -16,6 +16,6 @@
  * @type {Cypress.PluginConfig}
  */
 module.exports = (on, config) => {
-	// `on` is used to hook into various events Cypress emits
-	// `config` is the resolved Cypress config
-};
+  // `on` is used to hook into various events Cypress emits
+  // `config` is the resolved Cypress config
+}
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 3fe95b93d0..95bfcf6855 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -24,34 +24,32 @@
 // -- This will overwrite an existing command --
 // Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
 
-Cypress.Commands.add("resetState", () => {
-	cy.window((win) => {
-		win.indexedDB.deleteDatabase("keyval-store");
+Cypress.Commands.add('resetState', () => {
+	cy.window(win => {
+		win.indexedDB.deleteDatabase('keyval-store');
 	});
-	cy.request("POST", "/api/reset-db").as("reset");
-	cy.get("@reset").its("status").should("equal", 204);
+	cy.request('POST', '/api/reset-db').as('reset');
+	cy.get('@reset').its('status').should('equal', 204);
 	cy.reload(true);
 });
 
-Cypress.Commands.add("registerUser", (username, password, isAdmin = false) => {
-	const route = isAdmin ? "/api/admin/accounts/create" : "/api/signup";
+Cypress.Commands.add('registerUser', (username, password, isAdmin = false) => {
+	const route = isAdmin ? '/api/admin/accounts/create' : '/api/signup';
 
-	cy.request("POST", route, {
+	cy.request('POST', route, {
 		username: username,
 		password: password,
-	})
-		.its("body")
-		.as(username);
+	}).its('body').as(username);
 });
 
-Cypress.Commands.add("login", (username, password) => {
-	cy.visit("/");
+Cypress.Commands.add('login', (username, password) => {
+	cy.visit('/');
 
-	cy.intercept("POST", "/api/signin").as("signin");
+	cy.intercept('POST', '/api/signin').as('signin');
 
-	cy.get("[data-cy-signin]").click();
-	cy.get("[data-cy-signin-username] input").type(username);
-	cy.get("[data-cy-signin-password] input").type(`${password}{enter}`);
+	cy.get('[data-cy-signin]').click();
+	cy.get('[data-cy-signin-username] input').type(username);
+	cy.get('[data-cy-signin-password] input').type(`${password}{enter}`);
 
-	cy.wait("@signin").as("signedIn");
+	cy.wait('@signin').as('signedIn');
 });
diff --git a/cypress/support/e2e.js b/cypress/support/e2e.js
index 961c6ac888..9185be344c 100644
--- a/cypress/support/e2e.js
+++ b/cypress/support/e2e.js
@@ -14,21 +14,19 @@
 // ***********************************************************
 
 // Import commands.js using ES2015 syntax:
-import "./commands";
+import './commands'
 
 // Alternatively you can use CommonJS syntax:
 // require('./commands')
 
-Cypress.on("uncaught:exception", (err, runnable) => {
-	if (
-		[
-			// Chrome
-			"ResizeObserver loop limit exceeded",
+Cypress.on('uncaught:exception', (err, runnable) => {
+	if ([
+		// Chrome
+		'ResizeObserver loop limit exceeded',
 
-			// Firefox
-			"ResizeObserver loop completed with undelivered notifications",
-		].some((msg) => err.message.includes(msg))
-	) {
+		// Firefox
+		'ResizeObserver loop completed with undelivered notifications',
+	].some(msg => err.message.includes(msg))) {
 		return false;
 	}
 });
diff --git a/locales/index.js b/locales/index.js
index 20e9593dad..7399bb5a18 100644
--- a/locales/index.js
+++ b/locales/index.js
@@ -2,90 +2,59 @@
  * Languages Loader
  */
 
-const fs = require("fs");
-const yaml = require("js-yaml");
-let languages = [];
-let languages_custom = [];
+const fs = require('fs');
+const yaml = require('js-yaml');
+let languages = []
+let languages_custom = []
+
+const merge = (...args) => args.reduce((a, c) => ({
+	...a,
+	...c,
+	...Object.entries(a)
+		.filter(([k]) => c && typeof c[k] === 'object')
+		.reduce((a, [k, v]) => (a[k] = merge(v, c[k]), a), {})
+}), {});
 
-const merge = (...args) =>
-	args.reduce(
-		(a, c) => ({
-			...a,
-			...c,
-			...Object.entries(a)
-				.filter(([k]) => c && typeof c[k] === "object")
-				.reduce((a, [k, v]) => ((a[k] = merge(v, c[k])), a), {}),
-		}),
-		{},
-	);
 
 fs.readdirSync(__dirname).forEach((file) => {
-	if (file.includes(".yml")) {
-		file = file.slice(0, file.indexOf("."));
+	if (file.includes('.yml')){
+		file = file.slice(0, file.indexOf('.'))
 		languages.push(file);
 	}
-});
+})
 
-fs.readdirSync(__dirname + "/../custom/locales").forEach((file) => {
-	if (file.includes(".yml")) {
-		file = file.slice(0, file.indexOf("."));
+fs.readdirSync(__dirname + '/../custom/locales').forEach((file) => {
+	if (file.includes('.yml')){
+		file = file.slice(0, file.indexOf('.'))
 		languages_custom.push(file);
 	}
-});
+})
 
 const primaries = {
-	en: "US",
-	ja: "JP",
-	zh: "CN",
+	'en': 'US',
+	'ja': 'JP',
+	'zh': 'CN',
 };
 
 // 何故か文字列にバックスペース文字が混入することがあり、YAMLが壊れるので取り除く
-const clean = (text) =>
-	text.replace(new RegExp(String.fromCodePoint(0x08), "g"), "");
+const clean = (text) => text.replace(new RegExp(String.fromCodePoint(0x08), 'g'), '');
 
-const locales = languages.reduce(
-	(a, c) => (
-		(a[c] =
-			yaml.load(clean(fs.readFileSync(`${__dirname}/${c}.yml`, "utf-8"))) ||
-			{}),
-		a
-	),
-	{},
-);
-const locales_custom = languages_custom.reduce(
-	(a, c) => (
-		(a[c] =
-			yaml.load(
-				clean(
-					fs.readFileSync(`${__dirname}/../custom/locales/${c}.yml`, "utf-8"),
-				),
-			) || {}),
-		a
-	),
-	{},
-);
-Object.assign(locales, locales_custom);
+const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(`${__dirname}/${c}.yml`, 'utf-8'))) || {}, a), {});
+const locales_custom = languages_custom.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(`${__dirname}/../custom/locales/${c}.yml`, 'utf-8'))) || {}, a), {});
+Object.assign(locales, locales_custom)
 
-module.exports = Object.entries(locales).reduce(
-	(a, [k, v]) => (
-		(a[k] = (() => {
-			const [lang] = k.split("-");
-			switch (k) {
-				case "ja-JP":
-					return v;
-				case "ja-KS":
-				case "en-US":
-					return merge(locales["ja-JP"], v);
-				default:
-					return merge(
-						locales["ja-JP"],
-						locales["en-US"],
-						locales[`${lang}-${primaries[lang]}`] || {},
-						v,
-					);
-			}
-		})()),
-		a
-	),
-	{},
-);
+module.exports = Object.entries(locales)
+	.reduce((a, [k ,v]) => (a[k] = (() => {
+		const [lang] = k.split('-');
+		switch (k) {
+			case 'ja-JP': return v;
+			case 'ja-KS':
+			case 'en-US': return merge(locales['ja-JP'], v);
+			default: return merge(
+				locales['ja-JP'],
+				locales['en-US'],
+				locales[`${lang}-${primaries[lang]}`] || {},
+				v
+			);
+		}
+	})(), a), {});
diff --git a/packages/backend/migration/1658656633972-note-replies-function.js b/packages/backend/migration/1658656633972-note-replies-function.js
index 705d1c9350..810e238439 100644
--- a/packages/backend/migration/1658656633972-note-replies-function.js
+++ b/packages/backend/migration/1658656633972-note-replies-function.js
@@ -47,6 +47,6 @@ export class noteRepliesFunction1658656633972 {
 	}
 
 	async down(queryRunner) {
-		await queryRunner.query("DROP FUNCTION note_replies");
+		await queryRunner.query(`DROP FUNCTION note_replies`);
 	}
 }
diff --git a/packages/backend/migration/1671199573000-AddFkAbuseUserReportTargetUserIdToUserId.js b/packages/backend/migration/1671199573000-AddFkAbuseUserReportTargetUserIdToUserId.js
index 8fb5d08af8..96ed8e1d6b 100644
--- a/packages/backend/migration/1671199573000-AddFkAbuseUserReportTargetUserIdToUserId.js
+++ b/packages/backend/migration/1671199573000-AddFkAbuseUserReportTargetUserIdToUserId.js
@@ -12,7 +12,7 @@ export class addFkAbuseUserReportTargetUserIdToUserId1671199573000 {
 
 	async down(queryRunner) {
 		await queryRunner.query(
-			"ALTER TABLE abuse_user_report DROP CONSTRAINT fk_7f4e851a35d81b64dda28eee0",
+			`ALTER TABLE abuse_user_report DROP CONSTRAINT fk_7f4e851a35d81b64dda28eee0`,
 		);
 	}
 }
diff --git a/packages/backend/migration/1680375641101-clean-charts.js b/packages/backend/migration/1680375641101-clean-charts.js
index 827dcd2ce2..bfb8aa9d92 100644
--- a/packages/backend/migration/1680375641101-clean-charts.js
+++ b/packages/backend/migration/1680375641101-clean-charts.js
@@ -4,22 +4,22 @@ export class CleanCharts1680375641101 {
 	}
 	async up(queryRunner) {
 		await queryRunner.query(
-			"delete from __chart__hashtag where ___local_users = 0 and ___remote_users = 0;",
+			`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;",
+			`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;");
+		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;",
+			`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;",
+			`delete from __chart_day__hashtag where ___local_users = 0 and ___remote_users = 0;`,
 		);
 	}
 }
diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index 17b84c74a5..bee8c8b0cd 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -93,7 +93,7 @@ export async function masterMain() {
 		true,
 	);
 
-	if (!(envOption.noDaemons || config.onlyQueueProcessor)) {
+	if (!envOption.noDaemons && !config.onlyQueueProcessor) {
 		import("../daemons/server-stats.js").then((x) => x.default());
 		import("../daemons/queue-stats.js").then((x) => x.default());
 		import("../daemons/janitor.js").then((x) => x.default());
diff --git a/packages/backend/src/remote/activitypub/misc/ld-signature.ts b/packages/backend/src/remote/activitypub/misc/ld-signature.ts
index 1fb452c079..62707624be 100644
--- a/packages/backend/src/remote/activitypub/misc/ld-signature.ts
+++ b/packages/backend/src/remote/activitypub/misc/ld-signature.ts
@@ -68,13 +68,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);
diff --git a/packages/backend/src/remote/activitypub/models/image.ts b/packages/backend/src/remote/activitypub/models/image.ts
index b47b16c86f..211aa3931e 100644
--- a/packages/backend/src/remote/activitypub/models/image.ts
+++ b/packages/backend/src/remote/activitypub/models/image.ts
@@ -29,8 +29,8 @@ 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}`);
+	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}`);
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 4c222d7c33..c603cb9acf 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -529,8 +529,8 @@ export default define(meta, paramDef, async (ps, me) => {
 			github: instance.enableGithubIntegration,
 			discord: instance.enableDiscordIntegration,
 			serviceWorker: instance.enableServiceWorker,
-			postEditing: instance.experimentalFeatures?.postEditing,
-			postImports: instance.experimentalFeatures?.postImports,
+			postEditing: instance.experimentalFeatures?.postEditing || false,
+			postImports: instance.experimentalFeatures?.postImports || false,
 			miauth: true,
 		};
 	}
diff --git a/packages/backend/src/server/api/endpoints/notes/edit.ts b/packages/backend/src/server/api/endpoints/notes/edit.ts
index 37d0f31701..66db6f644f 100644
--- a/packages/backend/src/server/api/endpoints/notes/edit.ts
+++ b/packages/backend/src/server/api/endpoints/notes/edit.ts
@@ -614,13 +614,13 @@ export default define(meta, paramDef, async (ps, user) => {
 			}
 
 			// Post is a reply and remote user is the contributor of the original post
-			if (note.reply?.userHost !== null) {
+			if (note.reply && note.reply.userHost !== null) {
 				const u = await Users.findOneBy({ id: note.reply.userId });
 				if (u && Users.isRemoteUser(u)) dm.addDirectRecipe(u);
 			}
 
 			// Post is a renote and remote user is the contributor of the original post
-			if (note.renote?.userHost !== null) {
+			if (note.renote && note.renote.userHost !== null) {
 				const u = await Users.findOneBy({ id: note.renote.userId });
 				if (u && Users.isRemoteUser(u)) dm.addDirectRecipe(u);
 			}
diff --git a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
index 91841a19af..b8ef0929ee 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/timeline.ts
@@ -49,7 +49,7 @@ export function toTextWithReaction(status: Entity.Status[], host: string) {
 		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 ? "* " : ""})`;
+			return `${emojiNotation} (${r.count}${r.me ? `* ` : ""})`;
 		});
 		const reaction = t.emoji_reactions as Entity.Reaction[];
 		const emoji = t.emojis || [];
diff --git a/packages/backend/src/server/web/boot.js b/packages/backend/src/server/web/boot.js
index d80d3ca134..e7e859d20c 100644
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@@ -97,7 +97,7 @@
 
 	const fontSize = localStorage.getItem("fontSize");
 	if (fontSize) {
-		document.documentElement.classList.add(`f-${fontSize}`);
+		document.documentElement.classList.add("f-" + fontSize);
 	}
 
 	const useSystemFont = localStorage.getItem("useSystemFont");
@@ -292,7 +292,7 @@
 
 			const meta = await res.json();
 
-			if (meta.version !== v) {
+			if (meta.version != v) {
 				localStorage.setItem("v", meta.version);
 				refresh();
 			}
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 723a6be3df..abb8d94e88 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -564,13 +564,13 @@ export default async (
 					}
 
 					// 投稿がリプライかつ投稿者がローカルユーザーかつリプライ先の投稿の投稿者がリモートユーザーなら配送
-					if (data.reply?.userHost !== null) {
+					if (data.reply && data.reply.userHost !== null) {
 						const u = await Users.findOneBy({ id: data.reply.userId });
 						if (u && Users.isRemoteUser(u)) dm.addDirectRecipe(u);
 					}
 
 					// 投稿がRenoteかつ投稿者がローカルユーザーかつRenote元の投稿の投稿者がリモートユーザーなら配送
-					if (data.renote?.userHost !== null) {
+					if (data.renote && data.renote.userHost !== null) {
 						const u = await Users.findOneBy({ id: data.renote.userId });
 						if (u && Users.isRemoteUser(u)) dm.addDirectRecipe(u);
 					}
@@ -671,7 +671,7 @@ async function insertNote(
 		tags: tags.map((tag) => normalizeForSearch(tag)),
 		emojis,
 		userId: user.id,
-		localOnly: data.localOnly,
+		localOnly: data.localOnly || false,
 		visibility: data.visibility as any,
 		visibleUserIds:
 			data.visibility === "specified"
diff --git a/packages/backend/test/api-visibility.ts b/packages/backend/test/api-visibility.ts
index 20a530fce4..0ee4a4d337 100644
--- a/packages/backend/test/api-visibility.ts
+++ b/packages/backend/test/api-visibility.ts
@@ -462,21 +462,21 @@ describe("API visibility", () => {
 		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);
+			const notes = res.body.filter((n: any) => n.id == pub.id);
 			assert.strictEqual(notes[0].text, "x");
 		}));
 
 		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);
+			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);
 			assert.strictEqual(res.status, 200);
-			const notes = res.body.filter((n: any) => n.id === fol.id);
+			const notes = res.body.filter((n: any) => n.id == fol.id);
 			assert.strictEqual(notes[0].text, "x");
 		}));
 		//#endregion
@@ -489,7 +489,7 @@ describe("API visibility", () => {
 				follower,
 			);
 			assert.strictEqual(res.status, 200);
-			const notes = res.body.filter((n: any) => n.id === folR.id);
+			const notes = res.body.filter((n: any) => n.id == folR.id);
 			assert.strictEqual(notes[0].text, "x");
 		}));
 
@@ -500,7 +500,7 @@ describe("API visibility", () => {
 				other,
 			);
 			assert.strictEqual(res.status, 200);
-			const notes = res.body.filter((n: any) => n.id === folR.id);
+			const notes = res.body.filter((n: any) => n.id == folR.id);
 			assert.strictEqual(notes.length, 0);
 		}));
 
@@ -511,7 +511,7 @@ describe("API visibility", () => {
 				target,
 			);
 			assert.strictEqual(res.status, 200);
-			const notes = res.body.filter((n: any) => n.id === folR.id);
+			const notes = res.body.filter((n: any) => n.id == folR.id);
 			assert.strictEqual(notes[0].text, "x");
 		}));
 		//#endregion
@@ -520,14 +520,14 @@ describe("API visibility", () => {
 		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);
+			const notes = res.body.filter((n: any) => n.id == folR.id);
 			assert.strictEqual(notes[0].text, "x");
 		}));
 
 		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);
+			const notes = res.body.filter((n: any) => n.id == folM.id);
 			assert.strictEqual(notes[0].text, "@target x");
 		}));
 		//#endregion
diff --git a/packages/backend/test/get-file-info.ts b/packages/backend/test/get-file-info.ts
index d399005144..22dc28c8e0 100644
--- a/packages/backend/test/get-file-info.ts
+++ b/packages/backend/test/get-file-info.ts
@@ -13,10 +13,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		info.warnings = undefined;
-		info.blurhash = undefined;
-		info.sensitive = undefined;
-		info.porn = undefined;
+		delete info.warnings;
+		delete info.blurhash;
+		delete info.sensitive;
+		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 0,
 			md5: "d41d8cd98f00b204e9800998ecf8427e",
@@ -35,10 +35,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		info.warnings = undefined;
-		info.blurhash = undefined;
-		info.sensitive = undefined;
-		info.porn = undefined;
+		delete info.warnings;
+		delete info.blurhash;
+		delete info.sensitive;
+		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 25360,
 			md5: "091b3f259662aa31e2ffef4519951168",
@@ -57,10 +57,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		info.warnings = undefined;
-		info.blurhash = undefined;
-		info.sensitive = undefined;
-		info.porn = undefined;
+		delete info.warnings;
+		delete info.blurhash;
+		delete info.sensitive;
+		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 1868,
 			md5: "08189c607bea3b952704676bb3c979e0",
@@ -79,10 +79,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		info.warnings = undefined;
-		info.blurhash = undefined;
-		info.sensitive = undefined;
-		info.porn = undefined;
+		delete info.warnings;
+		delete info.blurhash;
+		delete info.sensitive;
+		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 2248,
 			md5: "32c47a11555675d9267aee1a86571e7e",
@@ -101,10 +101,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		info.warnings = undefined;
-		info.blurhash = undefined;
-		info.sensitive = undefined;
-		info.porn = undefined;
+		delete info.warnings;
+		delete info.blurhash;
+		delete info.sensitive;
+		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 3772,
 			md5: "f73535c3e1e27508885b69b10cf6e991",
@@ -123,10 +123,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		info.warnings = undefined;
-		info.blurhash = undefined;
-		info.sensitive = undefined;
-		info.porn = undefined;
+		delete info.warnings;
+		delete info.blurhash;
+		delete info.sensitive;
+		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 505,
 			md5: "b6f52b4b021e7b92cdd04509c7267965",
@@ -146,10 +146,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		info.warnings = undefined;
-		info.blurhash = undefined;
-		info.sensitive = undefined;
-		info.porn = undefined;
+		delete info.warnings;
+		delete info.blurhash;
+		delete info.sensitive;
+		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 544,
 			md5: "4b7a346cde9ccbeb267e812567e33397",
@@ -168,10 +168,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		info.warnings = undefined;
-		info.blurhash = undefined;
-		info.sensitive = undefined;
-		info.porn = undefined;
+		delete info.warnings;
+		delete info.blurhash;
+		delete info.sensitive;
+		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 75933,
 			md5: "268c5dde99e17cf8fe09f1ab3f97df56",
@@ -190,10 +190,10 @@ describe("Get file info", () => {
 		const info = (await getFileInfo(path, {
 			skipSensitiveDetection: true,
 		})) as any;
-		info.warnings = undefined;
-		info.blurhash = undefined;
-		info.sensitive = undefined;
-		info.porn = undefined;
+		delete info.warnings;
+		delete info.blurhash;
+		delete info.sensitive;
+		delete info.porn;
 		assert.deepStrictEqual(info, {
 			size: 12624,
 			md5: "68d5b2d8d1d1acbbce99203e3ec3857e",
diff --git a/packages/backend/test/streaming.ts b/packages/backend/test/streaming.ts
index 05c972992d..3292c66e17 100644
--- a/packages/backend/test/streaming.ts
+++ b/packages/backend/test/streaming.ts
@@ -599,7 +599,7 @@ describe("Streaming", () => {
 						chitose,
 						"hashtag",
 						({ type, body }) => {
-							if (type === "note") {
+							if (type == "note") {
 								assert.deepStrictEqual(body.text, "#foo");
 								ws.close();
 								done();
@@ -625,7 +625,7 @@ describe("Streaming", () => {
 						chitose,
 						"hashtag",
 						({ type, body }) => {
-							if (type === "note") {
+							if (type == "note") {
 								if (body.text === "#foo") fooCount++;
 								if (body.text === "#bar") barCount++;
 								if (body.text === "#foo #bar") fooBarCount++;
@@ -668,7 +668,7 @@ describe("Streaming", () => {
 						chitose,
 						"hashtag",
 						({ type, body }) => {
-							if (type === "note") {
+							if (type == "note") {
 								if (body.text === "#foo") fooCount++;
 								if (body.text === "#bar") barCount++;
 								if (body.text === "#foo #bar") fooBarCount++;
@@ -718,7 +718,7 @@ describe("Streaming", () => {
 						chitose,
 						"hashtag",
 						({ type, body }) => {
-							if (type === "note") {
+							if (type == "note") {
 								if (body.text === "#foo") fooCount++;
 								if (body.text === "#bar") barCount++;
 								if (body.text === "#foo #bar") fooBarCount++;
diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts
index 28c1a7925f..f3f68b2609 100644
--- a/packages/backend/test/utils.ts
+++ b/packages/backend/test/utils.ts
@@ -53,7 +53,7 @@ export const api = async (endpoint: string, params: any, me?: any) => {
 			beforeError: [
 				(error) => {
 					const { response } = error;
-					if (response?.body) console.warn(response.body);
+					if (response && response.body) console.warn(response.body);
 					return error;
 				},
 			],
@@ -316,7 +316,7 @@ export function launchServer(
 	moreProcess: () => Promise<void> = async () => {},
 ) {
 	return (done: (err?: Error) => any) => {
-		const p = childProcess.spawn("node", [`${_dirname}/../index.js`], {
+		const p = childProcess.spawn("node", [_dirname + "/../index.js"], {
 			stdio: ["inherit", "inherit", "inherit", "ipc"],
 			env: { NODE_ENV: "test", PATH: process.env.PATH },
 		});
@@ -340,8 +340,8 @@ export async function initTestDb(justBorrow = false, initEntities?: any[]) {
 		username: config.db.user,
 		password: config.db.pass,
 		database: config.db.db,
-		synchronize: !justBorrow,
-		dropSchema: !justBorrow,
+		synchronize: true && !justBorrow,
+		dropSchema: true && !justBorrow,
 		entities: initEntities || entities,
 	});
 
@@ -359,7 +359,7 @@ export function startServer(
 			rej("timeout to start");
 		}, timeout);
 
-		const p = childProcess.spawn("node", [`${_dirname}/../built/index.js`], {
+		const p = childProcess.spawn("node", [_dirname + "/../built/index.js"], {
 			stdio: ["inherit", "inherit", "inherit", "ipc"],
 			env: { NODE_ENV: "test", PATH: process.env.PATH },
 		});
diff --git a/packages/client/src/components/mfm.ts b/packages/client/src/components/mfm.ts
index 1521438082..50a566d331 100644
--- a/packages/client/src/components/mfm.ts
+++ b/packages/client/src/components/mfm.ts
@@ -59,7 +59,7 @@ export default defineComponent({
 		};
 		// const validEase = (e: string | null | undefined) => {
 		// 	if (e == null) return null;
-		// 	return e.match(/(steps)?\(-?[0-9.]+,-?[0-9.]+,-?[0-9.]+,-?[0-9.]+\)/)
+		// 	return e.match(/(steps)?\(-?[0-9.]+,-?[0-9.]+,-?[0-9.]+,-?[0-9.]+\)/) 
 		// 		? (e.startsWith("steps") ? e : "cubic-bezier" + e)
 		// 		: null
 		// }
diff --git a/scripts/clean-all.js b/scripts/clean-all.js
index 5b7469040c..e347ee6a9f 100644
--- a/scripts/clean-all.js
+++ b/scripts/clean-all.js
@@ -1,39 +1,21 @@
-const fs = require("fs");
-const execa = require("execa");
+const fs = require('fs');
+const execa = require('execa');
 
 (async () => {
-	fs.rmSync(`${__dirname}/../packages/backend/built`, {
-		recursive: true,
-		force: true,
-	});
-	fs.rmSync(`${__dirname}/../packages/backend/node_modules`, {
-		recursive: true,
-		force: true,
-	});
+	fs.rmSync(__dirname + '/../packages/backend/built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../packages/backend/node_modules', { recursive: true, force: true });
 
-	fs.rmSync(`${__dirname}/../packages/client/built`, {
-		recursive: true,
-		force: true,
-	});
-	fs.rmSync(`${__dirname}/../packages/client/node_modules`, {
-		recursive: true,
-		force: true,
-	});
+	fs.rmSync(__dirname + '/../packages/client/built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../packages/client/node_modules', { recursive: true, force: true });
 
-	fs.rmSync(`${__dirname}/../packages/sw/built`, {
-		recursive: true,
-		force: true,
-	});
-	fs.rmSync(`${__dirname}/../packages/sw/node_modules`, {
-		recursive: true,
-		force: true,
-	});
+	fs.rmSync(__dirname + '/../packages/sw/built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../packages/sw/node_modules', { recursive: true, force: true });
 
-	fs.rmSync(`${__dirname}/../built`, { recursive: true, force: true });
-	fs.rmSync(`${__dirname}/../node_modules`, { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../node_modules', { recursive: true, force: true });
 
-	execa("pnpm", ["store", "prune"], {
-		cwd: `${__dirname}/../`,
-		stdio: "inherit",
+	execa('pnpm', ['store', 'prune'], {
+		cwd: __dirname + '/../',
+		stdio: 'inherit'
 	});
 })();
diff --git a/scripts/clean.js b/scripts/clean.js
index e052e3defa..70b9d882b5 100644
--- a/scripts/clean.js
+++ b/scripts/clean.js
@@ -1,17 +1,8 @@
-const fs = require("fs");
+const fs = require('fs');
 
 (async () => {
-	fs.rmSync(`${__dirname}/../packages/backend/built`, {
-		recursive: true,
-		force: true,
-	});
-	fs.rmSync(`${__dirname}/../packages/client/built`, {
-		recursive: true,
-		force: true,
-	});
-	fs.rmSync(`${__dirname}/../packages/sw/built`, {
-		recursive: true,
-		force: true,
-	});
-	fs.rmSync(`${__dirname}/../built`, { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../packages/backend/built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../packages/client/built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../packages/sw/built', { recursive: true, force: true });
+	fs.rmSync(__dirname + '/../built', { recursive: true, force: true });
 })();
diff --git a/scripts/dev.js b/scripts/dev.js
index 2a79e9b377..7a61070f5c 100644
--- a/scripts/dev.js
+++ b/scripts/dev.js
@@ -1,45 +1,45 @@
-const execa = require("execa");
+const execa = require('execa');
 
 (async () => {
-	await execa("pnpm", ["clean"], {
-		cwd: `${__dirname}/../`,
+	await execa('pnpm', ['clean'], {
+		cwd: __dirname + '/../',
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});
 
-	execa("pnpm", ["dlx", "gulp", "watch"], {
-		cwd: `${__dirname}/../`,
+	execa('pnpm', ['dlx', 'gulp', 'watch'], {
+		cwd: __dirname + '/../',
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});
 
-	execa("pnpm", ["--filter", "backend", "watch"], {
-		cwd: `${__dirname}/../`,
+	execa('pnpm', ['--filter', 'backend', 'watch'], {
+		cwd: __dirname + '/../',
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});
 
-	execa("pnpm", ["--filter", "client", "watch"], {
-		cwd: `${__dirname}/../`,
+	execa('pnpm', ['--filter', 'client', 'watch'], {
+		cwd: __dirname + '/../',
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});
 
-	execa("pnpm", ["--filter", "sw", "watch"], {
-		cwd: `${__dirname}/../`,
+	execa('pnpm', ['--filter', 'sw', 'watch'], {
+		cwd: __dirname + '/../',
 		stdout: process.stdout,
 		stderr: process.stderr,
 	});
 
 	const start = async () => {
 		try {
-			await execa("pnpm", ["start"], {
-				cwd: `${__dirname}/../`,
+			await execa('pnpm', ['start'], {
+				cwd: __dirname + '/../',
 				stdout: process.stdout,
 				stderr: process.stderr,
 			});
 		} catch (e) {
-			await new Promise((resolve) => setTimeout(resolve, 3000));
+			await new Promise(resolve => setTimeout(resolve, 3000));
 			start();
 		}
 	};

From cb8f1617c7e17e1eba013027d94f0dfdd5291a8b Mon Sep 17 00:00:00 2001
From: CaffeeLake <PascalCoffeeLake@gmail.com>
Date: Mon, 5 Jun 2023 21:44:28 +0900
Subject: [PATCH 312/319] Fix: #10955 TypeError: JSON5.parse is not a function
 (#10956)

* Fix: JSON5.parse is not a function

* update changelog

* update chglog

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
---
 packages/backend/src/server/api/endpoints/meta.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index c603cb9acf..14256eb7bf 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -1,4 +1,4 @@
-import * as JSON5 from "json5";
+import JSON5 from "json5";
 import { IsNull, MoreThan } from "typeorm";
 import config from "@/config/index.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";

From 3ca1f31c82a541456012a4a4b4078a94b22e22c0 Mon Sep 17 00:00:00 2001
From: Namekuji <nmkj@users.noreply.hosted.weblate.org>
Date: Tue, 6 Jun 2023 05:25:54 +0000
Subject: [PATCH 313/319] chore: Translated using Weblate (Japanese)

Currently translated at 100.0% (1753 of 1753 strings)

Translation: Calckey/locales
Translate-URL: https://hosted.weblate.org/projects/calckey/locales/ja/
---
 locales/ja-JP.yml | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index e95f73e2fe..b224f9b4f5 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -847,7 +847,7 @@ controlPanel: "コントロールパネル"
 manageAccounts: "アカウントを管理"
 makeReactionsPublic: "リアクション一覧を公開する"
 makeReactionsPublicDescription: "あなたがしたリアクション一覧を誰でも見れるようにします。"
-classic: "クラシック"
+classic: "中央寄せ"
 muteThread: "スレッドをミュート"
 unmuteThread: "スレッドのミュートを解除"
 ffVisibility: "つながりの公開範囲"
@@ -1012,7 +1012,7 @@ _ad:
 _forgotPassword:
   enterEmail: "アカウントに登録したメールアドレスを入力してください。そのアドレス宛てに、パスワードリセット用のリンクが送信されます。"
   ifNoEmail: "メールアドレスを登録していない場合は、管理者までお問い合わせください。"
-  contactAdmin: "このインスタンスではメールがサポートされていないため、パスワードリセットを行う場合は管理者までお問い合わせください。"
+  contactAdmin: "このインスタンスではメールアドレスの登録がサポートされていないため、パスワードリセットを行う場合は管理者までお問い合わせください。"
 _gallery:
   my: "自分の投稿"
   liked: "いいねした投稿"
@@ -1142,6 +1142,8 @@ _mfm:
   scale: 拡大・縮小
   scaleDescription: 大きさを指定した値に拡大・縮小します。
   foregroundDescription: 文字の色を変更します。
+  fade: フェード
+  fadeDescription: フェードインとフェードアウトする。
 _instanceTicker:
   none: "表示しない"
   remote: "リモートユーザーに表示"
@@ -1181,10 +1183,10 @@ _wordMute:
   hard: "ハード"
   mutedNotes: "ミュートされた投稿"
 _instanceMute:
-  instanceMuteDescription: "ミュートしたインスタンスのユーザーへの返信を含めて、設定したインスタンスの全ての投稿とブーストをミュートします。"
+  instanceMuteDescription: "ミュートしたサーバーのユーザーへの返信を含めて、設定したサーバーの全ての投稿とブーストをミュートします。"
   instanceMuteDescription2: "改行で区切って設定します"
-  title: "設定したインスタンスの投稿を隠します。"
-  heading: "ミュートするインスタンス"
+  title: "設定したサーバーの投稿を隠します。"
+  heading: "ミュートするサーバー"
 _theme:
   explore: "テーマを探す"
   install: "テーマのインストール"
@@ -1294,14 +1296,14 @@ _tutorial:
   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}タイムラインでは、接続している他のすべてのインスタンスからの投稿を見られます。"
+  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_2: "実は、あなたはただCalckeyに参加しただけではありません。ここは、何千もの相互接続されたサーバーが構成する Fediverse への入口です。"
   step6_3: "それぞれのサーバーでは必ずしもCalckeyが使われているわけではなく、異なる動作をするサーバーもあります。しかし、あなたは他のサーバーのアカウントもフォローしたり、返信・ブーストができます。一見難しそうですが大丈夫！すぐ慣れます。"
   step6_4: "これで完了です。お楽しみください！"
 _2fa:
@@ -1361,7 +1363,7 @@ _antennaSources:
   users: "指定した一人または複数のユーザーの投稿"
   userList: "指定したリストのユーザーの投稿"
   userGroup: "指定したグループのユーザーの投稿"
-  instances: "指定したインスタンスの全ユーザーの投稿"
+  instances: "指定したサーバーの全ユーザーの投稿"
 _weekday:
   sunday: "日曜日"
   monday: "月曜日"
@@ -1384,7 +1386,7 @@ _widgets:
   digitalClock: "デジタル時計"
   unixClock: "UNIX時計"
   federation: "連合"
-  instanceCloud: "インスタンスクラウド"
+  instanceCloud: "サーバークラウド"
   postForm: "投稿フォーム"
   slideshow: "スライドショー"
   button: "ボタン"
@@ -1823,6 +1825,9 @@ _notification:
     followBack: "フォローバック"
     reply: "返信"
     renote: "ブースト"
+  reacted: がリアクションしました
+  renoted: がブーストしました
+  voted: が投票しました
 _deck:
   alwaysShowMainColumn: "常にメインカラムを表示"
   columnAlign: "カラムの寄せ"
@@ -1871,3 +1876,4 @@ older: 古い投稿
 accessibility: アクセシビリティ
 jumpToPrevious: 前に戻る
 cw: 閲覧注意
+silencedWarning: スパムの可能性があるため、これらのユーザーが所属するサーバーは管理者によりサイレンスされています。

From f621e58efa46ed7bf783609c85de4fd7b810ec02 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 6 Jun 2023 12:11:15 -0700
Subject: [PATCH 314/319] fix: post editing meta

---
 packages/backend/src/remote/activitypub/models/note.ts  | 7 ++++++-
 packages/backend/src/server/api/endpoints/notes/edit.ts | 3 ++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index 3fff212433..c7a82a7203 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -52,7 +52,8 @@ import { UserProfiles } from "@/models/index.js";
 import { In } from "typeorm";
 import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js";
 import { truncate } from "@/misc/truncate.js";
-import { type Size, getEmojiSize } from "@/misc/emoji-meta.js";
+import { type Size, getEmojiSize } from "@/misc/emoji-meta.js";\
+import { fetchMeta } from "@/misc/fetch-meta.js";
 
 const logger = apLogger;
 
@@ -544,6 +545,10 @@ function notEmpty(partial: Partial<any>) {
 export async function updateNote(value: string | IObject, resolver?: Resolver) {
 	const uri = typeof value === "string" ? value : value.id;
 	if (!uri) throw new Error("Missing note uri");
+	const instanceMeta = await fetchMeta();
+	if (instanceMeta.experimentalFeatures?.postEdits === false) {
+		throw new Error("Post edits disabled.");
+	}
 
 	// Skip if URI points to this server
 	if (uri.startsWith(`${config.url}/`)) throw new Error("uri points local");
diff --git a/packages/backend/src/server/api/endpoints/notes/edit.ts b/packages/backend/src/server/api/endpoints/notes/edit.ts
index 66db6f644f..28cfff6020 100644
--- a/packages/backend/src/server/api/endpoints/notes/edit.ts
+++ b/packages/backend/src/server/api/endpoints/notes/edit.ts
@@ -244,8 +244,9 @@ export default define(meta, paramDef, async (ps, user) => {
 	if (user.movedToUri != null) throw new ApiError(meta.errors.accountLocked);
 
 	const instanceMeta = await fetchMeta();
-	if (instanceMeta.experimentalFeatures?.postImports === false)
+	if (instanceMeta.experimentalFeatures?.postEdits === false) {
 		throw new ApiError(meta.errors.editsDisabled);
+	}
 
 	if (!Users.isLocalUser(user)) {
 		throw new ApiError(meta.errors.notLocalUser);

From 349411ac76702dc5b74e806d3fd84559cca8ff1b Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 6 Jun 2023 12:16:49 -0700
Subject: [PATCH 315/319] typo

---
 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 c7a82a7203..73589125b4 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -52,7 +52,7 @@ import { UserProfiles } from "@/models/index.js";
 import { In } from "typeorm";
 import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js";
 import { truncate } from "@/misc/truncate.js";
-import { type Size, getEmojiSize } from "@/misc/emoji-meta.js";\
+import { type Size, getEmojiSize } from "@/misc/emoji-meta.js";
 import { fetchMeta } from "@/misc/fetch-meta.js";
 
 const logger = apLogger;

From 1e58e4ce699b664956f6c95b8f2179b819397c95 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 6 Jun 2023 12:29:45 -0700
Subject: [PATCH 316/319] fix: editing caption accuracy

---
 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 7169367548..5368214dd0 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -2032,7 +2032,7 @@ _experiments:
   title: "Experiments"
   enablePostEditing: "Enable post editing"
   postEditingCaption: "Shows the option for users to edit their existing posts via\
-    \ the post options menu."
+    \ the post options menu, and allows post edits from other instances to be recieved."
   enablePostImports: "Enable post imports"
   postImportsCaption: "Allows users to import their posts from past Calckey,\
     \ Misskey, Mastodon, Akkoma, and Pleroma accounts. It may cause slowdowns during\

From 047e9236600f4db98c8cd81255bd281d527fe7f1 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Tue, 6 Jun 2023 13:02:30 -0700
Subject: [PATCH 317/319] refactor: client assets

---
 packages/client/assets/fedi.jpg                 | Bin 51388 -> 0 bytes
 packages/client/assets/label-red.svg            | Bin 441 -> 130 bytes
 packages/client/assets/label.svg                | Bin 441 -> 130 bytes
 packages/client/assets/remove.png               | Bin 424 -> 0 bytes
 packages/client/assets/unread.svg               | Bin 536 -> 0 bytes
 .../client/src/components/MkChatPreview.vue     |   6 +-----
 .../pages/messaging/messaging-room.message.vue  |   2 +-
 7 files changed, 2 insertions(+), 6 deletions(-)
 delete mode 100644 packages/client/assets/fedi.jpg
 delete mode 100644 packages/client/assets/remove.png
 delete mode 100644 packages/client/assets/unread.svg

diff --git a/packages/client/assets/fedi.jpg b/packages/client/assets/fedi.jpg
deleted file mode 100644
index 9eecfd9630882ada30a2b34bcea2a8747a4d28db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 51388
zcmbSyWmHt*_wK*|Lyn}>5W>(Q3?V~<wB*pCQqna;my{sj&>=B&r*xxqhjb%Kw~`X-
zpWn^3?x%b2KI?osd!4nP_q=EAXFtz5{}%sk07%u8RFwc&SXcm+hXe3$1@Ig|2m;}Q
z@Cfno@reitiNG|ZU=k8A1Jz?P8dfGYC<_zI6Ly|wPuaPIxt_2H$O#I=C8VXL+4vPy
zpG&GdlaiMB&rPrhiHN`?U<fHGM1qrrQ{w+Q{&fM!@Ug%+03a3%0GkX8NQU*V55NQf
zVBtPg`=5gUM_^$Cad7cK_ymMR4+)K=0BkHE5E}=Gi;IKvkRAAN9e_iIOa4Sq4v#{|
z0>px(goPyJ;j_xuc2gmyenN#TQK1BckEv;B>DbsgIJvlmMMR&8!Ns2|C@LwdsH*Ae
z=^Gdt8Jk#Hzp=5kvv+X!@bvQb@%0OP7as9GGAcSTDLEzeV_JGfenDYTaY<=ed0l-&
zV^ecWYg<omU;n`1(D2Cg%<SC!!s62M_aB>E+dI2^`v<?y&Mz*nu7BU${s$M<1J3^$
z{~g%>fs5<`7d8$K5C`-hTv*uN4=0ce2lt5}9=V(j$O1{h0t>;XluyX3?IvIqLj0t%
zL`@Msh6;aY`}H4a{|(vy9k9^<FJ%7<*#E}03?K$#Jv=-h89)Yb?x{&|aa~fWfZmKV
ziDyX$ad`RC9KRU3fVyWKsf=uUnOT#{QBHIBlB{Gco^VKBN?*)JX7w9xgK&b8s=4Y_
z--_6=q_cM_b7LT<a?Aj<b;wNEABU$;zsMQGhPps-v3^z|iebJ1n1e^$gspzm2U4|n
z$E&+5w52cAM8V>=RT|NBe!npOGw&){1d)xA9NV-**N5w2*KVc>D~+(Ms8;rc7~omq
z{fHJ4gZ#adx^uR3CdW25DHIH_g^MxZDu>!}%XLF$G>Xh|&0`BoJ#ok@HR%td9f1j5
zw7X$ydePuV^Y7U4i&pt%SCNTsoT)PWO7bHsny?b)KO_L%OqZ$H&izG0n(yvswluVp
zpZutrTAYAk7{-X?Gat&r?GMkOm-#)dt=~JP7xZUSiGEZ7QPaTY(d$XAt_7XV*Wf)m
zh^lltb6ZNh?RChz0AfLHiMwB~-ZqotE`zD7K@I`Uh=v~dtr~#)IHYn)gU(CT@dwfV
zR@;}RdJ9_TiFT?;1^}?iax4^XY}ibDS>no(jRoIANdLkoF2UK>T>soLpNQO2<x}Zg
zBBf8m?hYIme|FYO^#<f3FpAlonNDD`d8_Z-%k<3E&khFz)<pJOS;X3sG~j51EY?%G
za8SINz!c_iixe3XJMd9yZtWhWyT+D30&8Uv8;kjw_9GMVGB}W-3`jNuxkXP~?+S;0
zM~KCZ#97w7^|t;Qh+k;0Dw`?WJ%L=k{F^+LVJ<cZ^*2sPekR`=W=Ik`Owv-Hwz{g(
z(m|HDnznzr$q`+7Hq6a3%qoC(R)k`RcjNkIbfU$W6E4JrjjBkaXnnE4CAk&U%K^8}
zhs$Qcb;UqV_%ibAETWBeDNiYeV5H0`Ub><5le?Hfyo=T7&?4|a!ypw}D^<6+T8Q#>
zuZy1`*B<Hxgrvxro$EKHT7_WT2Zd_~J0tli0h*>_`_swRZzYj0s>4Y2#@LdDYIs?(
zUSM@G;EIY}x2T8nB2&eHhX|4pTCzn}E4N7y(?nM2mW4YapMB#scgyj7NcbN7vWUa2
zT!o*$MtZ;dkNrDaAbhY<0^+$l9V#)GC<c|5vwCvw4WMwvF+b0+64j)ZP+kL-QYKsN
z%K{D&A;Ba{__Q>j^~x@aarq6()Ar~Vo?0PgjoIppJKyliQ(8A5?g`Ixg*j&@*YLS%
zyky7`!mIWgUfzZ=AmbMv4HNg}HcROSby`~Qv@zsEmzIBzzHVG#Be;59FTQCNcGtvk
z8zlbYr5c9Jpnof&o)tG$=pGD{d8F2mVfiYQceSzwbaW08{0H#3u5?i4BUIawBM2Yx
z_MTL0ECwuRwb0TgAa7>anljcAbpumvmxd<oxu)rj?IPX7>Hhu;l1;7l4*G3uuGKJ~
zb0hQXora)#*DB$y&*V}a)P!Enu3y4t{s9*BJ?%{ROb&Ve0r)Z>Ug0OPe~+p<Sd9JO
znbk0btGUWw%uy|>eE&e!y+slBkY2`jT$J-pUiM%u++HN53G?NbVEl_`b}TN2e>PY4
z^>^ESXL&8GqWoBpFG&}^3#MkGSBOEb<YJr9fP#Am_=}T2J17Y<v~C!P6UxN$(+dC=
zx<6R9H$>Q1l?LapG1*)CF%@|z8Vw)VV*4Q&g|ZuYtrZ63SWaU?^m*dH<uGL_p!$+l
z=ZarYZfnwC6enl`u9%9%`hLg=RBK~w*Rz7nsT^qDT2o*rV5}1suS;<a+UGc8S&3l`
zt+W?IWmzgSF<WB&<4bgOgIAs@hea{pv$3wNEkb=RDo>kwHk5aiM7KhHCYzAP2$H@N
zepN||eGLm}R7-A;1&W$xLK7^*G}3V$^HITzSJ*FOUlPHTDC@A+K9Ftx(RcM7{{S$1
z>8jcqo1V29X<}g59^@@i4PwqNS#B;uqq9o#V$>znehE)`GirjW9PPFDt;cS|dwF%r
zdP>&guLfzZcj|QJ(!G;vvb`>W%UQwN$NSlr%gYXfY#-<_^DqsjMRI+#5|98N+Wa=F
z{4-(j-~xkhVZ>9BpOcO9NiCtW_nrR$S^P??Ryk(VVUQ>>UbSkF1tPccalLO9b50ze
z9!bf9u(8%QExqN?9r$Y(hUrzOvPm5Isu}h($=J14==@5$C+k{lGABFcz|s<3_)MP0
zBlq#z0Lte_r91!tpKKKTmGk!E$Lg(K)0Cpf2ye9ki`%qSi0WQM^e4*bP$eb&zHm!1
zsORo4rYz=3ht*#YgH-;e4A0*kO#>)5uj~##gGXXO5mIkMVTXQnkMqQ~JC~F{)}Nr;
zIqY3fSii(Br<T~Hup+&*Tcy5|riA_x%i6ogu#b0dW}Zhb7SFAv9?8(f7!|sRTFYRS
zlXlGJk}(n?v#Di1?Q5^+n`3cm!tg+^lC#=$Q)pKlxGep#GT;E)PK~VLmNa32hH8ij
znY}%GI^TYKlraq!fooQ0R~4_uNK>|Ki&i7ZPL4hlA}X;dbzmK`O+M}#9?OUt!vabM
zYE4(frj?M@YzVku4dwT(zCHex!hzXJ`gVV=vThwrT0kgx7PqU>txW*Re&1*|V-vf)
z&7Mh5x%CNdv5%f!GE>xb+Q_d<VM7t<YQsqX0R*<PgAMI}Fp=74WTCZ}O^LkmVT)bT
ztB?ie5xMQR@93gY$thcvW{H}^tCnRe?H~rM;|v3BFcywqw6@#ZQ^w?yeG^h<0OKP{
zM!bh6EKW66-ttQ87v#}E7R&b4eE|q3HpfIA?>SD=myeWAC;ptn6@K<-)xA_}!6>0_
zMvNYf9ft)ZeOYDw9eQr>@oI++-(TC*fblh<V?=j7d}Y@)K?VBLK03shA^45t@!G;Y
z*BP<k?F@9_?W^CrG=q)o(dv%e;l!WLgUAyu_kRb8Hx@Zk`w1WORd<aQslHk3rqW|L
zqTI}emoyM&TYelZ>(bw1dSx%%mYh~M$v5&QxW_hslUDl6Ym?v#AzVNz2MsVI{T~1|
zNoh#GDFzLeb#k9M)W&;KR~QP%@yY|PYDd=ProYq<Hf2B_>!h&m05<0nqJ(pgooaBv
zUYK*)zHS`7sRydU5ohwj`;Mg~3Y7e2y#wMrIp%YCQAQI-KR{VW1%?&Ib%-NxXMYY2
zTM6O>Zf~GxdHZs=Fv#Hwfv(e%F-jN9(cq5R+Wc~rBb|VrTx;TNYAO3`!}=HGrjj9>
zVNV3V269yqJ)w^e4s>Au9t&c;I0{D=08>E;gAUrNl79pD^-+E<gAQ$N{(rJ;U`p#Y
znnI~Gm&LgL$R_9Rk*AUywp5FD*<4A=^%+CPWxQeOq}c99pd$DAHv5#i!CQmE$E<I6
zocoB~jkQwtM&e*|RQw#i)x=+ISTxm+0dakV(a)i2<n4l!ek-P&v0eR2O77X1>k{cq
zV!OJr5i3h2AW0Wu*OaoX9?XMMAxqRMDKbe?Z+1Ibcx%e*-!ugGI>EIweqrzIMU3?Q
z4dM5lbcp>ipvtbC#VD4Oc=z^LS*F7&x6(r0wy{Nm;Q3M#`fe7bd5S&AF8YM`3+FJ$
zx2jj*)K9y<_HMZe5fjU~uiae%*kIX<s)QsiA;^r|7(q9)r-*aDV-x_!@?De291Jg2
zN1pbi4wn4`$e7frKx`9zi*)|RJ-K<r95A@U;HN(tZuE<e6)X7dTNS8#T$O<x_Q0o3
zRZFF*Ipm?NSt&}>2NK9-lnRM;uxGJrO9VbDR#dK!C2?bT4i-emi^o-Q4>L#QgL|Ga
z*M)VnmYfS$mQ&m7w!<fa)M|0KwNG?0ZgRPVnes^~Lo5kj%em{UB*Rvtr$lQTLe$&!
zVvWi+Hj51G9+jxQC$C0GB-9b;#?J9ICL1=FVXqeA_oj15=s~Rib`YvkCe19TU-`OK
z>V-QU+iXBQw`Lc;nLQS_u)z{D$c%*e*p@BZuncu`tbPf67eUQIcTHe6*BB7bQuFAi
zl!F>u>W>!}%}quY&&gA8DY;zSQ>DgrSCWD|rkmW=h*<G(9yYsvq0Qn<D**yu3cpZ<
zH+H(|+HzuW#|AzwXjFg)fcSfs*RmSY(uy&*6at(%BzKG8b!J)ZzIz}w0f9&RvT0%2
z+;VinP6M(KQtZvrT@LBhw;s`098j=OoC*H$1Xu7j9yYr{OtdsW41V2xz)fwbDtSEI
zFNV=`P8x=nC8&nhg_~;&S_EtTJf989zQBrD3ma5Njx$pgf%9l)N*dFR$bYB=)a3H)
zVt!$)B*B-DxhM;``<r<hVq(HgY2c@WGDXI8rdeE<kE8)*%yA>IM*>^6PXf7XdYi>?
zvW<4*{9N#4c>{m%Yfm}!il&;E!?Xb4i?ceD5m=G6+4f6u#w-$X$W6Ikyc`YlM)c}@
zL;DMV`WFqe;oEZ~)agQr?>Wj&9Q{1Z^0(SZmnLy19a0G%Q}cc;%q=sMc7q9KKhl|x
zK<B}`SRpn^TW2jKUnDWVq9^8YNP-0@Em}cvmP`zGk&^rDB_-!7@=$GQ^*J%*e1OZy
zn~}*~NCoIZbJ2ZS?A%X+zAuppmy#1>ya>iNpDmUu0VaaQw%&St6*M?<`P=VF)uRlF
zp|`aTLp9GD)JD5%TeG^Mwqt+z!b<>oL%b@q-8u_1RT|tcJfY2u25aMqWN&qH)X*RC
zS*^~>pilE;{+74O6+#CvwZmH(x?hQPd&mXw+_gfN?YE77$e*m@0;`mIYss-NO+Nc^
zuV$-tq6T~~r4D?ZcA~}B@;!|4^qQ5ryZhybHqqo17v-y_WJjP*F(qV3Y@of0wkaS-
z%K<K_V@`t|DxUL->*Z2gEwh`@qV83=jF@l*g^G&e)9_U<^oEXGjgo4tR&H^yhBOSv
z^|y9OF^R)^WWscNi-IM-TzJ<$LfM^Hpus+vCRB4>jzPd*SHI3^I|RrI6c(AS3?YIL
zUyGnKou(MTDHU=7Ju`;&cY5k#3CgDwd;Vxc&s-nI0iIIVDz<Ygk`|YP#-85}GkR%%
z3XX%U8nilvV?uuWEfm?k<(rY7VhHaXHIw#Ar~e(-h|>B|x40G{ZR66o5d-JQxV_Sa
zy!jB{kz^)XR?XJd*c9h@CFZNkFXQtMp!+JR%BMslTh+;?-O(6}o9$Kb-9qN?h*ACK
zc!{;Z^7-e<SztrPzbSfi+csP>Uc2Ho<J_tO25;0|UDYqfxy=b1QEUzAxzs!YG&cos
z-QP3h&pw`P$Cdb<qD@w}lVr<_RId)B8Ma9&!Ct#!Yk#;`9fgdBG7TM2K3neV<qe4N
z)n13&?1*N=+H`GVj8&5E@wuFrH9}LAv-=)bt)8u|MM2q~0;layFJ{~K@btu??eU`r
zVs$$$EAb>jTlqbR7U%r3D0|+~F$}lQnKIgKWD_UQzM8P<5stQTVc<kx(ri*jMWjpa
zsCiPKm)gy8qSDO+eXFui>Hg^k0zka0q~6G@l-BtsgnE6(2c4G}Xteu3>xktL9a$kx
z+mue(+~j_0Z*wKFr^xxb_2vAtcwe$1pgAW8lH-fqp*r(mic_3+puL{JD6`B{XvlN{
zN_A`Ny4t#pJ`pd(xfgrgC#X%2a^)|)6s9^ZhRZYD%~bUQO7m`<l#dkE9=V^LegwuU
zpTerL{5nae45>EaT(y2#AT{_Z`?3@C-V@FXO?PH{gJWL4#e_WI$(pXl)U6B+v3y`t
z%N_m)kiOg#4~pGs_-Z|qR~M6X66_0QY#sEwbeqPM@$pZJH&_-==u56}L4(ym8KNqA
zHTXkf9EZ^rSzBOSyXEDkPo+1aBN3`C`YEBu(yc#o+v^`E`r=+|RvIV*%t?K^Cq?$;
zhgZr*z9DFSmiypjzi+9CS20f|`rx0HRBieMSreNkb<o&G@WyDA+lAT1D){qGB@|0{
zjB}gps^i1ZZZ6|J-CUvd;zvyg?<s6tD0RKam-a;KZR5+43K(zu+}m9o&(mYIP4{d(
z4TZ(s=zu0VZ#sYLU6#U#U&pDkwFOa>B@?ZKEf>Pyc%6yM`^Z97PM?>DYtxt~C8-`E
zo_IkYcs1t+SPI2u8WQsLvdnpkE!{xbXf6^r@_XQcW%bCzG=^L(s#)>5NhUqqCawms
zVlFst^cBB7N~;|Y4@yZfJte-rgy<k4ZezocP<@0faw=TFnOp#&w!1yF6^$}@0-&`(
zL}9^`o(@P!m?L<D+RlldnmJF(ye{HC>t(jg<Ii`J9rW^pSjBR3#eVtQhAQpe*VKts
zHfbkwQ)D>s|5DG}?o1rRNSzKK!MM*fx$BhwQtLZfNkU&7s~a-lII;|xywRwLr-!>*
zXoVLTZ`wu`D!S-;!K8%r2Tc-b)lmfzZ@9ZoUKQ-C^;li`F33wAgsfCF6XoctTYE|v
zSpg-pKmRCfjW<)X*0&fisvYKN<v3KS_zWvWn+5cpYyv+~eyw(p%M+PMVEfq;uJF2R
z{Ji<AK8@sHRQ~SKLH9OyW^`=&9|u@9EU$aho8&mdUKM+{*6e3*F;drdF8q$<&C4yN
z7XVGL1Of|VZcADItOkg_&F1dUYJWMBI(2O5HL&AED2iPX_yZYN#0m6TZCY;~bm%NK
z(y)*)(O{`p_=Yrf+bv^?FBjw8s9kBf9HeYEe9rr_s9asK@DtR`ylvy|mw|Jvweicj
z4`m~tZ~`4L@i(fiX=Lp{Vi@vx_N_i!IuHC7qPHTa5*h#!gBRl)$B&2}8vwS@TX%1%
zSeq6`66rZg9Kz4yLfxCc{*u#qBIBbMjy<+*jZ67wdy{pM(H@Pxi^3$FoyVQ`i&IdK
zSr7O8e4yI1kEN;u77^6?+UdRA!J2`A4qPlelR5`nRR~3v{69OZnxdQA{hGZzH3dlv
z866g;kzc%sU;cc%e>|U&il8MNQ7}g6CG;|OS<M#>6-Fz}ekHDz++<9aR7cAp@I`D`
zb{6H!1?b_+LO0VbM^Gd>R2II8_o<)0zsO8LH|s!d(A6ZC9$q9t$gp%#<uSAK;d!fp
z0r5-ZMddbB&vMLhTxnA~nlfFNw0dr_<wtoWP3UhZKMdJb(K9utm)1o)_^M&b78<Jz
zc;we;-M})j#Y0|Ro~JxSY%Di)Re`R}#TJldwngqr?ayDW(2ET=zJ6RLiamJluh+_w
zY|7Hy{edm?e1^eci`F81Pa->o*Pv<sS87(2n?QL<+(6mOu}uI;SzIz0*S7uZ^lE#m
zb*h+PQfE8HjT>Nc2^|~xY_f&7DS1IfuHocy!>A>o(SkF$HW+X>D`>_;@GQdCdbveP
z=5{fEo@kXN%XtU93x$LOg2Y$mF5BDJ*r_tcpuiB8*!PED=K-}Hc4Ivpi<MX|y&^V$
zPZ6X<kKoyBn))hT_od0Y_Q^%i^mMn6WUfnJT)w_0LIY=Hiu5BZWF~x=s!Y<%RG$dF
z2$jY4vj$`I*eMzy(MvS7bfRR~+M80yK@oDLrFF^_#D5mfC&fa)+bC)`DO5RVK3=Xh
z<d2m7sse&SqT@YQ+Ac6yhA_BnU|JJT<#z5LpuRb?(ds7cXMs$LB2-NJ&z`!I2!pgy
z(dwR8(sk$FjBvx3_7|33)aH^CBT|Pb4FlXTR(_hm0XXQKDoeD4H6XHfkopY}yCcV8
zdGRtZS_?IiS7@}~EUiBFQG(#lS?x_{+cXh9$kMW*!yHfT6SKcZd5%M$LM8r^lgs2q
zh2N{fk&O;?AtRn!!95S{g#Al;B~m}4He&n*4Si7YhN?`g92JYb*PX&7g}l&+C~c5r
zESJq3zjZ>gq^aCZmha&2Is58)WoetUEZ|jTirR-V%@k2(WZnv`sK_c1NN7dNcj9|!
zd>awICHp2qOH@S63QZ;bqcJaZaWsJ$)#p`Zx&n7PdXvghsFI7VBnLV))a<~_8fU2q
zqUj~~gj0{!jhBtpvLzTv<hvh>FxSQ>wW|FDIWbK%y<(+w=L(020qTLtyQP0$$GmyL
zBuRMTt0lelJYm3IQ$_Nv@J0)c-&9y^aw}*|$Xsj}b5Wck#qC@atHGV`8w`KqJ`9x9
zFHJxJKF>kRNL|;21iH3ALN+t%1sQ!(If=R5hH{f;K5Mn)Z+~w|7B={S)x}+@vL_Wp
z@p~FctNvJ4K2d0aG8*ef3n+>4C`lF;hb1zoaDWmH6+<^ggZsFKCP6ggTvSlGW()8$
zV!dm@&XmdIeWr9G^NkbYpoH?Kk7Tm3_U*pAMMhrsTlO^7C!d37t^EzWI4v|cPMAiL
zAm<1V90Z&gMap?WTWXj0`8Cc75GZ+FXuyN9N(k#$IjS7Abkao=?^2E-Y6#E}LLcHj
zE^~oLy3q+61g?~yot$2?TIQr94|SYzY^N*qu#!TB7OL23hs8Krg^xCNONzN*$Yu_}
zFV*0%JQ^kwbwtPtgM;2{eg)3w*)0RU7yUfMQHGsHh+pNYW@R}1-v__zl)agdh)&6W
z<I0Ok5o3nLbww8jn}eXSvzG>Iq4<MNh{!X|ugVPjR&tmcu?lVfsCtvZS1q+O{7z3)
z?kmu)tGP*Ghs*VA9bI2Iv6MgzK?5099@@q#BtuZoJlU!u4rtQjzIWeSu#k(8nGZFD
zD<ROgEWrg{-#QakqCFz_W2TaiXCSd8%FH)u3ow4*H7#V;NlBC2hZ&Z5RB0K9r=&kI
zh0(jM^z&OwD3<($heurS&>Xdr4TT2Ti+S#f?J(w?>jZ#ZDZr%gpdv!F=>+~G^_kI{
zSt<@B^gWJVqq#a-!s4SFAQmM)Q<ct&5yEhSegoZO#e}<4&4q%sbhXS`1D;I)n8~`N
ze-!4v()k=(*w~!7^P2maB9!91MW<_0w;v{8Y($)NtaVoKAw4ta<mv0bjiyWF%?vo+
z)IyZ##4&+EF`8@X6pu^>e#9HSjur+oQ$dc+_4=KTM1`|i{LQ}y{{Yzz?WD3@@Y6|?
z;fmC(56x{=>$!5-W~JY)UQsF6RQzS+!z;5wu|03w;FA3&us<OMuT-R^9lAAW%5gEz
z9ynwre-YOq6tC=3P+Bt7syJRcZuxz8o<H_z$7XO>F{078qyh>9QsiVmqcteCjeb$3
zw4ofcveqg#K_Kau5r$*K{xI#?q9NDiItDeOr|#C73@=EWdPcn90!epG(go9b0%mL@
z{gSSo;tXBHfk-{pNCDnQYi0?*e^hsus<V));nZYDu6<5HYD$o=P5c8W&Id^0B}jTN
zW_!wYUWHxIc8$B;j{07++bxdMiWwNt0A~QideinH&Nx$=?Kbi~Qe7?Gd&;v00fxFJ
z$}CDN0dvb64|>_HM^$b?g~D)Wx=sj#9Fqx(N6485Vw)7pWfVaxNp{??-`d&OtnM43
zDs-)fjQjKtU=pP!Xy}wy!bfJsd{JJ1K-!%`()kD1X6@D3$#8r{cC`ELoQ=8BF%EbM
z-jCGl|E9v=)@!;c%I{j(K4Y=kSE%lmm7M)$NZ;s^AaVUgKt#+CRA5p|Eq36|P1V+2
zqK9-uCa)3~A=%7jwfK~-n(OOx(eV6L*-4h0P*K6c4sot7R`}qI$dg8YcSt>HxqK5<
z#E(Zv?RUJ$SO<eh7%{N@OEFK@o~b>V2D#E`oqiJPMC|zZvUqd*L1dXVd9(HP1(Fgx
zr2tCXa4T3(U0z(R;6<M02&t$Jh|&D9FXPDfrtmYXFEJUYwvJg=Tzp2}((BE5*_7C8
zSNbz0tuEk@#jSA5>L1{fafJsTrE#db@v6S+z>$>*67K>}<Tx9C@A$3ztUTajyJ@zD
zy}Q~L_m&{@Mvk9ft$V~M)2oZ?SkCXbQLtKE`FN#u_nhZCT+BP|(}LEcOq0L$qE)UL
zvtmR|qc}3h5}M&aj8zF0i+Nb~7qtc}76K5wpRYq_==Hd<+B-{P$DB-v?aF)>cfxW$
zo`S*RSYE_T*uruWH?N(du`I2t`qS5%Qe1UeLtuS3WDPK<N)?hQ$D&GEWUbq+J94*E
z@CJH5Up(-UW#W6-N(q(y(VOOIIER6p_(|jytJvh8L(?>#o9~{3(aPPDxdc#`fo5^7
zB=*4vBeDNb`iVD{C>=+B=}{s%^NU1Zoay}xr)Bgfs+JEZR#9v7R+?)myCehl9WTN4
zVlqMWP#@=UcGX3p=c3vrOE@hnFKE69X8eS#=^LL>z!%X?OpXip;*87VuGhjrd)p&;
z*Zm0HFoS|N4`?1M97{YTA-dC#w)X0buj9!W>FCEHev}eO-8OG>Uq|3wW%vh|uBDIx
z|J}>NWq)um#gNSIz6PtXks&L<dIuw*+_EoUIyvShxIpzZeqANr%HFvk0rN-vx;Uh^
zsv*zvZQwT#FxS!7%r|nh#?Q&kno!ayd;^)Dj;@sF@<U13Rve$X0k7==KiBLG{PB9V
zH*TlB3xPYpA`^+JujLBGLN#Y#t+L_W!|BYg3T`w%609>=p}x%3$ee)$6ahDKJ;4Ww
zF~5z@77pPj><Is{yCWAGB%TTsYPsKN26YOAv@^Ttvt~6)+PBQGMHa-XxVoXZ1leUr
zF)72er--FLX9D7k_5-jfi4A1zhTg4{yl)dMAt9#Amg<pZv!Zd_5Cu`NDh^h*KZX7%
zu97ZYqKZT;N~XxO?zgnhMPEls@CWF&UaHdtO*QK8@(cJnoNrk=mjG*A!Isu82L6U&
z<XU${W$5d2WEYx;%TmtC%KNh45b+C(1>-XGz4bz7BBoWO$hVL$H4}F%v7+O?R2gJ<
z+Tu4Sni|fh-mz1uN>#VgH#Pa$U@|QeS)UC*)$iKf0qx6zWYkh&W+P-*g8E4jfQ@GX
zR%aDnChz8l5{But2%Egb{sGv_A0>n3CMCTp9)Eup;R29y*WnQsYl?YR`*$IE(ypuC
zI?d>q=Sa$7Agid&g`#?%A+o!w)U}~iII^I***Xgj3%R}1ySjeC9p0kRTOT&=Hd2__
z82elI!)zID$;V08BKtJink27BtYSNrnRuQsS?|6<W?-UpqYIzZL=L;&Sx;+`!O_09
zDg=}I^Cr&}Krz8d)_WDiE#bbC`u+CTe)PA$!!~TII6C(l+N!*db1Q-FA=fLn2EQr-
z(Qh;dVEg%O=lnS%nxpqhnQRO9_06yOBobz46F+7RySMDZrAo8cY1D4qdDFGEaLjKF
zM#pwtYah>X8?PqKS7_j;hYq$gz#MD`ra>lhbk&d2G3XpuhsHem^lQ;LXNkTop{Md_
z{K<t*aT2NZ$1Q+&=$OIPJN+dAW%UO)U`+2?I{7B^xsGb4$+M3v?^?XhU_!0PKMw2d
z&Neie)Wd^(&3tAXt(Hq`(H__2=_plVo(#Rh-EsF~5kyS1uJKXIYx@Am_XwfOom6Lj
zBfh_1#|h+>iI}0*wnfIiV+G{4-c@Fy>(h>`<bB5;<7X{0{L(2?6F(XSks5mzO3{l5
zmECF~wULm|>UTLND|8@Gz+#YW>rSLF0-qX8=><%5c*T<S$xV-=5uNhq2kF7sy?N5g
zbQ5ofczyn;s3pMT<lA=>H`8Sk+%rquyL!(uGa<~#is5>T!)EH#*MpLGheG4(XY6lL
zg|W)+&(*F8i2|h?zp9ojt@T*(Qn#4nDO$a>uU~A-wSWfdH*JbwtkXNbbKa6x%ib+r
zQt_V4Ph{&U2`>ZjoVGTTRytXf0QUIbm5_(p@I<+mT%sI@#xn3;_TvGQXHFjb=-ELl
zaRSzjO%C|x0+k6dzk57#Fo3RMoXc)Btc4$j2b0qJG@q}-4fEo7F>InTrNbgv-CbiP
z_8{4=7)Mq1cb=WdyJ-bk8KoxlQKdDHqj6c<=oy~4<m+n-_-=Vsi(hG|c50?c3`|<F
z8aFh=jtY((K_&75#Qr<2QGCX6fDPiLSj>WBpd(*jt(;9le%`X=_FZ50oUXyo@wqmF
zbwNt!Rm?;0S$OrCuB0I*dpFbMBTw7nwyU#MQ|p@u&lY_E2pBeK?$Fky^(v)|SB`+t
zn_@2VP)C)H9b3>TBvDDgKl(@qPR}!GCDNb@jcT+8lnrgsRg9oY5(ONUwqF@dBcjXk
zx*Kk-?j1@#jz44U>5MdxyetwV?e?=>h_1b+O~!?9vgV8wc*1w9I2f>RQ!<OEHF1?w
z2@N@Lw&F~(78n#+$rty7C5R1_!bpR`%1)0Ql$kF#W9Rq@A!HL0aSm2brQA<dtc@l)
zs?=Q|UGc}VrK%viN$KJwi+xPAoBD1vMN^mJc1mQsl3Fw28i1Ad_SgLZOQUtQ5)7#l
z)!OtE#8E9_;FMpZyV59Ov(0OUT)Y%{qRt;^|EV?BC^1k&WdKWQCe8s>wz*!!lh(B?
z#}K%`sDMN4u@fKbw^I#MN~r5>uNaPq`e2T`+XSD4-02~>_|7?B7P#nnvP4AJ0;pJP
zZ23z`nZCaY4Gov&fS_aT^^NN&DMB)EKsNnd67S8jxvg9U!d>WKtX|yowXCIo6qUS4
z+x5zT+3rc22VfYe$VAqIk!e=gl+#6~;V9!oNnHtO{<PCteH1#*Ym5&zWH6l0m0Q@?
zBno?}>7rAMZ5907I=f)HC^#R^A0C1bpl4_))Sq-{B{uj6uu0fTDagV<OEEn4OLQOL
zhU22jJxl6cEKPY;x3U||r;i`}gu-xSdJl$NXcl}aQ18`vr((VG#f2zlO$g(s%TJu`
z?ppu`;|~aG$Ww-~Y-{>&Hsi$)DhiYFMi^x%v0ht?Vq;<pAZTmLJf)~=$zcjI5N^tY
zX)UM9(=bgkd7LQzs3(6Jg$$K)q^-+`Lzg&x&I%!)q_|z{1>z=>2<Sb!CxXD8<pBAM
zt=kOwu{BkZ$K2bc)@x}$mc!fXNo7pR2Qe9b<OR&}%0;|AqGW0BGSe7V-UnP=Zc=Gk
z<0$MTi4C#-%KbH6^6lzfZwY6Ju4S<J_2ua}GrcQE68GqKWr&J|*&D6evZF%wzvMEz
zxn1`TpqNcP;uhj(V86?f<@k?eVy>A!n^cBh<<}yp-Cbx{l!or@+m}|{MSlPe{9@Az
z({^lSj_Hih4%OD^CMC*<fk&Ud_!Y7~SD68qz@uzpSty(K>471K+HH}m)$U>FS^O>U
z((PIEcT|>@U64m6a}$Cwi-{;N#YT&B8`(6Rt$zUSh-;%@{(1Tpi20ceU0=&ATMjeB
zhdpjkN}<YJZR7wo0K9d6IN#!6`6YotySKu>@0xl>tIN4;k4t*S#p55~N!2h$T4AM)
zU)<_&Jrg3R7X3Id@xDI{%?}vrKG9;Oxw!lxj2>Fie<A8`NLhFw<t@R|nRxA?9*6ea
z$xcvZ$0iw+!nHHqCsq;4%DuvC<oj-vT&eOPr1}}^O9~fNHo!Sv2`-Lk@b*$?d8k#x
z0H-?ac?=UQZ9_yoGPxCWm)}^H2v!zoCqPA(`m@O58_R|ROH4_HI1eA}#ppXl9u|0)
zrxZ`gFHku1l(R+R^u}5`HA!>+A7sYHMMH*TV=SD(u)_RD<3yRim7jrXCef6Zq#=V7
zADqoFL+3?)y}E7{=e}c|m7`yzReYLWuv%>wYw3@S>7KeF<{shT_(<?qEsG@MYif#h
z)y@)MB8HCIdmdTiL8LvI(lCH{6LL+ZS2kd%XV|%8dHAgGz1{Tw&voD1{Q3v)J0E>&
z@s-g}Z`Z)MC}^!*E@^u}CYWOJA0WnBi&Sao<%gtjzC`H;etj&Q1%_wb`hn#xn|=cW
zca3GWH~N34zDU%c9S@dNJ5--2o6Yg~=RDnVI+iJVxw>xSGqf4cvtRSObUtQ&S0X&>
zytU5lZA#EF;S4nO>z^Elkh3Nfa(H*Xw5!zUrg}&~<q1l4kl~MmYdVuT)N0l$<EYJs
zT(MJretBJ%x$QheTT{CX)WT9KMuR1{`Kid*r`qO`+bA@cDSc8hM^}fpu8S=Ox?IN(
zu{tH*z18u50@X(m>`yuwWGAp^g7awSSnQp<wzcC;*Xw<rhN>|33X_j488B}`7-utf
zG^lIYORnHgi$v9iU0aeFR2a%T+dE)|2}45%C>l>)HG0ReSY^rCq!E|uS2hYt?iiME
zoeN+QzbQ*K@c422R7wFqp%^P|H;8GZ#D3j5LfQ6-C^5zyE96GMigEnpgg&sc8QF(E
zio8P(n*G(sS1^iNZJiL^%-Kd{xbzM0qu^ESQC8=aae~jEO34+T?S?Cl?BT;X^6(0k
z2)i&%5(dQ;71BkH_Bhi#zN!r@%AtiGyPqAP%l0@<GceJo$(8ik?vodVi09Za{5{1-
zkOcLqy7&VX))tn?Y>{~3Xtj{6&n4fM8`M){B%FnGqGug+dhd!{FVR@E_YT62J_WAQ
zPk4sjyG-llP3jJcJiS`$wI{L;>2tV2f%U?^S~cpVYMh4KaKcERSzxBsw0^Ly<o0x6
z;stM~^SI?0{G#ol$om6Dr{E8<@F7UX*U<5~?YWiH)|9o#gE<J7<XC)9<*wJZHhl7i
z@-)5&Ca`fisiUFqW9CW>hT$P+ky^#?R;_EusI#Z}e{8GS?%e+2`UNdsH^%XwlQpmu
zYUYUcT<dFgiI8noAQUZyJStM4s$GaSxnvlMylL6eZ)icDiC18SgcdM^m+l?f@i;IT
zk201ar>#(|ebw0Q!>Gio%Qe<mDk<!rom{EibQ(GQW2kDsoZfXzEIV15!N?O@zQOI~
z!shqR6|2yMiUI)TpUs5?<K>Yamy=x`*Nr=S5ARlrWE=V>Z^oY1WFC9eFk!C#WI)p8
zeW__h0Z~cD7Ddvzo+^*(lXGdSuye-7WDDpwq1M8Z#~-<Cp|?Bv^F3?TFW7w_j1FV(
zAkiLVV(a(%Zx>~2M%4fu;%tzJ@eHll(6~c>YG2v2R#TTp>WB^J)9l$ZX{$lT<Sq4_
z_TT!j6L|{0U|3+;Ss{4HYBe{cqxn;SWl_dbu5)E27#PqCA<ICMEDaAbrX(5i3Fr~N
z4+({#9PAi{Lv?nXpN7=at_mHl6g{sgzaM&Q(JlOe)<$PK<^7oBk_L7zqU!gv2bH4n
zsM^w4G`{~)r+ZD|H8>%6RhbY_9WgQTO#|EX#+^fl5EVqXQ$aPmR|F4;ZB`_l=8<P&
zm^k67Fl;{4RJ&WqQT|k!07d3S$!!5=y{c3iA^T?nE<nQbA~hX<h67~cYG=hplbPVF
zK1QCj_C)4?0G6DIYSEf0a>^6kIn%sS>ob?pLZ-d*x^w#2f|cpU5)i}Kfu5Fvt?PT*
zVJ6-6TwC;RB67Z<HNw%Gi}_8zKJSarK8!iau}Q$RAZq+*w4cJE!O19LXizOwuHh#N
zi6NY6oO7zIQjMT~1}YH5dHQ=^&w>A>r{M#c<y)_P#SaQkdBOpqxU!Q;hNmtz@l}PD
z=qDpw+JflYS>0v6_WY0XV?Y;@gfMwKFKeDujX!PfYVYuNp;K97nt<Ws=}J>s7yieB
zvl!dyh-pJB)zuhFAr-)|jZBuul>lE>Ihy3p1UDz2MIG^w0{Y8fEQ!*zWC2Ic7SBNc
z58ppSM}B&osJm(2abJin;PN!KVf>d$D~@HkO2Tn3<XlHWm^t`8&5+2p@wEiG;-rZD
z4;CRcJz@WBi*^}rNXBrW{vcti^uxz^XKG5D=lZ3u-4-W87t6QM6f2T*Q6K-%DD~zI
ztr=_ZHt9Zw!Iu}EcN&j9X<S2Y0D}^K(TC1OV<xJ5R<Gq{wLv3F0$Gz)x}q?l9Dec@
z<zJZ1pH+963ckkiZc4JCyz&oME8gd%Jh@WHTe_CnwyzU<=u)V^NETbO>ht2&<L_W)
z>Gc$Ym;2oH<j;xAlLkmU2}BC}8WMO>*)+CQ2A$L70{rIsoSG^!)72tWM`J}w25np`
zmGT-nVl)pXtm<h(PEXq%p3yP6AZD}CovfG6oq6)pd}Vj#-;3gb8;MVTy<{5WcJ`W6
ztLwz`*Xu4lT?s9~c;wf)EWcCj&&>+V!`QJO&YCwI>Aq=aJBBdIf4Y-z=pBXn@IO!J
zI&!en%X+N0ujHs3(;2EDkshUc;Ct_oIzEWqb|bvU5l=u(b9nAq=u9_keFMhdL-8!c
zigP*mPInD=(hg0!STGCXBn(|#iD2<Sg2TaB6EvQTzpH-)vafq!2d%|-s1@Wm>|DO&
zHdS3#MEfdi(-J&!ERJQT5?$S?ipY|A&Y(BSj1RDJ!utBCZ+6~hiG$B0cDP}KpJ39Z
zvtGs0Zk3@U)=k;uv1CZf{{BmlAVS4xV0zmt3~ie;l1nrxslOc|YI9BmmVQ|vd3UF4
zvKG3TRe~{qDV3!daS>u~gbYuh>_yKH4Fb@is@;c^e(?%*mB>LFV>~(d-Fiyq*Q$}>
zmg=#r;9V-44O79mqgqu)vgfW&iEBffMM5KhUrC1vTFk`G&_9a!Z>$)>_^hA|-)8yh
z7tU^|RvH|41dO~37d|0~STXfoz(>n6oFD5-u%YrZy?9oZRwq<K@sa?$1nsn?#kHvv
zQKV(pRdZQZt=coZ(ndEraywOWJ{cSS^eL|!iUZOCckAC`P`vUx^(GA9u<bTKO!jo}
zY~7lwB$@o;%44r!DNPMkZ|aXc{DNWAxqo;ntS~OmYQVbybH;|X4!!r3PmvhleAyE-
zbM#|vGfoa1%&$}R1W}cdY8qfnZ{Bs8v70ZAbh47#kZ3$OC=z(TXGie_yKpdXT*{pH
z_u(mmoA|r3<|Q(WA`u@UUr8EFANuI+KfrWx^jdG3-8J!r)PYK9oVy9R*)S|G)pFg4
zF!%}>^3tui4Rc<4OWEJn2iv4AEz*b8pzk{#v?wYU`MQ8HKd%#qOm+=;g%hdwstx|W
zY7$!S=mkpwQ;HIG+&~&DgX*SCjO9{MWZ}yKwiYR=AhP8GMe>nSBc;M%<2w1fUz#ZW
zkYO50%S4+GeA_33G()@VbxFc1ACS=+BZDYRs915TjbxIt37~Y<vOJW4gC>`;b;1vr
zks)E@XwLx-(GJ#YqS=)Ky-l7XwO+06AddGro&J>C(}KsS`Beag3iQ(p*jz3N2R4ln
zHv{>C2`)uwX`C3>lZB~CxsUm$xt%XTU;hE#9~z&1a~}G@q^lZ)Og;M;EPgk~{iDKQ
zVoH1;VbBpp(l_Djt{HJ)w{2hu$IHXH60VpHbj-<kIgvthCBibtD(IZ>(uN=P{j(X_
z3{#f0W7>x7_{2$C<wMC-F4J;QS660`+l?v%iK}MAXU1YG&Vl<i{Nm54PQhNEa?5Wn
zCwJBMbfUBK!<FN|%UKx>k7yyLbxiOJ+yO@X{@I}^I$2G*?4L~coyLf(8W`vDYm|vC
zthA;6IOb<RM$GNK5&vbvD$O8}@{Kp_&(wVNASIHYOtwrd;vYb-T2|XsD(*MpDT9(@
zF=eu-vhV@iMTN<}%W_0Y(J0Z>E}@7m?=1e$45nqz{jz+Vv5#0kxpoN0>$0-y)hTz=
zX6%u2keneLrL@K7Z6*4{uqA8zZKb;o`jVmiZ&qpl8^|ah##`Fy4drl7eD>ygeqGbu
z%XNT+GJD6+xu#d`5@(M90&(Ld;^8Bi7Di5$(|W|6T_gC`w4PI@$f?o++9mVUDtcmp
zg)snOp3n?}7#6*HoaZt~`0-1b+PwC=Vl3JN{{^|?c&DG8K)UU)+W2}%qOZu80zscG
zKq<f$H^S%Y-Z2hzvhd2<AiR-(&Dd4ZD-P#OXyCiC4|fQp$q>!>O>J*exuwb0Kb%p8
zo-A$a{9Z(9=i4!%CKmGB!r@D!Rl3sF?_YKlIHuD1@r0%;mtH={yG%D89_V=l*v0&%
zdS$dOO<!7igD8s7`<vgP=AHt7>Ee3eA()%;V&DsRNTTV_zaH}7qxm;ki&1K-7^e1P
zlb<!*w3^CqdG>y`M9w`71#AlA{(&ZrQZRq9O?2V!N3D21*Olp0`RQSlH@;nP(4L~^
zaho(~AtQVqrdPWR17Zzdi_DF*(F|yn>4floW2iTL(iF24u)zH;V5}k$G!yNyuAazh
z+A}rSz_q$G>MbJiBqm+jVA-#1NEmZe`Lg=W2iw%|mS`7S2|d3I^Ee6|8$$O`EjdGW
zWnNIqISPigQ%2skdy7Cg)s5*&f)(5`kg~I3S}G21BT`w(fSw8({wJ|K5mBjdg2gSj
z#lz@kq_5O{vH$yTte#@U%`6sMEohB~$ff9rL0X0{Ce|hHCmc{rhCWBJENE7DR&bQ0
zmFWKYgM2tPQ`4_<emCA7v~;L_T=A4L5<i7dK#Unp>L4^B#+bz!O>gDptn(g+lwi;y
zixz4(7u)x+zy1LvXH5wc!7wR!*#ifL<P_PDJhyrGYv~)!=V5v|hyzaR&CsQbgn?gE
z*HpED%J85WVi20JYehBGJ&4rQ?$|x0n4#oc{K&G{9F-fBYCa8T&ZAk`LpeO+DFaD2
zJ~@v46E2zhZR8!dV6foy2O)`+`}{53?RvB}b;zkfe}#rCbOVqOPg}owr+51{LF#Jz
zy`#VYb$cKeoUMY3{YvN+tRw+_RdMy0<n2kVq+4)d{CF^O0)D98)|5DJ1vz;Br2DlR
zniaI%RRG49M0C!F&AAwbV%wUR1cOyKFN!ia@uq-}X=rWCAb&k=HRSmz;|T!SO71F3
zRx&K;&nS?VYmxFY+mXStkwxY=K2_HSjYM%2Sm;*2q&{;5c4Iw2@A6X`@wO47dcKJh
z&pF-Gt|&@xxV=iV%OOd&ufGoSBb>Fvjz1Dbdq^g!;l?c%uTRwf+71?zZWV^J)gs&d
z(keq#SFzYrGTmMQ#ExTA1aTO8V^`_O@#60zwWcHNQCvFuhF~UE4%*G-0<x^d0r!1_
zRC0Raj@W2rlWclboI$9PVHrmVVp+D4i<3D%xB5gtipSh|Nu-UIML;E;cmmns)pI5C
z__w)Ci}rL-U<5$ACpS^mh25Ur%Uh;T)A5=2mgD1s9iuzD5Oo8=8}rMcA2KnDMC4m_
zH)y$u(_O?9yYGvGg6-BJ=tP-69($YJ5YN&&#h0~HqSUJf4MGV8las%qN0wIx@IX~B
z^(~6V2;l2H@PRAQ;$u|uNAPPr%-Cq{yS!MT;722YTu^tOiUzw!cdWEUL>Pl8+PXf!
zB(m+*Pnon=TY=mXAAE|f*wROWka1(&qA@D0Ao$_&3zt!x?;}yz+3(TQbtd^UuBxPh
z+Tm&pH-{@{r8LbJCa%KnqWi22KCF$(J{o<W?ez3F0t%uHXJ?Yf*ZqihzlfALn)4si
z$+0MJ6UPsx4j&)tB`_*2mc!v2?j~1sRxZXIVz1i$Ge#<Bsa9&MIN|M37z3TRVtkp3
zs*I3F6~4mbJp|?C7nH;5%*fA3;!I11cEWJWX!wXSb9|7G$0rIhw7Y?nnwTevqQ)TG
zXPsF8S%ma?OAVpe%5+}a?8kAtlvwIehYSa4-H$<8geglH&rdQ2C!VOJ$v{`YO1zf)
zqCVH@&-RoMP_ejy)OksoiINycI77J1i`E$a__6RjoPeD5D!5a%1dI78beCwt&*qcK
z(A`hpel2fT=OC|h<FdwJQo^J}sXqs%f#RGLr{r1)yB&j8l5fvbO~YFaNLmvj9$48N
zTVd$3!r3ZpmzKeikf^{lnBHwdMRImHU=#%n#yYpgqpiNyI6zzJ+f7U?Dt9Ks;>X*=
zl3u`q-S9}WRrjP0!OOqK@<MRa<u)6gOkev(PYs2<x2b+ctGIfMP!C>_9a9@VXYy+$
zWF4#t)kFMAfodxdVYbNTtNY4-1q_FZ&$xqiVL#SH8Q!_UWGfrrKbXpFM(5FcHnq6k
zdC-ur2Ik?*7V(-Abjw0*Ldhab^l3)oDExtG?va-&UAO^Q!^JnuN@_pfCLemf7K|8U
zDzYt*vxzKjTP8q^DYFHaz5P1w@Wy79#)`F(cYeHfrR00`Cs%;p6XPYf7hL;FsYJE7
zfBNug-$)1!O(<_>q+c4RT&aXASS-5#)^{wGd&jD@ZtRq-dpr9Kn+eKItsDE|AK<cl
zI_AWdCw%<4qRF~`wICE3HaJ}}lhmuLDZSt>srqNSKuW^ESfLxSL3|nGH!F|b3~x@E
zjaOldvM?>bWX*TlNuiN45n0fhdWHD9mabchXb+OU7<Li%hl}C^ZU6c`(<;)Boz@oU
zO7!9NVO`IBoO33SPL+l>Cq#UbuB4*jOK=~Z`ZU$`oTzj{`yW89#63?H@C|GmiGDA4
z|A%YT;!2<K1rIG2afu9{**8yXJ!PJ&8<c}pH0HGjd2i2)dI4e%-<K^{g^7}!H$D)X
zwusbe<liKxbr)%SYQmt~OC=u<ZB?O{5HA4oX2A>@Z?~KJ*lw(G`s9;U;tQV)#mF~9
zN8J5IWzn?c=A`vjJFk?a4#qoY$v&l&46`qY1@`W+-sr1luTCHwo6y)OKxsuJ!XT<j
z9MV>o(qHq8MN3#k+|9jtI<;q2x{;h~(LlC8<al<@zx{*7XL=i3loEYzm5xi3K?N7i
z>X)@abHj{X9p{zSf<)EN11`l1A5rk3)xN);*+ZkDdNHeUNP`{At@>16Kbw4ef+#Ee
z0!MP1N16LMYL`yF3q0BI&Ha6?hrhKfd|8tge&!pYU1Pf6Uw_Oi)YVHMiB!Zw`B1S>
z4{3r%XJ@A-DZNmA^ZTsBF?En_!3BoaiW=O?9Z{65jkywyt?*O}spcaYk6A*m8mS<<
zW}r~65-l*V>Phvx7aGca1aOwhgoFXvB9(~q8uHdnDF=100r!_k17+c&GV0WBUmWj!
zb@K=TQGguW)#P*KzS9(T(QDiYIL&n_fkrzWY-@vyL6PJo&YLob``GkAZKXwu8gcGv
z_Lm%!Pd;&uJS#(h1Tc6S|9-!UM`^Ng2`m`$Z8=M7GK<)hZ(fk@*hc%U)qw_T*uhiT
zGBbWeOrIORn_Bv9)Lax#cjASp@>z+frW-empmLehkIJI?q;}J7GkWGFU69a-qGMgT
zia^$o*iiRvw&I)e8irs=_m|4y9ftn^_!lwTrqK4;6I*Q=UPOIUSnGtAt1uJqffZ|h
zO?UC<?Z9yw`ELRMt9?_tlQP>f2g|bw2K1sm`5Oe0_q}xE`>+fzY(-XA;iaaSli+Y#
zW(tg697T_p7+`}D?1!F3#H}`o$NSH?%9^Id_9)vrJ!rrJciPGv^B)gi!4FR&Haod@
z-O4O|ri@^Zhc*{)XFz<IA1NbSY7?6(*OYq`!&D)Aas@cVw|8F)ctK^w>3r1Hc}>*8
z<AVBb_?uOBvhzgbm3%Z73)vbr4l9zg=v~x+xZgj(ZTY)MoOi7ExmhJNL;nSWKz+Z>
zc6(J$Z$r;<bB^axBIgW70UTg;sTK^|nS`i~9tcu-ZhKcPE$z&W7?O67LN=yJzyr6^
zm-|NTR1Y+eJ!@#<)vVE*qppnTg!3trY_7g&#G6hx4!A#+OXfubu!IL!j05H<Y!U`>
z=yRIqVbx~`_kmbo`&FoQQ7bAKzGgVUHKZ%kZp2EQlDV&`--#fOR*%bAVh8{vgO9Cp
zGRS6?q;9NpTAJ0-!rF#ALEKk8{{YCWl~Tk3$vp*Oim7>Wu7%Qzwfl)(HiV;0Xs%ue
zre^uPxdv2@m?E(>+e3A90sE`VS6>uxTZLktWP|uvaaV?<-@ZjzrJ+rme3>I|eJZxO
zgQuen#g&IWfUB$&<8E_~L8QO7w{0FqcYilI3IN7Fwb@b^qa<_R-c0190EW+A)up2n
zFFJ5n6-5_0;}vGX+AFxgW3;y;JR0%n&z7owXGHZ(>J<FFsm=-<g($8vqdllV2yCxC
zayxz$+;N=qUq>Z$a3`r1-LzB20ybnB=NuZxWoX=~7$b_?LGyH`T-tfdz{7gtynIdz
z+9x<~`I~!7XlFoUjyX(`?_#)5Kz(XkOQwl}Hg=!VohgxFTXKpO4u0s#KIWrT-q~Vu
z2N|ypm1)tRGSP!+s~rkY16!i`KQ<0rH{Lyu;ZQP?cp0eTx1Q3{DW(8JE_NNmw_3Yz
zaV4awbqc0O-7KMoN3pM`!eZ&-Y4byV$26ki^&mvZ$pB)eLGm{^`cg>kER8FXmSRrP
zkA9RZj1WIs>2c;Ko0XAEE8EH>hF3$58BPs0PbN!t7LLfOiqfQ{W!QIIeQHaFPbV8b
zeoo<>k4nx1ab`n|V<6xXeZ8t0anRl}QdcCF;iXhf@3l$7XXRg|O>PjQgS&n{Tn;_+
zRpX3q>zcK-5<(+l%h-{M)+<9fvB3rj&(f6b^2aB3dSkUbg~!XE#+!<}7~G6G@A}dX
zTBO3T3I;Kpob{zd=9)m+V$E&L$@Z=57x5GsKdl!6*hs?MIbFvEx{=$8ad&8=jey#@
z#sJMQAZG(1M?9K3+|K<7`kvemrAxTGnOi3(f_bRO>zY&<G{Nj?T$>Yb2ib&zP`|z3
z(4T5`g``(aC!KJx?NY$Deq-rS%W7b^hGQgbB?skJ$y|E+Q=w)G$_W7DBi5nqqb2C>
z(8*AyOnE8?&(B_JT{`;a$mRwso}^O<!wmHATR+;GbXIE>rI7QCWnJAt<o6zxoZm}a
zxNUpbt0<2B8Rjf5oPwpBgX>h@(rB4g(2q)$BX@3uX1c2=Erpz52bqaEM;XBOHI+)9
z$!Kpz9@XoilcHI<xXA>9hk`3`X&PwK%d>$tbF+7P+0(R$n0b+80x^Tys_Is7+9$~Y
zk;h@sn&kS=G>-L#QHOJvXeMIGpDqB|+IV07y+<|7UukEzjZuikRA6-NQ(jGQ>Q-p@
zBx8@dJq1)-c4-MkAa)0>buD#goh==rP?^gD4=wBKRNZ}RO76~UatzV31IYKPn^dqp
zMtK#qTDFE(Y3fwL9M*=HdvT{r=Ubu{Ab?nB+M*B*#2$SyO02<fr)SfOQg>D~jnlZL
zmwP*M&B;~iQAs1naCjbrrC5y^0zZYg`qNAYIRc{St1={yJ*ieOBpDoLu0a7Qf}H2C
z^rt)+KVIIHoQqIpVGs?9)Y3e-r{64TBB&&*oCE&=*Q&`5eW}4t+zjHfma4|^T(0G>
zv_O}le<fNy`SQ<7b@jqr$2-QMRItG5#Z~efZa~dSA%C-wRPuc)U6qYh-OT)a+*H8}
zeQHr|ImyO98gN1eD(*)q6qfQt0CZ*CGBey#THCC$?T|ju2|GtMeHcrhv~PSS7YC=M
zRr1JkqvclqA~^z+WvGyweUg+oY<CADnqp;Rv%Orlgt6P)_p2!kag&dky=$JOWev`X
zbe#4hvbIP-l5|}51F@@9;7UX+NaK<^{{Z!=fEGN0Na!lSfdVUrV%R%@=suO=;%m8{
zohoVzLXG66DE17O>P<lj%ugf8QU3sieQ9QMbvE6^^Urc>!`c|b799ppdh?#zokkX^
zBEuL+&Rxz}ip#jUWE)k9IO~eFcO178G->jT@=tnfI%{M1pbT`!dfhaZrCFIa_A}m0
zM1o!0h8y^C-}+YkI$Fkq0|a-dUi8_o36i~P1=ePA8v|)L_o2B<VJM_(tm|sScLP07
z6>+9Ui+PiACjbM|uyq@AdKHz3Vmj3Nf7%w*Lfn|mPcD}Rud&1?=05eIX9-|H0F&Pp
zQWC#5SdKX3IW@JXAluV|IW_A|*&cl;-H%2Vfm?z|t8wazk?wDo9Y=FnlSrV2WyT4~
z2dxUeVEK>AKIr2nv2agwsY$Jlj>}es*d672X0{UIH&2n2u^Gp6T#c4cW6K*!$3C^X
zvd07|o~`IPu4&Ur=x-S|wKd~Qi4+)7ih+~HaY$l<T$x|XWd!9{sq{3<EoSP@HxNj;
zae@fRBAX<pMh%Q)aw^}micM<6S9C&yhE`vt2_9D|k&d-K!q{dcpIp?@h1t2k{dJ3x
zRx@RLmyn|{+B;O1@FRfAr*Pvm>B@QGy*V6Hn&Ze)<#JCvRW{nPCzq(%?cA=?2LR*d
zsAY{7*haw%9(ft7an7^HoE1KVb5$-ld|;k`I&i)0$db^e_MxQ2O@ML17!|pscy`9%
z$t~QgZsBmFJ%0+yVIwl6M{5(3#B{4s!!5cQWo^ZQ3Q5WLtyzSjb)g2O3frkv0PQ#j
zJ!-9~c>xZKfym;mGCN_L=T+#e0TjriXxum?1~>$JRq}hJU8kubg;i9s8=JB1P~2NH
z9s9B9YDrn=oU!C6{e9`~0gX!@fMn*O)7YgelmLoJL{hUB$0a>G^HgpYIAxJqAi#_%
zJet*!8zGkf_s=y9=2;}%BO6asik?euJN7ZkOALZ2puu1cRN+VKP|syE#$<hxbI#B+
zSFUi(6-#7vRp3!?14>E{-M9CT%Y*Mim4xGc%rvo4AXD<OH~{|uUrOKAnS8}NahTVS
zPBB^QZ*e90W>7#UI6tju>j(wNj0^-tTz(bXht{Xa<gTqx=3>jWxC{8xA(5b&T>|c2
zo0Jjx8nrS+sJnL;KYKg@>?)~VO?p;1Zb2u^*&I>?skW~}(w(p|8&?B?*S%UqHbb+F
z(iqsLbHe-7&V_IfahiO#-y=-`b8Z`GcNjUvUns6r3Q4UyRV1hYVLE)H_4WK}nk8##
z@oterXK%G@PAhXNv$8Ki4Z0)wt0BsKyKpex{?%W~UUAm6q9Dn)%vgp9EZsj!skKY&
zR!~{7xSRo79Eweq%ZQZV5ZvVU#b-}33>*@?@JC}(-A+L(S??e%$l{`I$mypZtXAAZ
zF&nerJ?JK6x4<kTlc?-Ss~T&n+^aqUj-`(uh{rY8>i2#dn?{8!A=!7do$R>p&s^fT
zr#7C)WKqH*kd8}iIO)z$wI`5GxwzjRH|^QDZuQPRDoK=?SdoHGc&Oxzqm*?j!-5Y{
zRbgBnQ6eG~P**u|oVI;wJjZfN9mg2S_7x?(D>UFdffEFlAan!M)`j_7Dh5Hw$jvl_
z*%1Vuokal{ZsQ?(kZR-!5sP^)(y1qI(YGJ|zSR`R&6VWXtGtu71_1gBZXt3Wd7uso
z@N?}?Dse*5V7Z5P0fKTn9zmkoA3i{vfX{PVS2l@r4%XqjA4<oX+G|$BsmEsRUS1-M
zpxav>wi3J~*ErcD5X@D+V5hO`QDd4?Nj%c$Byn7)W94r_m=$|WfK4OrMJpKIS&lJ-
z+t#DDv6kuZi}Lql&{UU`#cvncZH|BEqmK34hQms%lWRkcy=6^WJA~Gg+}uewm-4a7
zxaW$k<j#_Z@`+=dhL3^xbgNocq-@+IgqVrv+Pb)wDb-kE(DxkXy6WIHz4tulUB^ot
z6tI-ZJbM~rE)h?tuS&VnbnA&QAtC^IVxx9H3Z*}XEF^{yw&6%t%VhJ{6_3=aTIqts
z$Em@>V_8?t4YMP5-nj3I)v%5jg!jQnhBADhz;5=<Yf0f)gQ*PI9YOC|n(HOH$6)}%
zAj{*{v-VP?`RCBpRaI9kOi83OO42u0Ii_>d)||`SR)&dSZ!a>#_i-s>pI*YVigT5h
zP?xy1I{yF;Xc}7ha(OSW(%SAt42ipvKc#Y)7gx~C$sEK58N(8I9_F7d%#&(v%FLm7
zTpVButmkr&>KSqlbMp_SV>!+>pDexJh{-k8YDl`>!nXtw>cXcQ@hP@w0|pp4HJP-z
zR4;`cGI&}^Jij0elO}V=VeiM%x+99Jw78rhC$YM>x?Sy-*R?S%vi;-=q~!6Q=Aecx
zJ){j4*4}zBtWcp`1^|J{0lL$GP^1<4yBzeSszq-U{{R6xOQSn~It_ruFeK+Zj31>+
zLd_OcRY+cO(BOYM;#OBNDtVFxQ<YG78S7SJy_VhBMLWqDBq?q(KAo$zW-8W{PG>=_
znbe|y0R!gGagkP`SpgDCg_Mi}!?3Py3;jtW5`f-W84SyiNcRG@VexJA*d?vRDDXgc
zY|aSD{Od^O6dvr(bf;rqTYFtg%aY#7Eg4fECUE}s&6Q+w2*C!lE%i}+%p-w-MJz_{
z6nE=UO?P8*2}cUUkC+jf^RaZW^?m9xT-|~k_xF(-neHHuhA9x+lE(z+I3Jy8#WV?O
zR^m)NapE*Y9Gv$*jc2p{o&{bDH#r@%Q7%~Wd9Db{>YoqC`G3JOtvl$8a$n6L$p9Xi
z#YY|N+lFvJ_Nifs-9V8+QNZn86g~_`(VG7N?HK+bxEaPiwaHU9sY%{*YUey0rrL_V
zj5NJbAd*N#naJAt!6)fZY*&z#P`~W0GXDVNMU50HuU>Lb)|sWv7n)<ZcT^zYpvlfS
zuXh2Mx~)d8{TZbxw;Prrh_f1*lq;R1j^5Nkaq}v&t12Ah0B7oI>P$hNSgqsO<7o^t
zvnPyaoblGafoKwL<Fxw;H3`z*BB9*i7GMQQcc(R^%@crG2|~c+5-KJ0ZP`fO8>s|#
zBA3i<<)mW8vT{#<TFvuwZ=pQV<=aw6(e9$Mj`B$H42Np5?rJEYQxShL0|pDQ^~bMD
zkX%V8?wVo{XYUiYIR3Pe$fiA>QtsWI{O2B(ZsayKl$8LVr7}p061faP$I5e7TjvbS
z*<;T=%|Hg#-W)5b7#!r%Oq4;igM;}~;EcSXMlw!0I29@sl#wg#Je=*xCYu-mj%nPY
zTq-jxxg=x_q+>tSQ{z3xO)+B<WM>Qq%D5+S^rywh#yP24lPwUkXBi`}N<$V7LEJrh
zW~5~tXP>1#A;AqP+P|rxy9z0?TV7>V+RnNAwYOrh+5q=bat{cnCbE9g5S6xFihGlm
z{OO9%oRWF2dBxAj=%*zIea`z%))dBeI;J{CI{j*$#;X;}5jYsn-}J6~PIgJTJy6nx
zc{&~5)yS~%QfG6;NyTVwUnP^-NA_`<06gQ0##Qo;@w?3jIVXyhjP~!5lne%PFeyyY
z$(;PGM^Vt$kc*18=2L2J`!hdMytuvEZX_%eU}v>ad?^4X!Y~g9^Q(7Ius=6L-l0o5
zSdyw+j@7#5NW#)=u8iTgs}*lhaZU(XMoA=e`c#4zQ}YZTO0yI>p~($FjkMa5eCVtS
zkT+)oBd-+ofEFOQ0~rSguccbHv`3IDzQO(CD%2Wt&B7*ddiJbkB(-NuAl`)=TWMyM
zQZw^sj&aRQ)>4PdDahkEt$ST8!!UPYf!I{iTux_Y+5(Q`^{z^oxJBuy*-r~5wa~^(
z88>Ik+&%cF{f1z_>K{GMGh1Tw%9v&l{@tkzhEPZ>qdDTT`qSRV-&R{(%(fCNW<MwR
zfhTXwKOWVsc@oWM5(uM+?dm(zhUQ)vk8@E=3$pVeZ^ohGIiF(VM#!i%%WZ_bgg3C_
zn!0_mle%KV*i^;`bBthm3UApqo?Dt~w7-}=jC&K>=)Y(TU|_*lG{|frfXHrvVS)xd
zezfSXZY)E2Ew?Ijj&oE^-<n91A(-_Y58+MKmA3^+Ut&RL8fAk58-M}EDNHLGfTVTj
zJ?f)*oBs9y_oR6pdSv3f`t@Zlr)4@xY+eCQS+GdtnxlDk&-=7psoeV1jP2x&+ylv~
z(%eK}J;pm%n<+NVn80<U1~%QaDE{>~QN8`yQ0HhInt`taAx+FU;~uq_sGPzh%VoVO
zMlHQdwzngaNWtB_R+gO--AoWVs6XFe2j*)E7<Nc}(yU0p$j(3d^`jCXSo1!`Io*ZH
z6||vspf)pAwt`7mH_MI=)0%<{dq`D6!@0dpPS8y+-TR)kJ-xC=hLM49dKQY;0P@sD
zkf0vIpo&?eBo*Y<(qbe5$>$*SqzZ+@ZQOg&a7P7YY$g~CGw)k(HNB;=gfQF(TE`wm
zq_Qo$`N|Fz@r}dR2CGYO&5&1;e=7B*7bbb}nu7B#J=4u1#xU67Nj*9JDXJM5<aO&*
z(ru(E1B%d!RJbT6mjMO<K9t(9MqI|0m|c{Txkc~k?^>|~EBTVP{0s~X3eJW-(T0vi
z5tha=$R4#}FJnmrV0@#D*DUV#I^&|$(^9}GBLla+TY>kSvt~6M)@is5gK6znPUN*s
zppxBjT=H5PqeeMYbHN9tPa25{0~o9%cIZw{dU{r^w1ff29WzklVeV)RD9iv+&s<e`
z^tpV)owx(1HKT54L6Im?*p9fVW-M0>#j-JzPBM3~i<`O5$gO7p1x|D8QOP<=iX@L~
zcJ=&gLi!e!cAi4?thPdmOO3cZ=dEuQa)+#uL^nTAPg+m430S%LK<QN-e$wO;RCdi+
zip@sp41tP_VE+I?RFYehE89X~#lC#~F-Xc4eo^xuYHB(uICIBrRGUr1EO8u`>&GM5
zRr6TMrPPTK5>$-fWSVS|pkXF6fsQ*;NdrN+Ns)ud?rEYmao&X|xSUqVtoJ!%@@-u9
z<eGehx?%8%>M10Uz^CQf2YRRHeW8m;_&|DNIW$XAEeKgl%e5CPoC0e|MYb&CCB*_Y
zSomK50C*a62-YIoxF4k?mg3i9y^0{d+En3=-VS=xHC&BCLxGWj^9=T;!y?BxxXU0{
z7zA|(-mUAAe)VopW;xUl-r!)0>cX_Dzch1V6ZUEOm~#a3)EM@V56nM`skjBQD$Ky=
zrB^x5F<z<X5y~Uu%PpL9yVj!wjw$7eIA!b9dm3zrVlI*qy-o-m{<TphjU<u93Q6N9
z9+b_;kPip7O9=?!hzA{wQq)@#N0HEX>T6oX_C~`bXZ5I@t<~DxTtVbVD`ycd20QH)
zF7yt@F@@|aqA2I6?mkI9>a&tYY4-#x?N<-(I#UT~#zs}K`c>S@F)GXz&jSPb)mMmx
zE-*kKbs5jnt-F%D82qCo4|=cj#tewL#{`wg8UFw#u$k8aH_DKQa4V3?Pebibl6RIk
z)!m4UVL?3xbHzdrtx2$+gCJHWqt*##l_897cfbJg$*37QIqO!V-xI96d*w?EgZ?xW
zSsbw#&o~uHT$b!t3b^3o1HY|H3}N^@d(_EqkWP8@sbYs~4Dt9?q)U-%(?q<SJHY{!
z0uzujDzvsfN-|0c$`9Smbh<Bz?sS`JVz!BPmBTX(l4~03;9bhnkPxxSP&lh;_9vMc
z!U-A^m`)Evj+F<N0}TE+u8Li9;%zcLD8mxOr-s@A{OcM>SRCVn(~89>)V^UOwhtmA
zuzkk>4nLhwa}BK0IJS+vmE;KsEsyi*O^O_;B;y@D>cm##Z_K265IWUZT*p1AMPp_Z
z$!<>KdK?O?9qykWDP&y#0JLjY#IS>>qin%f9Q$C3=M{MX0ywOd2)S%`(Q=$qZJKt{
zOR9O$DG_m%3&mzl1dvK%nM$y&Z3JUeRmL)<eznnRIsnyS!Y<j6e65ety69B)PnGOt
zRdP<p3+0?-ay_eGMAaV7WsX2v2IKwOSoCSE=PP)v5g)^jO<zy5ApO*82=9#7q}>^N
ztEuTw%BNZ!(|oAytt`IV3}z4=SbU{NTInq`J7lp{yNqum*QYhccyq)OX^gN;f6-j@
zAH(h|(LxKGSfz!-M(do8_2XipQk%BO!nRv1H2v*U*yOeNw9P9^xu0(5RKk)@b6!7k
zZYSLAScY=g><O<(@uMM_T5rlmOGsPzo6rj7yyOshSQtG=V_!du#kW3Ht&eXn$=|W|
zl6G?Zj%#D=^2s}MoO{=EqUh^sqyp>~SHUTczmIHGIuC}1rFyf*3qcRfBA&;!bvJge
z9AqwbWM_^u{&QW~eWm-u#?7MW&)A&dvV@im5}c1pisMMLXp#vn(mjXoB8}KSr@d>-
zlZD3%!tu>RC;>ScuT|58{wSlsa%*ODa`<u*a|^IO<270QI93t^119W-JaOrY>+C1H
zv@*|a7<?fPN^S}d6;daQ%`G~TFh~G(KjBdDlx5TIEmfN8aZ+eksCbMw`=+D&72>PB
zmaahHu?OWp<Qmu3X1IdsJh@yh-T*ubrkbVXfAZ5mQC?+O(2U$2)sBTyZCtnE{{RnM
zYuBO_jIc<_agd|{I`hHDUwl@5&A*X6vAN8M+i(y8f!~j%bvg#ObUemFBYlNQ1E?bg
ziFE5(veHDmk9FYG!!MlQw1n>$w?clflCxTv_8uUX%ED_{V~mNwR}C2GI$+f`3eHa6
z4`Ib`Cx;M6=fmbCYU3xW=cwyQo*isuCj|S9Ruao<({08(gsa7*n=@j8LWcyd!Sm-F
z^VoN*AK24JJ+!h$!U^)o%m6G0x71b1bUT>i1~R09laADuR`-8t26ZYCPgWTG1#{A&
zS~a80w7$9t)Q=;vQg5Dj<Y08ALEPsZsbt);u)y!yoQGirmvHno$5u{KZJunIc{M4G
zq;{ugmW)dLqbg20&*4%XM&dM<6}o8`f8GRu-u%@J4Y?d2N^~)oR&IcGHOT41v4e`-
ziuP|bWxD#+I9XJml$JQ!LFraxP2`M><X|54Qw$#_y6Nb&I;o}0V`9>C9^wMF<=cX}
z9QXRwh6Pzk>PC9hT4}e4gE|QVE(S>e5<2neQ%M;{0N~_gVCKH=i{^rCBwChPE`NC>
zjPJnti6<ZZY*I8*q$??0Ba?&cicjHOAzT5Ro~Dcp4oN-5S%}pejZYeo*xQqiDdr|=
z19?F=41hWs+0kxn?4`}+xSU|&bJDV$?5?#ORo$M3WLC3H6SQ%bSjJd^&{QsiaN2}$
zI6U^P8>!Yw9NXn1f8ptmYJnSKZXH4VYd>i1a-&UN#RZJ-;2NDHKuMDzW1#9yPX(m+
z6Qab7%*TKST1lam9IL4e4hZz2%Iv#Y6^=vX=ZdijaD^0&r>Vf_@%$-;G1O+9GH@!<
zlP1c6g<ZrBxam=V(m335ed<__#UQ9``u3}bPhYUD$dPhe8#B+=p~)iS2P9Ka45T3>
zXM#pES7nA+Ezu;m3%u?U9;8)mqB%IhAl0dEZY7O;*$XOwqbH?9X0eJc+FQo}Mrj0v
z(BLWMezhj(1;}f3V!7ZRaa1ka=lOjq)s4V{;T^HZbI?{U_qov<StCyR-s@4B6o}o~
zK^t+$9V-#xXk;qfo}D<W_ga%pa%BJ^&mnjfOfi-IZcnW!^DWAnjGmj3oL~iP@yH{;
zrC-zJn$=yQh<w8ba)X@Gu9Ym7=6KMATx8azq>3#X-Pi=j18B}`I+Zlg+Lb4LOqev~
zxt+@ZgQ?@CX+x)5M9Qjxi1n*hX&hGamR#g;NyaN0ZAwY5+6a!q2L`<Q_=!1k#hvtU
z@lm@*uE>)iRTl%C0Zp3nIDkNT>w(^&w6<xE;W$4b+zH1@f$)q~SQcZ+J*$z=o2k;0
zTOxJ1c9h^@Pv=gMXCx8sO;VQXIAbjGfETS|UF%Nn%WuB`a7Q1`sU>X&?#__UZ3-Ro
zmm{bZ0KHaIv<x1A8svQ0U!~60&)k0h0EnxWx6@m=5+FJ2n$B)TMkwf#;%PwKb`Pyd
z_Q#D6%e&vTW45A1d;F8MpS{|kI;Wix!8{%m3d-|aqWKNqx0e8J#(MiwdEt)_yn9zP
zUP&81aUR39FQ0Q5$R+XCsZEdBodLK!;g3oYm6V;EN#M2xW!hdl$Iif8k9xNekgMYu
zQ_0;*Ran(FSy*=RNF>svN)F@t)M8&K1#Gi_Ds=MfgckWp8SB=#r6$>@Erhz12y#Xg
zcg0}MKKVXD^s9H*e`p6dP;tQGs>cV*k<`<Q?r5|`ae{=ibw6}e4#rvhxbn_=nzJM_
zHyi+ansUJ$Ff%J;oB~IB(?lejWp#!)+b%}zbnQ{gIw{}`)E6vWz+RcD79ij=t`DtJ
zUCOYc=5`0>!1SSJcVW-envP6#RlxewP@Hxds<IV}@lL`fP>KOL+($o!G)?6V#N^c(
zZi1&LAbM44rj6LLyKUo!>rF=CqB+d8K*uVwvYr9$P_&!4Jt<OF5j<GPd=s4Y9sdAR
zPgqGA8Lv}g$kmKkx;6_gdBNut_4~z%$2~DpC=q}`VEO5eD^Akd-u7gL$wxRMWQ>&u
z(2s9gnNG^=r2@{GcN}&@asE6E{VKeZZ@MLLd*qM>b${@$Z&yVZ4Kzvwh0K}xcH^yb
z`kPzXN?^2Cmw~!hQ^ChL1P=MEBI4xiY^q)+rL5s2Qy~hh4hipCHj}iG;Ryvk>GiHw
z86IQ-pOMB6d9D2_M~PKP_RVEd7CNcQ=AzoHjAxBVko8X0e%jo;o17J5dSa`jo>aeH
zL9G;%?w;nk-Pxn^EyDv2+*Pv{<rN$gp+Gy;xY<Yp1D^DvwK-(n%)7YNGwV^k#hYo(
z3tOq2xBA~t!nCgKgB{>@tf#i*oule2rW0`3sM<?Y4BNDFJh&`>hX<uP$~S1)iRsrh
zp*%rU;9&Qv>%IieG7T%-+1Ss2HKiLt3!b%p3z2KJp*vh-4e3f%P70{pds3Lw<WPe>
z&#hFXnlt4iyz{T7Gf3IVIVbwnSy?gVhuS@RnzuWQYy$(nJJm)_-@rY{J!)eu0mUtf
z?u#n$;DN#CG>hfNprm1d??>4rYk)unNAPsbO4id9LLziIJt&jA+?y6-FwbtS8w_JR
zeJX|06+ndXyDTx*n>w2*7FJvbIV`Qv_u{Tg61t3@FfhaET0te~XDhU4$bwf$r`{oB
zob?Ir1xsmr0eLjb@XUh+TN_CCAB9?IMZ1J~RgjLk;O47dTBXBAP_pg*Fg>eBrp8NM
z%<V?TOG);&NFyr4p&hF3foY^qa7M8)g*Kg}bu}?{xVKw7vKD3HC&n^;KN`hZ7Si}M
z@Cj8L=8cIN_Q<bFjbCdIGta9}*~`d>R*u>$hZe3H0K_gjk?UDZ-0@bf4)%EwHX%I+
zLG4vY&U0M|#e$A{)XB-kEv#|M!Z{>JRBk)Ulb$#neLq@!NI@7Q=HruE#Lbo?X21oG
z2Ty99cMwhvJ!%D9jyqL_a<LGsM(!8`!L8FUV-7*2B#?S>Pg0xL%mko3g*Z5>^A+B9
zXC1RcVH7p;O)^$_4p`@>=~r!IwQ%2PoS^c_1yesaV1LG;k|Ys^4hbZUyySb<Z&YfX
zh*HW~83HEef4ZZRXlr>PkjE;NWjHE&in$h}bp)`wO2MEQjkC%O=Zb9C65U-j%*<X_
zV#SEgXtJ?xMQ~Vvq?`(V&A2^}y*p(nS~elE$lF^Z^{WU~m=Y-(7|;N&B+7%3F@x#v
zR$AC1M0T()n~rgV$?5r1xtkRWEKdqK5xZoL#~nYJsGi(;A%g<hIb3x2spCe)SXfvt
zSx8pzjtxFybuv7e9hE@fouHluezh=!hEFhtQZg{zv-(x{u-t^I=B(TJe)W-M@>r?w
zP~?{E(Ov9Uc&%l)KW2fVh=GN6$p`CF3qo<%9fzfDoety@83z9VbJnd#p}33|l{21I
zdBtGy6yv)!R4PkUjx%1<)@>ebszE`MlbrLK;p4Y*M%69biuSvmHr6{kgq1@(#@OBT
z^sh6-QAof5Fi4^p+A8;F(PcSwt3~rWScgNhl{IT=2;1|HroDCx3wt~?Ws&y$<eY+Q
z%B}7(cNkNToE-i&={MKUrz~%C8QCg^RtF)o>FZoroNQ`*I~{qBUkXkRCTEB=b=KlL
z2w7AT9~jTIaJLaQpCN*HjBGutw{H<Z@)*$>*mO`UKg1Vyy1XcE7B!j`#A_JnJqhnd
z9<<Y4yvK#E>3gz&@C=PDV{52OGKk9!{%76Cdi783?+@u(ObKUm6OF$r2G1GfjQ%y^
zcRGvOlvz<#TOebT`BNm+n`|t+=R9YveMLn_5e3aBX#OUcsZp%bZ*GX(@m-|Le=YBt
z^20N35*7Zn&i$h-0({-NRqJ09OBebD;(emo_#mEB+*J13P)p^wg#Dt_eB;!8Yvgg5
zC`O}nozbm4#ih$GolgG%!OU#z77~E7fMhu5*jA<HmmSydBEpl^NyjzJSYDW%No^ov
zyfTKxbe5O@0B*M22hO}4n!=SwMd*0AsC{BiaxgCJUMY$d!4*p47ErD*4{UW6*|bpH
zDM=yP!EjxxGEEXT1s35NLO4;}*R4wz2DN94R|_=sM<C`%_aH1cec(IPEQ18+r$LUj
zuQr)7+!S;wM_h`nC7YuWf(>`ZN$hd7(ah`de(Dwk921^8Rxn8Xwk+6iMi(7xsMl?e
z*hvGB!ntNb2?qxUwRl+dYTl-hdRW!a8_d7*%LNReWb_r$%?hN=8p^VTI1arJ(z!hv
zR)bNEkmGPFe-Vo6)sh&?O27aQB;vgszIUZ=#8g`7ITh1%Wbh9l9EzP@IG1#+5q(Ll
zJFRv&K}%)x8~gd-RzqG~T{h{YE$BN}sHsX?y$Iye?CCFc*rVK*%e;<^dR7Z+6aBI|
zrI3&hPQrw6IWg`85y?G$YOK64J3|0-gV5JRX~sJW8=F%^ziC{sSmfk682}on{2jfs
z)~soT?(KYukf~qwZh9YTS*;{j*ieE!tKstuE5p`r?6Voil3qh?W8D7$GZ4AzeJW7F
z3vB3k=hCd(S>`6rcZ^|i)}k;KI5p$BrrF5mq}f_4gKKn?h|)rbJ6vQRtyM9Z<{MX%
zdJ4Ms@;OkdShoNUO<%Qu>2kqzj~tVI?S*r&gV5)#dUzZ&#8g&Vb!SyJo}?=Xj4tJD
z4!AWvv=UD$M;Oa7zy#x(vvo9=61CK*pvj!=Pz6bKa<_XKVv0SnsKjfu91i~V_Nm!e
zwpZJR!N5HYJcSAdFnxV!*uGjYZ<w(Jam6{;BvErFiQ+Bt=PUr}p4B)_stF+EcI{Eb
zhh};aR#sO_c8lfO#1oYn<KD55A~aFk^`*E}M#OKtU~`O9kOs&s7q2wJ#YRPD(X4JI
zwZxXP`H`_!9SA&%e3uP2OSa}Glj~6OGNfa<7^P4N>CGB$R=X3EzA%ARS0L~^;}n7n
zC}4TdN}4E(Em}gN7LUsXi61fQDtWE3N*vpi)i63#>mSR4y+<6?yIUr>Vxt3$@^M-b
zXwt9+fKPU;r&clDo5GBq$ini5?4CIEp_3{;Twr$ZTK8IWz`KYAM;nJVS))b+U^xTk
z&vQbkq^^ePIJ+_k6Uzbj41@P^+t!6r=Z>{_#}nIzXJatq1aXR{6|=M{B=p54E0@b*
zLb!HJbN5KaNoxUlcBspKm7`^*u~lif?nP(_;D~&IS3N)+*DXv`W1`gRh89xQ=tmJS
zS@|XMTb2W$qwJ8QhK<7x4oJr}BAC}CuqV*dX1YlnEOCXv9V>=a-luY+m4@7~C{#)b
zKb3RWHv-YwR&*z;5-USexG=@Jcs{t!E0ql;#Nv04bZFTdi5vc)S0q!DZJjzLV$AxZ
zvE6LM$QuNX!@X3y)vnSOaQ^@?2X7q*tu5We(!Rg~Gi0&r*0ZIG>uXBU$YDP#IUgwF
zrD~GuiM6&NhgW%K3v)S<LC)ZWfl~hfY6)%(amM9A%A9QmvXz3}s8NLj91it%HuIzs
z9-Rkj*F!x^q;GIR0G@l(!JSJoeCybH)6z)FY}f(Xeqs(!wO_TuTc%W<=hLNODcIE_
zjFR8U3Pg%_XCZn4Q`%a~8WwlKKf(=8<QZ@<0X$&yS6HNRgbFt|Us}p_8_?1ys<FAp
z&A{pa#%ZD^knG=$#;&w7xC#QI9+@1_VDeM<eY(~>#)zyf4VNx9?io^hk7~JWOERuD
z=e;&TH13ZyrTnk}+<JRbiIhr9a^01BR7tjIjmFX0ZQ9{vSrB0E8OKV)zLbmv=N;<I
z+U3kPrr9LIvE?zwD;8V-06BzRHss>7j9VruT}GYKO`Y3)20GO4>`)+VU~__bsFARG
z4afAUm`5B+=2UINB}Y;9tx9ECQb*$i=dDcWS5Hige8!m9kd;3&f+%?jv&#?S$oHY#
z5m2dIkOuD66HdWGvt*8fqPV_9BmtA?4N*7Xu~OJ$)7rIBY;B^<vP{1=MmyAI^Kc<o
zf!>;AK3~o<4|;57BBXMd;;zCPWFV4c7(TRst78lYsiE}QWqs%i1L@kXTWLgq9Q5ys
zZc$xG_pfUhmpVPxp0PdLEfAGMrbpffy%FtLiv~bJ0|fGO{{ZTzPc6i#zH769Frkic
zDw#|ln~z~#itTD}{5uk?Z8U^#1KggKa@Ke>=2_es<y;V(h){j~YLJkTv|&X?a>JTA
zZ=(}ua{mAlH6x>l$CSXn(u{yE+;qiqcXPvgD@hSCI~<fPmHabQNIz!-pS@0oJ^9aJ
z#W>T9bw)|_EL+MWawJy-4lsMx{+D*L1y(%%qOb&}A+)GD@7z<ZCNNxi(a2Pem^{*)
zIg!0OoQ}tI((WpA$QY|pvlQ=v+*dhodh#Ot-E*ERe#Ytsw+kR_`ikLkaXkd@v2xy5
zCkk_l*0qvTE*VY$$OKkJvqY-F8-eRvnr5kOXb5!@9jC8q>7xkE>P1~6bgo`m11>h6
zdl6OTfd@J3+M_q?EQUnj9^RDpV9VE^YRarR9g)q-(VcY?WRuUeRcL|vjx$%JjPu^9
zu))Vl$uneD*bDsRE>1J)O_j1YC;)+uI#cIz&$+)rii$@ecMdbyQ+6GQHhkcd$5ZQ0
z2$|sKl*CR;pQklZrVy6-u~B>IirBS<2XhgCeKT59>Th?aM`$64BIo7`GyeeBtVFqm
z)MPeE<mZpdrj9?EcCi5R4NR_yag4QPc@jmAL@2De$S3?MT*(w*I0qQ%=~iZlhb6~e
zgjGpj&72-~ir$;K6OD@UjnZ#mJgj2|lus;(u%ICn?o~X2^r?;|%z06sl?BXSW|Q|1
zCd0@sdK`25*GhL*FmbcFM^(64A&eitxZwJGQcnwNR_5v${{VcW5~h0Kec}CSXCmVR
z?B&>>m6UX;pp7*7qPxtDon4oos6T~VB<VY&DZx}$W(2Sm8D%3q4`Wc6^Uf=&)NFp-
zp{*zLRxnSKoZ}}yFZfnWF+&vKT}2}&bW^pzQC_Vokf^T~d6gk3J2Nq3Ip(GaIKj`a
zwOWM2vxbr%GB7^oahhO{1YlQ6Mh%F7^s5+;3ys}AZ2tgCL`2%evCm<Sw7msrjF?<`
zUUPk%x0j!kw_JPGVoH;PQ+%CCC)9NPX@Lvm2H{5lnu!+?s0J_rENJ?S)QFhiijcxd
z!knCRpm!n%Esda(G18u?lhUU)6T}tdiIgzNBx0nFK5<C{WFjMs?c$U{oDq+wrD|Hn
zs>93$qudK7dg85{19vOQYi8mt+$insno^ouf{S|?=?M%#=LfZ4g4!bqCPTa)7aeNk
z8XfF}5eQIwvBoQE(?f>c5Xx2MUP%X!%DJlI>A`MoPYY6SV*xE>j!mx<u6q$zpwpzA
zDv`4uoDM5=$plA|Ki<Y_8@)~_QwcUtwR!W**3n07a_7~MMQdqc7VDpx^U&}r#lE)`
z$+i)+gMbfu=CAJNypVvzfzWoSZDx21nOhj_I-20CUZnMG^r>O#!$gkM-YZ4s7~77x
zsx7KS^LcT<mPzF1vFGt-%NMppQl#_8HOt&;a+!-l_#T9FSV2{t`Ls3Vgiii@#470{
zs}aWG#d$`hD#Ld&gOVK9lj^rqDNWl?cCKeoV%N>Ni6rMWaiG`4&a5^o*xg5|DZU|w
z2*~eUPxk%Rp{78W5_zc_1Xb=a#}&ivC5Q(-_^tg2$@X2Ury%-tu877l)SC6GRbKI`
z_z@IM$(~5>_?o7&0WLhUM{;W1cWnV5Ye6EPy1{uLTCpdT>I@-pdx2Uyl6#zdtD%{F
zVQ+I9uwUMfx>~aDBHQFe5`Om`2=}RVyY~A?iYEU6SKNBkvA6cUyg?mexrKOU<99XH
zLlB~+8SMW6%^eZ<Rg%BxQoYkI>|_gd13@8B!+PN0^x~{(cefVv2%X4)_s`umQvUw#
zYo}Z1XPI~<&!@Sjqh>xB^WV~@tl`f6p2o@)s_1$YR?)O7!PVJ@cSqOp#Xi>JNF*jX
zia0!s*B_(nji<^jnV7)GmOWOwm$5Q5cSv24{^W;+VOUA?e1Cb#I)2VpM$&2$`H0fW
zP6yo`>wRsK<4hBzin3=5gUxZPZzEuNr;gsWe$LkIt#^6<05b3fPCqKcms_T1Q7ak}
z>yX<`95)Ju+o>n6D$|WOP$d;gJ~NSyYnHf6p*fHUUAi6r0C;+Jt1WW&=q?-tRUa|V
z59?dPQ;)*VS;7zEL_Q(WSuCbyA)_jAd*|t1e6hr`;$>o;!kilQD=mLb@j6^-*3u8O
zB4mab8TA#yTxd6maPc&INNfV!Zu)xGc-r^n=h2=nCLYdS?##utU6*mN=o}x`w6&=R
z+8PNJn6}nNEO4XK6)ajU<6MMzS~9&$CIGGdW5WVfwz=~egT@9?eLZvauKb@FPBWBS
zF-^%gZH_T*q)(Le>OJb!y^NOuV}=GVlae{jcG`D_tmfDn38WG5OPmHZy%nyRV2*~-
zKwev5<MB1<Vl#?Vosw;x6mWIxYq7&x_%~3wh%{z1>NkI!)`ho%ni&`E5WKECZQ{4b
zh|E_%EwB&+fwXp|)x2K?rJRx~v}|}x^OIg|vzpIFj`x<roOztKIPGpJ9{gLy5k!li
z1EpEhbq9gc3)?|FP4bpy$y$aTWgMiJ3eH)+XN+@<^NiH5eYwO?Zg`oARB_IFXNu*P
zVHro>Tl79^bt-dR9c_+_rrky*v~!KWGLgvk=9cfmmiI2Kjupq=1Nf@WiwT0oAw~V>
zH#z=weIX`6DzPLUeJhR9pry{C`JY2e15MIOtX2A)&HbWAQU<n;CWUr~RKah@y->HZ
zhHJ%JqE;-7x21PCmQY;3&ysV&H9>ScXyj*=nSkVW;=SxXDwHW&D&B@O!O2VA*yc66
zD@ZO1SV&}#`^T+jd3zTauDb6<isLg_y0`a}c1Wx#?51mm-i2GK;}zLQ6$!`PcRA|e
z=NVb68OVg3)ySdUf_MY3H7T|cqV2;obAi}Yk*6G*)z!Jr?5t{8CZF~xR%HG5+^g;w
zABTF*k$E9OJ?dqQ5^{EoWM-oC9SI1;1J@Ov+LdeBSXkg=5G1OGI2(u+S%Wd!qbJaF
zQ#n$&3dDji3F95<qB2`>1#{CKs&4w1%DNDeTP(zqdy`T`fw7Oqm7>Q3tzFYBCAxe@
zI2}ppLz;@YQKsbVNpBjd8Oa#*tpjYc%B^i1AOL44zpYz~PKph_d+)~qb5~c(LBI++
zbH#bJvDD$z^eJH^)}(f}F-BFFB#&N{lTREVpnsTk?@YVZ650||Yh$4m$xAKO)$52E
znNKX=(!9B19cf<rBhsfuQ%7SAt8*U7K3t3yG_qS*#HAfncEIW@7Q<1wi}x352Emxh
zkACK+n&v1NOK~Yfj+i8hpRCk^v_|MgPVE|7Y^~6^jDk9EJW{3Qi9qbTJu*L)bMxwP
zI3ZlP$I3E6`qc?9rkZk~BB(+^cE?Xjl~%Of<jPd3#cXwR>aeK9cpp<$4x<@6w+z=Y
z9MUrea!30(>ryn*F~hHF(#>@$$mm7vObc%n3*U(Hv9T@aD;E;1VU9&jr>1u^WRh|-
z)}`6*Qb@6JaBd@Hc^P{gRdurnrD8b;n!OFF48)A&=bE3%0Ox4tsx2VoGZw*?L}IF=
z9FxhWU0M0^HNCw26w3)10n^^L4jf_0Bn%41zK0SMw32-&=8Jj<E3wWEFbz@GL$oFb
zEu0_1tV3e|0BZqLF@c=psieM&dwfc&*vQGnY3Y}OO`=5ship|jJ6#cEv?aBLt=2@6
z-CN86D-p=&wK?r)DBrr=y?`~Sh_Xw#4snmdt(cU>_qOBLy>mJBV@T)Wwv~WMA}V_B
zttf5P5EGVvUbQ5u1B`LSIZo8)t!F9R)kJF`Pnph1s0y)Txo|xy%%VdPnNSt!*Ep&T
zG=$}ku;!9wAtsfOkXM1z6%;@-Z_P-<C5t%e`P3xt$c;`-GLsuB#y6bho1djpOIC97
z1AsZ?<3CSYl4#{J@Z5Ja;>-%}KvjDl^-DqAt3APuNKv@eRgvan=E|r5Ck>y<tWR(Y
zF$$`+oiiC6w?I8A;)Ka<RL?p9G6Bh}m$zA6ibe+<RU2mV<J`NlM?px^F3+DMpH7t8
zy9Dft7aMns5(z(@S2$KB!9Px-tXxOV@W77MOUz{q3S^VP9+lM{j(IyW&z@OTL!LcH
zCZ$;tA@ZD&&s^4Hv&IV^3GYh;uIDN^JxvZEs%v9%Jyvj|X3TmKPF;R>a)FUT_4#pG
zkuK<qob6MBeJKK|Vq#H`RwtUvl0A(%q$G?<!jXaAks;i&WNvZO2mI!k1Ipq!_JVt}
z06#NLhUQq<lyao02L~KiZL~OCwbWKZgCt;QtqQ8cu4x$y!W=iuTNuw2#B4J&b@T$N
z*B3RI^B3;;IT@)U^5X%rSgU->Mgbgm_3KYik8hP@yLST|R7G~TJxw$XbwMT>iz?uH
zXE>#b10XC90);~4s9-oJCahSa5=hV2(vx}(MK)j4;g$1{cpMD#Td)we<2}z$O3Sig
z9p=U$so|I&nXC6Xj?seT9o!#LT$9#Ebv+_V_az%>Y-Xi`^@cJ*;EuJ78*t~J#;#fb
zyp_oGs!x|<`I|Z`Ny{%<(~fK|NzGx}7{qK@!Y~;ebv~7P-bP`Paf-@vxiVKT@6ROl
zs_vxr!95A@O<5S63M7A+lhpUDTd@fg<p+5T58*?u5EG6nX94-oCYf>*VyduX-Eq>Q
z_t4QIwo9SsuS(6nf>4;+bDl6OR2`B4rvy}2C}eVXoRgD|^{gG3q^@)DNjegw9(W@a
zdfnzpMni2G;}xZDvd1txa#Ua(cBYt1$kG5ut!XJI(9SWi=<iZU#^Ht)R(SmEh{iL>
zt1;W)45=CCnrol4l5vnua7AMqC!woXF)nVTwMNRRbw4R!b5^wb<h<PkfHMTh&l#!j
zJd4PfvV+GJffV0n)HiXAU}L9B>x5L-naeid{EN3@K`)S!`D1X}tKZh3mhNjXs2KTf
zyo1huqJ{Him`Q>|1GT;LPM+E2U?e$E0OPf9$hw$wK7%bTp5Atv+aq(0@uH8+R_b0_
zT&C-o3C0wb<+1Br;%|Y9M-eAKdl{=@NyK?(#^ao0nvPbT;!=`o(k$v)Fth@Da?;z7
zK6BXn)_;|r)wf})$`#?bhs;8}<B^YXQp==8a*HjLh^P3XbBuirchJTCnxA>YTMPE7
z>~qZ-PR5$-N`=NSdivJn`aS!o3<HE1Uzl|C=Ch=-k|I__D#NH@gI&?78Eno8Q<Qf_
zB~TB}q^b1ckSSKm{{Skv<N~ARA+yQtPVxX1cO<HVo<ZlYJ!*Kf6NU;H`VqxUAq+rJ
zOL`9Vqi>>JO&DPbQ|jy&kD;lRNX2T)j3p<c3$0S`Qi2$#Roe>fQlkV?S!r_JKkmi{
zb|Z?`hQsXEeof?&EMd2mToxzmP+se{_R)Dz4S;X}>TAxcjf{QTdb7Tk3RBj4BSI@%
z3s}`meq#=<-RUIN;zP0)z#WD#E0DR@<(<j~+P&L6R!rKorHaPnFJq3i=1bbt_?hX(
zG-)jn=&7s*1o?@9)Mo~&PvSU(lz7{Y_`$9ZPrG!w1>1770K+_r>f*Vum<DL1xnMEK
z$N9x$Dm<@UOH~tBiXU^Rw5p{S<!|<?NT!N)Rh2O0<96<~7VCd3EH?PhUF(c~wNm8*
z#u$(vumh1xk}pEJ<X*g<J9x@P7zeu^YZh6-Vl(%-%{8tiWhBeAbf|6&Xf|Y){P9{w
z32sL_dll|vjZ28wk(}i5P_aghM0~e7sAiBVoch&scnKj?0D1viD3ax8scU!4SB!yK
zx};Af+8EVF<-sGpT8`4@=!R5$djnQAYhh<+3qC`Wj%p_>XpQjkQkv$`80iFXa!F>#
zIIRsPNSMeZc0dkxlZwc5xtX^fyj0q7KWf^|!5O6$)w8a>M4`(V*&TsM<+e?L6wVGs
zSG~JS8y5%x&&s5Z^>0sDzRc0DJcG|##PJQ{++B-!kPj@K#~oUwJ7{y$gQ+!R4WV~q
zBXWA2_cZkL10g~|2ajs7u`_iBwDdh0uP#ilpDr$brk6eUJsOl%C^;pdx7s^umdHpe
zaI4oC$*y@}n$vtUBP#|t&3Yu3dmS9R9B_Hh6-QIiEww1O#zIcH!(+F-XsRubCZD@L
zV~;{WFSK#fHLs$0id$I)y~7u`&j6pf^sLu{NNzsQB9XM>w4w0B%_}=ds{sE1mZyMz
zfYWVjeUD0{Z%+5n?QQNLkSoT1QZtdz(k`tXtG?y|M^a8JoBrCd(QLlWWg)qjp)JCS
z<8?hs_foqeS$7v81WuXs$E{RoOLei~%M(pE6{*|m-ZInK*jqW0QNTSH>zd~8HTm^c
zDRnVW++j`tJ&r4!IUF7_Kys%b;MZIfV!X~Oj#GQ+cK#2C?3&s;-L7O`FXa3ysJ)7L
zFQgJ&pDkM`sD5MhK9#}vPTKP4QiIA2(e5nl2O}Lh_chS?&srK)$Jt;&(#V5!g#F*8
zc^LY2D@`S<H}-V>joLPD_0`j1{ru6E?YQo5%e83Oc#6*RNl7J=J^=u4AIiL1OSz_U
z(z$YdO?2KDdv~@murf%DPD%Md$E7Mb2+;Shs8XqUTG}3kbK-SNHICeZdJVbevQtr-
z_C|R(Y#+i82kTYRdsz_3AW;$?2m~Ddboj4sopy^w2ss#9(~(DGy*rn0E*?13%ZxbB
zBOKzm{{Rtc;_Fn}<zt2{jez6>TUxfXY^+{Jz?6-s2<J7!GnPB0a!dB>nyPWS*z@tz
zcI3Y1zxJ%M!jOrBMHu-u@>f2UvEhXCuFb@|o;dm(_pUw!d9GF@O}RJ$JDT+U3q%&y
zam0nPc_-eYtYZ_C1%r&L^F5KPYb>n$U}h`z&TFBym&*fkorkXOD<r`@2$9>U2fG2B
zpGwlxt#u2RVRarrA1Ox2{{ZV!hrGE@YNAV4SiHVPUCWFp>z*qb^HuwOv)RFuAso84
zD$b>+Fqg_%Fd1{Obq27bMzy%ZfPf!PwUye7N$Ol_#U#xO2;|aHRkJ2fBphP4*G#pZ
zIUVKNt};KuvTWp2AP&WWJd@J2=GkK+MzXAm<FUvUR4P=Y@7(9D6+Ib&ePS(}Df1vb
zaaEyTGb}(H^cB_51am?Y0irzPuQ;rSu=1Ta0ZV+!IO4v7o+c8F?s*k3@=ruT1)S1>
zwl+C9&N!<h!?z4~J0h<c!O5wl*8a^7*y96l0YL5Avt-ro?wDW_hrW7OomVob+vHju
zwD1vM6ExFH(`^RnS*C8|BLb#NT{iALshD}_4;7OHl1m^26YhFdiSEUsjih98yVAVr
zV=)}p=G5(2N>;UpTxd?R{_Va`?;6mywfiI(1OU1~MZagMAY&%0>6)Z6hDoQ-2Lzmx
zQ@zAbAPT{O^*92$KD}0=QIV3u!kn&!E{fZv1fIZF9;vUrxN{o?0P&O7tlr*|j1Y6k
z&2l=*JjoiMVqQ!!1GRI;3Ul|4%W}r((zBg!?f02Tk=XD~RDYgpLeo!Z<6yS|Ll2ph
z^H{bzN?XQQGd|vr(;rIE{?NCG93-yekDag$T(x$AFGcSb=DApqrLhJ70KDA(H4VXz
zYiT^sHd%?ueEhid0<!1St|d80{ISytY8dB|MA<ZsM^L<s{c4pbxeljd>LM8fJY;!%
zWc4*(;_*Jx!Pg)Ulx^araO-SYBp^2m4{utE-QW=_NZEb7maU@|xr?7chV6z<-Z6ns
z(&kwwEh}$h&>q!J_46l}3ZIwStZ8a8-9sonM_+oWTa>8oYt3~OxP)?h?d?`=ArSn-
zE>BNt&9$=s07z+fU=x$?TM)=meqMO4cV(hCNwU&73(X@*k9^f;XDhglwF=D2*v4ub
zR?yKR*_4iP_*8EyN%FD`ijCyRIO|ZkBalXW)+Jbc=^ID2fXC9Jj@k|3)c`)!p@fQ7
zM!-EOP_lfTy=v6j6N+WH+%5{5n|}knRao*k{ApN}8P7q|p}Uh}M#HvP^rlF|9eAqm
zIcD^wS0o+z!0CZX%wtW=u?8`@8@k~2rXm&rhbPjcDZ2m@%@1;x=MfSJJ$utk1~RcE
zvXM(H%3)MU)e7}t{8Yhsv%HNw%o_x+8Qgv9tkWv<Bjeb2s<xsg+*{^iFb7&>(j<zY
zMys@7k^ElfsZBX6pSXh<^`Op500HKoD9rn{XL5kyYP@j2nacd2RriaM&w=ZTb{8CR
zT60+iwJHl-VDn75D2Hot#aWz?pCe$_bdkKSOpH2JM^U{tE6CxxepLgbU=hIY=~fm6
zLU41MNg|MpAuI^#irq687R=cXnI_(&rfS8!LNp`;ijq5jDE$1B`c;$V1Ph#+ro{?<
zSyDK|gSe0nrA(+(h3VRz!i?tvjpHEnsAh^O8J=c(^Y2NVwgv~ktxF!&EM6fgJOWsN
zKPr4880UqWRs$fpQG&eouH(zIAVwvEu_1HLDcdq?)}d=1rlBl$<@~UIQy?3NJu{DL
zXUxi>n4O~v4`EK@<rE{tgDOC7S3Sis@?7T`&u&FJMRg%b2LKU+nvx`DZbm9w>S+~y
z2+?tZN$b|N?G_?7p*cN)sz%;X0c9T{Y#w@^wV`OMYZ8#a=bFZH(CMcOGE{<Cr#~kL
z)0)tMjFEYB4a!e`)g_9(^zp?4d6G-O9m%H{o(W1w2H;2__O5w0)!I5zOGHtM+@#VY
z4u=5yRk&kez#Mj~kV3P_0V5}j=M?md%YC&DW3oa+5#X_{7?Hf4%YZYCXPP6mfLi&Y
zY{*;vUOEq4)J8zO)XPRK%VD++tIHosr1Lw-R19;DYByr}%VMRCQ9#@?>r(U@jfue`
zEyUwBR!LO|EV%&lj`ZoIatJC%IKiZc%Zw{rf2z+T)}w97dlBzk1HS~GMmkgvb>%ix
z)y-<^#^!LkdKkbQu6ouaae0n+F-#m_*3n6;vJ-7=ZP+c&p*o~Hna}Xj-bFQxjI*7r
z58VQ(K{dvgG*a70yPWk?mIL3?oju(5cLqzO%bfF6;~Nm1xx9zG?8&$gJMe0a?6?XL
z<oZ&Zh}Kex${gp9x@rko)x((CvFX}~t1|C(p-kR|VmRxMtyR2@);)=mtiX|;pXW5}
zEYh)Iu#@;z(-3$zkQk0LT`Ed0<`RpVu~^$lqslz#P`Qja2*HOu^GGkGy9*Mi!C*-P
zlaAG1_T8djncNN!%5pzCg3I@J05g;y#s1Lrt*)i1g`9LZ(kNPE7~I5g<J12DuTWjX
zFmREsa(E}VwQIWB&80_qWfXSbX8~me^3Hv6R2NgXWGMdtAqP8wqNF8CO4^z(S;t)p
z5xvEvfXf>w>4V<3?XMt6w-Q(|8%X{hd(|Ykf_aJygDNn_&AF+3k10%R9@CuU=bBef
zbZ5%e%+oh0(lWUW=r}u%PpwF^%FzI`V;qi8BhskBXCDu+53f(wq$z6|0h{j}bv&9)
z#Rn|eERx2jZOnG>&l|e_VxpGwOolQ|q#?1}EI(RmJ()O0C0mS|j^ftHVdPdI^bB~Z
za%*PBps%V$yIoD*A>_pz2uI$G0BOysENDS|IqpX$vSxLae7KlKqo&%8BU^H^NJBrN
z=Z|{Fl22A`&lRF2xzt`)!XAA|teej^RvWXsJ#$(k5^YoprH^4!Pim>P*;tHn3e}{b
zOOu|)8e47(s)U9=H#CxHtYrCD$_FQN=M|xGe%8P0BHYKRVaTj2%}(Oxc01h@Ju{qA
zO}C&llCuDpHj*r=2xK`2s1>nitCJqfiEzZ{f&FV9DSX5(WPR)RKpD^DP4gJbmIFTZ
za!Om7MYwz?PSZ4~Su#i-wL(onv!9ri>7Mmg+fX64mBOA06x);L{{X814CCIp+-&U5
zweKsH?=K{F$U)DgSB<59Ip?seDG$wtU`MB|YTT?^d@uuOVwIC1w>$YffmG&}h@M?_
zWjO33+C;H72d_WMoU3OOe1Q~>!D<%1X^+fK-1jvd$wisgIRi!x74ePU_^DBodX(oC
zv35;aVO&NDZi6R*SlXk>aSO`QZy<)jIpUSnGYz2Q)YP(BOxkqwroxCekVwu*JqLc3
zq+uAX3|&^`sm;8*j!EDiF<Raq2{x&0C3Q&4?JV81?O4DQleGR7V$@F^#7v67h8*MG
zu2H(OH-$}GmbX0*P`Haqwvj`t=OQu}9QxN2G^~%f<nI0~^H+5{u{@z3LUxSud-tr1
zsrq2<<E?Y3`_?@Qa#U#ZJsU1Y=0;Gma>oFB*L|eg#Ri)kBZnZ8+3IV7(BS(`$YaVN
z{LOZ@cS{5dyx}&So|U(<v|Bi<<6TQZZPb$IP>vNb5KDZ(b~&hRZ$l`JzGodzwPK~p
zYMP5dWYN6jGkoq9Mgcuf(z%U8P`+sy9!w)-e7plkv0EN{#H8)i>UED1Y1XotE#XU<
zmyOuq8s}!$@9(AaBz6&xmta3GYblp(J$v)-S9H5uTe&t}UVV*xwjs)v3_##<T1J#s
z+L=zg=B(Y3Vl@IR6eYb4RJyg2SqmunhXqK%&0V&#)F&n@b!i4ayTBh>+O@IM?KZZl
zF6jXO08<$1ef?^sTFX<OmL8<%`?PX)dTrhGn=Rrmj;+{!HPvZe42vrFMWt-=tI$>W
zHHZY>T0pT|^Z*V;bTCU45iF&F1C_^o*Bx9$wnwzEE{jg0Bf7cMyftjzOhoSCKmZZN
za9$_5I*gIsE;hbZl>Yz;`qxFQSxu?xD3G@8<OK(&eznZ%mc}S{HhxFLVycQu-g~nQ
zOq)$Dk%i^9?YQQ;ZwP6xHRCL-5f}`U&<e$h-bR-wyNNjj@rt>o>UTCbuO2`wG4!qF
zCoLj*l<GH8Sng#OHZmk~zwYzGsL1;LX=cA3X?taFAfMfaJb~^#YnzD-;ZdGK+2g%m
zy;ajR!qX`dKMG5A&2q{qXwP4tmM%|ZbKW7pi&4B`8*UMB6!DYX)@7_aq}==ra6Kwn
zUMO<PGJWc8GTux1!sIDt0Y|B>i}J(B@hVi5?=I&{;O#0qtEReq1c!n3uS2wrP;L@r
zXB>5`%{Iy%D$Xl)iCBgCk8GZ%uUg8nxG}C&p1rHillGE5%sn4tNiMxklTNpUxM?Kg
zuN7|JREEvvROAej#<Qfjwn!o{N=&Wyl=Kxz_X*uwuQ?rSM+woNy2WKX^AD3!5?vdG
zKpo#0HD6tgBoW;0#~WK7wOVIJV4#&G^)+N78!{)9`AXmy9R8IGElEl4IZ14c{{XgG
zh@y@Jbz%3*Hg|u8OB)v~LC(>W?Nta!<RU+vNzMr5)Q<y@&L3j~jf8S*&|kcFlCg~6
zD$vxnyC_6>EWcW`Swog(4m)nFC?%Q3IV?_2J!;%fE4d6CrvOyCR$4Mtu3c#&X$TQ6
z0l_%MH|&<`Ndp<|J!!F9ySjz>r6(BgOt>=JyCl1n!9Op0;&8LFH&$XX7QmDlZ&E9i
z*Kco~hyhhcsjj---JLwyc*ky})^+;Ykj86OWF6V@S;Z*I_PMH)wT>>r?&<CUK;(|&
zIIgnFOQ|GLGbl`SUi8~X7wW3E-c`PMQIHL3g}1d<kOBx81GQCJm(tc86}4{VN$svY
zvgaUwvskycl0Xq74sv-t#cN9KCoHG^m(NPhn$C8Z6Ee2rlZF1Y>819EDL#a7&peCe
z4c?^tRKxdWx8?VAB=bn|vXF`~$0Tx1S5;ubHIr~XbK15^GZ{#+<zVyk4{BtPw1n_L
z?nhd(F&t#^j=<CHaU*@*!mV9uV%^HO3bLlvR#Z`p9!_ZzIOB*&@v#T*W36e*B21}_
zliZ4UwvFxnKzidRp`)A>PJTE<(>r4s^{pke#?{(7a0O1bNhI8+)1GnZS5^>TIO)*$
zqEZ=FC1hQPKD9I<n1Cu{ZdyUPa=ELK!oTv(a@{MMa!BZl(276-z+SzFYO5q3SuH0X
zg04v-!<9V0dda)G+}xgf3duIj5iE{@K^>~B^8$WG&(u{jJ2MatNN$xGXE!UxRE|Yz
zpe|!g3`Py+QRZ&PmyX`Kr4u&b0Q@SXKyB(XQmf3w?2rBgI|?UfvM%PD$Q1`58e`oq
z+>{5lYKt?j(YvKJOP9wTd)7)QRwgXUcMfyjrG|ay1mdf^0CtmrJ?cov3&5*uK^B<f
zq2nHvoqH<FHb4v83((b<l)4oQ->p?~vmuv}Qx#?fS73mJ`^UNMQSHn8rzfc<r<sE%
z-Q-jX4st70CM=8QFkFtkYFoI)vw3REBQG0}<QlIms=O1LV_X0-2kV-4Vj*`UEJyzU
zUYKqJj^KLJC7d>XQ;y&oNMkbNaKew)uas%(JxP#Y4={S3)g-p?AY2{9s3#*BH5J5x
zM$ot(f~mCo@-z2&;;JaOWKArv!lM9FP0U+CBz(gon$4O*`;Jc?{VKaLI0|=GstU$V
zt)7MXWkO9LJun76Dvz3Y%~_4}9#qveU{kvs?lX)UPyk?Ykxz_Ev1DZ7v$US{vn$5s
zS#U>ci<fSuT00I%Bh!ww@4gFwa1IHml)5lrNMX>57zF_GLGNAmJcQY9-{)<Qg$?{?
zwkc0M=aErv1}KpwXD1|~7z%y4`cjDpwkm9DoypOHu6iF#RLElqmh0N88BnPiY~zmk
z{{RYDitb(GaL*$>YFagntY{>I01lOMIHkJJl^#MaSSaW#GB^2xXPVNDCXNW@D9Vlw
z(s&F#y=y6Gbj94YZz{s6<(3ixbI%y<R+O~EC9+Lq8BdrnrzG)Cj_H6KO=l$8qG=nj
zDU5ac)s5q5Ao4p_I$vdW=LGes#o|Q>P1~5ZPBFm8t#i1$mvn5!Gcxm!r>$6yKQ=&%
zkC@}0g0P^xA;Hc?T8{HA@}4u&qETsv`x?-}YLhzMF#$o_v!9xxp5hS}-MM0V{{TwF
zyVW)yy^l_M)kyUNG@~Haj`D(5*fdX8Z*NfvVT|?Xty7icx?%`BSFol$jT~ZT8$r$w
zt!7WFNfNUw?DQ27jHR%pB)2q-u|ptc#y*ugi+Nlyl}YZNquRNvi@AQy_Jbx>+XX@E
z?@?M`Igq~MiJT1cTYDF4+{@a=_Bwlrqw`6H9aOO@q~!i}Rp)kI4nm&&X%c5(w+Q%M
zxgc~TcdYllBH_yrS8*T;BN;JDNf+XkUR{oJo`)4QfS8z<+Ek6BA9}Oa;R)Z82T_W-
zYdE|fTCPdrl#^PNtn?cs0f?Na$m^c;*buD5!x>?MdS?}C>KU!G9LQ9!1x;8>o0PR_
zZQWuA<z+wtAb=0y#R^NV!EVMS%v(z~{h<E<3H7YfxR7)l_0LM#oi`!Mg2t--gwEio
zDm(7=t>G(fXHpH3-!-a;e#7P=3IxT-Iez%|sVpH`=gx71%VUA~cc;Z+95SoF%ts)0
ztFm1%4DJ4~l2{+}?td!T%KIGZ7Wjro3R<_z7tfBOn?AK8l|)rc3>IUOPpvV@y27(K
z$-o1(Gwg9h_zDPa<mA%P?hgL|WUF(jT)PF1M`QHB{HoM2TwF*z>05B?o}#Q<zz3Nc
zkTx&nPqk-E?fH-Qh^KpOiL-mMc<p}9hi)_29`#s~&Ubvx+>_F-#|_2K-KYZ-jIrXC
ztVO%B%`z5T<OANJ%G$B0-$YdeEPJ-?41Qj7nm)$&1s&T1Jr7J%W}Z8J#3*z9<Iq-Z
z-SyS=%Gz5t^<ouq#_ANC*iwvE=Rs<gjXGPb=^jW1LU<L4u06$;qj3$q;&_n%0IgC;
z$E{^DI!x&)<xU9nBBg?Bh`i*D-6E6#>JJT$nf0MkeAjGV*4iSoPb}y6k~4dr^&3Xm
z`GF(aw1uLyM<08xDIVFlZJANUQh=P>DOs$KCkgU}+v$(5tw}U)+jl4ftzV56Ig&XY
zB2%6SKZmt%U+P+I)r?kl_NWAT240NcUti9!o0M9zG>cZT$GXWQ3?Nio{<Qe+S{r#_
zRYu-H+*gtGJ*vg&A2cd9jNnyNk7QXn>(tVEtxG})8GdKL$4ZT-mU$JPV#Rn~e(0$r
zixK6I2B3=>lVc)bdN9uKVaHmi#`_T|cPGqfxKImwo&^%`xnk}WSSSD@fDSmQf*e(p
zF0lcSF`jYHH2F#91c5f-<Qhgc_UL4|eW{#!lTDIEx3_s5;3y{<u6A8Ud#l59A<4+v
zF~IyQs|`Wamajq_mC`mZHS2R_9j%6$4Y)=>zaug~)~Pp$E|Y4;S8yYoRXd3qP|}=k
zW0S@zt^+s#U>pkeBZZ|EXrWfAB`aR$>>8M6b=2)vNXnD)fE)0t`h}D;!Y*t+XqezB
zVYxBwRNm;u6;N^yaZ3!3Zpm{Q$YOUbVLTKitW}wFs?z0yzjH<{PTNVejwnx?Fd1xg
z2CLlP-0I0Jmp2ZBZ^;@Dl=IO3wH@_>myYfq^)qsPk9sD%^HXy=ro;<?pl$<!z^odK
z7TTVCr7e*Vw6|MRi5t!Cr=?IXzy!xCc&Q+Y;_6Z&1e0A>kKp8JzSDPbjNtzOsZ;Ho
zn&Fg`ekN-ga+gD!wXwU@B?)f>Nsj#o=Us-6;Mjx_z4W4HT;e4sYS#P-Z3VDcQZ-(f
zPzN<r?JpFp8L@-UVO&)z&RR!9(4~ijb(W>u%Wo@97S;?Pa=*ecgXvrp_OiotQgv@P
zJnpYXf_Pa|c`OL|ff&K|syf|-T8um3iBe=7Fz@xQSX6O#XQ_vjBJC}XH6ms0pK4oO
zYI|G31kT@QJb$~IfJr<PG;)?#QbsDZ((aJw878|S8@n^J6)4rBxeo5q$*vT}z&T7h
z5zgUR*ZN|Wm0CT#XM<VVM!!9rD+R-50yu8#_}4=eUuliz1nt^zNzQn#k7Uw!K5G>h
z8^^iH-`u&kL?DqGg+u<x2a3mp8LlIC`BcaUzAF9mNoqs+!P|B*w}1~?qvm;zdmM}p
zLs(H<t3$@1+Ov9|iKba4w0rU~jt94`W9#~ro!^-rBxi+!#e<dq0BE1av~Ta0%Sl-V
zOH83-$?NZ2ag!vO1|#k>$*dGyo!RJS6|WUaKCI5YKp%TIC!*HhgX8}IO7oxY#&Uz)
z)lE@!>+8s)(jk^G>Z;2lZY8^%`c~X}Z}wynC*CD_z^<-tYH2+i9uhbAn%M1aW19ID
z6L8$zFR821!Q`$SfJX&=D<{L+jDi-1RW75U&q~*jM>2+tfP0GOakhu4&e*8yydI!-
zt5*(OyT=KP0n<6fP({a6fm@b(#8Bz7!XgcTK4v_hrF7D#7X9XBQcY}($eP`hM=;qS
zInFXjqWr~gY_{mdjE$YW4k^;v`Dqp8WH@FyRv+gz5VALSu^4wQ;Bd!~4Gs}nnMzLO
z1OUzQf`lH2lUK%krBZSaR`jMzZRcvz$8GbnoM3UB3K~tQ2Rw2`U9OV|yN`u@oQT`M
zB#hMYNbJRk7(K-{-PDCG(4KjvcErr8HjcRTtfwbt&0`gN5)V2!+Ttb)wZ8UwsIBH}
zyOSj3vuCNQ_cNjZyz+XANM{j-!Os<wi)g(Q9j{)$k}WN|zXbYLY(5#9(GuqMibm_X
zFmsyHhB)3|IrF<29)g*xw6``!DA=eY9QUG2l02w|cPp9gsebZ95pAeGQd^}lB)O76
z<d;2(;8j>GadEYdN)DB=Yig?BGi~`u$Q<;nTvFKIn@f~tTa{OTJFijcRid~mpX*8I
zsqa?J#8TioV2&~mHJv(?xnvQj$3yE{CDD<4y$uDpEfXEvK<iRl!X%6X7X*Faf2C5j
zOM*)?7AL4RWgp3HyYcDIN?f|=OL`K@lgA<tB}`esY}B@G3QGA#a7O?(25HN93|m}z
zi;NI^(nSu%cZt4II2h$?U$bUm*5k_nNe4Xi?kW>83z7=vvtYQB&cl)j^{qHpaSp?;
z08^AXH!2UDu^HSxOzu6&=~_1S?6}FvJt`<;1c0CpF~I9qF7IK}t(n`GJPP8J-RzEz
zUW26x20Y`2Jrs2{nRlxnC8D<Z9k|>&iqE*!gow@*pM2)4$1*zxKQlKtH8y**Xu)+S
zj%$TR61ie|$*NZ@UlR9Fc=f9jP7v)Q9@R>DN16_L{*`dv;Uc2lNTj$KC)%b0TaI}Y
z?<u7U8ePi00p}GYW>DT#drk@DFHv1e*3jm6xTy@F4Xw!Snz;n`HptswXmN(Y>+Muz
zHzHl$VG2Dssn+40x#SM!qET%cM3CIGH_SRy%%!ok)Lvw4a0MiPGwlu(dz=c*q-?e=
zK`+gQRemweUylG~xxlIx@s>NWQ^>~zC^_}4<=9ONJcYU)qu5m`Wn=gGslhBTdWwa|
z_k}p2Y(!ge-GTX4N!Y4j3copxLWCu_86;x|(zE7Z2^c5dw1~GM-aNCs5^={k!KGAI
zfVh=&yB=SEtvvY+4^q-+`=AU|YC<?T+yUv+HKG-PAq?4WN%yIpLPlyW<udrjPXd`N
zrML%*H#Am67Z`Da*VePHRZ$oz%Mn*6d~u#?jH3i8{wC{Mz{;eGyCiY)^*mO`hqO_u
zU&RZ&aR9?}Il__eRnjy^A1OVm%tV(QU=Ed1ZLJJS+P#3V)a8Xjx`!Y*KQ1%cmK!FC
zKX||~=Wc3q9?AB%Oy>vIp311qFgL$HN{1(F8o@2d1Y$Pkk+Hk2Kg%7<6H&I&k&IF`
zOvfE~q&O#@)b;Y%pjkj9bG&dWEPTXd93G>guTIB{aOik6;gmgd$2AzvO-Nati!&Bx
zIVAO=piFs`d0}yma!;*F8a3EsW;}eshA@A^tB|`o^PZTc3fUx{gVv_Ssacmx1vuca
z>cHew@m{cuE4g65bQ993Ze<-o$n8xe=a514spPq`t7A%QlQAqdsPq)Xl1OA-jzbI(
zRP_96yk~%Vp5WD#UBN~G$Drn;md1*1MVL{goP<^Yw?cXR>p`@}^BP1Bpq#3cyN`2K
z?TR46i~-b|z2^}aZQB#3Nv>(RUqh-9R@AW_r^pL@xF5q#SkME8+m1P`(|9)$vv9tK
zqPf)>ZNVq!&T@IIy`0%x@kNWs(m531w%$%p6(^YjjoXwqI&`c_^;0;>AxY{7fAFeF
zeyby3V3CZTYiLoE+~=MmD`R=CW_AeDf`ssZ<PW81-^h%Glo9h_t~zn+RPAPxNzydQ
z=Yg~kezoX#nh%F;{5_fGPwfl`ShwYJMnLQRYtg5L(&r?x7tr&jE<xPP6?+<g?$<9E
zB>){xc9ZxDW$U}n!c2k>O}NEE6p(hQI2kw{1xt!Xe9q@jqUwtnWZ$?R0-lH3s@x`S
z<p6xD=V+)PnPGxIGho}$DCtr~bT<={3FqFqc~X;T>*l;w%hsr}>@K4!bB=)3i%7&1
zv#0|-y*`yrE7<pe8usL7u0=dj9m+;j@(pD)&EaNTxWC;I4!e+(oSYi1Wj6bH32q0z
zX_rbG3>O@X@!RV~uvnqt#u#&1IIdeGRP`G>kVLL<qoz94LsHHH5X6p^PWFAyKqQJ=
zSS6W*Yzh~?E21z~yE*4k^H~~p*pb6NcX}Fa)xFVh5RHU&0<T)z?f|eE_p9xdO}{A=
zbMn0b!<lMfLFQVFGdT=FU^(57TD1xZ*fPXacPu*7=YgbgfB^1k>319~6tEz07Zpvn
zu?Z-W0URhx@(<uCTJa%`T~z>LKs*v_GXD5GZ3r?tRY;xP^7slmao(@lU0s<vwsuB~
zUo?_pNkGp4wm=`1N0)RVm4-$^$6v;-X|PzdjCCm<71&B`QIdOPRVf(HcoaV52MSp6
zimzj($@Y%qY>Ke#Z<)HCryvT3+RbhqNuDSbxD5Hgsjsc}mscZxa6s)qg*>>DX?6g-
z9C6&$!U-8pO|l(3MUwYX7Dd(>GC?w(pnYkw*fq8L!p@^(V7E|ym9?Z>+T30sy_6UU
z<=Axk9M$g=Sm~DYlcqRvkDP!QujY8G=1JJgm7L_Tx&XkCuh9Ebh15P-h9m)0WVzw9
z?N5d&8*U}SC?f=Q%|6mSAS~wc;gP(uQ)=gPdK#9mp`v!w$hku#nE;=2(x$YuI}0%f
z9fePMa3X++O1eLFUIkOPzru)|e21<&=CPMIE``NKOHr3G#g~+`h9m_YkFWHn#c$>!
zv*T##=}s}naObZFAbM0+mu&+Ga!v+1@GFy7qB`_ij=IFEBftO-+!IsSczS!1Jhcox
zb5tx@t}eO3$>%lQXcvj6PO`G2u{>}9{{ZXO(1S?IQ%u4B#FEu!Y2!sz?%W^3s*7;P
zYzg<cIqoaaudOB5+F7HG4j1@9Ab*8%cM%Ofa)E=e&k8scOHENJr=vN&eLl?s#U@7c
zlAr_A-nr(QHB%k{{{VDWuZpCd?qYYw-J}EQ?OgFJa6cnno)$0Jra4yRT(L#>VLW(9
zl?DLoocq-<guVx@TeLz{gVvbvypnvmAbVG<2cb2f>LojBHh8?T8?oJy%{~-qA9e=T
zImb>Z^IJ%}BMMk@dUU0?F6v`cD~=0xts^ZiQl)CPYTxE=z$3ZP?=6uP3Lh~5Jvpp+
zbhvP@aWcrnXKJ1WUej(;IB(U5CI(Q|%#uOi*OOWt^P9bl@eV4b(mN|vwt_H`#tVBM
zD@MxgcKpq>gV3A|R{<T}#3$sHhJEV9TD{sjxp3t=ZcuB9;oH#=s@U(|-_D4ed^2?*
z8fMcZBr+9$x_Rqd&YR;K%L{=hj4=l}2Lx5$_)OuFV<eEtl6&H_mJ+3}Ynv+3^fjEi
zlA=$T0ggE0v}|s6<+qIVK9$c$;te)dXD`cV<>g2{xy4zE=Go&RZsR@pBDq}#)ufHR
zwYFicY4-Yo%uTXja5{DLu4-r{hG&h}4u_Cyr}LIgg9^+!%8XPu_8-~{mHB4IL-zU_
z-iuLw_QsH{%cC%&8?Dr_3P~ejAFXWYI`sBd$4!~HT03M7xhi^RHI5;cDFj3oeB)`!
z{Hs#p81!gSm<ev1k~<*xuSvy8a;1BlVrtTjH0lM`iu0LY2(cF@bDU&$tU2_k1L8~g
z)w7Ha)iur4&Cn&}X+aqyu&lWt+qn17<yq6fa{Z&`=}MeivN}CV*5>}&7Pg)_<F||=
z0NjD}u5R_FM)I5$$52HGWVghT$W@O*r=?wr_B-|aKB37!c5HGhDPbKgR;cJo6L;!u
z_%BIG3BH|9z%Zo#wZEvmFx#nREwt?;Ju1GDDnX+QaK~y5qaK;fS-JiFtHz;oD&+25
zo-vFcTJojM?Jmzwj8rMvZW>0S^W2Exi()A5cr~_1l`FR6lh_=Jz_xi7G(+XXxA;_G
z{Y`4YG?IYC5QC0uW|ru2ZLLeg4gt;$MKu0dD!q8%cc{|lIVAGA8C-%rYCIDm+kt`J
zgqn9`xnD$GhUJP4@;1c;;Pk0Rs+x6@wX+!-UB%JI$`5Q*R%;xpcb+qXpkoH5n@0}c
zyN_VUJc{UxhuS&jr1mp}%^4Dcu4Fl3jB`?(vnzRGGCo}9rAsG-lq{;JIV5qKNUY?M
zhVWF6UiGA$Ic`i8l&o8}RtlpXs!OSM0uLGMPk?aDa02(N{Yv@TXw{W=sN2HhKU&~V
zo>n`yR~b7EtBy%EAD93D90co8nRiaZBa^`FDN5{Iwj0=1%S{M(EhNnDHvFo4dsLSO
zcU_jMUQN9eXEmP*kdl7rJpL6myw@>Y8IpEP3=A9)D&-X3rYXA(2|m!JL1sL#;*ms&
zcjbeU22S32$7)G+5FFrxilmn}FwP{mmDWbi?l4Et=hB>M-=Pwfku0!9D<7DGy*8e;
z470}+K}<lZpS;|fotOYONEwRcl^o~L)HhKmOvc<EK4DI!CCVsNY26EFs>a{Cbac-E
z=QUzu5n=}|>MJ+^tO{~_`x?0u379E3VO*T5Ea`G`MDg4RkY}E8v<^j1_c9(9J)rjP
zXpRxpvBg`5?BJ0i79<>F)`uweCzeKex7_&y@jdF~AY^B?IK~v@ckM_*j+xFmtmiwU
zYH+cB2?T$<C#P!XwfSVYTzQ=H$E9l|nT3hY0IZ@G>P>|?&nCH+lDW{4&RWjsyJTki
z9+ja5#?>qr<~=>CYs)1~;Rqh16hjC^R0A!JO={$&s6{cc8Du-;878DK`H~WH2Vsu2
zVNm0dkxm^5Rr$T>Od7EejbUGy5=}^qBPZp-J?Z;`;4m5fRQD0cTgpwUdHL98sWL2x
zyw#L#bw5!}o;BODBluJ8B#H@lN~OMG@{WXh8n>%o+TKnY+5v9318DAOces<*)-#eF
zsyB7?sQ^ISj!#NMB9;RHU}B`-9^tfO^{JK36D&rfU?kuQWRjIUbg0>#jsf|7DnRHL
zYjSHlYEb2w2<HRqOnDUW7p*j@C$&c5fj*wKNf1XefHQ(kR+S8k#}#$%iGd>8pe}Gi
z@^k8Y)LWFVBL=BlW@u8Md#9<X<3(lQ<aMcDAVC{Lat=>wHsME3ods!ok#X>8ml~0E
zw@`K|atX!-Qfo(2Nd$!;6WX*a<ZnGd#z@<a)jq4Ie`m;|ON5xZgOogUq_?q@r)OgZ
zYc**OT}TIwy$|O>uop5aMx%Qib^|qS<3f0U%e5d<p#0UP#e0>!sUn4r*2)|f9V!J<
z#~lS<hzVGu=Wco9G<kkkC`iv3qV@utMhW9Nr$_+<CoR)8Wl*~X9sMd9Z5%K?n~~4+
z_oDYHT@)pfLBKi3aY$q)5b|vSc<s$h(KPZZAvgzt?@hS1vbUK9!^+AJJAcBOwd_{5
zxz1s5xF<cvD#`>TdFpro4VWM2ij7xvgDuHDO-!m><8RWvM$aNBj3Mh%MH5N8XwCsW
zaZ)|FLZKKx0GwoF+nSy@5z4ORT=ge76%Ct444_vXY3iho0X1!*-G##aYFkN-jPcH~
z#O#MVWI)P(qrEjG_Xka)iUt5=aheKpagV~UMiuTd$b`4d6tD~H&$cQSP0|t<0P+Cn
zD7p?pIEho!HFg`vgFadz%H!rxaqso0;z-d>_5kCjb5Xe?q2i_4nxx{1{@DAAF$KPq
zOK|d#UQFO%WYti>9D#}psUoM951p26RUO@A7%V_mEr6#z>TPZdOG%a+d!MuwU*0gr
z-QD({<KC$x*lg_w9N_e-?;y#@1QGdC<<{bE$YbqkKXeanr@awEW@Q-UZ~z>dS5zv#
zQD(yB^0>kO01lKy(kIM^X$Oo}so3Uf?6o`+S<KKnNduty)t3wp`NcIZq*P6<xU1)D
z42=H(T4l`g-8r6l+G$+;#mO!8B-0}*2;5mmJgCXdYNpo2*s&{1E6URCB(cZ?7(T<b
zGAIjf+C7eYQ{c6^y`7dNX=LS?j!EuKY1u#(e6k0abGfse`&JbycQ>a`n9Xob2cW5K
z;hD+Ug^3yC(;2Hb7R4WGD>{y+8Ks6Pj}b2es5Oh8njH$0xX5iM#^AUQpP9HEd;b8Q
zwD=}yH*G-21Rd0~Z{86di3it#^s5O0V6Odh$i+*Q)~1n-wiS0ykwnfFnXq>p55(2W
zEjcc&?p{mC(c#9_EzF$%01Z(ozEG&WJJjl7j|vD34<?i(qV-oQNxq{EpoZauqiI~{
zJo8p9<wQTlgZWiiq%Y6|j^xu8X4{RWx#!ZUCefUvlQoR8n3;s3QBUxmwCL}bXYU)I
zb68I_p|+qap46`QGshfqG1`L*fzWlWRW)r)T~~b#d!0%>n2FE1BY{~m+#UOY$rS{y
zQ~(dL!K)By*D|^Q5Qaec-Y^06J-(HsV4|+fXE!HgOZKFh7tLG|(2BpOB2BtbxQz$}
zk8IToiyN3!E2^|$WISUd8TI<o+Fwfqa$CmI1dw6XPY3H%l4|IiwCv4|Uf#_lh+18F
z<&!POFvqo15q+GXk}ox#hSgKeRUTlGTWRBwS5j#txmOSzj9?G*)|L7(*l~mju0PR?
zPNabo@>F~K)oZv5w0Oz+au&L4T{W)dEx7sea?2xRx8qtD{v2rIifN-*QDeh4agS=H
zEgw<)JK0{x6{gzUUtdLU4jN4G9Pv`!EY{Z#9J^LUY!VMz*h%!OIefTaXD6%l{HbrW
zdrP>?*77#uImzT#G_f?(vn%TJNawuy44{?(FHobkRJe#Vq=p1^1JG2L7V_H2QPl1J
z@f~T%h}NXwZV!|6`qrHNO!+UM+h`dr*_;BWkgdoyR74T5Prns%OO-3JI-cH@Sg}Ur
zfJX!lwVaz~i6lBHRu*CbJa7rD>)94r6o5g;&CYUaOPL$*1K*`PPO^PQRf;q$?br&z
zr5|~lUz<crr6^eeW3{uu#}&~>=EfF9-a7Q|J*tc8vFY*!JB#tSZQxb*zC?@36ERij
z39V_(INcb^I-3?AA-l7;c;aB7t})c--`23NuKel5(lacC<b^*iMsC86G0(j+WQ@iM
z!t+s4^E)Ep8)|d@B(jogQ!WT8&JR*6m5s`f2VB>nJYrL{{KFXM(z%UiMSD5Sw&1j9
zoOfF9!PQImaw2KpnGVy;ag}M%u<kRHPLpSt#duP9UYM$}N&B(cz3NnL-+Kh+y&K6Z
z9_2cba8N|$W8t5icBn2c&~GXLW6*R0pRr`$B#u>6fB_lL(z*``ctR~+U$$y8rM;r(
z8~*_1q4dQSD*GBd)0UlxuTiVnTg>H^E)z<25xYq{WMFg^kl~kxQV+d)2BxuET$^YB
z2)r&i+&gnwR}iF_8%FcgV!Wv0oUZM;;!2;H$x?tYa!<8&(dm{lz)L`cuO)|Cf&4iG
zsbvhf?YpPpT1OEMq&iIIM_N+7>v|6i8KwyxzyzL*y(qo#<?Ky`^2iy$$raa1ttPD5
z4i48aI#ZW9;Nq{zq3RKU#@X3Vb>^!*w9vL5CsXb#qMTyh`Wd^TK=%-{t4}0SNBj&=
zT;m^Jy?rXeYkG`fLAr9Q&~Qai<Q{2jsp08OYY<au=yuu`qHf@uQ@gi|{TOXW$1K&2
zsY@-}v&iI@B%gY_XP7)O3Um{>bMAPo>A+K+=Wn-a;inY`CvPvf=EYT%szxpBim1-<
zGO5@OM+Y2JKFY&#?#hwIPc+*p14_sNY`4pfrnIAs3=%j$rCKtaoi}3<mCx?mr)*Qc
z#~{WlT382~q!2<K!EwhuYH7!qOPF?sJg8h^wn;Gh#?~%)a_OYCXdDvJp1#%7i*p<(
z$sm(>B&q|H=e=`Y8;|}c2pMpNc>}$AG7EN<W{xP(06s+=ab5;tNk*f$Q`*7TbAiVs
zb42n)5%-_sBehzQ-C~Ty?0^8II{J=ls?`a;kX$viaTVIC;NTB@cly;C?SgFR`8ecP
zDtfD%-PxITHlZXeTsU5=GlDB#bb=dIXlC<Rrbr*d?M{xw?b*VE=}puu<gx@t%J~`G
zhc%r_oX<^y5w_%3CN;GrmRI&Qd9F4f1Lnx!p4EpFN`n$9BhYbLR?V^n4}wU@1azf6
zRmzT<7vqjOz~1DM)MBN0qm6fDp2DEFL`B}EyY45YMK#Egf-X;d*DR+i@~5GyO7|t6
zbXY`r1Nzn_*fL9<+;t|Vl3zYRbMywHJ;Pv=TT%B}Qdd?YlaSIzLn6N2!;I5{$+Rmg
z0K+)xk?JZL0-*$q_o>-Wm?TLzC?6<%o;@q6voH#+BQm21$>CYK$JVRd8F)>>6T2Rs
zxT}`IV|~&B;~<fqqL^)jvomb@NhcZTDx)=hOywOkGvi&^J4OfhM@qQX;mRD3N|Zp0
z^8f%I)owDLPaLp39CrHEx|-b?dp!t##*s#*Y@D9PnJ18-?Tj3B-OXBgCNOzHLnu4B
z9qJk5i)?;eh1jlND~+eq-izHgaOJl{J<5;aU%+CcNEwFpKQi~LMgkioj0%EBA&3MO
zHOo0!*&9L^)t7DeADNHK^{Y$sWPmE2vX3MT{syk#Du64RQ@OlhVeiUdo|O?fT+-y@
zngnde7{)qO+`Cwi97K8QJ!+H)BMiiVPa>`uwyx)DrzgsX6+5x5ivIv4u0}>l%{pZX
zC}hR}=qfnGVCN(fc&TOuQy}D?^>!7?%X02MUZmg(Q1UZiiiI7MC6^<$I8Ipc(DtiQ
z2P>B*YjG%BV(hpXG69_9pVpdN+lqlgo|(_3SvyLAs#Ig4=bCo0D`9{~u~|cI&&{5n
zg+}8Cb9L=g1qv_$KD2>1Hd%P>ng*4M>aOHqaaLA8D-5~aQe<EN2NaFSJ$R(`Eg=B~
zNi|fK^GV%-RyRZkT>64~)PK9~PJ0TJtWcrA;2u5c{FU_vn!5?W#&MoV6&Koi;9`ps
zN#t)l98_|^7x>L6pB*x3S;14gocdE&C6Tt&ja;}PvNnUrs0_d{CqIQbqb<(^nikhM
z%W>SAw2_;*urQiWEE1)=gI9H3HeD^FX=O+ABLoF(j-BeMwDM+eB21_}J}^x>c;#gq
zixoH?+*KzM99uKXGxs14gEXwWfIFCa)aC$-yQi_H5FFuo#XE(EMq`Z*a!n>fWal2n
znUa$Ov@jh<I5i+D%vdN;PIivo)i&x<9ILQyBOvlVl?0Ci0!)mmP7Vf0sl-gf0DuQv
z)H<YyV2T!4)s$@>Qe!;zC%LIxnsh6}Hq<gI;IRQcfUJE$%OtD`J$u%o$e{v`qp%fP
z>tH*WZYH#jj8fHD!&U^~b5}w_utnv}UPj50O5i7_J?a}vS#H_f6dP2#Gq4%_`k!i*
zRY~E2<I=q*&oU7eGR>9)udO(^PME0J@y#)&Qi`T92+z%vlT&M&^H`lE+&WTRLh(pZ
z@sZaI59%s7$vi7@*P4<Wg0hJoF(5(-4bb}<0_pBBpjfhZ2PcnARfz7=*<+H|D=<PO
zGGT*fBY}=MrpY+CY_>ropgaz9!0bJ#5;(!*3~1)=3Kx12hisFQ7>YB2%~+B(MBZ6*
z=m#}iusq`c(!I)YumTAqz9|uRuuu+3#XjfkpvU%OA^8WHybrzK9@PkQ%~Mt;=$ck<
zEg~vDQh5Mp@v6)dp*0{^l$>@1^~V(qoSdIpNfRb6RDIJ(t&@spmiWjSA6m5?l<#Qw
zVn5x+;TY~2$?3;l)cpuo8qn<s!PU2n;AboKsa7CP<{L*~DVUHCPQYfRjb$ZOr2%u%
zxy45_HBeVAL`WdUO7Y2BkzdPTRfc`4EHa@8Hy>k65W27>3X#+r#`ijQFAIi|$Zo@e
z4h>n3K!9PopS*h3Y?lRHNWsYG9jah_!IV}5kGylvIjC_oQ|w&Z6JV&v^{4%&KO=53
z`8?DSB&<RrZezlMRPLH+Rgu$f4>Xi+$0_on!M_TuhzHjk)fui>NPhPi7;d@mP%ME*
zCm8B;)|h2h$yGgh&2&Zy9CN7JEv%+c8*o#&fBNcJ?wB3913l`3w;8G9xCnA%Rs>__
z&mQ%ytYgh{MemhiMr8TA1Kd?-zGvVJj8#^U%5$87#tm4vw36~~-62p;4nL5ll3KAj
zNxLFjD^q`RBUbX`&&=d-qPiPl1Xhw+#T;o9k-A42ZaocEj@ZK=l^jJddB;k&BY!PJ
zMp?amYm&Wd=#IKHZL2KV>K5q{xAKh9DbMc|aD9bLx^<=W5=m=lkw~B2Jw;LxA`<T?
z59m5o{W4D}$wQTXb6$V7lpW&EsZxxiW{i)sKI7&cfO~RlO2wl9h=wuTp8o(^v8Z`#
z9_CT*2PU&j;nam-iaQRK+wFPcV5#!6PTy5qDTJ~~z1N}!`F|7Mt!th(dF`RM5Q!2<
z^2J+eQ|(;6<;-1J=Zq4oiqDr)jS2w@I0@9`*0k!i7i3J~7Sm<<g~h`Lg^P^$I3w__
zJ9*yTJ+A)%z34#fYnuMnn|S*>D)Y*P82swwcdtHWk}(h-ozJ~<REwWW8Yx8=yhS`R
z*@3u;0|UVv*Eo|9PSz)mN2N=3a?)dTrI#m)sG>ETum^$p*7VmTY|eQuXLLX9GDNPU
zfa4AC-k))P_j_H^G}wVYMG6i+o&D;pvNW=sk?qe~tl{!h<a<`vFy+*B#mW1qH+r7c
z)Oa(*dS;Cj{{U-+o_PQW;C;&Euy!)weN8^y00o+{t4=i|%FQ7w9lg(qp>}Z`3RY2u
zW?Y(~a**6xtg!~jKQ}dj9m_1AF6CT<xOEk;9n@w694bQX&Pn9dD0?)LFG&%zyqMg-
zDC0QASy*J2H5uJimBvO!K;(+H*J_LsJ;et?cs09PXlA^|q^j=wm&-niI27e*<YB+H
zQIbY$h9F=XS7sSiIpe6PaV;^II%S2!GYG=AMhYBMw%!-E@(jOdagIp9sAJ!da7YKO
zZrMy4GZ_Jtj+L{-RE#X76x&j|GGozgp|~unPaRvF)uASGt1-z0U{%LW(*Rp)^vE3I
zs0%|K!3Y_n8R~hiZg)5DJDW=VN`}T!Hu)PUqdNsbEGpYrsZtIweJi53Rgj;Mx66!?
zRVRrc`AG%3{KBryBRv_I*72e$Msis5p4E2B!|d_ooT=j;^*y>o$2&3aTFQ}_RA68p
zC|YhSUt=0OVHAbO-aeH)&@|E@ARm{|3cf7jBO@S|&fIZ|l-lPF#~$3)od{9Xhfaxh
z;DeRxNq21<&(F*W;5hA8Y#<GB<d*XHkP9B3#;x92ExgSin6m{xc}E7W5q}XiEVMA6
z!}@g6Y<oz-?}Y-Qm%zGQq1gdUb`EP{h!c)J>VR=hX*Oktdev5|4W!9XjFHc3`ash(
z7-Eggiwopuur<tFTq@hJOKtAmaBIE1PqbRe6Ba8V!5QN<z|9<%x3XKxyI62N>%R>?
zcr_=f=3?mDeD=`HfdWcN`5d0j$Q7q-cH=p9?oCwKrf15Gjw-|~V;~HDI#%u{Jy*<$
z?js<EPq=!H^?&WG_A6&3Y1em|)z9Nq9HERbW7D9bGz1PlZi9-rO~+%3QBq3%4ety<
zlIpLqiAaGtBLw<!+PfIG#^95TayZERs|P~U8phwvZ}qbM?{7-l$vhK}P(^r{s*0sn
z*2mFc={i)Bd$BLP=_47CvZ%mQ+M~3JM_>-`QV(jC*lpnF)Ks?Ykf9O%<IW9n&Rntc
zI}&nbotRL>j=0)7ijiWC+z0tk{p<{yqXe=^GZ``fILD<}d3K@NYt3z`9UQs`+2TOs
zVzQp>IUh=o?2-9{o(F1;S=i$lK7+kHNHe!-4UW{4njMho<V70*zyq~smw2M{FhemQ
z6WXjwgB&@}p*<?3y+#geNJl}YG9t^IARvrnj+E)6z~ErwuEk?3g$k-&hd{$8@TL0<
z@?<<)aon1vG@j$Ri?EeB2RZ#I`H>VA<FNIufnjM5)s^H{Jy>!F)}y$w5S{=a{{R+v
zHMh2l(4JD9Mn5cvVk86Q7|!GVb5bb*dJs>gFxtG5C;$+9=B`GnA`zSdzTDGtNnBRc
zgn-y`h^jDl_NcSj0rtf`gO@4*1J<R9KvR;u_wFh4X?8AA&me1cPb?`>$sNzVR3WqT
z4r<Yn3EDZuM(9a7I24rog^c^s=@`d5_~WRmu)@G)vs$+i<yDuc<B?7BcLK)<r?9N#
z>}ef{AYtZh9OJcJEJt23P^4)I%JZLE5xm#OAb&c=>T6<ft+iMXLv$JbbuMr@$rP!v
zK#vC*{He|X2X8<s8xd0OQpe>d1F)*nIhgHL;EI)`+aLk3eMhB46_JTk#yVBS1fN1C
zk7*d~PiccfBmU_pp#F5BNj}uzu?29*S%~0+(zQ;+Zf7xPV2PI8a1?hnVJuz#X+et|
zW4>xsiDFSArT}aP9=_EpTuZxl-N*f*oYgnjNnMc-E-n>veNS2piU=+Xb>JKyYKNWN
zxChWwm<6{02fZTfEvrn5;E+|ij8%>Z<2m-Im(XVf^)#M)1|fJw>r&ZjB)fJlNI9rX
zgsJBlroHA)8#wJy$#SG%Fcg)_u=8%X$$Xzo)GnkClpOtPKRE##n<wj1EyO(wb5(Xb
z5HXXkO#)BOq?Sb}0+E63P^*I63TT#zgvWPIy@fqy8?rz+>}oc31MtA87?IwDOGSp5
z9tUn|$#Mq=ty25Pf<+9WfE_W^)3G)*Mbh*m6z976SLIv-o;sS%Qi{KLlkG~faxhIR
z38GiHF2pb+9gQ$c#uoyUYPZf`lh@XzjZ^;suS`}VUE@DK0pRAGt0T76>HXtYmL*pt
zVTU7;PYS9%G5HEkLs2VCvIGgenZ0w+RBsv}4$ZlU@7kX%(Z`$;>}ss8smqcW^Ni4w
z9f%|Z5+hO1zgnRzfMr+}_2#TeI&-tFRcR7$l0`nowu&N5&4r4LK1%i5n%0|Bw)=9;
zr&uMj?Al|H`HFbPdHhXfTitz{Mw7}(7!Q+wAx?VZq4ek0nH%nJb6%C&Je13rU<m~B
zImI$)T_TQBcSgX4Jm4PV_5Eq~mtSR_B=Xiky;Zs}?hQvH<Po$CoYbRNsu-<-ij)$Y
zg0~JZarxq)4p$%n&$UXA$QYr7NuvQ+7AF94k)C}iT1K8$k%ER}leIt}kl<2zfP;~q
z!laFq1!0iky*Q{fNK1gBLoZ6K#{eDK&u>beSqp-s4!O-%Z%PnN>N+(tI1AKs$;VD<
z#1cuzB<7+VQ<ch`kJgz9jyWFw)ite!#-VVKTgFV1FjZW2C*G?Gdf;O<VjJgyGaluW
zJUBF(eE~GdwGATkNxge}xXe<i<$wC)iegHtHoD{<r!^JEqdn`ExOR~GvB~`EdkA8g
z%DVL&9Q3T(X?w=B-Sk2hj{$N(QN}sR{*>s7INEXv_N@&|OkFy5w>V}1Wruu#f2~nw
z5sU$j{8nl6Ee);8^(?~!LVj7)dW`j}VNA)gVmf@A0PF8raWQud*j3Xhfk9sNn@;Ab
zriqfmIGZwK=~6qzlN?|v6-GJam7APnKJ^~YDNC~wPo+Lq-mI52mWaA$Ff$-wmEe)j
z>s2L~TpWGkDi1VBM!-~KocE|VlPCk_=e2DZSi#h|`<VC5yh5?3A1afMp7g8?(y@XM
zEm#0ibGQ8WtCrw6!2prm_oqF_mxWcw(yN*DBiXIlS!^Xg>la|BEDIE$G6%>YbI|rR
zp!WOinq*=bMo2t^Q6y?)2cYA3bMHc%WjbjIZKvCVx^uaYI2E;TExb{Hk%a(pfr_JR
z0C3<Oa9ch2rI!##yOWNUjQ!_k&0%P*5qjfRSYt9sPdypACa6BNO}@y1VjCsBzt8im
zYm3*CUG4L8z&$DyosfdPeQCyodYQ_*zJ~M{YjKiE$sH?KOpW9lQHa1eu6s=)^5G#r
zyOFvw^!!D2I!qErcd^+?RXmTSbJmKD>}yV^G8)QoQc=4j9eP%6&8)o<Ngkt$=oCD;
ze5eRAc+Dc+CE_$*Pyi06sjOpF$DypF%yHKX9j;8TgZ;pAe;Uq|z1x;W0TFi)IKa+7
zt#sO^g>FGBl{n8_*EaT>0apg7`EHc~01h~=%5sdA(aku?79oNkwEpQ>pgkY1J@H#U
zPWW<2RqO|9qiqW3jOV_4nz<{qDij_nWWp%Sp4DR{D;ysFwMJ5pAyj7ER~*&rhbrPh
z^8k5M(A5<SG_1e{Jf13(eMfG^HV&Qn&nBma-RHp>`kIzF1cU}WRm;1Cw}3?o6=1xR
zR@se=nImP~3F+3Y*g~wbw4({P0I(fug~ij(*>jQr9WlVC{h`(kfbdN=n?&_AMd<#|
zlFm3I%#1fm7v>;)(%7TMK<ki34N<l{ocHNkut-FE`;IF%xpp*8;s;>mh^uhGCzVSO
z0OZvamD!m_03({cX8DkN3e_@fOFRi07E}P|jEc-MpF48n(2UlV#KeuKk<S&0ET6vE
zgJ~xjqzxB*$z(ziwxB%+O1Bi!T3albQeC$0&qMU6-IMGJs}NG71&3BXrm1W@K_nka
zgt>=z6IbSat-P5W<ma_rhTX#QGrF^F31R^`#ckQk=DNl@o(^k88zAPm1bby6NeaUx
z4@#qX^TuBsw|rKFgPi7~k`Q4y@9S2OKO&j~8YmslHFg;?0AfHDP^y&yaz3>(g3PK8
zIHJN#)K$uc#xgjks`jezPvwBSbCXtEsQ0I%VRn$mx65(HMJyzvI*@bRRLzx(ApF2}
zs`m13a_6Z#O*`smB<x2p+r5VYx#>_dXQK2yYSq>i^U3<v19gXG$6rdhJM21ZO-WmY
z$UmKC>N;hm_}mK#K>PUUf5NP8W?`1k){u|l9s5+p$}Z`eN->hNS{$wBiFaywh{!tb
zUW8Qx9D#^<*bbP*dIH?M3JT+qgOQp?5nKh3r#S9wsbi&Yc^p#9<9~IWMWuz^+XRXS
z+I!b$qxf|#(Pg<|B%_c!ElC`OK>AjNlNo{c8RxZg*2T_h%S3BS0ZuQO>d>Gz@G>dD
z`Hi%k6Wr7?9j-d^YE}!CWi9K?bKO|!Y1~waoc08N6-rbh?SH+Vqn;`8vmhiMt5qkP
zWQQ3f^ITPGIm*WL;bboMUNT3$OBDWLUHv;%c^vd4?jx-v3QK@aMP+Rnt2D|fUz0zT
zM6o*ZNhI{*pAExWvbtchoQ#Z$m1mHG*&O!8O0tO!6&~JKf0cO0BvB2MAriRU6mSh%
z^BKqo9MqFasRjy?ahjJ=rDO>Z2&R?y#UA;6M{0p?rO86XNt_IGN|$rSUPz=dw$cF=
zR@@mI%#)M+%_RkEveS1hG2NA7OOB+9dd<iMcP2TiKWHfBRCPExsnnSxX3qrTrAEcF
zb$fn%vcq@bRpo+s=5|oRFmsk8`P6Ko2FSn+-Ooy$WtKQZOu@kGk=C}0Xw9OGQW?3<
z)!mcoYSQdr03(Cb6(U+gG)(HIG6)${>+Ml_K1{`Plj~Z_Nv#Q6j}ZmtGCq{#jo+yR
z{*@q)c*r>7r9}$9!>_$#&N~&F*@!#3imfzlmD|*Htsx;iV*}Ed2}dlydmJB1iAj|g
zV=rqH&tuZ9Ll>4o>T^g@OY_tkxXtCq@`1UB9@MUA*#kBhfyOEeyU!p1s;+yft1|!*
zaG`e$k_}W#Wmah$mIF0OE~IW!h8bAy<Y(WdTu8!<6O)dV@q#x2jx&mCWA7fdZbPtO
z0gQfCT4*I%Sw{>G4i0Mh+TSkTDl)+i6k?oYOA8x&WQC-^NdlE3Hc`Q9r85#Xg#mNH
z_N#9(;x;6Y(0&xz6eYNFPU$iL9WW~HLeZJQa7)yP3%5cAAz%(R{W+&DN)w)FY}F1e
z*l|_lCz^X43aakGw*o;O2&H3GG0S)6pnSKkDstKRk0koiU=fp5YYeJm80cxfQyz_q
zu;YR6OSA>eJBq|eN-h}F!*h|%K`!D$XTB+`AznLB1+<U`JJWc<z|JszX{4U@7n|4$
zX^_y6iL#+jQhvNtF8uOo44)~$s^!TwR=Ew>vAk2a5;zqKKg)~`y?fM%-!?HrLfn}{
zky9ijwoY^CDVZ^VPdOQ>W4Q@}S2Ygfv0^lQbU#XYftY;k6n$!(x{Qj1fyHKAUClo%
z=N^=lWXg6%g!5WL#bZ0zckC-Bc^TZ2**VQDQYyY>QtRoQRcndz%*deu>^ch8F|#w1
j7v^AcI#dNqA5uC|<}m<nJoTrfV|Ga=HLk{dw?F^c3Es^I

diff --git a/packages/client/assets/label-red.svg b/packages/client/assets/label-red.svg
index 45996aa9ce5c00fbad1f5f456e8fb86590bc4de0..4b95a931a3611b32f4698b28197fae94d64966ac 100644
GIT binary patch
delta 103
zcmdnV+{7qlQ(Ts=P@b7ml3}Z4X{Mx*k(!yFQ37I5oU7tuXH$?^lA(~6nUiCyq@0>$
zmS$<Bq>y5(<ZGZ{Vyb6kYU%@~OcV?<j4k!dd<+yUO!O>FO{$di?QHacX4`QA03rb#
A4*&oF

literal 441
zcmZutU2DQH6n&oHf4IAQ)h4N}STPg)Kn7zI<~H_N+t>!Xq_nZse{Z7O*n<$bH@WAW
zoO37B<97j#sA{PdN9Iukp%R@+m2o_nU4Mkr$8KkGzj&Q*zSc{qn+(?Pv*)KdV4slB
z!JLrAW&v*>D_|ZYWch-CxiRIKkhX2TcHrqMBdaPdbD7k{0*M1!60u^8d8tX!{o$nl
zSz!p)oT~W^HJ?)I*guf*v5;zi3&^4<BA2O!a-`)EyPZ2YU0Y~nYI2Uz(7r=1WR{!X
zTO&m~(~biaqM<!*HSx9({cW7=vq~RS%2A2d&i@eB@whJIL~txCQH!b(mu#gjPMKD)
tlSRStLBxK*e1uX<Wo$y)3qsEiL%5WnM`09rqtG?9cWnWQTars{>lt$YfCT^m

diff --git a/packages/client/assets/label.svg b/packages/client/assets/label.svg
index b1f85f3c075905e8fc884c2159fa3af33c49a929..e076c6baf856ef27c732c0c711a35cb99591afe7 100644
GIT binary patch
delta 103
zcmdnV+{7qlQ(Ts=P@b7ml3}Z4X{Mx*k(!yFQ37I5oU7tuXH$?^lA(~6nUiCyq-<<x
zZeo$9q>y5(<ZGZ{Vyb6kYU%@~OcV?<j4k!dd<+yUO!O>FO{$di?QHacX4`QA01Z$Z
At^fc4

literal 441
zcmZutU2DQH6n&oHf4IAQ)h1CZt(b{lh%h!`Zex$Njcu??N*i1K_e*pedk_NmCik3^
zbMAO@`pTgeWhJ%Z$UKT5RIC%JQjSNn?*=$|Y`4bui<kNKbF+l1PGR#lds@!{yM%o7
z=Y%Y_3wV8B0rMCk%Vz}4j44KhG)?0*eNUGuS(Q<d$+#jGNF30Th!tbZOH6|94=4T4
z3PZ5wRK;(o^(du|{R0`Da;XltfGi9{a+z8vM_Qb)-MWMGwS`6|CgT_m?K@;brkVM@
z)lxJw?KnUo9NObn6YX-*-9_;sE%i|)9F=J7{10IrkE$Yy1;?Tkl_+a*$yVt6oN5Jo
undclI=q#8nrwE0X%GiXoGw{8h@57}GIuwF|7x=EBoofq7+>%^sTfYHnvVZ3Q

diff --git a/packages/client/assets/remove.png b/packages/client/assets/remove.png
deleted file mode 100644
index c2e222a0fc7b983c77bc87fe36b1f90a848dfba8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 424
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6SkfJR9T^xl_H+M9WCijSl0AZa
z85pWm85kOx85n;42huMY7)lKo7+xhXFj&oCU=Yur6o1qWsFo?o+ueoXe|!I#{XiaP
zfk$L90|U1(2s1Lwnj--eWH0gbb!C6V&c`Pr@#*(XW}wh)PZ!4!jq|+|9l4qf1YFZa
zUxZ#cymxYjSl3?fm$ES)m#a+{h^6l8SjlyC%Kj4{?w?ng$+1am@exC#PYYDK>mqne
zxp!SYG}W6&B9C37^mvQIXJKuxUJgs+uCiNoj;mu=q!lgfS{APy-5SK1cl-HP+oYqM
z!n?0E^Hs0$S$ROa)MfszC8AxI)5V@QXZ@2Y{j|BMNXP$PMU{^07yGSoPDj`OXBGlF
zQ?<l3q9i4;B-JXpC>2OC7#SE^=o*;o8k&R{nphbbSQ(jU8yHv_7-TA^@S|wR%}>cp
XtHiBAqVCRSpaup{S3j3^P6<r_1|^C~

diff --git a/packages/client/assets/unread.svg b/packages/client/assets/unread.svg
deleted file mode 100644
index 8c3cc9f4758c0be0f6f5a12c2929cfa2204acbf8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 536
zcmZuu%}T^T3_dIP4l$kt+nH`r+~O$v$Fd;0;2)l(+m7wvI4#rZcD?GWc=Qo`n|%?}
zu8IdCFq!1bmoLf5+3H!tQrb!tMquD`1Zk2YRVEWyyGQRB&rWx?Pj)>IrqW0oyTV2=
zNQ;GpnbvjXx)20MKKH`|xVoLfWK|Z{!CcpwH#6XO!P`xf2nfhwSSy_Z-v{u#j(>bP
zy1t)Jpju`yzZss-Mt~k;cj1V!@%6Z)2>gJt$pr%D&Xo~kP1E>I=odC)QyZ7LN-9PI
zSPP^gMr1+Yr!K{|M@#)@)Br)H0@rUJ>(}@78`<Xr#b_a>6907Qan4)DZ%DM#$~^rC
z4Ep^(>#_tD$jcS(Y;VEK#)U?uE*BW~C=R()S?+#*OC_6O(bfQmut(OOBVK6fE#l-U
zvqf!4vXKqte-WfOs>(Q#0!u3^X_vB_H&Hgx5+0S-0{6nfpf?^NBt%cgIwX%2Z9FUR
M2wA(Mc0hW+0HY<LRsaA1

diff --git a/packages/client/src/components/MkChatPreview.vue b/packages/client/src/components/MkChatPreview.vue
index 13e0d92317..4d694f2dc6 100644
--- a/packages/client/src/components/MkChatPreview.vue
+++ b/packages/client/src/components/MkChatPreview.vue
@@ -103,11 +103,7 @@ function isMe(message): boolean {
 		}
 
 		&:not(.isMe):not(.isRead) {
-			> div {
-				background-image: url("/client-assets/unread.svg");
-				background-repeat: no-repeat;
-				background-position: 0 center;
-			}
+			background-color: var(--accentedBg);
 		}
 
 		&:after {
diff --git a/packages/client/src/pages/messaging/messaging-room.message.vue b/packages/client/src/pages/messaging/messaging-room.message.vue
index e8cffc061e..f97e708fe7 100644
--- a/packages/client/src/pages/messaging/messaging-room.message.vue
+++ b/packages/client/src/pages/messaging/messaging-room.message.vue
@@ -14,7 +14,7 @@
 					:title="i18n.ts.delete"
 					@click="del"
 				>
-					<img src="/client-assets/remove.png" alt="Delete" />
+				<i style="color: var(--accentLighten)" class="ph-x-circle ph-fill ph-lg"></i>
 				</button>
 				<div v-if="!message.isDeleted" class="content">
 					<Mfm

From 7e9abc9b1c6b35655a6c3285a96853cf3c0bb3ac Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Tue, 6 Jun 2023 20:17:31 +0000
Subject: [PATCH 318/319] Update 'issue_template/feature.yaml'

---
 issue_template/feature.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/issue_template/feature.yaml b/issue_template/feature.yaml
index 32f7f2c105..75da17133d 100644
--- a/issue_template/feature.yaml
+++ b/issue_template/feature.yaml
@@ -68,3 +68,5 @@ body:
       options:
         - label: I agree to follow this project's Contribution Guidelines
           required: true
+		- label: I have searched the issue tracker for similar requests, and this is not a duplicate.
+          required: true

From 7dfc94b2c13712dc6c3dc0d362c6463fb2630a30 Mon Sep 17 00:00:00 2001
From: Kainoa Kanter <kainoa@t1c.dev>
Date: Tue, 6 Jun 2023 20:17:56 +0000
Subject: [PATCH 319/319] Update 'issue_template/bug.yaml'

---
 issue_template/bug.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/issue_template/bug.yaml b/issue_template/bug.yaml
index 3a21f1399a..b7f0c70986 100644
--- a/issue_template/bug.yaml
+++ b/issue_template/bug.yaml
@@ -68,3 +68,5 @@ body:
       options:
         - label: I agree to follow this project's Contribution Guidelines
           required: true
+		- label: I have searched the issue tracker for similar issues, and this is not a duplicate.
+          required: true