From de4da3c1fd491376e4b59585e28d339e26722989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=91=A8=E9=83=A8=E8=90=BD?=
 <laozhoubuluo@gmail.com>
Date: Tue, 19 Mar 2024 22:37:46 +0800
Subject: [PATCH 01/99] docs: add minimum dependencies

---
 dev/docs/local-installation.md |  2 ++
 docs/install.md                | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/dev/docs/local-installation.md b/dev/docs/local-installation.md
index a13aa6437f..132d86bd56 100644
--- a/dev/docs/local-installation.md
+++ b/dev/docs/local-installation.md
@@ -42,6 +42,8 @@ cargo --version
 
 ### PostgreSQL and PGroonga
 
+Firefish requires PostgreSQL v12 or later. While you can choose any versions between v12 and the latest version (v16.2 as of writing), we recommend that you install v12.x so as not to use new features inadvertently and introduce incompatibility issues.
+
 PostgreSQL install instructions can be found at [this page](https://www.postgresql.org/download/).
 
 ```sh
diff --git a/docs/install.md b/docs/install.md
index 061000fa32..f030e87125 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -4,6 +4,8 @@ This document shows an example procedure for installing Firefish on Debian 12. N
 
 If you want to use the pre-built container image, please refer to [`install-container.md`](./install-container.md).
 
+If you do not prepare your environment as document, be sure to meet the minimum dependencies given at the bottom of the page.
+
 Make sure that you can use the `sudo` command before proceeding.
 
 ## 1. Install dependencies
@@ -315,3 +317,31 @@ cd ~/firefish
   - Run `psql -d firefish` (or whatever the database name is)
   - Run `UPDATE "user" SET "isAdmin" = true WHERE id='999999';` (replace `999999` with the copied ID)
   - Restart your Firefish server
+
+## Dependencies
+
+**We only recommend that you use components that are still within the upstream support cycle for better performance and security, and it is recommended that new sites meet the recommended dependency version requirements.**
+
+- At least [NodeJS](https://nodejs.org/en/) v18.17.0 (v20/v21 recommended)
+- At least [PostgreSQL](https://www.postgresql.org/) v12 (v16 recommended) with [PGroonga](https://pgroonga.github.io/) extension
+- At least [Redis](https://redis.io/) v7
+- Web Proxy (one of the following)
+  - Caddy (recommended for new users)
+  - Nginx (recommended)
+  - Apache
+
+### Optional dependencies
+
+- [FFmpeg](https://ffmpeg.org/) for video transcoding
+- Caching server (one of the following)
+  - [DragonflyDB](https://www.dragonflydb.io/) (recommended)
+  - [KeyDB](https://keydb.dev/)
+  - Another [Redis](https://redis.io/) server
+
+### Build dependencies
+
+- At least [Rust](https://www.rust-lang.org/) v1.74
+- C/C++ compiler & build tools
+  - `build-essential` on Debian/Ubuntu Linux
+  - `base-devel` on Arch Linux
+- [Python 3](https://www.python.org/)

From db0bd21edcc4681dac033b7ec4184cb555940607 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=91=A8=E9=83=A8=E8=90=BD?=
 <laozhoubuluo@gmail.com>
Date: Mon, 11 Mar 2024 08:33:47 +0800
Subject: [PATCH 02/99] feat(client): attachment without description opened
 when choose add alt

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

diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index 3890908026..ad8c4c5ba3 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -500,6 +500,8 @@ const withHashtags = computed(
 );
 const hashtags = computed(defaultStore.makeGetterSetter("postFormHashtags"));
 
+let firstTryPost = true;
+
 watch(text, () => {
 	checkMissingMention();
 });
@@ -1048,16 +1050,91 @@ async function post() {
 		defaultStore.state.showNoAltTextWarning &&
 		files.value.some((f) => f.comment == null || f.comment.length === 0)
 	) {
+		if (firstTryPost) {
+			for (const file of files.value) {
+				if (file.comment == null || file.comment.length === 0) {
+					os.popup(
+						defineAsyncComponent(
+							() => import("@/components/MkMediaCaption.vue"),
+						),
+						{
+							title: i18n.ts.describeFile,
+							input: {
+								placeholder: i18n.ts.inputNewDescription,
+								default:
+									file.comment !== null ? file.comment : "",
+							},
+							image: file,
+						},
+						{
+							done: (result) => {
+								if (!result || result.canceled) return;
+								const comment =
+									result.result.length === 0
+										? null
+										: result.result;
+								os.api("drive/files/update", {
+									fileId: file.id,
+									comment,
+								}).then(() => {
+									file.comment = comment;
+								});
+							},
+						},
+						"closed",
+					);
+				}
+			}
+			firstTryPost = false;
+			return;
+		}
+
 		// "canceled" means "post anyway"
 		const { canceled } = await os.confirm({
 			type: "warning",
 			text: i18n.ts.noAltTextWarning,
-			okText: i18n.ts.goBack,
+			okText: i18n.ts.describeFile,
 			cancelText: i18n.ts.toPost,
 			isPlaintext: true,
 		});
 
-		if (!canceled) return;
+		if (!canceled) {
+			for (const file of files.value) {
+				if (file.comment == null || file.comment.length === 0) {
+					os.popup(
+						defineAsyncComponent(
+							() => import("@/components/MkMediaCaption.vue"),
+						),
+						{
+							title: i18n.ts.describeFile,
+							input: {
+								placeholder: i18n.ts.inputNewDescription,
+								default:
+									file.comment !== null ? file.comment : "",
+							},
+							image: file,
+						},
+						{
+							done: (result) => {
+								if (!result || result.canceled) return;
+								const comment =
+									result.result.length === 0
+										? null
+										: result.result;
+								os.api("drive/files/update", {
+									fileId: file.id,
+									comment,
+								}).then(() => {
+									file.comment = comment;
+								});
+							},
+						},
+						"closed",
+					);
+				}
+			}
+			return;
+		}
 	}
 
 	const processedText = preprocess(text.value);

From 2267e90d3bfb9ac51ed6dcdaee051c39c594bd19 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 25 Mar 2024 03:12:59 +0900
Subject: [PATCH 03/99] refactor (client): await asynchronous processes, remove
 duplicate code

---
 packages/client/src/components/MkPostForm.vue | 99 +++++++------------
 1 file changed, 35 insertions(+), 64 deletions(-)

diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index ad8c4c5ba3..6478838f4e 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -309,6 +309,8 @@ import XNoteSimple from "@/components/MkNoteSimple.vue";
 import XNotePreview from "@/components/MkNotePreview.vue";
 import XPostFormAttaches from "@/components/MkPostFormAttaches.vue";
 import XPollEditor from "@/components/MkPollEditor.vue";
+import XCheatSheet from "@/components/MkCheatSheetDialog.vue";
+import XMediaCaption from "@/components/MkMediaCaption.vue";
 import { host, url } from "@/config";
 import { erase, unique } from "@/scripts/array";
 import { extractMentions } from "@/scripts/extract-mentions";
@@ -325,7 +327,6 @@ import { getAccounts, openAccountMenu as openAccountMenu_ } from "@/account";
 import { me } from "@/me";
 import { uploadFile } from "@/scripts/upload";
 import { deepClone } from "@/scripts/clone";
-import XCheatSheet from "@/components/MkCheatSheetDialog.vue";
 import preprocess from "@/scripts/preprocess";
 import { vibrate } from "@/scripts/vibrate";
 import { langmap } from "@/scripts/langmap";
@@ -500,7 +501,7 @@ const withHashtags = computed(
 );
 const hashtags = computed(defaultStore.makeGetterSetter("postFormHashtags"));
 
-let firstTryPost = true;
+let isFirstPostAttempt = true;
 
 watch(text, () => {
 	checkMissingMention();
@@ -1012,6 +1013,34 @@ function deleteDraft() {
 	localStorage.setItem("drafts", JSON.stringify(draftData));
 }
 
+async function openFileDescriptionWindow(file: DriveFile) {
+	await os.popup(
+		XMediaCaption,
+		{
+			title: i18n.ts.describeFile,
+			input: {
+				placeholder: i18n.ts.inputNewDescription,
+				default: file.comment !== null ? file.comment : "",
+			},
+			image: file,
+		},
+		{
+			done: (result) => {
+				if (!result || result.canceled) return;
+				const comment =
+					result.result.length === 0 ? null : result.result;
+				os.api("drive/files/update", {
+					fileId: file.id,
+					comment,
+				}).then(() => {
+					file.comment = comment;
+				});
+			},
+		},
+		"closed",
+	);
+}
+
 async function post() {
 	// For text that is too short, the false positive rate may be too high, so we don't show alarm.
 	if (defaultStore.state.autocorrectNoteLanguage && text.value.length > 10) {
@@ -1050,42 +1079,13 @@ async function post() {
 		defaultStore.state.showNoAltTextWarning &&
 		files.value.some((f) => f.comment == null || f.comment.length === 0)
 	) {
-		if (firstTryPost) {
+		if (isFirstPostAttempt) {
 			for (const file of files.value) {
 				if (file.comment == null || file.comment.length === 0) {
-					os.popup(
-						defineAsyncComponent(
-							() => import("@/components/MkMediaCaption.vue"),
-						),
-						{
-							title: i18n.ts.describeFile,
-							input: {
-								placeholder: i18n.ts.inputNewDescription,
-								default:
-									file.comment !== null ? file.comment : "",
-							},
-							image: file,
-						},
-						{
-							done: (result) => {
-								if (!result || result.canceled) return;
-								const comment =
-									result.result.length === 0
-										? null
-										: result.result;
-								os.api("drive/files/update", {
-									fileId: file.id,
-									comment,
-								}).then(() => {
-									file.comment = comment;
-								});
-							},
-						},
-						"closed",
-					);
+					await openFileDescriptionWindow(file);
 				}
 			}
-			firstTryPost = false;
+			isFirstPostAttempt = false;
 			return;
 		}
 
@@ -1101,36 +1101,7 @@ async function post() {
 		if (!canceled) {
 			for (const file of files.value) {
 				if (file.comment == null || file.comment.length === 0) {
-					os.popup(
-						defineAsyncComponent(
-							() => import("@/components/MkMediaCaption.vue"),
-						),
-						{
-							title: i18n.ts.describeFile,
-							input: {
-								placeholder: i18n.ts.inputNewDescription,
-								default:
-									file.comment !== null ? file.comment : "",
-							},
-							image: file,
-						},
-						{
-							done: (result) => {
-								if (!result || result.canceled) return;
-								const comment =
-									result.result.length === 0
-										? null
-										: result.result;
-								os.api("drive/files/update", {
-									fileId: file.id,
-									comment,
-								}).then(() => {
-									file.comment = comment;
-								});
-							},
-						},
-						"closed",
-					);
+					await openFileDescriptionWindow(file);
 				}
 			}
 			return;

From f346d2e2f6b4674c9af03e761bf991b1c98f7d17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=91=A8=E9=83=A8=E8=90=BD?=
 <laozhoubuluo@gmail.com>
Date: Mon, 25 Mar 2024 22:52:37 +0800
Subject: [PATCH 04/99] feat: add showAddFileDescriptionAtFirstPost and allow
 cancel adding alt-text midway

---
 locales/en-US.yml                             |  2 +
 locales/zh-CN.yml                             |  1 +
 packages/client/src/components/MkPostForm.vue | 86 ++++++++++++-------
 .../client/src/pages/settings/general.vue     |  6 ++
 .../pages/settings/preferences-backups.vue    |  1 +
 packages/client/src/store.ts                  |  4 +
 6 files changed, 71 insertions(+), 29 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index d736a7d881..116b8eabd0 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1226,6 +1226,8 @@ publishTimelinesDescription: "If enabled, the Local and Global timelines will be
   on {url} even when signed out."
 noAltTextWarning: "Some attached file(s) have no description. Did you forget to write?"
 showNoAltTextWarning: "Show a warning if you attempt to post files without a description"
+showAddFileDescriptionAtFirstPost: "Show add description page automatically when
+  first try to post a post attachment without a description"
 
 _emojiModPerm:
   unauthorized: "None"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index f67bf4a600..8f5d009acc 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -2058,5 +2058,6 @@ searchRangeDescription: "如果您要过滤时间段，请按以下格式输入
 messagingUnencryptedInfo: "Firefish 上的聊天没有经过端到端加密，请不要在聊天中分享您的敏感信息。"
 noAltTextWarning: 有些附件没有描述。您是否忘记写描述了？
 showNoAltTextWarning: 当您尝试发布没有描述的帖子附件时显示警告
+showAddFileDescriptionAtFirstPost: 当您首次尝试发布没有描述的帖子附件时自动弹出添加描述页面
 autocorrectNoteLanguage: 当帖子语言不符合自动检测的结果的时候显示警告
 incorrectLanguageWarning: "看上去您帖子使用的语言是{detected}，但您选择的语言是{current}。\n要改为以{detected}发帖吗？"
diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index 6478838f4e..fee812317e 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -1013,32 +1013,43 @@ function deleteDraft() {
 	localStorage.setItem("drafts", JSON.stringify(draftData));
 }
 
-async function openFileDescriptionWindow(file: DriveFile) {
-	await os.popup(
-		XMediaCaption,
-		{
-			title: i18n.ts.describeFile,
-			input: {
-				placeholder: i18n.ts.inputNewDescription,
-				default: file.comment !== null ? file.comment : "",
+/**
+ * @returns whether the file is described
+ */
+ function openFileDescriptionWindow(file: entities.DriveFile) {
+	return new Promise<boolean>((resolve, reject) => {
+		os.popup(
+			XMediaCaption,
+			{
+				title: i18n.ts.describeFile,
+				input: {
+					placeholder: i18n.ts.inputNewDescription,
+					default: file.comment !== null ? file.comment : "",
+				},
+				image: file,
 			},
-			image: file,
-		},
-		{
-			done: (result) => {
-				if (!result || result.canceled) return;
-				const comment =
-					result.result.length === 0 ? null : result.result;
-				os.api("drive/files/update", {
-					fileId: file.id,
-					comment,
-				}).then(() => {
-					file.comment = comment;
-				});
+			{
+				done: (result) => {
+					if (!result || result.canceled) {
+						resolve(false);
+						return;
+					}
+					const comment =
+						result.result.length === 0 ? null : result.result;
+ 					os.api("drive/files/update", {
+						fileId: file.id,
+						comment,
+					}).then(() => {
+						resolve(true);
+						file.comment = comment;
+					}).catch((err: unknown) => {
+						reject(err);
+					});
+				},
 			},
-		},
-		"closed",
-	);
+			"closed",
+		);
+	})
 }
 
 async function post() {
@@ -1076,19 +1087,30 @@ async function post() {
 	}
 
 	if (
-		defaultStore.state.showNoAltTextWarning &&
+		defaultStore.state.showAddFileDescriptionAtFirstPost &&
 		files.value.some((f) => f.comment == null || f.comment.length === 0)
 	) {
 		if (isFirstPostAttempt) {
 			for (const file of files.value) {
 				if (file.comment == null || file.comment.length === 0) {
-					await openFileDescriptionWindow(file);
+					const described = await openFileDescriptionWindow(file);
+					if (!described) {
+						return;
+					}
 				}
 			}
 			isFirstPostAttempt = false;
-			return;
+			// Continue if all files have alt-text added.
+			if (files.value.some((f) => f.comment == null || f.comment.length === 0)) {
+				return;
+			}
 		}
+	}
 
+	if (
+		defaultStore.state.showNoAltTextWarning &&
+		files.value.some((f) => f.comment == null || f.comment.length === 0)
+	) {
 		// "canceled" means "post anyway"
 		const { canceled } = await os.confirm({
 			type: "warning",
@@ -1101,10 +1123,16 @@ async function post() {
 		if (!canceled) {
 			for (const file of files.value) {
 				if (file.comment == null || file.comment.length === 0) {
-					await openFileDescriptionWindow(file);
+					const described = await openFileDescriptionWindow(file);
+					if (!described) {
+						return;
+					}
 				}
 			}
-			return;
+			// Continue if all files have alt-text added.
+			if (files.value.some((f) => f.comment == null || f.comment.length === 0)) {
+				return;
+			}
 		}
 	}
 
diff --git a/packages/client/src/pages/settings/general.vue b/packages/client/src/pages/settings/general.vue
index 15e1172169..bc21efc132 100644
--- a/packages/client/src/pages/settings/general.vue
+++ b/packages/client/src/pages/settings/general.vue
@@ -124,6 +124,9 @@
 			<FormSwitch v-model="showNoAltTextWarning" class="_formBlock">{{
 				i18n.ts.showNoAltTextWarning
 			}}</FormSwitch>
+			<FormSwitch v-model="showAddFileDescriptionAtFirstPost" class="_formBlock">{{
+				i18n.ts.showAddFileDescriptionAtFirstPost
+			}}</FormSwitch>
 			<FormSwitch v-model="autocorrectNoteLanguage" class="_formBlock">{{
 				i18n.ts.autocorrectNoteLanguage
 			}}</FormSwitch>
@@ -533,6 +536,9 @@ const pullToRefreshThreshold = computed(
 const showNoAltTextWarning = computed(
 	defaultStore.makeGetterSetter("showNoAltTextWarning"),
 );
+const showAddFileDescriptionAtFirstPost = computed(
+	defaultStore.makeGetterSetter("showAddFileDescriptionAtFirstPost"),
+);
 const autocorrectNoteLanguage = computed(
 	defaultStore.makeGetterSetter("autocorrectNoteLanguage"),
 );
diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue
index 202de0a082..885fec70c1 100644
--- a/packages/client/src/pages/settings/preferences-backups.vue
+++ b/packages/client/src/pages/settings/preferences-backups.vue
@@ -125,6 +125,7 @@ const defaultStoreSaveKeys: (keyof (typeof defaultStore)["state"])[] = [
 	"enablePullToRefresh",
 	"pullToRefreshThreshold",
 	"showNoAltTextWarning",
+	"showAddFileDescriptionAtFirstPost",
 	"autocorrectNoteLanguage",
 ];
 const coldDeviceStorageSaveKeys: (keyof typeof ColdDeviceStorage.default)[] = [
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index cf17917477..11abb2e30f 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -432,6 +432,10 @@ export const defaultStore = markRaw(
 			where: "account",
 			default: true,
 		},
+		showAddFileDescriptionAtFirstPost: {
+			where: "account",
+			default: false,
+		},
 		autocorrectNoteLanguage: {
 			where: "account",
 			default: true,

From 46bf02cdd591df1bed64677ccb15e358aa6b921d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=91=A8=E9=83=A8=E8=90=BD?=
 <laozhoubuluo@gmail.com>
Date: Sun, 31 Mar 2024 06:44:00 +0800
Subject: [PATCH 05/99] chore: format

---
 packages/client/src/components/MkPostForm.vue | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index fee812317e..ffeb1a1cc5 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -1016,7 +1016,7 @@ function deleteDraft() {
 /**
  * @returns whether the file is described
  */
- function openFileDescriptionWindow(file: entities.DriveFile) {
+function openFileDescriptionWindow(file: entities.DriveFile) {
 	return new Promise<boolean>((resolve, reject) => {
 		os.popup(
 			XMediaCaption,
@@ -1034,22 +1034,23 @@ function deleteDraft() {
 						resolve(false);
 						return;
 					}
-					const comment =
-						result.result.length === 0 ? null : result.result;
- 					os.api("drive/files/update", {
+					const comment = result.result.length === 0 ? null : result.result;
+					os.api("drive/files/update", {
 						fileId: file.id,
 						comment,
-					}).then(() => {
-						resolve(true);
-						file.comment = comment;
-					}).catch((err: unknown) => {
-						reject(err);
-					});
+					})
+						.then(() => {
+							resolve(true);
+							file.comment = comment;
+						})
+						.catch((err: unknown) => {
+							reject(err);
+						});
 				},
 			},
 			"closed",
 		);
-	})
+	});
 }
 
 async function post() {
@@ -1101,7 +1102,9 @@ async function post() {
 			}
 			isFirstPostAttempt = false;
 			// Continue if all files have alt-text added.
-			if (files.value.some((f) => f.comment == null || f.comment.length === 0)) {
+			if (
+				files.value.some((f) => f.comment == null || f.comment.length === 0)
+			) {
 				return;
 			}
 		}
@@ -1130,7 +1133,9 @@ async function post() {
 				}
 			}
 			// Continue if all files have alt-text added.
-			if (files.value.some((f) => f.comment == null || f.comment.length === 0)) {
+			if (
+				files.value.some((f) => f.comment == null || f.comment.length === 0)
+			) {
 				return;
 			}
 		}

From f44a2937d4a7ab3c8b15f00b74623a158909e35b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=91=A8=E9=83=A8=E8=90=BD?=
 <laozhoubuluo@gmail.com>
Date: Sat, 13 Apr 2024 07:41:11 +0800
Subject: [PATCH 06/99] fix: download-url should use proxy bypass hosts

---
 packages/backend/src/misc/download-url.ts |  7 ++-----
 packages/backend/src/misc/fetch.ts        | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/misc/download-url.ts b/packages/backend/src/misc/download-url.ts
index ab04e8aa9c..663d354ead 100644
--- a/packages/backend/src/misc/download-url.ts
+++ b/packages/backend/src/misc/download-url.ts
@@ -2,7 +2,7 @@ import * as fs from "node:fs";
 import * as stream from "node:stream";
 import * as util from "node:util";
 import got, * as Got from "got";
-import { httpAgent, httpsAgent, StatusError } from "./fetch.js";
+import { getAgentByHostname, StatusError } from "./fetch.js";
 import config from "@/config/index.js";
 import chalk from "chalk";
 import Logger from "@/services/logger.js";
@@ -40,10 +40,7 @@ export async function downloadUrl(url: string, path: string): Promise<void> {
 				send: timeout,
 				request: operationTimeout, // whole operation timeout
 			},
-			agent: {
-				http: httpAgent,
-				https: httpsAgent,
-			},
+			agent: getAgentByHostname(new URL(url).hostname),
 			http2: false, // default
 			retry: {
 				limit: 0,
diff --git a/packages/backend/src/misc/fetch.ts b/packages/backend/src/misc/fetch.ts
index 4b8fc048e2..2cfd6b95f7 100644
--- a/packages/backend/src/misc/fetch.ts
+++ b/packages/backend/src/misc/fetch.ts
@@ -171,6 +171,25 @@ export function getAgentByUrl(url: URL, bypassProxy = false) {
 	}
 }
 
+/**
+ * Get agent by Hostname
+ * @param hostname Hostname
+ * @param bypassProxy Allways bypass proxy
+ */
+export function getAgentByHostname(hostname: string, bypassProxy = false) {
+	if (bypassProxy || (config.proxyBypassHosts || []).includes(hostname)) {
+		return {
+			http: _http,
+			https: _https,
+		};
+	} else {
+		return {
+			http: httpAgent,
+			https: httpsAgent,
+		};
+	}
+}
+
 export class StatusError extends Error {
 	public statusCode: number;
 	public statusMessage?: string;

From 5eff4da27b382226bcd0be0772dac6105ade4216 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=91=A8=E9=83=A8=E8=90=BD?=
 <laozhoubuluo@gmail.com>
Date: Sat, 13 Apr 2024 08:59:11 +0800
Subject: [PATCH 07/99] feat: antenna limit

---
 locales/en-US.yml                             |  1 +
 locales/zh-CN.yml                             |  1 +
 packages/backend-rs/index.d.ts                |  1 +
 packages/backend-rs/src/model/entity/meta.rs  |  2 ++
 .../migration/1712937600000-antennaLimit.ts   | 19 +++++++++++++++++++
 packages/backend/src/models/entities/meta.ts  |  6 ++++++
 .../src/server/api/endpoints/admin/meta.ts    |  6 ++++++
 .../server/api/endpoints/admin/update-meta.ts |  5 +++++
 .../server/api/endpoints/antennas/create.ts   |  5 ++++-
 .../backend/src/server/api/endpoints/meta.ts  |  6 ++++++
 packages/client/src/pages/admin/settings.vue  | 16 ++++++++++++++++
 packages/firefish-js/src/entities.ts          |  1 +
 12 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 packages/backend/src/migration/1712937600000-antennaLimit.ts

diff --git a/locales/en-US.yml b/locales/en-US.yml
index f8da18450c..a8663375a8 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -394,6 +394,7 @@ enableRegistration: "Enable new user registration"
 invite: "Invite"
 driveCapacityPerLocalAccount: "Drive capacity per local user"
 driveCapacityPerRemoteAccount: "Drive capacity per remote user"
+antennaLimit: "The maximum number of antennas that each user can create"
 inMb: "In megabytes"
 iconUrl: "Icon URL"
 bannerUrl: "Banner image URL"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index a8510612dc..9e7a0ed19e 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -340,6 +340,7 @@ invite: "邀请"
 driveCapacityPerLocalAccount: "每个本地用户的网盘容量"
 driveCapacityPerRemoteAccount: "每个远程用户的网盘容量"
 inMb: "以兆字节 (MegaByte) 为单位"
+antennaLimit: "每个用户最多可以创建的天线数量"
 iconUrl: "图标 URL"
 bannerUrl: "横幅图 URL"
 backgroundImageUrl: "背景图 URL"
diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index 617bedf5b9..509c3d912d 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -443,6 +443,7 @@ export interface Meta {
   recaptchaSecretKey: string | null
   localDriveCapacityMb: number
   remoteDriveCapacityMb: number
+  antennaLimit: number
   summalyProxy: string | null
   enableEmail: boolean
   email: string | null
diff --git a/packages/backend-rs/src/model/entity/meta.rs b/packages/backend-rs/src/model/entity/meta.rs
index b9a89914bd..7d0972b844 100644
--- a/packages/backend-rs/src/model/entity/meta.rs
+++ b/packages/backend-rs/src/model/entity/meta.rs
@@ -50,6 +50,8 @@ pub struct Model {
     pub local_drive_capacity_mb: i32,
     #[sea_orm(column_name = "remoteDriveCapacityMb")]
     pub remote_drive_capacity_mb: i32,
+    #[sea_orm(column_name = "antennaLimit")]
+    pub antenna_limit: i32,
     #[sea_orm(column_name = "summalyProxy")]
     pub summaly_proxy: Option<String>,
     #[sea_orm(column_name = "enableEmail")]
diff --git a/packages/backend/src/migration/1712937600000-antennaLimit.ts b/packages/backend/src/migration/1712937600000-antennaLimit.ts
new file mode 100644
index 0000000000..cd8f9ff658
--- /dev/null
+++ b/packages/backend/src/migration/1712937600000-antennaLimit.ts
@@ -0,0 +1,19 @@
+import type { MigrationInterface, QueryRunner } from "typeorm";
+
+export class antennaLimit1712937600000 implements MigrationInterface {
+	async up(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(
+			`ALTER TABLE "meta" ADD "antennaLimit" integer NOT NULL DEFAULT 5`,
+			undefined,
+		);
+		await queryRunner.query(
+			`COMMENT ON COLUMN "meta"."antennaLimit" IS 'Antenna Limit'`,
+		);
+	}
+	async down(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(
+			`ALTER TABLE "meta" DROP COLUMN "antennaLimit"`,
+			undefined,
+		);
+	}
+}
diff --git a/packages/backend/src/models/entities/meta.ts b/packages/backend/src/models/entities/meta.ts
index cdb8e14c3f..5e267a8e24 100644
--- a/packages/backend/src/models/entities/meta.ts
+++ b/packages/backend/src/models/entities/meta.ts
@@ -276,6 +276,12 @@ export class Meta {
 	})
 	public remoteDriveCapacityMb: number;
 
+	@Column("integer", {
+		default: 5,
+		comment: "Antenna Limit",
+	})
+	public antennaLimit: number;
+
 	@Column("varchar", {
 		length: 128,
 		nullable: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index a22fbab8f1..1f382f1254 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -24,6 +24,11 @@ export const meta = {
 				optional: false,
 				nullable: false,
 			},
+			antennaLimit: {
+				type: "number",
+				optional: false,
+				nullable: false,
+			},
 			cacheRemoteFiles: {
 				type: "boolean",
 				optional: false,
@@ -487,6 +492,7 @@ export default define(meta, paramDef, async () => {
 		enableGuestTimeline: instance.enableGuestTimeline,
 		driveCapacityPerLocalUserMb: instance.localDriveCapacityMb,
 		driveCapacityPerRemoteUserMb: instance.remoteDriveCapacityMb,
+		antennaLimit: instance.antennaLimit,
 		emailRequiredForSignup: instance.emailRequiredForSignup,
 		enableHcaptcha: instance.enableHcaptcha,
 		hcaptchaSiteKey: instance.hcaptchaSiteKey,
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 604ef3a0fc..e5234ea720 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -94,6 +94,7 @@ export const paramDef = {
 		defaultDarkTheme: { type: "string", nullable: true },
 		localDriveCapacityMb: { type: "integer" },
 		remoteDriveCapacityMb: { type: "integer" },
+		antennaLimit: { type: "integer" },
 		cacheRemoteFiles: { type: "boolean" },
 		markLocalFilesNsfwByDefault: { type: "boolean" },
 		emailRequiredForSignup: { type: "boolean" },
@@ -327,6 +328,10 @@ export default define(meta, paramDef, async (ps, me) => {
 		set.remoteDriveCapacityMb = ps.remoteDriveCapacityMb;
 	}
 
+	if (ps.antennaLimit !== undefined) {
+		set.antennaLimit = ps.antennaLimit;
+	}
+
 	if (ps.cacheRemoteFiles !== undefined) {
 		set.cacheRemoteFiles = ps.cacheRemoteFiles;
 	}
diff --git a/packages/backend/src/server/api/endpoints/antennas/create.ts b/packages/backend/src/server/api/endpoints/antennas/create.ts
index 792301d4de..792c5e30b4 100644
--- a/packages/backend/src/server/api/endpoints/antennas/create.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/create.ts
@@ -3,6 +3,7 @@ import { genId } from "backend-rs";
 import { Antennas, UserLists, UserGroupJoinings } from "@/models/index.js";
 import { ApiError } from "@/server/api/error.js";
 import { publishInternalEvent } from "@/services/stream.js";
+import { fetchMeta } from "@/misc/fetch-meta.js";
 
 export const meta = {
 	tags: ["antennas"],
@@ -109,10 +110,12 @@ export default define(meta, paramDef, async (ps, user) => {
 	let userList;
 	let userGroupJoining;
 
+	const instance = await fetchMeta(true);
+
 	const antennas = await Antennas.findBy({
 		userId: user.id,
 	});
-	if (antennas.length > 5 && !user.isAdmin) {
+	if (antennas.length >= instance.antennaLimit) {
 		throw new ApiError(meta.errors.tooManyAntennas);
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 2a674b52c3..cb494bf27e 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -126,6 +126,11 @@ export const meta = {
 				optional: false,
 				nullable: false,
 			},
+			antennaLimit: {
+				type: "number",
+				optional: false,
+				nullable: false,
+			},
 			cacheRemoteFiles: {
 				type: "boolean",
 				optional: false,
@@ -445,6 +450,7 @@ export default define(meta, paramDef, async (ps, me) => {
 		enableGuestTimeline: instance.enableGuestTimeline,
 		driveCapacityPerLocalUserMb: instance.localDriveCapacityMb,
 		driveCapacityPerRemoteUserMb: instance.remoteDriveCapacityMb,
+		antennaLimit: instance.antennaLimit,
 		emailRequiredForSignup: instance.emailRequiredForSignup,
 		enableHcaptcha: instance.enableHcaptcha,
 		hcaptchaSiteKey: instance.hcaptchaSiteKey,
diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue
index f69c4fb23b..1c2188daac 100644
--- a/packages/client/src/pages/admin/settings.vue
+++ b/packages/client/src/pages/admin/settings.vue
@@ -350,6 +350,19 @@
 							</FormSplit>
 						</FormSection>
 
+						<FormSection>
+							<template #label>{{ i18n.ts.antennas }}</template>
+							<FormInput
+									v-model="antennaLimit"
+									type="number"
+									class="_formBlock"
+								>
+									<template #label>{{
+										i18n.ts.antennaLimit
+									}}</template>
+								</FormInput>
+						</FormSection>
+
 						<FormSection>
 							<template #label>ServiceWorker</template>
 
@@ -502,6 +515,7 @@ const cacheRemoteFiles = ref(false);
 const markLocalFilesNsfwByDefault = ref(false);
 const localDriveCapacityMb = ref(0);
 const remoteDriveCapacityMb = ref(0);
+const antennaLimit = ref(0);
 const enableRegistration = ref(false);
 const emailRequiredForSignup = ref(false);
 const enableServiceWorker = ref(false);
@@ -579,6 +593,7 @@ async function init() {
 	markLocalFilesNsfwByDefault.value = meta.markLocalFilesNsfwByDefault;
 	localDriveCapacityMb.value = meta.driveCapacityPerLocalUserMb;
 	remoteDriveCapacityMb.value = meta.driveCapacityPerRemoteUserMb;
+	antennaLimit.value = meta.antennaLimit;
 	enableRegistration.value = !meta.disableRegistration;
 	emailRequiredForSignup.value = meta.emailRequiredForSignup;
 	enableServiceWorker.value = meta.enableServiceWorker;
@@ -631,6 +646,7 @@ function save() {
 		markLocalFilesNsfwByDefault: markLocalFilesNsfwByDefault.value,
 		localDriveCapacityMb: localDriveCapacityMb.value,
 		remoteDriveCapacityMb: remoteDriveCapacityMb.value,
+		antennaLimit: antennaLimit.value,
 		disableRegistration: !enableRegistration.value,
 		emailRequiredForSignup: emailRequiredForSignup.value,
 		enableServiceWorker: enableServiceWorker.value,
diff --git a/packages/firefish-js/src/entities.ts b/packages/firefish-js/src/entities.ts
index ce940a1481..6f9d6b400b 100644
--- a/packages/firefish-js/src/entities.ts
+++ b/packages/firefish-js/src/entities.ts
@@ -341,6 +341,7 @@ export type LiteInstanceMetadata = {
 	disableGlobalTimeline: boolean;
 	driveCapacityPerLocalUserMb: number;
 	driveCapacityPerRemoteUserMb: number;
+	antennaLimit: number;
 	enableHcaptcha: boolean;
 	hcaptchaSiteKey: string | null;
 	enableRecaptcha: boolean;

From f0a50bc2889416c8fb741147523b077719621130 Mon Sep 17 00:00:00 2001
From: Lhcfl <Lhcfl@outlook.com>
Date: Sun, 14 Apr 2024 13:59:27 +0800
Subject: [PATCH 08/99] feat: show MkRemoteCaution in note history page

---
 packages/client/src/pages/note-history.vue | 74 ++++++++++++----------
 1 file changed, 39 insertions(+), 35 deletions(-)

diff --git a/packages/client/src/pages/note-history.vue b/packages/client/src/pages/note-history.vue
index f6fbf517a3..33cae5860a 100644
--- a/packages/client/src/pages/note-history.vue
+++ b/packages/client/src/pages/note-history.vue
@@ -4,30 +4,35 @@
 			><MkPageHeader :display-back-button="true"
 		/></template>
 		<MkSpacer :content-max="800">
-			<MkLoading v-if="!loaded" />
-			<MkPagination
-				v-else
-				ref="pagingComponent"
-				v-slot="{ items }"
-				:pagination="pagination"
-			>
-				<div ref="tlEl" class="giivymft noGap">
-					<XList
-						v-slot="{ item }"
-						:items="convertNoteEditsToNotes(items)"
-						class="notes"
-						:no-gap="true"
-					>
-						<XNote
-							:key="item.id"
-							class="qtqtichx"
-							:note="item"
-							:hide-footer="true"
-							:detailed-view="true"
-						/>
-					</XList>
-				</div>
-			</MkPagination>
+			<MkLoading v-if="note == null" />
+			<div class="" v-else>
+				<MkRemoteCaution
+					v-if="note.user.host != null"
+					:href="note.url ?? note.uri!"
+				/>
+				<MkPagination
+					ref="pagingComponent"
+					v-slot="{ items }"
+					:pagination="pagination"
+				>
+					<div ref="tlEl" class="giivymft noGap">
+						<XList
+							v-slot="{ item }"
+							:items="convertNoteEditsToNotes(items)"
+							class="notes"
+							:no-gap="true"
+						>
+							<XNote
+								:key="item.id"
+								class="qtqtichx"
+								:note="item"
+								:hide-footer="true"
+								:detailed-view="true"
+							/>
+						</XList>
+					</div>
+				</MkPagination>
+			</div>
 		</MkSpacer>
 	</MkStickyContainer>
 </template>
@@ -42,6 +47,7 @@ import XNote from "@/components/MkNote.vue";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
 import icon from "@/scripts/icon";
+import MkRemoteCaution from "@/components/MkRemoteCaution.vue";
 
 const pagingComponent = ref<InstanceType<typeof MkPagination>>();
 
@@ -65,8 +71,7 @@ definePageMetadata(
 	})),
 );
 
-const note = ref<entities.Note>({} as entities.Note);
-const loaded = ref(false);
+const note = ref<entities.Note | null>(null);
 
 onMounted(() => {
 	api("notes/show", {
@@ -79,20 +84,19 @@ onMounted(() => {
 		res.replyId = null;
 
 		note.value = res;
-		loaded.value = true;
 	});
 });
 
 function convertNoteEditsToNotes(noteEdits: entities.NoteEdit[]) {
 	const now: entities.NoteEdit = {
 		id: "EditionNow",
-		noteId: note.value.id,
-		updatedAt: note.value.createdAt,
-		text: note.value.text,
-		cw: note.value.cw,
-		files: note.value.files,
-		fileIds: note.value.fileIds,
-		emojis: note.value.emojis,
+		noteId: note.value!.id,
+		updatedAt: note.value!.createdAt,
+		text: note.value!.text,
+		cw: note.value!.cw,
+		files: note.value!.files,
+		fileIds: note.value!.fileIds,
+		emojis: note.value!.emojis,
 	};
 
 	return [now]
@@ -108,7 +112,7 @@ function convertNoteEditsToNotes(noteEdits: entities.NoteEdit[]) {
 				_shouldInsertAd_: false,
 				files: noteEdit.files,
 				fileIds: noteEdit.fileIds,
-				emojis: note.value.emojis.concat(noteEdit.emojis),
+				emojis: note.value!.emojis.concat(noteEdit.emojis),
 			});
 		});
 }

From 54d9916fecaab64a8b61ea59fe52e6a51ebcc97e Mon Sep 17 00:00:00 2001
From: Lhcfl <Lhcfl@outlook.com>
Date: Sun, 14 Apr 2024 16:34:33 +0800
Subject: [PATCH 09/99] fix: rss feed no HTML

---
 packages/backend/src/server/web/feed.ts | 47 ++++++++++++++++++-------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/packages/backend/src/server/web/feed.ts b/packages/backend/src/server/web/feed.ts
index e6b09b4f4f..3b1b9d6fa5 100644
--- a/packages/backend/src/server/web/feed.ts
+++ b/packages/backend/src/server/web/feed.ts
@@ -2,7 +2,19 @@ import { Feed } from "feed";
 import { In, IsNull } from "typeorm";
 import config from "@/config/index.js";
 import type { User } from "@/models/entities/user.js";
+import type { Note } from "@/models/entities/note.js";
 import { Notes, DriveFiles, UserProfiles, Users } from "@/models/index.js";
+import getNoteHtml from "@/remote/activitypub/misc/get-note-html.js";
+
+/**
+ * If there is this part in the note, it will cause CDATA to be terminated early.
+ * So I inserted two zero-width spaces in the middle, which doesn't make a visual difference
+ * Although this is not a good solution, there seems no other way.
+ * Anyway, it is not common to encounter such extreme situations.
+ */
+function escapeCDATA(str: string) {
+	return str.replaceAll("]]>", "]​]​>");
+}
 
 export default async function (
 	user: User,
@@ -15,7 +27,7 @@ export default async function (
 	const author = {
 		link: `${config.url}/@${user.username}`,
 		email: `${user.username}@${config.host}`,
-		name: user.name || user.username,
+		name: escapeCDATA(user.name || user.username),
 	};
 
 	const profile = await UserProfiles.findOneByOrFail({ userId: user.id });
@@ -44,11 +56,13 @@ export default async function (
 		title: `${author.name} (@${user.username}@${config.host})`,
 		updated: notes[0].createdAt,
 		generator: "Firefish",
-		description: `${user.notesCount} Notes, ${
-			profile.ffVisibility === "public" ? user.followingCount : "?"
-		} Following, ${
-			profile.ffVisibility === "public" ? user.followersCount : "?"
-		} Followers${profile.description ? ` · ${profile.description}` : ""}`,
+		description: escapeCDATA(
+			`${user.notesCount} Notes, ${
+				profile.ffVisibility === "public" ? user.followingCount : "?"
+			} Following, ${
+				profile.ffVisibility === "public" ? user.followersCount : "?"
+			} Followers${profile.description ? ` · ${profile.description}` : ""}`,
+		),
 		link: author.link,
 		image: await Users.getAvatarUrl(user),
 		feedLinks: {
@@ -88,19 +102,23 @@ export default async function (
 		}
 
 		feed.addItem({
-			title: title
-				.replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, "")
-				.substring(0, 100),
+			title: escapeCDATA(
+				title
+					.replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, "")
+					.substring(0, 100),
+			),
 			link: `${config.url}/notes/${note.id}`,
 			date: note.createdAt,
 			description: note.cw
-				? note.cw.replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, "")
+				? escapeCDATA(note.cw.replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, ""))
 				: undefined,
-			content: contentStr.replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, ""),
+			content: escapeCDATA(
+				contentStr.replace(/[\x00-\x08\x0b\x0c\x0e-\x1f\x7f]/g, ""),
+			),
 		});
 	}
 
-	async function noteToString(note, isTheNote = false) {
+	async function noteToString(note: Note, isTheNote = false) {
 		const author = isTheNote
 			? null
 			: await Users.findOneBy({ id: note.userId });
@@ -135,7 +153,10 @@ export default async function (
 				}">${file.name}</a>`;
 			}
 		}
-		outstr += `${note.cw ? note.cw + "<br>" : ""}${note.text || ""}${fileEle}`;
+
+		outstr += `${note.cw ? note.cw + "<br>" : ""}${
+			getNoteHtml(note) || ""
+		}${fileEle}`;
 		if (isTheNote) {
 			outstr += ` <span class="${
 				note.renoteId ? "renote_note" : note.replyId ? "reply_note" : "new_note"

From 241c824ab54182c4cbaeccf33c9475c4652b14c0 Mon Sep 17 00:00:00 2001
From: Lhcfl <Lhcfl@outlook.com>
Date: Sun, 14 Apr 2024 16:44:12 +0800
Subject: [PATCH 10/99] fix: use better `]]>` replacer

---
 packages/backend/src/server/web/feed.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/backend/src/server/web/feed.ts b/packages/backend/src/server/web/feed.ts
index 3b1b9d6fa5..f3b3c97c32 100644
--- a/packages/backend/src/server/web/feed.ts
+++ b/packages/backend/src/server/web/feed.ts
@@ -8,12 +8,9 @@ import getNoteHtml from "@/remote/activitypub/misc/get-note-html.js";
 
 /**
  * If there is this part in the note, it will cause CDATA to be terminated early.
- * So I inserted two zero-width spaces in the middle, which doesn't make a visual difference
- * Although this is not a good solution, there seems no other way.
- * Anyway, it is not common to encounter such extreme situations.
  */
 function escapeCDATA(str: string) {
-	return str.replaceAll("]]>", "]​]​>");
+	return str.replaceAll("]]>", "]]]]><![CDATA[>");
 }
 
 export default async function (

From 4823abd3a9415cea56f703854e8ea344a65f644b Mon Sep 17 00:00:00 2001
From: yumeko <yumeko@mainichi.social>
Date: Fri, 19 Apr 2024 03:34:25 +0300
Subject: [PATCH 11/99] Add usageHint field to DriveFile, and fill accordingly
 when operating on Persons

---
 .../migration/1713451569342-AddDriveFileUsage.ts  | 15 +++++++++++++++
 .../backend/src/models/entities/drive-file.ts     |  7 +++++++
 .../src/remote/activitypub/models/image.ts        |  5 ++++-
 .../backend/src/remote/activitypub/models/note.ts |  4 ++--
 .../src/remote/activitypub/models/person.ts       |  8 ++++----
 packages/backend/src/services/drive/add-file.ts   | 10 ++++++++++
 .../backend/src/services/drive/upload-from-url.ts | 11 +++++++++--
 7 files changed, 51 insertions(+), 9 deletions(-)
 create mode 100644 packages/backend/src/migration/1713451569342-AddDriveFileUsage.ts

diff --git a/packages/backend/src/migration/1713451569342-AddDriveFileUsage.ts b/packages/backend/src/migration/1713451569342-AddDriveFileUsage.ts
new file mode 100644
index 0000000000..c0c96fe74c
--- /dev/null
+++ b/packages/backend/src/migration/1713451569342-AddDriveFileUsage.ts
@@ -0,0 +1,15 @@
+import type { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddDriveFileUsage1713451569342 implements MigrationInterface {
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" ADD "usageHint" character varying(16) DEFAULT NULL`,
+		);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" DROP COLUMN "usageHint"`
+		);
+	}
+}
diff --git a/packages/backend/src/models/entities/drive-file.ts b/packages/backend/src/models/entities/drive-file.ts
index 3c49e89fd5..b5717d62cd 100644
--- a/packages/backend/src/models/entities/drive-file.ts
+++ b/packages/backend/src/models/entities/drive-file.ts
@@ -177,6 +177,13 @@ export class DriveFile {
 	})
 	public isSensitive: boolean;
 
+	@Column("varchar", {
+		length: 16,
+		nullable: true,
+		comment: "Hint for what the file is used for.",
+	})
+	public usageHint: string | null;
+
 	/**
 	 * 外部の(信頼されていない)URLへの直リンクか否か
 	 */
diff --git a/packages/backend/src/remote/activitypub/models/image.ts b/packages/backend/src/remote/activitypub/models/image.ts
index e2072a963a..23fb720362 100644
--- a/packages/backend/src/remote/activitypub/models/image.ts
+++ b/packages/backend/src/remote/activitypub/models/image.ts
@@ -16,6 +16,7 @@ const logger = apLogger;
 export async function createImage(
 	actor: CacheableRemoteUser,
 	value: any,
+	usage: 'avatar' | 'banner' | null
 ): Promise<DriveFile> {
 	// Skip if author is frozen.
 	if (actor.isSuspended) {
@@ -43,6 +44,7 @@ export async function createImage(
 		sensitive: image.sensitive,
 		isLink: !instance.cacheRemoteFiles,
 		comment: truncate(image.name, DB_MAX_IMAGE_COMMENT_LENGTH),
+		usageHint: usage
 	});
 
 	if (file.isLink) {
@@ -73,9 +75,10 @@ export async function createImage(
 export async function resolveImage(
 	actor: CacheableRemoteUser,
 	value: any,
+	usage: 'avatar' | 'banner' | null,
 ): Promise<DriveFile> {
 	// TODO
 
 	// Fetch from remote server and register
-	return await createImage(actor, value);
+	return await createImage(actor, value, usage);
 }
diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index ad59930457..5e1c3829a7 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -213,7 +213,7 @@ export async function createNote(
 		? (
 				await Promise.all(
 					note.attachment.map(
-						(x) => limit(() => resolveImage(actor, x)) as Promise<DriveFile>,
+						(x) => limit(() => resolveImage(actor, x, null)) as Promise<DriveFile>,
 					),
 				)
 			).filter((image) => image != null)
@@ -616,7 +616,7 @@ export async function updateNote(value: string | IObject, resolver?: Resolver) {
 			fileList.map(
 				(x) =>
 					limit(async () => {
-						const file = await resolveImage(actor, x);
+						const file = await resolveImage(actor, x, null);
 						const update: Partial<DriveFile> = {};
 
 						const altText = truncate(x.name, DB_MAX_IMAGE_COMMENT_LENGTH);
diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index e91280125f..47a1152c36 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -362,10 +362,10 @@ export async function createPerson(
 
 	//#region Fetch avatar and header image
 	const [avatar, banner] = await Promise.all(
-		[person.icon, person.image].map((img) =>
+		[person.icon, person.image].map((img, index) =>
 			img == null
 				? Promise.resolve(null)
-				: resolveImage(user!, img).catch(() => null),
+				: resolveImage(user!, img, index === 0 ? "avatar" : index === 1 ? "banner" : null).catch(() => null),
 		),
 	);
 
@@ -438,10 +438,10 @@ export async function updatePerson(
 
 	// Fetch avatar and header image
 	const [avatar, banner] = await Promise.all(
-		[person.icon, person.image].map((img) =>
+		[person.icon, person.image].map((img, index) =>
 			img == null
 				? Promise.resolve(null)
-				: resolveImage(user, img).catch(() => null),
+				: resolveImage(user, img, index === 0 ? "avatar" : index === 1 ? "banner" : null).catch(() => null),
 		),
 	);
 
diff --git a/packages/backend/src/services/drive/add-file.ts b/packages/backend/src/services/drive/add-file.ts
index 24ad9f8f02..cfb871dd93 100644
--- a/packages/backend/src/services/drive/add-file.ts
+++ b/packages/backend/src/services/drive/add-file.ts
@@ -65,6 +65,7 @@ function urlPathJoin(
  * @param type Content-Type for original
  * @param hash Hash for original
  * @param size Size for original
+ * @param usage Optional usage hint for file (f.e. "avatar")
  */
 async function save(
 	file: DriveFile,
@@ -73,6 +74,7 @@ async function save(
 	type: string,
 	hash: string,
 	size: number,
+	usage: string | null = null
 ): Promise<DriveFile> {
 	// thunbnail, webpublic を必要なら生成
 	const alts = await generateAlts(path, type, !file.uri);
@@ -161,6 +163,7 @@ async function save(
 		file.md5 = hash;
 		file.size = size;
 		file.storedInternal = false;
+		file.usageHint = usage ?? null;
 
 		return await DriveFiles.insert(file).then((x) =>
 			DriveFiles.findOneByOrFail(x.identifiers[0]),
@@ -204,6 +207,7 @@ async function save(
 		file.type = type;
 		file.md5 = hash;
 		file.size = size;
+		file.usageHint = usage ?? null;
 
 		return await DriveFiles.insert(file).then((x) =>
 			DriveFiles.findOneByOrFail(x.identifiers[0]),
@@ -450,6 +454,9 @@ type AddFileArgs = {
 
 	requestIp?: string | null;
 	requestHeaders?: Record<string, string> | null;
+
+	/** Whether this file has a known use case, like user avatar or instance icon */
+	usageHint?: string | null;
 };
 
 /**
@@ -469,6 +476,7 @@ export async function addFile({
 	sensitive = null,
 	requestIp = null,
 	requestHeaders = null,
+	usageHint = null,
 }: AddFileArgs): Promise<DriveFile> {
 	const info = await getFileInfo(path);
 	logger.info(`${JSON.stringify(info)}`);
@@ -581,6 +589,7 @@ export async function addFile({
 	file.isLink = isLink;
 	file.requestIp = requestIp;
 	file.requestHeaders = requestHeaders;
+	file.usageHint = usageHint;
 	file.isSensitive = user
 		? Users.isLocalUser(user) &&
 			(instance!.markLocalFilesNsfwByDefault || profile!.alwaysMarkNsfw)
@@ -639,6 +648,7 @@ export async function addFile({
 			info.type.mime,
 			info.md5,
 			info.size,
+			usageHint
 		);
 	}
 
diff --git a/packages/backend/src/services/drive/upload-from-url.ts b/packages/backend/src/services/drive/upload-from-url.ts
index 551d3757ca..238f8714fa 100644
--- a/packages/backend/src/services/drive/upload-from-url.ts
+++ b/packages/backend/src/services/drive/upload-from-url.ts
@@ -13,7 +13,11 @@ const logger = driveLogger.createSubLogger("downloader");
 
 type Args = {
 	url: string;
-	user: { id: User["id"]; host: User["host"] } | null;
+	user: {
+		id: User["id"];
+		host: User["host"];
+		driveCapacityOverrideMb: User["driveCapacityOverrideMb"];
+	} | null;
 	folderId?: DriveFolder["id"] | null;
 	uri?: string | null;
 	sensitive?: boolean;
@@ -22,6 +26,7 @@ type Args = {
 	comment?: string | null;
 	requestIp?: string | null;
 	requestHeaders?: Record<string, string> | null;
+	usageHint?: string | null;
 };
 
 export async function uploadFromUrl({
@@ -35,6 +40,7 @@ export async function uploadFromUrl({
 	comment = null,
 	requestIp = null,
 	requestHeaders = null,
+	usageHint = null
 }: Args): Promise<DriveFile> {
 	const parsedUrl = new URL(url);
 	if (
@@ -75,9 +81,10 @@ export async function uploadFromUrl({
 			sensitive,
 			requestIp,
 			requestHeaders,
+			usageHint
 		});
 		logger.succ(`Got: ${driveFile.id}`);
-		return driveFile!;
+		return driveFile;
 	} catch (e) {
 		logger.error(`Failed to create drive file:\n${inspect(e)}`);
 		throw e;

From c0f93de94b2183c53ce041b58d028474c0f7ed73 Mon Sep 17 00:00:00 2001
From: yumeko <yumeko@mainichi.social>
Date: Fri, 19 Apr 2024 06:26:40 +0300
Subject: [PATCH 12/99] Set file usage hints on local avatar/banner uploads as
 well + export "valid" values as type

---
 .../backend/src/models/entities/drive-file.ts |  4 +++-
 .../src/remote/activitypub/models/image.ts    |  6 ++---
 .../src/remote/activitypub/models/person.ts   |  4 ++--
 .../src/server/api/endpoints/i/update.ts      | 23 +++++++++++++++++--
 .../backend/src/services/drive/add-file.ts    |  7 +++---
 5 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/packages/backend/src/models/entities/drive-file.ts b/packages/backend/src/models/entities/drive-file.ts
index b5717d62cd..f257280d60 100644
--- a/packages/backend/src/models/entities/drive-file.ts
+++ b/packages/backend/src/models/entities/drive-file.ts
@@ -16,6 +16,8 @@ import { DriveFolder } from "./drive-folder.js";
 import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js";
 import { NoteFile } from "./note-file.js";
 
+export type DriveFileUsageHint = "user_avatar" | "user_banner" | null;
+
 @Entity()
 @Index(["userId", "folderId", "id"])
 export class DriveFile {
@@ -182,7 +184,7 @@ export class DriveFile {
 		nullable: true,
 		comment: "Hint for what the file is used for.",
 	})
-	public usageHint: string | null;
+	public usageHint: DriveFileUsageHint;
 
 	/**
 	 * 外部の(信頼されていない)URLへの直リンクか否か
diff --git a/packages/backend/src/remote/activitypub/models/image.ts b/packages/backend/src/remote/activitypub/models/image.ts
index 23fb720362..9183b82ebe 100644
--- a/packages/backend/src/remote/activitypub/models/image.ts
+++ b/packages/backend/src/remote/activitypub/models/image.ts
@@ -3,7 +3,7 @@ import type { CacheableRemoteUser } from "@/models/entities/user.js";
 import Resolver from "../resolver.js";
 import { fetchMeta } from "backend-rs";
 import { apLogger } from "../logger.js";
-import type { DriveFile } from "@/models/entities/drive-file.js";
+import type { DriveFile, DriveFileUsageHint } from "@/models/entities/drive-file.js";
 import { DriveFiles } from "@/models/index.js";
 import { truncate } from "@/misc/truncate.js";
 import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js";
@@ -16,7 +16,7 @@ const logger = apLogger;
 export async function createImage(
 	actor: CacheableRemoteUser,
 	value: any,
-	usage: 'avatar' | 'banner' | null
+	usage: DriveFileUsageHint
 ): Promise<DriveFile> {
 	// Skip if author is frozen.
 	if (actor.isSuspended) {
@@ -75,7 +75,7 @@ export async function createImage(
 export async function resolveImage(
 	actor: CacheableRemoteUser,
 	value: any,
-	usage: 'avatar' | 'banner' | null,
+	usage: DriveFileUsageHint,
 ): Promise<DriveFile> {
 	// TODO
 
diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index 47a1152c36..64a4c7f5c5 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -365,7 +365,7 @@ export async function createPerson(
 		[person.icon, person.image].map((img, index) =>
 			img == null
 				? Promise.resolve(null)
-				: resolveImage(user!, img, index === 0 ? "avatar" : index === 1 ? "banner" : null).catch(() => null),
+				: resolveImage(user, img, index === 0 ? "user_avatar" : index === 1 ? "user_banner" : null).catch(() => null)
 		),
 	);
 
@@ -441,7 +441,7 @@ export async function updatePerson(
 		[person.icon, person.image].map((img, index) =>
 			img == null
 				? Promise.resolve(null)
-				: resolveImage(user, img, index === 0 ? "avatar" : index === 1 ? "banner" : null).catch(() => null),
+				: resolveImage(user, img, index === 0 ? "user_avatar" : index === 1 ? "user_banner" : null).catch(() => null),
 		),
 	);
 
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index 4389688a12..9d39903eac 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -13,6 +13,7 @@ import { normalizeForSearch } from "@/misc/normalize-for-search.js";
 import { verifyLink } from "@/services/fetch-rel-me.js";
 import { ApiError } from "@/server/api/error.js";
 import define from "@/server/api/define.js";
+import { DriveFile } from "@/models/entities/drive-file";
 
 export const meta = {
 	tags: ["account"],
@@ -241,8 +242,9 @@ export default define(meta, paramDef, async (ps, _user, token) => {
 	if (ps.emailNotificationTypes !== undefined)
 		profileUpdates.emailNotificationTypes = ps.emailNotificationTypes;
 
+	let avatar: DriveFile | null = null
 	if (ps.avatarId) {
-		const avatar = await DriveFiles.findOneBy({ id: ps.avatarId });
+		avatar = await DriveFiles.findOneBy({ id: ps.avatarId });
 
 		if (avatar == null || avatar.userId !== user.id)
 			throw new ApiError(meta.errors.noSuchAvatar);
@@ -250,8 +252,9 @@ export default define(meta, paramDef, async (ps, _user, token) => {
 			throw new ApiError(meta.errors.avatarNotAnImage);
 	}
 
+	let banner: DriveFile | null = null
 	if (ps.bannerId) {
-		const banner = await DriveFiles.findOneBy({ id: ps.bannerId });
+		banner = await DriveFiles.findOneBy({ id: ps.bannerId });
 
 		if (banner == null || banner.userId !== user.id)
 			throw new ApiError(meta.errors.noSuchBanner);
@@ -328,6 +331,22 @@ export default define(meta, paramDef, async (ps, _user, token) => {
 	updateUsertags(user, tags);
 	//#endregion
 
+	// Update old/new avatar usage hints
+	if (avatar)
+	{
+		if (user.avatarId)
+			await DriveFiles.update(user.avatarId, {usageHint: null});
+		await DriveFiles.update(avatar.id, {usageHint: "user_avatar"});
+	}
+
+	// Update old/new banner usage hints
+	if (banner)
+	{
+		if (user.bannerId)
+			await DriveFiles.update(user.bannerId, {usageHint: null});
+		await DriveFiles.update(banner.id, {usageHint: "user_banner"});
+	}
+
 	if (Object.keys(updates).length > 0) await Users.update(user.id, updates);
 	if (Object.keys(profileUpdates).length > 0)
 		await UserProfiles.update(user.id, profileUpdates);
diff --git a/packages/backend/src/services/drive/add-file.ts b/packages/backend/src/services/drive/add-file.ts
index cfb871dd93..79f30a651b 100644
--- a/packages/backend/src/services/drive/add-file.ts
+++ b/packages/backend/src/services/drive/add-file.ts
@@ -16,6 +16,7 @@ import {
 	UserProfiles,
 } from "@/models/index.js";
 import { DriveFile } from "@/models/entities/drive-file.js";
+import type { DriveFileUsageHint } from "@/models/entities/drive-file.js";
 import type { IRemoteUser, User } from "@/models/entities/user.js";
 import { genId } from "backend-rs";
 import { isDuplicateKeyValueError } from "@/misc/is-duplicate-key-value-error.js";
@@ -65,7 +66,7 @@ function urlPathJoin(
  * @param type Content-Type for original
  * @param hash Hash for original
  * @param size Size for original
- * @param usage Optional usage hint for file (f.e. "avatar")
+ * @param usage Optional usage hint for file (f.e. "user_avatar")
  */
 async function save(
 	file: DriveFile,
@@ -74,7 +75,7 @@ async function save(
 	type: string,
 	hash: string,
 	size: number,
-	usage: string | null = null
+	usage: DriveFileUsageHint = null
 ): Promise<DriveFile> {
 	// thunbnail, webpublic を必要なら生成
 	const alts = await generateAlts(path, type, !file.uri);
@@ -456,7 +457,7 @@ type AddFileArgs = {
 	requestHeaders?: Record<string, string> | null;
 
 	/** Whether this file has a known use case, like user avatar or instance icon */
-	usageHint?: string | null;
+	usageHint?: DriveFileUsageHint;
 };
 
 /**

From 4aeb0d95ccf7e4427c60ecd915a48922f465e451 Mon Sep 17 00:00:00 2001
From: yumeko <yumeko@mainichi.social>
Date: Fri, 19 Apr 2024 07:03:09 +0300
Subject: [PATCH 13/99] Add DriveFile usageHint field to rust model as well

---
 packages/backend-rs/src/model/entity/drive_file.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/backend-rs/src/model/entity/drive_file.rs b/packages/backend-rs/src/model/entity/drive_file.rs
index e3e4622a62..e5c3995573 100644
--- a/packages/backend-rs/src/model/entity/drive_file.rs
+++ b/packages/backend-rs/src/model/entity/drive_file.rs
@@ -52,6 +52,8 @@ pub struct Model {
     pub request_headers: Option<Json>,
     #[sea_orm(column_name = "requestIp")]
     pub request_ip: Option<String>,
+    #[sea_orm(column_name = "usageHint")]
+    pub usage_hint: Option<String>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

From 913de651dbb4413728599a1c7df3a646098c750c Mon Sep 17 00:00:00 2001
From: yumeko <yumeko@mainichi.social>
Date: Fri, 19 Apr 2024 07:25:42 +0300
Subject: [PATCH 14/99] When updating (remote) user avatar/banner, clear
 usageHint for the previous drivefile, if any

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

diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index 64a4c7f5c5..5460a0234b 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -10,6 +10,7 @@ import {
 	Followings,
 	UserProfiles,
 	UserPublickeys,
+	DriveFiles,
 } from "@/models/index.js";
 import type { IRemoteUser, CacheableUser } from "@/models/entities/user.js";
 import { User } from "@/models/entities/user.js";
@@ -561,10 +562,14 @@ export async function updatePerson(
 	} as Partial<User>;
 
 	if (avatar) {
+		if (user?.avatarId)
+			await DriveFiles.update(user.avatarId, {usageHint: null});
 		updates.avatarId = avatar.id;
 	}
 
 	if (banner) {
+		if (user?.bannerId)
+			await DriveFiles.update(user.bannerId, {usageHint: null});
 		updates.bannerId = banner.id;
 	}
 

From 968657d26eff412fd18e8b8cab47718f40a0f5e1 Mon Sep 17 00:00:00 2001
From: yumeko <yumeko@mainichi.social>
Date: Fri, 19 Apr 2024 07:54:11 +0300
Subject: [PATCH 15/99] Run format

---
 .../1713451569342-AddDriveFileUsage.ts         |  4 +---
 .../src/remote/activitypub/models/image.ts     |  9 ++++++---
 .../src/remote/activitypub/models/note.ts      |  3 ++-
 .../src/remote/activitypub/models/person.ts    | 16 ++++++++++++----
 .../src/server/api/endpoints/i/update.ts       | 18 ++++++++----------
 .../backend/src/services/drive/add-file.ts     |  4 ++--
 .../src/services/drive/upload-from-url.ts      |  8 ++++----
 7 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/packages/backend/src/migration/1713451569342-AddDriveFileUsage.ts b/packages/backend/src/migration/1713451569342-AddDriveFileUsage.ts
index c0c96fe74c..57c6a73890 100644
--- a/packages/backend/src/migration/1713451569342-AddDriveFileUsage.ts
+++ b/packages/backend/src/migration/1713451569342-AddDriveFileUsage.ts
@@ -8,8 +8,6 @@ export class AddDriveFileUsage1713451569342 implements MigrationInterface {
 	}
 
 	public async down(queryRunner: QueryRunner): Promise<void> {
-		await queryRunner.query(
-			`ALTER TABLE "drive_file" DROP COLUMN "usageHint"`
-		);
+		await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "usageHint"`);
 	}
 }
diff --git a/packages/backend/src/remote/activitypub/models/image.ts b/packages/backend/src/remote/activitypub/models/image.ts
index 9183b82ebe..a6ac698feb 100644
--- a/packages/backend/src/remote/activitypub/models/image.ts
+++ b/packages/backend/src/remote/activitypub/models/image.ts
@@ -3,7 +3,10 @@ import type { CacheableRemoteUser } from "@/models/entities/user.js";
 import Resolver from "../resolver.js";
 import { fetchMeta } from "backend-rs";
 import { apLogger } from "../logger.js";
-import type { DriveFile, DriveFileUsageHint } from "@/models/entities/drive-file.js";
+import type {
+	DriveFile,
+	DriveFileUsageHint,
+} from "@/models/entities/drive-file.js";
 import { DriveFiles } from "@/models/index.js";
 import { truncate } from "@/misc/truncate.js";
 import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js";
@@ -16,7 +19,7 @@ const logger = apLogger;
 export async function createImage(
 	actor: CacheableRemoteUser,
 	value: any,
-	usage: DriveFileUsageHint
+	usage: DriveFileUsageHint,
 ): Promise<DriveFile> {
 	// Skip if author is frozen.
 	if (actor.isSuspended) {
@@ -44,7 +47,7 @@ export async function createImage(
 		sensitive: image.sensitive,
 		isLink: !instance.cacheRemoteFiles,
 		comment: truncate(image.name, DB_MAX_IMAGE_COMMENT_LENGTH),
-		usageHint: usage
+		usageHint: usage,
 	});
 
 	if (file.isLink) {
diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index 5e1c3829a7..b2fd67288c 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -213,7 +213,8 @@ export async function createNote(
 		? (
 				await Promise.all(
 					note.attachment.map(
-						(x) => limit(() => resolveImage(actor, x, null)) as Promise<DriveFile>,
+						(x) =>
+							limit(() => resolveImage(actor, x, null)) as Promise<DriveFile>,
 					),
 				)
 			).filter((image) => image != null)
diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index 5460a0234b..657ac7d553 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -366,7 +366,11 @@ export async function createPerson(
 		[person.icon, person.image].map((img, index) =>
 			img == null
 				? Promise.resolve(null)
-				: resolveImage(user, img, index === 0 ? "user_avatar" : index === 1 ? "user_banner" : null).catch(() => null)
+				: resolveImage(
+						user,
+						img,
+						index === 0 ? "user_avatar" : index === 1 ? "user_banner" : null,
+					).catch(() => null),
 		),
 	);
 
@@ -442,7 +446,11 @@ export async function updatePerson(
 		[person.icon, person.image].map((img, index) =>
 			img == null
 				? Promise.resolve(null)
-				: resolveImage(user, img, index === 0 ? "user_avatar" : index === 1 ? "user_banner" : null).catch(() => null),
+				: resolveImage(
+						user,
+						img,
+						index === 0 ? "user_avatar" : index === 1 ? "user_banner" : null,
+					).catch(() => null),
 		),
 	);
 
@@ -563,13 +571,13 @@ export async function updatePerson(
 
 	if (avatar) {
 		if (user?.avatarId)
-			await DriveFiles.update(user.avatarId, {usageHint: null});
+			await DriveFiles.update(user.avatarId, { usageHint: null });
 		updates.avatarId = avatar.id;
 	}
 
 	if (banner) {
 		if (user?.bannerId)
-			await DriveFiles.update(user.bannerId, {usageHint: null});
+			await DriveFiles.update(user.bannerId, { usageHint: null });
 		updates.bannerId = banner.id;
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index 9d39903eac..29d03cc465 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -242,7 +242,7 @@ export default define(meta, paramDef, async (ps, _user, token) => {
 	if (ps.emailNotificationTypes !== undefined)
 		profileUpdates.emailNotificationTypes = ps.emailNotificationTypes;
 
-	let avatar: DriveFile | null = null
+	let avatar: DriveFile | null = null;
 	if (ps.avatarId) {
 		avatar = await DriveFiles.findOneBy({ id: ps.avatarId });
 
@@ -252,7 +252,7 @@ export default define(meta, paramDef, async (ps, _user, token) => {
 			throw new ApiError(meta.errors.avatarNotAnImage);
 	}
 
-	let banner: DriveFile | null = null
+	let banner: DriveFile | null = null;
 	if (ps.bannerId) {
 		banner = await DriveFiles.findOneBy({ id: ps.bannerId });
 
@@ -332,19 +332,17 @@ export default define(meta, paramDef, async (ps, _user, token) => {
 	//#endregion
 
 	// Update old/new avatar usage hints
-	if (avatar)
-	{
+	if (avatar) {
 		if (user.avatarId)
-			await DriveFiles.update(user.avatarId, {usageHint: null});
-		await DriveFiles.update(avatar.id, {usageHint: "user_avatar"});
+			await DriveFiles.update(user.avatarId, { usageHint: null });
+		await DriveFiles.update(avatar.id, { usageHint: "user_avatar" });
 	}
 
 	// Update old/new banner usage hints
-	if (banner)
-	{
+	if (banner) {
 		if (user.bannerId)
-			await DriveFiles.update(user.bannerId, {usageHint: null});
-		await DriveFiles.update(banner.id, {usageHint: "user_banner"});
+			await DriveFiles.update(user.bannerId, { usageHint: null });
+		await DriveFiles.update(banner.id, { usageHint: "user_banner" });
 	}
 
 	if (Object.keys(updates).length > 0) await Users.update(user.id, updates);
diff --git a/packages/backend/src/services/drive/add-file.ts b/packages/backend/src/services/drive/add-file.ts
index 79f30a651b..2f975e1984 100644
--- a/packages/backend/src/services/drive/add-file.ts
+++ b/packages/backend/src/services/drive/add-file.ts
@@ -75,7 +75,7 @@ async function save(
 	type: string,
 	hash: string,
 	size: number,
-	usage: DriveFileUsageHint = null
+	usage: DriveFileUsageHint = null,
 ): Promise<DriveFile> {
 	// thunbnail, webpublic を必要なら生成
 	const alts = await generateAlts(path, type, !file.uri);
@@ -649,7 +649,7 @@ export async function addFile({
 			info.type.mime,
 			info.md5,
 			info.size,
-			usageHint
+			usageHint,
 		);
 	}
 
diff --git a/packages/backend/src/services/drive/upload-from-url.ts b/packages/backend/src/services/drive/upload-from-url.ts
index 238f8714fa..a96e8e3262 100644
--- a/packages/backend/src/services/drive/upload-from-url.ts
+++ b/packages/backend/src/services/drive/upload-from-url.ts
@@ -3,7 +3,7 @@ import type { User } from "@/models/entities/user.js";
 import { createTemp } from "@/misc/create-temp.js";
 import { downloadUrl, isPrivateIp } from "@/misc/download-url.js";
 import type { DriveFolder } from "@/models/entities/drive-folder.js";
-import type { DriveFile } from "@/models/entities/drive-file.js";
+import type { DriveFile, DriveFileUsageHint } from "@/models/entities/drive-file.js";
 import { DriveFiles } from "@/models/index.js";
 import { driveLogger } from "./logger.js";
 import { addFile } from "./add-file.js";
@@ -26,7 +26,7 @@ type Args = {
 	comment?: string | null;
 	requestIp?: string | null;
 	requestHeaders?: Record<string, string> | null;
-	usageHint?: string | null;
+	usageHint?: DriveFileUsageHint;
 };
 
 export async function uploadFromUrl({
@@ -40,7 +40,7 @@ export async function uploadFromUrl({
 	comment = null,
 	requestIp = null,
 	requestHeaders = null,
-	usageHint = null
+	usageHint = null,
 }: Args): Promise<DriveFile> {
 	const parsedUrl = new URL(url);
 	if (
@@ -81,7 +81,7 @@ export async function uploadFromUrl({
 			sensitive,
 			requestIp,
 			requestHeaders,
-			usageHint
+			usageHint,
 		});
 		logger.succ(`Got: ${driveFile.id}`);
 		return driveFile;

From 6c46bb56fd2c13672ac6338b970f090f1f3c0672 Mon Sep 17 00:00:00 2001
From: yumeko <yumeko@mainichi.social>
Date: Fri, 19 Apr 2024 18:22:02 +0300
Subject: [PATCH 16/99] Switch DriveFile's usageHint field to an enum type

---
 .../src/migration/1713451569342-AddDriveFileUsage.ts       | 6 +++++-
 packages/backend/src/models/entities/drive-file.ts         | 7 ++++---
 packages/backend/src/remote/activitypub/models/person.ts   | 4 ++--
 packages/backend/src/server/api/endpoints/i/update.ts      | 4 ++--
 packages/backend/src/services/drive/add-file.ts            | 2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/packages/backend/src/migration/1713451569342-AddDriveFileUsage.ts b/packages/backend/src/migration/1713451569342-AddDriveFileUsage.ts
index 57c6a73890..3bdb1aafc8 100644
--- a/packages/backend/src/migration/1713451569342-AddDriveFileUsage.ts
+++ b/packages/backend/src/migration/1713451569342-AddDriveFileUsage.ts
@@ -3,11 +3,15 @@ import type { MigrationInterface, QueryRunner } from "typeorm";
 export class AddDriveFileUsage1713451569342 implements MigrationInterface {
 	public async up(queryRunner: QueryRunner): Promise<void> {
 		await queryRunner.query(
-			`ALTER TABLE "drive_file" ADD "usageHint" character varying(16) DEFAULT NULL`,
+			`CREATE TYPE drive_file_usage_hint_enum AS ENUM ('userAvatar', 'userBanner')`,
+		);
+		await queryRunner.query(
+			`ALTER TABLE "drive_file" ADD "usageHint" drive_file_usage_hint_enum DEFAULT NULL`,
 		);
 	}
 
 	public async down(queryRunner: QueryRunner): Promise<void> {
 		await queryRunner.query(`ALTER TABLE "drive_file" DROP COLUMN "usageHint"`);
+		await queryRunner.query(`DROP TYPE drive_file_usage_hint_enum`);
 	}
 }
diff --git a/packages/backend/src/models/entities/drive-file.ts b/packages/backend/src/models/entities/drive-file.ts
index f257280d60..2c6c1bf598 100644
--- a/packages/backend/src/models/entities/drive-file.ts
+++ b/packages/backend/src/models/entities/drive-file.ts
@@ -16,7 +16,7 @@ import { DriveFolder } from "./drive-folder.js";
 import { DB_MAX_IMAGE_COMMENT_LENGTH } from "@/misc/hard-limits.js";
 import { NoteFile } from "./note-file.js";
 
-export type DriveFileUsageHint = "user_avatar" | "user_banner" | null;
+export type DriveFileUsageHint = "userAvatar" | "userBanner" | null;
 
 @Entity()
 @Index(["userId", "folderId", "id"])
@@ -179,8 +179,9 @@ export class DriveFile {
 	})
 	public isSensitive: boolean;
 
-	@Column("varchar", {
-		length: 16,
+	@Column({
+		type: "enum",
+		enum: ["userAvatar", "userBanner"],
 		nullable: true,
 		comment: "Hint for what the file is used for.",
 	})
diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index 657ac7d553..4baa2c021b 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -369,7 +369,7 @@ export async function createPerson(
 				: resolveImage(
 						user,
 						img,
-						index === 0 ? "user_avatar" : index === 1 ? "user_banner" : null,
+						index === 0 ? "userAvatar" : index === 1 ? "userBanner" : null,
 					).catch(() => null),
 		),
 	);
@@ -449,7 +449,7 @@ export async function updatePerson(
 				: resolveImage(
 						user,
 						img,
-						index === 0 ? "user_avatar" : index === 1 ? "user_banner" : null,
+						index === 0 ? "userAvatar" : index === 1 ? "userBanner" : null,
 					).catch(() => null),
 		),
 	);
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index 29d03cc465..4f65c59a9e 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -335,14 +335,14 @@ export default define(meta, paramDef, async (ps, _user, token) => {
 	if (avatar) {
 		if (user.avatarId)
 			await DriveFiles.update(user.avatarId, { usageHint: null });
-		await DriveFiles.update(avatar.id, { usageHint: "user_avatar" });
+		await DriveFiles.update(avatar.id, { usageHint: "userAvatar" });
 	}
 
 	// Update old/new banner usage hints
 	if (banner) {
 		if (user.bannerId)
 			await DriveFiles.update(user.bannerId, { usageHint: null });
-		await DriveFiles.update(banner.id, { usageHint: "user_banner" });
+		await DriveFiles.update(banner.id, { usageHint: "userBanner" });
 	}
 
 	if (Object.keys(updates).length > 0) await Users.update(user.id, updates);
diff --git a/packages/backend/src/services/drive/add-file.ts b/packages/backend/src/services/drive/add-file.ts
index 2f975e1984..d180bbabf3 100644
--- a/packages/backend/src/services/drive/add-file.ts
+++ b/packages/backend/src/services/drive/add-file.ts
@@ -66,7 +66,7 @@ function urlPathJoin(
  * @param type Content-Type for original
  * @param hash Hash for original
  * @param size Size for original
- * @param usage Optional usage hint for file (f.e. "user_avatar")
+ * @param usage Optional usage hint for file (f.e. "userAvatar")
  */
 async function save(
 	file: DriveFile,

From 3b89a8bfa692cfeb9b71e7489bf493c40ab6a701 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 02:07:08 +0900
Subject: [PATCH 17/99] refactor (backend): port config loader to backend-rs
 completely

---
 packages/backend-rs/index.d.ts                |  70 +++++-
 packages/backend-rs/index.js                  |   6 +-
 packages/backend-rs/src/config/environment.rs |   2 +-
 packages/backend-rs/src/config/server.rs      | 201 +++++++++++++++++-
 packages/backend-rs/src/database/mod.rs       |  12 +-
 packages/backend-rs/src/misc/convert_host.rs  |   8 +-
 packages/backend/src/boot/index.ts            |   2 +-
 packages/backend/src/boot/master.ts           |  30 +--
 packages/backend/src/boot/worker.ts           |   2 +-
 packages/backend/src/config.ts                |   4 +
 packages/backend/src/config/index.ts          |   5 -
 packages/backend/src/config/load.ts           |  89 --------
 packages/backend/src/config/types.ts          |  20 --
 packages/backend/src/const.ts                 |   2 +-
 packages/backend/src/db/postgre.ts            |   2 +-
 packages/backend/src/db/redis.ts              |   2 +-
 packages/backend/src/mfm/to-html.ts           |   2 +-
 packages/backend/src/misc/captcha.ts          |   2 +-
 packages/backend/src/misc/download-url.ts     |   2 +-
 packages/backend/src/misc/fetch.ts            |   2 +-
 packages/backend/src/misc/populate-emojis.ts  |   2 +-
 .../src/models/repositories/drive-file.ts     |   2 +-
 .../backend/src/models/repositories/user.ts   |   2 +-
 .../src/models/schema/federation-instance.ts  |   2 +-
 packages/backend/src/queue/index.ts           |   6 +-
 packages/backend/src/queue/initialize.ts      |   2 +-
 .../processors/db/export-custom-emojis.ts     |   2 +-
 .../src/queue/processors/webhook-deliver.ts   |   2 +-
 packages/backend/src/queue/queues.ts          |   2 +-
 .../src/remote/activitypub/check-fetch.ts     |   2 +-
 .../src/remote/activitypub/db-resolver.ts     |   2 +-
 .../remote/activitypub/kernel/flag/index.ts   |   2 +-
 .../src/remote/activitypub/renderer/accept.ts |   2 +-
 .../src/remote/activitypub/renderer/add.ts    |   2 +-
 .../remote/activitypub/renderer/announce.ts   |   2 +-
 .../src/remote/activitypub/renderer/block.ts  |   2 +-
 .../src/remote/activitypub/renderer/create.ts |   2 +-
 .../src/remote/activitypub/renderer/delete.ts |   2 +-
 .../src/remote/activitypub/renderer/emoji.ts  |   2 +-
 .../src/remote/activitypub/renderer/flag.ts   |   2 +-
 .../activitypub/renderer/follow-relay.ts      |   2 +-
 .../activitypub/renderer/follow-user.ts       |   2 +-
 .../src/remote/activitypub/renderer/follow.ts |   2 +-
 .../remote/activitypub/renderer/hashtag.ts    |   2 +-
 .../src/remote/activitypub/renderer/index.ts  |   2 +-
 .../src/remote/activitypub/renderer/key.ts    |   2 +-
 .../src/remote/activitypub/renderer/like.ts   |   2 +-
 .../remote/activitypub/renderer/mention.ts    |   2 +-
 .../src/remote/activitypub/renderer/note.ts   |   2 +-
 .../src/remote/activitypub/renderer/person.ts |   2 +-
 .../remote/activitypub/renderer/question.ts   |   2 +-
 .../src/remote/activitypub/renderer/read.ts   |   2 +-
 .../src/remote/activitypub/renderer/reject.ts |   2 +-
 .../src/remote/activitypub/renderer/remove.ts |   2 +-
 .../src/remote/activitypub/renderer/undo.ts   |   2 +-
 .../src/remote/activitypub/renderer/update.ts |   2 +-
 .../src/remote/activitypub/renderer/vote.ts   |   2 +-
 .../backend/src/remote/activitypub/request.ts |   2 +-
 .../src/remote/activitypub/resolver.ts        |   2 +-
 packages/backend/src/remote/resolve-user.ts   |   2 +-
 packages/backend/src/server/activitypub.ts    |   2 +-
 .../src/server/activitypub/featured.ts        |   2 +-
 .../src/server/activitypub/followers.ts       |   2 +-
 .../src/server/activitypub/following.ts       |   2 +-
 .../backend/src/server/activitypub/outbox.ts  |   2 +-
 packages/backend/src/server/api/2fa.ts        |   2 +-
 .../backend/src/server/api/common/signin.ts   |   2 +-
 .../backend/src/server/api/common/signup.ts   |   2 +-
 .../api/endpoints/admin/accounts/hosted.ts    |   2 +-
 .../src/server/api/endpoints/admin/meta.ts    |   2 +-
 .../api/endpoints/auth/session/generate.ts    |   2 +-
 .../src/server/api/endpoints/fetch-rss.ts     |   2 +-
 .../server/api/endpoints/i/2fa/key-done.ts    |   2 +-
 .../server/api/endpoints/i/2fa/register.ts    |   2 +-
 .../src/server/api/endpoints/i/move.ts        |   2 +-
 .../server/api/endpoints/i/update-email.ts    |   2 +-
 .../backend/src/server/api/endpoints/meta.ts  |   2 +-
 .../api/endpoints/request-reset-password.ts   |   2 +-
 .../api/endpoints/username/available.ts       |   2 +-
 packages/backend/src/server/api/index.ts      |   2 +-
 .../src/server/api/mastodon/endpoints/meta.ts |   2 +-
 .../src/server/api/openapi/gen-spec.ts        |   2 +-
 .../backend/src/server/api/private/signin.ts  |   2 +-
 .../backend/src/server/api/private/signup.ts  |   2 +-
 packages/backend/src/server/index.ts          |   2 +-
 packages/backend/src/server/nodeinfo.ts       |   2 +-
 packages/backend/src/server/web/feed.ts       |   2 +-
 packages/backend/src/server/web/index.ts      |   2 +-
 packages/backend/src/server/web/manifest.ts   |   2 +-
 .../backend/src/server/web/url-preview.ts     |   2 +-
 packages/backend/src/server/well-known.ts     |   2 +-
 .../src/services/drive/internal-storage.ts    |   2 +-
 packages/backend/src/services/fetch-rel-me.ts |   2 +-
 .../src/services/following/requests/create.ts |   2 +-
 packages/backend/src/services/i/pin.ts        |   2 +-
 packages/backend/src/services/logger.ts       |   2 +-
 .../backend/src/services/messages/delete.ts   |   2 +-
 packages/backend/src/services/note/create.ts  |   2 +-
 packages/backend/src/services/note/delete.ts  |   2 +-
 .../backend/src/services/push-notification.ts |   2 +-
 packages/backend/src/services/send-email.ts   |   2 +-
 packages/backend/src/services/stream.ts       |   2 +-
 packages/backend/src/services/suspend-user.ts |   2 +-
 .../backend/src/services/unsuspend-user.ts    |   2 +-
 104 files changed, 375 insertions(+), 262 deletions(-)
 create mode 100644 packages/backend/src/config.ts
 delete mode 100644 packages/backend/src/config/index.ts
 delete mode 100644 packages/backend/src/config/load.ts
 delete mode 100644 packages/backend/src/config/types.ts

diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index 1cf961bd30..d985eb368d 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -12,7 +12,7 @@ export interface EnvConfig {
   withLogTime: boolean
   slow: boolean
 }
-export function readEnvironmentConfig(): EnvConfig
+export function loadEnv(): EnvConfig
 export interface ServerConfig {
   url: string
   port: number
@@ -29,7 +29,7 @@ export interface ServerConfig {
   /** `NapiValue` is not implemented for `u64` */
   maxFileSize?: number
   accessLog?: string
-  clusterLimits?: WorkerConfig
+  clusterLimits?: _WorkerConfig
   cuid?: IdConfig
   outgoingAddress?: string
   deliverJobConcurrency?: number
@@ -76,6 +76,10 @@ export interface TlsConfig {
   host: string
   rejectUnauthorized: boolean
 }
+export interface WorkerConfig {
+  web: number
+  queue: number
+}
 export interface WorkerConfig {
   web?: number
   queue?: number
@@ -121,7 +125,67 @@ export interface ObjectStorageConfig {
   setPublicReadOnUpload?: boolean
   s3ForcePathStyle?: boolean
 }
-export function readServerConfig(): ServerConfig
+export interface Config {
+  url: string
+  port: number
+  bind?: string
+  disableHsts?: boolean
+  db: DbConfig
+  redis: RedisConfig
+  cacheServer?: RedisConfig
+  proxy?: string
+  proxySmtp?: string
+  proxyBypassHosts?: Array<string>
+  allowedPrivateNetworks?: Array<string>
+  maxFileSize?: number
+  accessLog?: string
+  clusterLimits: WorkerConfig
+  cuid?: IdConfig
+  outgoingAddress?: string
+  deliverJobConcurrency?: number
+  inboxJobConcurrency?: number
+  deliverJobPerSec?: number
+  inboxJobPerSec?: number
+  deliverJobMaxAttempts?: number
+  inboxJobMaxAttempts?: number
+  logLevel?: Array<string>
+  syslog?: SysLogConfig
+  proxyRemoteFiles?: boolean
+  mediaProxy?: string
+  summalyProxyUrl?: string
+  reservedUsernames?: Array<string>
+  maxUserSignups?: number
+  isManagedHosting?: boolean
+  maxNoteLength?: number
+  maxCaptionLength?: number
+  deepl?: DeepLConfig
+  libreTranslate?: LibreTranslateConfig
+  email?: EmailConfig
+  objectStorage?: ObjectStorageConfig
+  version: string
+  host: string
+  hostname: string
+  scheme: string
+  wsScheme: string
+  apiUrl: string
+  wsUrl: string
+  authUrl: string
+  driveUrl: string
+  userAgent: string
+  clientEntry: Manifest
+}
+export interface Manifest {
+  file: string
+  name: string
+  src: string
+  isEntry: boolean
+  isDynamicEntry: boolean
+  imports: Array<string>
+  dynamicImports: Array<string>
+  css: Array<string>
+  assets: Array<string>
+}
+export function loadConfig(): Config
 export interface Acct {
   username: string
   host: string | null
diff --git a/packages/backend-rs/index.js b/packages/backend-rs/index.js
index 1ea7bb5bed..5fd1e9d784 100644
--- a/packages/backend-rs/index.js
+++ b/packages/backend-rs/index.js
@@ -310,10 +310,10 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { readEnvironmentConfig, readServerConfig, stringToAcct, acctToString, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, AntennaSrcEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, initIdGenerator, getTimestamp, genId, secureRndstr } = nativeBinding
+const { loadEnv, loadConfig, stringToAcct, acctToString, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, AntennaSrcEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, initIdGenerator, getTimestamp, genId, secureRndstr } = nativeBinding
 
-module.exports.readEnvironmentConfig = readEnvironmentConfig
-module.exports.readServerConfig = readServerConfig
+module.exports.loadEnv = loadEnv
+module.exports.loadConfig = loadConfig
 module.exports.stringToAcct = stringToAcct
 module.exports.acctToString = acctToString
 module.exports.checkWordMute = checkWordMute
diff --git a/packages/backend-rs/src/config/environment.rs b/packages/backend-rs/src/config/environment.rs
index 7d66aec7ba..1825af326a 100644
--- a/packages/backend-rs/src/config/environment.rs
+++ b/packages/backend-rs/src/config/environment.rs
@@ -11,7 +11,7 @@ pub struct EnvConfig {
 }
 
 #[crate::export]
-pub fn read_environment_config() -> EnvConfig {
+pub fn load_env() -> EnvConfig {
     let node_env = std::env::var("NODE_ENV").unwrap_or_default().to_lowercase();
     let is_testing = node_env == "test";
 
diff --git a/packages/backend-rs/src/config/server.rs b/packages/backend-rs/src/config/server.rs
index 125bae90b9..4b9fbc7131 100644
--- a/packages/backend-rs/src/config/server.rs
+++ b/packages/backend-rs/src/config/server.rs
@@ -6,7 +6,7 @@ use std::fs;
 #[derive(Clone, Debug, PartialEq, Deserialize)]
 #[serde(rename_all = "camelCase")]
 #[crate::export(object, use_nullable = false)]
-pub struct ServerConfig {
+struct ServerConfig {
     pub url: String,
     pub port: u16,
     /// host to listen on
@@ -25,7 +25,7 @@ pub struct ServerConfig {
     /// `NapiValue` is not implemented for `u64`
     pub max_file_size: Option<i64>,
     pub access_log: Option<String>,
-    pub cluster_limits: Option<WorkerConfig>,
+    pub cluster_limits: Option<_WorkerConfig>,
     pub cuid: Option<IdConfig>,
     pub outgoing_address: Option<String>,
 
@@ -94,10 +94,16 @@ pub struct TlsConfig {
     pub reject_unauthorized: bool,
 }
 
+#[crate::export(object, use_nullable = false)]
+pub struct WorkerConfig {
+    pub web: u32,
+    pub queue: u32,
+}
+
 #[derive(Clone, Debug, PartialEq, Deserialize)]
 #[serde(rename_all = "camelCase")]
 #[crate::export(object, use_nullable = false)]
-pub struct WorkerConfig {
+pub struct _WorkerConfig {
     pub web: Option<u32>,
     pub queue: Option<u32>,
 }
@@ -167,17 +173,198 @@ pub struct ObjectStorageConfig {
     pub s3_force_path_style: Option<bool>,
 }
 
-#[crate::export]
-pub fn read_server_config() -> ServerConfig {
+#[crate::export(object, use_nullable = false)]
+pub struct Config {
+    // ServerConfig (from default.yml)
+    pub url: String,
+    pub port: u16,
+    pub bind: Option<String>,
+    pub disable_hsts: Option<bool>,
+    pub db: DbConfig,
+    pub redis: RedisConfig,
+    pub cache_server: Option<RedisConfig>,
+    pub proxy: Option<String>,
+    pub proxy_smtp: Option<String>,
+    pub proxy_bypass_hosts: Option<Vec<String>>,
+    pub allowed_private_networks: Option<Vec<String>>,
+    pub max_file_size: Option<i64>,
+    pub access_log: Option<String>,
+    pub cluster_limits: WorkerConfig,
+    pub cuid: Option<IdConfig>,
+    pub outgoing_address: Option<String>,
+    pub deliver_job_concurrency: Option<u32>,
+    pub inbox_job_concurrency: Option<u32>,
+    pub deliver_job_per_sec: Option<u32>,
+    pub inbox_job_per_sec: Option<u32>,
+    pub deliver_job_max_attempts: Option<u32>,
+    pub inbox_job_max_attempts: Option<u32>,
+    pub log_level: Option<Vec<String>>,
+    pub syslog: Option<SysLogConfig>,
+    pub proxy_remote_files: Option<bool>,
+    pub media_proxy: Option<String>,
+    pub summaly_proxy_url: Option<String>,
+    pub reserved_usernames: Option<Vec<String>>,
+    pub max_user_signups: Option<u32>,
+    pub is_managed_hosting: Option<bool>,
+    pub max_note_length: Option<u32>,
+    pub max_caption_length: Option<u32>,
+    pub deepl: Option<DeepLConfig>,
+    pub libre_translate: Option<LibreTranslateConfig>,
+    pub email: Option<EmailConfig>,
+    pub object_storage: Option<ObjectStorageConfig>,
+
+    // Mixin
+    pub version: String,
+    pub host: String,
+    pub hostname: String,
+    pub scheme: String,
+    pub ws_scheme: String,
+    pub api_url: String,
+    pub ws_url: String,
+    pub auth_url: String,
+    pub drive_url: String,
+    pub user_agent: String,
+    pub client_entry: Manifest,
+}
+
+#[derive(Clone, Debug, PartialEq, Deserialize)]
+#[serde(rename_all = "camelCase")]
+struct Meta {
+    pub version: String,
+}
+
+#[derive(Clone, Debug, PartialEq, Deserialize)]
+struct ManifestJson {
+    #[serde(rename = "src/init.ts")]
+    pub init_ts: Manifest,
+}
+
+#[derive(Clone, Debug, PartialEq, Deserialize)]
+#[serde(rename_all = "camelCase")]
+#[crate::export(object, use_nullable = false)]
+pub struct Manifest {
+    pub file: String,
+    pub name: String,
+    pub src: String,
+    pub is_entry: bool,
+    pub is_dynamic_entry: bool,
+    pub imports: Vec<String>,
+    pub dynamic_imports: Vec<String>,
+    pub css: Vec<String>,
+    pub assets: Vec<String>,
+}
+
+fn read_config_file() -> ServerConfig {
     let cwd = env::current_dir().unwrap();
     let yml = fs::File::open(cwd.join("../../.config/default.yml"))
         .expect("Failed to open '.config/default.yml'");
-    let mut data: ServerConfig = serde_yaml::from_reader(yml).expect("Failed to parse yaml");
+    let mut data: ServerConfig =
+        serde_yaml::from_reader(yml).expect("Failed to parse .config/default.yml");
+
     data.url = url::Url::parse(&data.url)
         .expect("Config url is invalid")
         .origin()
         .ascii_serialization();
+
+    if data.bind.is_none() {
+        data.bind = std::env::var("BIND").ok()
+    }
+
     data
 }
 
-pub static SERVER_CONFIG: Lazy<ServerConfig> = Lazy::new(read_server_config);
+fn read_meta() -> Meta {
+    let cwd = env::current_dir().unwrap();
+    let meta_json = fs::File::open(cwd.join("../../built/meta.json"))
+        .expect("Failed to open 'built/meta.json'");
+    serde_json::from_reader(meta_json).expect("Failed to parse built/meta.json")
+}
+
+fn read_manifest() -> Manifest {
+    let cwd = env::current_dir().unwrap();
+    let manifest_json = fs::File::open(cwd.join("../../built/_client_dist_/manifest.json"))
+        .expect("Failed to open 'built/_client_dist_/manifest.json'");
+    let manifest: ManifestJson = serde_json::from_reader(manifest_json)
+        .expect("Failed to parse built/_client_dist_/manifest.json");
+
+    manifest.init_ts
+}
+
+#[crate::export]
+fn load_config() -> Config {
+    let server_config = read_config_file();
+    let version = read_meta().version;
+    let manifest = read_manifest();
+    let url = url::Url::parse(&server_config.url).expect("Config url is invalid");
+    let host = url
+        .host_str()
+        .expect("Hostname is missing in the config url")
+        .to_owned();
+    let hostname = url
+        .domain()
+        .expect("Domain is missing in the config url")
+        .to_owned();
+    let scheme = url.scheme().to_owned();
+    let ws_scheme = scheme.replace("http", "ws");
+
+    let cluster_limits = match server_config.cluster_limits {
+        Some(cl) => WorkerConfig {
+            web: cl.web.unwrap_or(1),
+            queue: cl.queue.unwrap_or(1),
+        },
+        None => WorkerConfig { web: 1, queue: 1 },
+    };
+
+    Config {
+        url: server_config.url,
+        port: server_config.port,
+        bind: server_config.bind,
+        disable_hsts: server_config.disable_hsts,
+        db: server_config.db,
+        redis: server_config.redis,
+        cache_server: server_config.cache_server,
+        proxy: server_config.proxy,
+        proxy_smtp: server_config.proxy_smtp,
+        proxy_bypass_hosts: server_config.proxy_bypass_hosts,
+        allowed_private_networks: server_config.allowed_private_networks,
+        max_file_size: server_config.max_file_size,
+        access_log: server_config.access_log,
+        cluster_limits,
+        cuid: server_config.cuid,
+        outgoing_address: server_config.outgoing_address,
+        deliver_job_concurrency: server_config.deliver_job_concurrency,
+        inbox_job_concurrency: server_config.inbox_job_concurrency,
+        deliver_job_per_sec: server_config.deliver_job_per_sec,
+        inbox_job_per_sec: server_config.inbox_job_per_sec,
+        deliver_job_max_attempts: server_config.deliver_job_max_attempts,
+        inbox_job_max_attempts: server_config.inbox_job_max_attempts,
+        log_level: server_config.log_level,
+        syslog: server_config.syslog,
+        proxy_remote_files: server_config.proxy_remote_files,
+        media_proxy: server_config.media_proxy,
+        summaly_proxy_url: server_config.summaly_proxy_url,
+        reserved_usernames: server_config.reserved_usernames,
+        max_user_signups: server_config.max_user_signups,
+        is_managed_hosting: server_config.is_managed_hosting,
+        max_note_length: server_config.max_note_length,
+        max_caption_length: server_config.max_caption_length,
+        deepl: server_config.deepl,
+        libre_translate: server_config.libre_translate,
+        email: server_config.email,
+        object_storage: server_config.object_storage,
+
+        ws_url: format!("{}://{}", ws_scheme, host),
+        api_url: format!("{}://{}/api", scheme, host),
+        auth_url: format!("{}://{}/auth", scheme, host),
+        drive_url: format!("{}://{}/files", scheme, host),
+        user_agent: format!("Firefish/{} ({})", version, url),
+        version,
+        host,
+        hostname,
+        scheme,
+        ws_scheme,
+        client_entry: manifest,
+    }
+}
+
+pub static CONFIG: Lazy<Config> = Lazy::new(load_config);
diff --git a/packages/backend-rs/src/database/mod.rs b/packages/backend-rs/src/database/mod.rs
index f598e35cc7..a60d20af9c 100644
--- a/packages/backend-rs/src/database/mod.rs
+++ b/packages/backend-rs/src/database/mod.rs
@@ -1,4 +1,4 @@
-use crate::config::server::SERVER_CONFIG;
+use crate::config::server::CONFIG;
 use sea_orm::{Database, DbConn, DbErr};
 
 static DB_CONN: once_cell::sync::OnceCell<DbConn> = once_cell::sync::OnceCell::new();
@@ -6,11 +6,11 @@ static DB_CONN: once_cell::sync::OnceCell<DbConn> = once_cell::sync::OnceCell::n
 async fn init_database() -> Result<&'static DbConn, DbErr> {
     let database_uri = format!(
         "postgres://{}:{}@{}:{}/{}",
-        SERVER_CONFIG.db.user,
-        urlencoding::encode(&SERVER_CONFIG.db.pass),
-        SERVER_CONFIG.db.host,
-        SERVER_CONFIG.db.port,
-        SERVER_CONFIG.db.db,
+        CONFIG.db.user,
+        urlencoding::encode(&CONFIG.db.pass),
+        CONFIG.db.host,
+        CONFIG.db.port,
+        CONFIG.db.db,
     );
     let conn = Database::connect(database_uri).await?;
     Ok(DB_CONN.get_or_init(move || conn))
diff --git a/packages/backend-rs/src/misc/convert_host.rs b/packages/backend-rs/src/misc/convert_host.rs
index 34a0792c62..cff52aeb07 100644
--- a/packages/backend-rs/src/misc/convert_host.rs
+++ b/packages/backend-rs/src/misc/convert_host.rs
@@ -1,4 +1,4 @@
-use crate::config::server::SERVER_CONFIG;
+use crate::config::server::CONFIG;
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -14,21 +14,21 @@ pub enum Error {
 pub fn get_full_ap_account(username: &str, host: Option<&str>) -> Result<String, Error> {
     Ok(match host {
         Some(host) => format!("{}@{}", username, to_puny(host)?),
-        None => format!("{}@{}", username, extract_host(&SERVER_CONFIG.url)?),
+        None => format!("{}@{}", username, extract_host(&CONFIG.url)?),
     })
 }
 
 #[crate::export]
 pub fn is_self_host(host: Option<&str>) -> Result<bool, Error> {
     Ok(match host {
-        Some(host) => extract_host(&SERVER_CONFIG.url)? == to_puny(host)?,
+        Some(host) => extract_host(&CONFIG.url)? == to_puny(host)?,
         None => true,
     })
 }
 
 #[crate::export]
 pub fn is_same_origin(uri: &str) -> Result<bool, Error> {
-    Ok(url::Url::parse(uri)?.origin().ascii_serialization() == SERVER_CONFIG.url)
+    Ok(url::Url::parse(uri)?.origin().ascii_serialization() == CONFIG.url)
 }
 
 #[crate::export]
diff --git a/packages/backend/src/boot/index.ts b/packages/backend/src/boot/index.ts
index 9854d2dce4..3e542a6e36 100644
--- a/packages/backend/src/boot/index.ts
+++ b/packages/backend/src/boot/index.ts
@@ -3,7 +3,7 @@ import chalk from "chalk";
 import Xev from "xev";
 
 import Logger from "@/services/logger.js";
-import { envOption } from "@/config/index.js";
+import { envOption } from "@/config.js";
 import { inspect } from "node:util";
 
 // for typeorm
diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index 3ba2d0cf50..44c4a8a2f1 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -8,9 +8,8 @@ import chalkTemplate from "chalk-template";
 import semver from "semver";
 
 import Logger from "@/services/logger.js";
-import loadConfig from "@/config/load.js";
-import type { Config } from "@/config/types.js";
-import { envOption } from "@/config/index.js";
+import type { Config } from "backend-rs";
+import { config, envOption } from "@/config.js";
 import { showMachineInfo } from "@/misc/show-machine-info.js";
 import { db, initDb } from "@/db/postgre.js";
 import { inspect } from "node:util";
@@ -87,15 +86,12 @@ function greet() {
  * Init master process
  */
 export async function masterMain() {
-	let config!: Config;
-
 	// initialize app
 	try {
 		greet();
 		showEnvironment();
 		await showMachineInfo(bootLogger);
 		showNodejsVersion();
-		config = loadConfigBoot();
 		await connectDb();
 	} catch (e) {
 		bootLogger.error(
@@ -154,28 +150,6 @@ function showNodejsVersion(): void {
 	}
 }
 
-function loadConfigBoot(): Config {
-	const configLogger = bootLogger.createSubLogger("config");
-	let config;
-
-	try {
-		config = loadConfig();
-	} catch (exception) {
-		if (exception.code === "ENOENT") {
-			configLogger.error("Configuration file not found", null, true);
-			process.exit(1);
-		} else if (e instanceof Error) {
-			configLogger.error(e.message);
-			process.exit(1);
-		}
-		throw exception;
-	}
-
-	configLogger.succ("Loaded");
-
-	return config;
-}
-
 async function connectDb(): Promise<void> {
 	const dbLogger = bootLogger.createSubLogger("db");
 
diff --git a/packages/backend/src/boot/worker.ts b/packages/backend/src/boot/worker.ts
index 647ea40fbd..cae861230f 100644
--- a/packages/backend/src/boot/worker.ts
+++ b/packages/backend/src/boot/worker.ts
@@ -1,5 +1,5 @@
 import cluster from "node:cluster";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { initDb } from "@/db/postgre.js";
 import { initIdGenerator } from "backend-rs";
 import os from "node:os";
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
new file mode 100644
index 0000000000..c91294b611
--- /dev/null
+++ b/packages/backend/src/config.ts
@@ -0,0 +1,4 @@
+import { loadConfig, loadEnv } from "backend-rs";
+
+export const config = loadConfig();
+export const envOption = loadEnv();
diff --git a/packages/backend/src/config/index.ts b/packages/backend/src/config/index.ts
deleted file mode 100644
index fe87e5026a..0000000000
--- a/packages/backend/src/config/index.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import load from "./load.js";
-import { readEnvironmentConfig } from "backend-rs";
-
-export default load();
-export const envOption = readEnvironmentConfig();
diff --git a/packages/backend/src/config/load.ts b/packages/backend/src/config/load.ts
deleted file mode 100644
index 682bf309d2..0000000000
--- a/packages/backend/src/config/load.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * Config loader
- */
-
-import * as fs from "node:fs";
-import { fileURLToPath } from "node:url";
-import { dirname } from "node:path";
-import type { Mixin } from "./types.js";
-import { readServerConfig } from "backend-rs";
-
-const _filename = fileURLToPath(import.meta.url);
-const _dirname = dirname(_filename);
-
-/**
- * Path of configuration directory
- */
-const dir = `${_dirname}/../../../../.config`;
-
-/**
- * Path of configuration file
- */
-const path =
-	process.env.NODE_ENV === "test" ? `${dir}/test.yml` : `${dir}/default.yml`;
-
-export default function load() {
-	const meta = JSON.parse(
-		fs.readFileSync(`${_dirname}/../../../../built/meta.json`, "utf-8"),
-	);
-	const clientManifest = JSON.parse(
-		fs.readFileSync(
-			`${_dirname}/../../../../built/_client_dist_/manifest.json`,
-			"utf-8",
-		),
-	);
-	const config = readServerConfig();
-
-	const mixin = {} as Mixin;
-
-	const url = tryCreateUrl(config.url);
-
-	config.url = url.origin;
-
-	config.port = config.port || parseInt(process.env.PORT || "", 10);
-	config.bind = config.bind || process.env.BIND;
-
-	mixin.version = meta.version;
-	mixin.host = url.host;
-	mixin.hostname = url.hostname;
-	mixin.scheme = url.protocol.replace(/:$/, "");
-	mixin.wsScheme = mixin.scheme.replace("http", "ws");
-	mixin.wsUrl = `${mixin.wsScheme}://${mixin.host}`;
-	mixin.apiUrl = `${mixin.scheme}://${mixin.host}/api`;
-	mixin.authUrl = `${mixin.scheme}://${mixin.host}/auth`;
-	mixin.driveUrl = `${mixin.scheme}://${mixin.host}/files`;
-	mixin.userAgent = `Firefish/${meta.version} (${config.url})`;
-	mixin.clientEntry = clientManifest["src/init.ts"];
-
-	if (config.proxyRemoteFiles == null) config.proxyRemoteFiles = true;
-	if (!config.redis.prefix) config.redis.prefix = mixin.hostname;
-	if (config.cacheServer && !config.cacheServer.prefix)
-		config.cacheServer.prefix = mixin.hostname;
-
-	if (!config.clusterLimits) {
-		config.clusterLimits = {
-			web: 1,
-			queue: 1,
-		};
-	} else {
-		config.clusterLimits = {
-			web: 1,
-			queue: 1,
-			...config.clusterLimits,
-		};
-
-		if (config.clusterLimits.web! < 1 || config.clusterLimits.queue! < 1) {
-			throw new Error("Invalid cluster limits");
-		}
-	}
-
-	return Object.assign(config, mixin);
-}
-
-function tryCreateUrl(url: string) {
-	try {
-		return new URL(url);
-	} catch (e) {
-		throw new Error(`url="${url}" is not a valid URL.`);
-	}
-}
diff --git a/packages/backend/src/config/types.ts b/packages/backend/src/config/types.ts
deleted file mode 100644
index 6b593d3b2d..0000000000
--- a/packages/backend/src/config/types.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import type { ServerConfig } from "backend-rs";
-
-/**
- * Firefish が自動的に(ユーザーが設定した情報から推論して)設定する情報
- */
-export type Mixin = {
-	version: string;
-	host: string;
-	hostname: string;
-	scheme: string;
-	wsScheme: string;
-	apiUrl: string;
-	wsUrl: string;
-	authUrl: string;
-	driveUrl: string;
-	userAgent: string;
-	clientEntry: string;
-};
-
-export type Config = ServerConfig & Mixin;
diff --git a/packages/backend/src/const.ts b/packages/backend/src/const.ts
index 39ff99fda7..2c52e2b009 100644
--- a/packages/backend/src/const.ts
+++ b/packages/backend/src/const.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import {
 	DB_MAX_IMAGE_COMMENT_LENGTH,
 	DB_MAX_NOTE_TEXT_LENGTH,
diff --git a/packages/backend/src/db/postgre.ts b/packages/backend/src/db/postgre.ts
index 6baccaa271..e0ab9d6d37 100644
--- a/packages/backend/src/db/postgre.ts
+++ b/packages/backend/src/db/postgre.ts
@@ -5,7 +5,7 @@ pg.types.setTypeParser(20, Number);
 import type { Logger } from "typeorm";
 import { DataSource } from "typeorm";
 import * as highlight from "cli-highlight";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 
 import { User } from "@/models/entities/user.js";
 import { DriveFile } from "@/models/entities/drive-file.js";
diff --git a/packages/backend/src/db/redis.ts b/packages/backend/src/db/redis.ts
index 215effd8ea..dc703e9d47 100644
--- a/packages/backend/src/db/redis.ts
+++ b/packages/backend/src/db/redis.ts
@@ -1,5 +1,5 @@
 import Redis from "ioredis";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 
 export function createConnection() {
 	let source = config.redis;
diff --git a/packages/backend/src/mfm/to-html.ts b/packages/backend/src/mfm/to-html.ts
index 7b7c0967a1..64aa9d7164 100644
--- a/packages/backend/src/mfm/to-html.ts
+++ b/packages/backend/src/mfm/to-html.ts
@@ -1,7 +1,7 @@
 import { type HTMLElement, Window } from "happy-dom";
 import type * as mfm from "mfm-js";
 import katex from "katex";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { intersperse } from "@/prelude/array.js";
 import type { IMentionedRemoteUsers } from "@/models/entities/note.js";
 
diff --git a/packages/backend/src/misc/captcha.ts b/packages/backend/src/misc/captcha.ts
index c163d4d82d..d0969b0205 100644
--- a/packages/backend/src/misc/captcha.ts
+++ b/packages/backend/src/misc/captcha.ts
@@ -1,7 +1,7 @@
 import fetch from "node-fetch";
 import { URLSearchParams } from "node:url";
 import { getAgentByUrl } from "@/misc/fetch.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { inspect } from "node:util";
 
 export async function verifyRecaptcha(secret: string, response: string) {
diff --git a/packages/backend/src/misc/download-url.ts b/packages/backend/src/misc/download-url.ts
index ab04e8aa9c..1bfd0a9f80 100644
--- a/packages/backend/src/misc/download-url.ts
+++ b/packages/backend/src/misc/download-url.ts
@@ -3,7 +3,7 @@ import * as stream from "node:stream";
 import * as util from "node:util";
 import got, * as Got from "got";
 import { httpAgent, httpsAgent, StatusError } from "./fetch.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import chalk from "chalk";
 import Logger from "@/services/logger.js";
 import IPCIDR from "ip-cidr";
diff --git a/packages/backend/src/misc/fetch.ts b/packages/backend/src/misc/fetch.ts
index 4b8fc048e2..b26fa83052 100644
--- a/packages/backend/src/misc/fetch.ts
+++ b/packages/backend/src/misc/fetch.ts
@@ -4,7 +4,7 @@ import type { URL } from "node:url";
 import CacheableLookup from "cacheable-lookup";
 import fetch, { type RequestRedirect } from "node-fetch";
 import { HttpProxyAgent, HttpsProxyAgent } from "hpagent";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { isValidUrl } from "./is-valid-url.js";
 
 export async function getJson(
diff --git a/packages/backend/src/misc/populate-emojis.ts b/packages/backend/src/misc/populate-emojis.ts
index 4ca60b222f..f2656ea28a 100644
--- a/packages/backend/src/misc/populate-emojis.ts
+++ b/packages/backend/src/misc/populate-emojis.ts
@@ -4,7 +4,7 @@ import type { Emoji } from "@/models/entities/emoji.js";
 import type { Note } from "@/models/entities/note.js";
 import { Cache } from "./cache.js";
 import { decodeReaction, isSelfHost, toPuny } from "backend-rs";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { query } from "@/prelude/url.js";
 import { redisClient } from "@/db/redis.js";
 import type { NoteEdit } from "@/models/entities/note-edit.js";
diff --git a/packages/backend/src/models/repositories/drive-file.ts b/packages/backend/src/models/repositories/drive-file.ts
index 2321f20d4c..757bd77ad6 100644
--- a/packages/backend/src/models/repositories/drive-file.ts
+++ b/packages/backend/src/models/repositories/drive-file.ts
@@ -4,7 +4,7 @@ import type { User } from "@/models/entities/user.js";
 import { toPuny } from "backend-rs";
 import { awaitAll } from "@/prelude/await-all.js";
 import type { Packed } from "@/misc/schema.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { query, appendQuery } from "@/prelude/url.js";
 import { Users, DriveFolders } from "../index.js";
 import { deepClone } from "@/misc/clone.js";
diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index 3bc943965b..040106b410 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -2,7 +2,7 @@ import { In, Not } from "typeorm";
 import Ajv from "ajv";
 import type { ILocalUser, IRemoteUser } from "@/models/entities/user.js";
 import { User } from "@/models/entities/user.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { Packed } from "@/misc/schema.js";
 import type { Promiseable } from "@/prelude/await-all.js";
 import { awaitAll } from "@/prelude/await-all.js";
diff --git a/packages/backend/src/models/schema/federation-instance.ts b/packages/backend/src/models/schema/federation-instance.ts
index 7a8af7f51d..338e079e28 100644
--- a/packages/backend/src/models/schema/federation-instance.ts
+++ b/packages/backend/src/models/schema/federation-instance.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 
 export const packedFederationInstanceSchema = {
 	type: "object",
diff --git a/packages/backend/src/queue/index.ts b/packages/backend/src/queue/index.ts
index e4e413be52..6272a5e668 100644
--- a/packages/backend/src/queue/index.ts
+++ b/packages/backend/src/queue/index.ts
@@ -1,11 +1,10 @@
 import type httpSignature from "@peertube/http-signature";
 import { v4 as uuid } from "uuid";
 
-import config from "@/config/index.js";
+import { config, envOption } from "@/config.js";
 import type { DriveFile } from "@/models/entities/drive-file.js";
 import type { IActivity } from "@/remote/activitypub/type.js";
 import type { Webhook, webhookEventTypes } from "@/models/entities/webhook.js";
-import { envOption } from "@/config/index.js";
 
 import processDeliver from "./processors/deliver.js";
 import processInbox from "./processors/inbox.js";
@@ -24,10 +23,9 @@ import {
 	objectStorageQueue,
 	endedPollNotificationQueue,
 	webhookDeliverQueue,
-	backgroundQueue,
 } from "./queues.js";
 import type { ThinUser } from "./types.js";
-import { Note } from "@/models/entities/note.js";
+import type { Note } from "@/models/entities/note.js";
 
 function renderError(e: Error): any {
 	return {
diff --git a/packages/backend/src/queue/initialize.ts b/packages/backend/src/queue/initialize.ts
index 0f9c83132f..3291d47675 100644
--- a/packages/backend/src/queue/initialize.ts
+++ b/packages/backend/src/queue/initialize.ts
@@ -1,5 +1,5 @@
 import Bull from "bull";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 
 export function initialize<T>(name: string, limitPerSec = -1) {
 	return new Bull<T>(name, {
diff --git a/packages/backend/src/queue/processors/db/export-custom-emojis.ts b/packages/backend/src/queue/processors/db/export-custom-emojis.ts
index a1ca3a91c5..157751c1aa 100644
--- a/packages/backend/src/queue/processors/db/export-custom-emojis.ts
+++ b/packages/backend/src/queue/processors/db/export-custom-emojis.ts
@@ -9,7 +9,7 @@ import { format as dateFormat } from "date-fns";
 import { Users, Emojis } from "@/models/index.js";
 import { createTemp, createTempDir } from "@/misc/create-temp.js";
 import { downloadUrl } from "@/misc/download-url.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { IsNull } from "typeorm";
 import { inspect } from "node:util";
 
diff --git a/packages/backend/src/queue/processors/webhook-deliver.ts b/packages/backend/src/queue/processors/webhook-deliver.ts
index 12c9a05498..63a16c373b 100644
--- a/packages/backend/src/queue/processors/webhook-deliver.ts
+++ b/packages/backend/src/queue/processors/webhook-deliver.ts
@@ -3,7 +3,7 @@ import Logger from "@/services/logger.js";
 import type { WebhookDeliverJobData } from "../types.js";
 import { getResponse, StatusError } from "@/misc/fetch.js";
 import { Webhooks } from "@/models/index.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 
 const logger = new Logger("webhook");
 
diff --git a/packages/backend/src/queue/queues.ts b/packages/backend/src/queue/queues.ts
index 6b0eb2de42..06b9567e74 100644
--- a/packages/backend/src/queue/queues.ts
+++ b/packages/backend/src/queue/queues.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { initialize as initializeQueue } from "./initialize.js";
 import type {
 	DeliverJobData,
diff --git a/packages/backend/src/remote/activitypub/check-fetch.ts b/packages/backend/src/remote/activitypub/check-fetch.ts
index 12ea63a931..04d989064f 100644
--- a/packages/backend/src/remote/activitypub/check-fetch.ts
+++ b/packages/backend/src/remote/activitypub/check-fetch.ts
@@ -1,6 +1,6 @@
 import { URL } from "url";
 import httpSignature, { IParsedSignature } from "@peertube/http-signature";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { fetchMeta } from "backend-rs";
 import { toPuny } from "backend-rs";
 import DbResolver from "@/remote/activitypub/db-resolver.js";
diff --git a/packages/backend/src/remote/activitypub/db-resolver.ts b/packages/backend/src/remote/activitypub/db-resolver.ts
index a753606a14..088a2db9da 100644
--- a/packages/backend/src/remote/activitypub/db-resolver.ts
+++ b/packages/backend/src/remote/activitypub/db-resolver.ts
@@ -1,5 +1,5 @@
 import escapeRegexp from "escape-regexp";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { Note } from "@/models/entities/note.js";
 import type {
 	CacheableRemoteUser,
diff --git a/packages/backend/src/remote/activitypub/kernel/flag/index.ts b/packages/backend/src/remote/activitypub/kernel/flag/index.ts
index 0f83f6b449..c556605865 100644
--- a/packages/backend/src/remote/activitypub/kernel/flag/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/flag/index.ts
@@ -1,5 +1,5 @@
 import type { CacheableRemoteUser } from "@/models/entities/user.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { IFlag } from "../../type.js";
 import { getApIds } from "../../type.js";
 import { AbuseUserReports, Users } from "@/models/index.js";
diff --git a/packages/backend/src/remote/activitypub/renderer/accept.ts b/packages/backend/src/remote/activitypub/renderer/accept.ts
index fd145dcf97..2d27a1b29d 100644
--- a/packages/backend/src/remote/activitypub/renderer/accept.ts
+++ b/packages/backend/src/remote/activitypub/renderer/accept.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { User } from "@/models/entities/user.js";
 
 export default (object: any, user: { id: User["id"]; host: null }) => ({
diff --git a/packages/backend/src/remote/activitypub/renderer/add.ts b/packages/backend/src/remote/activitypub/renderer/add.ts
index d8203ac1ea..14c71694e1 100644
--- a/packages/backend/src/remote/activitypub/renderer/add.ts
+++ b/packages/backend/src/remote/activitypub/renderer/add.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { ILocalUser } from "@/models/entities/user.js";
 
 export default (user: ILocalUser, target: any, object: any) => ({
diff --git a/packages/backend/src/remote/activitypub/renderer/announce.ts b/packages/backend/src/remote/activitypub/renderer/announce.ts
index 1fd1842acf..0cc9bec6f4 100644
--- a/packages/backend/src/remote/activitypub/renderer/announce.ts
+++ b/packages/backend/src/remote/activitypub/renderer/announce.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { Note } from "@/models/entities/note.js";
 
 export default (object: any, note: Note) => {
diff --git a/packages/backend/src/remote/activitypub/renderer/block.ts b/packages/backend/src/remote/activitypub/renderer/block.ts
index c2ea267f38..5169e0d550 100644
--- a/packages/backend/src/remote/activitypub/renderer/block.ts
+++ b/packages/backend/src/remote/activitypub/renderer/block.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { Blocking } from "@/models/entities/blocking.js";
 
 /**
diff --git a/packages/backend/src/remote/activitypub/renderer/create.ts b/packages/backend/src/remote/activitypub/renderer/create.ts
index 857f5722cc..89b14b88b2 100644
--- a/packages/backend/src/remote/activitypub/renderer/create.ts
+++ b/packages/backend/src/remote/activitypub/renderer/create.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { Note } from "@/models/entities/note.js";
 
 export default (object: any, note: Note) => {
diff --git a/packages/backend/src/remote/activitypub/renderer/delete.ts b/packages/backend/src/remote/activitypub/renderer/delete.ts
index 70bdc34922..0d2105941e 100644
--- a/packages/backend/src/remote/activitypub/renderer/delete.ts
+++ b/packages/backend/src/remote/activitypub/renderer/delete.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { User } from "@/models/entities/user.js";
 
 export default (object: any, user: { id: User["id"]; host: null }) => ({
diff --git a/packages/backend/src/remote/activitypub/renderer/emoji.ts b/packages/backend/src/remote/activitypub/renderer/emoji.ts
index 3d9b8cd55b..dab0e8cac7 100644
--- a/packages/backend/src/remote/activitypub/renderer/emoji.ts
+++ b/packages/backend/src/remote/activitypub/renderer/emoji.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { Emoji } from "@/models/entities/emoji.js";
 
 export default (emoji: Emoji) => ({
diff --git a/packages/backend/src/remote/activitypub/renderer/flag.ts b/packages/backend/src/remote/activitypub/renderer/flag.ts
index 44da33f5c2..1fa260be5e 100644
--- a/packages/backend/src/remote/activitypub/renderer/flag.ts
+++ b/packages/backend/src/remote/activitypub/renderer/flag.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { ILocalUser } from "@/models/entities/user.js";
 
 // to anonymise reporters, the reporting actor must be a system user
diff --git a/packages/backend/src/remote/activitypub/renderer/follow-relay.ts b/packages/backend/src/remote/activitypub/renderer/follow-relay.ts
index ad7f05bf84..b62d9c4011 100644
--- a/packages/backend/src/remote/activitypub/renderer/follow-relay.ts
+++ b/packages/backend/src/remote/activitypub/renderer/follow-relay.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { Relay } from "@/models/entities/relay.js";
 import type { ILocalUser } from "@/models/entities/user.js";
 
diff --git a/packages/backend/src/remote/activitypub/renderer/follow-user.ts b/packages/backend/src/remote/activitypub/renderer/follow-user.ts
index 22ee429ff6..93228a6327 100644
--- a/packages/backend/src/remote/activitypub/renderer/follow-user.ts
+++ b/packages/backend/src/remote/activitypub/renderer/follow-user.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { Users } from "@/models/index.js";
 import type { User } from "@/models/entities/user.js";
 
diff --git a/packages/backend/src/remote/activitypub/renderer/follow.ts b/packages/backend/src/remote/activitypub/renderer/follow.ts
index 3ff89c12aa..30ad799507 100644
--- a/packages/backend/src/remote/activitypub/renderer/follow.ts
+++ b/packages/backend/src/remote/activitypub/renderer/follow.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { User } from "@/models/entities/user.js";
 import { Users } from "@/models/index.js";
 
diff --git a/packages/backend/src/remote/activitypub/renderer/hashtag.ts b/packages/backend/src/remote/activitypub/renderer/hashtag.ts
index a00cd1ff5e..ab6651f55d 100644
--- a/packages/backend/src/remote/activitypub/renderer/hashtag.ts
+++ b/packages/backend/src/remote/activitypub/renderer/hashtag.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 
 export default (tag: string) => ({
 	type: "Hashtag",
diff --git a/packages/backend/src/remote/activitypub/renderer/index.ts b/packages/backend/src/remote/activitypub/renderer/index.ts
index 2b6229b3e4..a085443d23 100644
--- a/packages/backend/src/remote/activitypub/renderer/index.ts
+++ b/packages/backend/src/remote/activitypub/renderer/index.ts
@@ -1,5 +1,5 @@
 import { v4 as uuid } from "uuid";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { getUserKeypair } from "@/misc/keypair-store.js";
 import type { User } from "@/models/entities/user.js";
 import { LdSignature } from "../misc/ld-signature.js";
diff --git a/packages/backend/src/remote/activitypub/renderer/key.ts b/packages/backend/src/remote/activitypub/renderer/key.ts
index 084bb5361a..1e01640e59 100644
--- a/packages/backend/src/remote/activitypub/renderer/key.ts
+++ b/packages/backend/src/remote/activitypub/renderer/key.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { ILocalUser } from "@/models/entities/user.js";
 import type { UserKeypair } from "@/models/entities/user-keypair.js";
 import { createPublicKey } from "node:crypto";
diff --git a/packages/backend/src/remote/activitypub/renderer/like.ts b/packages/backend/src/remote/activitypub/renderer/like.ts
index 6f810cd201..ea0df3e359 100644
--- a/packages/backend/src/remote/activitypub/renderer/like.ts
+++ b/packages/backend/src/remote/activitypub/renderer/like.ts
@@ -1,5 +1,5 @@
 import { IsNull } from "typeorm";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { NoteReaction } from "@/models/entities/note-reaction.js";
 import type { Note } from "@/models/entities/note.js";
 import { Emojis } from "@/models/index.js";
diff --git a/packages/backend/src/remote/activitypub/renderer/mention.ts b/packages/backend/src/remote/activitypub/renderer/mention.ts
index e7f0435c16..c935c7d325 100644
--- a/packages/backend/src/remote/activitypub/renderer/mention.ts
+++ b/packages/backend/src/remote/activitypub/renderer/mention.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { User, ILocalUser } from "@/models/entities/user.js";
 import { Users } from "@/models/index.js";
 
diff --git a/packages/backend/src/remote/activitypub/renderer/note.ts b/packages/backend/src/remote/activitypub/renderer/note.ts
index f1344c1b03..dc978f1e0e 100644
--- a/packages/backend/src/remote/activitypub/renderer/note.ts
+++ b/packages/backend/src/remote/activitypub/renderer/note.ts
@@ -1,5 +1,5 @@
 import { In, IsNull } from "typeorm";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { Note, IMentionedRemoteUsers } from "@/models/entities/note.js";
 import type { DriveFile } from "@/models/entities/drive-file.js";
 import { DriveFiles, Notes, Users, Emojis, Polls } from "@/models/index.js";
diff --git a/packages/backend/src/remote/activitypub/renderer/person.ts b/packages/backend/src/remote/activitypub/renderer/person.ts
index bba963d72e..c6371440b4 100644
--- a/packages/backend/src/remote/activitypub/renderer/person.ts
+++ b/packages/backend/src/remote/activitypub/renderer/person.ts
@@ -1,6 +1,6 @@
 import { URL } from "node:url";
 import * as mfm from "mfm-js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { ILocalUser } from "@/models/entities/user.js";
 import { DriveFiles, UserProfiles } from "@/models/index.js";
 import { getUserKeypair } from "@/misc/keypair-store.js";
diff --git a/packages/backend/src/remote/activitypub/renderer/question.ts b/packages/backend/src/remote/activitypub/renderer/question.ts
index cb89aa7583..ac62734395 100644
--- a/packages/backend/src/remote/activitypub/renderer/question.ts
+++ b/packages/backend/src/remote/activitypub/renderer/question.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { User } from "@/models/entities/user.js";
 import type { Note } from "@/models/entities/note.js";
 import type { Poll } from "@/models/entities/poll.js";
diff --git a/packages/backend/src/remote/activitypub/renderer/read.ts b/packages/backend/src/remote/activitypub/renderer/read.ts
index 212e7e8ddf..9ea15b10f7 100644
--- a/packages/backend/src/remote/activitypub/renderer/read.ts
+++ b/packages/backend/src/remote/activitypub/renderer/read.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { User } from "@/models/entities/user.js";
 import type { MessagingMessage } from "@/models/entities/messaging-message.js";
 
diff --git a/packages/backend/src/remote/activitypub/renderer/reject.ts b/packages/backend/src/remote/activitypub/renderer/reject.ts
index 7ac4452411..75c3b9d065 100644
--- a/packages/backend/src/remote/activitypub/renderer/reject.ts
+++ b/packages/backend/src/remote/activitypub/renderer/reject.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { User } from "@/models/entities/user.js";
 
 export default (object: any, user: { id: User["id"] }) => ({
diff --git a/packages/backend/src/remote/activitypub/renderer/remove.ts b/packages/backend/src/remote/activitypub/renderer/remove.ts
index e3b3fef856..270744dd30 100644
--- a/packages/backend/src/remote/activitypub/renderer/remove.ts
+++ b/packages/backend/src/remote/activitypub/renderer/remove.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { User } from "@/models/entities/user.js";
 
 export default (user: { id: User["id"] }, target: any, object: any) => ({
diff --git a/packages/backend/src/remote/activitypub/renderer/undo.ts b/packages/backend/src/remote/activitypub/renderer/undo.ts
index 4394c4bf2f..a0285ea9c7 100644
--- a/packages/backend/src/remote/activitypub/renderer/undo.ts
+++ b/packages/backend/src/remote/activitypub/renderer/undo.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { User } from "@/models/entities/user.js";
 
 export default (object: any, user: { id: User["id"] }) => {
diff --git a/packages/backend/src/remote/activitypub/renderer/update.ts b/packages/backend/src/remote/activitypub/renderer/update.ts
index ecb0ed2192..b47f7c5cda 100644
--- a/packages/backend/src/remote/activitypub/renderer/update.ts
+++ b/packages/backend/src/remote/activitypub/renderer/update.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { User } from "@/models/entities/user.js";
 
 export default (object: any, user: { id: User["id"] }) => {
diff --git a/packages/backend/src/remote/activitypub/renderer/vote.ts b/packages/backend/src/remote/activitypub/renderer/vote.ts
index 21234a112d..118e6761ab 100644
--- a/packages/backend/src/remote/activitypub/renderer/vote.ts
+++ b/packages/backend/src/remote/activitypub/renderer/vote.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { Note } from "@/models/entities/note.js";
 import type { IRemoteUser, User } from "@/models/entities/user.js";
 import type { PollVote } from "@/models/entities/poll-vote.js";
diff --git a/packages/backend/src/remote/activitypub/request.ts b/packages/backend/src/remote/activitypub/request.ts
index f6d33b8549..8e3bc764d3 100644
--- a/packages/backend/src/remote/activitypub/request.ts
+++ b/packages/backend/src/remote/activitypub/request.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { getUserKeypair } from "@/misc/keypair-store.js";
 import type { User, ILocalUser } from "@/models/entities/user.js";
 import { StatusError, getResponse } from "@/misc/fetch.js";
diff --git a/packages/backend/src/remote/activitypub/resolver.ts b/packages/backend/src/remote/activitypub/resolver.ts
index 79b7962b72..65e6f1d635 100644
--- a/packages/backend/src/remote/activitypub/resolver.ts
+++ b/packages/backend/src/remote/activitypub/resolver.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { ILocalUser } from "@/models/entities/user.js";
 import { getInstanceActor } from "@/services/instance-actor.js";
 import { fetchMeta } from "backend-rs";
diff --git a/packages/backend/src/remote/resolve-user.ts b/packages/backend/src/remote/resolve-user.ts
index 0883386371..69a99c767a 100644
--- a/packages/backend/src/remote/resolve-user.ts
+++ b/packages/backend/src/remote/resolve-user.ts
@@ -1,7 +1,7 @@
 import { URL } from "node:url";
 import chalk from "chalk";
 import { IsNull } from "typeorm";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { User, IRemoteUser } from "@/models/entities/user.js";
 import { Users } from "@/models/index.js";
 import { toPuny } from "backend-rs";
diff --git a/packages/backend/src/server/activitypub.ts b/packages/backend/src/server/activitypub.ts
index 00c8a6babe..2de7ab1827 100644
--- a/packages/backend/src/server/activitypub.ts
+++ b/packages/backend/src/server/activitypub.ts
@@ -31,7 +31,7 @@ import Following from "./activitypub/following.js";
 import Followers from "./activitypub/followers.js";
 import Outbox, { packActivity } from "./activitypub/outbox.js";
 import { serverLogger } from "./index.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import Koa from "koa";
 import * as crypto from "node:crypto";
 import { inspect } from "node:util";
diff --git a/packages/backend/src/server/activitypub/featured.ts b/packages/backend/src/server/activitypub/featured.ts
index e7ea6f238e..671c7ac67e 100644
--- a/packages/backend/src/server/activitypub/featured.ts
+++ b/packages/backend/src/server/activitypub/featured.ts
@@ -1,5 +1,5 @@
 import { IsNull } from "typeorm";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { renderActivity } from "@/remote/activitypub/renderer/index.js";
 import renderOrderedCollection from "@/remote/activitypub/renderer/ordered-collection.js";
 import renderNote from "@/remote/activitypub/renderer/note.js";
diff --git a/packages/backend/src/server/activitypub/followers.ts b/packages/backend/src/server/activitypub/followers.ts
index 576a672d6d..603e93ebe8 100644
--- a/packages/backend/src/server/activitypub/followers.ts
+++ b/packages/backend/src/server/activitypub/followers.ts
@@ -1,5 +1,5 @@
 import { IsNull, LessThan } from "typeorm";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import * as url from "@/prelude/url.js";
 import { renderActivity } from "@/remote/activitypub/renderer/index.js";
 import renderOrderedCollection from "@/remote/activitypub/renderer/ordered-collection.js";
diff --git a/packages/backend/src/server/activitypub/following.ts b/packages/backend/src/server/activitypub/following.ts
index 76b4e79716..be5a4e9643 100644
--- a/packages/backend/src/server/activitypub/following.ts
+++ b/packages/backend/src/server/activitypub/following.ts
@@ -1,5 +1,5 @@
 import { LessThan, IsNull } from "typeorm";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import * as url from "@/prelude/url.js";
 import { renderActivity } from "@/remote/activitypub/renderer/index.js";
 import renderOrderedCollection from "@/remote/activitypub/renderer/ordered-collection.js";
diff --git a/packages/backend/src/server/activitypub/outbox.ts b/packages/backend/src/server/activitypub/outbox.ts
index 305102cf12..06319565e5 100644
--- a/packages/backend/src/server/activitypub/outbox.ts
+++ b/packages/backend/src/server/activitypub/outbox.ts
@@ -1,5 +1,5 @@
 import { Brackets, IsNull } from "typeorm";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { renderActivity } from "@/remote/activitypub/renderer/index.js";
 import renderOrderedCollection from "@/remote/activitypub/renderer/ordered-collection.js";
 import renderOrderedCollectionPage from "@/remote/activitypub/renderer/ordered-collection-page.js";
diff --git a/packages/backend/src/server/api/2fa.ts b/packages/backend/src/server/api/2fa.ts
index 7318f0f433..5a6479939d 100644
--- a/packages/backend/src/server/api/2fa.ts
+++ b/packages/backend/src/server/api/2fa.ts
@@ -1,6 +1,6 @@
 import * as crypto from "node:crypto";
 import * as jsrsasign from "jsrsasign";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 
 const ECC_PRELUDE = Buffer.from([0x04]);
 const NULL_BYTE = Buffer.from([0]);
diff --git a/packages/backend/src/server/api/common/signin.ts b/packages/backend/src/server/api/common/signin.ts
index e59a39ac41..e5ca09df95 100644
--- a/packages/backend/src/server/api/common/signin.ts
+++ b/packages/backend/src/server/api/common/signin.ts
@@ -1,6 +1,6 @@
 import type Koa from "koa";
 
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { ILocalUser } from "@/models/entities/user.js";
 import { Signins } from "@/models/index.js";
 import { genId } from "backend-rs";
diff --git a/packages/backend/src/server/api/common/signup.ts b/packages/backend/src/server/api/common/signup.ts
index 58b88b7d02..40b59c8ed5 100644
--- a/packages/backend/src/server/api/common/signup.ts
+++ b/packages/backend/src/server/api/common/signup.ts
@@ -8,7 +8,7 @@ import { genId, hashPassword, toPuny } from "backend-rs";
 import { UserKeypair } from "@/models/entities/user-keypair.js";
 import { UsedUsername } from "@/models/entities/used-username.js";
 import { db } from "@/db/postgre.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 
 export async function signup(opts: {
 	username: User["username"];
diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/hosted.ts b/packages/backend/src/server/api/endpoints/admin/accounts/hosted.ts
index fd4ad9401a..01d08f7a3d 100644
--- a/packages/backend/src/server/api/endpoints/admin/accounts/hosted.ts
+++ b/packages/backend/src/server/api/endpoints/admin/accounts/hosted.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { Meta } from "@/models/entities/meta.js";
 import { insertModerationLog } from "@/services/insert-moderation-log.js";
 import { db } from "@/db/postgre.js";
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index c7731c6c81..d0e639fcf1 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { fetchMeta } from "backend-rs";
 import { MAX_NOTE_TEXT_LENGTH, MAX_CAPTION_TEXT_LENGTH } from "@/const.js";
 import define from "@/server/api/define.js";
diff --git a/packages/backend/src/server/api/endpoints/auth/session/generate.ts b/packages/backend/src/server/api/endpoints/auth/session/generate.ts
index 26a1fddfcb..f20219aa82 100644
--- a/packages/backend/src/server/api/endpoints/auth/session/generate.ts
+++ b/packages/backend/src/server/api/endpoints/auth/session/generate.ts
@@ -1,5 +1,5 @@
 import { v4 as uuid } from "uuid";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import define from "@/server/api/define.js";
 import { ApiError } from "@/server/api/error.js";
 import { Apps, AuthSessions } from "@/models/index.js";
diff --git a/packages/backend/src/server/api/endpoints/fetch-rss.ts b/packages/backend/src/server/api/endpoints/fetch-rss.ts
index bda3c455d1..489aaab0f5 100644
--- a/packages/backend/src/server/api/endpoints/fetch-rss.ts
+++ b/packages/backend/src/server/api/endpoints/fetch-rss.ts
@@ -1,6 +1,6 @@
 import Parser from "rss-parser";
 import { getResponse } from "@/misc/fetch.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import define from "@/server/api/define.js";
 
 const rssParser = new Parser();
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts
index 6c99217e7d..0951369dd8 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts
@@ -6,7 +6,7 @@ import {
 	AttestationChallenges,
 	Users,
 } from "@/models/index.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { procedures, hash } from "@/server/api/2fa.js";
 import { publishMainStream } from "@/services/stream.js";
 import { verifyPassword } from "backend-rs";
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register.ts b/packages/backend/src/server/api/endpoints/i/2fa/register.ts
index c0e6137d5d..eb926a6098 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/register.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/register.ts
@@ -1,6 +1,6 @@
 import * as OTPAuth from "otpauth";
 import * as QRCode from "qrcode";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { UserProfiles } from "@/models/index.js";
 import define from "@/server/api/define.js";
 import { verifyPassword } from "backend-rs";
diff --git a/packages/backend/src/server/api/endpoints/i/move.ts b/packages/backend/src/server/api/endpoints/i/move.ts
index 4784d3ee20..381bb1dea9 100644
--- a/packages/backend/src/server/api/endpoints/i/move.ts
+++ b/packages/backend/src/server/api/endpoints/i/move.ts
@@ -10,7 +10,7 @@ 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 config from "@/config/index.js";
+import { config } from "@/config.js";
 import { publishMainStream } from "@/services/stream.js";
 import { stringToAcct } from "backend-rs";
 import { inspect } from "node:util";
diff --git a/packages/backend/src/server/api/endpoints/i/update-email.ts b/packages/backend/src/server/api/endpoints/i/update-email.ts
index 234127f584..185d1c8dc9 100644
--- a/packages/backend/src/server/api/endpoints/i/update-email.ts
+++ b/packages/backend/src/server/api/endpoints/i/update-email.ts
@@ -1,7 +1,7 @@
 import { publishMainStream } from "@/services/stream.js";
 import define from "@/server/api/define.js";
 import rndstr from "rndstr";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { Users, UserProfiles } from "@/models/index.js";
 import { sendEmail } from "@/services/send-email.js";
 import { ApiError } from "@/server/api/error.js";
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 31677ee2ef..0167377944 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -1,6 +1,6 @@
 import JSON5 from "json5";
 import { IsNull, MoreThan } from "typeorm";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { fetchMeta } from "backend-rs";
 import { Ads, Emojis, Users } from "@/models/index.js";
 import { MAX_NOTE_TEXT_LENGTH, MAX_CAPTION_TEXT_LENGTH } from "@/const.js";
diff --git a/packages/backend/src/server/api/endpoints/request-reset-password.ts b/packages/backend/src/server/api/endpoints/request-reset-password.ts
index 9855b06513..00936c9d22 100644
--- a/packages/backend/src/server/api/endpoints/request-reset-password.ts
+++ b/packages/backend/src/server/api/endpoints/request-reset-password.ts
@@ -1,6 +1,6 @@
 import rndstr from "rndstr";
 import { IsNull } from "typeorm";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { Users, UserProfiles, PasswordResetRequests } from "@/models/index.js";
 import { sendEmail } from "@/services/send-email.js";
 import { genId } from "backend-rs";
diff --git a/packages/backend/src/server/api/endpoints/username/available.ts b/packages/backend/src/server/api/endpoints/username/available.ts
index cd634a798a..3818a3c28f 100644
--- a/packages/backend/src/server/api/endpoints/username/available.ts
+++ b/packages/backend/src/server/api/endpoints/username/available.ts
@@ -1,6 +1,6 @@
 import { IsNull } from "typeorm";
 import { Users, UsedUsernames } from "@/models/index.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import define from "@/server/api/define.js";
 
 export const meta = {
diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index 493661b2a2..7e5cd892bc 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -12,7 +12,7 @@ import {
 	getClient,
 } from "./mastodon/ApiMastodonCompatibleService.js";
 import { AccessTokens, Users } from "@/models/index.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import endpoints from "./endpoints.js";
 import compatibility from "./compatibility.js";
 import handler from "./api-handler.js";
diff --git a/packages/backend/src/server/api/mastodon/endpoints/meta.ts b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
index 5c304929a1..862310fb3e 100644
--- a/packages/backend/src/server/api/mastodon/endpoints/meta.ts
+++ b/packages/backend/src/server/api/mastodon/endpoints/meta.ts
@@ -1,5 +1,5 @@
 import { Entity } from "megalodon";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { fetchMeta } from "backend-rs";
 import { Users, Notes } from "@/models/index.js";
 import { IsNull } from "typeorm";
diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts
index 8b2f92b745..79dc48a8bb 100644
--- a/packages/backend/src/server/api/openapi/gen-spec.ts
+++ b/packages/backend/src/server/api/openapi/gen-spec.ts
@@ -1,5 +1,5 @@
 import endpoints from "@/server/api/endpoints.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { errors as basicErrors } from "./errors.js";
 import { schemas, convertSchemaToOpenApiSchema } from "./schemas.js";
 
diff --git a/packages/backend/src/server/api/private/signin.ts b/packages/backend/src/server/api/private/signin.ts
index a7eb623062..d8bbbf74ad 100644
--- a/packages/backend/src/server/api/private/signin.ts
+++ b/packages/backend/src/server/api/private/signin.ts
@@ -1,7 +1,7 @@
 import type Koa from "koa";
 import * as OTPAuth from "otpauth";
 import signin from "@/server/api/common/signin.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import {
 	Users,
 	Signins,
diff --git a/packages/backend/src/server/api/private/signup.ts b/packages/backend/src/server/api/private/signup.ts
index 5af5d65b50..4dd4ffb231 100644
--- a/packages/backend/src/server/api/private/signup.ts
+++ b/packages/backend/src/server/api/private/signup.ts
@@ -3,7 +3,7 @@ import rndstr from "rndstr";
 import { verifyHcaptcha, verifyRecaptcha } from "@/misc/captcha.js";
 import { Users, RegistrationTickets, UserPendings } from "@/models/index.js";
 import { signup } from "@/server/api/common/signup.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { sendEmail } from "@/services/send-email.js";
 import { fetchMeta, genId, hashPassword } from "backend-rs";
 import { validateEmailForAccount } from "@/services/validate-email-for-account.js";
diff --git a/packages/backend/src/server/index.ts b/packages/backend/src/server/index.ts
index 17358a4758..54d6e8bf5f 100644
--- a/packages/backend/src/server/index.ts
+++ b/packages/backend/src/server/index.ts
@@ -13,7 +13,7 @@ import koaLogger from "koa-logger";
 import * as slow from "koa-slow";
 
 import { IsNull } from "typeorm";
-import config, { envOption } from "@/config/index.js";
+import { config, envOption } from "@/config.js";
 import Logger from "@/services/logger.js";
 import { Users } from "@/models/index.js";
 import { fetchMeta } from "backend-rs";
diff --git a/packages/backend/src/server/nodeinfo.ts b/packages/backend/src/server/nodeinfo.ts
index 7359878b19..91e5fd8034 100644
--- a/packages/backend/src/server/nodeinfo.ts
+++ b/packages/backend/src/server/nodeinfo.ts
@@ -1,5 +1,5 @@
 import Router from "@koa/router";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { fetchMeta } from "backend-rs";
 import { Users, Notes } from "@/models/index.js";
 import { IsNull, MoreThan } from "typeorm";
diff --git a/packages/backend/src/server/web/feed.ts b/packages/backend/src/server/web/feed.ts
index e6b09b4f4f..5208ee70e4 100644
--- a/packages/backend/src/server/web/feed.ts
+++ b/packages/backend/src/server/web/feed.ts
@@ -1,6 +1,6 @@
 import { Feed } from "feed";
 import { In, IsNull } from "typeorm";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { User } from "@/models/entities/user.js";
 import { Notes, DriveFiles, UserProfiles, Users } from "@/models/index.js";
 
diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index 939fcfab14..dfc1cdc475 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -16,7 +16,7 @@ import { KoaAdapter } from "@bull-board/koa";
 
 import { In, IsNull } from "typeorm";
 import { fetchMeta, metaToPugArgs } from "backend-rs";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import {
 	Users,
 	Notes,
diff --git a/packages/backend/src/server/web/manifest.ts b/packages/backend/src/server/web/manifest.ts
index a4c615c7ab..77c8a57cf4 100644
--- a/packages/backend/src/server/web/manifest.ts
+++ b/packages/backend/src/server/web/manifest.ts
@@ -1,6 +1,6 @@
 import type Koa from "koa";
 import { fetchMeta } from "backend-rs";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import manifest from "./manifest.json" assert { type: "json" };
 
 export const manifestHandler = async (ctx: Koa.Context) => {
diff --git a/packages/backend/src/server/web/url-preview.ts b/packages/backend/src/server/web/url-preview.ts
index f59f3f357a..8fd757ef14 100644
--- a/packages/backend/src/server/web/url-preview.ts
+++ b/packages/backend/src/server/web/url-preview.ts
@@ -2,7 +2,7 @@ import type Koa from "koa";
 import summaly from "summaly";
 import { fetchMeta } from "backend-rs";
 import Logger from "@/services/logger.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { query } from "@/prelude/url.js";
 import { getJson } from "@/misc/fetch.js";
 import { inspect } from "node:util";
diff --git a/packages/backend/src/server/well-known.ts b/packages/backend/src/server/well-known.ts
index fc339eaad6..4a244db57f 100644
--- a/packages/backend/src/server/well-known.ts
+++ b/packages/backend/src/server/well-known.ts
@@ -1,6 +1,6 @@
 import Router from "@koa/router";
 
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { type Acct, stringToAcct } from "backend-rs";
 import { links } from "./nodeinfo.js";
 import { escapeAttribute, escapeValue } from "@/prelude/xml.js";
diff --git a/packages/backend/src/services/drive/internal-storage.ts b/packages/backend/src/services/drive/internal-storage.ts
index b2a663b3ea..6413f7920e 100644
--- a/packages/backend/src/services/drive/internal-storage.ts
+++ b/packages/backend/src/services/drive/internal-storage.ts
@@ -3,7 +3,7 @@ import * as fsPromises from "node:fs/promises";
 import * as Path from "node:path";
 import { fileURLToPath } from "node:url";
 import { dirname } from "node:path";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
diff --git a/packages/backend/src/services/fetch-rel-me.ts b/packages/backend/src/services/fetch-rel-me.ts
index c9a37d1c88..e9736f8c33 100644
--- a/packages/backend/src/services/fetch-rel-me.ts
+++ b/packages/backend/src/services/fetch-rel-me.ts
@@ -1,5 +1,5 @@
 import { Window } from "happy-dom";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 
 async function getRelMeLinks(url: string): Promise<string[]> {
 	try {
diff --git a/packages/backend/src/services/following/requests/create.ts b/packages/backend/src/services/following/requests/create.ts
index d2f2c1ca41..146e20efd9 100644
--- a/packages/backend/src/services/following/requests/create.ts
+++ b/packages/backend/src/services/following/requests/create.ts
@@ -6,7 +6,7 @@ import type { User } from "@/models/entities/user.js";
 import { Blockings, FollowRequests, Users } from "@/models/index.js";
 import { genId } from "backend-rs";
 import { createNotification } from "@/services/create-notification.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 
 export default async function (
 	follower: {
diff --git a/packages/backend/src/services/i/pin.ts b/packages/backend/src/services/i/pin.ts
index 2d2675a535..b44ba5f9fa 100644
--- a/packages/backend/src/services/i/pin.ts
+++ b/packages/backend/src/services/i/pin.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import renderAdd from "@/remote/activitypub/renderer/add.js";
 import renderRemove from "@/remote/activitypub/renderer/remove.js";
 import { renderActivity } from "@/remote/activitypub/renderer/index.js";
diff --git a/packages/backend/src/services/logger.ts b/packages/backend/src/services/logger.ts
index e53279e31c..bd2ca74793 100644
--- a/packages/backend/src/services/logger.ts
+++ b/packages/backend/src/services/logger.ts
@@ -2,7 +2,7 @@ import cluster from "node:cluster";
 import chalk from "chalk";
 import { default as convertColor } from "color-convert";
 import { format as dateFormat } from "date-fns";
-import config, { envOption } from "@/config/index.js";
+import { config, envOption } from "@/config.js";
 
 import * as SyslogPro from "syslog-pro";
 
diff --git a/packages/backend/src/services/messages/delete.ts b/packages/backend/src/services/messages/delete.ts
index 77caba80ce..2d8f6b9baf 100644
--- a/packages/backend/src/services/messages/delete.ts
+++ b/packages/backend/src/services/messages/delete.ts
@@ -1,4 +1,4 @@
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { MessagingMessages, Users } from "@/models/index.js";
 import type { MessagingMessage } from "@/models/entities/messaging-message.js";
 import {
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 0a4ddc517f..662064da57 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -10,7 +10,7 @@ import renderCreate from "@/remote/activitypub/renderer/create.js";
 import renderAnnounce from "@/remote/activitypub/renderer/announce.js";
 import { renderActivity } from "@/remote/activitypub/renderer/index.js";
 import { resolveUser } from "@/remote/resolve-user.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { updateHashtags } from "@/services/update-hashtag.js";
 import { concat } from "@/prelude/array.js";
 import { insertNoteUnread } from "@/services/note/unread.js";
diff --git a/packages/backend/src/services/note/delete.ts b/packages/backend/src/services/note/delete.ts
index be3bf1e8b2..c709792fef 100644
--- a/packages/backend/src/services/note/delete.ts
+++ b/packages/backend/src/services/note/delete.ts
@@ -5,7 +5,7 @@ import renderAnnounce from "@/remote/activitypub/renderer/announce.js";
 import renderUndo from "@/remote/activitypub/renderer/undo.js";
 import { renderActivity } from "@/remote/activitypub/renderer/index.js";
 import renderTombstone from "@/remote/activitypub/renderer/tombstone.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { User, ILocalUser, IRemoteUser } from "@/models/entities/user.js";
 import type { Note, IMentionedRemoteUsers } from "@/models/entities/note.js";
 import { Notes, Users, Instances } from "@/models/index.js";
diff --git a/packages/backend/src/services/push-notification.ts b/packages/backend/src/services/push-notification.ts
index 3f1f2cfb1a..86dd2a32e2 100644
--- a/packages/backend/src/services/push-notification.ts
+++ b/packages/backend/src/services/push-notification.ts
@@ -1,5 +1,5 @@
 import push from "web-push";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { SwSubscriptions } from "@/models/index.js";
 import { fetchMeta, getNoteSummary } from "backend-rs";
 import type { Packed } from "@/misc/schema.js";
diff --git a/packages/backend/src/services/send-email.ts b/packages/backend/src/services/send-email.ts
index 11a899d267..bcbecce356 100644
--- a/packages/backend/src/services/send-email.ts
+++ b/packages/backend/src/services/send-email.ts
@@ -1,7 +1,7 @@
 import * as nodemailer from "nodemailer";
 import { fetchMeta } from "backend-rs";
 import Logger from "@/services/logger.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import { inspect } from "node:util";
 
 export const logger = new Logger("email");
diff --git a/packages/backend/src/services/stream.ts b/packages/backend/src/services/stream.ts
index bd09bc3f2c..0e2395e87e 100644
--- a/packages/backend/src/services/stream.ts
+++ b/packages/backend/src/services/stream.ts
@@ -3,7 +3,7 @@ import type { User } from "@/models/entities/user.js";
 import type { Note } from "@/models/entities/note.js";
 import type { UserList } from "@/models/entities/user-list.js";
 import type { UserGroup } from "@/models/entities/user-group.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { Antenna } from "@/models/entities/antenna.js";
 import type { Channel } from "@/models/entities/channel.js";
 import type {
diff --git a/packages/backend/src/services/suspend-user.ts b/packages/backend/src/services/suspend-user.ts
index f72b8ffcb1..0babd31bc5 100644
--- a/packages/backend/src/services/suspend-user.ts
+++ b/packages/backend/src/services/suspend-user.ts
@@ -1,7 +1,7 @@
 import renderDelete from "@/remote/activitypub/renderer/delete.js";
 import { renderActivity } from "@/remote/activitypub/renderer/index.js";
 import { deliver } from "@/queue/index.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { User } from "@/models/entities/user.js";
 import { Users, Followings } from "@/models/index.js";
 import { Not, IsNull } from "typeorm";
diff --git a/packages/backend/src/services/unsuspend-user.ts b/packages/backend/src/services/unsuspend-user.ts
index 69447a4a26..72d7e30d66 100644
--- a/packages/backend/src/services/unsuspend-user.ts
+++ b/packages/backend/src/services/unsuspend-user.ts
@@ -2,7 +2,7 @@ import renderDelete from "@/remote/activitypub/renderer/delete.js";
 import renderUndo from "@/remote/activitypub/renderer/undo.js";
 import { renderActivity } from "@/remote/activitypub/renderer/index.js";
 import { deliver } from "@/queue/index.js";
-import config from "@/config/index.js";
+import { config } from "@/config.js";
 import type { User } from "@/models/entities/user.js";
 import { Users, Followings } from "@/models/index.js";
 import { Not, IsNull } from "typeorm";

From e60898b4b056726aff09d120b055d3205bbcb3b6 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 02:11:41 +0900
Subject: [PATCH 18/99] refactor (backend-rs): separate postgresql connector
 from database/mod.rs

---
 packages/backend-rs/src/database/mod.rs       | 36 ++-----------------
 .../backend-rs/src/database/postgresql.rs     | 34 ++++++++++++++++++
 2 files changed, 36 insertions(+), 34 deletions(-)
 create mode 100644 packages/backend-rs/src/database/postgresql.rs

diff --git a/packages/backend-rs/src/database/mod.rs b/packages/backend-rs/src/database/mod.rs
index a60d20af9c..26db81c644 100644
--- a/packages/backend-rs/src/database/mod.rs
+++ b/packages/backend-rs/src/database/mod.rs
@@ -1,34 +1,2 @@
-use crate::config::server::CONFIG;
-use sea_orm::{Database, DbConn, DbErr};
-
-static DB_CONN: once_cell::sync::OnceCell<DbConn> = once_cell::sync::OnceCell::new();
-
-async fn init_database() -> Result<&'static DbConn, DbErr> {
-    let database_uri = format!(
-        "postgres://{}:{}@{}:{}/{}",
-        CONFIG.db.user,
-        urlencoding::encode(&CONFIG.db.pass),
-        CONFIG.db.host,
-        CONFIG.db.port,
-        CONFIG.db.db,
-    );
-    let conn = Database::connect(database_uri).await?;
-    Ok(DB_CONN.get_or_init(move || conn))
-}
-
-pub async fn db_conn() -> Result<&'static DbConn, DbErr> {
-    match DB_CONN.get() {
-        Some(conn) => Ok(conn),
-        None => init_database().await,
-    }
-}
-
-#[cfg(test)]
-mod unit_test {
-    use super::db_conn;
-
-    #[tokio::test]
-    async fn connect_test() {
-        assert!(db_conn().await.is_ok());
-    }
-}
+pub use postgresql::db_conn;
+pub mod postgresql;
diff --git a/packages/backend-rs/src/database/postgresql.rs b/packages/backend-rs/src/database/postgresql.rs
new file mode 100644
index 0000000000..a60d20af9c
--- /dev/null
+++ b/packages/backend-rs/src/database/postgresql.rs
@@ -0,0 +1,34 @@
+use crate::config::server::CONFIG;
+use sea_orm::{Database, DbConn, DbErr};
+
+static DB_CONN: once_cell::sync::OnceCell<DbConn> = once_cell::sync::OnceCell::new();
+
+async fn init_database() -> Result<&'static DbConn, DbErr> {
+    let database_uri = format!(
+        "postgres://{}:{}@{}:{}/{}",
+        CONFIG.db.user,
+        urlencoding::encode(&CONFIG.db.pass),
+        CONFIG.db.host,
+        CONFIG.db.port,
+        CONFIG.db.db,
+    );
+    let conn = Database::connect(database_uri).await?;
+    Ok(DB_CONN.get_or_init(move || conn))
+}
+
+pub async fn db_conn() -> Result<&'static DbConn, DbErr> {
+    match DB_CONN.get() {
+        Some(conn) => Ok(conn),
+        None => init_database().await,
+    }
+}
+
+#[cfg(test)]
+mod unit_test {
+    use super::db_conn;
+
+    #[tokio::test]
+    async fn connect_test() {
+        assert!(db_conn().await.is_ok());
+    }
+}

From e82a07c03d9c1f35ae96a51d4e3a3a2e0e16ca43 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 02:17:03 +0900
Subject: [PATCH 19/99] dev (backend-rs): make backend-rs accessible to Redis

---
 Cargo.lock                                | 32 +++++++++++++++
 Cargo.toml                                |  1 +
 packages/backend-rs/Cargo.toml            |  1 +
 packages/backend-rs/index.d.ts            |  4 +-
 packages/backend-rs/src/config/server.rs  |  4 +-
 packages/backend-rs/src/database/mod.rs   |  4 ++
 packages/backend-rs/src/database/redis.rs | 47 +++++++++++++++++++++++
 7 files changed, 89 insertions(+), 4 deletions(-)
 create mode 100644 packages/backend-rs/src/database/redis.rs

diff --git a/Cargo.lock b/Cargo.lock
index c6ba96e683..52ef14933f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -220,6 +220,7 @@ dependencies = [
  "parse-display",
  "pretty_assertions",
  "rand",
+ "redis",
  "regex",
  "schemars",
  "sea-orm",
@@ -524,6 +525,16 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
 [[package]]
 name = "const-oid"
 version = "0.9.6"
@@ -1858,6 +1869,21 @@ dependencies = [
  "getrandom",
 ]
 
+[[package]]
+name = "redis"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6472825949c09872e8f2c50bde59fcefc17748b6be5c90fd67cd8b4daca73bfd"
+dependencies = [
+ "combine",
+ "itoa",
+ "percent-encoding",
+ "ryu",
+ "sha1_smol",
+ "socket2",
+ "url",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@@ -2295,6 +2321,12 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "sha1_smol"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
+
 [[package]]
 name = "sha2"
 version = "0.10.8"
diff --git a/Cargo.toml b/Cargo.toml
index 7ca43c960b..b82635d8b4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -26,6 +26,7 @@ pretty_assertions = "1.4.0"
 proc-macro2 = "1.0.79"
 quote = "1.0.36"
 rand = "0.8.5"
+redis = "0.25.3"
 regex = "1.10.4"
 schemars = "0.8.16"
 sea-orm = "0.12.15"
diff --git a/packages/backend-rs/Cargo.toml b/packages/backend-rs/Cargo.toml
index af9e10cdc1..d077028e13 100644
--- a/packages/backend-rs/Cargo.toml
+++ b/packages/backend-rs/Cargo.toml
@@ -30,6 +30,7 @@ jsonschema = { workspace = true }
 once_cell = { workspace = true }
 parse-display = { workspace = true }
 rand = { workspace = true }
+redis = { workspace = true }
 regex = { workspace = true }
 schemars = { workspace = true, features = ["chrono"] }
 sea-orm = { workspace = true, features = ["sqlx-postgres", "runtime-tokio-rustls"] }
diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index d985eb368d..433e80999c 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -29,7 +29,7 @@ export interface ServerConfig {
   /** `NapiValue` is not implemented for `u64` */
   maxFileSize?: number
   accessLog?: string
-  clusterLimits?: _WorkerConfig
+  clusterLimits?: WorkerConfigInternal
   cuid?: IdConfig
   outgoingAddress?: string
   deliverJobConcurrency?: number
@@ -80,7 +80,7 @@ export interface WorkerConfig {
   web: number
   queue: number
 }
-export interface WorkerConfig {
+export interface WorkerConfigInternal {
   web?: number
   queue?: number
 }
diff --git a/packages/backend-rs/src/config/server.rs b/packages/backend-rs/src/config/server.rs
index 4b9fbc7131..edfdf6109c 100644
--- a/packages/backend-rs/src/config/server.rs
+++ b/packages/backend-rs/src/config/server.rs
@@ -25,7 +25,7 @@ struct ServerConfig {
     /// `NapiValue` is not implemented for `u64`
     pub max_file_size: Option<i64>,
     pub access_log: Option<String>,
-    pub cluster_limits: Option<_WorkerConfig>,
+    pub cluster_limits: Option<WorkerConfigInternal>,
     pub cuid: Option<IdConfig>,
     pub outgoing_address: Option<String>,
 
@@ -103,7 +103,7 @@ pub struct WorkerConfig {
 #[derive(Clone, Debug, PartialEq, Deserialize)]
 #[serde(rename_all = "camelCase")]
 #[crate::export(object, use_nullable = false)]
-pub struct _WorkerConfig {
+pub struct WorkerConfigInternal {
     pub web: Option<u32>,
     pub queue: Option<u32>,
 }
diff --git a/packages/backend-rs/src/database/mod.rs b/packages/backend-rs/src/database/mod.rs
index 26db81c644..7a6277068b 100644
--- a/packages/backend-rs/src/database/mod.rs
+++ b/packages/backend-rs/src/database/mod.rs
@@ -1,2 +1,6 @@
 pub use postgresql::db_conn;
+pub use redis::key as redis_key;
+pub use redis::redis_conn;
+
 pub mod postgresql;
+pub mod redis;
diff --git a/packages/backend-rs/src/database/redis.rs b/packages/backend-rs/src/database/redis.rs
new file mode 100644
index 0000000000..863f57b35d
--- /dev/null
+++ b/packages/backend-rs/src/database/redis.rs
@@ -0,0 +1,47 @@
+use crate::config::server::CONFIG;
+use redis::{Client, Connection, RedisError};
+
+static REDIS_CLIENT: once_cell::sync::OnceCell<Client> = once_cell::sync::OnceCell::new();
+
+fn init_redis() -> Result<Client, RedisError> {
+    let redis_url = {
+        let mut params = vec!["redis://".to_owned()];
+
+        if let Some(user) = &CONFIG.redis.user {
+            params.push(user.to_string())
+        }
+        if let Some(pass) = &CONFIG.redis.pass {
+            params.push(format!(":{}@", pass))
+        }
+        params.push(CONFIG.redis.host.to_string());
+        params.push(format!(":{}", CONFIG.redis.port));
+        params.push(format!("/{}", CONFIG.redis.db));
+
+        params.concat()
+    };
+
+    Client::open(redis_url)
+}
+
+pub fn redis_conn() -> Result<Connection, RedisError> {
+    match REDIS_CLIENT.get() {
+        Some(client) => Ok(client.get_connection()?),
+        None => init_redis()?.get_connection(),
+    }
+}
+
+#[inline]
+/// prefix redis key with the hostname
+pub fn key(key: &str) -> String {
+    format!("{}:{}", CONFIG.hostname, key)
+}
+
+#[cfg(test)]
+mod unit_test {
+    use super::init_redis;
+
+    #[test]
+    fn connect_test() {
+        assert!(init_redis().is_ok());
+    }
+}

From 037b7950a264123396982dd9dfeaa0f31d1c336b Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 02:58:39 +0900
Subject: [PATCH 20/99] refactor (backend): clean the booting process a bit

---
 packages/backend/src/boot/master.ts | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index 44c4a8a2f1..090a84f6ea 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -169,23 +169,31 @@ async function connectDb(): Promise<void> {
 }
 
 async function spawnWorkers(
-	clusterLimits: Required<Config["clusterLimits"]>,
+	clusterLimits: Config["clusterLimits"],
 ): Promise<void> {
-	const modes = ["web", "queue"];
 	const cpus = os.cpus().length;
-	for (const mode of modes.filter((mode) => clusterLimits[mode] > cpus)) {
+
+	if (clusterLimits.queue > cpus) {
 		bootLogger.warn(
-			`configuration warning: cluster limit for ${mode} exceeds number of cores (${cpus})`,
+			"config: queue cluster limit exceeds the number of cpu cores",
 		);
 	}
 
-	const total = modes.reduce((acc, mode) => acc + clusterLimits[mode], 0);
+	if (clusterLimits.web > cpus) {
+		bootLogger.warn(
+			"config: web cluster limit exceeds the number of cpu cores",
+		);
+	}
+
+	const total = clusterLimits.queue + clusterLimits.web;
+
+	// workers = ["web", "web", ..., "web", "queue", "queue", ..., "queue"]
 	const workers = new Array(total);
-	workers.fill("web", 0, clusterLimits?.web);
-	workers.fill("queue", clusterLimits?.web);
+	workers.fill("web", 0, clusterLimits.web);
+	workers.fill("queue", clusterLimits.web);
 
 	bootLogger.info(
-		`Starting ${clusterLimits?.web} web workers and ${clusterLimits?.queue} queue workers (total ${total})...`,
+		`Starting ${clusterLimits.web} web workers and ${clusterLimits.queue} queue workers (total ${total})...`,
 	);
 	await Promise.all(workers.map((mode) => spawnWorker(mode)));
 	bootLogger.succ("All workers started");

From 56038b174d146330a6f8d367020455d5d26b67ca Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 03:01:13 +0900
Subject: [PATCH 21/99] fix (backend): correct import path

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

diff --git a/packages/backend/src/ormconfig.ts b/packages/backend/src/ormconfig.ts
index a1891e00df..293be57cae 100644
--- a/packages/backend/src/ormconfig.ts
+++ b/packages/backend/src/ormconfig.ts
@@ -1,6 +1,6 @@
 import { DataSource } from "typeorm";
-import config from "./config/index.js";
-import { entities } from "./db/postgre.js";
+import { config } from "@/config.js";
+import { entities } from "@/db/postgre.js";
 
 export default new DataSource({
 	type: "postgres",

From def62ff1cecfd36e24e48aabc3d45bc89a362d6b Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 03:04:34 +0900
Subject: [PATCH 22/99] chore (minor, backend): remove unused import

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

diff --git a/packages/backend/src/db/postgre.ts b/packages/backend/src/db/postgre.ts
index e0ab9d6d37..1295136054 100644
--- a/packages/backend/src/db/postgre.ts
+++ b/packages/backend/src/db/postgre.ts
@@ -77,7 +77,6 @@ import { NoteFile } from "@/models/entities/note-file.js";
 
 import { entities as charts } from "@/services/chart/entities.js";
 import { dbLogger } from "./logger.js";
-import { redisClient } from "./redis.js";
 
 const sqlLogger = dbLogger.createSubLogger("sql", "gray", false);
 

From ccb17977c36eec325517e7f5090053c07292a0db Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 03:08:35 +0900
Subject: [PATCH 23/99] chore (minor, backend): use type import

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

diff --git a/packages/backend/src/misc/cache.ts b/packages/backend/src/misc/cache.ts
index 30a50e5714..e99b17a5f7 100644
--- a/packages/backend/src/misc/cache.ts
+++ b/packages/backend/src/misc/cache.ts
@@ -1,6 +1,6 @@
 import { redisClient } from "@/db/redis.js";
 import { encode, decode } from "msgpackr";
-import { ChainableCommander } from "ioredis";
+import type { ChainableCommander } from "ioredis";
 
 export class Cache<T> {
 	private ttl: number;

From b157cbe79a30d2fa10b53008c4447dc878ccc9aa Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 04:41:47 +0900
Subject: [PATCH 24/99] chore (backend-rs): make entities serializable

---
 packages/backend-rs/Makefile                  |  4 +-
 .../src/model/entity/abuse_user_report.rs     |  2 +-
 .../src/model/entity/access_token.rs          |  2 +-
 packages/backend-rs/src/model/entity/ad.rs    |  2 +-
 .../src/model/entity/announcement.rs          |  2 +-
 .../src/model/entity/announcement_read.rs     |  2 +-
 .../backend-rs/src/model/entity/antenna.rs    |  2 +-
 .../src/model/entity/antenna_note.rs          | 49 -------------------
 packages/backend-rs/src/model/entity/app.rs   |  2 +-
 .../src/model/entity/attestation_challenge.rs |  2 +-
 .../src/model/entity/auth_session.rs          |  2 +-
 .../backend-rs/src/model/entity/blocking.rs   |  2 +-
 .../backend-rs/src/model/entity/channel.rs    |  2 +-
 .../src/model/entity/channel_following.rs     |  2 +-
 .../src/model/entity/channel_note_pining.rs   |  2 +-
 packages/backend-rs/src/model/entity/clip.rs  |  2 +-
 .../backend-rs/src/model/entity/clip_note.rs  |  2 +-
 .../backend-rs/src/model/entity/drive_file.rs |  2 +-
 .../src/model/entity/drive_folder.rs          |  2 +-
 packages/backend-rs/src/model/entity/emoji.rs |  2 +-
 .../src/model/entity/follow_request.rs        |  2 +-
 .../backend-rs/src/model/entity/following.rs  |  2 +-
 .../src/model/entity/gallery_like.rs          |  2 +-
 .../src/model/entity/gallery_post.rs          |  2 +-
 .../backend-rs/src/model/entity/hashtag.rs    |  2 +-
 .../backend-rs/src/model/entity/instance.rs   |  2 +-
 .../src/model/entity/messaging_message.rs     |  2 +-
 packages/backend-rs/src/model/entity/meta.rs  |  2 +-
 .../backend-rs/src/model/entity/migrations.rs |  2 +-
 .../src/model/entity/moderation_log.rs        |  2 +-
 .../backend-rs/src/model/entity/muted_note.rs |  2 +-
 .../backend-rs/src/model/entity/muting.rs     |  2 +-
 packages/backend-rs/src/model/entity/note.rs  |  2 +-
 .../backend-rs/src/model/entity/note_edit.rs  |  2 +-
 .../src/model/entity/note_favorite.rs         |  2 +-
 .../backend-rs/src/model/entity/note_file.rs  |  2 +-
 .../src/model/entity/note_reaction.rs         |  2 +-
 .../src/model/entity/note_thread_muting.rs    |  2 +-
 .../src/model/entity/note_unread.rs           |  2 +-
 .../src/model/entity/note_watching.rs         |  2 +-
 .../src/model/entity/notification.rs          |  2 +-
 packages/backend-rs/src/model/entity/page.rs  |  2 +-
 .../backend-rs/src/model/entity/page_like.rs  |  2 +-
 .../model/entity/password_reset_request.rs    |  2 +-
 packages/backend-rs/src/model/entity/poll.rs  |  2 +-
 .../backend-rs/src/model/entity/poll_vote.rs  |  2 +-
 .../backend-rs/src/model/entity/promo_note.rs |  2 +-
 .../backend-rs/src/model/entity/promo_read.rs |  2 +-
 .../src/model/entity/registration_ticket.rs   |  2 +-
 .../src/model/entity/registry_item.rs         |  2 +-
 packages/backend-rs/src/model/entity/relay.rs |  2 +-
 .../src/model/entity/renote_muting.rs         |  2 +-
 .../src/model/entity/reply_muting.rs          |  2 +-
 .../src/model/entity/sea_orm_active_enums.rs  | 20 ++++----
 .../backend-rs/src/model/entity/signin.rs     |  2 +-
 .../src/model/entity/sw_subscription.rs       |  2 +-
 .../src/model/entity/used_username.rs         |  2 +-
 packages/backend-rs/src/model/entity/user.rs  |  2 +-
 .../backend-rs/src/model/entity/user_group.rs |  2 +-
 .../src/model/entity/user_group_invitation.rs |  2 +-
 .../src/model/entity/user_group_invite.rs     |  2 +-
 .../src/model/entity/user_group_joining.rs    |  2 +-
 .../backend-rs/src/model/entity/user_ip.rs    |  2 +-
 .../src/model/entity/user_keypair.rs          |  2 +-
 .../backend-rs/src/model/entity/user_list.rs  |  2 +-
 .../src/model/entity/user_list_joining.rs     |  2 +-
 .../src/model/entity/user_note_pining.rs      |  2 +-
 .../src/model/entity/user_pending.rs          |  2 +-
 .../src/model/entity/user_profile.rs          |  2 +-
 .../src/model/entity/user_publickey.rs        |  2 +-
 .../src/model/entity/user_security_key.rs     |  2 +-
 .../backend-rs/src/model/entity/webhook.rs    |  2 +-
 72 files changed, 82 insertions(+), 129 deletions(-)
 delete mode 100644 packages/backend-rs/src/model/entity/antenna_note.rs

diff --git a/packages/backend-rs/Makefile b/packages/backend-rs/Makefile
index 11b614c82a..29a00e847d 100644
--- a/packages/backend-rs/Makefile
+++ b/packages/backend-rs/Makefile
@@ -6,6 +6,7 @@ SRC += $(call recursive_wildcard, src, *)
 
 .PHONY: regenerate-entities
 regenerate-entities:
+	rm --recursive --force src/model/entity
 	sea-orm-cli generate entity \
 	  --output-dir='src/model/entity' \
 	  --database-url='postgres://$(POSTGRES_USER):$(POSTGRES_PASSWORD)@localhost:25432/$(POSTGRES_DB)' \
@@ -16,8 +17,9 @@ regenerate-entities:
 	  jsname=$$(printf '%s\n' "$${base%.*}" | perl -pe 's/(^|_)./uc($$&)/ge;s/_//g'); \
 	  attribute=$$(printf 'cfg_attr(feature = "napi", napi_derive::napi(object, js_name = "%s", use_nullable = true))' "$${jsname}"); \
 	  sed -i "s/NAPI_EXTRA_ATTR_PLACEHOLDER/$${attribute}/" "$${file}"; \
+		sed -i 's/#\[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)\]/#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]/' "$${file}"; \
 	done
-	sed -i 's/#\[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)\]/#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]\n#[cfg_attr(not(feature = "napi"), derive(Clone))]\n#[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]/' \
+	sed -i 's/#\[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)\]/#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]\n#[cfg_attr(not(feature = "napi"), derive(Clone))]\n#[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]/' \
 	  src/model/entity/sea_orm_active_enums.rs
 	cargo fmt --all --
 
diff --git a/packages/backend-rs/src/model/entity/abuse_user_report.rs b/packages/backend-rs/src/model/entity/abuse_user_report.rs
index 4d781f06dd..4d46581a89 100644
--- a/packages/backend-rs/src/model/entity/abuse_user_report.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "abuse_user_report")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/access_token.rs b/packages/backend-rs/src/model/entity/access_token.rs
index 3083bb8c90..ffe4fd9914 100644
--- a/packages/backend-rs/src/model/entity/access_token.rs
+++ b/packages/backend-rs/src/model/entity/access_token.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "access_token")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/ad.rs b/packages/backend-rs/src/model/entity/ad.rs
index 98ec50ea91..f8de656383 100644
--- a/packages/backend-rs/src/model/entity/ad.rs
+++ b/packages/backend-rs/src/model/entity/ad.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "ad")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/announcement.rs b/packages/backend-rs/src/model/entity/announcement.rs
index 311571c113..73b9c84080 100644
--- a/packages/backend-rs/src/model/entity/announcement.rs
+++ b/packages/backend-rs/src/model/entity/announcement.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "announcement")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/announcement_read.rs b/packages/backend-rs/src/model/entity/announcement_read.rs
index 157e402aa6..5f0c27599d 100644
--- a/packages/backend-rs/src/model/entity/announcement_read.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "announcement_read")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/antenna.rs b/packages/backend-rs/src/model/entity/antenna.rs
index 1edd6e8761..2abe216cda 100644
--- a/packages/backend-rs/src/model/entity/antenna.rs
+++ b/packages/backend-rs/src/model/entity/antenna.rs
@@ -3,7 +3,7 @@
 use super::sea_orm_active_enums::AntennaSrcEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "antenna")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/antenna_note.rs b/packages/backend-rs/src/model/entity/antenna_note.rs
deleted file mode 100644
index c86fb349d4..0000000000
--- a/packages/backend-rs/src/model/entity/antenna_note.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-//! `SeaORM` Entity. Generated by sea-orm-codegen 0.11.3
-
-use sea_orm::entity::prelude::*;
-
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, Default)]
-#[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-rs/src/model/entity/app.rs b/packages/backend-rs/src/model/entity/app.rs
index d9517ed211..72c908e87a 100644
--- a/packages/backend-rs/src/model/entity/app.rs
+++ b/packages/backend-rs/src/model/entity/app.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "app")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/attestation_challenge.rs b/packages/backend-rs/src/model/entity/attestation_challenge.rs
index 0c131066dd..9513a584e7 100644
--- a/packages/backend-rs/src/model/entity/attestation_challenge.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "attestation_challenge")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/auth_session.rs b/packages/backend-rs/src/model/entity/auth_session.rs
index f022a5e632..873a15ec3d 100644
--- a/packages/backend-rs/src/model/entity/auth_session.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "auth_session")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/blocking.rs b/packages/backend-rs/src/model/entity/blocking.rs
index 2f5a3e0482..5ffc685f80 100644
--- a/packages/backend-rs/src/model/entity/blocking.rs
+++ b/packages/backend-rs/src/model/entity/blocking.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "blocking")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/channel.rs b/packages/backend-rs/src/model/entity/channel.rs
index 52f8059030..e309a7ead6 100644
--- a/packages/backend-rs/src/model/entity/channel.rs
+++ b/packages/backend-rs/src/model/entity/channel.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "channel")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/channel_following.rs b/packages/backend-rs/src/model/entity/channel_following.rs
index 01a25ccb83..ee5a5a9bbc 100644
--- a/packages/backend-rs/src/model/entity/channel_following.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "channel_following")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/channel_note_pining.rs b/packages/backend-rs/src/model/entity/channel_note_pining.rs
index 0a41efd3e8..28431d2999 100644
--- a/packages/backend-rs/src/model/entity/channel_note_pining.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "channel_note_pining")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/clip.rs b/packages/backend-rs/src/model/entity/clip.rs
index 6cbbcf4756..7316831088 100644
--- a/packages/backend-rs/src/model/entity/clip.rs
+++ b/packages/backend-rs/src/model/entity/clip.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "clip")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/clip_note.rs b/packages/backend-rs/src/model/entity/clip_note.rs
index 262f4a9b50..c7b089d35b 100644
--- a/packages/backend-rs/src/model/entity/clip_note.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "clip_note")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/drive_file.rs b/packages/backend-rs/src/model/entity/drive_file.rs
index e3e4622a62..5527d79530 100644
--- a/packages/backend-rs/src/model/entity/drive_file.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "drive_file")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/drive_folder.rs b/packages/backend-rs/src/model/entity/drive_folder.rs
index 727a698ce3..717a28b8b0 100644
--- a/packages/backend-rs/src/model/entity/drive_folder.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "drive_folder")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/emoji.rs b/packages/backend-rs/src/model/entity/emoji.rs
index 530dfe12f5..19c080bc4d 100644
--- a/packages/backend-rs/src/model/entity/emoji.rs
+++ b/packages/backend-rs/src/model/entity/emoji.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "emoji")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/follow_request.rs b/packages/backend-rs/src/model/entity/follow_request.rs
index 4a6b572433..0ee2f954f6 100644
--- a/packages/backend-rs/src/model/entity/follow_request.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "follow_request")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/following.rs b/packages/backend-rs/src/model/entity/following.rs
index f19e46140e..25a9caf226 100644
--- a/packages/backend-rs/src/model/entity/following.rs
+++ b/packages/backend-rs/src/model/entity/following.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "following")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/gallery_like.rs b/packages/backend-rs/src/model/entity/gallery_like.rs
index f4ede4169a..b07ad74266 100644
--- a/packages/backend-rs/src/model/entity/gallery_like.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "gallery_like")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/gallery_post.rs b/packages/backend-rs/src/model/entity/gallery_post.rs
index 797bf38242..396075c252 100644
--- a/packages/backend-rs/src/model/entity/gallery_post.rs
+++ b/packages/backend-rs/src/model/entity/gallery_post.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "gallery_post")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/hashtag.rs b/packages/backend-rs/src/model/entity/hashtag.rs
index e2bb816b26..a689e110b7 100644
--- a/packages/backend-rs/src/model/entity/hashtag.rs
+++ b/packages/backend-rs/src/model/entity/hashtag.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "hashtag")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/instance.rs b/packages/backend-rs/src/model/entity/instance.rs
index 8b598f72b1..8b534eae6e 100644
--- a/packages/backend-rs/src/model/entity/instance.rs
+++ b/packages/backend-rs/src/model/entity/instance.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "instance")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/messaging_message.rs b/packages/backend-rs/src/model/entity/messaging_message.rs
index 304f876d1a..0997d18013 100644
--- a/packages/backend-rs/src/model/entity/messaging_message.rs
+++ b/packages/backend-rs/src/model/entity/messaging_message.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "messaging_message")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/meta.rs b/packages/backend-rs/src/model/entity/meta.rs
index b9a89914bd..67cf3d96e7 100644
--- a/packages/backend-rs/src/model/entity/meta.rs
+++ b/packages/backend-rs/src/model/entity/meta.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "meta")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/migrations.rs b/packages/backend-rs/src/model/entity/migrations.rs
index 235156ba4e..9487b29f0f 100644
--- a/packages/backend-rs/src/model/entity/migrations.rs
+++ b/packages/backend-rs/src/model/entity/migrations.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "migrations")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/moderation_log.rs b/packages/backend-rs/src/model/entity/moderation_log.rs
index b76f2c33df..097f620318 100644
--- a/packages/backend-rs/src/model/entity/moderation_log.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "moderation_log")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/muted_note.rs b/packages/backend-rs/src/model/entity/muted_note.rs
index 7c2880a03d..580f13b1aa 100644
--- a/packages/backend-rs/src/model/entity/muted_note.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "muted_note")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/muting.rs b/packages/backend-rs/src/model/entity/muting.rs
index 917e6a2e20..5ae9bf3dfa 100644
--- a/packages/backend-rs/src/model/entity/muting.rs
+++ b/packages/backend-rs/src/model/entity/muting.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "muting")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/note.rs b/packages/backend-rs/src/model/entity/note.rs
index 5903216c1a..1344fe8fad 100644
--- a/packages/backend-rs/src/model/entity/note.rs
+++ b/packages/backend-rs/src/model/entity/note.rs
@@ -3,7 +3,7 @@
 use super::sea_orm_active_enums::NoteVisibilityEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "note")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/note_edit.rs b/packages/backend-rs/src/model/entity/note_edit.rs
index edfb35029a..e594704fe8 100644
--- a/packages/backend-rs/src/model/entity/note_edit.rs
+++ b/packages/backend-rs/src/model/entity/note_edit.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "note_edit")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/note_favorite.rs b/packages/backend-rs/src/model/entity/note_favorite.rs
index 76d45e9e98..c201b82092 100644
--- a/packages/backend-rs/src/model/entity/note_favorite.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "note_favorite")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/note_file.rs b/packages/backend-rs/src/model/entity/note_file.rs
index 2c52a4e5e8..fad63db8bd 100644
--- a/packages/backend-rs/src/model/entity/note_file.rs
+++ b/packages/backend-rs/src/model/entity/note_file.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "note_file")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/note_reaction.rs b/packages/backend-rs/src/model/entity/note_reaction.rs
index dd870a3e7f..ab4c87d76d 100644
--- a/packages/backend-rs/src/model/entity/note_reaction.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "note_reaction")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/note_thread_muting.rs b/packages/backend-rs/src/model/entity/note_thread_muting.rs
index 965001189e..fa7a4365a0 100644
--- a/packages/backend-rs/src/model/entity/note_thread_muting.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "note_thread_muting")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/note_unread.rs b/packages/backend-rs/src/model/entity/note_unread.rs
index ba96aed69f..9e15f631ec 100644
--- a/packages/backend-rs/src/model/entity/note_unread.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "note_unread")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/note_watching.rs b/packages/backend-rs/src/model/entity/note_watching.rs
index 5b3b331e90..00433a08e0 100644
--- a/packages/backend-rs/src/model/entity/note_watching.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "note_watching")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/notification.rs b/packages/backend-rs/src/model/entity/notification.rs
index 6ed5f718aa..b5d1dced95 100644
--- a/packages/backend-rs/src/model/entity/notification.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "notification")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/page.rs b/packages/backend-rs/src/model/entity/page.rs
index e1652a372b..3256bfff1c 100644
--- a/packages/backend-rs/src/model/entity/page.rs
+++ b/packages/backend-rs/src/model/entity/page.rs
@@ -3,7 +3,7 @@
 use super::sea_orm_active_enums::PageVisibilityEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "page")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/page_like.rs b/packages/backend-rs/src/model/entity/page_like.rs
index c1e59ef0e1..e7a477e922 100644
--- a/packages/backend-rs/src/model/entity/page_like.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "page_like")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/password_reset_request.rs b/packages/backend-rs/src/model/entity/password_reset_request.rs
index 058eaedebe..76e89bd8d5 100644
--- a/packages/backend-rs/src/model/entity/password_reset_request.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "password_reset_request")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/poll.rs b/packages/backend-rs/src/model/entity/poll.rs
index 6bcbcac08b..9572a3c728 100644
--- a/packages/backend-rs/src/model/entity/poll.rs
+++ b/packages/backend-rs/src/model/entity/poll.rs
@@ -3,7 +3,7 @@
 use super::sea_orm_active_enums::PollNotevisibilityEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "poll")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/poll_vote.rs b/packages/backend-rs/src/model/entity/poll_vote.rs
index 0f2df2f5db..8208c3a95a 100644
--- a/packages/backend-rs/src/model/entity/poll_vote.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "poll_vote")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/promo_note.rs b/packages/backend-rs/src/model/entity/promo_note.rs
index c4e012b1a9..5e38b3440f 100644
--- a/packages/backend-rs/src/model/entity/promo_note.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "promo_note")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/promo_read.rs b/packages/backend-rs/src/model/entity/promo_read.rs
index 10fe176405..f4d8854e39 100644
--- a/packages/backend-rs/src/model/entity/promo_read.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "promo_read")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/registration_ticket.rs b/packages/backend-rs/src/model/entity/registration_ticket.rs
index 55d60d78b0..e06f2b295e 100644
--- a/packages/backend-rs/src/model/entity/registration_ticket.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "registration_ticket")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/registry_item.rs b/packages/backend-rs/src/model/entity/registry_item.rs
index 74ae18cef3..7c7fcbf4b5 100644
--- a/packages/backend-rs/src/model/entity/registry_item.rs
+++ b/packages/backend-rs/src/model/entity/registry_item.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "registry_item")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/relay.rs b/packages/backend-rs/src/model/entity/relay.rs
index c035a74bec..24e4fb81c0 100644
--- a/packages/backend-rs/src/model/entity/relay.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "relay")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/renote_muting.rs b/packages/backend-rs/src/model/entity/renote_muting.rs
index b6604cad88..80b0f57f59 100644
--- a/packages/backend-rs/src/model/entity/renote_muting.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "renote_muting")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/reply_muting.rs b/packages/backend-rs/src/model/entity/reply_muting.rs
index 84fe0cbbfa..8d2e00eb3f 100644
--- a/packages/backend-rs/src/model/entity/reply_muting.rs
+++ b/packages/backend-rs/src/model/entity/reply_muting.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "reply_muting")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/sea_orm_active_enums.rs b/packages/backend-rs/src/model/entity/sea_orm_active_enums.rs
index 38820e1bd8..2232800070 100644
--- a/packages/backend-rs/src/model/entity/sea_orm_active_enums.rs
+++ b/packages/backend-rs/src/model/entity/sea_orm_active_enums.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "antenna_src_enum")]
@@ -20,7 +20,7 @@ pub enum AntennaSrcEnum {
     #[sea_orm(string_value = "users")]
     Users,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
@@ -38,7 +38,7 @@ pub enum MutedNoteReasonEnum {
     #[sea_orm(string_value = "word")]
     Word,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
@@ -58,7 +58,7 @@ pub enum NoteVisibilityEnum {
     #[sea_orm(string_value = "specified")]
     Specified,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
@@ -92,7 +92,7 @@ pub enum NotificationTypeEnum {
     #[sea_orm(string_value = "reply")]
     Reply,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
@@ -108,7 +108,7 @@ pub enum PageVisibilityEnum {
     #[sea_orm(string_value = "specified")]
     Specified,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
@@ -126,7 +126,7 @@ pub enum PollNotevisibilityEnum {
     #[sea_orm(string_value = "specified")]
     Specified,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "relay_status_enum")]
@@ -138,7 +138,7 @@ pub enum RelayStatusEnum {
     #[sea_orm(string_value = "requesting")]
     Requesting,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
@@ -156,7 +156,7 @@ pub enum UserEmojimodpermEnum {
     #[sea_orm(string_value = "unauthorized")]
     Unauthorized,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
@@ -172,7 +172,7 @@ pub enum UserProfileFfvisibilityEnum {
     #[sea_orm(string_value = "public")]
     Public,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
diff --git a/packages/backend-rs/src/model/entity/signin.rs b/packages/backend-rs/src/model/entity/signin.rs
index 491f079a82..08c7ad59f1 100644
--- a/packages/backend-rs/src/model/entity/signin.rs
+++ b/packages/backend-rs/src/model/entity/signin.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "signin")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/sw_subscription.rs b/packages/backend-rs/src/model/entity/sw_subscription.rs
index 4aa275f77b..a1bf0a9b3d 100644
--- a/packages/backend-rs/src/model/entity/sw_subscription.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "sw_subscription")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/used_username.rs b/packages/backend-rs/src/model/entity/used_username.rs
index 9e108a8a4f..af038530b4 100644
--- a/packages/backend-rs/src/model/entity/used_username.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "used_username")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user.rs b/packages/backend-rs/src/model/entity/user.rs
index 8af0b27e88..25c8854abe 100644
--- a/packages/backend-rs/src/model/entity/user.rs
+++ b/packages/backend-rs/src/model/entity/user.rs
@@ -3,7 +3,7 @@
 use super::sea_orm_active_enums::UserEmojimodpermEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "user")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_group.rs b/packages/backend-rs/src/model/entity/user_group.rs
index 7d9ae71b24..8c5b08514f 100644
--- a/packages/backend-rs/src/model/entity/user_group.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "user_group")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_group_invitation.rs b/packages/backend-rs/src/model/entity/user_group_invitation.rs
index c449a48078..c676248ce4 100644
--- a/packages/backend-rs/src/model/entity/user_group_invitation.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "user_group_invitation")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_group_invite.rs b/packages/backend-rs/src/model/entity/user_group_invite.rs
index 3df43af3f6..41d47eb1b5 100644
--- a/packages/backend-rs/src/model/entity/user_group_invite.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "user_group_invite")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_group_joining.rs b/packages/backend-rs/src/model/entity/user_group_joining.rs
index 2ff31b3a5f..3289b7e1e4 100644
--- a/packages/backend-rs/src/model/entity/user_group_joining.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "user_group_joining")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_ip.rs b/packages/backend-rs/src/model/entity/user_ip.rs
index d6eadc7f71..77caeec313 100644
--- a/packages/backend-rs/src/model/entity/user_ip.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "user_ip")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_keypair.rs b/packages/backend-rs/src/model/entity/user_keypair.rs
index d59853158a..f5fc9cd6b5 100644
--- a/packages/backend-rs/src/model/entity/user_keypair.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "user_keypair")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_list.rs b/packages/backend-rs/src/model/entity/user_list.rs
index 356ec5318c..399767fb25 100644
--- a/packages/backend-rs/src/model/entity/user_list.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "user_list")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_list_joining.rs b/packages/backend-rs/src/model/entity/user_list_joining.rs
index 037d7af181..adfdda8560 100644
--- a/packages/backend-rs/src/model/entity/user_list_joining.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "user_list_joining")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_note_pining.rs b/packages/backend-rs/src/model/entity/user_note_pining.rs
index f0a80a66c9..74f4e1c1cd 100644
--- a/packages/backend-rs/src/model/entity/user_note_pining.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "user_note_pining")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_pending.rs b/packages/backend-rs/src/model/entity/user_pending.rs
index 1fa13c2829..ddab5f2aee 100644
--- a/packages/backend-rs/src/model/entity/user_pending.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "user_pending")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_profile.rs b/packages/backend-rs/src/model/entity/user_profile.rs
index a121118926..076729669f 100644
--- a/packages/backend-rs/src/model/entity/user_profile.rs
+++ b/packages/backend-rs/src/model/entity/user_profile.rs
@@ -4,7 +4,7 @@ use super::sea_orm_active_enums::UserProfileFfvisibilityEnum;
 use super::sea_orm_active_enums::UserProfileMutingnotificationtypesEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "user_profile")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_publickey.rs b/packages/backend-rs/src/model/entity/user_publickey.rs
index ad6a456ead..3683a25a7c 100644
--- a/packages/backend-rs/src/model/entity/user_publickey.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "user_publickey")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_security_key.rs b/packages/backend-rs/src/model/entity/user_security_key.rs
index aae6dfa8c6..bd0a7a493a 100644
--- a/packages/backend-rs/src/model/entity/user_security_key.rs
+++ b/packages/backend-rs/src/model/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, serde::Serialize)]
 #[sea_orm(table_name = "user_security_key")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/webhook.rs b/packages/backend-rs/src/model/entity/webhook.rs
index e7656056b9..72c1c7e011 100644
--- a/packages/backend-rs/src/model/entity/webhook.rs
+++ b/packages/backend-rs/src/model/entity/webhook.rs
@@ -2,7 +2,7 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
 #[sea_orm(table_name = "webhook")]
 #[cfg_attr(
     feature = "napi",

From b017f9ce94a4c4678468f570958458106cb5a088 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 06:53:34 +0900
Subject: [PATCH 25/99] fix (backend-rs): use cache server if present

---
 packages/backend-rs/src/database/redis.rs | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/backend-rs/src/database/redis.rs b/packages/backend-rs/src/database/redis.rs
index 863f57b35d..8652c6b53c 100644
--- a/packages/backend-rs/src/database/redis.rs
+++ b/packages/backend-rs/src/database/redis.rs
@@ -7,15 +7,21 @@ fn init_redis() -> Result<Client, RedisError> {
     let redis_url = {
         let mut params = vec!["redis://".to_owned()];
 
-        if let Some(user) = &CONFIG.redis.user {
+        let redis = if let Some(cache_server) = &CONFIG.cache_server {
+            cache_server
+        } else {
+            &CONFIG.redis
+        };
+
+        if let Some(user) = &redis.user {
             params.push(user.to_string())
         }
-        if let Some(pass) = &CONFIG.redis.pass {
+        if let Some(pass) = &redis.pass {
             params.push(format!(":{}@", pass))
         }
-        params.push(CONFIG.redis.host.to_string());
-        params.push(format!(":{}", CONFIG.redis.port));
-        params.push(format!("/{}", CONFIG.redis.db));
+        params.push(redis.host.to_string());
+        params.push(format!(":{}", redis.port));
+        params.push(format!("/{}", redis.db));
 
         params.concat()
     };
@@ -31,9 +37,9 @@ pub fn redis_conn() -> Result<Connection, RedisError> {
 }
 
 #[inline]
-/// prefix redis key with the hostname
-pub fn key(key: &str) -> String {
-    format!("{}:{}", CONFIG.hostname, key)
+/// prefix redis key
+pub fn key(key: impl ToString) -> String {
+    format!("{}:{}", CONFIG.redis.prefix, key.to_string())
 }
 
 #[cfg(test)]

From f486caf24477d8bbaf6097a5beb53fd520d7ddc1 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 06:52:27 +0900
Subject: [PATCH 26/99] fix (backend-rs): use correct Redis key prefix

---
 packages/backend-rs/index.d.ts            |  3 ++-
 packages/backend-rs/src/config/server.rs  | 12 ++++++++++--
 packages/backend-rs/src/database/redis.rs |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index 433e80999c..0c75def671 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -70,7 +70,7 @@ export interface RedisConfig {
   pass?: string
   tls?: TlsConfig
   db: number
-  prefix: string
+  prefix?: string
 }
 export interface TlsConfig {
   host: string
@@ -165,6 +165,7 @@ export interface Config {
   version: string
   host: string
   hostname: string
+  redisKeyPrefix: string
   scheme: string
   wsScheme: string
   apiUrl: string
diff --git a/packages/backend-rs/src/config/server.rs b/packages/backend-rs/src/config/server.rs
index edfdf6109c..720e1a9c49 100644
--- a/packages/backend-rs/src/config/server.rs
+++ b/packages/backend-rs/src/config/server.rs
@@ -82,8 +82,7 @@ pub struct RedisConfig {
     pub tls: Option<TlsConfig>,
     #[serde(default)]
     pub db: u32,
-    #[serde(default)]
-    pub prefix: String,
+    pub prefix: Option<String>,
 }
 
 #[derive(Clone, Debug, PartialEq, Deserialize)]
@@ -217,6 +216,7 @@ pub struct Config {
     pub version: String,
     pub host: String,
     pub hostname: String,
+    pub redis_key_prefix: String,
     pub scheme: String,
     pub ws_scheme: String,
     pub api_url: String,
@@ -315,6 +315,13 @@ fn load_config() -> Config {
         None => WorkerConfig { web: 1, queue: 1 },
     };
 
+    let redis_key_prefix = if let Some(cache_server) = &server_config.cache_server {
+        cache_server.prefix.clone()
+    } else {
+        server_config.redis.prefix.clone()
+    }
+    .unwrap_or(hostname.clone());
+
     Config {
         url: server_config.url,
         port: server_config.port,
@@ -361,6 +368,7 @@ fn load_config() -> Config {
         version,
         host,
         hostname,
+        redis_key_prefix,
         scheme,
         ws_scheme,
         client_entry: manifest,
diff --git a/packages/backend-rs/src/database/redis.rs b/packages/backend-rs/src/database/redis.rs
index 8652c6b53c..e717201f95 100644
--- a/packages/backend-rs/src/database/redis.rs
+++ b/packages/backend-rs/src/database/redis.rs
@@ -39,7 +39,7 @@ pub fn redis_conn() -> Result<Connection, RedisError> {
 #[inline]
 /// prefix redis key
 pub fn key(key: impl ToString) -> String {
-    format!("{}:{}", CONFIG.redis.prefix, key.to_string())
+    format!("{}:{}", CONFIG.redis_key_prefix, key.to_string())
 }
 
 #[cfg(test)]

From ccbd6178e4336f801adae8a5d49c3f3f9f93525a Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 06:54:06 +0900
Subject: [PATCH 27/99] refactor (backend): port add-note-to-antenna to
 backend-rs

I hit this bug: https://github.com/napi-rs/napi-rs/issues/2060
---
 Cargo.lock                                    | 31 ++++++-
 Cargo.toml                                    |  1 +
 packages/backend-rs/Cargo.toml                |  1 +
 packages/backend-rs/index.d.ts                |  1 +
 packages/backend-rs/index.js                  |  3 +-
 packages/backend-rs/src/lib.rs                |  1 +
 .../src/service/add_note_to_antenna.rs        | 20 +++++
 packages/backend-rs/src/service/mod.rs        |  2 +
 packages/backend-rs/src/service/stream.rs     | 86 +++++++++++++++++++
 packages/backend/package.json                 |  1 +
 .../backend/src/prelude/undefined-to-null.ts  | 76 ++++++++++++++++
 .../src/services/add-note-to-antenna.ts       | 24 ------
 packages/backend/src/services/note/create.ts  |  7 +-
 packages/backend/src/services/stream.ts       | 28 +++---
 pnpm-lock.yaml                                |  8 ++
 15 files changed, 247 insertions(+), 43 deletions(-)
 create mode 100644 packages/backend-rs/src/service/add_note_to_antenna.rs
 create mode 100644 packages/backend-rs/src/service/mod.rs
 create mode 100644 packages/backend-rs/src/service/stream.rs
 create mode 100644 packages/backend/src/prelude/undefined-to-null.ts
 delete mode 100644 packages/backend/src/services/add-note-to-antenna.ts

diff --git a/Cargo.lock b/Cargo.lock
index 52ef14933f..6cb32a21d0 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -227,6 +227,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_yaml",
+ "strum 0.26.2",
  "thiserror",
  "tokio",
  "url",
@@ -2096,6 +2097,12 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47"
+
 [[package]]
 name = "ryu"
 version = "1.0.17"
@@ -2176,7 +2183,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sqlx",
- "strum",
+ "strum 0.25.0",
  "thiserror",
  "time",
  "tracing",
@@ -2708,6 +2715,28 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
 
+[[package]]
+name = "strum"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
+dependencies = [
+ "strum_macros",
+]
+
+[[package]]
+name = "strum_macros"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.58",
+]
+
 [[package]]
 name = "subtle"
 version = "2.5.0"
diff --git a/Cargo.toml b/Cargo.toml
index b82635d8b4..0bde324447 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,6 +33,7 @@ sea-orm = "0.12.15"
 serde = "1.0.197"
 serde_json = "1.0.115"
 serde_yaml = "0.9.34"
+strum = "0.26.2"
 syn = "2.0.58"
 thiserror = "1.0.58"
 tokio = "1.37.0"
diff --git a/packages/backend-rs/Cargo.toml b/packages/backend-rs/Cargo.toml
index d077028e13..93c57dc321 100644
--- a/packages/backend-rs/Cargo.toml
+++ b/packages/backend-rs/Cargo.toml
@@ -37,6 +37,7 @@ sea-orm = { workspace = true, features = ["sqlx-postgres", "runtime-tokio-rustls
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
 serde_yaml = { workspace = true }
+strum = { workspace = true, features = ["derive"] }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["full"] }
 url = { workspace = true }
diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index 0c75def671..f13cb0bc45 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -1098,6 +1098,7 @@ export interface Webhook {
   latestSentAt: Date | null
   latestStatus: number | null
 }
+export function addNoteToAntenna(antennaId: string, note: Note): void
 /** Initializes Cuid2 generator. Must be called before any [create_id]. */
 export function initIdGenerator(length: number, fingerprint: string): void
 export function getTimestamp(id: string): number
diff --git a/packages/backend-rs/index.js b/packages/backend-rs/index.js
index 5fd1e9d784..fbaf1dc352 100644
--- a/packages/backend-rs/index.js
+++ b/packages/backend-rs/index.js
@@ -310,7 +310,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { loadEnv, loadConfig, stringToAcct, acctToString, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, AntennaSrcEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, initIdGenerator, getTimestamp, genId, secureRndstr } = nativeBinding
+const { loadEnv, loadConfig, stringToAcct, acctToString, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, AntennaSrcEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, addNoteToAntenna, initIdGenerator, getTimestamp, genId, secureRndstr } = nativeBinding
 
 module.exports.loadEnv = loadEnv
 module.exports.loadConfig = loadConfig
@@ -348,6 +348,7 @@ module.exports.RelayStatusEnum = RelayStatusEnum
 module.exports.UserEmojimodpermEnum = UserEmojimodpermEnum
 module.exports.UserProfileFfvisibilityEnum = UserProfileFfvisibilityEnum
 module.exports.UserProfileMutingnotificationtypesEnum = UserProfileMutingnotificationtypesEnum
+module.exports.addNoteToAntenna = addNoteToAntenna
 module.exports.initIdGenerator = initIdGenerator
 module.exports.getTimestamp = getTimestamp
 module.exports.genId = genId
diff --git a/packages/backend-rs/src/lib.rs b/packages/backend-rs/src/lib.rs
index bef7a41808..0dcc4e6251 100644
--- a/packages/backend-rs/src/lib.rs
+++ b/packages/backend-rs/src/lib.rs
@@ -4,4 +4,5 @@ pub mod config;
 pub mod database;
 pub mod misc;
 pub mod model;
+pub mod service;
 pub mod util;
diff --git a/packages/backend-rs/src/service/add_note_to_antenna.rs b/packages/backend-rs/src/service/add_note_to_antenna.rs
new file mode 100644
index 0000000000..b919f4e1a0
--- /dev/null
+++ b/packages/backend-rs/src/service/add_note_to_antenna.rs
@@ -0,0 +1,20 @@
+use crate::database::{redis_conn, redis_key};
+use crate::model::entity::note;
+use crate::service::stream::{publish, Error, Stream};
+use crate::util::id::get_timestamp;
+use redis::{streams::StreamMaxlen, Commands};
+
+#[crate::export]
+pub fn add_note_to_antenna(antenna_id: &str, note: &note::Model) -> Result<(), Error> {
+    redis_conn()?.xadd_maxlen(
+        redis_key(format!("antennaTimeline:{}", antenna_id)),
+        StreamMaxlen::Approx(200),
+        format!("{}-*", get_timestamp(&note.id)),
+        &[("note", &note.id)],
+    )?;
+
+    let stream = Stream::Antenna {
+        id: antenna_id.to_string(),
+    };
+    publish(&stream, Some("note"), Some(serde_json::to_value(note)?))
+}
diff --git a/packages/backend-rs/src/service/mod.rs b/packages/backend-rs/src/service/mod.rs
new file mode 100644
index 0000000000..cc239e3f9e
--- /dev/null
+++ b/packages/backend-rs/src/service/mod.rs
@@ -0,0 +1,2 @@
+pub mod add_note_to_antenna;
+pub mod stream;
diff --git a/packages/backend-rs/src/service/stream.rs b/packages/backend-rs/src/service/stream.rs
new file mode 100644
index 0000000000..fc545fa95c
--- /dev/null
+++ b/packages/backend-rs/src/service/stream.rs
@@ -0,0 +1,86 @@
+use crate::database::redis_conn;
+use redis::{Commands, RedisError};
+
+#[derive(strum::Display, serde::Serialize)]
+pub enum Stream {
+    #[strum(serialize = "internal")]
+    Internal,
+    #[strum(serialize = "broadcast")]
+    Broadcast,
+    #[strum(to_string = "adminStream:{id}")]
+    Admin { id: String },
+    #[strum(to_string = "user:{id}")]
+    User { id: String },
+    #[strum(to_string = "channelStream:{id}")]
+    Channel { id: String },
+    #[strum(to_string = "noteStream:{id}")]
+    Note { id: String },
+    #[strum(serialize = "notesStream")]
+    Notes,
+    #[strum(to_string = "userListStream:{id}")]
+    UserList { id: String },
+    #[strum(to_string = "mainStream:{id}")]
+    Main { id: String },
+    #[strum(to_string = "driveStream:{id}")]
+    Drive { id: String },
+    #[strum(to_string = "antennaStream:{id}")]
+    Antenna { id: String },
+    #[strum(to_string = "messagingStream:{id}")]
+    Messaging { id: String },
+    #[strum(to_string = "messagingIndexStream:{id}")]
+    MessagingIndex { id: String },
+}
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error("Redis error: {0}")]
+    RedisError(#[from] RedisError),
+    #[error("Json serialization error: {0}")]
+    JsonError(#[from] serde_json::Error),
+    #[error("Value error: {0}")]
+    ValueError(String),
+}
+
+pub fn publish(
+    channel: &Stream,
+    kind: Option<&str>,
+    value: Option<serde_json::Value>,
+) -> Result<(), Error> {
+    #[derive(serde::Serialize)]
+    struct Message {
+        r#type: String,
+        body: Option<serde_json::Value>,
+    }
+
+    let message = if let Some(kind) = kind {
+        serde_json::to_value(Message {
+            r#type: kind.to_string(),
+            body: value,
+        })?
+    } else {
+        value.ok_or(Error::ValueError("Invalid streaming message".to_string()))?
+    };
+
+    redis_conn()?.publish(channel.to_string(), message.to_string())?;
+
+    Ok(())
+}
+
+#[cfg(test)]
+mod unit_test {
+    use super::Stream;
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    fn channel_to_string() {
+        assert_eq!(Stream::Internal.to_string(), "internal");
+        assert_eq!(Stream::Broadcast.to_string(), "broadcast");
+        assert_eq!(
+            Stream::Admin {
+                id: "9tb42br63g5apjcq".to_string()
+            }
+            .to_string(),
+            "adminStream:9tb42br63g5apjcq"
+        );
+    }
+}
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 9289c2f7ea..0599a39d4b 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -178,6 +178,7 @@
 		"ts-loader": "9.5.1",
 		"ts-node": "10.9.2",
 		"tsconfig-paths": "4.2.0",
+		"type-fest": "4.15.0",
 		"typescript": "5.4.5",
 		"webpack": "^5.91.0",
 		"ws": "8.16.0"
diff --git a/packages/backend/src/prelude/undefined-to-null.ts b/packages/backend/src/prelude/undefined-to-null.ts
new file mode 100644
index 0000000000..013be3cf9e
--- /dev/null
+++ b/packages/backend/src/prelude/undefined-to-null.ts
@@ -0,0 +1,76 @@
+// https://gist.github.com/tkrotoff/a6baf96eb6b61b445a9142e5555511a0
+import type { Primitive } from "type-fest";
+
+type NullToUndefined<T> = T extends null
+	? undefined
+	: T extends Primitive | Function | Date | RegExp
+		? T
+		: T extends Array<infer U>
+			? Array<NullToUndefined<U>>
+			: T extends Map<infer K, infer V>
+				? Map<K, NullToUndefined<V>>
+				: T extends Set<infer U>
+					? Set<NullToUndefined<U>>
+					: T extends object
+						? { [K in keyof T]: NullToUndefined<T[K]> }
+						: unknown;
+
+type UndefinedToNull<T> = T extends undefined
+	? null
+	: T extends Primitive | Function | Date | RegExp
+		? T
+		: T extends Array<infer U>
+			? Array<UndefinedToNull<U>>
+			: T extends Map<infer K, infer V>
+				? Map<K, UndefinedToNull<V>>
+				: T extends Set<infer U>
+					? Set<NullToUndefined<U>>
+					: T extends object
+						? { [K in keyof T]: UndefinedToNull<T[K]> }
+						: unknown;
+
+function _nullToUndefined<T>(obj: T): NullToUndefined<T> {
+	if (obj === null) {
+		return undefined as any;
+	}
+
+	if (typeof obj === "object") {
+		if (obj instanceof Map) {
+			obj.forEach((value, key) => obj.set(key, _nullToUndefined(value)));
+		} else {
+			for (const key in obj) {
+				obj[key] = _nullToUndefined(obj[key]) as any;
+			}
+		}
+	}
+
+	return obj as any;
+}
+
+function _undefinedToNull<T>(obj: T): UndefinedToNull<T> {
+	if (obj === undefined) {
+		return null as any;
+	}
+
+	if (typeof obj === "object") {
+		if (obj instanceof Map) {
+			obj.forEach((value, key) => obj.set(key, _undefinedToNull(value)));
+		} else {
+			for (const key in obj) {
+				obj[key] = _undefinedToNull(obj[key]) as any;
+			}
+		}
+	}
+
+	return obj as any;
+}
+
+/**
+ * Recursively converts all undefined values to null.
+ *
+ * @param obj object to convert
+ * @returns a copy of the object with all its undefined values converted to null
+ */
+export function undefinedToNull<T>(obj: T) {
+	return _undefinedToNull(structuredClone(obj));
+}
diff --git a/packages/backend/src/services/add-note-to-antenna.ts b/packages/backend/src/services/add-note-to-antenna.ts
deleted file mode 100644
index 66bc898263..0000000000
--- a/packages/backend/src/services/add-note-to-antenna.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import type { Antenna } from "@/models/entities/antenna.js";
-import type { Note } from "@/models/entities/note.js";
-import { getTimestamp } from "backend-rs";
-import { redisClient } from "@/db/redis.js";
-import { publishAntennaStream } from "@/services/stream.js";
-import type { User } from "@/models/entities/user.js";
-
-export async function addNoteToAntenna(
-	antenna: Antenna,
-	note: Note,
-	_noteUser: { id: User["id"] },
-) {
-	redisClient.xadd(
-		`antennaTimeline:${antenna.id}`,
-		"MAXLEN",
-		"~",
-		"200",
-		`${getTimestamp(note.id)}-*`,
-		"note",
-		note.id,
-	);
-
-	publishAntennaStream(antenna.id, "note", note);
-}
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 662064da57..206f6a50ad 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -44,8 +44,7 @@ import { Poll } from "@/models/entities/poll.js";
 import { createNotification } from "@/services/create-notification.js";
 import { isDuplicateKeyValueError } from "@/misc/is-duplicate-key-value-error.js";
 import { checkHitAntenna } from "@/misc/check-hit-antenna.js";
-import { checkWordMute } from "backend-rs";
-import { addNoteToAntenna } from "@/services/add-note-to-antenna.js";
+import { addNoteToAntenna, checkWordMute } from "backend-rs";
 import { countSameRenotes } from "@/misc/count-same-renotes.js";
 import { deliverToRelays, getCachedRelays } from "../relay.js";
 import type { Channel } from "@/models/entities/channel.js";
@@ -63,6 +62,7 @@ import { Mutex } from "redis-semaphore";
 import { langmap } from "@/misc/langmap.js";
 import Logger from "@/services/logger.js";
 import { inspect } from "node:util";
+import { undefinedToNull } from "@/prelude/undefined-to-null.js";
 
 const logger = new Logger("create-note");
 
@@ -399,7 +399,8 @@ export default async (
 		for (const antenna of await getAntennas()) {
 			checkHitAntenna(antenna, note, user).then((hit) => {
 				if (hit) {
-					addNoteToAntenna(antenna, note, user);
+					// TODO: do this more sanely
+					addNoteToAntenna(antenna.id, undefinedToNull(note) as Note);
 				}
 			});
 		}
diff --git a/packages/backend/src/services/stream.ts b/packages/backend/src/services/stream.ts
index 0e2395e87e..6dff9602cd 100644
--- a/packages/backend/src/services/stream.ts
+++ b/packages/backend/src/services/stream.ts
@@ -4,12 +4,12 @@ import type { Note } from "@/models/entities/note.js";
 import type { UserList } from "@/models/entities/user-list.js";
 import type { UserGroup } from "@/models/entities/user-group.js";
 import { config } from "@/config.js";
-import type { Antenna } from "@/models/entities/antenna.js";
+// import type { Antenna } from "@/models/entities/antenna.js";
 import type { Channel } from "@/models/entities/channel.js";
 import type {
 	StreamChannels,
 	AdminStreamTypes,
-	AntennaStreamTypes,
+	// AntennaStreamTypes,
 	BroadcastTypes,
 	ChannelStreamTypes,
 	DriveStreamTypes,
@@ -134,17 +134,17 @@ class Publisher {
 		);
 	};
 
-	public publishAntennaStream = <K extends keyof AntennaStreamTypes>(
-		antennaId: Antenna["id"],
-		type: K,
-		value?: AntennaStreamTypes[K],
-	): void => {
-		this.publish(
-			`antennaStream:${antennaId}`,
-			type,
-			typeof value === "undefined" ? null : value,
-		);
-	};
+	// public publishAntennaStream = <K extends keyof AntennaStreamTypes>(
+	// 	antennaId: Antenna["id"],
+	// 	type: K,
+	// 	value?: AntennaStreamTypes[K],
+	// ): void => {
+	// 	this.publish(
+	// 		`antennaStream:${antennaId}`,
+	// 		type,
+	// 		typeof value === "undefined" ? null : value,
+	// 	);
+	// };
 
 	public publishMessagingStream = <K extends keyof MessagingStreamTypes>(
 		userId: User["id"],
@@ -217,7 +217,7 @@ export const publishNoteStream = publisher.publishNoteStream;
 export const publishNotesStream = publisher.publishNotesStream;
 export const publishChannelStream = publisher.publishChannelStream;
 export const publishUserListStream = publisher.publishUserListStream;
-export const publishAntennaStream = publisher.publishAntennaStream;
+// export const publishAntennaStream = publisher.publishAntennaStream;
 export const publishMessagingStream = publisher.publishMessagingStream;
 export const publishGroupMessagingStream =
 	publisher.publishGroupMessagingStream;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b591ffe9c1..16a4ad6ad4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -521,6 +521,9 @@ importers:
       tsconfig-paths:
         specifier: 4.2.0
         version: 4.2.0
+      type-fest:
+        specifier: 4.15.0
+        version: 4.15.0
       typescript:
         specifier: 5.4.5
         version: 5.4.5
@@ -16632,6 +16635,11 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /type-fest@4.15.0:
+    resolution: {integrity: sha512-tB9lu0pQpX5KJq54g+oHOLumOx+pMep4RaM6liXh2PKmVRFF+/vAtUP0ZaJ0kOySfVNjF6doBWPHhBhISKdlIA==}
+    engines: {node: '>=16'}
+    dev: true
+
   /type-is@1.6.18:
     resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
     engines: {node: '>= 0.6'}

From d41b462a893ec57717ca3c2527485927f00ce6e1 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 07:43:09 +0900
Subject: [PATCH 28/99] fix (backend): fix redis key prefix

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

diff --git a/packages/backend/src/db/redis.ts b/packages/backend/src/db/redis.ts
index dc703e9d47..72c23d84e2 100644
--- a/packages/backend/src/db/redis.ts
+++ b/packages/backend/src/db/redis.ts
@@ -12,7 +12,7 @@ export function createConnection() {
 		family: source.family ?? 0,
 		password: source.pass,
 		username: source.user ?? "default",
-		keyPrefix: `${source.prefix}:`,
+		keyPrefix: `${config.redisKeyPrefix}:`,
 		db: source.db || 0,
 		tls: source.tls,
 	});

From f33c7c6c94074acba664acde306803cd53bfa3b5 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 08:48:48 +0900
Subject: [PATCH 29/99] fix (backend): host and hostname was messed up

---
 packages/backend-rs/src/config/server.rs             | 12 ++++++------
 .../src/server/api/stream/channels/user-list.ts      |  2 +-
 packages/backend/src/server/api/stream/index.ts      |  2 +-
 packages/backend/src/server/api/stream/types.ts      |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/backend-rs/src/config/server.rs b/packages/backend-rs/src/config/server.rs
index 720e1a9c49..b822d0d300 100644
--- a/packages/backend-rs/src/config/server.rs
+++ b/packages/backend-rs/src/config/server.rs
@@ -296,14 +296,14 @@ fn load_config() -> Config {
     let version = read_meta().version;
     let manifest = read_manifest();
     let url = url::Url::parse(&server_config.url).expect("Config url is invalid");
-    let host = url
+    let hostname = url
         .host_str()
         .expect("Hostname is missing in the config url")
         .to_owned();
-    let hostname = url
-        .domain()
-        .expect("Domain is missing in the config url")
-        .to_owned();
+    let host = match url.port() {
+        Some(port) => format!("{}:{}", hostname, port),
+        None => hostname.clone(),
+    };
     let scheme = url.scheme().to_owned();
     let ws_scheme = scheme.replace("http", "ws");
 
@@ -320,7 +320,7 @@ fn load_config() -> Config {
     } else {
         server_config.redis.prefix.clone()
     }
-    .unwrap_or(hostname.clone());
+    .unwrap_or(host.clone());
 
     Config {
         url: server_config.url,
diff --git a/packages/backend/src/server/api/stream/channels/user-list.ts b/packages/backend/src/server/api/stream/channels/user-list.ts
index fcfb7ecda3..2722a6610a 100644
--- a/packages/backend/src/server/api/stream/channels/user-list.ts
+++ b/packages/backend/src/server/api/stream/channels/user-list.ts
@@ -22,7 +22,7 @@ export default class extends Channel {
 		this.listId = params.listId as string;
 
 		// Check existence and owner
-		const exist = await UserLists.exist({
+		const exist = await UserLists.exists({
 			where: {
 				id: this.listId,
 				userId: this.user!.id,
diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts
index 416a041b52..313719e207 100644
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -1,4 +1,4 @@
-import type { EventEmitter } from "events";
+import type { EventEmitter } from "node:events";
 import type * as websocket from "websocket";
 import readNote from "@/services/note/read.js";
 import type { User } from "@/models/entities/user.js";
diff --git a/packages/backend/src/server/api/stream/types.ts b/packages/backend/src/server/api/stream/types.ts
index 91095a46d3..8b4ac9e502 100644
--- a/packages/backend/src/server/api/stream/types.ts
+++ b/packages/backend/src/server/api/stream/types.ts
@@ -1,4 +1,4 @@
-import type { EventEmitter } from "events";
+import type { EventEmitter } from "node:events";
 import type Emitter from "strict-event-emitter-types";
 import type { Channel } from "@/models/entities/channel.js";
 import type { User } from "@/models/entities/user.js";

From f13df7e2022992b53bea07f19a13ca956bac85f1 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 09:13:14 +0900
Subject: [PATCH 30/99] chore (backend-rs): make entities deserializable

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

diff --git a/packages/backend-rs/Makefile b/packages/backend-rs/Makefile
index 29a00e847d..abe6045801 100644
--- a/packages/backend-rs/Makefile
+++ b/packages/backend-rs/Makefile
@@ -17,9 +17,9 @@ regenerate-entities:
 	  jsname=$$(printf '%s\n' "$${base%.*}" | perl -pe 's/(^|_)./uc($$&)/ge;s/_//g'); \
 	  attribute=$$(printf 'cfg_attr(feature = "napi", napi_derive::napi(object, js_name = "%s", use_nullable = true))' "$${jsname}"); \
 	  sed -i "s/NAPI_EXTRA_ATTR_PLACEHOLDER/$${attribute}/" "$${file}"; \
-		sed -i 's/#\[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)\]/#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]/' "$${file}"; \
+		sed -i 's/#\[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)\]/#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]\n#[serde(rename_all = "camelCase")]/' "$${file}"; \
 	done
-	sed -i 's/#\[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)\]/#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]\n#[cfg_attr(not(feature = "napi"), derive(Clone))]\n#[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]/' \
+	sed -i 's/#\[derive(Debug, Clone, PartialEq, Eq, EnumIter, DeriveActiveEnum)\]/#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize, serde::Deserialize)]\n#[serde(rename_all = "camelCase")]\n#[cfg_attr(not(feature = "napi"), derive(Clone))]\n#[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]/' \
 	  src/model/entity/sea_orm_active_enums.rs
 	cargo fmt --all --
 
diff --git a/packages/backend-rs/src/model/entity/abuse_user_report.rs b/packages/backend-rs/src/model/entity/abuse_user_report.rs
index 4d46581a89..e12b2f4d31 100644
--- a/packages/backend-rs/src/model/entity/abuse_user_report.rs
+++ b/packages/backend-rs/src/model/entity/abuse_user_report.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "abuse_user_report")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/access_token.rs b/packages/backend-rs/src/model/entity/access_token.rs
index ffe4fd9914..8b79877b8b 100644
--- a/packages/backend-rs/src/model/entity/access_token.rs
+++ b/packages/backend-rs/src/model/entity/access_token.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "access_token")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/ad.rs b/packages/backend-rs/src/model/entity/ad.rs
index f8de656383..8a7b9abb86 100644
--- a/packages/backend-rs/src/model/entity/ad.rs
+++ b/packages/backend-rs/src/model/entity/ad.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "ad")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/announcement.rs b/packages/backend-rs/src/model/entity/announcement.rs
index 73b9c84080..4532614a24 100644
--- a/packages/backend-rs/src/model/entity/announcement.rs
+++ b/packages/backend-rs/src/model/entity/announcement.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "announcement")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/announcement_read.rs b/packages/backend-rs/src/model/entity/announcement_read.rs
index 5f0c27599d..de54dae082 100644
--- a/packages/backend-rs/src/model/entity/announcement_read.rs
+++ b/packages/backend-rs/src/model/entity/announcement_read.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "announcement_read")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/antenna.rs b/packages/backend-rs/src/model/entity/antenna.rs
index 2abe216cda..4074f5f106 100644
--- a/packages/backend-rs/src/model/entity/antenna.rs
+++ b/packages/backend-rs/src/model/entity/antenna.rs
@@ -3,7 +3,8 @@
 use super::sea_orm_active_enums::AntennaSrcEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "antenna")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/app.rs b/packages/backend-rs/src/model/entity/app.rs
index 72c908e87a..8d2aa5373a 100644
--- a/packages/backend-rs/src/model/entity/app.rs
+++ b/packages/backend-rs/src/model/entity/app.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "app")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/attestation_challenge.rs b/packages/backend-rs/src/model/entity/attestation_challenge.rs
index 9513a584e7..999952943d 100644
--- a/packages/backend-rs/src/model/entity/attestation_challenge.rs
+++ b/packages/backend-rs/src/model/entity/attestation_challenge.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "attestation_challenge")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/auth_session.rs b/packages/backend-rs/src/model/entity/auth_session.rs
index 873a15ec3d..fac397308d 100644
--- a/packages/backend-rs/src/model/entity/auth_session.rs
+++ b/packages/backend-rs/src/model/entity/auth_session.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "auth_session")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/blocking.rs b/packages/backend-rs/src/model/entity/blocking.rs
index 5ffc685f80..d7773108ab 100644
--- a/packages/backend-rs/src/model/entity/blocking.rs
+++ b/packages/backend-rs/src/model/entity/blocking.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "blocking")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/channel.rs b/packages/backend-rs/src/model/entity/channel.rs
index e309a7ead6..4f3ec777ee 100644
--- a/packages/backend-rs/src/model/entity/channel.rs
+++ b/packages/backend-rs/src/model/entity/channel.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "channel")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/channel_following.rs b/packages/backend-rs/src/model/entity/channel_following.rs
index ee5a5a9bbc..d45b2c9706 100644
--- a/packages/backend-rs/src/model/entity/channel_following.rs
+++ b/packages/backend-rs/src/model/entity/channel_following.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "channel_following")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/channel_note_pining.rs b/packages/backend-rs/src/model/entity/channel_note_pining.rs
index 28431d2999..9080c0181e 100644
--- a/packages/backend-rs/src/model/entity/channel_note_pining.rs
+++ b/packages/backend-rs/src/model/entity/channel_note_pining.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "channel_note_pining")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/clip.rs b/packages/backend-rs/src/model/entity/clip.rs
index 7316831088..05dc66fa48 100644
--- a/packages/backend-rs/src/model/entity/clip.rs
+++ b/packages/backend-rs/src/model/entity/clip.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "clip")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/clip_note.rs b/packages/backend-rs/src/model/entity/clip_note.rs
index c7b089d35b..a76b5d5d8a 100644
--- a/packages/backend-rs/src/model/entity/clip_note.rs
+++ b/packages/backend-rs/src/model/entity/clip_note.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "clip_note")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/drive_file.rs b/packages/backend-rs/src/model/entity/drive_file.rs
index 5527d79530..cff9aa5a92 100644
--- a/packages/backend-rs/src/model/entity/drive_file.rs
+++ b/packages/backend-rs/src/model/entity/drive_file.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "drive_file")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/drive_folder.rs b/packages/backend-rs/src/model/entity/drive_folder.rs
index 717a28b8b0..e4f6fccb6f 100644
--- a/packages/backend-rs/src/model/entity/drive_folder.rs
+++ b/packages/backend-rs/src/model/entity/drive_folder.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "drive_folder")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/emoji.rs b/packages/backend-rs/src/model/entity/emoji.rs
index 19c080bc4d..374781c4d2 100644
--- a/packages/backend-rs/src/model/entity/emoji.rs
+++ b/packages/backend-rs/src/model/entity/emoji.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "emoji")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/follow_request.rs b/packages/backend-rs/src/model/entity/follow_request.rs
index 0ee2f954f6..332eeed204 100644
--- a/packages/backend-rs/src/model/entity/follow_request.rs
+++ b/packages/backend-rs/src/model/entity/follow_request.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "follow_request")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/following.rs b/packages/backend-rs/src/model/entity/following.rs
index 25a9caf226..6f3255ecc9 100644
--- a/packages/backend-rs/src/model/entity/following.rs
+++ b/packages/backend-rs/src/model/entity/following.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "following")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/gallery_like.rs b/packages/backend-rs/src/model/entity/gallery_like.rs
index b07ad74266..db519bc91b 100644
--- a/packages/backend-rs/src/model/entity/gallery_like.rs
+++ b/packages/backend-rs/src/model/entity/gallery_like.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "gallery_like")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/gallery_post.rs b/packages/backend-rs/src/model/entity/gallery_post.rs
index 396075c252..5492417911 100644
--- a/packages/backend-rs/src/model/entity/gallery_post.rs
+++ b/packages/backend-rs/src/model/entity/gallery_post.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "gallery_post")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/hashtag.rs b/packages/backend-rs/src/model/entity/hashtag.rs
index a689e110b7..56b9314e08 100644
--- a/packages/backend-rs/src/model/entity/hashtag.rs
+++ b/packages/backend-rs/src/model/entity/hashtag.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "hashtag")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/instance.rs b/packages/backend-rs/src/model/entity/instance.rs
index 8b534eae6e..839c6206df 100644
--- a/packages/backend-rs/src/model/entity/instance.rs
+++ b/packages/backend-rs/src/model/entity/instance.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "instance")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/messaging_message.rs b/packages/backend-rs/src/model/entity/messaging_message.rs
index 0997d18013..b5f5d818a0 100644
--- a/packages/backend-rs/src/model/entity/messaging_message.rs
+++ b/packages/backend-rs/src/model/entity/messaging_message.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "messaging_message")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/meta.rs b/packages/backend-rs/src/model/entity/meta.rs
index 67cf3d96e7..a1e50228d5 100644
--- a/packages/backend-rs/src/model/entity/meta.rs
+++ b/packages/backend-rs/src/model/entity/meta.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "meta")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/migrations.rs b/packages/backend-rs/src/model/entity/migrations.rs
index 9487b29f0f..f0d55ba123 100644
--- a/packages/backend-rs/src/model/entity/migrations.rs
+++ b/packages/backend-rs/src/model/entity/migrations.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "migrations")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/moderation_log.rs b/packages/backend-rs/src/model/entity/moderation_log.rs
index 097f620318..e51ac4cc0d 100644
--- a/packages/backend-rs/src/model/entity/moderation_log.rs
+++ b/packages/backend-rs/src/model/entity/moderation_log.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "moderation_log")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/muted_note.rs b/packages/backend-rs/src/model/entity/muted_note.rs
index 580f13b1aa..b1345565b7 100644
--- a/packages/backend-rs/src/model/entity/muted_note.rs
+++ b/packages/backend-rs/src/model/entity/muted_note.rs
@@ -3,7 +3,8 @@
 use super::sea_orm_active_enums::MutedNoteReasonEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "muted_note")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/muting.rs b/packages/backend-rs/src/model/entity/muting.rs
index 5ae9bf3dfa..b9850b3a42 100644
--- a/packages/backend-rs/src/model/entity/muting.rs
+++ b/packages/backend-rs/src/model/entity/muting.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "muting")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/note.rs b/packages/backend-rs/src/model/entity/note.rs
index 1344fe8fad..85947ea35d 100644
--- a/packages/backend-rs/src/model/entity/note.rs
+++ b/packages/backend-rs/src/model/entity/note.rs
@@ -3,7 +3,8 @@
 use super::sea_orm_active_enums::NoteVisibilityEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "note")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/note_edit.rs b/packages/backend-rs/src/model/entity/note_edit.rs
index e594704fe8..0fb10b82a8 100644
--- a/packages/backend-rs/src/model/entity/note_edit.rs
+++ b/packages/backend-rs/src/model/entity/note_edit.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "note_edit")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/note_favorite.rs b/packages/backend-rs/src/model/entity/note_favorite.rs
index c201b82092..12e5c641b1 100644
--- a/packages/backend-rs/src/model/entity/note_favorite.rs
+++ b/packages/backend-rs/src/model/entity/note_favorite.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "note_favorite")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/note_file.rs b/packages/backend-rs/src/model/entity/note_file.rs
index fad63db8bd..9d13c7506d 100644
--- a/packages/backend-rs/src/model/entity/note_file.rs
+++ b/packages/backend-rs/src/model/entity/note_file.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "note_file")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/note_reaction.rs b/packages/backend-rs/src/model/entity/note_reaction.rs
index ab4c87d76d..9d5de3fab4 100644
--- a/packages/backend-rs/src/model/entity/note_reaction.rs
+++ b/packages/backend-rs/src/model/entity/note_reaction.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "note_reaction")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/note_thread_muting.rs b/packages/backend-rs/src/model/entity/note_thread_muting.rs
index fa7a4365a0..fbbb30e948 100644
--- a/packages/backend-rs/src/model/entity/note_thread_muting.rs
+++ b/packages/backend-rs/src/model/entity/note_thread_muting.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "note_thread_muting")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/note_unread.rs b/packages/backend-rs/src/model/entity/note_unread.rs
index 9e15f631ec..2b74e3a63c 100644
--- a/packages/backend-rs/src/model/entity/note_unread.rs
+++ b/packages/backend-rs/src/model/entity/note_unread.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "note_unread")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/note_watching.rs b/packages/backend-rs/src/model/entity/note_watching.rs
index 00433a08e0..817431daaa 100644
--- a/packages/backend-rs/src/model/entity/note_watching.rs
+++ b/packages/backend-rs/src/model/entity/note_watching.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "note_watching")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/notification.rs b/packages/backend-rs/src/model/entity/notification.rs
index b5d1dced95..e2273017e5 100644
--- a/packages/backend-rs/src/model/entity/notification.rs
+++ b/packages/backend-rs/src/model/entity/notification.rs
@@ -3,7 +3,8 @@
 use super::sea_orm_active_enums::NotificationTypeEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "notification")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/page.rs b/packages/backend-rs/src/model/entity/page.rs
index 3256bfff1c..a88b53459d 100644
--- a/packages/backend-rs/src/model/entity/page.rs
+++ b/packages/backend-rs/src/model/entity/page.rs
@@ -3,7 +3,8 @@
 use super::sea_orm_active_enums::PageVisibilityEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "page")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/page_like.rs b/packages/backend-rs/src/model/entity/page_like.rs
index e7a477e922..7f7caabde5 100644
--- a/packages/backend-rs/src/model/entity/page_like.rs
+++ b/packages/backend-rs/src/model/entity/page_like.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "page_like")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/password_reset_request.rs b/packages/backend-rs/src/model/entity/password_reset_request.rs
index 76e89bd8d5..de78019087 100644
--- a/packages/backend-rs/src/model/entity/password_reset_request.rs
+++ b/packages/backend-rs/src/model/entity/password_reset_request.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "password_reset_request")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/poll.rs b/packages/backend-rs/src/model/entity/poll.rs
index 9572a3c728..2e65674b15 100644
--- a/packages/backend-rs/src/model/entity/poll.rs
+++ b/packages/backend-rs/src/model/entity/poll.rs
@@ -3,7 +3,8 @@
 use super::sea_orm_active_enums::PollNotevisibilityEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "poll")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/poll_vote.rs b/packages/backend-rs/src/model/entity/poll_vote.rs
index 8208c3a95a..47e68084cc 100644
--- a/packages/backend-rs/src/model/entity/poll_vote.rs
+++ b/packages/backend-rs/src/model/entity/poll_vote.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "poll_vote")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/promo_note.rs b/packages/backend-rs/src/model/entity/promo_note.rs
index 5e38b3440f..8b13b8987b 100644
--- a/packages/backend-rs/src/model/entity/promo_note.rs
+++ b/packages/backend-rs/src/model/entity/promo_note.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "promo_note")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/promo_read.rs b/packages/backend-rs/src/model/entity/promo_read.rs
index f4d8854e39..3e6d822d29 100644
--- a/packages/backend-rs/src/model/entity/promo_read.rs
+++ b/packages/backend-rs/src/model/entity/promo_read.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "promo_read")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/registration_ticket.rs b/packages/backend-rs/src/model/entity/registration_ticket.rs
index e06f2b295e..ab735b2422 100644
--- a/packages/backend-rs/src/model/entity/registration_ticket.rs
+++ b/packages/backend-rs/src/model/entity/registration_ticket.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "registration_ticket")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/registry_item.rs b/packages/backend-rs/src/model/entity/registry_item.rs
index 7c7fcbf4b5..cb129128b7 100644
--- a/packages/backend-rs/src/model/entity/registry_item.rs
+++ b/packages/backend-rs/src/model/entity/registry_item.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "registry_item")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/relay.rs b/packages/backend-rs/src/model/entity/relay.rs
index 24e4fb81c0..f2eeb571f4 100644
--- a/packages/backend-rs/src/model/entity/relay.rs
+++ b/packages/backend-rs/src/model/entity/relay.rs
@@ -3,7 +3,8 @@
 use super::sea_orm_active_enums::RelayStatusEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "relay")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/renote_muting.rs b/packages/backend-rs/src/model/entity/renote_muting.rs
index 80b0f57f59..308e4c1563 100644
--- a/packages/backend-rs/src/model/entity/renote_muting.rs
+++ b/packages/backend-rs/src/model/entity/renote_muting.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "renote_muting")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/reply_muting.rs b/packages/backend-rs/src/model/entity/reply_muting.rs
index 8d2e00eb3f..77891d1ee2 100644
--- a/packages/backend-rs/src/model/entity/reply_muting.rs
+++ b/packages/backend-rs/src/model/entity/reply_muting.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "reply_muting")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/sea_orm_active_enums.rs b/packages/backend-rs/src/model/entity/sea_orm_active_enums.rs
index 2232800070..e8a53acdd3 100644
--- a/packages/backend-rs/src/model/entity/sea_orm_active_enums.rs
+++ b/packages/backend-rs/src/model/entity/sea_orm_active_enums.rs
@@ -2,7 +2,10 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
+#[derive(
+    Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize, serde::Deserialize,
+)]
+#[serde(rename_all = "camelCase")]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "antenna_src_enum")]
@@ -20,7 +23,10 @@ pub enum AntennaSrcEnum {
     #[sea_orm(string_value = "users")]
     Users,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
+#[derive(
+    Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize, serde::Deserialize,
+)]
+#[serde(rename_all = "camelCase")]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
@@ -38,7 +44,10 @@ pub enum MutedNoteReasonEnum {
     #[sea_orm(string_value = "word")]
     Word,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
+#[derive(
+    Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize, serde::Deserialize,
+)]
+#[serde(rename_all = "camelCase")]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
@@ -58,7 +67,10 @@ pub enum NoteVisibilityEnum {
     #[sea_orm(string_value = "specified")]
     Specified,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
+#[derive(
+    Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize, serde::Deserialize,
+)]
+#[serde(rename_all = "camelCase")]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
@@ -92,7 +104,10 @@ pub enum NotificationTypeEnum {
     #[sea_orm(string_value = "reply")]
     Reply,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
+#[derive(
+    Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize, serde::Deserialize,
+)]
+#[serde(rename_all = "camelCase")]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
@@ -108,7 +123,10 @@ pub enum PageVisibilityEnum {
     #[sea_orm(string_value = "specified")]
     Specified,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
+#[derive(
+    Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize, serde::Deserialize,
+)]
+#[serde(rename_all = "camelCase")]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
@@ -126,7 +144,10 @@ pub enum PollNotevisibilityEnum {
     #[sea_orm(string_value = "specified")]
     Specified,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
+#[derive(
+    Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize, serde::Deserialize,
+)]
+#[serde(rename_all = "camelCase")]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "relay_status_enum")]
@@ -138,7 +159,10 @@ pub enum RelayStatusEnum {
     #[sea_orm(string_value = "requesting")]
     Requesting,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
+#[derive(
+    Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize, serde::Deserialize,
+)]
+#[serde(rename_all = "camelCase")]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
@@ -156,7 +180,10 @@ pub enum UserEmojimodpermEnum {
     #[sea_orm(string_value = "unauthorized")]
     Unauthorized,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
+#[derive(
+    Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize, serde::Deserialize,
+)]
+#[serde(rename_all = "camelCase")]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
@@ -172,7 +199,10 @@ pub enum UserProfileFfvisibilityEnum {
     #[sea_orm(string_value = "public")]
     Public,
 }
-#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize)]
+#[derive(
+    Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum, serde::Serialize, serde::Deserialize,
+)]
+#[serde(rename_all = "camelCase")]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
diff --git a/packages/backend-rs/src/model/entity/signin.rs b/packages/backend-rs/src/model/entity/signin.rs
index 08c7ad59f1..d5584f9d84 100644
--- a/packages/backend-rs/src/model/entity/signin.rs
+++ b/packages/backend-rs/src/model/entity/signin.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "signin")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/sw_subscription.rs b/packages/backend-rs/src/model/entity/sw_subscription.rs
index a1bf0a9b3d..fe694177f3 100644
--- a/packages/backend-rs/src/model/entity/sw_subscription.rs
+++ b/packages/backend-rs/src/model/entity/sw_subscription.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "sw_subscription")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/used_username.rs b/packages/backend-rs/src/model/entity/used_username.rs
index af038530b4..8557955034 100644
--- a/packages/backend-rs/src/model/entity/used_username.rs
+++ b/packages/backend-rs/src/model/entity/used_username.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "used_username")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user.rs b/packages/backend-rs/src/model/entity/user.rs
index 25c8854abe..f8a2b09324 100644
--- a/packages/backend-rs/src/model/entity/user.rs
+++ b/packages/backend-rs/src/model/entity/user.rs
@@ -3,7 +3,8 @@
 use super::sea_orm_active_enums::UserEmojimodpermEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "user")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_group.rs b/packages/backend-rs/src/model/entity/user_group.rs
index 8c5b08514f..387c50d422 100644
--- a/packages/backend-rs/src/model/entity/user_group.rs
+++ b/packages/backend-rs/src/model/entity/user_group.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "user_group")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_group_invitation.rs b/packages/backend-rs/src/model/entity/user_group_invitation.rs
index c676248ce4..289acf89df 100644
--- a/packages/backend-rs/src/model/entity/user_group_invitation.rs
+++ b/packages/backend-rs/src/model/entity/user_group_invitation.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "user_group_invitation")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_group_invite.rs b/packages/backend-rs/src/model/entity/user_group_invite.rs
index 41d47eb1b5..62fcf0c524 100644
--- a/packages/backend-rs/src/model/entity/user_group_invite.rs
+++ b/packages/backend-rs/src/model/entity/user_group_invite.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "user_group_invite")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_group_joining.rs b/packages/backend-rs/src/model/entity/user_group_joining.rs
index 3289b7e1e4..b29bdd11eb 100644
--- a/packages/backend-rs/src/model/entity/user_group_joining.rs
+++ b/packages/backend-rs/src/model/entity/user_group_joining.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "user_group_joining")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_ip.rs b/packages/backend-rs/src/model/entity/user_ip.rs
index 77caeec313..9847fb8d65 100644
--- a/packages/backend-rs/src/model/entity/user_ip.rs
+++ b/packages/backend-rs/src/model/entity/user_ip.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "user_ip")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_keypair.rs b/packages/backend-rs/src/model/entity/user_keypair.rs
index f5fc9cd6b5..dad29ab3b3 100644
--- a/packages/backend-rs/src/model/entity/user_keypair.rs
+++ b/packages/backend-rs/src/model/entity/user_keypair.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "user_keypair")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_list.rs b/packages/backend-rs/src/model/entity/user_list.rs
index 399767fb25..30dc6db715 100644
--- a/packages/backend-rs/src/model/entity/user_list.rs
+++ b/packages/backend-rs/src/model/entity/user_list.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "user_list")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_list_joining.rs b/packages/backend-rs/src/model/entity/user_list_joining.rs
index adfdda8560..972cc34bb6 100644
--- a/packages/backend-rs/src/model/entity/user_list_joining.rs
+++ b/packages/backend-rs/src/model/entity/user_list_joining.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "user_list_joining")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_note_pining.rs b/packages/backend-rs/src/model/entity/user_note_pining.rs
index 74f4e1c1cd..26f05274fd 100644
--- a/packages/backend-rs/src/model/entity/user_note_pining.rs
+++ b/packages/backend-rs/src/model/entity/user_note_pining.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "user_note_pining")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_pending.rs b/packages/backend-rs/src/model/entity/user_pending.rs
index ddab5f2aee..43a5c2f1e2 100644
--- a/packages/backend-rs/src/model/entity/user_pending.rs
+++ b/packages/backend-rs/src/model/entity/user_pending.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "user_pending")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_profile.rs b/packages/backend-rs/src/model/entity/user_profile.rs
index 076729669f..644817aa8d 100644
--- a/packages/backend-rs/src/model/entity/user_profile.rs
+++ b/packages/backend-rs/src/model/entity/user_profile.rs
@@ -4,7 +4,8 @@ use super::sea_orm_active_enums::UserProfileFfvisibilityEnum;
 use super::sea_orm_active_enums::UserProfileMutingnotificationtypesEnum;
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "user_profile")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_publickey.rs b/packages/backend-rs/src/model/entity/user_publickey.rs
index 3683a25a7c..f8bc8629eb 100644
--- a/packages/backend-rs/src/model/entity/user_publickey.rs
+++ b/packages/backend-rs/src/model/entity/user_publickey.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "user_publickey")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/user_security_key.rs b/packages/backend-rs/src/model/entity/user_security_key.rs
index bd0a7a493a..a4694cf177 100644
--- a/packages/backend-rs/src/model/entity/user_security_key.rs
+++ b/packages/backend-rs/src/model/entity/user_security_key.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "user_security_key")]
 #[cfg_attr(
     feature = "napi",
diff --git a/packages/backend-rs/src/model/entity/webhook.rs b/packages/backend-rs/src/model/entity/webhook.rs
index 72c1c7e011..430cf9fcc0 100644
--- a/packages/backend-rs/src/model/entity/webhook.rs
+++ b/packages/backend-rs/src/model/entity/webhook.rs
@@ -2,7 +2,8 @@
 
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
 #[sea_orm(table_name = "webhook")]
 #[cfg_attr(
     feature = "napi",

From 2b0668dacd3f540b93c932e504d1e86a1337afc1 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 09:54:02 +0900
Subject: [PATCH 31/99] fix (backend-rs): Redis streaming

---
 .../src/service/add_note_to_antenna.rs        |  2 +-
 packages/backend-rs/src/service/stream.rs     | 35 ++++++++++---------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/packages/backend-rs/src/service/add_note_to_antenna.rs b/packages/backend-rs/src/service/add_note_to_antenna.rs
index b919f4e1a0..6a06fb6993 100644
--- a/packages/backend-rs/src/service/add_note_to_antenna.rs
+++ b/packages/backend-rs/src/service/add_note_to_antenna.rs
@@ -16,5 +16,5 @@ pub fn add_note_to_antenna(antenna_id: &str, note: &note::Model) -> Result<(), E
     let stream = Stream::Antenna {
         id: antenna_id.to_string(),
     };
-    publish(&stream, Some("note"), Some(serde_json::to_value(note)?))
+    publish(&stream, Some("note"), Some(serde_json::to_string(note)?))
 }
diff --git a/packages/backend-rs/src/service/stream.rs b/packages/backend-rs/src/service/stream.rs
index fc545fa95c..6fbe699f44 100644
--- a/packages/backend-rs/src/service/stream.rs
+++ b/packages/backend-rs/src/service/stream.rs
@@ -1,3 +1,4 @@
+use crate::config::server::CONFIG;
 use crate::database::redis_conn;
 use redis::{Commands, RedisError};
 
@@ -35,33 +36,33 @@ pub enum Stream {
 pub enum Error {
     #[error("Redis error: {0}")]
     RedisError(#[from] RedisError),
-    #[error("Json serialization error: {0}")]
+    #[error("Json (de)serialization error: {0}")]
     JsonError(#[from] serde_json::Error),
     #[error("Value error: {0}")]
     ValueError(String),
 }
 
-pub fn publish(
-    channel: &Stream,
-    kind: Option<&str>,
-    value: Option<serde_json::Value>,
-) -> Result<(), Error> {
-    #[derive(serde::Serialize)]
-    struct Message {
-        r#type: String,
-        body: Option<serde_json::Value>,
-    }
-
+pub fn publish(channel: &Stream, kind: Option<&str>, value: Option<String>) -> Result<(), Error> {
     let message = if let Some(kind) = kind {
-        serde_json::to_value(Message {
-            r#type: kind.to_string(),
-            body: value,
-        })?
+        format!(
+            "{{ \"type\": \"{}\", \"body\": {} }}",
+            kind,
+            match value {
+                Some(v) => v,
+                None => "null".to_string(),
+            }
+        )
     } else {
         value.ok_or(Error::ValueError("Invalid streaming message".to_string()))?
     };
 
-    redis_conn()?.publish(channel.to_string(), message.to_string())?;
+    redis_conn()?.publish(
+        &CONFIG.host,
+        format!(
+            "{{ \"channel\": \"{}\", \"message\": {} }}",
+            channel, message,
+        ),
+    )?;
 
     Ok(())
 }

From 35c7dccb498ac8f068199f09f982e80997ed7bcb Mon Sep 17 00:00:00 2001
From: Lhcfl <Lhcfl@outlook.com>
Date: Sat, 20 Apr 2024 15:56:13 +0800
Subject: [PATCH 32/99] fix: use MkPagination in notes for Quote, Boost,
 Reaction

---
 .../backend/src/models/repositories/note.ts   | 22 ++++-
 packages/backend/src/models/schema/note.ts    | 10 ++
 .../server/api/endpoints/notes/reactions.ts   |  2 -
 .../src/server/api/endpoints/notes/renotes.ts | 15 ++-
 .../client/src/components/MkNoteDetailed.vue  | 93 ++++++++++---------
 .../client/src/components/MkReactedUsers.vue  | 31 +++++--
 .../client/src/components/MkRenoteButton.vue  | 16 +---
 packages/firefish-js/src/api.types.ts         |  8 +-
 packages/firefish-js/src/entities.ts          |  2 +
 9 files changed, 131 insertions(+), 68 deletions(-)

diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts
index c877048709..5974fc24af 100644
--- a/packages/backend/src/models/repositories/note.ts
+++ b/packages/backend/src/models/repositories/note.ts
@@ -1,4 +1,4 @@
-import { In } from "typeorm";
+import { In, IsNull, Not } from "typeorm";
 import * as mfm from "mfm-js";
 import { Note } from "@/models/entities/note.js";
 import type { User } from "@/models/entities/user.js";
@@ -10,6 +10,7 @@ import {
 	Followings,
 	Polls,
 	Channels,
+	Notes,
 } from "../index.js";
 import type { Packed } from "@/misc/schema.js";
 import { countReactions, decodeReaction, nyaify } from "backend-rs";
@@ -101,7 +102,7 @@ export const NoteRepository = db.getRepository(Note).extend({
 				return true;
 			} else {
 				// 指定されているかどうか
-				return note.visibleUserIds.some((id: any) => meId === id);
+				return note.visibleUserIds.some((id) => meId === id);
 			}
 		}
 
@@ -211,8 +212,25 @@ export const NoteRepository = db.getRepository(Note).extend({
 			localOnly: note.localOnly || undefined,
 			visibleUserIds:
 				note.visibility === "specified" ? note.visibleUserIds : undefined,
+			// FIXME: Deleting a post does not decrease these two numbers, causing the number to be wrong
 			renoteCount: note.renoteCount,
 			repliesCount: note.repliesCount,
+			// TODO: add it to database and use note.quoteCount
+			quoteCount: Notes.count({
+				where: {
+					renoteId: note.id,
+					text: Not(IsNull()),
+				},
+			}),
+			meRenoteCount: me
+				? Notes.count({
+						where: {
+							renoteId: note.id,
+							text: IsNull(),
+							userId: me.id,
+						},
+					})
+				: undefined,
 			reactions: countReactions(note.reactions),
 			reactionEmojis: reactionEmoji,
 			emojis: noteEmoji,
diff --git a/packages/backend/src/models/schema/note.ts b/packages/backend/src/models/schema/note.ts
index fff872b69f..e0048f7d00 100644
--- a/packages/backend/src/models/schema/note.ts
+++ b/packages/backend/src/models/schema/note.ts
@@ -208,5 +208,15 @@ export const packedNoteSchema = {
 			optional: true,
 			nullable: true,
 		},
+		meRenoteCount: {
+			type: "number",
+			optional: true,
+			nullable: false,
+		},
+		quoteCount: {
+			type: "number",
+			optional: false,
+			nullable: false,
+		},
 	},
 } as const;
diff --git a/packages/backend/src/server/api/endpoints/notes/reactions.ts b/packages/backend/src/server/api/endpoints/notes/reactions.ts
index 386a3a08df..d6ff8888af 100644
--- a/packages/backend/src/server/api/endpoints/notes/reactions.ts
+++ b/packages/backend/src/server/api/endpoints/notes/reactions.ts
@@ -42,8 +42,6 @@ export const paramDef = {
 		type: { type: "string", nullable: true },
 		limit: { type: "integer", minimum: 1, maximum: 100, default: 10 },
 		offset: { type: "integer", default: 0 },
-		sinceId: { type: "string", format: "misskey:id" },
-		untilId: { type: "string", format: "misskey:id" },
 	},
 	required: ["noteId"],
 } as const;
diff --git a/packages/backend/src/server/api/endpoints/notes/renotes.ts b/packages/backend/src/server/api/endpoints/notes/renotes.ts
index 683004ebe8..282777b2e4 100644
--- a/packages/backend/src/server/api/endpoints/notes/renotes.ts
+++ b/packages/backend/src/server/api/endpoints/notes/renotes.ts
@@ -42,6 +42,12 @@ export const paramDef = {
 		limit: { type: "integer", minimum: 1, maximum: 100, default: 10 },
 		sinceId: { type: "string", format: "misskey:id" },
 		untilId: { type: "string", format: "misskey:id" },
+		filter: {
+			type: "string",
+			enum: ["boost", "quote"],
+			nullable: true,
+			default: null,
+		},
 	},
 	required: ["noteId"],
 } as const;
@@ -53,7 +59,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		throw err;
 	});
 
-	let query = makePaginationQuery(
+	const query = makePaginationQuery(
 		Notes.createQueryBuilder("note"),
 		ps.sinceId,
 		ps.untilId,
@@ -61,6 +67,13 @@ export default define(meta, paramDef, async (ps, user) => {
 		.andWhere("note.renoteId = :renoteId", { renoteId: note.id })
 		.innerJoinAndSelect("note.user", "user");
 
+	if (ps.filter === "boost") {
+		query.andWhere("note.text IS NULL");
+	}
+	if (ps.filter === "quote") {
+		query.andWhere("note.text IS NOT NULL");
+	}
+
 	if (ps.userId) {
 		query.andWhere("user.id = :userId", { userId: ps.userId });
 	}
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index b6c0d784ba..71e4aeb783 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -64,11 +64,11 @@
 					)
 				}}
 			</option>
-			<option v-if="directQuotes && directQuotes.length > 0" value="quotes">
+			<option v-if="note.quoteCount > 0" value="quotes">
 				<!-- <i :class="icon('ph-quotes')"></i> -->
 				{{
 					wordWithCount(
-						directQuotes.length,
+						note.quoteCount,
 						i18n.ts.quote,
 						i18n.ts.quotes,
 					)
@@ -92,32 +92,33 @@
 		/>
 		<MkLoading v-else-if="tab === 'replies' && note.repliesCount > 0" />
 
-		<MkNoteSub
-			v-for="note in directQuotes"
-			v-if="directQuotes && tab === 'quotes'"
-			:key="note.id"
-			:note="note"
-			class="reply"
-			:conversation="replies"
-			:detailed-view="true"
-			:parent-id="note.id"
-		/>
-		<MkLoading v-else-if="tab === 'quotes' && directQuotes && directQuotes.length > 0" />
+		<MkPagination
+			v-if="tab === 'quotes'"
+			v-slot="{ items }"
+			:pagination="quotePagination"
+		>
+			<MkNoteSub
+				v-for="note in items"
+				:key="note.id"
+				:note="note"
+				class="reply"
+				:conversation="items"
+				:detailed-view="true"
+				:parent-id="note.id"
+			/>
+		</MkPagination>
 
-		<!-- <MkPagination
+		<MkPagination
 			v-if="tab === 'renotes'"
 			v-slot="{ items }"
-			ref="pagingComponent"
-			:pagination="pagination"
-		> -->
-		<MkUserCardMini
-			v-for="item in renotes"
-			v-if="tab === 'renotes' && renotes"
-			:key="item.user.id"
-			:user="item.user"
-		/>
-		<!-- </MkPagination> -->
-		<MkLoading v-else-if="tab === 'renotes' && note.renoteCount > 0" />
+			:pagination="renotePagination"
+		>
+			<MkUserCardMini
+				v-for="item in items"
+				:key="item.user.id"
+				:user="item.user"
+			/>
+		</MkPagination>
 
 		<div v-if="tab === 'clips' && clips.length > 0" class="_content clips">
 			<MkA
@@ -186,6 +187,7 @@ import { getNoteMenu } from "@/scripts/get-note-menu";
 import { useNoteCapture } from "@/scripts/use-note-capture";
 import { deepClone } from "@/scripts/clone";
 import { useStream } from "@/stream";
+import MkPagination, { Paging } from "@/components/MkPagination.vue";
 // import icon from "@/scripts/icon";
 
 const props = defineProps<{
@@ -247,7 +249,6 @@ const replies = ref<entities.Note[]>([]);
 const directReplies = ref<null | entities.Note[]>([]);
 const directQuotes = ref<null | entities.Note[]>([]);
 const clips = ref();
-const renotes = ref();
 const isRenote = ref(note.value.renoteId != null);
 let isScrolling: boolean;
 
@@ -401,24 +402,32 @@ os.api("notes/clips", {
 	clips.value = res;
 });
 
-// const pagination = {
-// 	endpoint: "notes/renotes",
-// 	noteId: note.id,
-// 	limit: 10,
-// };
+const renotePagination = {
+	endpoint: "notes/renotes" as const,
+	limit: 30,
+	params: {
+		noteId: note.value.id,
+		filter: "boost" as const,
+	},
+};
+const quotePagination = {
+	endpoint: "notes/renotes" as const,
+	limit: 30,
+	params: {
+		noteId: note.value.id,
+		filter: "quote" as const,
+	},
+};
 
-// const pagingComponent = $ref<InstanceType<typeof MkPagination>>();
-
-renotes.value = null;
 function loadTab() {
-	if (tab.value === "renotes" && !renotes.value) {
-		os.api("notes/renotes", {
-			noteId: note.value.id,
-			limit: 100,
-		}).then((res) => {
-			renotes.value = res;
-		});
-	}
+	// if (tab.value === "renotes" && !renotes.value) {
+	// 	os.api("notes/renotes", {
+	// 		noteId: note.value.id,
+	// 		limit: 100,
+	// 	}).then((res) => {
+	// 		renotes.value = res;
+	// 	});
+	// }
 }
 
 async function onNoteUpdated(
diff --git a/packages/client/src/components/MkReactedUsers.vue b/packages/client/src/components/MkReactedUsers.vue
index ae7a1d6d7d..76b86ed46f 100644
--- a/packages/client/src/components/MkReactedUsers.vue
+++ b/packages/client/src/components/MkReactedUsers.vue
@@ -23,7 +23,13 @@
 				}}</span>
 			</button>
 		</div>
-		<MkUserCardMini v-for="user in users" :key="user.id" :user="user" />
+		<MkPagination
+			ref="pagingComponent"
+			:pagination="pagination"
+			v-slot="{ items }"
+		>
+			<MkUserCardMini v-for="{ user: user } in items" :key="user.id" :user="user" />
+		</MkPagination>
 	</div>
 	<div v-else>
 		<MkLoading />
@@ -36,6 +42,9 @@ import type { entities } from "firefish-js";
 import MkReactionIcon from "@/components/MkReactionIcon.vue";
 import MkUserCardMini from "@/components/MkUserCardMini.vue";
 import * as os from "@/os";
+import MkPagination, {
+	type MkPaginationType,
+} from "@/components/MkPagination.vue";
 
 const props = defineProps<{
 	noteId: entities.Note["id"];
@@ -44,16 +53,22 @@ const props = defineProps<{
 const note = ref<entities.Note>();
 const tab = ref<string | null>(null);
 const reactions = ref<string[]>();
-const users = ref();
 
-async function updateUsers(): void {
-	const res = await os.api("notes/reactions", {
+const pagingComponent = ref<MkPaginationType<"notes/reactions"> | null>(null);
+
+const pagination = {
+	endpoint: "notes/reactions" as const,
+	params: {
 		noteId: props.noteId,
 		type: tab.value,
-		limit: 30,
-	});
+	},
+	offsetMode: true,
+	limit: 30,
+};
 
-	users.value = res.map((x) => x.user);
+function updateUsers(): void {
+	pagination.params.type = tab.value;
+	pagingComponent.value?.reload();
 }
 
 watch(tab, updateUsers);
@@ -64,7 +79,7 @@ onMounted(() => {
 	}).then(async (res) => {
 		reactions.value = Object.keys(res.reactions);
 		note.value = res;
-		await updateUsers();
+		// updateUsers();
 	});
 });
 </script>
diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue
index 7250757da4..23911eef37 100644
--- a/packages/client/src/components/MkRenoteButton.vue
+++ b/packages/client/src/components/MkRenoteButton.vue
@@ -27,7 +27,7 @@ import Ripple from "@/components/MkRipple.vue";
 import XDetails from "@/components/MkUsersTooltip.vue";
 import { pleaseLogin } from "@/scripts/please-login";
 import * as os from "@/os";
-import { isSignedIn, me } from "@/me";
+import { me } from "@/me";
 import { useTooltip } from "@/scripts/use-tooltip";
 import { i18n } from "@/i18n";
 import { defaultStore } from "@/store";
@@ -72,17 +72,9 @@ useTooltip(buttonRef, async (showing) => {
 	);
 });
 
-const hasRenotedBefore = ref(false);
-
-if (isSignedIn) {
-	os.api("notes/renotes", {
-		noteId: props.note.id,
-		userId: me!.id,
-		limit: 1,
-	}).then((res) => {
-		hasRenotedBefore.value = res.length > 0;
-	});
-}
+const hasRenotedBefore = ref(
+	props.note.meRenoteCount && props.note.meRenoteCount > 0,
+);
 
 const renote = (viaKeyboard = false, ev?: MouseEvent) => {
 	pleaseLogin();
diff --git a/packages/firefish-js/src/api.types.ts b/packages/firefish-js/src/api.types.ts
index c0a7c9019b..6c0e11bec5 100644
--- a/packages/firefish-js/src/api.types.ts
+++ b/packages/firefish-js/src/api.types.ts
@@ -773,7 +773,12 @@ export type Endpoints = {
 		res: null;
 	};
 	"notes/reactions": {
-		req: { noteId: Note["id"]; type?: string | null; limit?: number };
+		req: {
+			noteId: Note["id"];
+			type?: string | null;
+			limit?: number;
+			offset?: number;
+		};
 		res: NoteReaction[];
 	};
 	"notes/reactions/create": {
@@ -787,6 +792,7 @@ export type Endpoints = {
 			sinceId?: Note["id"];
 			untilId?: Note["id"];
 			noteId: Note["id"];
+			filter?: "boost" | "quote";
 		};
 		res: Note[];
 	};
diff --git a/packages/firefish-js/src/entities.ts b/packages/firefish-js/src/entities.ts
index 457d7ac935..aace6de166 100644
--- a/packages/firefish-js/src/entities.ts
+++ b/packages/firefish-js/src/entities.ts
@@ -174,9 +174,11 @@ export type Note = {
 	channelId?: Channel["id"];
 	channel?: Channel;
 	myReaction?: string;
+	meRenoteCount?: number;
 	reactions: Record<string, number>;
 	renoteCount: number;
 	repliesCount: number;
+	quoteCount: number;
 	poll?: {
 		expiresAt: DateString | null;
 		multiple: boolean;

From 39a229b8753df37a15842bb957cdf2dff57ead3b Mon Sep 17 00:00:00 2001
From: Lhcfl <Lhcfl@outlook.com>
Date: Sat, 20 Apr 2024 20:55:47 +0800
Subject: [PATCH 33/99] fix: use MkPagination for replies

---
 biome.json                                    |   2 +-
 .../api/common/make-pagination-query.ts       |   4 +-
 .../client/src/components/MkNoteDetailed.vue  | 149 +++++-------------
 packages/client/src/components/MkNoteSub.vue  | 103 +++++++++---
 .../client/src/components/MkPagination.vue    |  68 ++++----
 .../client/src/scripts/use-note-capture.ts    |  17 +-
 6 files changed, 172 insertions(+), 171 deletions(-)

diff --git a/biome.json b/biome.json
index 21b711f457..487165266a 100644
--- a/biome.json
+++ b/biome.json
@@ -14,7 +14,7 @@
 	},
 	"overrides": [
 		{
-			"include": ["*.vue"],
+			"include": ["*.vue", "packages/client/*.ts"],
 			"linter": {
 				"rules": {
 					"style": {
diff --git a/packages/backend/src/server/api/common/make-pagination-query.ts b/packages/backend/src/server/api/common/make-pagination-query.ts
index a2c3275693..83827b3df1 100644
--- a/packages/backend/src/server/api/common/make-pagination-query.ts
+++ b/packages/backend/src/server/api/common/make-pagination-query.ts
@@ -1,6 +1,6 @@
-import type { SelectQueryBuilder } from "typeorm";
+import type { ObjectLiteral, SelectQueryBuilder } from "typeorm";
 
-export function makePaginationQuery<T>(
+export function makePaginationQuery<T extends ObjectLiteral>(
 	q: SelectQueryBuilder<T>,
 	sinceId?: string,
 	untilId?: string,
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 71e4aeb783..30f1af0829 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -33,7 +33,7 @@
 			@contextmenu.stop="onContextmenu"
 		></MkNote>
 
-		<MkTab v-model="tab" :style="'underline'" @update:modelValue="loadTab">
+		<MkTab v-model="tab" :style="'underline'">
 			<option value="replies">
 				<!-- <i :class="icon('ph-arrow-u-up-left')"></i> -->
 				{{
@@ -80,17 +80,22 @@
 			</option>
 		</MkTab>
 
-		<MkNoteSub
-			v-for="note in directReplies"
-			v-if="directReplies && tab === 'replies'"
-			:key="note.id"
-			:note="note"
-			class="reply"
-			:conversation="replies"
-			:detailed-view="true"
-			:parent-id="note.id"
-		/>
-		<MkLoading v-else-if="tab === 'replies' && note.repliesCount > 0" />
+		<MkPagination
+			ref="repliesPagingComponent"
+			v-if="tab === 'replies' && note.repliesCount > 0"
+			v-slot="{ items }"
+			:pagination="repliesPagination"
+		>
+			<MkNoteSub
+				v-for="note in items"
+				:key="note.id"
+				:note="note"
+				class="reply"
+				:auto-conversation="true"
+				:detailed-view="true"
+				:parent-id="note.id"
+			/>
+		</MkPagination>
 
 		<MkPagination
 			v-if="tab === 'quotes'"
@@ -102,7 +107,7 @@
 				:key="note.id"
 				:note="note"
 				class="reply"
-				:conversation="items"
+				:auto-conversation="true"
 				:detailed-view="true"
 				:parent-id="note.id"
 			/>
@@ -167,8 +172,8 @@
 </template>
 
 <script lang="ts" setup>
-import { onMounted, onUnmounted, onUpdated, ref } from "vue";
-import type { StreamTypes, entities } from "firefish-js";
+import { onMounted, onUpdated, ref } from "vue";
+import type { entities } from "firefish-js";
 import MkTab from "@/components/MkTab.vue";
 import MkNote from "@/components/MkNote.vue";
 import MkNoteSub from "@/components/MkNoteSub.vue";
@@ -186,8 +191,9 @@ import { i18n } from "@/i18n";
 import { getNoteMenu } from "@/scripts/get-note-menu";
 import { useNoteCapture } from "@/scripts/use-note-capture";
 import { deepClone } from "@/scripts/clone";
-import { useStream } from "@/stream";
-import MkPagination, { Paging } from "@/components/MkPagination.vue";
+import MkPagination, {
+	type MkPaginationType,
+} from "@/components/MkPagination.vue";
 // import icon from "@/scripts/icon";
 
 const props = defineProps<{
@@ -195,8 +201,6 @@ const props = defineProps<{
 	pinned?: boolean;
 }>();
 
-const stream = useStream();
-
 const tab = ref("replies");
 
 const note = ref(deepClone(props.note));
@@ -227,6 +231,10 @@ if (noteViewInterruptors.length > 0) {
 	});
 }
 
+const repliesPagingComponent = ref<MkPaginationType<"notes/replies"> | null>(
+	null,
+);
+
 const el = ref<HTMLElement | null>(null);
 const noteEl = ref();
 const menuButton = ref<HTMLElement>();
@@ -245,9 +253,6 @@ const muted = ref(
 const translation = ref(null);
 const translating = ref(false);
 const conversation = ref<null | entities.Note[]>([]);
-const replies = ref<entities.Note[]>([]);
-const directReplies = ref<null | entities.Note[]>([]);
-const directQuotes = ref<null | entities.Note[]>([]);
 const clips = ref();
 const isRenote = ref(note.value.renoteId != null);
 let isScrolling: boolean;
@@ -270,6 +275,10 @@ useNoteCapture({
 	rootEl: el,
 	note,
 	isDeletedRef: isDeleted,
+	onReplied: (replyNote) => {
+		note.value.repliesCount += 1;
+		repliesPagingComponent.value?.append(replyNote);
+	},
 });
 
 function reply(_viaKeyboard = false): void {
@@ -358,32 +367,6 @@ function blur() {
 	noteEl.value.blur();
 }
 
-directReplies.value = null;
-os.api("notes/children", {
-	noteId: note.value.id,
-	limit: 30,
-	depth: 12,
-}).then((res) => {
-	// biome-ignore lint/style/noParameterAssign: assign it intentially
-	res = res
-		.filter((n) => n.userId !== note.value.userId)
-		.reverse()
-		.concat(res.filter((n) => n.userId === note.value.userId));
-	// res = res.reduce((acc: entities.Note[], resNote) => {
-	// 	if (resNote.userId === note.value.userId) {
-	// 		return [...acc, resNote];
-	// 	}
-	// 	return [resNote, ...acc];
-	// }, []);
-	replies.value = res;
-	directReplies.value = res
-		.filter((resNote) => resNote.replyId === note.value.id)
-		.reverse();
-	directQuotes.value = res.filter(
-		(resNote) => resNote.renoteId === note.value.id,
-	);
-});
-
 conversation.value = null;
 if (note.value.replyId) {
 	os.api("notes/conversation", {
@@ -402,6 +385,15 @@ os.api("notes/clips", {
 	clips.value = res;
 });
 
+const repliesPagination = {
+	endpoint: "notes/replies" as const,
+	limit: 10,
+	params: {
+		noteId: note.value.id,
+	},
+	ascending: true,
+};
+
 const renotePagination = {
 	endpoint: "notes/renotes" as const,
 	limit: 30,
@@ -419,68 +411,11 @@ const quotePagination = {
 	},
 };
 
-function loadTab() {
-	// if (tab.value === "renotes" && !renotes.value) {
-	// 	os.api("notes/renotes", {
-	// 		noteId: note.value.id,
-	// 		limit: 100,
-	// 	}).then((res) => {
-	// 		renotes.value = res;
-	// 	});
-	// }
-}
-
-async function onNoteUpdated(
-	noteData: StreamTypes.NoteUpdatedEvent,
-): Promise<void> {
-	const { type, id, body } = noteData;
-
-	let found = -1;
-	if (id === note.value.id) {
-		found = 0;
-	} else {
-		for (let i = 0; i < replies.value.length; i++) {
-			const reply = replies.value[i];
-			if (reply.id === id) {
-				found = i + 1;
-				break;
-			}
-		}
-	}
-
-	if (found === -1) {
-		return;
-	}
-
-	switch (type) {
-		case "replied": {
-			const { id: createdId } = body;
-			const replyNote = await os.api("notes/show", {
-				noteId: createdId,
-			});
-
-			replies.value.splice(found, 0, replyNote);
-			if (found === 0) {
-				directReplies.value!.push(replyNote);
-			}
-			break;
-		}
-		case "deleted":
-			if (found === 0) {
-				isDeleted.value = true;
-			} else {
-				replies.value.splice(found - 1, 1);
-			}
-			break;
-	}
-}
-
 document.addEventListener("wheel", () => {
 	isScrolling = true;
 });
 
 onMounted(() => {
-	stream.on("noteUpdated", onNoteUpdated);
 	isScrolling = false;
 	noteEl.value.scrollIntoView();
 });
@@ -493,10 +428,6 @@ onUpdated(() => {
 		}
 	}
 });
-
-onUnmounted(() => {
-	stream.off("noteUpdated", onNoteUpdated);
-});
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index c7cf06d2e5..a71580c0be 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -22,7 +22,7 @@
 			<div class="avatar-container">
 				<MkAvatar class="avatar" :user="appearNote.user" />
 				<div
-					v-if="!conversation || replies.length > 0"
+					v-if="conversation == null || replies.length > 0"
 					class="line"
 				></div>
 			</div>
@@ -148,20 +148,31 @@
 				</footer>
 			</div>
 		</div>
-		<template v-if="conversation">
-			<MkNoteSub
-				v-for="reply in replies"
-				v-if="replyLevel < 11 && depth < 5"
-				:key="reply.id"
-				:note="reply"
-				class="reply"
-				:class="{ single: replies.length == 1 }"
-				:conversation="conversation"
-				:depth="replies.length == 1 ? depth : depth + 1"
-				:reply-level="replyLevel + 1"
-				:parent-id="appearNote.id"
-				:detailed-view="detailedView"
-			/>
+		<MkLoading v-if="conversationLoading" />
+		<template v-else-if="conversation">
+			<template
+				v-if="replyLevel < REPLY_LEVEL_UPPERBOUND && depth < DEPTH_UPPERBOUND"
+			>
+				<MkNoteSub
+					v-for="reply in replies.slice(0, REPLIES_LIMIT)"
+					:key="reply.id"
+					:note="reply"
+					class="reply"
+					:class="{ single: replies.length == 1 }"
+					:conversation="conversation"
+					:depth="replies.length == 1 ? depth : depth + 1"
+					:reply-level="replyLevel + 1"
+					:parent-id="appearNote.id"
+					:detailed-view="detailedView"
+				/>
+				<div v-if="hasMoreReplies" class="more">
+					<div class="line"></div>
+					<MkA class="text _link" :to="notePage(note)"
+						>{{ i18n.ts.continueThread }}
+						<i :class="icon('ph-caret-double-right')"></i
+					></MkA>
+				</div>
+			</template>
 			<div v-else-if="replies.length > 0" class="more">
 				<div class="line"></div>
 				<MkA class="text _link" :to="notePage(note)"
@@ -190,7 +201,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, ref } from "vue";
+import { computed, inject, ref, watch } from "vue";
 import type { Ref } from "vue";
 import type { entities } from "firefish-js";
 import XNoteHeader from "@/components/MkNoteHeader.vue";
@@ -221,13 +232,17 @@ import type { NoteTranslation } from "@/types/note";
 
 const router = useRouter();
 
+const REPLIES_LIMIT = 10;
+const REPLY_LEVEL_UPPERBOUND = 11;
+const DEPTH_UPPERBOUND = 5;
+
 const props = withDefaults(
 	defineProps<{
 		note: entities.Note;
 		conversation?: entities.Note[];
-		parentId?;
-		detailedView?;
-
+		autoConversation?: boolean;
+		parentId?: string;
+		detailedView?: boolean;
 		// how many notes are in between this one and the note being viewed in detail
 		depth?: number;
 		// the actual reply level of this note within the conversation thread
@@ -251,6 +266,44 @@ const softMuteReasonI18nSrc = (what?: string) => {
 	return i18n.ts.userSaysSomething;
 };
 
+const conversation = ref(props.conversation);
+const conversationLoading = ref(false);
+const replies = ref<entities.Note[]>([]);
+const hasMoreReplies = ref(false);
+
+function updateReplies() {
+	replies.value = (conversation.value ?? [])
+		.filter(
+			(item) =>
+				item.replyId === props.note.id || item.renoteId === props.note.id,
+		)
+		.reverse();
+	hasMoreReplies.value = replies.value.length >= REPLIES_LIMIT + 1;
+}
+
+watch(conversation, updateReplies, {
+	immediate: true,
+});
+
+if (props.autoConversation) {
+	if (note.value.repliesCount > 0 || note.value.renoteCount > 0) {
+		conversationLoading.value = true;
+		os.api("notes/children", {
+			noteId: note.value.id,
+			limit: REPLIES_LIMIT + 1,
+			depth: REPLY_LEVEL_UPPERBOUND + 1,
+		}).then((res) => {
+			conversation.value = res
+				.filter((n) => n.userId !== note.value.userId)
+				.reverse()
+				.concat(res.filter((n) => n.userId === note.value.userId));
+			conversationLoading.value = false;
+		});
+	} else {
+		conversation.value = [];
+	}
+}
+
 const isRenote =
 	note.value.renote != null &&
 	note.value.text == null &&
@@ -277,13 +330,6 @@ const muted = ref(
 );
 const translation = ref<NoteTranslation | null>(null);
 const translating = ref(false);
-const replies: entities.Note[] =
-	props.conversation
-		?.filter(
-			(item) =>
-				item.replyId === props.note.id || item.renoteId === props.note.id,
-		)
-		.reverse() ?? [];
 const enableEmojiReactions = defaultStore.state.enableEmojiReactions;
 const expandOnNoteClick = defaultStore.state.expandOnNoteClick;
 const lang = localStorage.getItem("lang");
@@ -329,6 +375,11 @@ useNoteCapture({
 	rootEl: el,
 	note: appearNote,
 	isDeletedRef: isDeleted,
+	onReplied: (note) => {
+		if (hasMoreReplies.value === false) {
+			conversation.value = (conversation.value ?? []).concat([note]);
+		}
+	},
 });
 
 function reply(_viaKeyboard = false): void {
diff --git a/packages/client/src/components/MkPagination.vue b/packages/client/src/components/MkPagination.vue
index 03a1f0e35f..2f092cb8ad 100644
--- a/packages/client/src/components/MkPagination.vue
+++ b/packages/client/src/components/MkPagination.vue
@@ -68,7 +68,15 @@
 
 <script lang="ts" setup generic="E extends PagingKey">
 import type { ComponentPublicInstance, ComputedRef } from "vue";
-import { computed, isRef, onActivated, onDeactivated, ref, watch } from "vue";
+import {
+	computed,
+	isRef,
+	onActivated,
+	onDeactivated,
+	ref,
+	unref,
+	watch,
+} from "vue";
 import type { Endpoints, TypeUtils } from "firefish-js";
 import * as os from "@/os";
 import {
@@ -122,6 +130,12 @@ export interface Paging<E extends PagingKey = PagingKey> {
 	 */
 	reversed?: boolean;
 
+	/**
+	 * For not-reversed, not-offsetMode,
+	 * Sort by id in ascending order
+	 */
+	ascending?: boolean;
+
 	offsetMode?: boolean;
 }
 
@@ -169,17 +183,19 @@ const init = async (): Promise<void> => {
 	queue.value = [];
 	fetching.value = true;
 
-	const params = props.pagination.params
-		? isRef<Param>(props.pagination.params)
-			? props.pagination.params.value
-			: props.pagination.params
-		: {};
+	const params = props.pagination.params ? unref(props.pagination.params) : {};
 	await os
 		.api(props.pagination.endpoint, {
 			...params,
 			limit: props.pagination.noPaging
 				? props.pagination.limit || 10
 				: (props.pagination.limit || 10) + 1,
+			...(props.pagination.ascending
+				? {
+						// An initial value smaller than all possible ids must be filled in here.
+						sinceId: "0",
+					}
+				: {}),
 		})
 		.then(
 			(res: Item[]) => {
@@ -196,10 +212,10 @@ const init = async (): Promise<void> => {
 					res.length > (props.pagination.limit || 10)
 				) {
 					res.pop();
-					items.value = props.pagination.reversed ? [...res].reverse() : res;
+					items.value = props.pagination.reversed ? res.toReversed() : res;
 					more.value = true;
 				} else {
-					items.value = props.pagination.reversed ? [...res].reverse() : res;
+					items.value = props.pagination.reversed ? res.toReversed() : res;
 					more.value = false;
 				}
 				offset.value = res.length;
@@ -219,11 +235,7 @@ const reload = (): Promise<void> => {
 };
 
 const refresh = async (): Promise<void> => {
-	const params = props.pagination.params
-		? isRef<Param>(props.pagination.params)
-			? props.pagination.params.value
-			: props.pagination.params
-		: {};
+	const params = props.pagination.params ? unref(props.pagination.params) : {};
 	await os
 		.api(props.pagination.endpoint, {
 			...params,
@@ -269,11 +281,7 @@ const fetchMore = async (): Promise<void> => {
 		return;
 	moreFetching.value = true;
 	backed.value = true;
-	const params = props.pagination.params
-		? isRef<Param>(props.pagination.params)
-			? props.pagination.params.value
-			: props.pagination.params
-		: {};
+	const params = props.pagination.params ? unref(props.pagination.params) : {};
 	await os
 		.api(props.pagination.endpoint, {
 			...params,
@@ -286,9 +294,13 @@ const fetchMore = async (): Promise<void> => {
 					? {
 							sinceId: items.value[0].id,
 						}
-					: {
-							untilId: items.value[items.value.length - 1].id,
-						}),
+					: props.pagination.ascending
+						? {
+								sinceId: items.value[items.value.length - 1].id,
+							}
+						: {
+								untilId: items.value[items.value.length - 1].id,
+							}),
 		})
 		.then(
 			(res: Item[]) => {
@@ -303,12 +315,12 @@ const fetchMore = async (): Promise<void> => {
 				if (res.length > SECOND_FETCH_LIMIT) {
 					res.pop();
 					items.value = props.pagination.reversed
-						? [...res].reverse().concat(items.value)
+						? res.toReversed().concat(items.value)
 						: items.value.concat(res);
 					more.value = true;
 				} else {
 					items.value = props.pagination.reversed
-						? [...res].reverse().concat(items.value)
+						? res.toReversed().concat(items.value)
 						: items.value.concat(res);
 					more.value = false;
 				}
@@ -330,11 +342,7 @@ const fetchMoreAhead = async (): Promise<void> => {
 	)
 		return;
 	moreFetching.value = true;
-	const params = props.pagination.params
-		? isRef<Param>(props.pagination.params)
-			? props.pagination.params.value
-			: props.pagination.params
-		: {};
+	const params = props.pagination.params ? unref(props.pagination.params) : {};
 	await os
 		.api(props.pagination.endpoint, {
 			...params,
@@ -356,12 +364,12 @@ const fetchMoreAhead = async (): Promise<void> => {
 				if (res.length > SECOND_FETCH_LIMIT) {
 					res.pop();
 					items.value = props.pagination.reversed
-						? [...res].reverse().concat(items.value)
+						? res.toReversed().concat(items.value)
 						: items.value.concat(res);
 					more.value = true;
 				} else {
 					items.value = props.pagination.reversed
-						? [...res].reverse().concat(items.value)
+						? res.toReversed().concat(items.value)
 						: items.value.concat(res);
 					more.value = false;
 				}
diff --git a/packages/client/src/scripts/use-note-capture.ts b/packages/client/src/scripts/use-note-capture.ts
index 1bc32d5246..2d0a203fa7 100644
--- a/packages/client/src/scripts/use-note-capture.ts
+++ b/packages/client/src/scripts/use-note-capture.ts
@@ -9,6 +9,7 @@ export function useNoteCapture(props: {
 	rootEl: Ref<HTMLElement | null>;
 	note: Ref<entities.Note>;
 	isDeletedRef: Ref<boolean>;
+	onReplied?: (note: entities.Note) => void;
 }) {
 	const note = props.note;
 	const connection = isSignedIn ? useStream() : null;
@@ -19,6 +20,16 @@ export function useNoteCapture(props: {
 		if (id !== note.value.id) return;
 
 		switch (type) {
+			case "replied": {
+				if (props.onReplied) {
+					const { id: createdId } = body;
+					const replyNote = await os.api("notes/show", {
+						noteId: createdId,
+					});
+					props.onReplied(replyNote);
+				}
+				break;
+			}
 			case "reacted": {
 				const reaction = body.reaction;
 
@@ -34,7 +45,7 @@ export function useNoteCapture(props: {
 
 				note.value.reactions[reaction] = currentCount + 1;
 
-				if (isSignedIn && body.userId === me.id) {
+				if (isSignedIn && body.userId === me!.id) {
 					note.value.myReaction = reaction;
 				}
 				break;
@@ -48,7 +59,7 @@ export function useNoteCapture(props: {
 
 				note.value.reactions[reaction] = Math.max(0, currentCount - 1);
 
-				if (isSignedIn && body.userId === me.id) {
+				if (isSignedIn && body.userId === me!.id) {
 					note.value.myReaction = undefined;
 				}
 				break;
@@ -62,7 +73,7 @@ export function useNoteCapture(props: {
 					choices[choice] = {
 						...choices[choice],
 						votes: choices[choice].votes + 1,
-						...(isSignedIn && body.userId === me.id
+						...(isSignedIn && body.userId === me!.id
 							? {
 									isVoted: true,
 								}

From e5e2eedfb4e936a339d550c2110df56e37f51184 Mon Sep 17 00:00:00 2001
From: Lhcfl <Lhcfl@outlook.com>
Date: Sat, 20 Apr 2024 22:04:25 +0800
Subject: [PATCH 34/99] fix: Some SubNote incorrectly added replies

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

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 30f1af0829..55a13956f6 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -94,6 +94,7 @@
 				:auto-conversation="true"
 				:detailed-view="true"
 				:parent-id="note.id"
+				:auto-add-replies="true"
 			/>
 		</MkPagination>
 
@@ -110,6 +111,7 @@
 				:auto-conversation="true"
 				:detailed-view="true"
 				:parent-id="note.id"
+				:auto-add-replies="true"
 			/>
 		</MkPagination>
 
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index a71580c0be..f83c676cc1 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -164,6 +164,7 @@
 					:reply-level="replyLevel + 1"
 					:parent-id="appearNote.id"
 					:detailed-view="detailedView"
+					:auto-add-replies="true"
 				/>
 				<div v-if="hasMoreReplies" class="more">
 					<div class="line"></div>
@@ -247,10 +248,12 @@ const props = withDefaults(
 		depth?: number;
 		// the actual reply level of this note within the conversation thread
 		replyLevel?: number;
+		autoAddReplies?: boolean;
 	}>(),
 	{
 		depth: 1,
 		replyLevel: 1,
+		autoAddReplies: false,
 	},
 );
 
@@ -376,6 +379,9 @@ useNoteCapture({
 	note: appearNote,
 	isDeletedRef: isDeleted,
 	onReplied: (note) => {
+		if (props.autoAddReplies !== true) {
+			return;
+		}
 		if (hasMoreReplies.value === false) {
 			conversation.value = (conversation.value ?? []).concat([note]);
 		}
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index 7d350085bb..a0664c28e9 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -1,7 +1,7 @@
 <template>
 	<p v-if="note.cw != null" class="cw">
 		<MkA
-			v-if="conversation && note.renoteId == parentId"
+			v-if="conversation && note.renoteId == parentId && parentId != null"
 			:to="
 				detailedView ? `#${parentId}` : `${notePage(note)}#${parentId}`
 			"
@@ -198,8 +198,8 @@ import icon from "@/scripts/icon";
 
 const props = defineProps<{
 	note: entities.Note;
-	parentId?;
-	conversation?;
+	parentId?: string;
+	conversation?: entities.Note[];
 	detailed?: boolean;
 	detailedView?: boolean;
 }>();

From 4e20fe589d5fc7cfc6f0bc400acdba8d3bfd05cc Mon Sep 17 00:00:00 2001
From: Lhcfl <Lhcfl@outlook.com>
Date: Sat, 20 Apr 2024 22:29:55 +0800
Subject: [PATCH 35/99] fix: style may be missing in mobile mode

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

diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index f83c676cc1..326bb3d502 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -1,6 +1,7 @@
 <template>
+	<MkLoading v-if="conversationLoading" />
 	<article
-		v-if="!muted.muted || muted.what === 'reply'"
+		v-else-if="!muted.muted || muted.what === 'reply'"
 		:id="detailedView ? appearNote.id : undefined"
 		ref="el"
 		v-size="{ max: [450, 500] }"
@@ -289,6 +290,7 @@ watch(conversation, updateReplies, {
 });
 
 if (props.autoConversation) {
+	conversation.value = [];
 	if (note.value.repliesCount > 0 || note.value.renoteCount > 0) {
 		conversationLoading.value = true;
 		os.api("notes/children", {
@@ -302,8 +304,6 @@ if (props.autoConversation) {
 				.concat(res.filter((n) => n.userId === note.value.userId));
 			conversationLoading.value = false;
 		});
-	} else {
-		conversation.value = [];
 	}
 }
 

From 6349705fb24d01e35bb8f53e53d2ec9ec9cfe629 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sat, 20 Apr 2024 23:55:40 +0900
Subject: [PATCH 36/99] test (backend-rs): add db connection tests

---
 .../backend-rs/src/database/postgresql.rs     |  3 ++-
 packages/backend-rs/src/database/redis.rs     | 21 ++++++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/packages/backend-rs/src/database/postgresql.rs b/packages/backend-rs/src/database/postgresql.rs
index a60d20af9c..c365da84dc 100644
--- a/packages/backend-rs/src/database/postgresql.rs
+++ b/packages/backend-rs/src/database/postgresql.rs
@@ -28,7 +28,8 @@ mod unit_test {
     use super::db_conn;
 
     #[tokio::test]
-    async fn connect_test() {
+    async fn connect() {
+        assert!(db_conn().await.is_ok());
         assert!(db_conn().await.is_ok());
     }
 }
diff --git a/packages/backend-rs/src/database/redis.rs b/packages/backend-rs/src/database/redis.rs
index e717201f95..d722e2c00a 100644
--- a/packages/backend-rs/src/database/redis.rs
+++ b/packages/backend-rs/src/database/redis.rs
@@ -44,10 +44,25 @@ pub fn key(key: impl ToString) -> String {
 
 #[cfg(test)]
 mod unit_test {
-    use super::init_redis;
+    use super::redis_conn;
+    use pretty_assertions::assert_eq;
+    use redis::Commands;
 
     #[test]
-    fn connect_test() {
-        assert!(init_redis().is_ok());
+    fn connect() {
+        assert!(redis_conn().is_ok());
+        assert!(redis_conn().is_ok());
+    }
+
+    #[test]
+    fn access() {
+        let mut redis = redis_conn().unwrap();
+
+        let key = "CARGO_UNIT_TEST_KEY";
+        let value = "CARGO_UNIT_TEST_VALUE";
+
+        assert_eq!(redis.set::<&str, &str, String>(key, value).unwrap(), "OK");
+        assert_eq!(redis.get::<&str, String>(key).unwrap(), value);
+        assert_eq!(redis.del::<&str, u32>(key).unwrap(), 1);
     }
 }

From 3b65ebcb3e26d58db78f86c92fac9c06f199f18f Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 21 Apr 2024 05:47:11 +0900
Subject: [PATCH 37/99] refactor (backend): it turns out that sending the
 entire note object was redundant

---
 packages/backend-rs/index.d.ts                |  2 +-
 .../src/service/add_note_to_antenna.rs        | 13 ++--
 packages/backend/package.json                 |  1 -
 .../backend/src/prelude/undefined-to-null.ts  | 76 -------------------
 packages/backend/src/services/note/create.ts  |  4 +-
 pnpm-lock.yaml                                |  8 --
 6 files changed, 10 insertions(+), 94 deletions(-)
 delete mode 100644 packages/backend/src/prelude/undefined-to-null.ts

diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index f13cb0bc45..3b8a4c929b 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -1098,7 +1098,7 @@ export interface Webhook {
   latestSentAt: Date | null
   latestStatus: number | null
 }
-export function addNoteToAntenna(antennaId: string, note: Note): void
+export function addNoteToAntenna(antennaId: string, noteId: string): void
 /** Initializes Cuid2 generator. Must be called before any [create_id]. */
 export function initIdGenerator(length: number, fingerprint: string): void
 export function getTimestamp(id: string): number
diff --git a/packages/backend-rs/src/service/add_note_to_antenna.rs b/packages/backend-rs/src/service/add_note_to_antenna.rs
index 6a06fb6993..ea6e5fe76e 100644
--- a/packages/backend-rs/src/service/add_note_to_antenna.rs
+++ b/packages/backend-rs/src/service/add_note_to_antenna.rs
@@ -1,20 +1,23 @@
 use crate::database::{redis_conn, redis_key};
-use crate::model::entity::note;
 use crate::service::stream::{publish, Error, Stream};
 use crate::util::id::get_timestamp;
 use redis::{streams::StreamMaxlen, Commands};
 
 #[crate::export]
-pub fn add_note_to_antenna(antenna_id: &str, note: &note::Model) -> Result<(), Error> {
+pub fn add_note_to_antenna(antenna_id: &str, note_id: &str) -> Result<(), Error> {
     redis_conn()?.xadd_maxlen(
         redis_key(format!("antennaTimeline:{}", antenna_id)),
         StreamMaxlen::Approx(200),
-        format!("{}-*", get_timestamp(&note.id)),
-        &[("note", &note.id)],
+        format!("{}-*", get_timestamp(&note_id)),
+        &[("note", &note_id)],
     )?;
 
     let stream = Stream::Antenna {
         id: antenna_id.to_string(),
     };
-    publish(&stream, Some("note"), Some(serde_json::to_string(note)?))
+    publish(
+        &stream,
+        Some("note"),
+        Some(format!("{{ \"id\": \"{}\" }}", note_id)),
+    )
 }
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 0599a39d4b..9289c2f7ea 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -178,7 +178,6 @@
 		"ts-loader": "9.5.1",
 		"ts-node": "10.9.2",
 		"tsconfig-paths": "4.2.0",
-		"type-fest": "4.15.0",
 		"typescript": "5.4.5",
 		"webpack": "^5.91.0",
 		"ws": "8.16.0"
diff --git a/packages/backend/src/prelude/undefined-to-null.ts b/packages/backend/src/prelude/undefined-to-null.ts
deleted file mode 100644
index 013be3cf9e..0000000000
--- a/packages/backend/src/prelude/undefined-to-null.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-// https://gist.github.com/tkrotoff/a6baf96eb6b61b445a9142e5555511a0
-import type { Primitive } from "type-fest";
-
-type NullToUndefined<T> = T extends null
-	? undefined
-	: T extends Primitive | Function | Date | RegExp
-		? T
-		: T extends Array<infer U>
-			? Array<NullToUndefined<U>>
-			: T extends Map<infer K, infer V>
-				? Map<K, NullToUndefined<V>>
-				: T extends Set<infer U>
-					? Set<NullToUndefined<U>>
-					: T extends object
-						? { [K in keyof T]: NullToUndefined<T[K]> }
-						: unknown;
-
-type UndefinedToNull<T> = T extends undefined
-	? null
-	: T extends Primitive | Function | Date | RegExp
-		? T
-		: T extends Array<infer U>
-			? Array<UndefinedToNull<U>>
-			: T extends Map<infer K, infer V>
-				? Map<K, UndefinedToNull<V>>
-				: T extends Set<infer U>
-					? Set<NullToUndefined<U>>
-					: T extends object
-						? { [K in keyof T]: UndefinedToNull<T[K]> }
-						: unknown;
-
-function _nullToUndefined<T>(obj: T): NullToUndefined<T> {
-	if (obj === null) {
-		return undefined as any;
-	}
-
-	if (typeof obj === "object") {
-		if (obj instanceof Map) {
-			obj.forEach((value, key) => obj.set(key, _nullToUndefined(value)));
-		} else {
-			for (const key in obj) {
-				obj[key] = _nullToUndefined(obj[key]) as any;
-			}
-		}
-	}
-
-	return obj as any;
-}
-
-function _undefinedToNull<T>(obj: T): UndefinedToNull<T> {
-	if (obj === undefined) {
-		return null as any;
-	}
-
-	if (typeof obj === "object") {
-		if (obj instanceof Map) {
-			obj.forEach((value, key) => obj.set(key, _undefinedToNull(value)));
-		} else {
-			for (const key in obj) {
-				obj[key] = _undefinedToNull(obj[key]) as any;
-			}
-		}
-	}
-
-	return obj as any;
-}
-
-/**
- * Recursively converts all undefined values to null.
- *
- * @param obj object to convert
- * @returns a copy of the object with all its undefined values converted to null
- */
-export function undefinedToNull<T>(obj: T) {
-	return _undefinedToNull(structuredClone(obj));
-}
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 206f6a50ad..8fa2b4e23b 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -62,7 +62,6 @@ import { Mutex } from "redis-semaphore";
 import { langmap } from "@/misc/langmap.js";
 import Logger from "@/services/logger.js";
 import { inspect } from "node:util";
-import { undefinedToNull } from "@/prelude/undefined-to-null.js";
 
 const logger = new Logger("create-note");
 
@@ -399,8 +398,7 @@ export default async (
 		for (const antenna of await getAntennas()) {
 			checkHitAntenna(antenna, note, user).then((hit) => {
 				if (hit) {
-					// TODO: do this more sanely
-					addNoteToAntenna(antenna.id, undefinedToNull(note) as Note);
+					addNoteToAntenna(antenna.id, note.id);
 				}
 			});
 		}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 16a4ad6ad4..b591ffe9c1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -521,9 +521,6 @@ importers:
       tsconfig-paths:
         specifier: 4.2.0
         version: 4.2.0
-      type-fest:
-        specifier: 4.15.0
-        version: 4.15.0
       typescript:
         specifier: 5.4.5
         version: 5.4.5
@@ -16635,11 +16632,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /type-fest@4.15.0:
-    resolution: {integrity: sha512-tB9lu0pQpX5KJq54g+oHOLumOx+pMep4RaM6liXh2PKmVRFF+/vAtUP0ZaJ0kOySfVNjF6doBWPHhBhISKdlIA==}
-    engines: {node: '>=16'}
-    dev: true
-
   /type-is@1.6.18:
     resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
     engines: {node: '>= 0.6'}

From 9f3396af21bf459394287cdf16656a72065a8b5b Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 21 Apr 2024 10:30:13 +0900
Subject: [PATCH 38/99] chore (backend): translate Japanese comments into
 English

---
 packages/backend/src/services/logger.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/services/logger.ts b/packages/backend/src/services/logger.ts
index e53279e31c..3fcf28671e 100644
--- a/packages/backend/src/services/logger.ts
+++ b/packages/backend/src/services/logger.ts
@@ -144,12 +144,12 @@ export default class Logger {
 		}
 	}
 
+	// Used when the process can't continue (fatal error)
 	public error(
 		x: string | Error,
 		data?: Record<string, any> | null,
 		important = false,
 	): void {
-		// 実行を継続できない状況で使う
 		if (x instanceof Error) {
 			data = data || {};
 			data.e = x;
@@ -166,30 +166,30 @@ export default class Logger {
 		}
 	}
 
+	// Used when the process can continue but some action should be taken
 	public warn(
 		message: string,
 		data?: Record<string, any> | null,
 		important = false,
 	): void {
-		// 実行を継続できるが改善すべき状況で使う
 		this.log("warning", message, data, important);
 	}
 
+	// Used when something is successful
 	public succ(
 		message: string,
 		data?: Record<string, any> | null,
 		important = false,
 	): void {
-		// 何かに成功した状況で使う
 		this.log("success", message, data, important);
 	}
 
+	// Used for debugging (information necessary for developers but unnecessary for users)
 	public debug(
 		message: string,
 		data?: Record<string, any> | null,
 		important = false,
 	): void {
-		// Used for debugging (information necessary for developers but unnecessary for users)
 		// Fixed if statement is ignored when logLevel includes debug
 		if (
 			config.logLevel?.includes("debug") ||
@@ -200,12 +200,12 @@ export default class Logger {
 		}
 	}
 
+	// Other generic logs
 	public info(
 		message: string,
 		data?: Record<string, any> | null,
 		important = false,
 	): void {
-		// それ以外
 		this.log("info", message, data, important);
 	}
 }

From 28f7ac1acd835ea2059289b060ec6b74b7609929 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 21 Apr 2024 10:31:00 +0900
Subject: [PATCH 39/99] fix (backend): typo

---
 packages/backend/src/services/logger.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/services/logger.ts b/packages/backend/src/services/logger.ts
index 3fcf28671e..f4b4454ef8 100644
--- a/packages/backend/src/services/logger.ts
+++ b/packages/backend/src/services/logger.ts
@@ -28,9 +28,9 @@ export default class Logger {
 
 		if (config.syslog) {
 			this.syslogClient = new SyslogPro.RFC5424({
-				applacationName: "Firefish",
+				applicationName: "Firefish",
 				timestamp: true,
-				encludeStructuredData: true,
+				includeStructuredData: true,
 				color: true,
 				extendedColor: true,
 				server: {

From 43570a54aa3e146698487d5ee39686f428b91397 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 21 Apr 2024 10:44:54 +0900
Subject: [PATCH 40/99] chore: format

---
 packages/backend/src/services/drive/upload-from-url.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/services/drive/upload-from-url.ts b/packages/backend/src/services/drive/upload-from-url.ts
index a96e8e3262..e7b084bda1 100644
--- a/packages/backend/src/services/drive/upload-from-url.ts
+++ b/packages/backend/src/services/drive/upload-from-url.ts
@@ -3,7 +3,10 @@ import type { User } from "@/models/entities/user.js";
 import { createTemp } from "@/misc/create-temp.js";
 import { downloadUrl, isPrivateIp } from "@/misc/download-url.js";
 import type { DriveFolder } from "@/models/entities/drive-folder.js";
-import type { DriveFile, DriveFileUsageHint } from "@/models/entities/drive-file.js";
+import type {
+	DriveFile,
+	DriveFileUsageHint,
+} from "@/models/entities/drive-file.js";
 import { DriveFiles } from "@/models/index.js";
 import { driveLogger } from "./logger.js";
 import { addFile } from "./add-file.js";

From c936102a4c95b4b6e12b3caf46ef9bcdde4f4e2c Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 21 Apr 2024 10:45:47 +0900
Subject: [PATCH 41/99] chore (backend-rs): regenerate entities and
 index.js/d.ts

---
 packages/backend-rs/index.d.ts                     |  5 +++++
 packages/backend-rs/index.js                       |  3 ++-
 packages/backend-rs/src/model/entity/drive_file.rs |  3 ++-
 .../src/model/entity/sea_orm_active_enums.rs       | 14 ++++++++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index 1cf961bd30..5a7bf218c5 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -348,6 +348,7 @@ export interface DriveFile {
   webpublicType: string | null
   requestHeaders: Json | null
   requestIp: string | null
+  usageHint: DriveFileUsageHintEnum | null
 }
 export interface DriveFolder {
   id: string
@@ -780,6 +781,10 @@ export enum AntennaSrcEnum {
   List = 'list',
   Users = 'users'
 }
+export enum DriveFileUsageHintEnum {
+  UserAvatar = 'userAvatar',
+  UserBanner = 'userBanner'
+}
 export enum MutedNoteReasonEnum {
   Manual = 'manual',
   Other = 'other',
diff --git a/packages/backend-rs/index.js b/packages/backend-rs/index.js
index 1ea7bb5bed..6d64f6ec75 100644
--- a/packages/backend-rs/index.js
+++ b/packages/backend-rs/index.js
@@ -310,7 +310,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { readEnvironmentConfig, readServerConfig, stringToAcct, acctToString, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, AntennaSrcEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, initIdGenerator, getTimestamp, genId, secureRndstr } = nativeBinding
+const { readEnvironmentConfig, readServerConfig, stringToAcct, acctToString, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, initIdGenerator, getTimestamp, genId, secureRndstr } = nativeBinding
 
 module.exports.readEnvironmentConfig = readEnvironmentConfig
 module.exports.readServerConfig = readServerConfig
@@ -339,6 +339,7 @@ module.exports.decodeReaction = decodeReaction
 module.exports.countReactions = countReactions
 module.exports.toDbReaction = toDbReaction
 module.exports.AntennaSrcEnum = AntennaSrcEnum
+module.exports.DriveFileUsageHintEnum = DriveFileUsageHintEnum
 module.exports.MutedNoteReasonEnum = MutedNoteReasonEnum
 module.exports.NoteVisibilityEnum = NoteVisibilityEnum
 module.exports.NotificationTypeEnum = NotificationTypeEnum
diff --git a/packages/backend-rs/src/model/entity/drive_file.rs b/packages/backend-rs/src/model/entity/drive_file.rs
index e5c3995573..a6926e7af2 100644
--- a/packages/backend-rs/src/model/entity/drive_file.rs
+++ b/packages/backend-rs/src/model/entity/drive_file.rs
@@ -1,5 +1,6 @@
 //! `SeaORM` Entity. Generated by sea-orm-codegen 0.12.15
 
+use super::sea_orm_active_enums::DriveFileUsageHintEnum;
 use sea_orm::entity::prelude::*;
 
 #[derive(Clone, Debug, PartialEq, DeriveEntityModel, Eq)]
@@ -53,7 +54,7 @@ pub struct Model {
     #[sea_orm(column_name = "requestIp")]
     pub request_ip: Option<String>,
     #[sea_orm(column_name = "usageHint")]
-    pub usage_hint: Option<String>,
+    pub usage_hint: Option<DriveFileUsageHintEnum>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
diff --git a/packages/backend-rs/src/model/entity/sea_orm_active_enums.rs b/packages/backend-rs/src/model/entity/sea_orm_active_enums.rs
index 38820e1bd8..36281f4dc5 100644
--- a/packages/backend-rs/src/model/entity/sea_orm_active_enums.rs
+++ b/packages/backend-rs/src/model/entity/sea_orm_active_enums.rs
@@ -23,6 +23,20 @@ pub enum AntennaSrcEnum {
 #[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
 #[cfg_attr(not(feature = "napi"), derive(Clone))]
 #[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
+#[sea_orm(
+    rs_type = "String",
+    db_type = "Enum",
+    enum_name = "drive_file_usage_hint_enum"
+)]
+pub enum DriveFileUsageHintEnum {
+    #[sea_orm(string_value = "userAvatar")]
+    UserAvatar,
+    #[sea_orm(string_value = "userBanner")]
+    UserBanner,
+}
+#[derive(Debug, PartialEq, Eq, EnumIter, DeriveActiveEnum)]
+#[cfg_attr(not(feature = "napi"), derive(Clone))]
+#[cfg_attr(feature = "napi", napi_derive::napi(string_enum = "camelCase"))]
 #[sea_orm(
     rs_type = "String",
     db_type = "Enum",

From 96481f1353dd665b0c05d776d5df54f6ce2a57a8 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 21 Apr 2024 10:48:31 +0900
Subject: [PATCH 42/99] chore: update downgrade.sql

---
 docs/downgrade.sql | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/downgrade.sql b/docs/downgrade.sql
index 77dea27573..44222f818f 100644
--- a/docs/downgrade.sql
+++ b/docs/downgrade.sql
@@ -1,6 +1,7 @@
 BEGIN;
 
 DELETE FROM "migrations" WHERE name IN (
+    'AddDriveFileUsage1713451569342',
     'ConvertCwVarcharToText1713225866247',
     'FixChatFileConstraint1712855579316',
     'DropTimeZone1712425488543',
@@ -23,7 +24,11 @@ DELETE FROM "migrations" WHERE name IN (
     'RemoveNativeUtilsMigration1705877093218'
 );
 
---convert-cw-varchar-to-text
+-- AddDriveFileUsage
+ALTER TABLE "drive_file" DROP COLUMN "usageHint";
+DROP TYPE "drive_file_usage_hint_enum";
+
+-- convert-cw-varchar-to-text
 DROP INDEX "IDX_8e3bbbeb3df04d1a8105da4c8f";
 ALTER TABLE "note" ALTER COLUMN "cw" TYPE character varying(512);
 CREATE INDEX "IDX_8e3bbbeb3df04d1a8105da4c8f" ON "note" USING "pgroonga" ("cw" pgroonga_varchar_full_text_search_ops_v2);

From d2dbfb37c72234e4b4a3b23867c48ec9034861b3 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 21 Apr 2024 10:59:02 +0900
Subject: [PATCH 43/99] chore (backend): reflect entity changes to the schema
 and repository

---
 packages/backend/src/models/repositories/drive-file.ts | 2 ++
 packages/backend/src/models/schema/drive-file.ts       | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/packages/backend/src/models/repositories/drive-file.ts b/packages/backend/src/models/repositories/drive-file.ts
index 2321f20d4c..18b139caff 100644
--- a/packages/backend/src/models/repositories/drive-file.ts
+++ b/packages/backend/src/models/repositories/drive-file.ts
@@ -152,6 +152,7 @@ export const DriveFileRepository = db.getRepository(DriveFile).extend({
 			md5: file.md5,
 			size: file.size,
 			isSensitive: file.isSensitive,
+			usageHint: file.usageHint,
 			blurhash: file.blurhash,
 			properties: opts.self ? file.properties : this.getPublicProperties(file),
 			url: opts.self ? file.url : this.getPublicUrl(file, false),
@@ -193,6 +194,7 @@ export const DriveFileRepository = db.getRepository(DriveFile).extend({
 			md5: file.md5,
 			size: file.size,
 			isSensitive: file.isSensitive,
+			usageHint: file.usageHint,
 			blurhash: file.blurhash,
 			properties: opts.self ? file.properties : this.getPublicProperties(file),
 			url: opts.self ? file.url : this.getPublicUrl(file, false),
diff --git a/packages/backend/src/models/schema/drive-file.ts b/packages/backend/src/models/schema/drive-file.ts
index 30db9e7d48..929dbb472e 100644
--- a/packages/backend/src/models/schema/drive-file.ts
+++ b/packages/backend/src/models/schema/drive-file.ts
@@ -44,6 +44,12 @@ export const packedDriveFileSchema = {
 			optional: false,
 			nullable: false,
 		},
+		usageHint: {
+			type: "string",
+			optional: false,
+			nullable: true,
+			enum: ["userAvatar", "userBanner"],
+		},
 		blurhash: {
 			type: "string",
 			optional: false,

From 6b008c651a899a47b202f1d25b6c5ed56577e962 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 21 Apr 2024 11:09:18 +0900
Subject: [PATCH 44/99] chore (backend): remove (technically) incorrect TypeORM
 decorator field

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

diff --git a/packages/backend/src/models/entities/drive-file.ts b/packages/backend/src/models/entities/drive-file.ts
index 2c6c1bf598..81f564115f 100644
--- a/packages/backend/src/models/entities/drive-file.ts
+++ b/packages/backend/src/models/entities/drive-file.ts
@@ -179,11 +179,11 @@ export class DriveFile {
 	})
 	public isSensitive: boolean;
 
+	// Hint for what this file is used for
 	@Column({
 		type: "enum",
 		enum: ["userAvatar", "userBanner"],
 		nullable: true,
-		comment: "Hint for what the file is used for.",
 	})
 	public usageHint: DriveFileUsageHint;
 

From cdc3b5181a709bbbfb492b0546d5f03cc26978ff Mon Sep 17 00:00:00 2001
From: Lhcfl <Lhcfl@outlook.com>
Date: Sun, 21 Apr 2024 11:24:41 +0800
Subject: [PATCH 45/99] Update api-change.md

---
 docs/api-change.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/api-change.md b/docs/api-change.md
index f3ed584c32..79c9b39e52 100644
--- a/docs/api-change.md
+++ b/docs/api-change.md
@@ -2,6 +2,15 @@
 
 Breaking changes are indicated by the :warning: icon.
 
+## Unreleased
+
+- New optional parameters are added to `notes/renotes` endpoint:
+	- `filter`: `"boost"` for boosts only, `"quote"` for quotes only, `null`(default) for both
+
+- Removed unused optional parameters for `notes/reactions` endpoint:
+	- `sinceId`
+	- `untilId`
+
 ## v20240413
 
 - :warning: Removed `patrons` endpoint.

From 09bcbb0ff02dc01d79021049bb915ae959f4f073 Mon Sep 17 00:00:00 2001
From: Lhcfl <Lhcfl@outlook.com>
Date: Sun, 21 Apr 2024 11:27:08 +0800
Subject: [PATCH 46/99] Update docs/api-change.md

---
 docs/api-change.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api-change.md b/docs/api-change.md
index 79c9b39e52..36b05d77f4 100644
--- a/docs/api-change.md
+++ b/docs/api-change.md
@@ -5,7 +5,7 @@ Breaking changes are indicated by the :warning: icon.
 ## Unreleased
 
 - New optional parameters are added to `notes/renotes` endpoint:
-	- `filter`: `"boost"` for boosts only, `"quote"` for quotes only, `null`(default) for both
+	- `filter`
 
 - Removed unused optional parameters for `notes/reactions` endpoint:
 	- `sinceId`

From ce672f4edd542d78a1b33429d379ec969ae163cb Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 21 Apr 2024 22:36:05 +0900
Subject: [PATCH 47/99] dev: add cargo test to pnpm scripts

mocha test has been unmaintained for a long time and is very broken :(
---
 package.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a62fae09f0..93594a5698 100644
--- a/package.json
+++ b/package.json
@@ -26,7 +26,9 @@
 		"debug": "pnpm run build:debug && pnpm run start",
 		"build:debug": "pnpm run clean && pnpm node ./scripts/dev-build.mjs && pnpm run gulp",
 		"mocha": "pnpm --filter backend run mocha",
-		"test": "pnpm run mocha",
+		"test": "pnpm run test:ts && pnpm run test:rs",
+		"test:ts": "pnpm run mocha",
+		"test:rs": "cargo test",
 		"format": "pnpm run format:ts; pnpm run format:rs",
 		"format:ts": "pnpm -r --parallel run format",
 		"format:rs": "cargo fmt --all --",

From 9b91035a796c2f4844ffdfe8c9cd59c89233bcc3 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 21 Apr 2024 22:40:58 +0900
Subject: [PATCH 48/99] chore (backend-rs): remove unneeded reference

---
 packages/backend-rs/src/service/add_note_to_antenna.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend-rs/src/service/add_note_to_antenna.rs b/packages/backend-rs/src/service/add_note_to_antenna.rs
index ea6e5fe76e..4ba8856dc4 100644
--- a/packages/backend-rs/src/service/add_note_to_antenna.rs
+++ b/packages/backend-rs/src/service/add_note_to_antenna.rs
@@ -8,8 +8,8 @@ pub fn add_note_to_antenna(antenna_id: &str, note_id: &str) -> Result<(), Error>
     redis_conn()?.xadd_maxlen(
         redis_key(format!("antennaTimeline:{}", antenna_id)),
         StreamMaxlen::Approx(200),
-        format!("{}-*", get_timestamp(&note_id)),
-        &[("note", &note_id)],
+        format!("{}-*", get_timestamp(note_id)),
+        &[("note", note_id)],
     )?;
 
     let stream = Stream::Antenna {

From ec940bb0681f1cd8ad6b2ee0acb20eed30a49013 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Sun, 21 Apr 2024 22:43:09 +0900
Subject: [PATCH 49/99] chore (backend-rs): publish -> publish_to_stream

---
 packages/backend-rs/src/service/add_note_to_antenna.rs | 4 ++--
 packages/backend-rs/src/service/stream.rs              | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/backend-rs/src/service/add_note_to_antenna.rs b/packages/backend-rs/src/service/add_note_to_antenna.rs
index 4ba8856dc4..0509db9ccb 100644
--- a/packages/backend-rs/src/service/add_note_to_antenna.rs
+++ b/packages/backend-rs/src/service/add_note_to_antenna.rs
@@ -1,5 +1,5 @@
 use crate::database::{redis_conn, redis_key};
-use crate::service::stream::{publish, Error, Stream};
+use crate::service::stream::{publish_to_stream, Error, Stream};
 use crate::util::id::get_timestamp;
 use redis::{streams::StreamMaxlen, Commands};
 
@@ -15,7 +15,7 @@ pub fn add_note_to_antenna(antenna_id: &str, note_id: &str) -> Result<(), Error>
     let stream = Stream::Antenna {
         id: antenna_id.to_string(),
     };
-    publish(
+    publish_to_stream(
         &stream,
         Some("note"),
         Some(format!("{{ \"id\": \"{}\" }}", note_id)),
diff --git a/packages/backend-rs/src/service/stream.rs b/packages/backend-rs/src/service/stream.rs
index 6fbe699f44..e7d0cce628 100644
--- a/packages/backend-rs/src/service/stream.rs
+++ b/packages/backend-rs/src/service/stream.rs
@@ -42,7 +42,11 @@ pub enum Error {
     ValueError(String),
 }
 
-pub fn publish(channel: &Stream, kind: Option<&str>, value: Option<String>) -> Result<(), Error> {
+pub fn publish_to_stream(
+    stream: &Stream,
+    kind: Option<&str>,
+    value: Option<String>,
+) -> Result<(), Error> {
     let message = if let Some(kind) = kind {
         format!(
             "{{ \"type\": \"{}\", \"body\": {} }}",
@@ -60,7 +64,7 @@ pub fn publish(channel: &Stream, kind: Option<&str>, value: Option<String>) -> R
         &CONFIG.host,
         format!(
             "{{ \"channel\": \"{}\", \"message\": {} }}",
-            channel, message,
+            stream, message,
         ),
     )?;
 

From 77e6479a67a20ea182f92c90651bc31f0dfb38db Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 00:14:19 +0900
Subject: [PATCH 50/99] chore (backend-rs): separate one-to-one/group chat
 stream types

---
 packages/backend-rs/src/service/stream.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/backend-rs/src/service/stream.rs b/packages/backend-rs/src/service/stream.rs
index e7d0cce628..98733a96fc 100644
--- a/packages/backend-rs/src/service/stream.rs
+++ b/packages/backend-rs/src/service/stream.rs
@@ -26,8 +26,10 @@ pub enum Stream {
     Drive { id: String },
     #[strum(to_string = "antennaStream:{id}")]
     Antenna { id: String },
+    #[strum(to_string = "messagingStream:{id_1}-{id_2}")]
+    Chat { id_1: String, id_2: String },
     #[strum(to_string = "messagingStream:{id}")]
-    Messaging { id: String },
+    GroupChat { id: String },
     #[strum(to_string = "messagingIndexStream:{id}")]
     MessagingIndex { id: String },
 }

From 2d8f4b945f0b60f8bb9fabda1ba6da818ec096ca Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 00:17:33 +0900
Subject: [PATCH 51/99] chore (backend-rs): remove unneeded serialize
 derivation for now

---
 packages/backend-rs/src/service/stream.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/backend-rs/src/service/stream.rs b/packages/backend-rs/src/service/stream.rs
index 98733a96fc..8ca79cd96c 100644
--- a/packages/backend-rs/src/service/stream.rs
+++ b/packages/backend-rs/src/service/stream.rs
@@ -2,7 +2,7 @@ use crate::config::server::CONFIG;
 use crate::database::redis_conn;
 use redis::{Commands, RedisError};
 
-#[derive(strum::Display, serde::Serialize)]
+#[derive(strum::Display)]
 pub enum Stream {
     #[strum(serialize = "internal")]
     Internal,
@@ -38,8 +38,6 @@ pub enum Stream {
 pub enum Error {
     #[error("Redis error: {0}")]
     RedisError(#[from] RedisError),
-    #[error("Json (de)serialization error: {0}")]
-    JsonError(#[from] serde_json::Error),
     #[error("Value error: {0}")]
     ValueError(String),
 }

From 5c6f1c818adfa59921ac3ef61ed6b61c6eb44791 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 00:21:10 +0900
Subject: [PATCH 52/99] chore (backend-rs): clean redundant match expression

---
 packages/backend-rs/src/service/stream.rs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/backend-rs/src/service/stream.rs b/packages/backend-rs/src/service/stream.rs
index 8ca79cd96c..700a834c83 100644
--- a/packages/backend-rs/src/service/stream.rs
+++ b/packages/backend-rs/src/service/stream.rs
@@ -51,10 +51,7 @@ pub fn publish_to_stream(
         format!(
             "{{ \"type\": \"{}\", \"body\": {} }}",
             kind,
-            match value {
-                Some(v) => v,
-                None => "null".to_string(),
-            }
+            value.unwrap_or("null".to_string()),
         )
     } else {
         value.ok_or(Error::ValueError("Invalid streaming message".to_string()))?

From 137d0fe3e54e45a2c3eee0a0111e75bbc38364c2 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 00:28:05 +0900
Subject: [PATCH 53/99] chore (backend-rs): make variable names clearer

---
 .../src/service/add_note_to_antenna.rs        |  2 +-
 packages/backend-rs/src/service/stream.rs     | 49 ++++++++++---------
 2 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/packages/backend-rs/src/service/add_note_to_antenna.rs b/packages/backend-rs/src/service/add_note_to_antenna.rs
index 0509db9ccb..eefd242dfb 100644
--- a/packages/backend-rs/src/service/add_note_to_antenna.rs
+++ b/packages/backend-rs/src/service/add_note_to_antenna.rs
@@ -13,7 +13,7 @@ pub fn add_note_to_antenna(antenna_id: &str, note_id: &str) -> Result<(), Error>
     )?;
 
     let stream = Stream::Antenna {
-        id: antenna_id.to_string(),
+        antenna_id: antenna_id.to_string(),
     };
     publish_to_stream(
         &stream,
diff --git a/packages/backend-rs/src/service/stream.rs b/packages/backend-rs/src/service/stream.rs
index 700a834c83..511954ec81 100644
--- a/packages/backend-rs/src/service/stream.rs
+++ b/packages/backend-rs/src/service/stream.rs
@@ -8,30 +8,33 @@ pub enum Stream {
     Internal,
     #[strum(serialize = "broadcast")]
     Broadcast,
-    #[strum(to_string = "adminStream:{id}")]
-    Admin { id: String },
-    #[strum(to_string = "user:{id}")]
-    User { id: String },
-    #[strum(to_string = "channelStream:{id}")]
-    Channel { id: String },
-    #[strum(to_string = "noteStream:{id}")]
-    Note { id: String },
+    #[strum(to_string = "adminStream:{user_id}")]
+    Admin { user_id: String },
+    #[strum(to_string = "user:{user_id}")]
+    User { user_id: String },
+    #[strum(to_string = "channelStream:{channel_id}")]
+    Channel { channel_id: String },
+    #[strum(to_string = "noteStream:{note_id}")]
+    Note { note_id: String },
     #[strum(serialize = "notesStream")]
     Notes,
-    #[strum(to_string = "userListStream:{id}")]
-    UserList { id: String },
-    #[strum(to_string = "mainStream:{id}")]
-    Main { id: String },
-    #[strum(to_string = "driveStream:{id}")]
-    Drive { id: String },
-    #[strum(to_string = "antennaStream:{id}")]
-    Antenna { id: String },
-    #[strum(to_string = "messagingStream:{id_1}-{id_2}")]
-    Chat { id_1: String, id_2: String },
-    #[strum(to_string = "messagingStream:{id}")]
-    GroupChat { id: String },
-    #[strum(to_string = "messagingIndexStream:{id}")]
-    MessagingIndex { id: String },
+    #[strum(to_string = "userListStream:{list_id}")]
+    UserList { list_id: String },
+    #[strum(to_string = "mainStream:{user_id}")]
+    Main { user_id: String },
+    #[strum(to_string = "driveStream:{user_id}")]
+    Drive { user_id: String },
+    #[strum(to_string = "antennaStream:{antenna_id}")]
+    Antenna { antenna_id: String },
+    #[strum(to_string = "messagingStream:{sender_user_id}-{receiver_user_id}")]
+    Chat {
+        sender_user_id: String,
+        receiver_user_id: String,
+    },
+    #[strum(to_string = "messagingStream:{group_id}")]
+    GroupChat { group_id: String },
+    #[strum(to_string = "messagingIndexStream:{user_id}")]
+    MessagingIndex { user_id: String },
 }
 
 #[derive(thiserror::Error, Debug)]
@@ -79,7 +82,7 @@ mod unit_test {
         assert_eq!(Stream::Broadcast.to_string(), "broadcast");
         assert_eq!(
             Stream::Admin {
-                id: "9tb42br63g5apjcq".to_string()
+                user_id: "9tb42br63g5apjcq".to_string()
             }
             .to_string(),
             "adminStream:9tb42br63g5apjcq"

From 574d3b3fe58f7c21c755958c8b671d229173bdea Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 00:30:59 +0900
Subject: [PATCH 54/99] chore (backend-rs): in the current implementation we
 need to call to_string() anyway

There's room for refactoring
---
 packages/backend-rs/src/service/add_note_to_antenna.rs | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/backend-rs/src/service/add_note_to_antenna.rs b/packages/backend-rs/src/service/add_note_to_antenna.rs
index eefd242dfb..a92e8dc301 100644
--- a/packages/backend-rs/src/service/add_note_to_antenna.rs
+++ b/packages/backend-rs/src/service/add_note_to_antenna.rs
@@ -4,7 +4,7 @@ use crate::util::id::get_timestamp;
 use redis::{streams::StreamMaxlen, Commands};
 
 #[crate::export]
-pub fn add_note_to_antenna(antenna_id: &str, note_id: &str) -> Result<(), Error> {
+pub fn add_note_to_antenna(antenna_id: String, note_id: &str) -> Result<(), Error> {
     redis_conn()?.xadd_maxlen(
         redis_key(format!("antennaTimeline:{}", antenna_id)),
         StreamMaxlen::Approx(200),
@@ -12,11 +12,8 @@ pub fn add_note_to_antenna(antenna_id: &str, note_id: &str) -> Result<(), Error>
         &[("note", note_id)],
     )?;
 
-    let stream = Stream::Antenna {
-        antenna_id: antenna_id.to_string(),
-    };
     publish_to_stream(
-        &stream,
+        &Stream::Antenna { antenna_id },
         Some("note"),
         Some(format!("{{ \"id\": \"{}\" }}", note_id)),
     )

From 3039458c4c715e648a3cb25b52b10926975c1024 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 00:36:06 +0900
Subject: [PATCH 55/99] chore (backend-rs): config::server::CONFIG ->
 config::CONFIG

---
 packages/backend-rs/src/config/mod.rs          | 2 ++
 packages/backend-rs/src/database/postgresql.rs | 2 +-
 packages/backend-rs/src/database/redis.rs      | 2 +-
 packages/backend-rs/src/misc/convert_host.rs   | 2 +-
 packages/backend-rs/src/service/stream.rs      | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/backend-rs/src/config/mod.rs b/packages/backend-rs/src/config/mod.rs
index b708f2b265..6155f15e54 100644
--- a/packages/backend-rs/src/config/mod.rs
+++ b/packages/backend-rs/src/config/mod.rs
@@ -1,2 +1,4 @@
+pub use server::CONFIG;
+
 pub mod environment;
 pub mod server;
diff --git a/packages/backend-rs/src/database/postgresql.rs b/packages/backend-rs/src/database/postgresql.rs
index c365da84dc..ec0945fbe3 100644
--- a/packages/backend-rs/src/database/postgresql.rs
+++ b/packages/backend-rs/src/database/postgresql.rs
@@ -1,4 +1,4 @@
-use crate::config::server::CONFIG;
+use crate::config::CONFIG;
 use sea_orm::{Database, DbConn, DbErr};
 
 static DB_CONN: once_cell::sync::OnceCell<DbConn> = once_cell::sync::OnceCell::new();
diff --git a/packages/backend-rs/src/database/redis.rs b/packages/backend-rs/src/database/redis.rs
index d722e2c00a..f8f6c712de 100644
--- a/packages/backend-rs/src/database/redis.rs
+++ b/packages/backend-rs/src/database/redis.rs
@@ -1,4 +1,4 @@
-use crate::config::server::CONFIG;
+use crate::config::CONFIG;
 use redis::{Client, Connection, RedisError};
 
 static REDIS_CLIENT: once_cell::sync::OnceCell<Client> = once_cell::sync::OnceCell::new();
diff --git a/packages/backend-rs/src/misc/convert_host.rs b/packages/backend-rs/src/misc/convert_host.rs
index cff52aeb07..8f054488de 100644
--- a/packages/backend-rs/src/misc/convert_host.rs
+++ b/packages/backend-rs/src/misc/convert_host.rs
@@ -1,4 +1,4 @@
-use crate::config::server::CONFIG;
+use crate::config::CONFIG;
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
diff --git a/packages/backend-rs/src/service/stream.rs b/packages/backend-rs/src/service/stream.rs
index 511954ec81..3ef13961ce 100644
--- a/packages/backend-rs/src/service/stream.rs
+++ b/packages/backend-rs/src/service/stream.rs
@@ -1,4 +1,4 @@
-use crate::config::server::CONFIG;
+use crate::config::CONFIG;
 use crate::database::redis_conn;
 use redis::{Commands, RedisError};
 

From 2a30b4a536201e0ae4e2d748c48d2ec7503401b0 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 01:47:56 +0900
Subject: [PATCH 56/99] Revert "refactor (backend): it turns out that sending
 the entire note object was redundant"

This reverts commit 3b65ebcb3e26d58db78f86c92fac9c06f199f18f.
---
 packages/backend-rs/index.d.ts                |  2 +-
 .../src/service/add_note_to_antenna.rs        | 11 ++-
 packages/backend-rs/src/service/stream.rs     |  2 +
 packages/backend/package.json                 |  1 +
 .../backend/src/prelude/undefined-to-null.ts  | 76 +++++++++++++++++++
 packages/backend/src/services/note/create.ts  |  4 +-
 pnpm-lock.yaml                                |  8 ++
 7 files changed, 98 insertions(+), 6 deletions(-)
 create mode 100644 packages/backend/src/prelude/undefined-to-null.ts

diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index 1e086c88ff..7fd93a3845 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -1103,7 +1103,7 @@ export interface Webhook {
   latestSentAt: Date | null
   latestStatus: number | null
 }
-export function addNoteToAntenna(antennaId: string, noteId: string): void
+export function addNoteToAntenna(antennaId: string, note: Note): void
 /** Initializes Cuid2 generator. Must be called before any [create_id]. */
 export function initIdGenerator(length: number, fingerprint: string): void
 export function getTimestamp(id: string): number
diff --git a/packages/backend-rs/src/service/add_note_to_antenna.rs b/packages/backend-rs/src/service/add_note_to_antenna.rs
index a92e8dc301..199a5cde5f 100644
--- a/packages/backend-rs/src/service/add_note_to_antenna.rs
+++ b/packages/backend-rs/src/service/add_note_to_antenna.rs
@@ -1,20 +1,23 @@
 use crate::database::{redis_conn, redis_key};
 use crate::service::stream::{publish_to_stream, Error, Stream};
+use crate::model::entity::note;
 use crate::util::id::get_timestamp;
 use redis::{streams::StreamMaxlen, Commands};
 
+type Note = note::Model;
+
 #[crate::export]
-pub fn add_note_to_antenna(antenna_id: String, note_id: &str) -> Result<(), Error> {
+pub fn add_note_to_antenna(antenna_id: String, note: &Note) -> Result<(), Error> {
     redis_conn()?.xadd_maxlen(
         redis_key(format!("antennaTimeline:{}", antenna_id)),
         StreamMaxlen::Approx(200),
-        format!("{}-*", get_timestamp(note_id)),
-        &[("note", note_id)],
+        format!("{}-*", get_timestamp(&note.id)),
+        &[("note", &note.id)],
     )?;
 
     publish_to_stream(
         &Stream::Antenna { antenna_id },
         Some("note"),
-        Some(format!("{{ \"id\": \"{}\" }}", note_id)),
+        Some(serde_json::to_string(note)?),
     )
 }
diff --git a/packages/backend-rs/src/service/stream.rs b/packages/backend-rs/src/service/stream.rs
index 3ef13961ce..6c5e6be4dd 100644
--- a/packages/backend-rs/src/service/stream.rs
+++ b/packages/backend-rs/src/service/stream.rs
@@ -41,6 +41,8 @@ pub enum Stream {
 pub enum Error {
     #[error("Redis error: {0}")]
     RedisError(#[from] RedisError),
+    #[error("Json (de)serialization error: {0}")]
+    JsonError(#[from] serde_json::Error),
     #[error("Value error: {0}")]
     ValueError(String),
 }
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 9289c2f7ea..0599a39d4b 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -178,6 +178,7 @@
 		"ts-loader": "9.5.1",
 		"ts-node": "10.9.2",
 		"tsconfig-paths": "4.2.0",
+		"type-fest": "4.15.0",
 		"typescript": "5.4.5",
 		"webpack": "^5.91.0",
 		"ws": "8.16.0"
diff --git a/packages/backend/src/prelude/undefined-to-null.ts b/packages/backend/src/prelude/undefined-to-null.ts
new file mode 100644
index 0000000000..013be3cf9e
--- /dev/null
+++ b/packages/backend/src/prelude/undefined-to-null.ts
@@ -0,0 +1,76 @@
+// https://gist.github.com/tkrotoff/a6baf96eb6b61b445a9142e5555511a0
+import type { Primitive } from "type-fest";
+
+type NullToUndefined<T> = T extends null
+	? undefined
+	: T extends Primitive | Function | Date | RegExp
+		? T
+		: T extends Array<infer U>
+			? Array<NullToUndefined<U>>
+			: T extends Map<infer K, infer V>
+				? Map<K, NullToUndefined<V>>
+				: T extends Set<infer U>
+					? Set<NullToUndefined<U>>
+					: T extends object
+						? { [K in keyof T]: NullToUndefined<T[K]> }
+						: unknown;
+
+type UndefinedToNull<T> = T extends undefined
+	? null
+	: T extends Primitive | Function | Date | RegExp
+		? T
+		: T extends Array<infer U>
+			? Array<UndefinedToNull<U>>
+			: T extends Map<infer K, infer V>
+				? Map<K, UndefinedToNull<V>>
+				: T extends Set<infer U>
+					? Set<NullToUndefined<U>>
+					: T extends object
+						? { [K in keyof T]: UndefinedToNull<T[K]> }
+						: unknown;
+
+function _nullToUndefined<T>(obj: T): NullToUndefined<T> {
+	if (obj === null) {
+		return undefined as any;
+	}
+
+	if (typeof obj === "object") {
+		if (obj instanceof Map) {
+			obj.forEach((value, key) => obj.set(key, _nullToUndefined(value)));
+		} else {
+			for (const key in obj) {
+				obj[key] = _nullToUndefined(obj[key]) as any;
+			}
+		}
+	}
+
+	return obj as any;
+}
+
+function _undefinedToNull<T>(obj: T): UndefinedToNull<T> {
+	if (obj === undefined) {
+		return null as any;
+	}
+
+	if (typeof obj === "object") {
+		if (obj instanceof Map) {
+			obj.forEach((value, key) => obj.set(key, _undefinedToNull(value)));
+		} else {
+			for (const key in obj) {
+				obj[key] = _undefinedToNull(obj[key]) as any;
+			}
+		}
+	}
+
+	return obj as any;
+}
+
+/**
+ * Recursively converts all undefined values to null.
+ *
+ * @param obj object to convert
+ * @returns a copy of the object with all its undefined values converted to null
+ */
+export function undefinedToNull<T>(obj: T) {
+	return _undefinedToNull(structuredClone(obj));
+}
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 8fa2b4e23b..206f6a50ad 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -62,6 +62,7 @@ import { Mutex } from "redis-semaphore";
 import { langmap } from "@/misc/langmap.js";
 import Logger from "@/services/logger.js";
 import { inspect } from "node:util";
+import { undefinedToNull } from "@/prelude/undefined-to-null.js";
 
 const logger = new Logger("create-note");
 
@@ -398,7 +399,8 @@ export default async (
 		for (const antenna of await getAntennas()) {
 			checkHitAntenna(antenna, note, user).then((hit) => {
 				if (hit) {
-					addNoteToAntenna(antenna.id, note.id);
+					// TODO: do this more sanely
+					addNoteToAntenna(antenna.id, undefinedToNull(note) as Note);
 				}
 			});
 		}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b591ffe9c1..16a4ad6ad4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -521,6 +521,9 @@ importers:
       tsconfig-paths:
         specifier: 4.2.0
         version: 4.2.0
+      type-fest:
+        specifier: 4.15.0
+        version: 4.15.0
       typescript:
         specifier: 5.4.5
         version: 5.4.5
@@ -16632,6 +16635,11 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /type-fest@4.15.0:
+    resolution: {integrity: sha512-tB9lu0pQpX5KJq54g+oHOLumOx+pMep4RaM6liXh2PKmVRFF+/vAtUP0ZaJ0kOySfVNjF6doBWPHhBhISKdlIA==}
+    engines: {node: '>=16'}
+    dev: true
+
   /type-is@1.6.18:
     resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
     engines: {node: '>= 0.6'}

From b4ae877462f2dca837260bded569b7fbd53b56a9 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 01:54:44 +0900
Subject: [PATCH 57/99] chore: format

---
 packages/backend-rs/src/service/add_note_to_antenna.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend-rs/src/service/add_note_to_antenna.rs b/packages/backend-rs/src/service/add_note_to_antenna.rs
index 199a5cde5f..4f294cc881 100644
--- a/packages/backend-rs/src/service/add_note_to_antenna.rs
+++ b/packages/backend-rs/src/service/add_note_to_antenna.rs
@@ -1,6 +1,6 @@
 use crate::database::{redis_conn, redis_key};
-use crate::service::stream::{publish_to_stream, Error, Stream};
 use crate::model::entity::note;
+use crate::service::stream::{publish_to_stream, Error, Stream};
 use crate::util::id::get_timestamp;
 use redis::{streams::StreamMaxlen, Commands};
 

From 9fef36e80c73d4483b61df1281c1205e9544898f Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 01:56:34 +0900
Subject: [PATCH 58/99] chore (backend): add comment

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

diff --git a/packages/backend/src/services/stream.ts b/packages/backend/src/services/stream.ts
index 6dff9602cd..7f1862b74d 100644
--- a/packages/backend/src/services/stream.ts
+++ b/packages/backend/src/services/stream.ts
@@ -134,6 +134,7 @@ class Publisher {
 		);
 	};
 
+	/* ported to backend-rs */
 	// public publishAntennaStream = <K extends keyof AntennaStreamTypes>(
 	// 	antennaId: Antenna["id"],
 	// 	type: K,

From 0c9dc92f07c47aa570291e246b187b147a4cf408 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 05:16:14 +0900
Subject: [PATCH 59/99] fix (backend-rs): use hostname for Redis key prefix and
 host for Redis streams

I suspect this is a bug, but I keep this behavior for compatibility for now
---
 packages/backend-rs/src/config/server.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend-rs/src/config/server.rs b/packages/backend-rs/src/config/server.rs
index b822d0d300..5a4ee481cd 100644
--- a/packages/backend-rs/src/config/server.rs
+++ b/packages/backend-rs/src/config/server.rs
@@ -320,7 +320,7 @@ fn load_config() -> Config {
     } else {
         server_config.redis.prefix.clone()
     }
-    .unwrap_or(host.clone());
+    .unwrap_or(hostname.clone());
 
     Config {
         url: server_config.url,

From dc53447fa3322f44cd01716491184e80472878a6 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 05:42:31 +0900
Subject: [PATCH 60/99] chore (API): we still use the word 'renote' in our
 code/API

---
 packages/backend/src/server/api/endpoints/notes/renotes.ts | 4 ++--
 packages/client/src/components/MkNoteDetailed.vue          | 2 +-
 packages/firefish-js/src/api.types.ts                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/renotes.ts b/packages/backend/src/server/api/endpoints/notes/renotes.ts
index 282777b2e4..e69d1be7b4 100644
--- a/packages/backend/src/server/api/endpoints/notes/renotes.ts
+++ b/packages/backend/src/server/api/endpoints/notes/renotes.ts
@@ -44,7 +44,7 @@ export const paramDef = {
 		untilId: { type: "string", format: "misskey:id" },
 		filter: {
 			type: "string",
-			enum: ["boost", "quote"],
+			enum: ["all", "renote", "quote"],
 			nullable: true,
 			default: null,
 		},
@@ -67,7 +67,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		.andWhere("note.renoteId = :renoteId", { renoteId: note.id })
 		.innerJoinAndSelect("note.user", "user");
 
-	if (ps.filter === "boost") {
+	if (ps.filter === "renote") {
 		query.andWhere("note.text IS NULL");
 	}
 	if (ps.filter === "quote") {
diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 55a13956f6..2c242645b4 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -401,7 +401,7 @@ const renotePagination = {
 	limit: 30,
 	params: {
 		noteId: note.value.id,
-		filter: "boost" as const,
+		filter: "renote" as const,
 	},
 };
 const quotePagination = {
diff --git a/packages/firefish-js/src/api.types.ts b/packages/firefish-js/src/api.types.ts
index 6c0e11bec5..1ee94b9954 100644
--- a/packages/firefish-js/src/api.types.ts
+++ b/packages/firefish-js/src/api.types.ts
@@ -792,7 +792,7 @@ export type Endpoints = {
 			sinceId?: Note["id"];
 			untilId?: Note["id"];
 			noteId: Note["id"];
-			filter?: "boost" | "quote";
+			filter?: "all" | "renote" | "quote";
 		};
 		res: Note[];
 	};

From b9e88ce490a31a579b7c53f583f47dbb3b0a6838 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 05:37:57 +0900
Subject: [PATCH 61/99] docs: edit api-changes.md

---
 docs/api-change.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/api-change.md b/docs/api-change.md
index 36b05d77f4..eec5f0d81c 100644
--- a/docs/api-change.md
+++ b/docs/api-change.md
@@ -4,10 +4,11 @@ Breaking changes are indicated by the :warning: icon.
 
 ## Unreleased
 
-- New optional parameters are added to `notes/renotes` endpoint:
-	- `filter`
-
-- Removed unused optional parameters for `notes/reactions` endpoint:
+- Added `filter` optional parameter to `notes/renotes` endpoint to filter the types of renotes. It can take the following values:
+	- `all` (default)
+  - `renote`
+  - `quote`
+- :warning: Removed the following optional parameters in `notes/reactions`, as they were not taken into account due to a bug:
 	- `sinceId`
 	- `untilId`
 

From 509690d84d92c53cef1ba60453b8a72b99fab47e Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 05:43:58 +0900
Subject: [PATCH 62/99] chore: meRenoteCount -> myRenoteCount

---
 packages/backend/src/models/repositories/note.ts  | 2 +-
 packages/backend/src/models/schema/note.ts        | 2 +-
 packages/client/src/components/MkRenoteButton.vue | 2 +-
 packages/firefish-js/src/entities.ts              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts
index 5974fc24af..7fa26373b8 100644
--- a/packages/backend/src/models/repositories/note.ts
+++ b/packages/backend/src/models/repositories/note.ts
@@ -222,7 +222,7 @@ export const NoteRepository = db.getRepository(Note).extend({
 					text: Not(IsNull()),
 				},
 			}),
-			meRenoteCount: me
+			myRenoteCount: me
 				? Notes.count({
 						where: {
 							renoteId: note.id,
diff --git a/packages/backend/src/models/schema/note.ts b/packages/backend/src/models/schema/note.ts
index e0048f7d00..6064919960 100644
--- a/packages/backend/src/models/schema/note.ts
+++ b/packages/backend/src/models/schema/note.ts
@@ -208,7 +208,7 @@ export const packedNoteSchema = {
 			optional: true,
 			nullable: true,
 		},
-		meRenoteCount: {
+		myRenoteCount: {
 			type: "number",
 			optional: true,
 			nullable: false,
diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue
index 23911eef37..3925dc8c5a 100644
--- a/packages/client/src/components/MkRenoteButton.vue
+++ b/packages/client/src/components/MkRenoteButton.vue
@@ -73,7 +73,7 @@ useTooltip(buttonRef, async (showing) => {
 });
 
 const hasRenotedBefore = ref(
-	props.note.meRenoteCount && props.note.meRenoteCount > 0,
+	props.note.myRenoteCount && props.note.myRenoteCount > 0,
 );
 
 const renote = (viaKeyboard = false, ev?: MouseEvent) => {
diff --git a/packages/firefish-js/src/entities.ts b/packages/firefish-js/src/entities.ts
index aace6de166..02362194eb 100644
--- a/packages/firefish-js/src/entities.ts
+++ b/packages/firefish-js/src/entities.ts
@@ -174,7 +174,7 @@ export type Note = {
 	channelId?: Channel["id"];
 	channel?: Channel;
 	myReaction?: string;
-	meRenoteCount?: number;
+	myRenoteCount?: number;
 	reactions: Record<string, number>;
 	renoteCount: number;
 	repliesCount: number;

From 8140694a3191a33db9b81afe70677755a36cd38d Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 05:47:22 +0900
Subject: [PATCH 63/99] chore (backend): add comment

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

diff --git a/packages/backend/src/server/api/endpoints/notes/renotes.ts b/packages/backend/src/server/api/endpoints/notes/renotes.ts
index e69d1be7b4..16304dd269 100644
--- a/packages/backend/src/server/api/endpoints/notes/renotes.ts
+++ b/packages/backend/src/server/api/endpoints/notes/renotes.ts
@@ -67,6 +67,9 @@ export default define(meta, paramDef, async (ps, user) => {
 		.andWhere("note.renoteId = :renoteId", { renoteId: note.id })
 		.innerJoinAndSelect("note.user", "user");
 
+	// "all" doesn't filter out anything, it's just there for
+	// those who prefer to set the parameter explicitly
+
 	if (ps.filter === "renote") {
 		query.andWhere("note.text IS NULL");
 	}

From a107d8c1ec8309ca9d76583acdcf2d072fda3bfc Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 05:52:56 +0900
Subject: [PATCH 64/99] fix (backend): update import

---
 packages/backend/src/server/api/endpoints/antennas/create.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/antennas/create.ts b/packages/backend/src/server/api/endpoints/antennas/create.ts
index 792c5e30b4..aa5dcee044 100644
--- a/packages/backend/src/server/api/endpoints/antennas/create.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/create.ts
@@ -1,9 +1,8 @@
 import define from "@/server/api/define.js";
-import { genId } from "backend-rs";
+import { fetchMeta, genId } from "backend-rs";
 import { Antennas, UserLists, UserGroupJoinings } from "@/models/index.js";
 import { ApiError } from "@/server/api/error.js";
 import { publishInternalEvent } from "@/services/stream.js";
-import { fetchMeta } from "@/misc/fetch-meta.js";
 
 export const meta = {
 	tags: ["antennas"],

From c4658801aa98e61f5ee14177583cc758c1904f1d Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 05:54:32 +0900
Subject: [PATCH 65/99] chore: regenerate entities

---
 packages/backend-rs/src/model/entity/meta.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend-rs/src/model/entity/meta.rs b/packages/backend-rs/src/model/entity/meta.rs
index 7d0972b844..fcba9e0be9 100644
--- a/packages/backend-rs/src/model/entity/meta.rs
+++ b/packages/backend-rs/src/model/entity/meta.rs
@@ -50,8 +50,6 @@ pub struct Model {
     pub local_drive_capacity_mb: i32,
     #[sea_orm(column_name = "remoteDriveCapacityMb")]
     pub remote_drive_capacity_mb: i32,
-    #[sea_orm(column_name = "antennaLimit")]
-    pub antenna_limit: i32,
     #[sea_orm(column_name = "summalyProxy")]
     pub summaly_proxy: Option<String>,
     #[sea_orm(column_name = "enableEmail")]
@@ -175,6 +173,8 @@ pub struct Model {
     pub more_urls: Json,
     #[sea_orm(column_name = "markLocalFilesNsfwByDefault")]
     pub mark_local_files_nsfw_by_default: bool,
+    #[sea_orm(column_name = "antennaLimit")]
+    pub antenna_limit: i32,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

From c9de5f6095dec1c3390a4e5c0300dd0fa296620a Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 05:56:46 +0900
Subject: [PATCH 66/99] docs: update api-changes.md

---
 docs/api-change.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/api-change.md b/docs/api-change.md
index f3ed584c32..dcd4329a27 100644
--- a/docs/api-change.md
+++ b/docs/api-change.md
@@ -2,6 +2,10 @@
 
 Breaking changes are indicated by the :warning: icon.
 
+## Unreleased
+
+- Added `antennaLimit` field to the response of `meta` and `admin/meta`, and the request of `admin/update-meta` (optional).
+
 ## v20240413
 
 - :warning: Removed `patrons` endpoint.

From ebaefb9697f7705313ce477a1c6a7ed9ec71ad98 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 06:02:08 +0900
Subject: [PATCH 67/99] chore (minor, client): remove redundant attribute

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

diff --git a/packages/client/src/pages/note-history.vue b/packages/client/src/pages/note-history.vue
index c3665d41bc..8c97448f72 100644
--- a/packages/client/src/pages/note-history.vue
+++ b/packages/client/src/pages/note-history.vue
@@ -5,7 +5,7 @@
 		/></template>
 		<MkSpacer :content-max="800">
 			<MkLoading v-if="note == null" />
-			<div class="" v-else>
+			<div v-else>
 				<MkRemoteCaution
 					v-if="note.user.host != null"
 					:href="note.url ?? note.uri!"

From 56aac15a6b891772f9404c943c6005b3370d309b Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 06:32:07 +0900
Subject: [PATCH 68/99] docs (minor): paraphrase a bit

---
 dev/docs/local-installation.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/docs/local-installation.md b/dev/docs/local-installation.md
index 132d86bd56..38d8a4a07d 100644
--- a/dev/docs/local-installation.md
+++ b/dev/docs/local-installation.md
@@ -42,7 +42,7 @@ cargo --version
 
 ### PostgreSQL and PGroonga
 
-Firefish requires PostgreSQL v12 or later. While you can choose any versions between v12 and the latest version (v16.2 as of writing), we recommend that you install v12.x so as not to use new features inadvertently and introduce incompatibility issues.
+Firefish requires PostgreSQL v12 or later. We recommend that you install v12.x for the same reason as Node.js.
 
 PostgreSQL install instructions can be found at [this page](https://www.postgresql.org/download/).
 

From d98c564ead4117ecdcd2c9379675835566ecb9de Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 06:39:20 +0900
Subject: [PATCH 69/99] docs: move the dependencies section to the top

---
 docs/install.md | 55 +++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/docs/install.md b/docs/install.md
index f030e87125..5f2d7859ae 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -1,6 +1,31 @@
 # Install Firefish
 
-This document shows an example procedure for installing Firefish on Debian 12. Note that there is much room for customizing the server setup; this document merely demonstrates a simple installation.
+Firefish depends on the following software.
+
+## Runtime dependencies
+
+- At least [NodeJS](https://nodejs.org/en/) v18.17.0 (v20/v21 recommended)
+- At least [PostgreSQL](https://www.postgresql.org/) v12 (v16 recommended) with [PGroonga](https://pgroonga.github.io/) extension
+- At least [Redis](https://redis.io/) v7
+- Web Proxy (one of the following)
+  - Caddy (recommended)
+  - Nginx (recommended)
+  - Apache
+- [FFmpeg](https://ffmpeg.org/) for video transcoding (**optional**)
+- Caching server (**optional**, one of the following)
+  - [DragonflyDB](https://www.dragonflydb.io/)
+  - [KeyDB](https://keydb.dev/)
+  - Another [Redis](https://redis.io/) server
+
+## Build dependencies
+
+- At least [Rust](https://www.rust-lang.org/) v1.74
+- C/C++ compiler & build tools
+  - `build-essential` on Debian/Ubuntu Linux
+  - `base-devel` on Arch Linux
+- [Python 3](https://www.python.org/)
+
+This document shows an example procedure for installing these dependencies and Firefish on Debian 12. Note that there is much room for customizing the server setup; this document merely demonstrates a simple installation.
 
 If you want to use the pre-built container image, please refer to [`install-container.md`](./install-container.md).
 
@@ -317,31 +342,3 @@ cd ~/firefish
   - Run `psql -d firefish` (or whatever the database name is)
   - Run `UPDATE "user" SET "isAdmin" = true WHERE id='999999';` (replace `999999` with the copied ID)
   - Restart your Firefish server
-
-## Dependencies
-
-**We only recommend that you use components that are still within the upstream support cycle for better performance and security, and it is recommended that new sites meet the recommended dependency version requirements.**
-
-- At least [NodeJS](https://nodejs.org/en/) v18.17.0 (v20/v21 recommended)
-- At least [PostgreSQL](https://www.postgresql.org/) v12 (v16 recommended) with [PGroonga](https://pgroonga.github.io/) extension
-- At least [Redis](https://redis.io/) v7
-- Web Proxy (one of the following)
-  - Caddy (recommended for new users)
-  - Nginx (recommended)
-  - Apache
-
-### Optional dependencies
-
-- [FFmpeg](https://ffmpeg.org/) for video transcoding
-- Caching server (one of the following)
-  - [DragonflyDB](https://www.dragonflydb.io/) (recommended)
-  - [KeyDB](https://keydb.dev/)
-  - Another [Redis](https://redis.io/) server
-
-### Build dependencies
-
-- At least [Rust](https://www.rust-lang.org/) v1.74
-- C/C++ compiler & build tools
-  - `build-essential` on Debian/Ubuntu Linux
-  - `base-devel` on Arch Linux
-- [Python 3](https://www.python.org/)

From fbdc0681151e8eee959b3d50b842a19ee857683c Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 07:09:54 +0900
Subject: [PATCH 70/99] locale: update en-US.yml

---
 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 5d0e8ae2f8..a70eb2406f 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1227,8 +1227,8 @@ publishTimelinesDescription: "If enabled, the Local and Global timelines will be
   on {url} even when signed out."
 noAltTextWarning: "Some attached file(s) have no description. Did you forget to write?"
 showNoAltTextWarning: "Show a warning if you attempt to post files without a description"
-showAddFileDescriptionAtFirstPost: "Show add description page automatically when
-  first try to post a post attachment without a description"
+showAddFileDescriptionAtFirstPost: "Automatically open a form to write a description when you
+  attempt to post files without a description"
 
 _emojiModPerm:
   unauthorized: "None"

From 9a4988eaad2b305295308462f9424beb1579b72f Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 07:14:56 +0900
Subject: [PATCH 71/99] chore (client): fix type errors

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

diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index 2d36408d9d..e7ec45a37b 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -1046,14 +1046,14 @@ function openFileDescriptionWindow(file: entities.DriveFile) {
 						resolve(false);
 						return;
 					}
-					const comment = result.result.length === 0 ? null : result.result;
+					const comment = result.result?.length === 0 ? null : result.result;
 					os.api("drive/files/update", {
 						fileId: file.id,
 						comment,
 					})
 						.then(() => {
 							resolve(true);
-							file.comment = comment;
+							file.comment = comment ?? null;
 						})
 						.catch((err: unknown) => {
 							reject(err);

From 9ced0d96adca51b68dc574b396d9bd659cc391c1 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 07:20:07 +0900
Subject: [PATCH 72/99] chore (client): don't make a new post as soon as you
 add descriptions

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

diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue
index e7ec45a37b..5850fdf498 100644
--- a/packages/client/src/components/MkPostForm.vue
+++ b/packages/client/src/components/MkPostForm.vue
@@ -1113,12 +1113,7 @@ async function post() {
 				}
 			}
 			isFirstPostAttempt = false;
-			// Continue if all files have alt-text added.
-			if (
-				files.value.some((f) => f.comment == null || f.comment.length === 0)
-			) {
-				return;
-			}
+			return;
 		}
 	}
 
@@ -1144,12 +1139,7 @@ async function post() {
 					}
 				}
 			}
-			// Continue if all files have alt-text added.
-			if (
-				files.value.some((f) => f.comment == null || f.comment.length === 0)
-			) {
-				return;
-			}
+			return;
 		}
 	}
 

From 0c1e7cdd72a4eda2045d117a274d4c28e6b1484f Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 08:31:28 +0900
Subject: [PATCH 73/99] refactor (backend): port should-block-instance to
 backend-rs

---
 packages/backend-rs/index.d.ts                | 17 ++++++-
 packages/backend-rs/index.js                  |  5 +-
 .../backend-rs/src/misc/check_server_block.rs | 49 +++++++++++++++++++
 packages/backend-rs/src/misc/mod.rs           |  1 +
 .../backend/src/misc/should-block-instance.ts | 38 --------------
 .../backend/src/misc/skipped-instances.ts     |  9 ++--
 .../src/models/repositories/instance.ts       |  9 ++--
 .../backend/src/queue/processors/inbox.ts     | 10 ++--
 .../src/remote/activitypub/check-fetch.ts     | 13 ++---
 .../activitypub/kernel/announce/note.ts       |  4 +-
 .../src/remote/activitypub/kernel/index.ts    |  5 +-
 .../src/remote/activitypub/models/note.ts     |  7 ++-
 .../src/remote/activitypub/resolver.ts        | 24 +++++----
 .../src/server/api/endpoints/ap/show.ts       |  5 +-
 .../src/services/create-notification.ts       |  7 ++-
 .../backend/src/services/following/create.ts  |  5 +-
 packages/backend/src/services/note/create.ts  | 11 +++--
 17 files changed, 117 insertions(+), 102 deletions(-)
 create mode 100644 packages/backend-rs/src/misc/check_server_block.rs
 delete mode 100644 packages/backend/src/misc/should-block-instance.ts

diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index 50489a846d..69de833dcc 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -193,6 +193,21 @@ export interface Acct {
 }
 export function stringToAcct(acct: string): Acct
 export function acctToString(acct: Acct): string
+/**
+ * @param host punycoded instance host
+ * @returns whether the given host should be blocked
+*/
+export function isBlockedServer(host: string): Promise<boolean>
+/**
+ * @param host punycoded instance host
+ * @returns whether the given host should be limited
+*/
+export function isSilencedServer(host: string): Promise<boolean>
+/**
+ * @param host punycoded instance host
+ * @returns whether the given host is allowlisted (this is always true if private mode is disabled)
+*/
+export function isAllowedServer(host: string): Promise<boolean>
 /** TODO: handle name collisions better */
 export interface NoteLikeForCheckWordMute {
   fileIds: Array<string>
@@ -557,7 +572,6 @@ export interface Meta {
   recaptchaSecretKey: string | null
   localDriveCapacityMb: number
   remoteDriveCapacityMb: number
-  antennaLimit: number
   summalyProxy: string | null
   enableEmail: boolean
   email: string | null
@@ -620,6 +634,7 @@ export interface Meta {
   donationLink: string | null
   moreUrls: Json
   markLocalFilesNsfwByDefault: boolean
+  antennaLimit: number
 }
 export interface Migrations {
   id: number
diff --git a/packages/backend-rs/index.js b/packages/backend-rs/index.js
index 9a5e3d1a92..b4d86dccdf 100644
--- a/packages/backend-rs/index.js
+++ b/packages/backend-rs/index.js
@@ -310,12 +310,15 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { loadEnv, loadConfig, stringToAcct, acctToString, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, addNoteToAntenna, initIdGenerator, getTimestamp, genId, secureRndstr } = nativeBinding
+const { loadEnv, loadConfig, stringToAcct, acctToString, isBlockedServer, isSilencedServer, isAllowedServer, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, addNoteToAntenna, initIdGenerator, getTimestamp, genId, secureRndstr } = nativeBinding
 
 module.exports.loadEnv = loadEnv
 module.exports.loadConfig = loadConfig
 module.exports.stringToAcct = stringToAcct
 module.exports.acctToString = acctToString
+module.exports.isBlockedServer = isBlockedServer
+module.exports.isSilencedServer = isSilencedServer
+module.exports.isAllowedServer = isAllowedServer
 module.exports.checkWordMute = checkWordMute
 module.exports.getFullApAccount = getFullApAccount
 module.exports.isSelfHost = isSelfHost
diff --git a/packages/backend-rs/src/misc/check_server_block.rs b/packages/backend-rs/src/misc/check_server_block.rs
new file mode 100644
index 0000000000..b5e262aa87
--- /dev/null
+++ b/packages/backend-rs/src/misc/check_server_block.rs
@@ -0,0 +1,49 @@
+use crate::misc::meta::fetch_meta;
+use sea_orm::DbErr;
+
+/**
+ * @param host punycoded instance host
+ * @returns whether the given host should be blocked
+ */
+#[crate::export]
+pub async fn is_blocked_server(host: &str) -> Result<bool, DbErr> {
+    Ok(fetch_meta(true)
+        .await?
+        .blocked_hosts
+        .iter()
+        .any(|blocked_host| {
+            host == blocked_host || host.ends_with(format!(".{}", blocked_host).as_str())
+        }))
+}
+
+/**
+ * @param host punycoded instance host
+ * @returns whether the given host should be limited
+ */
+#[crate::export]
+pub async fn is_silenced_server(host: &str) -> Result<bool, DbErr> {
+    Ok(fetch_meta(true)
+        .await?
+        .silenced_hosts
+        .iter()
+        .any(|silenced_host| {
+            host == silenced_host || host.ends_with(format!(".{}", silenced_host).as_str())
+        }))
+}
+
+/**
+ * @param host punycoded instance host
+ * @returns whether the given host is allowlisted (this is always true if private mode is disabled)
+ */
+#[crate::export]
+pub async fn is_allowed_server(host: &str) -> Result<bool, DbErr> {
+    let meta = fetch_meta(true).await?;
+
+    if !meta.private_mode.unwrap_or(false) {
+        return Ok(true);
+    }
+    if let Some(allowed_hosts) = meta.allowed_hosts {
+        return Ok(allowed_hosts.contains(&host.to_string()));
+    }
+    Ok(false)
+}
diff --git a/packages/backend-rs/src/misc/mod.rs b/packages/backend-rs/src/misc/mod.rs
index a9d7074dbf..56aae3b552 100644
--- a/packages/backend-rs/src/misc/mod.rs
+++ b/packages/backend-rs/src/misc/mod.rs
@@ -1,4 +1,5 @@
 pub mod acct;
+pub mod check_server_block;
 pub mod check_word_mute;
 pub mod convert_host;
 pub mod emoji;
diff --git a/packages/backend/src/misc/should-block-instance.ts b/packages/backend/src/misc/should-block-instance.ts
deleted file mode 100644
index 465be41f2a..0000000000
--- a/packages/backend/src/misc/should-block-instance.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { fetchMeta } from "backend-rs";
-import type { Instance } from "@/models/entities/instance.js";
-import type { Meta } from "@/models/entities/meta.js";
-
-/**
- * Returns whether a specific host (punycoded) should be blocked.
- *
- * @param host punycoded instance host
- * @param meta a resolved Meta table
- * @returns whether the given host should be blocked
- */
-export async function shouldBlockInstance(
-	host: Instance["host"],
-	meta?: Meta,
-): Promise<boolean> {
-	const { blockedHosts } = meta ?? (await fetchMeta(true));
-	return blockedHosts.some(
-		(blockedHost) => host === blockedHost || host.endsWith(`.${blockedHost}`),
-	);
-}
-
-/**
- * Returns whether a specific host (punycoded) should be limited.
- *
- * @param host punycoded instance host
- * @param meta a resolved Meta table
- * @returns whether the given host should be limited
- */
-export async function shouldSilenceInstance(
-	host: Instance["host"],
-	meta?: Meta,
-): Promise<boolean> {
-	const { silencedHosts } = meta ?? (await fetchMeta(true));
-	return silencedHosts.some(
-		(silencedHost) =>
-			host === silencedHost || host.endsWith(`.${silencedHost}`),
-	);
-}
diff --git a/packages/backend/src/misc/skipped-instances.ts b/packages/backend/src/misc/skipped-instances.ts
index 14b26a3032..0c87a524f6 100644
--- a/packages/backend/src/misc/skipped-instances.ts
+++ b/packages/backend/src/misc/skipped-instances.ts
@@ -1,9 +1,8 @@
 import { Brackets } from "typeorm";
-import { fetchMeta } from "backend-rs";
+import { isBlockedServer } from "backend-rs";
 import { Instances } from "@/models/index.js";
 import type { Instance } from "@/models/entities/instance.js";
 import { DAY } from "@/const.js";
-import { shouldBlockInstance } from "./should-block-instance.js";
 
 // Threshold from last contact after which an instance will be considered
 // "dead" and should no longer get activities delivered to it.
@@ -19,16 +18,16 @@ export async function skippedInstances(
 	hosts: Instance["host"][],
 ): Promise<Instance["host"][]> {
 	// first check for blocked instances since that info may already be in memory
-	const meta = await fetchMeta(true);
 	const shouldSkip = await Promise.all(
-		hosts.map((host) => shouldBlockInstance(host, meta)),
+		hosts.map((host) => isBlockedServer(host)),
 	);
 	const skipped = hosts.filter((_, i) => shouldSkip[i]);
 
 	// if possible return early and skip accessing the database
 	if (skipped.length === hosts.length) return hosts;
 
-	const deadTime = new Date(Date.now() - deadThreshold);
+	// FIXME: Use or remove this
+	// const deadTime = new Date(Date.now() - deadThreshold);
 
 	return skipped.concat(
 		await Instances.createQueryBuilder("instance")
diff --git a/packages/backend/src/models/repositories/instance.ts b/packages/backend/src/models/repositories/instance.ts
index 667ec948de..8f479e8ea4 100644
--- a/packages/backend/src/models/repositories/instance.ts
+++ b/packages/backend/src/models/repositories/instance.ts
@@ -1,10 +1,7 @@
 import { db } from "@/db/postgre.js";
 import { Instance } from "@/models/entities/instance.js";
 import type { Packed } from "@/misc/schema.js";
-import {
-	shouldBlockInstance,
-	shouldSilenceInstance,
-} from "@/misc/should-block-instance.js";
+import { isBlockedServer, isSilencedServer } from "backend-rs";
 
 export const InstanceRepository = db.getRepository(Instance).extend({
 	async pack(instance: Instance): Promise<Packed<"FederationInstance">> {
@@ -22,8 +19,8 @@ export const InstanceRepository = db.getRepository(Instance).extend({
 			lastCommunicatedAt: instance.lastCommunicatedAt.toISOString(),
 			isNotResponding: instance.isNotResponding,
 			isSuspended: instance.isSuspended,
-			isBlocked: await shouldBlockInstance(instance.host),
-			isSilenced: await shouldSilenceInstance(instance.host),
+			isBlocked: await isBlockedServer(instance.host),
+			isSilenced: await isSilencedServer(instance.host),
 			softwareName: instance.softwareName,
 			softwareVersion: instance.softwareVersion,
 			openRegistrations: instance.openRegistrations,
diff --git a/packages/backend/src/queue/processors/inbox.ts b/packages/backend/src/queue/processors/inbox.ts
index 0ea72306b6..898c68cff3 100644
--- a/packages/backend/src/queue/processors/inbox.ts
+++ b/packages/backend/src/queue/processors/inbox.ts
@@ -5,7 +5,7 @@ import perform from "@/remote/activitypub/perform.js";
 import Logger from "@/services/logger.js";
 import { registerOrFetchInstanceDoc } from "@/services/register-or-fetch-instance-doc.js";
 import { Instances } from "@/models/index.js";
-import { fetchMeta } from "backend-rs";
+import { isAllowedServer, isBlockedServer } from "backend-rs";
 import { toPuny, extractHost } from "backend-rs";
 import { getApId } from "@/remote/activitypub/type.js";
 import { fetchInstanceMetadata } from "@/services/fetch-instance-metadata.js";
@@ -16,7 +16,6 @@ import { LdSignature } from "@/remote/activitypub/misc/ld-signature.js";
 import { StatusError } from "@/misc/fetch.js";
 import type { CacheableRemoteUser } from "@/models/entities/user.js";
 import type { UserPublickey } from "@/models/entities/user-publickey.js";
-import { shouldBlockInstance } from "@/misc/should-block-instance.js";
 import { verifySignature } from "@/remote/activitypub/check-fetch.js";
 import { inspect } from "node:util";
 
@@ -41,13 +40,12 @@ export default async (job: Bull.Job<InboxJobData>): Promise<string> => {
 	const host = toPuny(new URL(signature.keyId).hostname);
 
 	// interrupt if blocked
-	const meta = await fetchMeta(true);
-	if (await shouldBlockInstance(host, meta)) {
+	if (await isBlockedServer(host)) {
 		return `Blocked request: ${host}`;
 	}
 
 	// only whitelisted instances in private mode
-	if (meta.privateMode && !meta.allowedHosts.includes(host)) {
+	if (!isAllowedServer(host)) {
 		return `Blocked request: ${host}`;
 	}
 
@@ -158,7 +156,7 @@ export default async (job: Bull.Job<InboxJobData>): Promise<string> => {
 
 			// ブロックしてたら中断
 			const ldHost = extractHost(authUser.user.uri);
-			if (await shouldBlockInstance(ldHost, meta)) {
+			if (await isBlockedServer(ldHost)) {
 				return `Blocked request: ${ldHost}`;
 			}
 		} else {
diff --git a/packages/backend/src/remote/activitypub/check-fetch.ts b/packages/backend/src/remote/activitypub/check-fetch.ts
index 04d989064f..726d996ad8 100644
--- a/packages/backend/src/remote/activitypub/check-fetch.ts
+++ b/packages/backend/src/remote/activitypub/check-fetch.ts
@@ -1,11 +1,10 @@
 import { URL } from "url";
-import httpSignature, { IParsedSignature } from "@peertube/http-signature";
+import httpSignature, { type IParsedSignature } from "@peertube/http-signature";
 import { config } from "@/config.js";
-import { fetchMeta } from "backend-rs";
+import { fetchMeta, isAllowedServer, isBlockedServer } from "backend-rs";
 import { toPuny } from "backend-rs";
 import DbResolver from "@/remote/activitypub/db-resolver.js";
 import { getApId } from "@/remote/activitypub/type.js";
-import { shouldBlockInstance } from "@/misc/should-block-instance.js";
 import type { IncomingMessage } from "http";
 import type { CacheableRemoteUser } from "@/models/entities/user.js";
 import type { UserPublickey } from "@/models/entities/user-publickey.js";
@@ -44,15 +43,11 @@ export async function checkFetch(req: IncomingMessage): Promise<number> {
 		const keyId = new URL(signature.keyId);
 		const host = toPuny(keyId.hostname);
 
-		if (await shouldBlockInstance(host, meta)) {
+		if (await isBlockedServer(host)) {
 			return 403;
 		}
 
-		if (
-			meta.privateMode &&
-			host !== config.host &&
-			!meta.allowedHosts.includes(host)
-		) {
+		if (host !== config.host && !isAllowedServer(host)) {
 			return 403;
 		}
 
diff --git a/packages/backend/src/remote/activitypub/kernel/announce/note.ts b/packages/backend/src/remote/activitypub/kernel/announce/note.ts
index ae16c77dbd..41d1319dbd 100644
--- a/packages/backend/src/remote/activitypub/kernel/announce/note.ts
+++ b/packages/backend/src/remote/activitypub/kernel/announce/note.ts
@@ -10,7 +10,7 @@ import { getApLock } from "@/misc/app-lock.js";
 import { parseAudience } from "../../audience.js";
 import { StatusError } from "@/misc/fetch.js";
 import { Notes } from "@/models/index.js";
-import { shouldBlockInstance } from "@/misc/should-block-instance.js";
+import { isBlockedServer } from "backend-rs";
 import { inspect } from "node:util";
 
 const logger = apLogger;
@@ -31,7 +31,7 @@ export default async function (
 	}
 
 	// Interrupt if you block the announcement destination
-	if (await shouldBlockInstance(extractHost(uri))) return;
+	if (await isBlockedServer(extractHost(uri))) return;
 
 	const lock = await getApLock(uri);
 
diff --git a/packages/backend/src/remote/activitypub/kernel/index.ts b/packages/backend/src/remote/activitypub/kernel/index.ts
index f64a0e2ee8..b556550c5f 100644
--- a/packages/backend/src/remote/activitypub/kernel/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/index.ts
@@ -38,8 +38,7 @@ import block from "./block/index.js";
 import flag from "./flag/index.js";
 import move from "./move/index.js";
 import type { IObject, IActivity } from "../type.js";
-import { extractHost } from "backend-rs";
-import { shouldBlockInstance } from "@/misc/should-block-instance.js";
+import { extractHost, isBlockedServer } from "backend-rs";
 import { inspect } from "node:util";
 
 export async function performActivity(
@@ -71,7 +70,7 @@ async function performOneActivity(
 
 	if (typeof activity.id !== "undefined") {
 		const host = extractHost(getApId(activity));
-		if (await shouldBlockInstance(host)) return;
+		if (await isBlockedServer(host)) return;
 	}
 
 	if (isCreate(activity)) {
diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index b2fd67288c..4b685747ba 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -12,7 +12,7 @@ import { unique, toArray, toSingle } from "@/prelude/array.js";
 import { extractPollFromQuestion } from "./question.js";
 import vote from "@/services/note/polls/vote.js";
 import { apLogger } from "../logger.js";
-import { DriveFile } from "@/models/entities/drive-file.js";
+import type { DriveFile } from "@/models/entities/drive-file.js";
 import { extractHost, isSameOrigin, toPuny } from "backend-rs";
 import {
 	Emojis,
@@ -33,14 +33,13 @@ import {
 	getApType,
 } from "../type.js";
 import type { Emoji } from "@/models/entities/emoji.js";
-import { genId } from "backend-rs";
+import { genId, isBlockedServer } from "backend-rs";
 import { getApLock } from "@/misc/app-lock.js";
 import { createMessage } from "@/services/messages/create.js";
 import { parseAudience } from "../audience.js";
 import { extractApMentions } from "./mention.js";
 import DbResolver from "../db-resolver.js";
 import { StatusError } from "@/misc/fetch.js";
-import { shouldBlockInstance } from "@/misc/should-block-instance.js";
 import { publishNoteStream } from "@/services/stream.js";
 import { extractHashtags } from "@/misc/extract-hashtags.js";
 import { UserProfiles } from "@/models/index.js";
@@ -421,7 +420,7 @@ export async function resolveNote(
 	if (uri == null) throw new Error("missing uri");
 
 	// Abort if origin host is blocked
-	if (await shouldBlockInstance(extractHost(uri)))
+	if (await isBlockedServer(extractHost(uri)))
 		throw new StatusError(
 			"host blocked",
 			451,
diff --git a/packages/backend/src/remote/activitypub/resolver.ts b/packages/backend/src/remote/activitypub/resolver.ts
index 65e6f1d635..51419deecf 100644
--- a/packages/backend/src/remote/activitypub/resolver.ts
+++ b/packages/backend/src/remote/activitypub/resolver.ts
@@ -1,8 +1,12 @@
 import { config } from "@/config.js";
 import type { ILocalUser } from "@/models/entities/user.js";
 import { getInstanceActor } from "@/services/instance-actor.js";
-import { fetchMeta } from "backend-rs";
-import { extractHost, isSelfHost } from "backend-rs";
+import {
+	extractHost,
+	isAllowedServer,
+	isBlockedServer,
+	isSelfHost,
+} from "backend-rs";
 import { apGet } from "./request.js";
 import type { IObject, ICollection, IOrderedCollection } from "./type.js";
 import { isCollectionOrOrderedCollection, getApId } from "./type.js";
@@ -21,7 +25,6 @@ import renderQuestion from "@/remote/activitypub/renderer/question.js";
 import renderCreate from "@/remote/activitypub/renderer/create.js";
 import { renderActivity } from "@/remote/activitypub/renderer/index.js";
 import renderFollow from "@/remote/activitypub/renderer/follow.js";
-import { shouldBlockInstance } from "@/misc/should-block-instance.js";
 import { apLogger } from "@/remote/activitypub/logger.js";
 import { IsNull, Not } from "typeorm";
 
@@ -69,7 +72,7 @@ export default class Resolver {
 			apLogger.debug("Object to resolve is not a string");
 			if (typeof value.id !== "undefined") {
 				const host = extractHost(getApId(value));
-				if (await shouldBlockInstance(host)) {
+				if (await isBlockedServer(host)) {
 					throw new Error("instance is blocked");
 				}
 			}
@@ -100,17 +103,12 @@ export default class Resolver {
 			return await this.resolveLocal(value);
 		}
 
-		const meta = await fetchMeta(true);
-		if (await shouldBlockInstance(host, meta)) {
-			throw new Error("Instance is blocked");
+		if (await isBlockedServer(host)) {
+			throw new Error("This instance is blocked");
 		}
 
-		if (
-			meta.privateMode &&
-			config.host !== host &&
-			!meta.allowedHosts.includes(host)
-		) {
-			throw new Error("Instance is not allowed");
+		if (config.host !== host && !isAllowedServer(host)) {
+			throw new Error("This instance is not allowed");
 		}
 
 		if (!this.user) {
diff --git a/packages/backend/src/server/api/endpoints/ap/show.ts b/packages/backend/src/server/api/endpoints/ap/show.ts
index f1d42d8d93..56307311b2 100644
--- a/packages/backend/src/server/api/endpoints/ap/show.ts
+++ b/packages/backend/src/server/api/endpoints/ap/show.ts
@@ -4,14 +4,13 @@ import { createNote } from "@/remote/activitypub/models/note.js";
 import DbResolver from "@/remote/activitypub/db-resolver.js";
 import Resolver from "@/remote/activitypub/resolver.js";
 import { ApiError } from "@/server/api/error.js";
-import { extractHost } from "backend-rs";
+import { extractHost, isBlockedServer } from "backend-rs";
 import { Users, Notes } from "@/models/index.js";
 import type { Note } from "@/models/entities/note.js";
 import type { CacheableLocalUser, User } from "@/models/entities/user.js";
 import { isActor, isPost, getApId } from "@/remote/activitypub/type.js";
 import type { SchemaType } from "@/misc/schema.js";
 import { MINUTE } from "@/const.js";
-import { shouldBlockInstance } from "@/misc/should-block-instance.js";
 import { updateQuestion } from "@/remote/activitypub/models/question.js";
 import { populatePoll } from "@/models/repositories/note.js";
 import { redisClient } from "@/db/redis.js";
@@ -101,7 +100,7 @@ async function fetchAny(
 	me: CacheableLocalUser | null | undefined,
 ): Promise<SchemaType<(typeof meta)["res"]> | null> {
 	// Wait if blocked.
-	if (await shouldBlockInstance(extractHost(uri))) return null;
+	if (await isBlockedServer(extractHost(uri))) return null;
 
 	const dbResolver = new DbResolver();
 
diff --git a/packages/backend/src/services/create-notification.ts b/packages/backend/src/services/create-notification.ts
index a108d4f5de..93fec126d3 100644
--- a/packages/backend/src/services/create-notification.ts
+++ b/packages/backend/src/services/create-notification.ts
@@ -8,11 +8,10 @@ import {
 	Users,
 	Followings,
 } from "@/models/index.js";
-import { genId } from "backend-rs";
+import { genId, isSilencedServer } from "backend-rs";
 import type { User } from "@/models/entities/user.js";
 import type { Notification } from "@/models/entities/notification.js";
 import { sendEmailNotification } from "./send-email-notification.js";
-import { shouldSilenceInstance } from "@/misc/should-block-instance.js";
 
 export async function createNotification(
 	notifieeId: User["id"],
@@ -35,8 +34,8 @@ export async function createNotification(
 		if (
 			(notifier.isSilenced ||
 				(Users.isRemoteUser(notifier) &&
-					(await shouldSilenceInstance(notifier.host)))) &&
-			!(await Followings.exist({
+					(await isSilencedServer(notifier.host)))) &&
+			!(await Followings.exists({
 				where: { followerId: notifieeId, followeeId: data.notifierId },
 			}))
 		)
diff --git a/packages/backend/src/services/following/create.ts b/packages/backend/src/services/following/create.ts
index 7387346d1a..49852ee9ef 100644
--- a/packages/backend/src/services/following/create.ts
+++ b/packages/backend/src/services/following/create.ts
@@ -17,13 +17,12 @@ import {
 	Instances,
 	UserProfiles,
 } from "@/models/index.js";
-import { genId } from "backend-rs";
+import { genId, isSilencedServer } from "backend-rs";
 import { createNotification } from "@/services/create-notification.js";
 import { isDuplicateKeyValueError } from "@/misc/is-duplicate-key-value-error.js";
 import type { Packed } from "@/misc/schema.js";
 import { getActiveWebhooks } from "@/misc/webhook-cache.js";
 import { webhookDeliver } from "@/queue/index.js";
-import { shouldSilenceInstance } from "@/misc/should-block-instance.js";
 
 const logger = new Logger("following/create");
 
@@ -231,7 +230,7 @@ export default async function (
 		(Users.isLocalUser(follower) && Users.isRemoteUser(followee)) ||
 		(Users.isRemoteUser(follower) &&
 			Users.isLocalUser(followee) &&
-			(await shouldSilenceInstance(follower.host)))
+			(await isSilencedServer(follower.host)))
 	) {
 		let autoAccept = false;
 
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 206f6a50ad..2135847a17 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -37,14 +37,18 @@ import type { DriveFile } from "@/models/entities/drive-file.js";
 import type { App } from "@/models/entities/app.js";
 import { Not, In } from "typeorm";
 import type { User, ILocalUser, IRemoteUser } from "@/models/entities/user.js";
-import { genId } from "backend-rs";
 import { activeUsersChart } from "@/services/chart/index.js";
 import type { IPoll } from "@/models/entities/poll.js";
 import { Poll } from "@/models/entities/poll.js";
 import { createNotification } from "@/services/create-notification.js";
 import { isDuplicateKeyValueError } from "@/misc/is-duplicate-key-value-error.js";
 import { checkHitAntenna } from "@/misc/check-hit-antenna.js";
-import { addNoteToAntenna, checkWordMute } from "backend-rs";
+import {
+	addNoteToAntenna,
+	checkWordMute,
+	genId,
+	isSilencedServer,
+} from "backend-rs";
 import { countSameRenotes } from "@/misc/count-same-renotes.js";
 import { deliverToRelays, getCachedRelays } from "../relay.js";
 import type { Channel } from "@/models/entities/channel.js";
@@ -56,7 +60,6 @@ import { Cache } from "@/misc/cache.js";
 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 { redisClient } from "@/db/redis.js";
 import { Mutex } from "redis-semaphore";
 import { langmap } from "@/misc/langmap.js";
@@ -225,7 +228,7 @@ export default async (
 		if (
 			data.visibility === "public" &&
 			Users.isRemoteUser(user) &&
-			(await shouldSilenceInstance(user.host))
+			(await isSilencedServer(user.host))
 		) {
 			data.visibility = "home";
 		}

From 9acd130a22bb4eb0eaf5cde44e1c6b4adfc48d7f Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 08:57:00 +0900
Subject: [PATCH 74/99] chore (backend): update meta cache every 5 mins

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

diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index 090a84f6ea..f254aaea17 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -9,6 +9,7 @@ import semver from "semver";
 
 import Logger from "@/services/logger.js";
 import type { Config } from "backend-rs";
+import { fetchMeta } from "backend-rs";
 import { config, envOption } from "@/config.js";
 import { showMachineInfo } from "@/misc/show-machine-info.js";
 import { db, initDb } from "@/db/postgre.js";
@@ -123,6 +124,9 @@ export async function masterMain() {
 		import("../daemons/queue-stats.js").then((x) => x.default());
 		import("../daemons/janitor.js").then((x) => x.default());
 	}
+
+	// Update meta cache every 5 minitues
+	setInterval(() => fetchMeta(false), 1000 * 60 * 5);
 }
 
 function showEnvironment(): void {

From c5a344c2a035bc06ee6637491f3a11747a5958b4 Mon Sep 17 00:00:00 2001
From: Lhcfl <Lhcfl@outlook.com>
Date: Mon, 22 Apr 2024 10:32:41 +0800
Subject: [PATCH 75/99] refactor: make isSignedIn a function

---
 .../client/src/components/MkFollowButton.vue     |  2 +-
 packages/client/src/components/MkMention.vue     |  2 +-
 packages/client/src/components/MkNote.vue        |  4 ++--
 packages/client/src/components/MkNoteSub.vue     |  2 +-
 .../components/MkPushNotificationAllowButton.vue |  8 ++++----
 .../components/MkReactionsViewer.reaction.vue    |  8 +++++---
 .../client/src/components/MkReactionsViewer.vue  |  2 +-
 .../client/src/components/MkRenoteButton.vue     |  2 +-
 packages/client/src/components/MkTimeline.vue    |  4 ++--
 packages/client/src/components/MkUserInfo.vue    |  4 ++--
 packages/client/src/init.ts                      |  4 ++--
 packages/client/src/me.ts                        |  2 +-
 packages/client/src/navbar.ts                    | 14 +++++++-------
 packages/client/src/pages/announcements.vue      |  6 +++---
 packages/client/src/pages/auth.vue               |  8 ++++----
 packages/client/src/pages/clip.vue               |  2 +-
 packages/client/src/pages/explore.users.vue      | 10 +++++-----
 packages/client/src/pages/gallery/post.vue       |  4 ++--
 packages/client/src/pages/page.vue               |  4 ++--
 packages/client/src/pages/settings/drive.vue     |  2 +-
 .../src/pages/settings/preferences-backups.vue   |  4 ++--
 packages/client/src/pages/timeline.vue           | 16 ++++++++--------
 packages/client/src/pages/user/home.vue          |  6 +++---
 packages/client/src/pages/user/index.vue         |  2 +-
 packages/client/src/pizzax.ts                    | 14 +++++++-------
 packages/client/src/scripts/get-note-menu.ts     |  2 +-
 packages/client/src/scripts/get-user-menu.ts     |  4 ++--
 packages/client/src/scripts/please-login.ts      |  4 ++--
 packages/client/src/scripts/use-note-capture.ts  |  8 ++++----
 packages/client/src/store.ts                     |  4 ++--
 packages/client/src/theme-store.ts               |  4 ++--
 packages/client/src/ui/_common_/common.vue       |  2 +-
 packages/client/src/ui/deck.vue                  |  2 +-
 packages/client/src/ui/deck/tl-column.vue        |  4 ++--
 34 files changed, 86 insertions(+), 84 deletions(-)

diff --git a/packages/client/src/components/MkFollowButton.vue b/packages/client/src/components/MkFollowButton.vue
index 0920001c7b..a018c47b55 100644
--- a/packages/client/src/components/MkFollowButton.vue
+++ b/packages/client/src/components/MkFollowButton.vue
@@ -8,7 +8,7 @@
 		<i :class="icon('ph-dots-three-outline')"></i>
 	</button>
 	<button
-		v-if="!hideFollowButton && isSignedIn && me!.id != user.id"
+		v-if="!hideFollowButton && isSignedIn(me) && me!.id != user.id"
 		v-tooltip="full ? null : `${state} ${user.name || user.username}`"
 		class="kpoogebi _button follow-button"
 		:class="{
diff --git a/packages/client/src/components/MkMention.vue b/packages/client/src/components/MkMention.vue
index f943997459..6c9fb4797a 100644
--- a/packages/client/src/components/MkMention.vue
+++ b/packages/client/src/components/MkMention.vue
@@ -51,7 +51,7 @@ const canonical =
 const url = `/${canonical}`;
 
 const isMe =
-	isSignedIn &&
+	isSignedIn(me) &&
 	`@${props.username}@${toUnicode(props.host)}`.toLowerCase() ===
 		`@${me!.username}@${toUnicode(localHost)}`.toLowerCase();
 </script>
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 6a22652f60..05cad22e77 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -235,7 +235,7 @@
 					<XQuoteButton class="button" :note="appearNote" />
 					<button
 						v-if="
-							isSignedIn &&
+							isSignedIn(me) &&
 							isForeignLanguage &&
 							translation == null
 						"
@@ -370,7 +370,7 @@ const reactButton = ref<HTMLElement | null>(null);
 const appearNote = computed(() =>
 	isRenote ? (note.value.renote as NoteType) : note.value,
 );
-const isMyRenote = isSignedIn && me!.id === note.value.userId;
+const isMyRenote = isSignedIn(me) && me!.id === note.value.userId;
 // const showContent = ref(false);
 const isDeleted = ref(false);
 const muted = ref(
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index c7cf06d2e5..aed6de486d 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -127,7 +127,7 @@
 					<XQuoteButton class="button" :note="appearNote" />
 					<button
 						v-if="
-							isSignedIn &&
+							isSignedIn(me) &&
 							isForeignLanguage &&
 							translation == null
 						"
diff --git a/packages/client/src/components/MkPushNotificationAllowButton.vue b/packages/client/src/components/MkPushNotificationAllowButton.vue
index 788c9a3264..1d1be0fb05 100644
--- a/packages/client/src/components/MkPushNotificationAllowButton.vue
+++ b/packages/client/src/components/MkPushNotificationAllowButton.vue
@@ -16,7 +16,7 @@
 	<MkButton
 		v-else-if="
 			!showOnlyToRegister &&
-			(isSignedIn ? pushRegistrationInServer : pushSubscription)
+			(isSignedIn(me) ? pushRegistrationInServer : pushSubscription)
 		"
 		type="button"
 		:primary="false"
@@ -31,7 +31,7 @@
 		{{ i18n.ts.unsubscribePushNotification }}
 	</MkButton>
 	<MkButton
-		v-else-if="isSignedIn && pushRegistrationInServer"
+		v-else-if="isSignedIn(me) && pushRegistrationInServer"
 		disabled
 		:rounded="rounded"
 		:inline="inline"
@@ -142,7 +142,7 @@ async function unsubscribe() {
 
 	pushRegistrationInServer.value = undefined;
 
-	if (isSignedIn && accounts.length >= 2) {
+	if (isSignedIn(me) && accounts.length >= 2) {
 		apiWithDialog("sw/unregister", {
 			i: me.token,
 			endpoint,
@@ -189,7 +189,7 @@ if (navigator.serviceWorker == null) {
 		if (
 			instance.swPublickey &&
 			"PushManager" in window &&
-			isSignedIn &&
+			isSignedIn(me) &&
 			me.token
 		) {
 			supported.value = true;
diff --git a/packages/client/src/components/MkReactionsViewer.reaction.vue b/packages/client/src/components/MkReactionsViewer.reaction.vue
index 89f51797ab..0baa9d2eed 100644
--- a/packages/client/src/components/MkReactionsViewer.reaction.vue
+++ b/packages/client/src/components/MkReactionsViewer.reaction.vue
@@ -23,12 +23,12 @@
 
 <script lang="ts" setup>
 import { computed, ref } from "vue";
-import type { entitites } from "firefish-js";
+import type { entities } from "firefish-js";
 import XDetails from "@/components/MkReactionsViewer.details.vue";
 import XReactionIcon from "@/components/MkReactionIcon.vue";
 import * as os from "@/os";
 import { useTooltip } from "@/scripts/use-tooltip";
-import { isSignedIn } from "@/me";
+import { isSignedIn, me } from "@/me";
 
 const props = defineProps<{
 	reaction: string;
@@ -43,7 +43,9 @@ const emit = defineEmits<{
 
 const buttonRef = ref<HTMLElement>();
 
-const canToggle = computed(() => isSignedIn && !props.reaction.match(/@\w/));
+const canToggle = computed(
+	() => isSignedIn(me) && !props.reaction.match(/@\w/),
+);
 
 const toggleReaction = () => {
 	if (!canToggle.value) return;
diff --git a/packages/client/src/components/MkReactionsViewer.vue b/packages/client/src/components/MkReactionsViewer.vue
index 9977faf15f..27f1b9d435 100644
--- a/packages/client/src/components/MkReactionsViewer.vue
+++ b/packages/client/src/components/MkReactionsViewer.vue
@@ -30,7 +30,7 @@ const reactionsEl = ref<HTMLElement>();
 
 const initialReactions = new Set(Object.keys(props.note.reactions));
 
-const isMe = computed(() => isSignedIn && me.id === props.note.userId);
+const isMe = computed(() => isSignedIn(me) && me.id === props.note.userId);
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue
index 7250757da4..93ab89a151 100644
--- a/packages/client/src/components/MkRenoteButton.vue
+++ b/packages/client/src/components/MkRenoteButton.vue
@@ -74,7 +74,7 @@ useTooltip(buttonRef, async (showing) => {
 
 const hasRenotedBefore = ref(false);
 
-if (isSignedIn) {
+if (isSignedIn(me)) {
 	os.api("notes/renotes", {
 		noteId: props.note.id,
 		userId: me!.id,
diff --git a/packages/client/src/components/MkTimeline.vue b/packages/client/src/components/MkTimeline.vue
index f3fe6c7872..d9056c3b25 100644
--- a/packages/client/src/components/MkTimeline.vue
+++ b/packages/client/src/components/MkTimeline.vue
@@ -1,6 +1,6 @@
 <template>
 	<MkInfo
-		v-if="tlHint && !tlHintClosed && isSignedIn"
+		v-if="tlHint && !tlHintClosed && isSignedIn(me)"
 		:closeable="true"
 		class="_gap"
 		@close="closeHint"
@@ -120,7 +120,7 @@ const prepend = (note: entities.Note) => {
 	emit("note");
 
 	if (props.sound) {
-		sound.play(isSignedIn && note.userId === me?.id ? "noteMy" : "note");
+		sound.play(isSignedIn(me) && note.userId === me?.id ? "noteMy" : "note");
 	}
 };
 
diff --git a/packages/client/src/components/MkUserInfo.vue b/packages/client/src/components/MkUserInfo.vue
index eb4940858a..137886b4ef 100644
--- a/packages/client/src/components/MkUserInfo.vue
+++ b/packages/client/src/components/MkUserInfo.vue
@@ -8,7 +8,7 @@
 			:class="{ detailed }"
 		>
 			<span
-				v-if="isSignedIn && me.id !== user.id && user.isFollowed"
+				v-if="isSignedIn(me) && me.id !== user.id && user.isFollowed"
 				class="followed"
 				>{{ i18n.ts.followsYou }}</span
 			>
@@ -80,7 +80,7 @@
 		<div class="buttons">
 			<slot>
 				<MkFollowButton
-					v-if="isSignedIn && user.id !== me.id"
+					v-if="isSignedIn(me) && user.id !== me.id"
 					:user="user"
 				/>
 			</slot>
diff --git a/packages/client/src/init.ts b/packages/client/src/init.ts
index 17b44bb9f8..08d424cffc 100644
--- a/packages/client/src/init.ts
+++ b/packages/client/src/init.ts
@@ -262,7 +262,7 @@ function checkForSplash() {
 	}
 
 	if (
-		isSignedIn &&
+		isSignedIn(me) &&
 		defaultStore.state.tutorial === -1 &&
 		!["/announcements", "/announcements/"].includes(window.location.pathname)
 	) {
@@ -417,7 +417,7 @@ function checkForSplash() {
 		s: search,
 	};
 
-	if (isSignedIn) {
+	if (isSignedIn(me)) {
 		// only add post shortcuts if logged in
 		hotkeys["p|n"] = post;
 
diff --git a/packages/client/src/me.ts b/packages/client/src/me.ts
index 0add04975b..e0c3cb58cf 100644
--- a/packages/client/src/me.ts
+++ b/packages/client/src/me.ts
@@ -8,7 +8,7 @@ export const me = accountData
 	? reactive(JSON.parse(accountData) as Account)
 	: null;
 
-export const isSignedIn = me != null;
+export const isSignedIn = (i: typeof me): i is Account => i != null;
 export const isModerator = me != null && (me.isModerator || me.isAdmin);
 export const isEmojiMod = isModerator || me?.emojiModPerm !== "unauthorized";
 export const isAdmin = me?.isAdmin;
diff --git a/packages/client/src/navbar.ts b/packages/client/src/navbar.ts
index d06c8cf18e..771e55d60a 100644
--- a/packages/client/src/navbar.ts
+++ b/packages/client/src/navbar.ts
@@ -11,21 +11,21 @@ export const navbarItemDef = reactive({
 	notifications: {
 		title: "notifications",
 		icon: `${icon("ph-bell")}`,
-		show: computed(() => isSignedIn),
+		show: computed(() => isSignedIn(me)),
 		indicated: computed(() => me?.hasUnreadNotification),
 		to: "/my/notifications",
 	},
 	messaging: {
 		title: "messaging",
 		icon: `${icon("ph-chats-teardrop")}`,
-		show: computed(() => isSignedIn),
+		show: computed(() => isSignedIn(me)),
 		indicated: computed(() => me?.hasUnreadMessagingMessage),
 		to: "/my/messaging",
 	},
 	drive: {
 		title: "drive",
 		icon: `${icon("ph-cloud")}`,
-		show: computed(() => isSignedIn),
+		show: computed(() => isSignedIn(me)),
 		to: "/my/drive",
 	},
 	followRequests: {
@@ -54,19 +54,19 @@ export const navbarItemDef = reactive({
 	lists: {
 		title: "lists",
 		icon: `${icon("ph-list-bullets")}`,
-		show: computed(() => isSignedIn),
+		show: computed(() => isSignedIn(me)),
 		to: "/my/lists",
 	},
 	antennas: {
 		title: "antennas",
 		icon: `${icon("ph-flying-saucer")}`,
-		show: computed(() => isSignedIn),
+		show: computed(() => isSignedIn(me)),
 		to: "/my/antennas",
 	},
 	favorites: {
 		title: "favorites",
 		icon: `${icon("ph-bookmark-simple")}`,
-		show: computed(() => isSignedIn),
+		show: computed(() => isSignedIn(me)),
 		to: "/my/favorites",
 	},
 	pages: {
@@ -82,7 +82,7 @@ export const navbarItemDef = reactive({
 	clips: {
 		title: "clips",
 		icon: `${icon("ph-paperclip")}`,
-		show: computed(() => isSignedIn),
+		show: computed(() => isSignedIn(me)),
 		to: "/my/clips",
 	},
 	channels: {
diff --git a/packages/client/src/pages/announcements.vue b/packages/client/src/pages/announcements.vue
index 59b703a35e..bd861e226a 100644
--- a/packages/client/src/pages/announcements.vue
+++ b/packages/client/src/pages/announcements.vue
@@ -17,7 +17,7 @@
 				>
 					<div class="_title">
 						<h3>
-							<span v-if="isSignedIn && !announcement.isRead">
+							<span v-if="isSignedIn(me) && !announcement.isRead">
 								🆕&nbsp;
 							</span>
 							{{ announcement.title }}
@@ -37,7 +37,7 @@
 						/>
 					</div>
 					<div
-						v-if="isSignedIn && !announcement.isRead"
+						v-if="isSignedIn(me) && !announcement.isRead"
 						class="_footer"
 					>
 						<MkButton primary @click="read(announcement.id)"
@@ -60,7 +60,7 @@ import * as os from "@/os";
 import { i18n } from "@/i18n";
 import { definePageMetadata } from "@/scripts/page-metadata";
 import icon from "@/scripts/icon";
-import { isSignedIn } from "@/me";
+import { isSignedIn, me } from "@/me";
 
 const pagination = {
 	endpoint: "announcements" as const,
diff --git a/packages/client/src/pages/auth.vue b/packages/client/src/pages/auth.vue
index a874d0fd26..504343405f 100644
--- a/packages/client/src/pages/auth.vue
+++ b/packages/client/src/pages/auth.vue
@@ -1,8 +1,8 @@
 <template>
-	<div v-if="isSignedIn && fetching" class="">
+	<div v-if="isSignedIn(me) && fetching" class="">
 		<MkLoading />
 	</div>
-	<div v-else-if="isSignedIn">
+	<div v-else-if="isSignedIn(me)">
 		<XForm
 			v-if="state == 'waiting'"
 			ref="form"
@@ -52,7 +52,7 @@ import MkSignin from "@/components/MkSignin.vue";
 import MkKeyValue from "@/components/MkKeyValue.vue";
 import * as os from "@/os";
 import { signIn } from "@/account";
-import { isSignedIn } from "@/me";
+import { isSignedIn, me } from "@/me";
 import { i18n } from "@/i18n";
 
 const props = defineProps<{
@@ -64,7 +64,7 @@ const fetching = ref(true);
 const auth_code = ref("");
 
 onMounted(() => {
-	if (!isSignedIn) return;
+	if (!isSignedIn(me)) return;
 
 	os.api("auth/session/show", { token: props.token })
 		.then((sess: any) => {
diff --git a/packages/client/src/pages/clip.vue b/packages/client/src/pages/clip.vue
index 8507721519..6f99f66062 100644
--- a/packages/client/src/pages/clip.vue
+++ b/packages/client/src/pages/clip.vue
@@ -51,7 +51,7 @@ const pagination = {
 };
 
 const isOwned: boolean | null = computed<boolean | null>(
-	() => isSignedIn && clip.value && me.id === clip.value.userId,
+	() => isSignedIn(me) && clip.value && me.id === clip.value.userId,
 );
 
 watch(
diff --git a/packages/client/src/pages/explore.users.vue b/packages/client/src/pages/explore.users.vue
index ac68bb8d2d..369399e8db 100644
--- a/packages/client/src/pages/explore.users.vue
+++ b/packages/client/src/pages/explore.users.vue
@@ -17,7 +17,7 @@
 					<XUserList :pagination="pinnedUsers" />
 				</MkFolder>
 				<MkFolder
-					v-if="isSignedIn"
+					v-if="isSignedIn(me)"
 					class="_gap"
 					persist-key="explore-popular-users"
 				>
@@ -31,7 +31,7 @@
 					<XUserList :pagination="popularUsers" />
 				</MkFolder>
 				<MkFolder
-					v-if="isSignedIn"
+					v-if="isSignedIn(me)"
 					class="_gap"
 					persist-key="explore-recently-updated-users"
 				>
@@ -45,7 +45,7 @@
 					<XUserList :pagination="recentlyUpdatedUsers" />
 				</MkFolder>
 				<MkFolder
-					v-if="isSignedIn"
+					v-if="isSignedIn(me)"
 					class="_gap"
 					persist-key="explore-recently-registered-users"
 				>
@@ -103,7 +103,7 @@
 				<XUserList :pagination="tagUsers" />
 			</MkFolder>
 
-			<template v-if="tag == null && isSignedIn">
+			<template v-if="tag == null && isSignedIn(me)">
 				<MkFolder class="_gap">
 					<template #header
 						><i
@@ -146,7 +146,7 @@ import MkFolder from "@/components/MkFolder.vue";
 import MkTab from "@/components/MkTab.vue";
 import * as os from "@/os";
 import { i18n } from "@/i18n";
-import { isSignedIn } from "@/me";
+import { isSignedIn, me } from "@/me";
 import icon from "@/scripts/icon";
 
 const props = defineProps<{
diff --git a/packages/client/src/pages/gallery/post.vue b/packages/client/src/pages/gallery/post.vue
index 91b6b764c5..c1f23bc123 100644
--- a/packages/client/src/pages/gallery/post.vue
+++ b/packages/client/src/pages/gallery/post.vue
@@ -59,7 +59,7 @@
 								<div class="other">
 									<button
 										v-if="
-											isSignedIn && me!.id === post.user.id
+											isSignedIn(me) && me!.id === post.user.id
 										"
 										v-tooltip="i18n.ts.toEdit"
 										v-click-anime
@@ -105,7 +105,7 @@
 									<MkAcct :user="post.user" />
 								</div>
 								<MkFollowButton
-									v-if="!isSignedIn || me!.id != post.user.id"
+									v-if="!isSignedIn(me) || me!.id != post.user.id"
 									:user="post.user"
 									:inline="true"
 									:transparent="false"
diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue
index 9ccfed4271..15987d3fb0 100644
--- a/packages/client/src/pages/page.vue
+++ b/packages/client/src/pages/page.vue
@@ -51,7 +51,7 @@
 									/></MkA>
 									<template
 										v-if="
-											isSignedIn && me.id === page.userId
+											isSignedIn(me) && me.id === page.userId
 										"
 									>
 										<MkA
@@ -159,7 +159,7 @@
 						</div>
 						<!-- <div class="links">
 						<MkA :to="`/@${username}/pages/${pageName}/view-source`" class="link">{{ i18n.ts._pages.viewSource }}</MkA>
-						<template v-if="isSignedIn && me.id === page.userId">
+						<template v-if="isSignedIn(me) && me.id === page.userId">
 							<MkA :to="`/pages/edit/${page.id}`" class="link">{{ i18n.ts._pages.editThisPage }}</MkA>
 							<button v-if="me.pinnedPageId === page.id" class="link _textButton" @click="pin(false)">{{ i18n.ts.unpin }}</button>
 							<button v-else class="link _textButton" @click="pin(true)">{{ i18n.ts.pin }}</button>
diff --git a/packages/client/src/pages/settings/drive.vue b/packages/client/src/pages/settings/drive.vue
index eb279cc372..b4586d986e 100644
--- a/packages/client/src/pages/settings/drive.vue
+++ b/packages/client/src/pages/settings/drive.vue
@@ -64,7 +64,7 @@ const fetching = ref(true);
 const usage = ref<any>(null);
 const capacity = ref<any>(null);
 const uploadFolder = ref<any>(null);
-const alwaysMarkNsfw = ref<boolean>(isSignedIn && me.alwaysMarkNsfw);
+const alwaysMarkNsfw = ref<boolean>(isSignedIn(me) && me.alwaysMarkNsfw);
 
 const meterStyle = computed(() => {
 	return {
diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue
index 15ff5de402..d0361d39f9 100644
--- a/packages/client/src/pages/settings/preferences-backups.vue
+++ b/packages/client/src/pages/settings/preferences-backups.vue
@@ -65,7 +65,7 @@ import * as os from "@/os";
 import { ColdDeviceStorage, defaultStore } from "@/store";
 import { unisonReload } from "@/scripts/unison-reload";
 import { useStream } from "@/stream";
-import { isSignedIn } from "@/me";
+import { isSignedIn, me } from "@/me";
 import { i18n } from "@/i18n";
 import { host, version } from "@/config";
 import { definePageMetadata } from "@/scripts/page-metadata";
@@ -170,7 +170,7 @@ interface Profile {
 	};
 }
 
-const connection = isSignedIn && stream.useChannel("main");
+const connection = isSignedIn(me) && stream.useChannel("main");
 
 const profiles = ref<Record<string, Profile> | null>(null);
 
diff --git a/packages/client/src/pages/timeline.vue b/packages/client/src/pages/timeline.vue
index 8a577e78ce..31434338b2 100644
--- a/packages/client/src/pages/timeline.vue
+++ b/packages/client/src/pages/timeline.vue
@@ -75,28 +75,28 @@ import * as os from "@/os";
 import { defaultStore } from "@/store";
 import { i18n } from "@/i18n";
 import { instance } from "@/instance";
-import { isModerator, isSignedIn } from "@/me";
+import { isModerator, isSignedIn, me } from "@/me";
 import { definePageMetadata } from "@/scripts/page-metadata";
 import { deviceKind } from "@/scripts/device-kind";
 import icon from "@/scripts/icon";
 import "swiper/scss";
 import "swiper/scss/virtual";
 
-if (isSignedIn && defaultStore.reactiveState.tutorial.value !== -1) {
+if (isSignedIn(me) && defaultStore.reactiveState.tutorial.value !== -1) {
 	os.popup(XTutorial, {}, {}, "closed");
 }
 
-const isHomeTimelineAvailable = isSignedIn;
+const isHomeTimelineAvailable = isSignedIn(me);
 const isLocalTimelineAvailable =
 	(!instance.disableLocalTimeline &&
-		(isSignedIn || instance.enableGuestTimeline)) ||
+		(isSignedIn(me) || instance.enableGuestTimeline)) ||
 	isModerator;
-const isSocialTimelineAvailable = isLocalTimelineAvailable && isSignedIn;
+const isSocialTimelineAvailable = isLocalTimelineAvailable && isSignedIn(me);
 const isRecommendedTimelineAvailable =
-	!instance.disableRecommendedTimeline && isSignedIn;
+	!instance.disableRecommendedTimeline && isSignedIn(me);
 const isGlobalTimelineAvailable =
 	(!instance.disableGlobalTimeline &&
-		(isSignedIn || instance.enableGuestTimeline)) ||
+		(isSignedIn(me) || instance.enableGuestTimeline)) ||
 	isModerator;
 const keymap = {
 	t: focus,
@@ -205,7 +205,7 @@ function focus(): void {
 }
 
 const headerActions = computed(() =>
-	isSignedIn
+	isSignedIn(me)
 		? [
 				{
 					icon: `${icon("ph-list-bullets")}`,
diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue
index 463e5cb4a2..a92bbb3b70 100644
--- a/packages/client/src/pages/user/home.vue
+++ b/packages/client/src/pages/user/home.vue
@@ -67,7 +67,7 @@
 									</div>
 									<span
 										v-if="
-											isSignedIn &&
+											isSignedIn(me) &&
 											me.id !== user.id &&
 											user.isFollowed
 										"
@@ -120,7 +120,7 @@
 								/>
 								<span
 									v-if="
-										isSignedIn &&
+										isSignedIn(me) &&
 										me.id !== user.id &&
 										user.isFollowed
 									"
@@ -319,7 +319,7 @@
 						/>
 					</div>
 					<MkInfo
-						v-else-if="isSignedIn && me.id === user.id"
+						v-else-if="isSignedIn(me) && me.id === user.id"
 						style="margin: 12px 0"
 						>{{ i18n.ts.userPagePinTip }}</MkInfo
 					>
diff --git a/packages/client/src/pages/user/index.vue b/packages/client/src/pages/user/index.vue
index 3e079f95cb..6450524687 100644
--- a/packages/client/src/pages/user/index.vue
+++ b/packages/client/src/pages/user/index.vue
@@ -93,7 +93,7 @@ const headerTabs = computed(() =>
 					title: i18n.ts.media,
 					icon: `${icon("ph-grid-four")}`,
 				},
-				...((isSignedIn && me.id === user.value.id) ||
+				...((isSignedIn(me) && me.id === user.value.id) ||
 				user.value.publicReactions
 					? [
 							{
diff --git a/packages/client/src/pizzax.ts b/packages/client/src/pizzax.ts
index 6974df94dc..77b3e53934 100644
--- a/packages/client/src/pizzax.ts
+++ b/packages/client/src/pizzax.ts
@@ -17,7 +17,7 @@ type StateDef = Record<
 type ArrayElement<A> = A extends readonly (infer T)[] ? T : never;
 
 const stream = useStream();
-const connection = isSignedIn && stream.useChannel("main");
+const connection = isSignedIn(me) ? null : stream.useChannel("main");
 
 export class Storage<T extends StateDef> {
 	public readonly key: string;
@@ -43,12 +43,12 @@ export class Storage<T extends StateDef> {
 		const deviceState = JSON.parse(
 			localStorage.getItem(this.keyForLocalStorage) || "{}",
 		);
-		const deviceAccountState = isSignedIn
+		const deviceAccountState = isSignedIn(me)
 			? JSON.parse(
 					localStorage.getItem(`${this.keyForLocalStorage}::${me.id}`) || "{}",
 				)
 			: {};
-		const registryCache = isSignedIn
+		const registryCache = isSignedIn(me)
 			? JSON.parse(
 					localStorage.getItem(`${this.keyForLocalStorage}::cache::${me.id}`) ||
 						"{}",
@@ -65,7 +65,7 @@ export class Storage<T extends StateDef> {
 				state[k] = deviceState[k];
 			} else if (
 				v.where === "account" &&
-				isSignedIn &&
+				isSignedIn(me) &&
 				Object.prototype.hasOwnProperty.call(registryCache, k)
 			) {
 				state[k] = registryCache[k];
@@ -85,7 +85,7 @@ export class Storage<T extends StateDef> {
 		this.state = state as any;
 		this.reactiveState = reactiveState as any;
 
-		if (isSignedIn) {
+		if (isSignedIn(me)) {
 			// なぜかsetTimeoutしないとapi関数内でエラーになる(おそらく循環参照してることに原因がありそう)
 			window.setTimeout(() => {
 				api("i/registry/get-all", { scope: ["client", this.key] }).then(
@@ -169,7 +169,7 @@ export class Storage<T extends StateDef> {
 				break;
 			}
 			case "deviceAccount": {
-				if (!isSignedIn) break;
+				if (!isSignedIn(me)) break;
 				const deviceAccountState = JSON.parse(
 					localStorage.getItem(`${this.keyForLocalStorage}::${me.id}`) || "{}",
 				);
@@ -181,7 +181,7 @@ export class Storage<T extends StateDef> {
 				break;
 			}
 			case "account": {
-				if (!isSignedIn) break;
+				if (!isSignedIn(me)) break;
 				const cache = JSON.parse(
 					localStorage.getItem(`${this.keyForLocalStorage}::cache::${me.id}`) ||
 						"{}",
diff --git a/packages/client/src/scripts/get-note-menu.ts b/packages/client/src/scripts/get-note-menu.ts
index 25091f2da2..1bc2941acc 100644
--- a/packages/client/src/scripts/get-note-menu.ts
+++ b/packages/client/src/scripts/get-note-menu.ts
@@ -293,7 +293,7 @@ export function getNoteMenu(props: {
 	}
 
 	let menu: MenuItem[];
-	if (isSignedIn) {
+	if (isSignedIn(me)) {
 		const statePromise = os.api("notes/state", {
 			noteId: appearNote.id,
 		});
diff --git a/packages/client/src/scripts/get-user-menu.ts b/packages/client/src/scripts/get-user-menu.ts
index aac687d207..3ccb6c62a2 100644
--- a/packages/client/src/scripts/get-user-menu.ts
+++ b/packages/client/src/scripts/get-user-menu.ts
@@ -335,7 +335,7 @@ export function getUserMenu(user, router: Router = mainRouter) {
 		},
 	] as any;
 
-	if (isSignedIn && me.id !== user.id) {
+	if (isSignedIn(me) && me.id !== user.id) {
 		menu = menu.concat([
 			{
 				icon: user.isMuted ? "ph-eye ph-lg" : "ph-eye-slash ph-lg",
@@ -386,7 +386,7 @@ export function getUserMenu(user, router: Router = mainRouter) {
 		}
 	}
 
-	if (isSignedIn && me.id === user.id) {
+	if (isSignedIn(me) && me.id === user.id) {
 		menu = menu.concat([
 			null,
 			{
diff --git a/packages/client/src/scripts/please-login.ts b/packages/client/src/scripts/please-login.ts
index b66802b816..80c6e5b645 100644
--- a/packages/client/src/scripts/please-login.ts
+++ b/packages/client/src/scripts/please-login.ts
@@ -1,11 +1,11 @@
 import { defineAsyncComponent } from "vue";
-import { isSignedIn } from "@/me";
+import { isSignedIn, me } from "@/me";
 import { i18n } from "@/i18n";
 import { popup } from "@/os";
 import { vibrate } from "@/scripts/vibrate";
 
 export function pleaseLogin(path?: string) {
-	if (isSignedIn) return;
+	if (isSignedIn(me)) return;
 	vibrate(100);
 
 	popup(
diff --git a/packages/client/src/scripts/use-note-capture.ts b/packages/client/src/scripts/use-note-capture.ts
index 1bc32d5246..09043044cd 100644
--- a/packages/client/src/scripts/use-note-capture.ts
+++ b/packages/client/src/scripts/use-note-capture.ts
@@ -11,7 +11,7 @@ export function useNoteCapture(props: {
 	isDeletedRef: Ref<boolean>;
 }) {
 	const note = props.note;
-	const connection = isSignedIn ? useStream() : null;
+	const connection = isSignedIn(me) ? useStream() : null;
 
 	async function onStreamNoteUpdated(noteData): Promise<void> {
 		const { type, id, body } = noteData;
@@ -34,7 +34,7 @@ export function useNoteCapture(props: {
 
 				note.value.reactions[reaction] = currentCount + 1;
 
-				if (isSignedIn && body.userId === me.id) {
+				if (isSignedIn(me) && body.userId === me.id) {
 					note.value.myReaction = reaction;
 				}
 				break;
@@ -48,7 +48,7 @@ export function useNoteCapture(props: {
 
 				note.value.reactions[reaction] = Math.max(0, currentCount - 1);
 
-				if (isSignedIn && body.userId === me.id) {
+				if (isSignedIn(me) && body.userId === me.id) {
 					note.value.myReaction = undefined;
 				}
 				break;
@@ -62,7 +62,7 @@ export function useNoteCapture(props: {
 					choices[choice] = {
 						...choices[choice],
 						votes: choices[choice].votes + 1,
-						...(isSignedIn && body.userId === me.id
+						...(isSignedIn(me) && body.userId === me.id
 							? {
 									isVoted: true,
 								}
diff --git a/packages/client/src/store.ts b/packages/client/src/store.ts
index 0adc4e76db..fed9acc035 100644
--- a/packages/client/src/store.ts
+++ b/packages/client/src/store.ts
@@ -1,6 +1,6 @@
 import { markRaw, ref } from "vue";
 import type { ApiTypes, entities } from "firefish-js";
-import { isSignedIn } from "./me";
+import { isSignedIn, me } from "./me";
 import { Storage } from "./pizzax";
 import type { NoteVisibility } from "@/types/note";
 
@@ -167,7 +167,7 @@ export const defaultStore = markRaw(
 		tl: {
 			where: "deviceAccount",
 			default: {
-				src: (isSignedIn ? "home" : "local") as
+				src: (isSignedIn(me) ? "home" : "local") as
 					| "home"
 					| "local"
 					| "social"
diff --git a/packages/client/src/theme-store.ts b/packages/client/src/theme-store.ts
index a5957dea8f..bc344b339d 100644
--- a/packages/client/src/theme-store.ts
+++ b/packages/client/src/theme-store.ts
@@ -2,14 +2,14 @@ import type { Theme } from "./scripts/theme";
 import { isSignedIn, me } from "@/me";
 import { api } from "@/os";
 
-const lsCacheKey = isSignedIn ? `themes:${me.id}` : "";
+const lsCacheKey = isSignedIn(me) ? `themes:${me.id}` : "";
 
 export function getThemes(): Theme[] {
 	return JSON.parse(localStorage.getItem(lsCacheKey) || "[]");
 }
 
 export async function fetchThemes(): Promise<void> {
-	if (!isSignedIn) return;
+	if (!isSignedIn(me)) return;
 
 	try {
 		const themes = await api("i/registry/get", {
diff --git a/packages/client/src/ui/_common_/common.vue b/packages/client/src/ui/_common_/common.vue
index b4f20869b8..c90533581f 100644
--- a/packages/client/src/ui/_common_/common.vue
+++ b/packages/client/src/ui/_common_/common.vue
@@ -57,7 +57,7 @@ const onNotification = (notification) => {
 	sound.play("notification");
 };
 
-if (isSignedIn) {
+if (isSignedIn(me)) {
 	const connection = stream.useChannel("main", null, "UI");
 	connection.on("notification", onNotification);
 
diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue
index cab107809d..3337841c0a 100644
--- a/packages/client/src/ui/deck.vue
+++ b/packages/client/src/ui/deck.vue
@@ -239,7 +239,7 @@ watch(route, () => {
 const columns = deckStore.reactiveState.columns;
 const layout = deckStore.reactiveState.layout;
 const menuIndicated = computed(() => {
-	if (!isSignedIn) return false;
+	if (!isSignedIn(me)) return false;
 	for (const def in navbarItemDef) {
 		if (navbarItemDef[def].indicated) return true;
 	}
diff --git a/packages/client/src/ui/deck/tl-column.vue b/packages/client/src/ui/deck/tl-column.vue
index ae26489b2a..1a4707988b 100644
--- a/packages/client/src/ui/deck/tl-column.vue
+++ b/packages/client/src/ui/deck/tl-column.vue
@@ -50,7 +50,7 @@ import type { Column } from "./deck-store";
 import { removeColumn, updateColumn } from "./deck-store";
 import XTimeline from "@/components/MkTimeline.vue";
 import * as os from "@/os";
-import { isModerator, isSignedIn } from "@/me";
+import { isModerator, isSignedIn, me } from "@/me";
 import { instance } from "@/instance";
 import { i18n } from "@/i18n";
 import icon from "@/scripts/icon";
@@ -72,7 +72,7 @@ const columnActive = ref(true);
 onMounted(() => {
 	if (props.column.tl == null) {
 		setType();
-	} else if (isSignedIn) {
+	} else if (isSignedIn(me)) {
 		disabled.value =
 			!isModerator &&
 			((instance.disableLocalTimeline &&

From 29da81317032f71ebdf9beeeb282fb5e590fe11f Mon Sep 17 00:00:00 2001
From: Lhcfl <Lhcfl@outlook.com>
Date: Mon, 22 Apr 2024 10:54:16 +0800
Subject: [PATCH 76/99] fix typo

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

diff --git a/packages/client/src/pizzax.ts b/packages/client/src/pizzax.ts
index 77b3e53934..7c952978a1 100644
--- a/packages/client/src/pizzax.ts
+++ b/packages/client/src/pizzax.ts
@@ -17,7 +17,7 @@ type StateDef = Record<
 type ArrayElement<A> = A extends readonly (infer T)[] ? T : never;
 
 const stream = useStream();
-const connection = isSignedIn(me) ? null : stream.useChannel("main");
+const connection = isSignedIn(me) ? stream.useChannel("main") : null; 
 
 export class Storage<T extends StateDef> {
 	public readonly key: string;

From a49f9c33efcb8a8b3f534f853bf356ba9d7814cd Mon Sep 17 00:00:00 2001
From: Lhcfl <Lhcfl@outlook.com>
Date: Mon, 22 Apr 2024 11:02:35 +0800
Subject: [PATCH 77/99] chore: format

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

diff --git a/packages/client/src/pizzax.ts b/packages/client/src/pizzax.ts
index 7c952978a1..ce35dbeb24 100644
--- a/packages/client/src/pizzax.ts
+++ b/packages/client/src/pizzax.ts
@@ -17,7 +17,7 @@ type StateDef = Record<
 type ArrayElement<A> = A extends readonly (infer T)[] ? T : never;
 
 const stream = useStream();
-const connection = isSignedIn(me) ? stream.useChannel("main") : null; 
+const connection = isSignedIn(me) ? stream.useChannel("main") : null;
 
 export class Storage<T extends StateDef> {
 	public readonly key: string;

From 08926ceb8c0cf6889891f466b04ac5fd87df3416 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 21:56:38 +0900
Subject: [PATCH 78/99] dev (backend-rs): add basic Redis cache setter/getter

---
 Cargo.lock                                  | 23 ++++++
 Cargo.toml                                  |  1 +
 packages/backend-rs/Cargo.toml              |  1 +
 packages/backend-rs/src/misc/mod.rs         |  1 +
 packages/backend-rs/src/misc/redis_cache.rs | 84 +++++++++++++++++++++
 5 files changed, 110 insertions(+)
 create mode 100644 packages/backend-rs/src/misc/redis_cache.rs

diff --git a/Cargo.lock b/Cargo.lock
index 6cb32a21d0..f34ed4aea4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -222,6 +222,7 @@ dependencies = [
  "rand",
  "redis",
  "regex",
+ "rmp-serde",
  "schemars",
  "sea-orm",
  "serde",
@@ -2012,6 +2013,28 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "rmp"
+version = "0.8.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "228ed7c16fa39782c3b3468e974aec2795e9089153cd08ee2e9aefb3613334c4"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "938a142ab806f18b88a97b0dea523d39e0fd730a064b035726adcfc58a8a5188"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
 [[package]]
 name = "rsa"
 version = "0.9.6"
diff --git a/Cargo.toml b/Cargo.toml
index 0bde324447..2beb8e3fe5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,6 +28,7 @@ quote = "1.0.36"
 rand = "0.8.5"
 redis = "0.25.3"
 regex = "1.10.4"
+rmp-serde = "1.2.0"
 schemars = "0.8.16"
 sea-orm = "0.12.15"
 serde = "1.0.197"
diff --git a/packages/backend-rs/Cargo.toml b/packages/backend-rs/Cargo.toml
index 93c57dc321..5a18dc92cf 100644
--- a/packages/backend-rs/Cargo.toml
+++ b/packages/backend-rs/Cargo.toml
@@ -32,6 +32,7 @@ parse-display = { workspace = true }
 rand = { workspace = true }
 redis = { workspace = true }
 regex = { workspace = true }
+rmp-serde = { workspace = true }
 schemars = { workspace = true, features = ["chrono"] }
 sea-orm = { workspace = true, features = ["sqlx-postgres", "runtime-tokio-rustls"] }
 serde = { workspace = true, features = ["derive"] }
diff --git a/packages/backend-rs/src/misc/mod.rs b/packages/backend-rs/src/misc/mod.rs
index 56aae3b552..24cec14969 100644
--- a/packages/backend-rs/src/misc/mod.rs
+++ b/packages/backend-rs/src/misc/mod.rs
@@ -11,3 +11,4 @@ pub mod meta;
 pub mod nyaify;
 pub mod password;
 pub mod reaction;
+pub mod redis_cache;
diff --git a/packages/backend-rs/src/misc/redis_cache.rs b/packages/backend-rs/src/misc/redis_cache.rs
new file mode 100644
index 0000000000..d4924bb646
--- /dev/null
+++ b/packages/backend-rs/src/misc/redis_cache.rs
@@ -0,0 +1,84 @@
+use crate::database::{redis_conn, redis_key};
+use redis::{Commands, RedisError};
+use serde::{Deserialize, Serialize};
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error("Redis error: {0}")]
+    RedisError(#[from] RedisError),
+    #[error("Data serialization error: {0}")]
+    SerializeError(#[from] rmp_serde::encode::Error),
+    #[error("Data deserialization error: {0}")]
+    DeserializeError(#[from] rmp_serde::decode::Error),
+}
+
+pub fn set_cache<V: for<'a> Deserialize<'a> + Serialize>(
+    key: &str,
+    value: &V,
+    expire_seconds: u64,
+) -> Result<(), Error> {
+    redis_conn()?.set_ex(
+        redis_key(key),
+        rmp_serde::encode::to_vec(&value)?,
+        expire_seconds,
+    )?;
+    Ok(())
+}
+
+pub fn get_cache<V: for<'a> Deserialize<'a> + Serialize>(key: &str) -> Result<Option<V>, Error> {
+    let serialized_value: Option<Vec<u8>> = redis_conn()?.get(redis_key(key))?;
+    Ok(match serialized_value {
+        Some(v) => Some(rmp_serde::from_slice::<V>(v.as_ref())?),
+        None => None,
+    })
+}
+
+#[cfg(test)]
+mod unit_test {
+    use super::{get_cache, set_cache};
+    use pretty_assertions::assert_eq;
+
+    #[test]
+    fn set_get_expire() {
+        #[derive(serde::Deserialize, serde::Serialize, PartialEq, Debug)]
+        struct Data {
+            id: u32,
+            kind: String,
+        }
+
+        let key_1 = "CARGO_TEST_CACHE_KEY_1";
+        let value_1: Vec<i32> = vec![1, 2, 3, 4, 5];
+
+        let key_2 = "CARGO_TEST_CACHE_KEY_2";
+        let value_2 = "Hello fedizens".to_string();
+
+        let key_3 = "CARGO_TEST_CACHE_KEY_3";
+        let value_3 = Data {
+            id: 1000000007,
+            kind: "prime number".to_string(),
+        };
+
+        set_cache(key_1, &value_1, 1).unwrap();
+        set_cache(key_2, &value_2, 1).unwrap();
+        set_cache(key_3, &value_3, 1).unwrap();
+
+        let cached_value_1: Vec<i32> = get_cache(key_1).unwrap().unwrap();
+        let cached_value_2: String = get_cache(key_2).unwrap().unwrap();
+        let cached_value_3: Data = get_cache(key_3).unwrap().unwrap();
+
+        assert_eq!(value_1, cached_value_1);
+        assert_eq!(value_2, cached_value_2);
+        assert_eq!(value_3, cached_value_3);
+
+        // wait for the cache to expire
+        std::thread::sleep(std::time::Duration::from_millis(1100));
+
+        let expired_value_1: Option<Vec<i32>> = get_cache(key_1).unwrap();
+        let expired_value_2: Option<Vec<i32>> = get_cache(key_2).unwrap();
+        let expired_value_3: Option<Vec<i32>> = get_cache(key_3).unwrap();
+
+        assert!(expired_value_1.is_none());
+        assert!(expired_value_2.is_none());
+        assert!(expired_value_3.is_none());
+    }
+}

From c6d0fe52d21966c060ee7bc8723a65682411ee05 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Mon, 22 Apr 2024 22:44:43 +0900
Subject: [PATCH 79/99] chore (client): remove unnecessary non-null assertions

---
 packages/client/src/components/MkFollowButton.vue | 2 +-
 packages/client/src/components/MkMention.vue      | 2 +-
 packages/client/src/components/MkNote.vue         | 2 +-
 packages/client/src/components/MkRenoteButton.vue | 2 +-
 packages/client/src/pages/gallery/post.vue        | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/components/MkFollowButton.vue b/packages/client/src/components/MkFollowButton.vue
index a018c47b55..4e2d884749 100644
--- a/packages/client/src/components/MkFollowButton.vue
+++ b/packages/client/src/components/MkFollowButton.vue
@@ -8,7 +8,7 @@
 		<i :class="icon('ph-dots-three-outline')"></i>
 	</button>
 	<button
-		v-if="!hideFollowButton && isSignedIn(me) && me!.id != user.id"
+		v-if="!hideFollowButton && isSignedIn(me) && me.id != user.id"
 		v-tooltip="full ? null : `${state} ${user.name || user.username}`"
 		class="kpoogebi _button follow-button"
 		:class="{
diff --git a/packages/client/src/components/MkMention.vue b/packages/client/src/components/MkMention.vue
index 6c9fb4797a..62626f8373 100644
--- a/packages/client/src/components/MkMention.vue
+++ b/packages/client/src/components/MkMention.vue
@@ -53,7 +53,7 @@ const url = `/${canonical}`;
 const isMe =
 	isSignedIn(me) &&
 	`@${props.username}@${toUnicode(props.host)}`.toLowerCase() ===
-		`@${me!.username}@${toUnicode(localHost)}`.toLowerCase();
+		`@${me.username}@${toUnicode(localHost)}`.toLowerCase();
 </script>
 
 <style lang="scss" scoped>
diff --git a/packages/client/src/components/MkNote.vue b/packages/client/src/components/MkNote.vue
index 05cad22e77..41b396c173 100644
--- a/packages/client/src/components/MkNote.vue
+++ b/packages/client/src/components/MkNote.vue
@@ -370,7 +370,7 @@ const reactButton = ref<HTMLElement | null>(null);
 const appearNote = computed(() =>
 	isRenote ? (note.value.renote as NoteType) : note.value,
 );
-const isMyRenote = isSignedIn(me) && me!.id === note.value.userId;
+const isMyRenote = isSignedIn(me) && me.id === note.value.userId;
 // const showContent = ref(false);
 const isDeleted = ref(false);
 const muted = ref(
diff --git a/packages/client/src/components/MkRenoteButton.vue b/packages/client/src/components/MkRenoteButton.vue
index 93ab89a151..4f0a669c11 100644
--- a/packages/client/src/components/MkRenoteButton.vue
+++ b/packages/client/src/components/MkRenoteButton.vue
@@ -77,7 +77,7 @@ const hasRenotedBefore = ref(false);
 if (isSignedIn(me)) {
 	os.api("notes/renotes", {
 		noteId: props.note.id,
-		userId: me!.id,
+		userId: me.id,
 		limit: 1,
 	}).then((res) => {
 		hasRenotedBefore.value = res.length > 0;
diff --git a/packages/client/src/pages/gallery/post.vue b/packages/client/src/pages/gallery/post.vue
index c1f23bc123..a26006ae6a 100644
--- a/packages/client/src/pages/gallery/post.vue
+++ b/packages/client/src/pages/gallery/post.vue
@@ -59,7 +59,7 @@
 								<div class="other">
 									<button
 										v-if="
-											isSignedIn(me) && me!.id === post.user.id
+											isSignedIn(me) && me.id === post.user.id
 										"
 										v-tooltip="i18n.ts.toEdit"
 										v-click-anime
@@ -105,7 +105,7 @@
 									<MkAcct :user="post.user" />
 								</div>
 								<MkFollowButton
-									v-if="!isSignedIn(me) || me!.id != post.user.id"
+									v-if="!isSignedIn(me) || me.id != post.user.id"
 									:user="post.user"
 									:inline="true"
 									:transparent="false"

From be2837551c7bded50db6b6a5e0bde203b5c57c35 Mon Sep 17 00:00:00 2001
From: Salif Mehmed <mail@salif.eu>
Date: Mon, 22 Apr 2024 14:52:40 +0000
Subject: [PATCH 80/99] locale: update translations (Bulgarian)

Currently translated at 44.6% (855 of 1916 strings)

Translation: Firefish/locales
Translate-URL: https://hosted.weblate.org/projects/firefish/locales/bg/
---
 locales/bg-BG.yml | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/locales/bg-BG.yml b/locales/bg-BG.yml
index 1142a1eb57..45bd1eb465 100644
--- a/locales/bg-BG.yml
+++ b/locales/bg-BG.yml
@@ -69,7 +69,7 @@ renameFile: Преименуване на файла
 _widgets:
   activity: Дейност
   notifications: Известия
-  timeline: Инфопоток
+  timeline: Хронология
   clock: Часовник
   trends: Актуални
   photos: Снимки
@@ -187,7 +187,7 @@ notesAndReplies: Публикации и отговори
 noSuchUser: Потребителят не е намерен
 pinnedPages: Закачени страници
 pinLimitExceeded: Не може да закачаш повече публикации
-flagShowTimelineReplies: Показване на отговори в инфопотока
+flagShowTimelineReplies: Показване на отговори в хронологията
 followersCount: Брой последователи
 receivedReactionsCount: Брой получени реакции
 federation: Федерация
@@ -340,7 +340,7 @@ _deck:
   _columns:
     notifications: Известия
     mentions: Споменавания
-    tl: Инфопоток
+    tl: Хронология
     direct: Директни съобщения
     list: Списък
     antenna: Антена
@@ -375,7 +375,7 @@ basicSettings: Основни настройки
 otherSettings: Други настройки
 openInWindow: Отваряне в прозорец
 profile: Профил
-timeline: Инфопоток
+timeline: Хронология
 noAccountDescription: Този потребител все още не е написал своята биография.
 login: Вход
 loggingIn: Вписване
@@ -558,12 +558,12 @@ _visibility:
   specified: Директна
   localOnly: Само местни
   public: Общодостъпна
-  publicDescription: Публикацията ще бъде видима във всички публични инфопотоци
+  publicDescription: Публикацията ще бъде видима във всички публични хронологии
   home: Скрита
   localOnlyDescription: Не е видима за отдалечени потребители
   specifiedDescription: Видима само за определени потребители
   followersDescription: Видима само за последователите ти и споменатите потребители
-  homeDescription: Публикуване само в началния инфопоток
+  homeDescription: Публикуване само в началната хронология
 explore: Разглеждане
 theme: Теми
 wallpaper: Тапет
@@ -594,21 +594,21 @@ _tutorial:
     да разберат дали искат да видят вашите публикации или да ви следват.
   title: Как се използва Firefish
   step1_1: Добре дошли!
-  step5_1: Инфопотоци, инфопотоци навсякъде!
+  step5_1: Хронологии, хронологии навсякъде!
   step3_1: Сега е време да последвате няколко хора!
   step1_2: Нека да ви настроим. Ще бъдете готови за нула време!
-  step5_3: Началният {icon} инфопоток е мястото, където можете да видите публикации
+  step5_3: Началната {icon} хронология е мястото, където можете да видите публикации
     от акаунтите, които следвате.
   step6_1: И така, какво е това място?
-  step5_7: Глобалният {icon} инфопоток е мястото, където можете да видите публикации
+  step5_7: Глобалната {icon} хронология е мястото, където можете да видите публикации
     от всеки друг свързан сървър.
   step4_2: За първата си публикация някои хора обичат да правят публикация {introduction}
     или просто „Здравей свят!“
-  step5_2: Вашият сървър има активирани {timelines} различни инфопотоци.
-  step5_4: Местният {icon} инфопоток е мястото, където можете да видите публикации
+  step5_2: Вашият сървър има активирани {timelines} различни хронологии.
+  step5_4: Местната {icon} хронология е мястото, където можете да видите публикации
     от всички останали на този сървър.
-  step5_5: Социалният {icon} инфопоток е комбинация от Началния и Местния инфопоток.
-  step5_6: Препоръчаният {icon} инфопоток е мястото, където можете да видите публикации
+  step5_5: Социалната {icon} хронология е комбинация от Началната и Местната хронология.
+  step5_6: Препоръчаната {icon} хронология е мястото, където можете да видите публикации
     от сървъри, препоръчани от администраторите.
   step6_4: Сега отидете, изследвайте и се забавлявайте!
   step6_3: Всеки сървър работи по различни начини и не всички сървъри работят с Firefish.
@@ -754,7 +754,7 @@ _feeds:
 general: Общи
 metadata: Метаданни
 disk: Диск
-featured: Представени
+featured: Препоръчани
 yearsOld: на {age} години
 reload: Опресняване
 invites: Покани
@@ -778,8 +778,8 @@ uploadFromUrl: Качване от URL адрес
 instanceName: Име на сървъра
 instanceDescription: Описание на сървъра
 accept: Приемане
-enableLocalTimeline: Включване на местния инфопоток
-enableGlobalTimeline: Включване на глобалния инфопоток
+enableLocalTimeline: Включване на местната хронология
+enableGlobalTimeline: Включване на глобалната хронология
 removeMember: Премахване на член
 isAdmin: Администратор
 isModerator: Модератор
@@ -862,8 +862,8 @@ apply: Прилагане
 selectAccount: Избор на акаунт
 muteThread: Заглушаване на нишката
 ffVisibility: Видимост на Последвани/Последователи
-renoteMute: Заглушаване на подсилванията в инфопотоците
-replyMute: Заглушаване на отговорите в инфопотоците
+renoteMute: Заглуш. на подсилванията в хронолог.
+replyMute: Заглуш. на отговорите в хронолог.
 blockConfirm: Сигурни ли сте, че искате да блокирате този акаунт?
 appearance: Облик
 fontSize: Размер на шрифта
@@ -893,7 +893,7 @@ charts: Диаграми
 disablePagesScript: Изключване на AiScript в Страниците
 updatedAt: Обновено на
 privateDescription: Видима само за теб
-enableTimelineStreaming: Автоматично обновяване на инфопотоците
+enableTimelineStreaming: Автоматично обновяване на хронологиите
 toEdit: Редактиране
 showEmojisInReactionNotifications: Показване на емоджита в известията за реакции
 rememberNoteVisibility: Запомняне на настройките за видимост на публикациите
@@ -932,3 +932,11 @@ clientSettings: Настройки за устройството
 behavior: Поведение
 detectPostLanguage: Автоматично откриване на езика и показване на бутон за превеждане
   за публикации на чужди езици
+replyUnmute: Отмяна на заглушаването на отговорите
+searchWords: Думи за търсене / ID или URL за поглеждане
+reloadConfirm: Искате ли да опресните хронологията?
+enableRecommendedTimeline: Включване на препоръчаната хронология
+showGapBetweenNotesInTimeline: Показване на празнина между публикациите в хронологията
+lookup: Поглеждане
+media: Мултимедия
+welcomeBackWithName: Добре дошли отново, {name}

From ccd26a826fb5560ad38dfefd9ec6c01e37da0353 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Tue, 23 Apr 2024 02:10:31 +0000
Subject: [PATCH 81/99] locale: update translations (Japanese)

Currently translated at 100.0% (1918 of 1918 strings)

Translation: Firefish/locales
Translate-URL: https://hosted.weblate.org/projects/firefish/locales/ja/
---
 locales/ja-JP.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 3f900d1a5e..fef91cb81b 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -2057,3 +2057,5 @@ incorrectLanguageWarning: "この投稿は{detected}で書かれていると判
 markLocalFilesNsfwByDefault: このサーバーの全てのファイルをデフォルトでNSFWに設定する
 markLocalFilesNsfwByDefaultDescription: この設定が有効でも、ユーザーは自分でNSFWのフラグを外すことができます。また、この設定は既存のファイルには影響しません。
 noteEditHistory: 編集履歴
+showAddFileDescriptionAtFirstPost: 説明の無い添付ファイルを投稿しようとした際に説明を書く画面を自動で開く
+antennaLimit: 各ユーザーが作れるアンテナの最大数

From 6a0ad409cdb1cd81e1cc0d630259d9708e9dc9db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=91=A8=E9=83=A8=E8=90=BD?=
 <laozhoubuluo@gmail.com>
Date: Tue, 23 Apr 2024 20:07:52 +0800
Subject: [PATCH 82/99] fix: authorize-follow not working due to redeclare
 'acct'

---
 packages/client/src/pages/follow.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/pages/follow.vue b/packages/client/src/pages/follow.vue
index a8708978ef..3be549537f 100644
--- a/packages/client/src/pages/follow.vue
+++ b/packages/client/src/pages/follow.vue
@@ -24,16 +24,16 @@ async function follow(user): Promise<void> {
 	});
 }
 
-const acct = new URL(location.href).searchParams.get("acct");
-if (acct == null) {
+const acctUri = new URL(location.href).searchParams.get("acct");
+if (acctUri == null) {
 	throw new Error("acct required");
 }
 
 let promise;
 
-if (acct.startsWith("https://")) {
+if (acctUri.startsWith("https://")) {
 	promise = os.api("ap/show", {
-		uri: acct,
+		uri: acctUri,
 	});
 	promise.then((res) => {
 		if (res.type === "User") {
@@ -50,7 +50,7 @@ if (acct.startsWith("https://")) {
 		}
 	});
 } else {
-	promise = os.api("users/show", acct.parse(acct));
+	promise = os.api("users/show", acct.parse(acctUri));
 	promise.then((user) => {
 		follow(user);
 	});

From 50b7c71ed6a701ca001e51a115616e4446c324a6 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Tue, 23 Apr 2024 23:56:34 +0900
Subject: [PATCH 83/99] chore (backend): use type import

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

diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index 4f65c59a9e..9a2b49cb3d 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -13,7 +13,7 @@ import { normalizeForSearch } from "@/misc/normalize-for-search.js";
 import { verifyLink } from "@/services/fetch-rel-me.js";
 import { ApiError } from "@/server/api/error.js";
 import define from "@/server/api/define.js";
-import { DriveFile } from "@/models/entities/drive-file";
+import type { DriveFile } from "@/models/entities/drive-file";
 
 export const meta = {
 	tags: ["account"],

From 067810b1bece8228f88c592e73dde68fdfb33f36 Mon Sep 17 00:00:00 2001
From: Lhcfl <Lhcfl@outlook.com>
Date: Tue, 23 Apr 2024 23:59:03 +0900
Subject: [PATCH 84/99] docs (minor): update api-change.md

---
 docs/api-change.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api-change.md b/docs/api-change.md
index f55ceab58f..89cf8a9d38 100644
--- a/docs/api-change.md
+++ b/docs/api-change.md
@@ -9,7 +9,7 @@ Breaking changes are indicated by the :warning: icon.
 	- `all` (default)
   - `renote`
   - `quote`
-- :warning: Removed the following optional parameters in `notes/reactions`, as they were not taken into account due to a bug:
+- :warning: Removed the following optional parameters in `notes/reactions`, as they were never taken into account due to a bug:
 	- `sinceId`
 	- `untilId`
 

From 9eccdba0759a92010ec424c61472d14be414741b Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 24 Apr 2024 00:23:13 +0900
Subject: [PATCH 85/99] chore (backend-rs): move add_note_to_antenna to misc

---
 packages/backend-rs/index.d.ts                       |  2 +-
 packages/backend-rs/index.js                         |  4 ++--
 .../src/{service => misc}/add_note_to_antenna.rs     | 12 +++++-------
 packages/backend-rs/src/misc/mod.rs                  |  1 +
 packages/backend-rs/src/service/mod.rs               |  1 -
 packages/backend-rs/src/service/stream.rs            |  2 ++
 packages/backend-rs/src/service/stream/antenna.rs    | 10 ++++++++++
 7 files changed, 21 insertions(+), 11 deletions(-)
 rename packages/backend-rs/src/{service => misc}/add_note_to_antenna.rs (69%)
 create mode 100644 packages/backend-rs/src/service/stream/antenna.rs

diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index 69de833dcc..dec480d79c 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -193,6 +193,7 @@ export interface Acct {
 }
 export function stringToAcct(acct: string): Acct
 export function acctToString(acct: Acct): string
+export function addNoteToAntenna(antennaId: string, note: Note): void
 /**
  * @param host punycoded instance host
  * @returns whether the given host should be blocked
@@ -1119,7 +1120,6 @@ export interface Webhook {
   latestSentAt: Date | null
   latestStatus: number | null
 }
-export function addNoteToAntenna(antennaId: string, note: Note): void
 /** Initializes Cuid2 generator. Must be called before any [create_id]. */
 export function initIdGenerator(length: number, fingerprint: string): void
 export function getTimestamp(id: string): number
diff --git a/packages/backend-rs/index.js b/packages/backend-rs/index.js
index b4d86dccdf..d801e28fce 100644
--- a/packages/backend-rs/index.js
+++ b/packages/backend-rs/index.js
@@ -310,12 +310,13 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { loadEnv, loadConfig, stringToAcct, acctToString, isBlockedServer, isSilencedServer, isAllowedServer, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, addNoteToAntenna, initIdGenerator, getTimestamp, genId, secureRndstr } = nativeBinding
+const { loadEnv, loadConfig, stringToAcct, acctToString, addNoteToAntenna, isBlockedServer, isSilencedServer, isAllowedServer, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, initIdGenerator, getTimestamp, genId, secureRndstr } = nativeBinding
 
 module.exports.loadEnv = loadEnv
 module.exports.loadConfig = loadConfig
 module.exports.stringToAcct = stringToAcct
 module.exports.acctToString = acctToString
+module.exports.addNoteToAntenna = addNoteToAntenna
 module.exports.isBlockedServer = isBlockedServer
 module.exports.isSilencedServer = isSilencedServer
 module.exports.isAllowedServer = isAllowedServer
@@ -352,7 +353,6 @@ module.exports.RelayStatusEnum = RelayStatusEnum
 module.exports.UserEmojimodpermEnum = UserEmojimodpermEnum
 module.exports.UserProfileFfvisibilityEnum = UserProfileFfvisibilityEnum
 module.exports.UserProfileMutingnotificationtypesEnum = UserProfileMutingnotificationtypesEnum
-module.exports.addNoteToAntenna = addNoteToAntenna
 module.exports.initIdGenerator = initIdGenerator
 module.exports.getTimestamp = getTimestamp
 module.exports.genId = genId
diff --git a/packages/backend-rs/src/service/add_note_to_antenna.rs b/packages/backend-rs/src/misc/add_note_to_antenna.rs
similarity index 69%
rename from packages/backend-rs/src/service/add_note_to_antenna.rs
rename to packages/backend-rs/src/misc/add_note_to_antenna.rs
index 4f294cc881..2ed698d7e6 100644
--- a/packages/backend-rs/src/service/add_note_to_antenna.rs
+++ b/packages/backend-rs/src/misc/add_note_to_antenna.rs
@@ -1,13 +1,14 @@
 use crate::database::{redis_conn, redis_key};
 use crate::model::entity::note;
-use crate::service::stream::{publish_to_stream, Error, Stream};
+use crate::service::stream;
 use crate::util::id::get_timestamp;
 use redis::{streams::StreamMaxlen, Commands};
 
 type Note = note::Model;
 
 #[crate::export]
-pub fn add_note_to_antenna(antenna_id: String, note: &Note) -> Result<(), Error> {
+pub fn add_note_to_antenna(antenna_id: String, note: &Note) -> Result<(), stream::Error> {
+    // for timeline API
     redis_conn()?.xadd_maxlen(
         redis_key(format!("antennaTimeline:{}", antenna_id)),
         StreamMaxlen::Approx(200),
@@ -15,9 +16,6 @@ pub fn add_note_to_antenna(antenna_id: String, note: &Note) -> Result<(), Error>
         &[("note", &note.id)],
     )?;
 
-    publish_to_stream(
-        &Stream::Antenna { antenna_id },
-        Some("note"),
-        Some(serde_json::to_string(note)?),
-    )
+    // for streaming API
+    stream::antenna::publish(antenna_id, note)
 }
diff --git a/packages/backend-rs/src/misc/mod.rs b/packages/backend-rs/src/misc/mod.rs
index 24cec14969..8246b6a31a 100644
--- a/packages/backend-rs/src/misc/mod.rs
+++ b/packages/backend-rs/src/misc/mod.rs
@@ -1,4 +1,5 @@
 pub mod acct;
+pub mod add_note_to_antenna;
 pub mod check_server_block;
 pub mod check_word_mute;
 pub mod convert_host;
diff --git a/packages/backend-rs/src/service/mod.rs b/packages/backend-rs/src/service/mod.rs
index cc239e3f9e..baf29e06ad 100644
--- a/packages/backend-rs/src/service/mod.rs
+++ b/packages/backend-rs/src/service/mod.rs
@@ -1,2 +1 @@
-pub mod add_note_to_antenna;
 pub mod stream;
diff --git a/packages/backend-rs/src/service/stream.rs b/packages/backend-rs/src/service/stream.rs
index 6c5e6be4dd..1e84d5f866 100644
--- a/packages/backend-rs/src/service/stream.rs
+++ b/packages/backend-rs/src/service/stream.rs
@@ -1,3 +1,5 @@
+pub mod antenna;
+
 use crate::config::CONFIG;
 use crate::database::redis_conn;
 use redis::{Commands, RedisError};
diff --git a/packages/backend-rs/src/service/stream/antenna.rs b/packages/backend-rs/src/service/stream/antenna.rs
new file mode 100644
index 0000000000..08ae391caf
--- /dev/null
+++ b/packages/backend-rs/src/service/stream/antenna.rs
@@ -0,0 +1,10 @@
+use crate::model::entity::note;
+use crate::service::stream::{publish_to_stream, Error, Stream};
+
+pub fn publish(antenna_id: String, note: &note::Model) -> Result<(), Error> {
+    publish_to_stream(
+        &Stream::Antenna { antenna_id },
+        Some("note"),
+        Some(serde_json::to_string(note)?),
+    )
+}

From ee04e30f25a54b01d121a02f2066967723a7bcf0 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 24 Apr 2024 02:58:25 +0900
Subject: [PATCH 86/99] chore (backend-rs): remove unused stuff

it should be reworked
---
 Cargo.lock                                  | 567 +-------------------
 Cargo.toml                                  |   4 -
 packages/backend-rs/Cargo.toml              |   4 -
 packages/backend-rs/src/model/error.rs      |   9 -
 packages/backend-rs/src/model/mod.rs        |   3 -
 packages/backend-rs/src/model/repository.rs |  31 --
 packages/backend-rs/src/model/schema.rs     |  18 -
 7 files changed, 5 insertions(+), 631 deletions(-)
 delete mode 100644 packages/backend-rs/src/model/error.rs
 delete mode 100644 packages/backend-rs/src/model/repository.rs
 delete mode 100644 packages/backend-rs/src/model/schema.rs

diff --git a/Cargo.lock b/Cargo.lock
index f34ed4aea4..07e2738cd4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -37,7 +37,6 @@ dependencies = [
  "cfg-if",
  "getrandom",
  "once_cell",
- "serde",
  "version_check",
  "zerocopy",
 ]
@@ -78,60 +77,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "anstream"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "3.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
-dependencies = [
- "anstyle",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "anyhow"
-version = "1.0.82"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
-
 [[package]]
 name = "argon2"
 version = "0.5.3"
@@ -203,7 +148,6 @@ name = "backend-rs"
 version = "0.0.0"
 dependencies = [
  "argon2",
- "async-trait",
  "basen",
  "bcrypt",
  "cfg-if",
@@ -211,19 +155,16 @@ dependencies = [
  "cuid2",
  "emojis",
  "idna",
- "jsonschema",
  "macro_rs",
  "napi",
  "napi-build",
  "napi-derive",
  "once_cell",
- "parse-display",
  "pretty_assertions",
  "rand",
  "redis",
  "regex",
  "rmp-serde",
- "schemars",
  "sea-orm",
  "serde",
  "serde_json",
@@ -298,21 +239,6 @@ dependencies = [
  "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"
@@ -420,12 +346,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "bytecount"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1e5f035d16fc623ae5f74981db80a439803888314e3a555fd6f04acd51a3205"
-
 [[package]]
 name = "byteorder"
 version = "1.5.0"
@@ -481,52 +401,6 @@ dependencies = [
  "inout",
 ]
 
-[[package]]
-name = "clap"
-version = "4.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
-dependencies = [
- "clap_builder",
- "clap_derive",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "quote",
- "syn 2.0.58",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
-
-[[package]]
-name = "colorchoice"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-
 [[package]]
 name = "combine"
 version = "4.6.7"
@@ -552,16 +426,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "core-foundation"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "core-foundation-sys"
 version = "0.8.6"
@@ -701,12 +565,6 @@ version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
-[[package]]
-name = "dyn-clone"
-version = "1.0.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
-
 [[package]]
 name = "either"
 version = "1.11.0"
@@ -725,15 +583,6 @@ dependencies = [
  "phf",
 ]
 
-[[package]]
-name = "encoding_rs"
-version = "0.8.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
-dependencies = [
- "cfg-if",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -767,16 +616,6 @@ 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 = "2.0.2"
@@ -800,12 +639,6 @@ dependencies = [
  "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.2.1"
@@ -815,16 +648,6 @@ 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"
@@ -935,10 +758,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "wasi",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -947,25 +768,6 @@ version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 
-[[package]]
-name = "h2"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -1003,12 +805,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@@ -1048,64 +844,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "http"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
-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.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
-
-[[package]]
-name = "hyper"
-version = "0.14.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
-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.60"
@@ -1169,21 +907,6 @@ dependencies = [
  "generic-array",
 ]
 
-[[package]]
-name = "ipnet"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
-
-[[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.12.1"
@@ -1208,36 +931,6 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "jsonschema"
-version = "0.17.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a071f4f7efc9a9118dfb627a0a94ef247986e1ab8606a4c806ae2b3aa3b6978"
-dependencies = [
- "ahash 0.8.11",
- "anyhow",
- "base64 0.21.7",
- "bytecount",
- "clap",
- "fancy-regex",
- "fraction",
- "getrandom",
- "iso8601",
- "itoa",
- "memchr",
- "num-cmp",
- "once_cell",
- "parking_lot",
- "percent-encoding",
- "regex",
- "reqwest",
- "serde",
- "serde_json",
- "time",
- "url",
- "uuid",
-]
-
 [[package]]
 name = "keccak"
 version = "0.1.5"
@@ -1339,12 +1032,6 @@ version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
-[[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"
@@ -1484,12 +1171,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[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.5"
@@ -1598,7 +1279,7 @@ version = "0.17.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec4c6225c69b4ca778c0aea097321a64c421cf4577b331c61b229267edabb6f8"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -1628,31 +1309,6 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
-[[package]]
-name = "parse-display"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06af5f9333eb47bd9ba8462d612e37a8328a5cb80b13f0af4de4c3b89f52dee5"
-dependencies = [
- "parse-display-derive",
- "regex",
- "regex-syntax",
-]
-
-[[package]]
-name = "parse-display-derive"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc9252f259500ee570c75adcc4e317fa6f57a1e47747d622e0bf838002a7b790"
-dependencies = [
- "proc-macro2",
- "quote",
- "regex",
- "regex-syntax",
- "structmeta",
- "syn 2.0.58",
-]
-
 [[package]]
 name = "password-hash"
 version = "0.5.0"
@@ -1933,42 +1589,6 @@ dependencies = [
  "bytecheck",
 ]
 
-[[package]]
-name = "reqwest"
-version = "0.11.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
-dependencies = [
- "base64 0.21.7",
- "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",
- "sync_wrapper",
- "system-configuration",
- "tokio",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "winreg",
-]
-
 [[package]]
 name = "ring"
 version = "0.17.8"
@@ -2132,31 +1752,6 @@ version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
 
-[[package]]
-name = "schemars"
-version = "0.8.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a28f4c49489add4ce10783f7911893516f15afe45d015608d41faca6bc4d29"
-dependencies = [
- "chrono",
- "dyn-clone",
- "schemars_derive",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "schemars_derive"
-version = "0.8.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c767fd6fa65d9ccf9cf026122c1b555f2ef9a4f0cea69da4d7dbc3e258d30967"
-dependencies = [
- "proc-macro2",
- "quote",
- "serde_derive_internals",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -2179,7 +1774,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3bd3534a9978d0aa7edd2808dc1f8f31c4d0ecd31ddf71d997b3c98e9f3c9114"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -2220,7 +1815,7 @@ version = "0.12.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e115c6b078e013aa963cc2d38c196c2c40b05f03d0ac872fe06b6e0d5265603"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro2",
  "quote",
  "sea-bae",
@@ -2293,17 +1888,6 @@ dependencies = [
  "syn 2.0.58",
 ]
 
-[[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.115"
@@ -2315,18 +1899,6 @@ dependencies = [
  "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.34+deprecated"
@@ -2551,7 +2123,7 @@ checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8"
 dependencies = [
  "dotenvy",
  "either",
- "heck 0.4.1",
+ "heck",
  "hex",
  "once_cell",
  "proc-macro2",
@@ -2703,35 +2275,6 @@ dependencies = [
  "unicode-normalization",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-
-[[package]]
-name = "structmeta"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329"
-dependencies = [
- "proc-macro2",
- "quote",
- "structmeta-derive",
- "syn 2.0.58",
-]
-
-[[package]]
-name = "structmeta-derive"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.58",
-]
-
 [[package]]
 name = "strum"
 version = "0.25.0"
@@ -2753,7 +2296,7 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
 dependencies = [
- "heck 0.4.1",
+ "heck",
  "proc-macro2",
  "quote",
  "rustversion",
@@ -2800,33 +2343,6 @@ dependencies = [
  "syn 2.0.58",
 ]
 
-[[package]]
-name = "sync_wrapper"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-
-[[package]]
-name = "system-configuration"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
-dependencies = [
- "bitflags 1.3.2",
- "core-foundation",
- "system-configuration-sys",
-]
-
-[[package]]
-name = "system-configuration-sys"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "tap"
 version = "1.0.1"
@@ -2952,20 +2468,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "tokio-util"
-version = "0.7.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "toml_datetime"
 version = "0.6.5"
@@ -2983,12 +2485,6 @@ dependencies = [
  "winnow",
 ]
 
-[[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.40"
@@ -3021,12 +2517,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "try-lock"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
-
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -3095,12 +2585,6 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
-[[package]]
-name = "utf8parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-
 [[package]]
 name = "uuid"
 version = "1.8.0"
@@ -3122,15 +2606,6 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -3168,18 +2643,6 @@ dependencies = [
  "wasm-bindgen-shared",
 ]
 
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.42"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
 [[package]]
 name = "wasm-bindgen-macro"
 version = "0.2.92"
@@ -3209,16 +2672,6 @@ version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
-[[package]]
-name = "web-sys"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "0.25.4"
@@ -3392,16 +2845,6 @@ dependencies = [
  "memchr",
 ]
 
-[[package]]
-name = "winreg"
-version = "0.50.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
-dependencies = [
- "cfg-if",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "wyz"
 version = "0.5.1"
diff --git a/Cargo.toml b/Cargo.toml
index 2beb8e3fe5..a5dbad8687 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,7 +10,6 @@ napi-derive = "2.16.2"
 napi-build = "2.1.3"
 
 argon2 = "0.5.3"
-async-trait = "0.1.80"
 basen = "0.1.0"
 bcrypt = "0.15.1"
 cfg-if = "1.0.0"
@@ -19,9 +18,7 @@ convert_case = "0.6.0"
 cuid2 = "0.1.2"
 emojis = "0.6.1"
 idna = "0.5.0"
-jsonschema = "0.17.1"
 once_cell = "1.19.0"
-parse-display = "0.9.0"
 pretty_assertions = "1.4.0"
 proc-macro2 = "1.0.79"
 quote = "1.0.36"
@@ -29,7 +26,6 @@ rand = "0.8.5"
 redis = "0.25.3"
 regex = "1.10.4"
 rmp-serde = "1.2.0"
-schemars = "0.8.16"
 sea-orm = "0.12.15"
 serde = "1.0.197"
 serde_json = "1.0.115"
diff --git a/packages/backend-rs/Cargo.toml b/packages/backend-rs/Cargo.toml
index 5a18dc92cf..865e263fed 100644
--- a/packages/backend-rs/Cargo.toml
+++ b/packages/backend-rs/Cargo.toml
@@ -18,7 +18,6 @@ napi = { workspace = true, optional = true, default-features = false, features =
 napi-derive = { workspace = true, optional = true }
 
 argon2 = { workspace = true, features = ["std"] }
-async-trait = { workspace = true }
 basen = { workspace = true }
 bcrypt = { workspace = true }
 cfg-if = { workspace = true }
@@ -26,14 +25,11 @@ chrono = { workspace = true }
 cuid2 = { workspace = true }
 emojis = { workspace = true }
 idna = { workspace = true }
-jsonschema = { workspace = true }
 once_cell = { workspace = true }
-parse-display = { workspace = true }
 rand = { workspace = true }
 redis = { workspace = true }
 regex = { workspace = true }
 rmp-serde = { workspace = true }
-schemars = { workspace = true, features = ["chrono"] }
 sea-orm = { workspace = true, features = ["sqlx-postgres", "runtime-tokio-rustls"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
diff --git a/packages/backend-rs/src/model/error.rs b/packages/backend-rs/src/model/error.rs
deleted file mode 100644
index b3d9f6eda5..0000000000
--- a/packages/backend-rs/src/model/error.rs
+++ /dev/null
@@ -1,9 +0,0 @@
-#[derive(thiserror::Error, Debug, PartialEq, Eq)]
-pub enum Error {
-    #[error("Failed to parse string: {0}")]
-    ParseError(#[from] parse_display::ParseError),
-    #[error("Database error: {0}")]
-    DbError(#[from] sea_orm::DbErr),
-    #[error("Requested entity not found")]
-    NotFound,
-}
diff --git a/packages/backend-rs/src/model/mod.rs b/packages/backend-rs/src/model/mod.rs
index d92cf709a6..e8c3d6a4c6 100644
--- a/packages/backend-rs/src/model/mod.rs
+++ b/packages/backend-rs/src/model/mod.rs
@@ -1,4 +1 @@
 pub mod entity;
-pub mod error;
-// pub mod repository;
-pub mod schema;
diff --git a/packages/backend-rs/src/model/repository.rs b/packages/backend-rs/src/model/repository.rs
deleted file mode 100644
index be86ff22ba..0000000000
--- a/packages/backend-rs/src/model/repository.rs
+++ /dev/null
@@ -1,31 +0,0 @@
-use async_trait::async_trait;
-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)
-                .one(crate::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-rs/src/model/schema.rs b/packages/backend-rs/src/model/schema.rs
deleted file mode 100644
index 843a9351b0..0000000000
--- a/packages/backend-rs/src/model/schema.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-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`].
-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`].
-    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")
-    }
-}

From 88280e3bfdb40e1a16220053e098093afa249e26 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 24 Apr 2024 04:13:29 +0900
Subject: [PATCH 87/99] refactor (backend): port publishMessagingStream to
 backend-rs

---
 packages/backend-rs/index.d.ts                |  7 +++++
 packages/backend-rs/index.js                  |  4 ++-
 packages/backend-rs/src/service/stream.rs     |  3 +-
 .../backend-rs/src/service/stream/antenna.rs  |  2 +-
 .../backend-rs/src/service/stream/chat.rs     | 31 +++++++++++++++++++
 .../api/common/read-messaging-message.ts      |  4 +--
 .../backend/src/server/api/stream/index.ts    |  7 ++---
 .../backend/src/services/messages/create.ts   | 11 +++----
 .../backend/src/services/messages/delete.ts   | 14 ++++-----
 packages/backend/src/services/stream.ts       | 29 ++++++++---------
 10 files changed, 75 insertions(+), 37 deletions(-)
 create mode 100644 packages/backend-rs/src/service/stream/chat.rs

diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index dec480d79c..001ee6f679 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -1120,6 +1120,13 @@ export interface Webhook {
   latestSentAt: Date | null
   latestStatus: number | null
 }
+export enum ChatEvent {
+  Message = 'message',
+  Read = 'read',
+  Deleted = 'deleted',
+  Typing = 'typing'
+}
+export function publishToChatStream(senderUserId: string, receiverUserId: string, kind: ChatEvent, object: any): void
 /** Initializes Cuid2 generator. Must be called before any [create_id]. */
 export function initIdGenerator(length: number, fingerprint: string): void
 export function getTimestamp(id: string): number
diff --git a/packages/backend-rs/index.js b/packages/backend-rs/index.js
index d801e28fce..411a39e050 100644
--- a/packages/backend-rs/index.js
+++ b/packages/backend-rs/index.js
@@ -310,7 +310,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { loadEnv, loadConfig, stringToAcct, acctToString, addNoteToAntenna, isBlockedServer, isSilencedServer, isAllowedServer, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, initIdGenerator, getTimestamp, genId, secureRndstr } = nativeBinding
+const { loadEnv, loadConfig, stringToAcct, acctToString, addNoteToAntenna, isBlockedServer, isSilencedServer, isAllowedServer, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, ChatEvent, publishToChatStream, initIdGenerator, getTimestamp, genId, secureRndstr } = nativeBinding
 
 module.exports.loadEnv = loadEnv
 module.exports.loadConfig = loadConfig
@@ -353,6 +353,8 @@ module.exports.RelayStatusEnum = RelayStatusEnum
 module.exports.UserEmojimodpermEnum = UserEmojimodpermEnum
 module.exports.UserProfileFfvisibilityEnum = UserProfileFfvisibilityEnum
 module.exports.UserProfileMutingnotificationtypesEnum = UserProfileMutingnotificationtypesEnum
+module.exports.ChatEvent = ChatEvent
+module.exports.publishToChatStream = publishToChatStream
 module.exports.initIdGenerator = initIdGenerator
 module.exports.getTimestamp = getTimestamp
 module.exports.genId = genId
diff --git a/packages/backend-rs/src/service/stream.rs b/packages/backend-rs/src/service/stream.rs
index 1e84d5f866..46fafa64ba 100644
--- a/packages/backend-rs/src/service/stream.rs
+++ b/packages/backend-rs/src/service/stream.rs
@@ -1,4 +1,5 @@
 pub mod antenna;
+pub mod chat;
 
 use crate::config::CONFIG;
 use crate::database::redis_conn;
@@ -51,7 +52,7 @@ pub enum Error {
 
 pub fn publish_to_stream(
     stream: &Stream,
-    kind: Option<&str>,
+    kind: Option<String>,
     value: Option<String>,
 ) -> Result<(), Error> {
     let message = if let Some(kind) = kind {
diff --git a/packages/backend-rs/src/service/stream/antenna.rs b/packages/backend-rs/src/service/stream/antenna.rs
index 08ae391caf..3a829df546 100644
--- a/packages/backend-rs/src/service/stream/antenna.rs
+++ b/packages/backend-rs/src/service/stream/antenna.rs
@@ -4,7 +4,7 @@ use crate::service::stream::{publish_to_stream, Error, Stream};
 pub fn publish(antenna_id: String, note: &note::Model) -> Result<(), Error> {
     publish_to_stream(
         &Stream::Antenna { antenna_id },
-        Some("note"),
+        Some("note".to_string()),
         Some(serde_json::to_string(note)?),
     )
 }
diff --git a/packages/backend-rs/src/service/stream/chat.rs b/packages/backend-rs/src/service/stream/chat.rs
new file mode 100644
index 0000000000..ae2efce938
--- /dev/null
+++ b/packages/backend-rs/src/service/stream/chat.rs
@@ -0,0 +1,31 @@
+use crate::service::stream::{publish_to_stream, Error, Stream};
+
+#[derive(strum::Display)]
+#[crate::export(string_enum = "camelCase")]
+pub enum ChatEvent {
+    #[strum(serialize = "message")]
+    Message,
+    #[strum(serialize = "read")]
+    Read,
+    #[strum(serialize = "deleted")]
+    Deleted,
+    #[strum(serialize = "typing")]
+    Typing,
+}
+
+#[crate::export(js_name = "publishToChatStream")]
+pub fn publish(
+    sender_user_id: String,
+    receiver_user_id: String,
+    kind: ChatEvent,
+    object: &serde_json::Value, // TODO?: change this to enum
+) -> Result<(), Error> {
+    publish_to_stream(
+        &Stream::Chat {
+            sender_user_id,
+            receiver_user_id,
+        },
+        Some(kind.to_string()),
+        Some(serde_json::to_string(object)?),
+    )
+}
diff --git a/packages/backend/src/server/api/common/read-messaging-message.ts b/packages/backend/src/server/api/common/read-messaging-message.ts
index fc22c843af..20777c8246 100644
--- a/packages/backend/src/server/api/common/read-messaging-message.ts
+++ b/packages/backend/src/server/api/common/read-messaging-message.ts
@@ -2,7 +2,7 @@ import {
 	publishMainStream,
 	publishGroupMessagingStream,
 } from "@/services/stream.js";
-import { publishMessagingStream } from "@/services/stream.js";
+import { publishToChatStream, ChatEvent } from "backend-rs";
 import { publishMessagingIndexStream } from "@/services/stream.js";
 import { pushNotification } from "@/services/push-notification.js";
 import type { User, IRemoteUser } from "@/models/entities/user.js";
@@ -54,7 +54,7 @@ export async function readUserMessagingMessage(
 	);
 
 	// Publish event
-	publishMessagingStream(otherpartyId, userId, "read", messageIds);
+	publishToChatStream(otherpartyId, userId, ChatEvent.Read, messageIds);
 	publishMessagingIndexStream(userId, "read", messageIds);
 
 	if (!(await Users.getHasUnreadMessagingMessage(userId))) {
diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts
index 313719e207..97337bd7e1 100644
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -4,7 +4,6 @@ import readNote from "@/services/note/read.js";
 import type { User } from "@/models/entities/user.js";
 import type { Channel as ChannelModel } from "@/models/entities/channel.js";
 import {
-	Users,
 	Followings,
 	Mutings,
 	RenoteMutings,
@@ -18,8 +17,8 @@ import type { UserProfile } from "@/models/entities/user-profile.js";
 import {
 	publishChannelStream,
 	publishGroupMessagingStream,
-	publishMessagingStream,
 } from "@/services/stream.js";
+import { publishToChatStream, ChatEvent } from "backend-rs";
 import type { UserGroup } from "@/models/entities/user-group.js";
 import type { Packed } from "@/misc/schema.js";
 import { readNotification } from "@/server/api/common/read-notification.js";
@@ -525,10 +524,10 @@ export default class Connection {
 	}) {
 		if (this.user) {
 			if (param.partner) {
-				publishMessagingStream(
+				publishToChatStream(
 					param.partner,
 					this.user.id,
-					"typing",
+					ChatEvent.Typing,
 					this.user.id,
 				);
 			} else if (param.group) {
diff --git a/packages/backend/src/services/messages/create.ts b/packages/backend/src/services/messages/create.ts
index 257a132e6b..562e92e42a 100644
--- a/packages/backend/src/services/messages/create.ts
+++ b/packages/backend/src/services/messages/create.ts
@@ -7,10 +7,9 @@ import {
 	Mutings,
 	Users,
 } from "@/models/index.js";
-import { genId, toPuny } from "backend-rs";
+import { genId, publishToChatStream, toPuny, ChatEvent } from "backend-rs";
 import type { MessagingMessage } from "@/models/entities/messaging-message.js";
 import {
-	publishMessagingStream,
 	publishMessagingIndexStream,
 	publishMainStream,
 	publishGroupMessagingStream,
@@ -52,10 +51,10 @@ export async function createMessage(
 	if (recipientUser) {
 		if (Users.isLocalUser(user)) {
 			// 自分のストリーム
-			publishMessagingStream(
+			publishToChatStream(
 				message.userId,
 				recipientUser.id,
-				"message",
+				ChatEvent.Message,
 				messageObj,
 			);
 			publishMessagingIndexStream(message.userId, "message", messageObj);
@@ -64,10 +63,10 @@ export async function createMessage(
 
 		if (Users.isLocalUser(recipientUser)) {
 			// 相手のストリーム
-			publishMessagingStream(
+			publishToChatStream(
 				recipientUser.id,
 				message.userId,
-				"message",
+				ChatEvent.Message,
 				messageObj,
 			);
 			publishMessagingIndexStream(recipientUser.id, "message", messageObj);
diff --git a/packages/backend/src/services/messages/delete.ts b/packages/backend/src/services/messages/delete.ts
index 2d8f6b9baf..745c89380d 100644
--- a/packages/backend/src/services/messages/delete.ts
+++ b/packages/backend/src/services/messages/delete.ts
@@ -1,10 +1,8 @@
 import { config } from "@/config.js";
 import { MessagingMessages, Users } from "@/models/index.js";
 import type { MessagingMessage } from "@/models/entities/messaging-message.js";
-import {
-	publishGroupMessagingStream,
-	publishMessagingStream,
-} from "@/services/stream.js";
+import { publishGroupMessagingStream } from "@/services/stream.js";
+import { publishToChatStream, ChatEvent } from "backend-rs";
 import { renderActivity } from "@/remote/activitypub/renderer/index.js";
 import renderDelete from "@/remote/activitypub/renderer/delete.js";
 import renderTombstone from "@/remote/activitypub/renderer/tombstone.js";
@@ -21,17 +19,17 @@ async function postDeleteMessage(message: MessagingMessage) {
 		const recipient = await Users.findOneByOrFail({ id: message.recipientId });
 
 		if (Users.isLocalUser(user))
-			publishMessagingStream(
+			publishToChatStream(
 				message.userId,
 				message.recipientId,
-				"deleted",
+				ChatEvent.Deleted,
 				message.id,
 			);
 		if (Users.isLocalUser(recipient))
-			publishMessagingStream(
+			publishToChatStream(
 				message.recipientId,
 				message.userId,
-				"deleted",
+				ChatEvent.Deleted,
 				message.id,
 			);
 
diff --git a/packages/backend/src/services/stream.ts b/packages/backend/src/services/stream.ts
index 7f1862b74d..00d33dbb30 100644
--- a/packages/backend/src/services/stream.ts
+++ b/packages/backend/src/services/stream.ts
@@ -17,7 +17,7 @@ import type {
 	InternalStreamTypes,
 	MainStreamTypes,
 	MessagingIndexStreamTypes,
-	MessagingStreamTypes,
+	// MessagingStreamTypes,
 	NoteStreamTypes,
 	UserListStreamTypes,
 	UserStreamTypes,
@@ -147,18 +147,19 @@ class Publisher {
 	// 	);
 	// };
 
-	public publishMessagingStream = <K extends keyof MessagingStreamTypes>(
-		userId: User["id"],
-		otherpartyId: User["id"],
-		type: K,
-		value?: MessagingStreamTypes[K],
-	): void => {
-		this.publish(
-			`messagingStream:${userId}-${otherpartyId}`,
-			type,
-			typeof value === "undefined" ? null : value,
-		);
-	};
+	/* ported to backend-rs */
+	// public publishMessagingStream = <K extends keyof MessagingStreamTypes>(
+	// 	userId: User["id"],
+	// 	otherpartyId: User["id"],
+	// 	type: K,
+	// 	value?: MessagingStreamTypes[K],
+	// ): void => {
+	// 	this.publish(
+	// 		`messagingStream:${userId}-${otherpartyId}`,
+	// 		type,
+	// 		typeof value === "undefined" ? null : value,
+	// 	);
+	// };
 
 	public publishGroupMessagingStream = <
 		K extends keyof GroupMessagingStreamTypes,
@@ -219,7 +220,7 @@ export const publishNotesStream = publisher.publishNotesStream;
 export const publishChannelStream = publisher.publishChannelStream;
 export const publishUserListStream = publisher.publishUserListStream;
 // export const publishAntennaStream = publisher.publishAntennaStream;
-export const publishMessagingStream = publisher.publishMessagingStream;
+// export const publishMessagingStream = publisher.publishMessagingStream;
 export const publishGroupMessagingStream =
 	publisher.publishGroupMessagingStream;
 export const publishMessagingIndexStream =

From e8b39be387177ff6c3fbb8f9ee155a560d8f17f3 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 24 Apr 2024 05:01:35 +0900
Subject: [PATCH 88/99] chore (backend): remove unused function

---
 packages/backend/src/misc/is-quote.ts | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 packages/backend/src/misc/is-quote.ts

diff --git a/packages/backend/src/misc/is-quote.ts b/packages/backend/src/misc/is-quote.ts
deleted file mode 100644
index fe83a56a55..0000000000
--- a/packages/backend/src/misc/is-quote.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { Note } from "@/models/entities/note.js";
-
-export default function (note: Note): boolean {
-	return (
-		note.renoteId != null &&
-		(note.text != null ||
-			note.hasPoll ||
-			(note.fileIds != null && note.fileIds.length > 0))
-	);
-}

From 9ef5350a00310ebdc9105be0e1a94015cbe85c0c Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 24 Apr 2024 05:19:03 +0900
Subject: [PATCH 89/99] chore (backend): remove promisify

---
 .../backend/src/misc/download-text-file.ts    |  5 ++---
 packages/backend/src/misc/download-url.ts     |  7 ++-----
 packages/backend/src/misc/get-file-info.ts    | 19 ++++++++-----------
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/packages/backend/src/misc/download-text-file.ts b/packages/backend/src/misc/download-text-file.ts
index 9d3821b20f..a1e615263f 100644
--- a/packages/backend/src/misc/download-text-file.ts
+++ b/packages/backend/src/misc/download-text-file.ts
@@ -1,5 +1,4 @@
-import * as fs from "node:fs";
-import * as util from "node:util";
+import * as fs from "node:fs/promises";
 import Logger from "@/services/logger.js";
 import { createTemp } from "./create-temp.js";
 import { downloadUrl } from "./download-url.js";
@@ -16,7 +15,7 @@ export async function downloadTextFile(url: string): Promise<string> {
 		// write content at URL to temp file
 		await downloadUrl(url, path);
 
-		const text = await util.promisify(fs.readFile)(path, "utf8");
+		const text = await fs.readFile(path, "utf-8");
 
 		return text;
 	} finally {
diff --git a/packages/backend/src/misc/download-url.ts b/packages/backend/src/misc/download-url.ts
index f516265106..e3066ff333 100644
--- a/packages/backend/src/misc/download-url.ts
+++ b/packages/backend/src/misc/download-url.ts
@@ -1,6 +1,5 @@
 import * as fs from "node:fs";
-import * as stream from "node:stream";
-import * as util from "node:util";
+import * as stream from "node:stream/promises";
 import got, * as Got from "got";
 import { config } from "@/config.js";
 import { getAgentByHostname, StatusError } from "./fetch.js";
@@ -10,8 +9,6 @@ import IPCIDR from "ip-cidr";
 import PrivateIp from "private-ip";
 import { isValidUrl } from "./is-valid-url.js";
 
-const pipeline = util.promisify(stream.pipeline);
-
 export async function downloadUrl(url: string, path: string): Promise<void> {
 	if (!isValidUrl(url)) {
 		throw new StatusError("Invalid URL", 400);
@@ -84,7 +81,7 @@ export async function downloadUrl(url: string, path: string): Promise<void> {
 		});
 
 	try {
-		await pipeline(req, fs.createWriteStream(path));
+		await stream.pipeline(req, fs.createWriteStream(path));
 	} catch (e) {
 		if (e instanceof Got.HTTPError) {
 			throw new StatusError(
diff --git a/packages/backend/src/misc/get-file-info.ts b/packages/backend/src/misc/get-file-info.ts
index dadbda9e9e..532bbeec56 100644
--- a/packages/backend/src/misc/get-file-info.ts
+++ b/packages/backend/src/misc/get-file-info.ts
@@ -1,7 +1,7 @@
-import * as fs from "node:fs";
+import * as fs from "node:fs/promises";
+import { createReadStream } from "node:fs";
 import * as crypto from "node:crypto";
-import * as stream from "node:stream";
-import * as util from "node:util";
+import * as stream from "node:stream/promises";
 import { fileTypeFromFile } from "file-type";
 import probeImageSize from "probe-image-size";
 import isSvg from "is-svg";
@@ -9,8 +9,6 @@ import sharp from "sharp";
 import { encode } from "blurhash";
 import { inspect } from "node:util";
 
-const pipeline = util.promisify(stream.pipeline);
-
 export type FileInfo = {
 	size: number;
 	md5: string;
@@ -163,7 +161,7 @@ export async function checkSvg(path: string) {
 	try {
 		const size = await getFileSize(path);
 		if (size > 1 * 1024 * 1024) return false;
-		return isSvg(fs.readFileSync(path));
+		return isSvg(await fs.readFile(path, "utf-8"));
 	} catch {
 		return false;
 	}
@@ -173,8 +171,7 @@ export async function checkSvg(path: string) {
  * Get file size
  */
 export async function getFileSize(path: string): Promise<number> {
-	const getStat = util.promisify(fs.stat);
-	return (await getStat(path)).size;
+	return (await fs.stat(path)).size;
 }
 
 /**
@@ -182,7 +179,7 @@ export async function getFileSize(path: string): Promise<number> {
  */
 async function calcHash(path: string): Promise<string> {
 	const hash = crypto.createHash("md5").setEncoding("hex");
-	await pipeline(fs.createReadStream(path), hash);
+	await stream.pipeline(createReadStream(path), hash);
 	return hash.read();
 }
 
@@ -196,7 +193,7 @@ async function detectImageSize(path: string): Promise<{
 	hUnits: string;
 	orientation?: number;
 }> {
-	const readable = fs.createReadStream(path);
+	const readable = createReadStream(path);
 	const imageSize = await probeImageSize(readable);
 	readable.destroy();
 	return imageSize;
@@ -214,7 +211,7 @@ function getBlurhash(path: string): Promise<string> {
 			.toBuffer((err, buffer, { width, height }) => {
 				if (err) return reject(err);
 
-				let hash;
+				let hash: string;
 
 				try {
 					hash = encode(new Uint8ClampedArray(buffer), width, height, 7, 7);

From a2958f6da8c37fc1bee3120f5c024d8f63f801b1 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 24 Apr 2024 06:39:40 +0900
Subject: [PATCH 90/99] refactor (backend): port daemons/janitor.ts to
 backend-rs

---
 packages/backend-rs/index.d.ts                |  2 ++
 packages/backend-rs/index.js                  |  3 ++-
 packages/backend-rs/src/misc/mod.rs           |  1 +
 .../misc/remove_old_attestation_challenges.rs | 17 ++++++++++++++++
 packages/backend/src/boot/master.ts           | 16 ++++++---------
 packages/backend/src/daemons/janitor.ts       | 20 -------------------
 6 files changed, 28 insertions(+), 31 deletions(-)
 create mode 100644 packages/backend-rs/src/misc/remove_old_attestation_challenges.rs
 delete mode 100644 packages/backend/src/daemons/janitor.ts

diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index 001ee6f679..8d61f9ccd9 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -264,6 +264,8 @@ export interface DecodedReaction {
 export function decodeReaction(reaction: string): DecodedReaction
 export function countReactions(reactions: Record<string, number>): Record<string, number>
 export function toDbReaction(reaction?: string | undefined | null, host?: string | undefined | null): Promise<string>
+/** Delete all entries in the "attestation_challenge" table created at more than 5 minutes ago */
+export function removeOldAttestationChallenges(): Promise<void>
 export interface AbuseUserReport {
   id: string
   createdAt: Date
diff --git a/packages/backend-rs/index.js b/packages/backend-rs/index.js
index 411a39e050..d4ae11b676 100644
--- a/packages/backend-rs/index.js
+++ b/packages/backend-rs/index.js
@@ -310,7 +310,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { loadEnv, loadConfig, stringToAcct, acctToString, addNoteToAntenna, isBlockedServer, isSilencedServer, isAllowedServer, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, ChatEvent, publishToChatStream, initIdGenerator, getTimestamp, genId, secureRndstr } = nativeBinding
+const { loadEnv, loadConfig, stringToAcct, acctToString, addNoteToAntenna, isBlockedServer, isSilencedServer, isAllowedServer, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, removeOldAttestationChallenges, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, ChatEvent, publishToChatStream, initIdGenerator, getTimestamp, genId, secureRndstr } = nativeBinding
 
 module.exports.loadEnv = loadEnv
 module.exports.loadConfig = loadConfig
@@ -342,6 +342,7 @@ module.exports.isOldPasswordAlgorithm = isOldPasswordAlgorithm
 module.exports.decodeReaction = decodeReaction
 module.exports.countReactions = countReactions
 module.exports.toDbReaction = toDbReaction
+module.exports.removeOldAttestationChallenges = removeOldAttestationChallenges
 module.exports.AntennaSrcEnum = AntennaSrcEnum
 module.exports.DriveFileUsageHintEnum = DriveFileUsageHintEnum
 module.exports.MutedNoteReasonEnum = MutedNoteReasonEnum
diff --git a/packages/backend-rs/src/misc/mod.rs b/packages/backend-rs/src/misc/mod.rs
index 8246b6a31a..049c744f62 100644
--- a/packages/backend-rs/src/misc/mod.rs
+++ b/packages/backend-rs/src/misc/mod.rs
@@ -13,3 +13,4 @@ pub mod nyaify;
 pub mod password;
 pub mod reaction;
 pub mod redis_cache;
+pub mod remove_old_attestation_challenges;
diff --git a/packages/backend-rs/src/misc/remove_old_attestation_challenges.rs b/packages/backend-rs/src/misc/remove_old_attestation_challenges.rs
new file mode 100644
index 0000000000..829a8e2c0c
--- /dev/null
+++ b/packages/backend-rs/src/misc/remove_old_attestation_challenges.rs
@@ -0,0 +1,17 @@
+// TODO: We want to get rid of this
+
+use crate::database::db_conn;
+use crate::model::entity::attestation_challenge;
+use chrono::{Duration, Utc};
+use sea_orm::{ColumnTrait, DbErr, EntityTrait, QueryFilter};
+
+/// Delete all entries in the "attestation_challenge" table created at more than 5 minutes ago
+#[crate::export]
+pub async fn remove_old_attestation_challenges() -> Result<(), DbErr> {
+    attestation_challenge::Entity::delete_many()
+        .filter(attestation_challenge::Column::CreatedAt.lt(Utc::now() - Duration::minutes(5)))
+        .exec(db_conn().await?)
+        .await?;
+
+    Ok(())
+}
diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index f254aaea17..e9e3ceb98a 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -9,7 +9,7 @@ import semver from "semver";
 
 import Logger from "@/services/logger.js";
 import type { Config } from "backend-rs";
-import { fetchMeta } from "backend-rs";
+import { fetchMeta, removeOldAttestationChallenges } from "backend-rs";
 import { config, envOption } from "@/config.js";
 import { showMachineInfo } from "@/misc/show-machine-info.js";
 import { db, initDb } from "@/db/postgre.js";
@@ -115,18 +115,14 @@ export async function masterMain() {
 		true,
 	);
 
-	if (
-		!envOption.noDaemons &&
-		config.clusterLimits?.web &&
-		config.clusterLimits?.web >= 1
-	) {
+	if (!envOption.noDaemons) {
 		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());
+		// Update meta cache every 5 minitues
+		setInterval(() => fetchMeta(false), 1000 * 60 * 5);
+		// Remove old attestation challenges
+		setInterval(() => removeOldAttestationChallenges(), 1000 * 60 * 30);
 	}
-
-	// Update meta cache every 5 minitues
-	setInterval(() => fetchMeta(false), 1000 * 60 * 5);
 }
 
 function showEnvironment(): void {
diff --git a/packages/backend/src/daemons/janitor.ts b/packages/backend/src/daemons/janitor.ts
deleted file mode 100644
index 99b809d1c8..0000000000
--- a/packages/backend/src/daemons/janitor.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// TODO: 消したい
-
-const interval = 30 * 60 * 1000;
-import { AttestationChallenges } from "@/models/index.js";
-import { LessThan } from "typeorm";
-
-/**
- * Clean up database occasionally
- */
-export default function () {
-	async function tick() {
-		await AttestationChallenges.delete({
-			createdAt: LessThan(new Date(Date.now() - 5 * 60 * 1000)),
-		});
-	}
-
-	tick();
-
-	setInterval(tick, interval);
-}

From 9db729d7344fb7fe4df21343f353a510ac14f37f Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 24 Apr 2024 07:02:06 +0900
Subject: [PATCH 91/99] refactor (backend-rs): separate gen_id and gen_id_at

---
 Cargo.lock                                   |  1 -
 Cargo.toml                                   |  1 -
 packages/backend-rs/Cargo.toml               |  1 -
 packages/backend-rs/index.d.ts               |  4 ++-
 packages/backend-rs/index.js                 |  3 +-
 packages/backend-rs/src/util/id.rs           | 31 ++++++++++----------
 packages/backend/src/services/note/create.ts |  3 +-
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 07e2738cd4..2959ad5bf6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -150,7 +150,6 @@ dependencies = [
  "argon2",
  "basen",
  "bcrypt",
- "cfg-if",
  "chrono",
  "cuid2",
  "emojis",
diff --git a/Cargo.toml b/Cargo.toml
index a5dbad8687..42de97a220 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,6 @@ napi-build = "2.1.3"
 argon2 = "0.5.3"
 basen = "0.1.0"
 bcrypt = "0.15.1"
-cfg-if = "1.0.0"
 chrono = "0.4.37"
 convert_case = "0.6.0"
 cuid2 = "0.1.2"
diff --git a/packages/backend-rs/Cargo.toml b/packages/backend-rs/Cargo.toml
index 865e263fed..3a222cd4a5 100644
--- a/packages/backend-rs/Cargo.toml
+++ b/packages/backend-rs/Cargo.toml
@@ -20,7 +20,6 @@ napi-derive = { workspace = true, optional = true }
 argon2 = { workspace = true, features = ["std"] }
 basen = { workspace = true }
 bcrypt = { workspace = true }
-cfg-if = { workspace = true }
 chrono = { workspace = true }
 cuid2 = { workspace = true }
 emojis = { workspace = true }
diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index 8d61f9ccd9..016932a092 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -1140,5 +1140,7 @@ export function getTimestamp(id: string): number
  *
  * Ref: https://github.com/paralleldrive/cuid2#parameterized-length
  */
-export function genId(date?: Date | undefined | null): string
+export function genId(): string
+/** Generate an ID using a specific datetime */
+export function genIdAt(date: Date): string
 export function secureRndstr(length?: number | undefined | null): string
diff --git a/packages/backend-rs/index.js b/packages/backend-rs/index.js
index d4ae11b676..9e15fa3658 100644
--- a/packages/backend-rs/index.js
+++ b/packages/backend-rs/index.js
@@ -310,7 +310,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { loadEnv, loadConfig, stringToAcct, acctToString, addNoteToAntenna, isBlockedServer, isSilencedServer, isAllowedServer, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, removeOldAttestationChallenges, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, ChatEvent, publishToChatStream, initIdGenerator, getTimestamp, genId, secureRndstr } = nativeBinding
+const { loadEnv, loadConfig, stringToAcct, acctToString, addNoteToAntenna, isBlockedServer, isSilencedServer, isAllowedServer, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, removeOldAttestationChallenges, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, ChatEvent, publishToChatStream, initIdGenerator, getTimestamp, genId, genIdAt, secureRndstr } = nativeBinding
 
 module.exports.loadEnv = loadEnv
 module.exports.loadConfig = loadConfig
@@ -359,4 +359,5 @@ module.exports.publishToChatStream = publishToChatStream
 module.exports.initIdGenerator = initIdGenerator
 module.exports.getTimestamp = getTimestamp
 module.exports.genId = genId
+module.exports.genIdAt = genIdAt
 module.exports.secureRndstr = secureRndstr
diff --git a/packages/backend-rs/src/util/id.rs b/packages/backend-rs/src/util/id.rs
index 20b2f2b74c..515c020ece 100644
--- a/packages/backend-rs/src/util/id.rs
+++ b/packages/backend-rs/src/util/id.rs
@@ -1,8 +1,7 @@
 //! ID generation utility based on [cuid2]
 
 use basen::BASE36;
-use cfg_if::cfg_if;
-use chrono::NaiveDateTime;
+use chrono::{DateTime, NaiveDateTime, Utc};
 use once_cell::sync::OnceCell;
 use std::cmp;
 
@@ -53,21 +52,21 @@ pub fn get_timestamp(id: &str) -> i64 {
     }
 }
 
-cfg_if! {
-    if #[cfg(feature = "napi")] {
-        use chrono::{DateTime, Utc};
+/// 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
+#[crate::export]
+pub fn gen_id() -> String {
+    create_id(&Utc::now().naive_utc()).unwrap()
+}
 
-        /// 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
-        #[napi_derive::napi]
-        pub fn gen_id(date: Option<DateTime<Utc>>) -> String {
-            create_id(&date.unwrap_or_else(Utc::now).naive_utc()).unwrap()
-        }
-    }
+/// Generate an ID using a specific datetime
+#[crate::export]
+pub fn gen_id_at(date: DateTime<Utc>) -> String {
+    create_id(&date.naive_utc()).unwrap()
 }
 
 #[cfg(test)]
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 2135847a17..679a2f886e 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -47,6 +47,7 @@ import {
 	addNoteToAntenna,
 	checkWordMute,
 	genId,
+	genIdAt,
 	isSilencedServer,
 } from "backend-rs";
 import { countSameRenotes } from "@/misc/count-same-renotes.js";
@@ -711,7 +712,7 @@ async function insertNote(
 		data.createdAt = new Date();
 	}
 	const insert = new Note({
-		id: genId(data.createdAt),
+		id: genIdAt(data.createdAt),
 		createdAt: data.createdAt,
 		fileIds: data.files ? data.files.map((file) => file.id) : [],
 		replyId: data.reply ? data.reply.id : null,

From 879d499486f35c9ec420c4aac2238ff6e2a6149c Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 24 Apr 2024 07:37:16 +0900
Subject: [PATCH 92/99] refactor (backend-rs): never throw an error on ID
 generation

---
 packages/backend-rs/index.d.ts                |  2 -
 packages/backend-rs/index.js                  |  3 +-
 .../src/misc/add_note_to_antenna.rs           | 20 +++-
 packages/backend-rs/src/util/id.rs            | 95 +++++++++++--------
 packages/backend/src/boot/worker.ts           |  6 --
 5 files changed, 71 insertions(+), 55 deletions(-)

diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index 016932a092..49009c8b61 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -1129,8 +1129,6 @@ export enum ChatEvent {
   Typing = 'typing'
 }
 export function publishToChatStream(senderUserId: string, receiverUserId: string, kind: ChatEvent, object: any): void
-/** Initializes Cuid2 generator. Must be called before any [create_id]. */
-export function initIdGenerator(length: number, fingerprint: string): void
 export function getTimestamp(id: string): number
 /**
  * The generated ID results in the form of `[8 chars timestamp] + [cuid2]`.
diff --git a/packages/backend-rs/index.js b/packages/backend-rs/index.js
index 9e15fa3658..563477d306 100644
--- a/packages/backend-rs/index.js
+++ b/packages/backend-rs/index.js
@@ -310,7 +310,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { loadEnv, loadConfig, stringToAcct, acctToString, addNoteToAntenna, isBlockedServer, isSilencedServer, isAllowedServer, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, removeOldAttestationChallenges, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, ChatEvent, publishToChatStream, initIdGenerator, getTimestamp, genId, genIdAt, secureRndstr } = nativeBinding
+const { loadEnv, loadConfig, stringToAcct, acctToString, addNoteToAntenna, isBlockedServer, isSilencedServer, isAllowedServer, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, removeOldAttestationChallenges, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, ChatEvent, publishToChatStream, getTimestamp, genId, genIdAt, secureRndstr } = nativeBinding
 
 module.exports.loadEnv = loadEnv
 module.exports.loadConfig = loadConfig
@@ -356,7 +356,6 @@ module.exports.UserProfileFfvisibilityEnum = UserProfileFfvisibilityEnum
 module.exports.UserProfileMutingnotificationtypesEnum = UserProfileMutingnotificationtypesEnum
 module.exports.ChatEvent = ChatEvent
 module.exports.publishToChatStream = publishToChatStream
-module.exports.initIdGenerator = initIdGenerator
 module.exports.getTimestamp = getTimestamp
 module.exports.genId = genId
 module.exports.genIdAt = genIdAt
diff --git a/packages/backend-rs/src/misc/add_note_to_antenna.rs b/packages/backend-rs/src/misc/add_note_to_antenna.rs
index 2ed698d7e6..2ce4e655d7 100644
--- a/packages/backend-rs/src/misc/add_note_to_antenna.rs
+++ b/packages/backend-rs/src/misc/add_note_to_antenna.rs
@@ -1,21 +1,31 @@
 use crate::database::{redis_conn, redis_key};
 use crate::model::entity::note;
 use crate::service::stream;
-use crate::util::id::get_timestamp;
-use redis::{streams::StreamMaxlen, Commands};
+use crate::util::id::{get_timestamp, InvalidIdErr};
+use redis::{streams::StreamMaxlen, Commands, RedisError};
+
+#[derive(thiserror::Error, Debug)]
+pub enum Error {
+    #[error("Redis error: {0}")]
+    RedisErr(#[from] RedisError),
+    #[error("Invalid ID: {0}")]
+    InvalidIdErr(#[from] InvalidIdErr),
+    #[error("Stream error: {0}")]
+    StreamErr(#[from] stream::Error),
+}
 
 type Note = note::Model;
 
 #[crate::export]
-pub fn add_note_to_antenna(antenna_id: String, note: &Note) -> Result<(), stream::Error> {
+pub fn add_note_to_antenna(antenna_id: String, note: &Note) -> Result<(), Error> {
     // for timeline API
     redis_conn()?.xadd_maxlen(
         redis_key(format!("antennaTimeline:{}", antenna_id)),
         StreamMaxlen::Approx(200),
-        format!("{}-*", get_timestamp(&note.id)),
+        format!("{}-*", get_timestamp(&note.id)?),
         &[("note", &note.id)],
     )?;
 
     // for streaming API
-    stream::antenna::publish(antenna_id, note)
+    Ok(stream::antenna::publish(antenna_id, note)?)
 }
diff --git a/packages/backend-rs/src/util/id.rs b/packages/backend-rs/src/util/id.rs
index 515c020ece..595a8ebb3a 100644
--- a/packages/backend-rs/src/util/id.rs
+++ b/packages/backend-rs/src/util/id.rs
@@ -1,54 +1,63 @@
 //! ID generation utility based on [cuid2]
 
+use crate::config::CONFIG;
 use basen::BASE36;
 use chrono::{DateTime, NaiveDateTime, Utc};
 use once_cell::sync::OnceCell;
 use std::cmp;
 
-#[derive(thiserror::Error, Debug, PartialEq, Eq)]
-#[error("ID generator has not been initialized yet")]
-pub struct ErrorUninitialized;
-
 static FINGERPRINT: OnceCell<String> = OnceCell::new();
 static GENERATOR: OnceCell<cuid2::CuidConstructor> = OnceCell::new();
 
 const TIME_2000: i64 = 946_684_800_000;
-const TIMESTAMP_LENGTH: u16 = 8;
+const TIMESTAMP_LENGTH: u8 = 8;
 
-/// Initializes Cuid2 generator. Must be called before any [create_id].
-#[crate::export]
-pub fn init_id_generator(length: u16, fingerprint: &str) {
+/// Initializes Cuid2 generator.
+fn init_id_generator(length: u8, fingerprint: &str) {
     FINGERPRINT.get_or_init(move || format!("{}{}", fingerprint, cuid2::create_id()));
     GENERATOR.get_or_init(move || {
         cuid2::CuidConstructor::new()
             // length to pass shoule be greater than or equal to 8.
-            .with_length(cmp::max(length - TIMESTAMP_LENGTH, 8))
+            .with_length(cmp::max(length - TIMESTAMP_LENGTH, 8).into())
             .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(datetime: &NaiveDateTime) -> Result<String, ErrorUninitialized> {
-    match GENERATOR.get() {
-        None => Err(ErrorUninitialized),
-        Some(gen) => {
-            let date_num = cmp::max(0, datetime.and_utc().timestamp_millis() - TIME_2000) as u64;
-            Ok(format!(
-                "{:0>8}{}",
-                BASE36.encode_var_len(&date_num),
-                gen.create_id()
-            ))
-        }
+/// Returns Cuid2 with the length specified by [init_id_generator].
+/// It automatically calls [init_id_generator], if the generator has not been initialized.
+fn create_id(datetime: &NaiveDateTime) -> String {
+    if GENERATOR.get().is_none() {
+        let length = match &CONFIG.cuid {
+            Some(cuid) => cmp::min(cmp::max(cuid.length.unwrap_or(16), 16), 24),
+            None => 16,
+        };
+        let fingerprint = match &CONFIG.cuid {
+            Some(cuid) => cuid.fingerprint.as_deref().unwrap_or_default(),
+            None => "",
+        };
+        init_id_generator(length, fingerprint);
     }
+    let date_num = cmp::max(0, datetime.and_utc().timestamp_millis() - TIME_2000) as u64;
+    format!(
+        "{:0>8}{}",
+        BASE36.encode_var_len(&date_num),
+        GENERATOR.get().unwrap().create_id()
+    )
+}
+
+#[derive(thiserror::Error, Debug)]
+#[error("Invalid ID: {id}")]
+pub struct InvalidIdErr {
+    id: String,
 }
 
 #[crate::export]
-pub fn get_timestamp(id: &str) -> i64 {
+pub fn get_timestamp(id: &str) -> Result<i64, InvalidIdErr> {
     let n: Option<u64> = BASE36.decode_var_len(&id[0..8]);
-    match n {
-        None => -1,
-        Some(n) => n as i64 + TIME_2000,
+    if let Some(n) = n {
+        Ok(n as i64 + TIME_2000)
+    } else {
+        Err(InvalidIdErr { id: id.to_string() })
     }
 }
 
@@ -60,35 +69,41 @@ pub fn get_timestamp(id: &str) -> i64 {
 /// Ref: https://github.com/paralleldrive/cuid2#parameterized-length
 #[crate::export]
 pub fn gen_id() -> String {
-    create_id(&Utc::now().naive_utc()).unwrap()
+    create_id(&Utc::now().naive_utc())
 }
 
 /// Generate an ID using a specific datetime
 #[crate::export]
 pub fn gen_id_at(date: DateTime<Utc>) -> String {
-    create_id(&date.naive_utc()).unwrap()
+    create_id(&date.naive_utc())
 }
 
 #[cfg(test)]
 mod unit_test {
-    use crate::util::id;
-    use chrono::Utc;
+    use super::{gen_id, gen_id_at, get_timestamp};
+    use chrono::{Duration, Utc};
     use pretty_assertions::{assert_eq, assert_ne};
     use std::thread;
 
     #[test]
     fn can_create_and_decode_id() {
-        let now = Utc::now().naive_utc();
-        assert_eq!(id::create_id(&now), Err(id::ErrorUninitialized));
-        id::init_id_generator(16, "");
-        assert_eq!(id::create_id(&now).unwrap().len(), 16);
-        assert_ne!(id::create_id(&now).unwrap(), id::create_id(&now).unwrap());
-        let id1 = thread::spawn(move || id::create_id(&now).unwrap());
-        let id2 = thread::spawn(move || id::create_id(&now).unwrap());
+        let now = Utc::now();
+        assert_eq!(gen_id().len(), 16);
+        assert_ne!(gen_id_at(now), gen_id_at(now));
+        assert_ne!(gen_id(), gen_id());
+
+        let id1 = thread::spawn(move || gen_id_at(now));
+        let id2 = thread::spawn(move || gen_id_at(now));
         assert_ne!(id1.join().unwrap(), id2.join().unwrap());
 
-        let test_id = id::create_id(&now).unwrap();
-        let timestamp = id::get_timestamp(&test_id);
-        assert_eq!(now.and_utc().timestamp_millis(), timestamp);
+        let test_id = gen_id_at(now);
+        let timestamp = get_timestamp(&test_id).unwrap();
+        assert_eq!(now.timestamp_millis(), timestamp);
+
+        let now_id = gen_id_at(now);
+        let old_id = gen_id_at(now - Duration::milliseconds(1));
+        let future_id = gen_id_at(now + Duration::milliseconds(1));
+        assert!(old_id < now_id);
+        assert!(now_id < future_id);
     }
 }
diff --git a/packages/backend/src/boot/worker.ts b/packages/backend/src/boot/worker.ts
index cae861230f..0acdcd97c6 100644
--- a/packages/backend/src/boot/worker.ts
+++ b/packages/backend/src/boot/worker.ts
@@ -1,17 +1,11 @@
 import cluster from "node:cluster";
-import { config } from "@/config.js";
 import { initDb } from "@/db/postgre.js";
-import { initIdGenerator } from "backend-rs";
 import os from "node:os";
 
 /**
  * Init worker process
  */
 export async function workerMain() {
-	const length = Math.min(Math.max(config.cuid?.length ?? 16, 16), 24);
-	const fingerprint = config.cuid?.fingerprint ?? "";
-	initIdGenerator(length, fingerprint);
-
 	await initDb();
 
 	if (!process.env.mode || process.env.mode === "web") {

From 109884f6d8326a9cbac9e63a74c1dc8592635a84 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 24 Apr 2024 13:16:25 +0900
Subject: [PATCH 93/99] refactor (backend): port note watch/unwatch to
 backend-rs

---
 packages/backend-rs/index.d.ts                |  2 +
 packages/backend-rs/index.js                  |  4 +-
 packages/backend-rs/src/service/mod.rs        |  1 +
 packages/backend-rs/src/service/note/mod.rs   |  1 +
 packages/backend-rs/src/service/note/watch.rs | 42 +++++++++++++++++++
 .../api/endpoints/notes/watching/create.ts    |  4 +-
 .../api/endpoints/notes/watching/delete.ts    |  4 +-
 packages/backend/src/services/note/unwatch.ts | 10 -----
 packages/backend/src/services/note/watch.ts   | 20 ---------
 9 files changed, 53 insertions(+), 35 deletions(-)
 create mode 100644 packages/backend-rs/src/service/note/mod.rs
 create mode 100644 packages/backend-rs/src/service/note/watch.rs
 delete mode 100644 packages/backend/src/services/note/unwatch.ts
 delete mode 100644 packages/backend/src/services/note/watch.ts

diff --git a/packages/backend-rs/index.d.ts b/packages/backend-rs/index.d.ts
index 49009c8b61..6dc5848bd4 100644
--- a/packages/backend-rs/index.d.ts
+++ b/packages/backend-rs/index.d.ts
@@ -1122,6 +1122,8 @@ export interface Webhook {
   latestSentAt: Date | null
   latestStatus: number | null
 }
+export function watchNote(watcherId: string, noteAuthorId: string, noteId: string): Promise<void>
+export function unwatchNote(watcherId: string, noteId: string): Promise<void>
 export enum ChatEvent {
   Message = 'message',
   Read = 'read',
diff --git a/packages/backend-rs/index.js b/packages/backend-rs/index.js
index 563477d306..1b7b487ede 100644
--- a/packages/backend-rs/index.js
+++ b/packages/backend-rs/index.js
@@ -310,7 +310,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { loadEnv, loadConfig, stringToAcct, acctToString, addNoteToAntenna, isBlockedServer, isSilencedServer, isAllowedServer, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, removeOldAttestationChallenges, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, ChatEvent, publishToChatStream, getTimestamp, genId, genIdAt, secureRndstr } = nativeBinding
+const { loadEnv, loadConfig, stringToAcct, acctToString, addNoteToAntenna, isBlockedServer, isSilencedServer, isAllowedServer, checkWordMute, getFullApAccount, isSelfHost, isSameOrigin, extractHost, toPuny, isUnicodeEmoji, sqlLikeEscape, safeForSql, formatMilliseconds, getNoteSummary, toMastodonId, fromMastodonId, fetchMeta, metaToPugArgs, nyaify, hashPassword, verifyPassword, isOldPasswordAlgorithm, decodeReaction, countReactions, toDbReaction, removeOldAttestationChallenges, AntennaSrcEnum, DriveFileUsageHintEnum, MutedNoteReasonEnum, NoteVisibilityEnum, NotificationTypeEnum, PageVisibilityEnum, PollNotevisibilityEnum, RelayStatusEnum, UserEmojimodpermEnum, UserProfileFfvisibilityEnum, UserProfileMutingnotificationtypesEnum, watchNote, unwatchNote, ChatEvent, publishToChatStream, getTimestamp, genId, genIdAt, secureRndstr } = nativeBinding
 
 module.exports.loadEnv = loadEnv
 module.exports.loadConfig = loadConfig
@@ -354,6 +354,8 @@ module.exports.RelayStatusEnum = RelayStatusEnum
 module.exports.UserEmojimodpermEnum = UserEmojimodpermEnum
 module.exports.UserProfileFfvisibilityEnum = UserProfileFfvisibilityEnum
 module.exports.UserProfileMutingnotificationtypesEnum = UserProfileMutingnotificationtypesEnum
+module.exports.watchNote = watchNote
+module.exports.unwatchNote = unwatchNote
 module.exports.ChatEvent = ChatEvent
 module.exports.publishToChatStream = publishToChatStream
 module.exports.getTimestamp = getTimestamp
diff --git a/packages/backend-rs/src/service/mod.rs b/packages/backend-rs/src/service/mod.rs
index baf29e06ad..a1b1ada71b 100644
--- a/packages/backend-rs/src/service/mod.rs
+++ b/packages/backend-rs/src/service/mod.rs
@@ -1 +1,2 @@
+pub mod note;
 pub mod stream;
diff --git a/packages/backend-rs/src/service/note/mod.rs b/packages/backend-rs/src/service/note/mod.rs
new file mode 100644
index 0000000000..f5362807d2
--- /dev/null
+++ b/packages/backend-rs/src/service/note/mod.rs
@@ -0,0 +1 @@
+pub mod watch;
diff --git a/packages/backend-rs/src/service/note/watch.rs b/packages/backend-rs/src/service/note/watch.rs
new file mode 100644
index 0000000000..f740ec6ce4
--- /dev/null
+++ b/packages/backend-rs/src/service/note/watch.rs
@@ -0,0 +1,42 @@
+use crate::database::db_conn;
+use crate::model::entity::note_watching;
+use crate::util::id::gen_id;
+use sea_orm::{ActiveValue, ColumnTrait, DbErr, EntityTrait, ModelTrait, QueryFilter};
+
+#[crate::export]
+pub async fn watch_note(
+    watcher_id: &str,
+    note_author_id: &str,
+    note_id: &str,
+) -> Result<(), DbErr> {
+    if watcher_id != note_author_id {
+        note_watching::Entity::insert(note_watching::ActiveModel {
+            id: ActiveValue::set(gen_id()),
+            created_at: ActiveValue::set(chrono::Local::now().naive_local()),
+            user_id: ActiveValue::Set(watcher_id.to_string()),
+            note_user_id: ActiveValue::Set(note_author_id.to_string()),
+            note_id: ActiveValue::Set(note_id.to_string()),
+        })
+        .exec(db_conn().await?)
+        .await?;
+    }
+
+    Ok(())
+}
+
+#[crate::export]
+pub async fn unwatch_note(watcher_id: &str, note_id: &str) -> Result<(), DbErr> {
+    let db = db_conn().await?;
+
+    let entry = note_watching::Entity::find()
+        .filter(note_watching::Column::UserId.eq(watcher_id))
+        .filter(note_watching::Column::NoteId.eq(note_id))
+        .one(db)
+        .await?;
+
+    if let Some(entry) = entry {
+        entry.delete(db).await?;
+    }
+
+    Ok(())
+}
diff --git a/packages/backend/src/server/api/endpoints/notes/watching/create.ts b/packages/backend/src/server/api/endpoints/notes/watching/create.ts
index ec13f5aa2a..ae6d65f562 100644
--- a/packages/backend/src/server/api/endpoints/notes/watching/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/watching/create.ts
@@ -1,4 +1,4 @@
-import watch from "@/services/note/watch.js";
+import { watchNote } from "backend-rs";
 import define from "@/server/api/define.js";
 import { getNote } from "@/server/api/common/getters.js";
 import { ApiError } from "@/server/api/error.js";
@@ -34,5 +34,5 @@ export default define(meta, paramDef, async (ps, user) => {
 		throw err;
 	});
 
-	await watch(user.id, note);
+	await watchNote(user.id, note.userId, note.id);
 });
diff --git a/packages/backend/src/server/api/endpoints/notes/watching/delete.ts b/packages/backend/src/server/api/endpoints/notes/watching/delete.ts
index 18994fa80c..746b293453 100644
--- a/packages/backend/src/server/api/endpoints/notes/watching/delete.ts
+++ b/packages/backend/src/server/api/endpoints/notes/watching/delete.ts
@@ -1,4 +1,4 @@
-import unwatch from "@/services/note/unwatch.js";
+import { unwatchNote } from "backend-rs";
 import define from "@/server/api/define.js";
 import { getNote } from "@/server/api/common/getters.js";
 import { ApiError } from "@/server/api/error.js";
@@ -34,5 +34,5 @@ export default define(meta, paramDef, async (ps, user) => {
 		throw err;
 	});
 
-	await unwatch(user.id, note);
+	await unwatchNote(user.id, note.id);
 });
diff --git a/packages/backend/src/services/note/unwatch.ts b/packages/backend/src/services/note/unwatch.ts
deleted file mode 100644
index b4da5e86da..0000000000
--- a/packages/backend/src/services/note/unwatch.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import type { User } from "@/models/entities/user.js";
-import { NoteWatchings } from "@/models/index.js";
-import type { Note } from "@/models/entities/note.js";
-
-export default async (me: User["id"], note: Note) => {
-	await NoteWatchings.delete({
-		noteId: note.id,
-		userId: me,
-	});
-};
diff --git a/packages/backend/src/services/note/watch.ts b/packages/backend/src/services/note/watch.ts
deleted file mode 100644
index 682b0822cc..0000000000
--- a/packages/backend/src/services/note/watch.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import type { User } from "@/models/entities/user.js";
-import type { Note } from "@/models/entities/note.js";
-import { NoteWatchings } from "@/models/index.js";
-import { genId } from "backend-rs";
-import type { NoteWatching } from "@/models/entities/note-watching.js";
-
-export default async (me: User["id"], note: Note) => {
-	// 自分の投稿はwatchできない
-	if (me === note.userId) {
-		return;
-	}
-
-	await NoteWatchings.insert({
-		id: genId(),
-		createdAt: new Date(),
-		noteId: note.id,
-		userId: me,
-		noteUserId: note.userId,
-	} as NoteWatching);
-};

From cc37177bb55d765f74c69504b8cba976250f4757 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 24 Apr 2024 13:43:18 +0900
Subject: [PATCH 94/99] fix (backend-rs): use server's local time

---
 .../backend-rs/src/misc/remove_old_attestation_challenges.rs  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend-rs/src/misc/remove_old_attestation_challenges.rs b/packages/backend-rs/src/misc/remove_old_attestation_challenges.rs
index 829a8e2c0c..c5c3e0a2af 100644
--- a/packages/backend-rs/src/misc/remove_old_attestation_challenges.rs
+++ b/packages/backend-rs/src/misc/remove_old_attestation_challenges.rs
@@ -2,14 +2,14 @@
 
 use crate::database::db_conn;
 use crate::model::entity::attestation_challenge;
-use chrono::{Duration, Utc};
+use chrono::{Duration, Local};
 use sea_orm::{ColumnTrait, DbErr, EntityTrait, QueryFilter};
 
 /// Delete all entries in the "attestation_challenge" table created at more than 5 minutes ago
 #[crate::export]
 pub async fn remove_old_attestation_challenges() -> Result<(), DbErr> {
     attestation_challenge::Entity::delete_many()
-        .filter(attestation_challenge::Column::CreatedAt.lt(Utc::now() - Duration::minutes(5)))
+        .filter(attestation_challenge::Column::CreatedAt.lt(Local::now() - Duration::minutes(5)))
         .exec(db_conn().await?)
         .await?;
 

From 71e4621e264fdf47da5f426aa2679e98d75474f2 Mon Sep 17 00:00:00 2001
From: Linca <lhcfllinca@gmail.com>
Date: Wed, 24 Apr 2024 06:02:37 +0000
Subject: [PATCH 95/99] fix: Replying to a post sometimes doesn't increase
 post's reply count

Co-authored-by: Lhcfl <Lhcfl@outlook.com>
---
 packages/client/src/components/MkNoteDetailed.vue | 1 -
 packages/client/src/scripts/use-note-capture.ts   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index 2c242645b4..82ca22f32e 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -278,7 +278,6 @@ useNoteCapture({
 	note,
 	isDeletedRef: isDeleted,
 	onReplied: (replyNote) => {
-		note.value.repliesCount += 1;
 		repliesPagingComponent.value?.append(replyNote);
 	},
 });
diff --git a/packages/client/src/scripts/use-note-capture.ts b/packages/client/src/scripts/use-note-capture.ts
index dac3e140a3..0d0d4dbe5b 100644
--- a/packages/client/src/scripts/use-note-capture.ts
+++ b/packages/client/src/scripts/use-note-capture.ts
@@ -21,6 +21,7 @@ export function useNoteCapture(props: {
 
 		switch (type) {
 			case "replied": {
+				note.value.repliesCount += 1;
 				if (props.onReplied) {
 					const { id: createdId } = body;
 					const replyNote = await os.api("notes/show", {

From f895e002eaec99a5c4ab7a83959e2eefff74059b Mon Sep 17 00:00:00 2001
From: jolupa <jolupameister@gmail.com>
Date: Tue, 23 Apr 2024 12:12:42 +0000
Subject: [PATCH 96/99] locale: update translations (Catalan)

Currently translated at 100.0% (1918 of 1918 strings)

Translation: Firefish/locales
Translate-URL: https://hosted.weblate.org/projects/firefish/locales/ca/
---
 locales/ca-ES.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 47328cb554..199397153d 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -2289,3 +2289,6 @@ autocorrectNoteLanguage: Mostra un avís si l'idioma de la publicació no coinci
   amb el resultat de l'idioma detectat automàticament
 noteEditHistory: Historial d'edicions
 media: Multimèdia
+antennaLimit: El nombre màxim d'antenes que pot crear un usuari
+showAddFileDescriptionAtFirstPost: Obra de forma automàtica un formulari per escriure
+  una descripció quant intentes publicar un fitxer que no en té

From 89a8547cb135a61a849a9d43e42bba7ef6f235a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=91=A8=E9=83=A8=E8=90=BD?=
 <laozhoubuluo@gmail.com>
Date: Tue, 23 Apr 2024 09:02:00 +0000
Subject: [PATCH 97/99] locale: update translations (Chinese (Simplified))

Currently translated at 100.0% (1918 of 1918 strings)

Translation: Firefish/locales
Translate-URL: https://hosted.weblate.org/projects/firefish/locales/zh_Hans/
---
 locales/zh-CN.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 1be460f7f0..0adb9b4ba1 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1386,7 +1386,7 @@ _poll:
 _visibility:
   public: "公开"
   publicDescription: "您的帖子将出现在公共时间线上"
-  home: "不公开"
+  home: "悄悄公开"
   homeDescription: "仅发送至首页时间线"
   followers: "仅关注者"
   followersDescription: "仅对您的关注者和提及的用户可见"

From 9bf17dcb3c6fb002de1bd0b533736e31342253e0 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 24 Apr 2024 15:19:29 +0900
Subject: [PATCH 98/99] docs: update changelog

---
 docs/changelog.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/changelog.md b/docs/changelog.md
index 70f8b34fbe..e49225f3a4 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -5,6 +5,12 @@ Critical security updates are indicated by the :warning: icon.
 - Server administrators should check [notice-for-admins.md](./notice-for-admins.md) as well.
 - Third-party client/bot developers may want to check [api-change.md](./api-change.md) as well.
 
+## Unreleased
+
+- Improve the usability of the feature to prevent forgetting to write alt texts
+- Add a server-wide setting for the maximum number of antennas each user can create
+- Fix bugs
+
 ## [v20240421](https://firefish.dev/firefish/firefish/-/merge_requests/10756/commits)
 
 - Fix bugs

From 4816d75e23e7dcdb4949345d220a3811b3639a07 Mon Sep 17 00:00:00 2001
From: naskya <m@naskya.net>
Date: Wed, 24 Apr 2024 15:42:23 +0900
Subject: [PATCH 99/99] v20240424

---
 docs/api-change.md | 2 +-
 docs/changelog.md  | 2 +-
 package.json       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/api-change.md b/docs/api-change.md
index 89cf8a9d38..d9b7095c7c 100644
--- a/docs/api-change.md
+++ b/docs/api-change.md
@@ -2,7 +2,7 @@
 
 Breaking changes are indicated by the :warning: icon.
 
-## Unreleased
+## v20240424
 
 - Added `antennaLimit` field to the response of `meta` and `admin/meta`, and the request of `admin/update-meta` (optional).
 - Added `filter` optional parameter to `notes/renotes` endpoint to filter the types of renotes. It can take the following values:
diff --git a/docs/changelog.md b/docs/changelog.md
index e49225f3a4..844c45b706 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -5,7 +5,7 @@ Critical security updates are indicated by the :warning: icon.
 - Server administrators should check [notice-for-admins.md](./notice-for-admins.md) as well.
 - Third-party client/bot developers may want to check [api-change.md](./api-change.md) as well.
 
-## Unreleased
+## [v20240424](https://firefish.dev/firefish/firefish/-/merge_requests/10765/commits)
 
 - Improve the usability of the feature to prevent forgetting to write alt texts
 - Add a server-wide setting for the maximum number of antennas each user can create
diff --git a/package.json b/package.json
index 93594a5698..0e5f0e77ab 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "firefish",
-	"version": "20240421",
+	"version": "20240424",
 	"repository": {
 		"type": "git",
 		"url": "https://firefish.dev/firefish/firefish.git"