From 338e898f5691532891f2229da7f4c5efd4de7598 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sun, 1 Jan 2023 21:02:55 +0100
Subject: [PATCH 01/56] client: disable unavailable visibilities

---
 packages/client/src/components/post-form.vue  |  4 ++--
 .../src/components/visibility-picker.vue      | 22 ++++++++++++-------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/packages/client/src/components/post-form.vue b/packages/client/src/components/post-form.vue
index b7efa3b14..a22235ee3 100644
--- a/packages/client/src/components/post-form.vue
+++ b/packages/client/src/components/post-form.vue
@@ -393,8 +393,8 @@ function setVisibility() {
 	}
 
 	os.popup(defineAsyncComponent(() => import('./visibility-picker.vue')), {
-		currentVisibility: visibility,
-		currentLocalOnly: localOnly,
+		parentVisibility: visibility,
+		parentLocalOnly: localOnly,
 		src: visibilityButton,
 	}, {
 		changeVisibility: v => {
diff --git a/packages/client/src/components/visibility-picker.vue b/packages/client/src/components/visibility-picker.vue
index 2ed42cb70..4321a6982 100644
--- a/packages/client/src/components/visibility-picker.vue
+++ b/packages/client/src/components/visibility-picker.vue
@@ -1,28 +1,28 @@
 <template>
 <MkModal ref="modal" :z-priority="'high'" :src="src" @click="modal.close()" @closed="emit('closed')">
 	<div class="gqyayizv _popup">
-		<button key="public" class="_button" :class="{ active: v === 'public' }" data-index="1" @click="choose('public')">
+		<button key="public" :disabled="disabled['public']" class="_button" :class="{ active: v === 'public' }" data-index="1" @click="choose('public')">
 			<div><i class="fas fa-globe"></i></div>
 			<div>
 				<span>{{ i18n.ts._visibility.public }}</span>
 				<span>{{ i18n.ts._visibility.publicDescription }}</span>
 			</div>
 		</button>
-		<button key="home" class="_button" :class="{ active: v === 'home' }" data-index="2" @click="choose('home')">
+		<button key="home" :disabled="disabled['home']" class="_button" :class="{ active: v === 'home' }" data-index="2" @click="choose('home')">
 			<div><i class="fas fa-home"></i></div>
 			<div>
 				<span>{{ i18n.ts._visibility.home }}</span>
 				<span>{{ i18n.ts._visibility.homeDescription }}</span>
 			</div>
 		</button>
-		<button key="followers" class="_button" :class="{ active: v === 'followers' }" data-index="3" @click="choose('followers')">
+		<button key="followers" :disabled="disabled['followers']" class="_button" :class="{ active: v === 'followers' }" data-index="3" @click="choose('followers')">
 			<div><i class="fas fa-unlock"></i></div>
 			<div>
 				<span>{{ i18n.ts._visibility.followers }}</span>
 				<span>{{ i18n.ts._visibility.followersDescription }}</span>
 			</div>
 		</button>
-		<button key="specified" :disabled="localOnly" class="_button" :class="{ active: v === 'specified' }" data-index="4" @click="choose('specified')">
+		<button key="specified" :disabled="localOnly || disabled['specified']" class="_button" :class="{ active: v === 'specified' }" data-index="4" @click="choose('specified')">
 			<div><i class="fas fa-envelope"></i></div>
 			<div>
 				<span>{{ i18n.ts._visibility.specified }}</span>
@@ -51,7 +51,8 @@ import { i18n } from '@/i18n';
 const modal = $ref<InstanceType<typeof MkModal>>();
 
 const props = withDefaults(defineProps<{
-	currentVisibility: typeof foundkey.noteVisibilities[number];
+	parentVisibility: foundkey.NoteVisibility;
+	parentLocalOnly: boolean;
 	currentLocalOnly: boolean;
 	src?: HTMLElement;
 }>(), {
@@ -63,14 +64,19 @@ const emit = defineEmits<{
 	(ev: 'closed'): void;
 }>();
 
-let v = $ref(props.currentVisibility);
-let localOnly = $ref(props.currentLocalOnly);
+let v = $ref(props.parentVisibility);
+let localOnly = $ref(props.parentLocalOnly);
+
+const disabled = foundkey.noteVisibilities.reduce((acc, visibility) => {
+	acc[visibility] = (visibility !== foundkey.minVisibility(visibility, props.parentVisibility));
+	return acc;
+}, {});
 
 watch($$(localOnly), () => {
 	emit('changeLocalOnly', localOnly);
 });
 
-function choose(visibility: typeof foundkey.noteVisibilities[number]): void {
+function choose(visibility: typeof foundkey.NoteVisibility): void {
 	v = visibility;
 	emit('changeVisibility', visibility);
 	nextTick(() => {

From 0b7c9095bf96254a4ac0b4488b223088bd078612 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sun, 1 Jan 2023 21:22:53 +0100
Subject: [PATCH 02/56] server: don't return users twice in search

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

diff --git a/packages/backend/src/server/api/endpoints/users/search.ts b/packages/backend/src/server/api/endpoints/users/search.ts
index cdd24390a..0e861bdc2 100644
--- a/packages/backend/src/server/api/endpoints/users/search.ts
+++ b/packages/backend/src/server/api/endpoints/users/search.ts
@@ -64,7 +64,7 @@ export default define(meta, paramDef, async (ps, me) => {
 			.getMany();
 	} else {
 		const nameQuery = Users.createQueryBuilder('user')
-			.where(new Brackets(qb => { 
+			.where(new Brackets(qb => {
 				qb.where('user.name ILIKE :query', { query: '%' + ps.query + '%' });
 
 				// Also search username if it qualifies as username
@@ -103,6 +103,8 @@ export default define(meta, paramDef, async (ps, me) => {
 
 			const query = Users.createQueryBuilder('user')
 				.where(`user.id IN (${ profQuery.getQuery() })`)
+				// don't show users twice
+				.andWhere('user.id NOT IN (:...ids)', { ids: users.map(user => user.id) })
 				.andWhere(new Brackets(qb => { qb
 					.where('user.updatedAt IS NULL')
 					.orWhere('user.updatedAt > :activeThreshold', { activeThreshold });

From 8b0b7ff525e64cdeb7f3ee98f6b9804f893e4fe6 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sun, 1 Jan 2023 22:11:19 +0100
Subject: [PATCH 03/56] server: change default value for api/admin/show-users
 origin param

Changed from "local" to "combined" to fix a bug when the hostname is set
but origin is not.

Changelog: Changed
---
 .../backend/src/server/api/endpoints/admin/show-users.ts    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/admin/show-users.ts b/packages/backend/src/server/api/endpoints/admin/show-users.ts
index 14889e4de..c15de1402 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-users.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-users.ts
@@ -26,13 +26,11 @@ export const paramDef = {
 		offset: { type: 'integer', default: 0 },
 		sort: { type: 'string', enum: ['+follower', '-follower', '+createdAt', '-createdAt', '+updatedAt', '-updatedAt'] },
 		state: { type: 'string', enum: ['all', 'alive', 'available', 'admin', 'moderator', 'adminOrModerator', 'silenced', 'suspended'], default: 'all' },
-		origin: { type: 'string', enum: ['combined', 'local', 'remote'], default: 'local' },
+		origin: { type: 'string', enum: ['combined', 'local', 'remote'], default: 'combined' },
 		username: { type: 'string', nullable: true, default: null },
 		hostname: {
 			type: 'string',
-			nullable: true,
-			default: null,
-			description: 'The local host is represented with `null`.',
+			description: "To represent the local host, use `origin: 'local'` instead.",
 		},
 	},
 	required: [],

From 8f09b05e7c56e7868a5c1d63e2ccab36a7d6782c Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sun, 1 Jan 2023 22:27:25 +0100
Subject: [PATCH 04/56] chore: remove reversi database tables

Changelog: Fixed
---
 .../migration/1672607891750-remove-reversi.js | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 packages/backend/migration/1672607891750-remove-reversi.js

diff --git a/packages/backend/migration/1672607891750-remove-reversi.js b/packages/backend/migration/1672607891750-remove-reversi.js
new file mode 100644
index 000000000..2906e884a
--- /dev/null
+++ b/packages/backend/migration/1672607891750-remove-reversi.js
@@ -0,0 +1,21 @@
+export class removeReversi1672607891750 {
+	name = 'removeReversi1672607891750';
+
+	async up(queryRunner) {
+		await queryRunner.query(`DROP TABLE "reversi_matching"`);
+		await queryRunner.query(`DROP TABLE "reversi_game"`);
+	}
+
+	async down(queryRunner) {
+		await queryRunner.query(`CREATE TABLE "reversi_game" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "startedAt" TIMESTAMP WITH TIME ZONE, "user1Id" character varying(32) NOT NULL, "user2Id" character varying(32) NOT NULL, "user1Accepted" boolean NOT NULL DEFAULT false, "user2Accepted" boolean NOT NULL DEFAULT false, "black" integer, "isStarted" boolean NOT NULL DEFAULT false, "isEnded" boolean NOT NULL DEFAULT false, "winnerId" character varying(32), "surrendered" character varying(32), "logs" jsonb NOT NULL DEFAULT '[]', "map" character varying(64) array NOT NULL, "bw" character varying(32) NOT NULL, "isLlotheo" boolean NOT NULL DEFAULT false, "canPutEverywhere" boolean NOT NULL DEFAULT false, "loopedBoard" boolean NOT NULL DEFAULT false, "form1" jsonb DEFAULT null, "form2" jsonb DEFAULT null, "crc32" character varying(32), CONSTRAINT "PK_76b30eeba71b1193ad7c5311c3f" PRIMARY KEY ("id"))`);
+		await queryRunner.query(`CREATE INDEX "IDX_b46ec40746efceac604142be1c" ON "reversi_game" ("createdAt")`);
+		await queryRunner.query(`CREATE TABLE "reversi_matching" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "parentId" character varying(32) NOT NULL, "childId" character varying(32) NOT NULL, CONSTRAINT "PK_880bd0afbab232f21c8b9d146cf" PRIMARY KEY ("id"))`);
+		await queryRunner.query(`CREATE INDEX "IDX_b604d92d6c7aec38627f6eaf16" ON "reversi_matching" ("createdAt")`);
+		await queryRunner.query(`CREATE INDEX "IDX_3b25402709dd9882048c2bbade" ON "reversi_matching" ("parentId")`);
+		await queryRunner.query(`CREATE INDEX "IDX_e247b23a3c9b45f89ec1299d06" ON "reversi_matching" ("childId")`);
+		await queryRunner.query(`ALTER TABLE "reversi_game" ADD CONSTRAINT "FK_f7467510c60a45ce5aca6292743" FOREIGN KEY ("user1Id") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+		await queryRunner.query(`ALTER TABLE "reversi_game" ADD CONSTRAINT "FK_6649a4e8c5d5cf32fb03b5da9f6" FOREIGN KEY ("user2Id") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+		await queryRunner.query(`ALTER TABLE "reversi_matching" ADD CONSTRAINT "FK_3b25402709dd9882048c2bbade0" FOREIGN KEY ("parentId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+		await queryRunner.query(`ALTER TABLE "reversi_matching" ADD CONSTRAINT "FK_e247b23a3c9b45f89ec1299d066" FOREIGN KEY ("childId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+	}
+}

From 3aaa9facc6c7ff71d42a213448a7b18ac6a2cf2a Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sun, 1 Jan 2023 23:30:43 +0100
Subject: [PATCH 05/56] translate japanese to english

---
 packages/backend/src/services/following/delete.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/services/following/delete.ts b/packages/backend/src/services/following/delete.ts
index b99ff73e2..23cd7486e 100644
--- a/packages/backend/src/services/following/delete.ts
+++ b/packages/backend/src/services/following/delete.ts
@@ -20,7 +20,7 @@ export default async function(follower: { id: User['id']; host: User['host']; ur
 	});
 
 	if (following == null) {
-		logger.warn('フォロー解除がリクエストされましたがフォローしていませんでした');
+		logger.warn('unfollow requested, but did not follow');
 		return;
 	}
 

From 0fbd7fa4925a09f77ef16f5b433422502a6b67de Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sun, 1 Jan 2023 23:32:01 +0100
Subject: [PATCH 06/56] client: fix 500 error in notifications

closes https://akkoma.dev/FoundKeyGang/FoundKey/issues/73

Changelog: Fixed
---
 packages/backend/src/services/following/delete.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/services/following/delete.ts b/packages/backend/src/services/following/delete.ts
index 23cd7486e..9a29d1921 100644
--- a/packages/backend/src/services/following/delete.ts
+++ b/packages/backend/src/services/following/delete.ts
@@ -1,3 +1,4 @@
+import { db } from '@/db/postgre.js';
 import { publishMainStream, publishUserEvent } from '@/services/stream.js';
 import { renderActivity } from '@/remote/activitypub/renderer/index.js';
 import renderFollow from '@/remote/activitypub/renderer/follow.js';
@@ -24,7 +25,11 @@ export default async function(follower: { id: User['id']; host: User['host']; ur
 		return;
 	}
 
-	await Followings.delete(following.id);
+	await Promise.all([
+		Followings.delete(following.id),
+		// delete notifications that the ex-follower can now no longer see
+		db.query('DELETE FROM "notification" WHERE "noteId" IS NOT NULL AND "notifieeId" = $1 AND NOT note_visible("noteId", "notifieeId")', [follower.id]),
+	]);
 
 	decrementFollowing(follower, followee);
 

From 7f564431bee3d2476acb5c45ef0df11b07863d89 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 2 Jan 2023 00:11:35 +0100
Subject: [PATCH 07/56] server: fixup sql

Fixup to 0b7c9095bf96254a4ac0b4488b223088bd078612.
---
 packages/backend/src/server/api/endpoints/users/search.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/users/search.ts b/packages/backend/src/server/api/endpoints/users/search.ts
index 0e861bdc2..02e58cf75 100644
--- a/packages/backend/src/server/api/endpoints/users/search.ts
+++ b/packages/backend/src/server/api/endpoints/users/search.ts
@@ -103,8 +103,8 @@ export default define(meta, paramDef, async (ps, me) => {
 
 			const query = Users.createQueryBuilder('user')
 				.where(`user.id IN (${ profQuery.getQuery() })`)
-				// don't show users twice
-				.andWhere('user.id NOT IN (:...ids)', { ids: users.map(user => user.id) })
+				// don't show users twice, but also make sure there is at least one value otherwise this is an invalid query
+				.andWhere('user.id NOT IN (:...ids)', { ids: users.length === 0 ? [''] : users.map(user => user.id) })
 				.andWhere(new Brackets(qb => { qb
 					.where('user.updatedAt IS NULL')
 					.orWhere('user.updatedAt > :activeThreshold', { activeThreshold });

From 2a46719f312e7ec7f02509383240e40dad18705c Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 2 Jan 2023 12:23:47 +0100
Subject: [PATCH 08/56] server: set file permissions after copy

This explicitly sets the file permissions to allow everyone to read files
since apparently multer sometimes doesn't set the permissions we expect.

Ref: https://akkoma.dev/FoundKeyGang/FoundKey/issues/202
Changelog: Fixed
---
 packages/backend/src/services/drive/internal-storage.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/services/drive/internal-storage.ts b/packages/backend/src/services/drive/internal-storage.ts
index e76749d6c..ee067844f 100644
--- a/packages/backend/src/services/drive/internal-storage.ts
+++ b/packages/backend/src/services/drive/internal-storage.ts
@@ -18,7 +18,9 @@ export class InternalStorage {
 
 	public static saveFromPath(key: string, srcPath: string): string {
 		fs.mkdirSync(InternalStorage.path, { recursive: true });
-		fs.copyFileSync(srcPath, InternalStorage.resolvePath(key));
+		const target = InternalStorage.resolvePath(key);
+		fs.copyFileSync(srcPath, target);
+		fs.chmodSync(target, 0o644);
 		return `${config.url}/files/${key}`;
 	}
 

From d28931bf00568d99708d6ee4e86cb5962c558c11 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 2 Jan 2023 12:43:41 +0100
Subject: [PATCH 09/56] server: remove dateUTC function

---
 packages/backend/src/prelude/time.ts        | 14 --------------
 packages/backend/src/services/chart/core.ts | 18 +++++++++---------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/packages/backend/src/prelude/time.ts b/packages/backend/src/prelude/time.ts
index 06a06debd..4e2e320b0 100644
--- a/packages/backend/src/prelude/time.ts
+++ b/packages/backend/src/prelude/time.ts
@@ -4,20 +4,6 @@ const dateTimeIntervals = {
 	'ms': 1,
 };
 
-export function dateUTC(time: number[]): Date {
-	const d = time.length === 2 ? Date.UTC(time[0], time[1])
-		: time.length === 3 ? Date.UTC(time[0], time[1], time[2])
-		: time.length === 4 ? Date.UTC(time[0], time[1], time[2], time[3])
-		: time.length === 5 ? Date.UTC(time[0], time[1], time[2], time[3], time[4])
-		: time.length === 6 ? Date.UTC(time[0], time[1], time[2], time[3], time[4], time[5])
-		: time.length === 7 ? Date.UTC(time[0], time[1], time[2], time[3], time[4], time[5], time[6])
-		: null;
-
-	if (!d) throw new Error('wrong number of arguments');
-
-	return new Date(d);
-}
-
 export function isTimeSame(a: Date, b: Date): boolean {
 	return a.getTime() === b.getTime();
 }
diff --git a/packages/backend/src/services/chart/core.ts b/packages/backend/src/services/chart/core.ts
index 025fd87ab..cfc02d11a 100644
--- a/packages/backend/src/services/chart/core.ts
+++ b/packages/backend/src/services/chart/core.ts
@@ -6,7 +6,7 @@
 
 import * as nestedProperty from 'nested-property';
 import { EntitySchema, Repository, LessThan, Between } from 'typeorm';
-import { dateUTC, isTimeSame, isTimeBefore, subtractTime, addTime } from '@/prelude/time.js';
+import { isTimeSame, isTimeBefore, subtractTime, addTime } from '@/prelude/time.js';
 import { unique } from '@/prelude/array.js';
 import { getChartInsertLock } from '@/misc/app-lock.js';
 import { db } from '@/db/postgre.js';
@@ -282,10 +282,10 @@ export default abstract class Chart<T extends Schema> {
 	private async claimCurrentLog(group: string | null, span: 'hour' | 'day'): Promise<RawRecord<T>> {
 		const [y, m, d, h] = Chart.getCurrentDate();
 
-		const current = dateUTC(
+		const current = new Date(Date.UTC(...(
 			span === 'hour' ? [y, m, d, h] :
 			span === 'day' ? [y, m, d] :
-			new Error('not happen') as never);
+			new Error('not happen') as never)));
 
 		const repository =
 			span === 'hour' ? this.repositoryForHour :
@@ -533,7 +533,7 @@ export default abstract class Chart<T extends Schema> {
 	}
 
 	public async clean(): Promise<void> {
-		const current = dateUTC(Chart.getCurrentDate());
+		const current = new Date(Date.UTC(...Chart.getCurrentDate()));
 
 		// more than 1 day and less than 3 days
 		const gt = Chart.dateToTimestamp(current) - (60 * 60 * 24 * 3);
@@ -571,11 +571,11 @@ export default abstract class Chart<T extends Schema> {
 		const [y, m, d, h, _m, _s, _ms] = cursor ? Chart.parseDate(subtractTime(addTime(cursor, 1, span), 1)) : Chart.getCurrentDate();
 		const [y2, m2, d2, h2] = cursor ? Chart.parseDate(addTime(cursor, 1, span)) : [] as never;
 
-		const lt = dateUTC([y, m, d, h, _m, _s, _ms]);
+		const lt = new Date(Date.UTC(y, m, d, h, _m, _s, _ms));
 
 		const gt =
-			span === 'day' ? subtractTime(cursor ? dateUTC([y2, m2, d2, 0]) : dateUTC([y, m, d, 0]), amount - 1, 'day') :
-			span === 'hour' ? subtractTime(cursor ? dateUTC([y2, m2, d2, h2]) : dateUTC([y, m, d, h]), amount - 1, 'hour') :
+			span === 'day' ? subtractTime(cursor ? new Date(Date.UTC(y2, m2, d2, 0)) : new Date(Date.UTC(y, m, d, 0)), amount - 1, 'day') :
+			span === 'hour' ? subtractTime(cursor ? new Date(Date.UTC(y2, m2, d2, h2)) : new Date(Date.UTC(y, m, d, h)), amount - 1, 'hour') :
 			new Error('not happen') as never;
 
 		const repository =
@@ -632,8 +632,8 @@ export default abstract class Chart<T extends Schema> {
 
 		for (let i = (amount - 1); i >= 0; i--) {
 			const current =
-				span === 'hour' ? subtractTime(dateUTC([y, m, d, h]), i, 'hour') :
-				span === 'day' ? subtractTime(dateUTC([y, m, d]), i, 'day') :
+				span === 'hour' ? subtractTime(new Date(Date.UTC(y, m, d, h)), i, 'hour') :
+				span === 'day' ? subtractTime(new Date(Date.UTC(y, m, d)), i, 'day') :
 				new Error('not happen') as never;
 
 			const log = logs.find(l => isTimeSame(new Date(l.date * 1000), current));

From 7bf4d4426a57831a613f5c255518388661957f72 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 2 Jan 2023 14:43:27 +0100
Subject: [PATCH 10/56] use count instead of find to check existence

---
 .../src/server/api/endpoints/channels/create.ts       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/channels/create.ts b/packages/backend/src/server/api/endpoints/channels/create.ts
index 4962bd3da..1a55cebe4 100644
--- a/packages/backend/src/server/api/endpoints/channels/create.ts
+++ b/packages/backend/src/server/api/endpoints/channels/create.ts
@@ -7,6 +7,8 @@ import { ApiError } from '../../error.js';
 export const meta = {
 	tags: ['channels'],
 
+	description: 'Creates a new channel with the current user as its administrator.',
+
 	requireCredential: true,
 
 	kind: 'write:channels',
@@ -32,14 +34,13 @@ export const paramDef = {
 
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
-	let banner = null;
 	if (ps.bannerId != null) {
-		banner = await DriveFiles.findOneBy({
+		const bannerExists = await DriveFiles.countBy({
 			id: ps.bannerId,
 			userId: user.id,
 		});
 
-		if (banner == null) throw new ApiError('NO_SUCH_FILE');
+		if (!bannerExists) throw new ApiError('NO_SUCH_FILE');
 	}
 
 	const channel = await Channels.insert({
@@ -47,8 +48,8 @@ export default define(meta, paramDef, async (ps, user) => {
 		createdAt: new Date(),
 		userId: user.id,
 		name: ps.name,
-		description: ps.description || null,
-		bannerId: banner ? banner.id : null,
+		description: ps.description,
+		bannerId: ps.bannerId,
 	} as Channel).then(x => Channels.findOneByOrFail(x.identifiers[0]));
 
 	return await Channels.pack(channel, user);

From 29714d1ae0c63e4e213304d951efb86c9e898199 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 2 Jan 2023 20:58:33 +0100
Subject: [PATCH 11/56] add custom eslint rule to prefer countBy over findBy

---
 packages/backend/.eslintrc.cjs                |   4 +
 packages/backend/package.json                 |   3 +-
 packages/shared/custom-rules/index.js         |  12 ++
 .../custom-rules/typeorm-prefer-count.js      | 120 ++++++++++++++++++
 4 files changed, 138 insertions(+), 1 deletion(-)
 create mode 100644 packages/shared/custom-rules/index.js
 create mode 100644 packages/shared/custom-rules/typeorm-prefer-count.js

diff --git a/packages/backend/.eslintrc.cjs b/packages/backend/.eslintrc.cjs
index 5a06889dc..4dad2ea08 100644
--- a/packages/backend/.eslintrc.cjs
+++ b/packages/backend/.eslintrc.cjs
@@ -6,7 +6,11 @@ module.exports = {
 	extends: [
 		'../shared/.eslintrc.js',
 	],
+	plugins: [
+		'foundkey-custom-rules',
+	]
 	rules: {
+		'foundkey-custom-rules/typeorm-prefer-count': 'error',
 		'import/order': ['warn', {
 			'groups': ['builtin', 'external', 'internal', 'parent', 'sibling', 'index', 'object', 'type'],
 			'pathGroups': [
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 261207528..7b710333c 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -174,6 +174,7 @@
 		"execa": "6.1.0",
 		"form-data": "^4.0.0",
 		"sinon": "^14.0.2",
-		"typescript": "^4.9.4"
+		"typescript": "^4.9.4",
+		"eslint-plugin-foundkey-custom-rules": "file:../shared/custom-rules"
 	}
 }
diff --git a/packages/shared/custom-rules/index.js b/packages/shared/custom-rules/index.js
new file mode 100644
index 000000000..25330a2e8
--- /dev/null
+++ b/packages/shared/custom-rules/index.js
@@ -0,0 +1,12 @@
+const fs = require("fs");
+const path = require("path");
+
+const ruleFiles = fs
+  .readdirSync(__dirname)
+  .filter((file) => file !== "index.js" && !file.endsWith("test.js"));
+
+const rules = Object.fromEntries(
+  ruleFiles.map((file) => [path.basename(file, ".js"), require("./" + file)])
+);
+
+module.exports = { rules };
diff --git a/packages/shared/custom-rules/typeorm-prefer-count.js b/packages/shared/custom-rules/typeorm-prefer-count.js
new file mode 100644
index 000000000..fd6357e51
--- /dev/null
+++ b/packages/shared/custom-rules/typeorm-prefer-count.js
@@ -0,0 +1,120 @@
+const dbFunctions = ["find", "findBy", "findOne", "findOneBy", "findOneOrFail", "findOneByOrFail"];
+
+module.exports = {
+	meta: {
+		type: "suggestion",
+	},
+	create(context) {
+		return {
+			"Program:exit"(programNode) {
+				const isNull = (node) => node.type === "Literal" && node.value === null;
+
+				const scopes = [context.getScope()];
+				while (scopes.length > 0) {
+					const s = scopes.pop();
+					s.childScopes.forEach(x => scopes.push(x));
+
+					const variables = s.variables
+						.filter(x =>
+							x.references
+								.filter((ref) => ref.isRead())
+								.length > 0
+							&& x.defs.length > 0
+						);
+
+					for (const v of variables) {
+						let findValueAssign = null;
+						// if the find value was not read, there will already be an unused variable lint
+						// or maybe this was inside an if/else so we dont want to cause a false positive
+						let read = false;
+						for (const ref of v.references) {
+							if (
+								ref.isWrite()
+							) {
+								if (!ref.writeExpr) continue;
+								let writeExpr = ref.writeExpr;
+								// unwrap write expression, order matters to correctly unwrap
+								// something like "await Promise.all([a, b])".
+								// Basically a poor mans data flow analysis.
+								if (writeExpr.type === "AwaitExpression")
+									writeExpr = writeExpr.argument;
+								if (
+									writeExpr.type === "CallExpression"
+									&& writeExpr.callee.type === "MemberExpression"
+									&& writeExpr.callee.object.type === "Identifier"
+									&& writeExpr.callee.object.name === "Promise"
+									&& writeExpr.callee.property.type === "Identifier"
+									&& writeExpr.callee.property.name === "all"
+								)
+									writeExpr = writeExpr.arguments[0];
+								if (
+									writeExpr.type === "ArrayExpression"
+									&& ref.identifier.parent.type === "ArrayPattern"
+								) {
+									// use same index as the index of the identifier in the array pattern
+									const index = ref.identifier.parent.elements.indexOf(ref.identifier);
+									if (index > -1)
+										writeExpr = writeExpr.elements[index];
+								}
+								// check if this is a DB find thingy
+								if (
+									writeExpr.type === "CallExpression"
+									&& writeExpr.callee.type === "MemberExpression"
+									&& writeExpr.callee.property.type === "Identifier"
+									&& dbFunctions.includes(writeExpr.callee.property.name)
+								) {
+									if (findValueAssign && read) {
+										context.report({
+											node: findValueAssign,
+											message: "The returned object(s) are not read from, use `count` or `countBy` instead."
+										});
+									}
+									findValueAssign = writeExpr;
+									read = false;
+								}
+							}
+							// must be a read
+							else if (findValueAssign) {
+								const node = ref.identifier;
+								if(!(
+									(
+										// explicit null check
+										node.parent.type === "BinaryExpression" &&
+										["==", "==="].includes(node.parent.operator) &&
+										(
+											(isNull(node.parent.left) && node.parent.right === node)
+											||
+											(isNull(node.parent.right) && node.parent.left === node)
+										)
+									) || (
+										// implicit null check
+										["IfStatement", "ConditionalExpression"].includes(node.parent.type)
+									) || (
+										// different implicit null check
+										node.parent.type === "UnaryExpression" &&
+										node.parent.operator === "!"
+									) || (
+										// length check
+										node.parent.type === "MemberExpression" &&
+										node.parent.object === node &&
+										node.parent.property.type === "Identifier" &&
+										node.parent.property.name === "length"
+									)
+								)) {
+									// other use, dont report
+									findValueAssign = null;
+								}
+							}
+						}
+						if (findValueAssign) {
+							context.report({
+								node: findValueAssign,
+								message: "The returned object(s) are not read from, use `count` or `countBy` instead."
+							});
+						}
+					}
+				}
+			}
+		};
+	}
+};

From b423d23cf69601a1e873d4a4f4e0905c86037e54 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 2 Jan 2023 21:07:02 +0100
Subject: [PATCH 12/56] server: fix custom lint typeorm-prefer-count

---
 packages/backend/src/misc/reaction-lib.ts           |  2 +-
 .../src/remote/activitypub/kernel/undo/accept.ts    |  2 +-
 .../src/remote/activitypub/kernel/undo/follow.ts    |  8 ++++----
 .../backend/src/remote/activitypub/models/note.ts   |  2 +-
 packages/backend/src/server/api/common/signup.ts    |  2 +-
 .../endpoints/admin/federation/update-instance.ts   |  4 ++--
 .../src/server/api/endpoints/blocking/delete.ts     |  4 ++--
 .../src/server/api/endpoints/following/delete.ts    |  4 ++--
 .../server/api/endpoints/following/invalidate.ts    |  4 ++--
 .../src/server/api/endpoints/i/read-announcement.ts |  4 ++--
 .../src/server/api/endpoints/i/revoke-token.ts      |  4 ++--
 .../src/server/api/endpoints/messaging/messages.ts  |  4 ++--
 .../api/endpoints/messaging/messages/create.ts      |  6 +++---
 .../src/server/api/endpoints/notes/create.ts        |  8 ++++----
 .../src/server/api/endpoints/notes/polls/vote.ts    |  6 +++---
 .../src/server/api/endpoints/users/followers.ts     |  4 ++--
 .../src/server/api/endpoints/users/following.ts     |  4 ++--
 .../src/server/api/endpoints/users/groups/invite.ts |  6 +++---
 .../src/server/api/endpoints/users/groups/show.ts   |  4 ++--
 .../server/api/endpoints/users/groups/transfer.ts   |  4 ++--
 .../src/server/api/endpoints/users/lists/push.ts    |  6 +++---
 .../src/server/api/stream/channels/messaging.ts     |  4 ++--
 .../src/server/api/stream/channels/user-list.ts     |  4 ++--
 packages/backend/src/services/create-system-user.ts |  2 +-
 packages/backend/src/services/following/create.ts   |  8 ++++----
 .../src/services/following/requests/cancel.ts       |  6 +++---
 packages/backend/src/services/note/create.ts        |  8 ++++----
 packages/backend/src/services/note/polls/vote.ts    |  4 ++--
 .../backend/src/services/note/reaction/create.ts    |  4 ++--
 packages/backend/src/services/note/unread.ts        | 13 +++++++------
 30 files changed, 73 insertions(+), 72 deletions(-)

diff --git a/packages/backend/src/misc/reaction-lib.ts b/packages/backend/src/misc/reaction-lib.ts
index 949ca696a..51be49a67 100644
--- a/packages/backend/src/misc/reaction-lib.ts
+++ b/packages/backend/src/misc/reaction-lib.ts
@@ -75,7 +75,7 @@ export async function toDbReaction(reaction?: string | null, idnReacterHost?: st
 	const custom = reaction.match(/^:([\w+-]+)(?:@\.)?:$/);
 	if (custom) {
 		const name = custom[1];
-		const emoji = await Emojis.findOneBy({
+		const emoji = await Emojis.countBy({
 			host: reacterHost ?? IsNull(),
 			name,
 		});
diff --git a/packages/backend/src/remote/activitypub/kernel/undo/accept.ts b/packages/backend/src/remote/activitypub/kernel/undo/accept.ts
index b4664cb4a..9c5174ed6 100644
--- a/packages/backend/src/remote/activitypub/kernel/undo/accept.ts
+++ b/packages/backend/src/remote/activitypub/kernel/undo/accept.ts
@@ -12,7 +12,7 @@ export default async (actor: CacheableRemoteUser, activity: IAccept): Promise<st
 		return 'skip: follower not found';
 	}
 
-	const following = await Followings.findOneBy({
+	const following = await Followings.countBy({
 		followerId: follower.id,
 		followeeId: actor.id,
 	});
diff --git a/packages/backend/src/remote/activitypub/kernel/undo/follow.ts b/packages/backend/src/remote/activitypub/kernel/undo/follow.ts
index d6f334e52..c7f99bcf2 100644
--- a/packages/backend/src/remote/activitypub/kernel/undo/follow.ts
+++ b/packages/backend/src/remote/activitypub/kernel/undo/follow.ts
@@ -17,18 +17,18 @@ export default async (actor: CacheableRemoteUser, activity: IFollow): Promise<st
 		return 'skip: the unfollowed user is not local';
 	}
 
-	const [req, following] = await Promise.all([
-		FollowRequests.findOneBy({
+	const [requested, following] = await Promise.all([
+		FollowRequests.countBy({
 			followerId: actor.id,
 			followeeId: followee.id,
 		}),
-		Followings.findOneBy({
+		Followings.countBy({
 			followerId: actor.id,
 			followeeId: followee.id,
 		}),
 	]);
 
-	if (req) {
+	if (requested) {
 		await cancelFollowRequest(followee, actor);
 		return 'ok: follow request canceled';
 	} else if (following) {
diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index e52d86d79..20db3c8df 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -142,7 +142,7 @@ export async function createNote(value: string | IObject, resolver: Resolver, si
 			const uri = getApId(note.inReplyTo);
 			if (uri.startsWith(config.url + '/')) {
 				const id = uri.split('/').pop();
-				const talk = await MessagingMessages.findOneBy({ id });
+				const talk = await MessagingMessages.countBy({ id });
 				if (talk) {
 					isTalk = true;
 					return null;
diff --git a/packages/backend/src/server/api/common/signup.ts b/packages/backend/src/server/api/common/signup.ts
index 7ae1c09b0..59a1c9538 100644
--- a/packages/backend/src/server/api/common/signup.ts
+++ b/packages/backend/src/server/api/common/signup.ts
@@ -70,7 +70,7 @@ export async function signup(opts: {
 
 	// Start transaction
 	await db.transaction(async transactionalEntityManager => {
-		const exist = await transactionalEntityManager.findOneBy(User, {
+		const exist = await transactionalEntityManager.countBy(User, {
 			usernameLower: username.toLowerCase(),
 			host: IsNull(),
 		});
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
index a810300b5..93b311579 100644
--- a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
+++ b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
@@ -23,9 +23,9 @@ export const paramDef = {
 
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, me) => {
-	const instance = await Instances.findOneBy({ host: toPuny(ps.host) });
+	const instanceExists = await Instances.countBy({ host: toPuny(ps.host) });
 
-	if (instance == null) {
+	if (!instanceExists) {
 		throw new ApiError('NO_SUCH_OBJECT');
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/blocking/delete.ts b/packages/backend/src/server/api/endpoints/blocking/delete.ts
index 5e9ca9368..f2a206280 100644
--- a/packages/backend/src/server/api/endpoints/blocking/delete.ts
+++ b/packages/backend/src/server/api/endpoints/blocking/delete.ts
@@ -48,12 +48,12 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	// Check not blocking
-	const exist = await Blockings.findOneBy({
+	const exist = await Blockings.countBy({
 		blockerId: blocker.id,
 		blockeeId: blockee.id,
 	});
 
-	if (exist == null) throw new ApiError('NOT_BLOCKING');
+	if (!exist) throw new ApiError('NOT_BLOCKING');
 
 	// Delete blocking
 	await deleteBlocking(blocker, blockee);
diff --git a/packages/backend/src/server/api/endpoints/following/delete.ts b/packages/backend/src/server/api/endpoints/following/delete.ts
index 72c1ce6c6..40fe718cc 100644
--- a/packages/backend/src/server/api/endpoints/following/delete.ts
+++ b/packages/backend/src/server/api/endpoints/following/delete.ts
@@ -48,12 +48,12 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	// Check not following
-	const exist = await Followings.findOneBy({
+	const exist = await Followings.countBy({
 		followerId: follower.id,
 		followeeId: followee.id,
 	});
 
-	if (exist == null) throw new ApiError('NOT_FOLLOWING');
+	if (!exist) throw new ApiError('NOT_FOLLOWING');
 
 	await deleteFollowing(follower, followee);
 
diff --git a/packages/backend/src/server/api/endpoints/following/invalidate.ts b/packages/backend/src/server/api/endpoints/following/invalidate.ts
index 437d20ae7..7bb794caa 100644
--- a/packages/backend/src/server/api/endpoints/following/invalidate.ts
+++ b/packages/backend/src/server/api/endpoints/following/invalidate.ts
@@ -48,12 +48,12 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	// Check not following
-	const exist = await Followings.findOneBy({
+	const exist = await Followings.countBy({
 		followerId: follower.id,
 		followeeId: followee.id,
 	});
 
-	if (exist == null) throw new ApiError('NOT_FOLLOWING');
+	if (!exist) throw new ApiError('NOT_FOLLOWING');
 
 	await deleteFollowing(follower, followee);
 
diff --git a/packages/backend/src/server/api/endpoints/i/read-announcement.ts b/packages/backend/src/server/api/endpoints/i/read-announcement.ts
index 6d7e8954c..433cb79b5 100644
--- a/packages/backend/src/server/api/endpoints/i/read-announcement.ts
+++ b/packages/backend/src/server/api/endpoints/i/read-announcement.ts
@@ -25,9 +25,9 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	// Check if announcement exists
-	const announcement = await Announcements.findOneBy({ id: ps.announcementId });
+	const exists = await Announcements.countBy({ id: ps.announcementId });
 
-	if (announcement == null) throw new ApiError('NO_SUCH_ANNOUNCEMENT');
+	if (!exists) throw new ApiError('NO_SUCH_ANNOUNCEMENT');
 
 	// Check if already read
 	const read = await AnnouncementReads.findOneBy({
diff --git a/packages/backend/src/server/api/endpoints/i/revoke-token.ts b/packages/backend/src/server/api/endpoints/i/revoke-token.ts
index 26c20cba9..ef85051f8 100644
--- a/packages/backend/src/server/api/endpoints/i/revoke-token.ts
+++ b/packages/backend/src/server/api/endpoints/i/revoke-token.ts
@@ -18,9 +18,9 @@ export const paramDef = {
 
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
-	const token = await AccessTokens.findOneBy({ id: ps.tokenId });
+	const exists = await AccessTokens.countBy({ id: ps.tokenId });
 
-	if (token) {
+	if (exists) {
 		await AccessTokens.delete({
 			id: ps.tokenId,
 			userId: user.id,
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages.ts b/packages/backend/src/server/api/endpoints/messaging/messages.ts
index 88e17a054..b9fea1259 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages.ts
@@ -95,12 +95,12 @@ export default define(meta, paramDef, async (ps, user) => {
 		if (recipientGroup == null) throw new ApiError('NO_SUCH_GROUP');
 
 		// check joined
-		const joining = await UserGroupJoinings.findOneBy({
+		const joined = await UserGroupJoinings.countBy({
 			userId: user.id,
 			userGroupId: recipientGroup.id,
 		});
 
-		if (joining == null) throw new ApiError('ACCESS_DENIED', 'You have to join a group to read messages in it.');
+		if (!joined) throw new ApiError('ACCESS_DENIED', 'You have to join a group to read messages in it.');
 
 		const query = makePaginationQuery(MessagingMessages.createQueryBuilder('message'), ps.sinceId, ps.untilId)
 			.andWhere('message.groupId = :groupId', { groupId: recipientGroup.id });
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
index 020d596fc..cbca715c0 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
@@ -106,7 +106,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		});
 
 		// Check blocking
-		const block = await Blockings.findOneBy({
+		const block = await Blockings.countBy({
 			blockerId: recipientUser.id,
 			blockeeId: user.id,
 		});
@@ -118,12 +118,12 @@ export default define(meta, paramDef, async (ps, user) => {
 		if (recipientGroup == null) throw new ApiError('NO_SUCH_GROUP');
 
 		// check joined
-		const joining = await UserGroupJoinings.findOneBy({
+		const joined = await UserGroupJoinings.countBy({
 			userId: user.id,
 			userGroupId: recipientGroup.id,
 		});
 
-		if (joining == null) throw new ApiError('ACCESS_DENIED', 'You have to join a group to send a message in it.');
+		if (!joined) throw new ApiError('ACCESS_DENIED', 'You have to join a group to send a message in it.');
 	}
 
 	let file = null;
diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
index 18eec6b89..1b272e9dc 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -169,11 +169,11 @@ export default define(meta, paramDef, async (ps, user) => {
 
 		// Check blocking
 		if (renote.userId !== user.id) {
-			const block = await Blockings.findOneBy({
+			const blocked = await Blockings.countBy({
 				blockerId: renote.userId,
 				blockeeId: user.id,
 			});
-			if (block) throw new ApiError('BLOCKED', 'Blocked by author of note to be renoted.');
+			if (blocked) throw new ApiError('BLOCKED', 'Blocked by author of note to be renoted.');
 		}
 	}
 
@@ -194,11 +194,11 @@ export default define(meta, paramDef, async (ps, user) => {
 
 		// Check blocking
 		if (reply.userId !== user.id) {
-			const block = await Blockings.findOneBy({
+			const blocked = await Blockings.countBy({
 				blockerId: reply.userId,
 				blockeeId: user.id,
 			});
-			if (block) throw new ApiError('BLOCKED', 'Blocked by author of replied to note.');
+			if (blocked) throw new ApiError('BLOCKED', 'Blocked by author of replied to note.');
 		}
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts
index 6648e996b..4ffdcc4c4 100644
--- a/packages/backend/src/server/api/endpoints/notes/polls/vote.ts
+++ b/packages/backend/src/server/api/endpoints/notes/polls/vote.ts
@@ -47,11 +47,11 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	// Check blocking
 	if (note.userId !== user.id) {
-		const block = await Blockings.findOneBy({
+		const blocked = await Blockings.countBy({
 			blockerId: note.userId,
 			blockeeId: user.id,
 		});
-		if (block) throw new ApiError('BLOCKED');
+		if (blocked) throw new ApiError('BLOCKED');
 	}
 
 	const poll = await Polls.findOneByOrFail({ noteId: note.id });
@@ -99,7 +99,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	// check if this thread and notification type is muted
-	const threadMuted = await NoteThreadMutings.findOneBy({
+	const threadMuted = await NoteThreadMutings.countBy({
 		userId: note.userId,
 		threadId: note.threadId || note.id,
 		mutingNotificationTypes: ArrayOverlap(['pollVote']),
diff --git a/packages/backend/src/server/api/endpoints/users/followers.ts b/packages/backend/src/server/api/endpoints/users/followers.ts
index e395c3f79..15ecf42fe 100644
--- a/packages/backend/src/server/api/endpoints/users/followers.ts
+++ b/packages/backend/src/server/api/endpoints/users/followers.ts
@@ -71,11 +71,11 @@ export default define(meta, paramDef, async (ps, me) => {
 		if (me == null) {
 			throw new ApiError('ACCESS_DENIED');
 		} else if (me.id !== user.id) {
-			const following = await Followings.findOneBy({
+			const following = await Followings.countBy({
 				followeeId: user.id,
 				followerId: me.id,
 			});
-			if (following == null) {
+			if (!following) {
 				throw new ApiError('ACCESS_DENIED');
 			}
 		}
diff --git a/packages/backend/src/server/api/endpoints/users/following.ts b/packages/backend/src/server/api/endpoints/users/following.ts
index 51ad75a77..85dccccb7 100644
--- a/packages/backend/src/server/api/endpoints/users/following.ts
+++ b/packages/backend/src/server/api/endpoints/users/following.ts
@@ -71,11 +71,11 @@ export default define(meta, paramDef, async (ps, me) => {
 		if (me == null) {
 			throw new ApiError('ACCESS_DENIED');
 		} else if (me.id !== user.id) {
-			const following = await Followings.findOneBy({
+			const following = await Followings.countBy({
 				followeeId: user.id,
 				followerId: me.id,
 			});
-			if (following == null) {
+			if (!following) {
 				throw new ApiError('ACCESS_DENIED');
 			}
 		}
diff --git a/packages/backend/src/server/api/endpoints/users/groups/invite.ts b/packages/backend/src/server/api/endpoints/users/groups/invite.ts
index 7a792a49b..e8214e815 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/invite.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/invite.ts
@@ -43,14 +43,14 @@ export default define(meta, paramDef, async (ps, me) => {
 		throw e;
 	});
 
-	const joining = await UserGroupJoinings.findOneBy({
+	const joined = await UserGroupJoinings.countBy({
 		userGroupId: userGroup.id,
 		userId: user.id,
 	});
 
-	if (joining) throw new ApiError('ALREADY_ADDED');
+	if (joined) throw new ApiError('ALREADY_ADDED');
 
-	const existInvitation = await UserGroupInvitations.findOneBy({
+	const existInvitation = await UserGroupInvitations.countBy({
 		userGroupId: userGroup.id,
 		userId: user.id,
 	});
diff --git a/packages/backend/src/server/api/endpoints/users/groups/show.ts b/packages/backend/src/server/api/endpoints/users/groups/show.ts
index eddd933c2..2aa5abb5b 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/show.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/show.ts
@@ -37,12 +37,12 @@ export default define(meta, paramDef, async (ps, me) => {
 
 	if (userGroup == null) throw new ApiError('NO_SUCH_GROUP');
 
-	const joining = await UserGroupJoinings.findOneBy({
+	const joined = await UserGroupJoinings.countBy({
 		userId: me.id,
 		userGroupId: userGroup.id,
 	});
 
-	if (joining == null && userGroup.userId !== me.id) {
+	if (!joined && userGroup.userId !== me.id) {
 		throw new ApiError('NO_SUCH_GROUP');
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/users/groups/transfer.ts b/packages/backend/src/server/api/endpoints/users/groups/transfer.ts
index b6607e4f8..b9020fbcc 100644
--- a/packages/backend/src/server/api/endpoints/users/groups/transfer.ts
+++ b/packages/backend/src/server/api/endpoints/users/groups/transfer.ts
@@ -46,12 +46,12 @@ export default define(meta, paramDef, async (ps, me) => {
 		throw e;
 	});
 
-	const joining = await UserGroupJoinings.findOneBy({
+	const joined = await UserGroupJoinings.countBy({
 		userGroupId: userGroup.id,
 		userId: user.id,
 	});
 
-	if (joining == null) throw new ApiError('NO_SUCH_USER', 'The user exists but is not a member of the group.');
+	if (!joined) throw new ApiError('NO_SUCH_USER', 'The user exists but is not a member of the group.');
 
 	await UserGroups.update(userGroup.id, {
 		userId: ps.userId,
diff --git a/packages/backend/src/server/api/endpoints/users/lists/push.ts b/packages/backend/src/server/api/endpoints/users/lists/push.ts
index 7552f3331..86f7aee9a 100644
--- a/packages/backend/src/server/api/endpoints/users/lists/push.ts
+++ b/packages/backend/src/server/api/endpoints/users/lists/push.ts
@@ -43,14 +43,14 @@ export default define(meta, paramDef, async (ps, me) => {
 
 	// Check blocking
 	if (user.id !== me.id) {
-		const block = await Blockings.findOneBy({
+		const blocked = await Blockings.countBy({
 			blockerId: user.id,
 			blockeeId: me.id,
 		});
-		if (block) throw new ApiError('BLOCKED');
+		if (blocked) throw new ApiError('BLOCKED');
 	}
 
-	const exist = await UserListJoinings.findOneBy({
+	const exist = await UserListJoinings.countBy({
 		userListId: userList.id,
 		userId: user.id,
 	});
diff --git a/packages/backend/src/server/api/stream/channels/messaging.ts b/packages/backend/src/server/api/stream/channels/messaging.ts
index ef3ac2ab8..4f9f6a9c4 100644
--- a/packages/backend/src/server/api/stream/channels/messaging.ts
+++ b/packages/backend/src/server/api/stream/channels/messaging.ts
@@ -31,12 +31,12 @@ export default class extends Channel {
 
 		// Check joining
 		if (this.groupId) {
-			const joining = await UserGroupJoinings.findOneBy({
+			const joined = await UserGroupJoinings.countBy({
 				userId: this.user!.id,
 				userGroupId: this.groupId,
 			});
 
-			if (joining == null) {
+			if (!joined) {
 				return;
 			}
 		}
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 39ee53c2b..0c1a66a5b 100644
--- a/packages/backend/src/server/api/stream/channels/user-list.ts
+++ b/packages/backend/src/server/api/stream/channels/user-list.ts
@@ -24,11 +24,11 @@ export default class extends Channel {
 		this.listId = params.listId as string;
 
 		// Check existence and owner
-		const list = await UserLists.findOneBy({
+		const exists = await UserLists.countBy({
 			id: this.listId,
 			userId: this.user!.id,
 		});
-		if (!list) return;
+		if (!exists) return;
 
 		// Subscribe stream
 		this.subscriber.on(`userListStream:${this.listId}`, this.send);
diff --git a/packages/backend/src/services/create-system-user.ts b/packages/backend/src/services/create-system-user.ts
index f965e82d7..8e39b00fb 100644
--- a/packages/backend/src/services/create-system-user.ts
+++ b/packages/backend/src/services/create-system-user.ts
@@ -22,7 +22,7 @@ export async function createSystemUser(username: string): Promise<User> {
 
 	// Start transaction
 	await db.transaction(async transactionalEntityManager => {
-		const exist = await transactionalEntityManager.findOneBy(User, {
+		const exist = await transactionalEntityManager.countBy(User, {
 			usernameLower: username.toLowerCase(),
 			host: IsNull(),
 		});
diff --git a/packages/backend/src/services/following/create.ts b/packages/backend/src/services/following/create.ts
index a4f546266..f588379f8 100644
--- a/packages/backend/src/services/following/create.ts
+++ b/packages/backend/src/services/following/create.ts
@@ -46,12 +46,12 @@ export async function insertFollowingDoc(followee: { id: User['id']; host: User[
 		}
 	});
 
-	const req = await FollowRequests.findOneBy({
+	const requested = await FollowRequests.countBy({
 		followeeId: followee.id,
 		followerId: follower.id,
 	});
 
-	if (req) {
+	if (requested) {
 		await FollowRequests.delete({
 			followeeId: followee.id,
 			followerId: follower.id,
@@ -167,7 +167,7 @@ export default async function(_follower: { id: User['id'] }, _followee: { id: Us
 		let autoAccept = false;
 
 		// 鍵アカウントであっても、既にフォローされていた場合はスルー
-		const following = await Followings.findOneBy({
+		const following = await Followings.countBy({
 			followerId: follower.id,
 			followeeId: followee.id,
 		});
@@ -177,7 +177,7 @@ export default async function(_follower: { id: User['id'] }, _followee: { id: Us
 
 		// フォローしているユーザーは自動承認オプション
 		if (!autoAccept && (Users.isLocalUser(followee) && followeeProfile.autoAcceptFollowed)) {
-			const followed = await Followings.findOneBy({
+			const followed = await Followings.countBy({
 				followerId: followee.id,
 				followeeId: follower.id,
 			});
diff --git a/packages/backend/src/services/following/requests/cancel.ts b/packages/backend/src/services/following/requests/cancel.ts
index 999ebc64e..4ceac19cb 100644
--- a/packages/backend/src/services/following/requests/cancel.ts
+++ b/packages/backend/src/services/following/requests/cancel.ts
@@ -16,17 +16,17 @@ export async function cancelFollowRequest(followee: User, follower: User): Promi
 	if (Users.isRemoteUser(followee)) {
 		const content = renderActivity(renderUndo(renderFollow(follower, followee), follower));
 
-		if (Users.isLocalUser(follower)) { // 本来このチェックは不要だけどTSに怒られるので
+		if (Users.isLocalUser(follower)) {
 			deliver(follower, content, followee.inbox);
 		}
 	}
 
-	const request = await FollowRequests.findOneBy({
+	const requested = await FollowRequests.countBy({
 		followeeId: followee.id,
 		followerId: follower.id,
 	});
 
-	if (request == null) {
+	if (!requested) {
 		throw new IdentifiableError('17447091-ce07-46dd-b331-c1fd4f15b1e7', 'request not found');
 	}
 
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 7ef25a620..aceb142b0 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -91,12 +91,12 @@ class NotificationManager {
 	public async deliver(): Promise<void> {
 		for (const x of this.queue) {
 			// check if the sender or thread are muted
-			const userMuted = await Mutings.findOneBy({
+			const userMuted = await Mutings.countBy({
 				muterId: x.target,
 				muteeId: this.notifier.id,
 			});
 
-			const threadMuted = await NoteThreadMutings.findOneBy({
+			const threadMuted = await NoteThreadMutings.countBy({
 				userId: x.target,
 				threadId: In([
 					// replies
@@ -376,7 +376,7 @@ export default async (user: { id: User['id']; username: User['username']; host:
 
 			// 通知
 			if (data.reply.userHost === null) {
-				const threadMuted = await NoteThreadMutings.findOneBy({
+				const threadMuted = await NoteThreadMutings.countBy({
 					userId: data.reply.userId,
 					threadId: data.reply.threadId || data.reply.id,
 				});
@@ -623,7 +623,7 @@ async function notifyToWatchersOfReplyee(reply: Note, user: { id: User['id']; },
 
 async function createMentionedEvents(mentionedUsers: MinimumUser[], note: Note, nm: NotificationManager): Promise<void> {
 	for (const u of mentionedUsers.filter(u => Users.isLocalUser(u))) {
-		const threadMuted = await NoteThreadMutings.findOneBy({
+		const threadMuted = await NoteThreadMutings.countBy({
 			userId: u.id,
 			threadId: note.threadId || note.id,
 		});
diff --git a/packages/backend/src/services/note/polls/vote.ts b/packages/backend/src/services/note/polls/vote.ts
index 6e22af41f..b86e7107d 100644
--- a/packages/backend/src/services/note/polls/vote.ts
+++ b/packages/backend/src/services/note/polls/vote.ts
@@ -16,7 +16,7 @@ export async function vote(user: CacheableUser, note: Note, choice: number): Pro
 
 	// Check blocking
 	if (note.userId !== user.id) {
-		const block = await Blockings.findOneBy({
+		const block = await Blockings.countBy({
 			blockerId: note.userId,
 			blockeeId: user.id,
 		});
@@ -58,7 +58,7 @@ export async function vote(user: CacheableUser, note: Note, choice: number): Pro
 	});
 
 	// check if this thread and notification type is muted
-	const muted = await NoteThreadMutings.findOneBy({
+	const muted = await NoteThreadMutings.countBy({
 		userId: note.userId,
 		threadId: note.threadId || note.id,
 		mutingNotificationTypes: ArrayOverlap(['pollVote']),
diff --git a/packages/backend/src/services/note/reaction/create.ts b/packages/backend/src/services/note/reaction/create.ts
index d6e128137..d50761a29 100644
--- a/packages/backend/src/services/note/reaction/create.ts
+++ b/packages/backend/src/services/note/reaction/create.ts
@@ -18,7 +18,7 @@ import { deleteReaction } from './delete.js';
 export async function createReaction(user: { id: User['id']; host: User['host']; }, note: Note, reaction?: string): Promise<void> {
 	// Check blocking
 	if (note.userId !== user.id) {
-		const block = await Blockings.findOneBy({
+		const block = await Blockings.countBy({
 			blockerId: note.userId,
 			blockeeId: user.id,
 		});
@@ -99,7 +99,7 @@ export async function createReaction(user: { id: User['id']; host: User['host'];
 	});
 
 	// check if this thread is muted
-	const threadMuted = await NoteThreadMutings.findOneBy({
+	const threadMuted = await NoteThreadMutings.countBy({
 		userId: note.userId,
 		threadId: note.threadId || note.id,
 		mutingNotificationTypes: ArrayOverlap(['reaction']),
diff --git a/packages/backend/src/services/note/unread.ts b/packages/backend/src/services/note/unread.ts
index 829a024ee..dcd1056e3 100644
--- a/packages/backend/src/services/note/unread.ts
+++ b/packages/backend/src/services/note/unread.ts
@@ -11,18 +11,19 @@ export async function insertNoteUnread(userId: User['id'], note: Note, params: {
 }): Promise<void> {
 	//#region ミュートしているなら無視
 	// TODO: 現在の仕様ではChannelにミュートは適用されないのでよしなにケアする
-	const mute = await Mutings.findBy({
+	const muted = await Mutings.countBy({
 		muterId: userId,
+		muteeId: note.userId,
 	});
-	if (mute.map(m => m.muteeId).includes(note.userId)) return;
+	if (muted) return;
 	//#endregion
 
+	const threadMuted = await NoteThreadMutings.countBy({
 	// スレッドミュート
-	const threadMute = await NoteThreadMutings.findOneBy({
 		userId,
 		threadId: note.threadId || note.id,
 	});
-	if (threadMute) return;
+	if (threadMuted) return;
 
 	const unread = {
 		id: genId(),
@@ -38,9 +39,9 @@ export async function insertNoteUnread(userId: User['id'], note: Note, params: {
 
 	// 2秒経っても既読にならなかったら「未読の投稿がありますよ」イベントを発行する
 	setTimeout(async () => {
-		const exist = await NoteUnreads.findOneBy({ id: unread.id });
+		const exist = await NoteUnreads.countBy({ id: unread.id });
 
-		if (exist == null) return;
+		if (!exist) return;
 
 		if (params.isMentioned) {
 			publishMainStream(userId, 'unreadMention', note.id);

From 6010884e623de91c03fffd780d89edfe8aa3c126 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 2 Jan 2023 21:07:56 +0100
Subject: [PATCH 13/56] cleanup: translate japanese, use SECOND constant

---
 .../src/remote/activitypub/kernel/undo/accept.ts   |  2 +-
 .../endpoints/admin/federation/update-instance.ts  |  2 +-
 .../backend/src/services/add-note-to-antenna.ts    |  3 ++-
 packages/backend/src/services/following/create.ts  |  4 ++--
 packages/backend/src/services/note/unread.ts       | 14 +++++++-------
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/packages/backend/src/remote/activitypub/kernel/undo/accept.ts b/packages/backend/src/remote/activitypub/kernel/undo/accept.ts
index 9c5174ed6..fa4eea44c 100644
--- a/packages/backend/src/remote/activitypub/kernel/undo/accept.ts
+++ b/packages/backend/src/remote/activitypub/kernel/undo/accept.ts
@@ -22,5 +22,5 @@ export default async (actor: CacheableRemoteUser, activity: IAccept): Promise<st
 		return 'ok: unfollowed';
 	}
 
-	return 'skip: フォローされていない';
+	return 'skip: not followed';
 };
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
index 93b311579..9b2e86511 100644
--- a/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
+++ b/packages/backend/src/server/api/endpoints/admin/federation/update-instance.ts
@@ -22,7 +22,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async (ps) => {
 	const instanceExists = await Instances.countBy({ host: toPuny(ps.host) });
 
 	if (!instanceExists) {
diff --git a/packages/backend/src/services/add-note-to-antenna.ts b/packages/backend/src/services/add-note-to-antenna.ts
index d502be254..ecb57376c 100644
--- a/packages/backend/src/services/add-note-to-antenna.ts
+++ b/packages/backend/src/services/add-note-to-antenna.ts
@@ -5,6 +5,7 @@ import { genId } from '@/misc/gen-id.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
 import { publishAntennaStream, publishMainStream } from '@/services/stream.js';
 import { User } from '@/models/entities/user.js';
+import { SECOND } from '@/const.js';
 
 export async function addNoteToAntenna(antenna: Antenna, note: Note, noteUser: { id: User['id']; }): Promise<void> {
 	// If it's set to not notify the user, or if it's the user's own post, read it.
@@ -49,6 +50,6 @@ export async function addNoteToAntenna(antenna: Antenna, note: Note, noteUser: {
 			if (unread) {
 				publishMainStream(antenna.userId, 'unreadAntenna', antenna);
 			}
-		}, 2000);
+		}, 2 * SECOND);
 	}
 }
diff --git a/packages/backend/src/services/following/create.ts b/packages/backend/src/services/following/create.ts
index f588379f8..7ad85dd99 100644
--- a/packages/backend/src/services/following/create.ts
+++ b/packages/backend/src/services/following/create.ts
@@ -166,7 +166,7 @@ export default async function(_follower: { id: User['id'] }, _followee: { id: Us
 	if (followee.isLocked || (followeeProfile.carefulBot && follower.isBot) || (Users.isLocalUser(follower) && Users.isRemoteUser(followee))) {
 		let autoAccept = false;
 
-		// 鍵アカウントであっても、既にフォローされていた場合はスルー
+		// Even for locked accounts, if they are already following, go through immediately.
 		const following = await Followings.countBy({
 			followerId: follower.id,
 			followeeId: followee.id,
@@ -175,7 +175,7 @@ export default async function(_follower: { id: User['id'] }, _followee: { id: Us
 			autoAccept = true;
 		}
 
-		// フォローしているユーザーは自動承認オプション
+		// handle automatic approval for users that follow you, if enabled
 		if (!autoAccept && (Users.isLocalUser(followee) && followeeProfile.autoAcceptFollowed)) {
 			const followed = await Followings.countBy({
 				followerId: followee.id,
diff --git a/packages/backend/src/services/note/unread.ts b/packages/backend/src/services/note/unread.ts
index dcd1056e3..4ef257c21 100644
--- a/packages/backend/src/services/note/unread.ts
+++ b/packages/backend/src/services/note/unread.ts
@@ -3,27 +3,27 @@ import { publishMainStream } from '@/services/stream.js';
 import { User } from '@/models/entities/user.js';
 import { Mutings, NoteThreadMutings, NoteUnreads } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
+import { SECOND } from '@/const.js';
 
 export async function insertNoteUnread(userId: User['id'], note: Note, params: {
-	// NOTE: isSpecifiedがtrueならisMentionedは必ずfalse
+	// NOTE: if isSpecified is true, isMentioned is always false
 	isSpecified: boolean;
 	isMentioned: boolean;
 }): Promise<void> {
-	//#region ミュートしているなら無視
-	// TODO: 現在の仕様ではChannelにミュートは適用されないのでよしなにケアする
+	//#region ignore if muted
+	// TODO: The current design does not apply mutes to channels.
 	const muted = await Mutings.countBy({
 		muterId: userId,
 		muteeId: note.userId,
 	});
 	if (muted) return;
-	//#endregion
 
 	const threadMuted = await NoteThreadMutings.countBy({
-	// スレッドミュート
 		userId,
 		threadId: note.threadId || note.id,
 	});
 	if (threadMuted) return;
+	//#endregion
 
 	const unread = {
 		id: genId(),
@@ -37,7 +37,7 @@ export async function insertNoteUnread(userId: User['id'], note: Note, params: {
 
 	await NoteUnreads.insert(unread);
 
-	// 2秒経っても既読にならなかったら「未読の投稿がありますよ」イベントを発行する
+	// Issue the events for unread messages if it hasn't been read after 2 seconds.
 	setTimeout(async () => {
 		const exist = await NoteUnreads.countBy({ id: unread.id });
 
@@ -52,5 +52,5 @@ export async function insertNoteUnread(userId: User['id'], note: Note, params: {
 		if (note.channelId) {
 			publishMainStream(userId, 'unreadChannel', note.id);
 		}
-	}, 2000);
+	}, 2 * SECOND);
 }

From 5b898c6c82d3d104be8df359852c368972bf7e51 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 2 Jan 2023 21:39:49 +0100
Subject: [PATCH 14/56] chore: update yarn files

---
 packages/backend/package.json             | 4 ++--
 packages/shared/custom-rules/package.json | 4 ++++
 yarn.lock                                 | 8 ++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 packages/shared/custom-rules/package.json

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 7b710333c..456e46810 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -170,11 +170,11 @@
 		"@typescript-eslint/parser": "^5.46.1",
 		"cross-env": "7.0.3",
 		"eslint": "^8.29.0",
+		"eslint-plugin-foundkey-custom-rules": "file:../shared/custom-rules",
 		"eslint-plugin-import": "^2.26.0",
 		"execa": "6.1.0",
 		"form-data": "^4.0.0",
 		"sinon": "^14.0.2",
-		"typescript": "^4.9.4",
-		"eslint-plugin-foundkey-custom-rules": "file:../shared/custom-rules"
+		"typescript": "^4.9.4"
 	}
 }
diff --git a/packages/shared/custom-rules/package.json b/packages/shared/custom-rules/package.json
new file mode 100644
index 000000000..090560801
--- /dev/null
+++ b/packages/shared/custom-rules/package.json
@@ -0,0 +1,4 @@
+{
+  "name": "custom-rules",
+  "packageManager": "yarn@3.3.0"
+}
diff --git a/yarn.lock b/yarn.lock
index e68e7dae9..f60f0a9b7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3764,6 +3764,7 @@ __metadata:
     deep-email-validator: 0.1.21
     escape-regexp: 0.0.1
     eslint: ^8.29.0
+    eslint-plugin-foundkey-custom-rules: "file:../shared/custom-rules"
     eslint-plugin-import: ^2.26.0
     execa: 6.1.0
     feed: 4.2.2
@@ -7005,6 +7006,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-plugin-foundkey-custom-rules@file:../shared/custom-rules::locator=backend%40workspace%3Apackages%2Fbackend":
+  version: 0.0.0
+  resolution: "eslint-plugin-foundkey-custom-rules@file:../shared/custom-rules#../shared/custom-rules::hash=81166b&locator=backend%40workspace%3Apackages%2Fbackend"
+  checksum: ac30bdbd2f8f135362128b93fe202e3eeabe785225439056ac1de78be10d919ee2f371b801e31a6de05e169d9002b29269726c2b26ca07f8003e98bbbb8600a7
+  languageName: node
+  linkType: hard
+
 "eslint-plugin-import@npm:^2.26.0":
   version: 2.26.0
   resolution: "eslint-plugin-import@npm:2.26.0"

From e0560dbe9ef5d60d11fa29185a0413dfe35e89ae Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 2 Jan 2023 21:51:13 +0100
Subject: [PATCH 15/56] client: dont display tooltip if software name unknown

Changelog: Fixed
---
 packages/client/src/components/instance-ticker.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/instance-ticker.vue b/packages/client/src/components/instance-ticker.vue
index 7704b7d7f..d4dfeb26d 100644
--- a/packages/client/src/components/instance-ticker.vue
+++ b/packages/client/src/components/instance-ticker.vue
@@ -1,5 +1,5 @@
 <template>
-<div v-tooltip="instance.softwareName + ' ' + instance.softwareVersion" class="hpaizdrt" :style="bg">
+<div v-tooltip="tooltip" class="hpaizdrt" :style="bg">
 	<img v-if="instance.faviconUrl" class="icon" :src="instance.faviconUrl"/>
 	<span class="name">{{ instance.name ?? host }}</span>
 	<span v-if="instance.softwareName" class="software">{{ instance.softwareName }}</span>
@@ -35,6 +35,10 @@ const themeColor = instance.themeColor ?? '#777777';
 const bg = {
 	background: `linear-gradient(90deg, ${themeColor}, ${themeColor}00)`,
 };
+
+const tooltip = instance.softwareName == null || instance.softwareVersion == null
+	? null
+	: instance.softwareName + ' ' + instance.softwareVersion;
 </script>
 
 <style lang="scss" scoped>

From b54e07caec3d2960918921880afb1561599bcff2 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 3 Jan 2023 02:41:53 +0100
Subject: [PATCH 16/56] enhance typeorm-prefer-count lint rule

---
 packages/backend/.eslintrc.cjs                       | 2 +-
 packages/shared/custom-rules/typeorm-prefer-count.js | 4 ++--
 yarn.lock                                            | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/backend/.eslintrc.cjs b/packages/backend/.eslintrc.cjs
index 4dad2ea08..c3b829966 100644
--- a/packages/backend/.eslintrc.cjs
+++ b/packages/backend/.eslintrc.cjs
@@ -8,7 +8,7 @@ module.exports = {
 	],
 	plugins: [
 		'foundkey-custom-rules',
-	]
+	],
 	rules: {
 		'foundkey-custom-rules/typeorm-prefer-count': 'error',
 		'import/order': ['warn', {
diff --git a/packages/shared/custom-rules/typeorm-prefer-count.js b/packages/shared/custom-rules/typeorm-prefer-count.js
index fd6357e51..a1a040552 100644
--- a/packages/shared/custom-rules/typeorm-prefer-count.js
+++ b/packages/shared/custom-rules/typeorm-prefer-count.js
@@ -1,4 +1,4 @@
-const dbFunctions = ["find", "findBy", "findOne", "findOneBy", "findOneOrFail", "findOneByOrFail"];
+const dbFunctions = ["find", "findBy", "findOne", "findOneBy", "findOneOrFail", "findOneByOrFail", "getOne", "getMany", "getRawOne", "getRawMany"];
 
 module.exports = {
 	meta: {
@@ -80,7 +80,7 @@ module.exports = {
 									(
 										// explicit null check
 										node.parent.type === "BinaryExpression" &&
-										["==", "==="].includes(node.parent.operator) &&
+										["==", "===", "!=", "!=="].includes(node.parent.operator) &&
 										(
 											(isNull(node.parent.left) && node.parent.right === node)
 											||
diff --git a/yarn.lock b/yarn.lock
index f60f0a9b7..59db1a65d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7008,8 +7008,8 @@ __metadata:
 
 "eslint-plugin-foundkey-custom-rules@file:../shared/custom-rules::locator=backend%40workspace%3Apackages%2Fbackend":
   version: 0.0.0
-  resolution: "eslint-plugin-foundkey-custom-rules@file:../shared/custom-rules#../shared/custom-rules::hash=81166b&locator=backend%40workspace%3Apackages%2Fbackend"
-  checksum: ac30bdbd2f8f135362128b93fe202e3eeabe785225439056ac1de78be10d919ee2f371b801e31a6de05e169d9002b29269726c2b26ca07f8003e98bbbb8600a7
+  resolution: "eslint-plugin-foundkey-custom-rules@file:../shared/custom-rules#../shared/custom-rules::hash=45c4fe&locator=backend%40workspace%3Apackages%2Fbackend"
+  checksum: 420d8341c1208ab068d9c8dd875241d452b199e46ebe9b75c07449051475e7814eed1c812d9552bdc0fbe2054d4dfd467577f7890ad050ab812347ccf04ae063
   languageName: node
   linkType: hard
 

From 417d252e9d701f95e809ebd21a33b701bc239c0b Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 3 Jan 2023 02:42:42 +0100
Subject: [PATCH 17/56] server: fix custom lint typeorm-prefer-count

---
 packages/backend/src/remote/activitypub/renderer/note.ts  | 4 ++--
 .../backend/src/server/api/endpoints/blocking/create.ts   | 4 ++--
 .../backend/src/server/api/endpoints/clips/add-note.ts    | 4 ++--
 .../server/api/endpoints/drive/files/check-existence.ts   | 4 +---
 .../backend/src/server/api/endpoints/following/create.ts  | 4 ++--
 .../src/server/api/endpoints/gallery/posts/like.ts        | 4 ++--
 .../src/server/api/endpoints/i/read-announcement.ts       | 4 ++--
 packages/backend/src/server/api/endpoints/mute/create.ts  | 4 ++--
 .../src/server/api/endpoints/notes/favorites/create.ts    | 4 ++--
 packages/backend/src/server/api/endpoints/pages/like.ts   | 4 ++--
 .../src/server/api/endpoints/renote-mute/create.ts        | 4 ++--
 packages/backend/src/server/api/endpoints/sw/register.ts  | 4 ++--
 packages/backend/src/services/add-note-to-antenna.ts      | 2 +-
 .../backend/src/services/following/requests/create.ts     | 8 ++++----
 14 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/packages/backend/src/remote/activitypub/renderer/note.ts b/packages/backend/src/remote/activitypub/renderer/note.ts
index 1bcb5eae2..c097d2640 100644
--- a/packages/backend/src/remote/activitypub/renderer/note.ts
+++ b/packages/backend/src/remote/activitypub/renderer/note.ts
@@ -25,9 +25,9 @@ export default async function renderNote(note: Note, dive = true, isTalk = false
 		inReplyToNote = await Notes.findOneBy({ id: note.replyId });
 
 		if (inReplyToNote != null) {
-			const inReplyToUser = await Users.findOneBy({ id: inReplyToNote.userId });
+			const inReplyToUserExists = await Users.countBy({ id: inReplyToNote.userId });
 
-			if (inReplyToUser != null) {
+			if (!inReplyToUserExists) {
 				if (inReplyToNote.uri) {
 					inReplyTo = inReplyToNote.uri;
 				} else {
diff --git a/packages/backend/src/server/api/endpoints/blocking/create.ts b/packages/backend/src/server/api/endpoints/blocking/create.ts
index 7f45ad522..4a9a2db4a 100644
--- a/packages/backend/src/server/api/endpoints/blocking/create.ts
+++ b/packages/backend/src/server/api/endpoints/blocking/create.ts
@@ -48,12 +48,12 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	// Check if already blocking
-	const exist = await Blockings.findOneBy({
+	const blocked = await Blockings.countBy({
 		blockerId: blocker.id,
 		blockeeId: blockee.id,
 	});
 
-	if (exist != null) throw new ApiError('ALREADY_BLOCKING');
+	if (blocked) throw new ApiError('ALREADY_BLOCKING');
 
 	await create(blocker, blockee);
 
diff --git a/packages/backend/src/server/api/endpoints/clips/add-note.ts b/packages/backend/src/server/api/endpoints/clips/add-note.ts
index 13b432d13..6317db0f3 100644
--- a/packages/backend/src/server/api/endpoints/clips/add-note.ts
+++ b/packages/backend/src/server/api/endpoints/clips/add-note.ts
@@ -37,12 +37,12 @@ export default define(meta, paramDef, async (ps, user) => {
 		throw err;
 	});
 
-	const exist = await ClipNotes.findOneBy({
+	const exist = await ClipNotes.countBy({
 		noteId: note.id,
 		clipId: clip.id,
 	});
 
-	if (exist != null) throw new ApiError('ALREADY_CLIPPED');
+	if (exist) throw new ApiError('ALREADY_CLIPPED');
 
 	await ClipNotes.insert({
 		id: genId(),
diff --git a/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts b/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts
index ef12d1837..73d20450d 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/check-existence.ts
@@ -26,10 +26,8 @@ export const paramDef = {
 
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
-	const file = await DriveFiles.findOneBy({
+	return 0 < await DriveFiles.countBy({
 		md5: ps.md5,
 		userId: user.id,
 	});
-
-	return file != null;
 });
diff --git a/packages/backend/src/server/api/endpoints/following/create.ts b/packages/backend/src/server/api/endpoints/following/create.ts
index 90ec95172..9341024c0 100644
--- a/packages/backend/src/server/api/endpoints/following/create.ts
+++ b/packages/backend/src/server/api/endpoints/following/create.ts
@@ -49,12 +49,12 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	// Check if already following
-	const exist = await Followings.findOneBy({
+	const exist = await Followings.countBy({
 		followerId: follower.id,
 		followeeId: followee.id,
 	});
 
-	if (exist != null) throw new ApiError('ALREADY_FOLLOWING');
+	if (exist) throw new ApiError('ALREADY_FOLLOWING');
 
 	try {
 		await create(follower, followee);
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts
index 3e0eda503..1525d4dad 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts
@@ -27,12 +27,12 @@ export default define(meta, paramDef, async (ps, user) => {
 	if (post == null) throw new ApiError('NO_SUCH_POST');
 
 	// if already liked
-	const exist = await GalleryLikes.findOneBy({
+	const exist = await GalleryLikes.countBy({
 		postId: post.id,
 		userId: user.id,
 	});
 
-	if (exist != null) throw new ApiError('ALREADY_LIKED');
+	if (exist) throw new ApiError('ALREADY_LIKED');
 
 	// Create like
 	await GalleryLikes.insert({
diff --git a/packages/backend/src/server/api/endpoints/i/read-announcement.ts b/packages/backend/src/server/api/endpoints/i/read-announcement.ts
index 433cb79b5..bbb510f0d 100644
--- a/packages/backend/src/server/api/endpoints/i/read-announcement.ts
+++ b/packages/backend/src/server/api/endpoints/i/read-announcement.ts
@@ -30,12 +30,12 @@ export default define(meta, paramDef, async (ps, user) => {
 	if (!exists) throw new ApiError('NO_SUCH_ANNOUNCEMENT');
 
 	// Check if already read
-	const read = await AnnouncementReads.findOneBy({
+	const read = await AnnouncementReads.countBy({
 		announcementId: ps.announcementId,
 		userId: user.id,
 	});
 
-	if (read != null) return;
+	if (read) return;
 
 	// Create read
 	await AnnouncementReads.insert({
diff --git a/packages/backend/src/server/api/endpoints/mute/create.ts b/packages/backend/src/server/api/endpoints/mute/create.ts
index 705fe9deb..ab013bade 100644
--- a/packages/backend/src/server/api/endpoints/mute/create.ts
+++ b/packages/backend/src/server/api/endpoints/mute/create.ts
@@ -43,12 +43,12 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	// Check if already muting
-	const exist = await Mutings.findOneBy({
+	const exist = await Mutings.countBy({
 		muterId: muter.id,
 		muteeId: mutee.id,
 	});
 
-	if (exist != null) throw new ApiError('ALREADY_MUTING');
+	if (exist) throw new ApiError('ALREADY_MUTING');
 
 	if (ps.expiresAt && ps.expiresAt <= Date.now()) {
 		return;
diff --git a/packages/backend/src/server/api/endpoints/notes/favorites/create.ts b/packages/backend/src/server/api/endpoints/notes/favorites/create.ts
index ffcb9b9e2..4ae1f0830 100644
--- a/packages/backend/src/server/api/endpoints/notes/favorites/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/favorites/create.ts
@@ -31,12 +31,12 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	// if already favorited
-	const exist = await NoteFavorites.findOneBy({
+	const exist = await NoteFavorites.countBy({
 		noteId: note.id,
 		userId: user.id,
 	});
 
-	if (exist != null) throw new ApiError('ALREADY_FAVORITED');
+	if (exist) throw new ApiError('ALREADY_FAVORITED');
 
 	// Create favorite
 	await NoteFavorites.insert({
diff --git a/packages/backend/src/server/api/endpoints/pages/like.ts b/packages/backend/src/server/api/endpoints/pages/like.ts
index 19b0d99ed..a3f8f3f3a 100644
--- a/packages/backend/src/server/api/endpoints/pages/like.ts
+++ b/packages/backend/src/server/api/endpoints/pages/like.ts
@@ -27,12 +27,12 @@ export default define(meta, paramDef, async (ps, user) => {
 	if (page == null) throw new ApiError('NO_SUCH_PAGE');
 
 	// if already liked
-	const exist = await PageLikes.findOneBy({
+	const exist = await PageLikes.countBy({
 		pageId: page.id,
 		userId: user.id,
 	});
 
-	if (exist != null) throw new ApiError('ALREADY_LIKED');
+	if (exist) throw new ApiError('ALREADY_LIKED');
 
 	// Create like
 	await PageLikes.insert({
diff --git a/packages/backend/src/server/api/endpoints/renote-mute/create.ts b/packages/backend/src/server/api/endpoints/renote-mute/create.ts
index 9320c4e2c..461312969 100644
--- a/packages/backend/src/server/api/endpoints/renote-mute/create.ts
+++ b/packages/backend/src/server/api/endpoints/renote-mute/create.ts
@@ -38,12 +38,12 @@ export default define(meta, paramDef, async (ps, user) => {
 	});
 
 	// Check if already muting
-	const exist = await RenoteMutings.findOneBy({
+	const exist = await RenoteMutings.countBy({
 		muterId: muter.id,
 		muteeId: mutee.id,
 	});
 
-	if (exist != null) throw new ApiError('ALREADY_MUTING');
+	if (exist) throw new ApiError('ALREADY_MUTING');
 
 	// Create mute
 	await RenoteMutings.insert({
diff --git a/packages/backend/src/server/api/endpoints/sw/register.ts b/packages/backend/src/server/api/endpoints/sw/register.ts
index 437f8874f..5ae858b99 100644
--- a/packages/backend/src/server/api/endpoints/sw/register.ts
+++ b/packages/backend/src/server/api/endpoints/sw/register.ts
@@ -40,7 +40,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	// if already subscribed
-	const exist = await SwSubscriptions.findOneBy({
+	const exist = await SwSubscriptions.countBy({
 		userId: user.id,
 		endpoint: ps.endpoint,
 		auth: ps.auth,
@@ -49,7 +49,7 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	const instance = await fetchMeta(true);
 
-	if (exist != null) {
+	if (exist) {
 		return {
 			state: 'already-subscribed' as const,
 			key: instance.swPublicKey,
diff --git a/packages/backend/src/services/add-note-to-antenna.ts b/packages/backend/src/services/add-note-to-antenna.ts
index ecb57376c..e490eaf11 100644
--- a/packages/backend/src/services/add-note-to-antenna.ts
+++ b/packages/backend/src/services/add-note-to-antenna.ts
@@ -46,7 +46,7 @@ export async function addNoteToAntenna(antenna: Antenna, note: Note, noteUser: {
 
 		// Notify if not read after 2 seconds
 		setTimeout(async () => {
-			const unread = await AntennaNotes.findOneBy({ antennaId: antenna.id, read: false });
+			const unread = await AntennaNotes.countBy({ antennaId: antenna.id, read: false });
 			if (unread) {
 				publishMainStream(antenna.userId, 'unreadAntenna', antenna);
 			}
diff --git a/packages/backend/src/services/following/requests/create.ts b/packages/backend/src/services/following/requests/create.ts
index 81fec5fe4..446f2de40 100644
--- a/packages/backend/src/services/following/requests/create.ts
+++ b/packages/backend/src/services/following/requests/create.ts
@@ -18,18 +18,18 @@ export async function createFollowRequest(follower: User, followee: User, reques
 
 	// check blocking
 	const [blocking, blocked] = await Promise.all([
-		Blockings.findOneBy({
+		Blockings.countBy({
 			blockerId: follower.id,
 			blockeeId: followee.id,
 		}),
-		Blockings.findOneBy({
+		Blockings.countBy({
 			blockerId: followee.id,
 			blockeeId: follower.id,
 		}),
 	]);
 
-	if (blocking != null) throw new Error('blocking');
-	if (blocked != null) throw new Error('blocked');
+	if (blocking) throw new Error('blocking');
+	if (blocked) throw new Error('blocked');
 
 	const followRequest = await FollowRequests.insert({
 		id: genId(),

From 8bc366fde01700ebffb1afb803f6f7925ff09419 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 3 Jan 2023 02:47:58 +0100
Subject: [PATCH 18/56] server: fix comma-dangle lint

---
 .../backend/src/server/api/endpoints/gallery/posts/create.ts  | 2 +-
 .../backend/src/server/api/endpoints/gallery/posts/update.ts  | 2 +-
 packages/backend/src/server/api/endpoints/meta.ts             | 4 ++--
 packages/backend/src/server/api/endpoints/notes/featured.ts   | 2 +-
 packages/backend/src/server/api/index.ts                      | 2 +-
 packages/backend/src/services/note/create.ts                  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
index a2c7e6038..230b7bec3 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
@@ -53,7 +53,7 @@ export default define(meta, paramDef, async (ps, user) => {
 			{
 				param: '#/properties/fileIds/items',
 				reason: 'contains invalid file IDs',
-			}
+			},
 		);
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts
index cd911bf47..071229f89 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts
@@ -54,7 +54,7 @@ export default define(meta, paramDef, async (ps, user) => {
 			{
 				param: '#/properties/fileIds/items',
 				reason: 'contains invalid file IDs',
-			}
+			},
 		);
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 03602faac..90d942811 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -235,7 +235,7 @@ export const meta = {
 	},
 
 	v2: {
-		method: 'get'
+		method: 'get',
 	},
 } as const;
 
@@ -253,7 +253,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async () => {
 	const instance = await fetchMeta(true);
 
 	const emojis = await Emojis.find({
diff --git a/packages/backend/src/server/api/endpoints/notes/featured.ts b/packages/backend/src/server/api/endpoints/notes/featured.ts
index 1382de6e5..112bc39a1 100644
--- a/packages/backend/src/server/api/endpoints/notes/featured.ts
+++ b/packages/backend/src/server/api/endpoints/notes/featured.ts
@@ -21,7 +21,7 @@ export const meta = {
 
 	v2: {
 		method: 'get',
-	}
+	},
 } as const;
 
 export const paramDef = {
diff --git a/packages/backend/src/server/api/index.ts b/packages/backend/src/server/api/index.ts
index 1aaee70a6..fe0c4450a 100644
--- a/packages/backend/src/server/api/index.ts
+++ b/packages/backend/src/server/api/index.ts
@@ -58,7 +58,7 @@ function uploadWrapper(endpoint: string): KoaMiddleware {
 						apiErr = new ApiError('FILE_TOO_BIG', { maxFileSize: config.maxFileSize || 262144000 });
 					}
 					apiErr.apply(ctx, endpoint);
-				}
+				},
 			);
 	};
 }
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index aceb142b0..4b4a80733 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -102,7 +102,7 @@ class NotificationManager {
 					// replies
 					this.note.threadId ?? this.note.id,
 					// renotes
-					this.note.renoteId ?? undefined
+					this.note.renoteId ?? undefined,
 				]),
 				mutingNotificationTypes: ArrayOverlap([x.reason]),
 			});

From 0c8a3cfeec2b8b36c9db30b8ab57c26c20936cfc Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 3 Jan 2023 03:51:38 +0100
Subject: [PATCH 19/56] server: fix lints

---
 packages/backend/src/misc/app-lock.ts                 |  5 +----
 packages/backend/src/misc/fetch-meta.ts               |  2 +-
 packages/backend/src/misc/renote.ts                   |  8 +++++++-
 packages/backend/src/models/entities/announcement.ts  |  8 --------
 .../src/models/entities/attestation-challenge.ts      |  8 --------
 .../backend/src/models/entities/note-thread-muting.ts |  1 -
 .../src/queue/processors/db/import-custom-emojis.ts   |  6 +++---
 .../src/queue/processors/system/check-expired.ts      |  2 +-
 .../src/remote/activitypub/kernel/create/note.ts      |  2 +-
 .../backend/src/remote/activitypub/models/person.ts   |  6 ++----
 .../backend/src/remote/activitypub/models/question.ts |  4 ++--
 packages/backend/src/remote/activitypub/perform.ts    |  2 +-
 packages/backend/src/remote/activitypub/request.ts    |  5 +++--
 .../src/server/api/endpoints/admin/accounts/delete.ts |  6 +++---
 .../api/endpoints/admin/announcements/delete.ts       |  2 +-
 .../server/api/endpoints/admin/announcements/list.ts  |  2 +-
 .../api/endpoints/admin/announcements/update.ts       |  2 +-
 .../api/endpoints/admin/delete-all-files-of-a-user.ts |  2 +-
 .../api/endpoints/admin/drive/clean-remote-files.ts   |  2 +-
 .../src/server/api/endpoints/admin/drive/files.ts     |  2 +-
 .../src/server/api/endpoints/admin/drive/show-file.ts |  2 +-
 .../src/server/api/endpoints/admin/emoji/copy.ts      |  2 +-
 .../endpoints/admin/federation/delete-all-files.ts    |  2 +-
 .../federation/refresh-remote-instance-metadata.ts    |  2 +-
 .../admin/federation/remove-all-following.ts          |  2 +-
 .../backend/src/server/api/endpoints/admin/meta.ts    |  2 +-
 .../api/endpoints/admin/queue/deliver-delayed.ts      |  2 +-
 .../server/api/endpoints/admin/queue/inbox-delayed.ts |  2 +-
 .../src/server/api/endpoints/admin/queue/stats.ts     |  2 +-
 .../src/server/api/endpoints/admin/relays/add.ts      |  2 +-
 .../src/server/api/endpoints/admin/relays/list.ts     |  2 +-
 .../src/server/api/endpoints/admin/relays/remove.ts   |  2 +-
 .../src/server/api/endpoints/admin/suspend-user.ts    |  6 +++---
 packages/backend/src/server/api/endpoints/ap/show.ts  |  2 +-
 .../backend/src/server/api/endpoints/auth/deny.ts     |  2 +-
 .../src/server/api/endpoints/federation/instances.ts  |  2 +-
 .../server/api/endpoints/federation/show-instance.ts  |  2 +-
 .../backend/src/server/api/endpoints/hashtags/list.ts |  2 +-
 .../backend/src/server/api/endpoints/hashtags/show.ts |  2 +-
 .../backend/src/server/api/endpoints/i/2fa/done.ts    |  2 +-
 .../src/server/api/endpoints/i/regenerate-token.ts    |  2 +-
 .../src/server/api/endpoints/notes/reactions.ts       |  2 +-
 .../src/server/api/endpoints/notes/translate.ts       |  1 -
 packages/backend/src/server/api/endpoints/reset-db.ts |  2 +-
 .../src/server/api/endpoints/reset-password.ts        |  2 +-
 .../backend/src/server/api/endpoints/users/clips.ts   |  2 +-
 .../backend/src/server/api/endpoints/users/pages.ts   |  2 +-
 .../backend/src/server/api/endpoints/users/stats.ts   |  2 +-
 packages/backend/src/server/api/error.ts              | 11 ++++++-----
 packages/backend/src/server/api/openapi/schemas.ts    |  3 ++-
 .../backend/src/server/api/private/signup-pending.ts  |  2 +-
 .../backend/src/server/api/stream/channels/admin.ts   |  2 +-
 .../backend/src/server/api/stream/channels/drive.ts   |  2 +-
 .../src/server/api/stream/channels/global-timeline.ts |  2 +-
 .../src/server/api/stream/channels/home-timeline.ts   |  2 +-
 .../src/server/api/stream/channels/hybrid-timeline.ts |  2 +-
 .../src/server/api/stream/channels/local-timeline.ts  |  2 +-
 .../backend/src/server/api/stream/channels/main.ts    |  2 +-
 .../src/server/api/stream/channels/messaging-index.ts |  2 +-
 .../src/server/api/stream/channels/queue-stats.ts     |  2 +-
 .../src/server/api/stream/channels/server-stats.ts    |  2 +-
 packages/backend/src/server/web/index.ts              |  3 ---
 .../src/services/chart/charts/per-user-reactions.ts   |  2 +-
 packages/backend/src/services/create-notification.ts  |  2 +-
 packages/backend/src/services/note/create.ts          |  2 +-
 packages/backend/src/services/note/delete.ts          |  4 ++--
 66 files changed, 84 insertions(+), 101 deletions(-)

diff --git a/packages/backend/src/misc/app-lock.ts b/packages/backend/src/misc/app-lock.ts
index 58e302525..25627fd05 100644
--- a/packages/backend/src/misc/app-lock.ts
+++ b/packages/backend/src/misc/app-lock.ts
@@ -8,10 +8,7 @@ import { SECOND } from '@/const.js';
  */
 const retryDelay = 100;
 
-const lock: (key: string, timeout?: number) => Promise<() => void>
-	= redisClient
-		? promisify(redisLock(redisClient, retryDelay))
-		: async () => () => { };
+const lock: (key: string, timeout?: number) => Promise<() => void> = promisify(redisLock(redisClient, retryDelay));
 
 /**
  * Get AP Object lock
diff --git a/packages/backend/src/misc/fetch-meta.ts b/packages/backend/src/misc/fetch-meta.ts
index 924b44553..edd6265a8 100644
--- a/packages/backend/src/misc/fetch-meta.ts
+++ b/packages/backend/src/misc/fetch-meta.ts
@@ -3,7 +3,7 @@ import { db } from '@/db/postgre.js';
 import { Meta } from '@/models/entities/meta.js';
 import { getFetchInstanceMetadataLock } from '@/misc/app-lock.js';
 
-let cache: Meta;
+let cache: Meta | undefined;
 
 /**
  * Performs the primitive database operation to set the server configuration
diff --git a/packages/backend/src/misc/renote.ts b/packages/backend/src/misc/renote.ts
index 758dcdd05..cd51cd04a 100644
--- a/packages/backend/src/misc/renote.ts
+++ b/packages/backend/src/misc/renote.ts
@@ -1,5 +1,11 @@
 import { Note } from '@/models/entities/note.js';
 
 export function isPureRenote(note: Note): note is Note & { renoteId: string, text: null, fileIds: null | never[], hasPoll: false } {
-	return note.renoteId != null && note.text == null && (note.fileIds == null || note.fileIds.length === 0) && !note.hasPoll;
+	return note.renoteId != null
+		&& note.text == null
+		&& (
+			note.fileIds == null
+			|| note.fileIds.length === 0
+		)
+		&& !note.hasPoll;
 }
diff --git a/packages/backend/src/models/entities/announcement.ts b/packages/backend/src/models/entities/announcement.ts
index beb2f8246..f2088455d 100644
--- a/packages/backend/src/models/entities/announcement.ts
+++ b/packages/backend/src/models/entities/announcement.ts
@@ -32,12 +32,4 @@ export class Announcement {
 		length: 1024, nullable: true,
 	})
 	public imageUrl: string | null;
-
-	constructor(data: Partial<Announcement>) {
-		if (data == null) return;
-
-		for (const [k, v] of Object.entries(data)) {
-			(this as any)[k] = v;
-		}
-	}
 }
diff --git a/packages/backend/src/models/entities/attestation-challenge.ts b/packages/backend/src/models/entities/attestation-challenge.ts
index 2a99953ee..421a07fce 100644
--- a/packages/backend/src/models/entities/attestation-challenge.ts
+++ b/packages/backend/src/models/entities/attestation-challenge.ts
@@ -35,12 +35,4 @@ export class AttestationChallenge {
 		default: false,
 	})
 	public registrationChallenge: boolean;
-
-	constructor(data: Partial<AttestationChallenge>) {
-		if (data == null) return;
-
-		for (const [k, v] of Object.entries(data)) {
-			(this as any)[k] = v;
-		}
-	}
 }
diff --git a/packages/backend/src/models/entities/note-thread-muting.ts b/packages/backend/src/models/entities/note-thread-muting.ts
index 90ed0c9f8..709dcbaa6 100644
--- a/packages/backend/src/models/entities/note-thread-muting.ts
+++ b/packages/backend/src/models/entities/note-thread-muting.ts
@@ -2,7 +2,6 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typ
 import { noteNotificationTypes } from 'foundkey-js';
 import { id } from '../id.js';
 import { User } from './user.js';
-import { Note } from './note.js';
 
 @Entity()
 @Index(['userId', 'threadId'], { unique: true })
diff --git a/packages/backend/src/queue/processors/db/import-custom-emojis.ts b/packages/backend/src/queue/processors/db/import-custom-emojis.ts
index 04d32d230..1d06d5ff8 100644
--- a/packages/backend/src/queue/processors/db/import-custom-emojis.ts
+++ b/packages/backend/src/queue/processors/db/import-custom-emojis.ts
@@ -56,7 +56,7 @@ export async function importCustomEmojis(job: Bull.Job<DbUserImportJobData>, don
 				name: emojiInfo.name,
 			});
 			const driveFile = await addFile({ user: null, path: emojiPath, name: record.fileName, force: true });
-			const emoji = await Emojis.insert({
+			await Emojis.insert({
 				id: genId(),
 				updatedAt: new Date(),
 				name: emojiInfo.name,
@@ -66,13 +66,13 @@ export async function importCustomEmojis(job: Bull.Job<DbUserImportJobData>, don
 				originalUrl: driveFile.url,
 				publicUrl: driveFile.webpublicUrl ?? driveFile.url,
 				type: driveFile.webpublicType ?? driveFile.type,
-			}).then(x => Emojis.findOneByOrFail(x.identifiers[0]));
+			});
 		}
 
 		await db.queryResultCache!.remove(['meta_emojis']);
 
 		cleanup();
-	
+
 		logger.succ('Imported');
 		done();
 	});
diff --git a/packages/backend/src/queue/processors/system/check-expired.ts b/packages/backend/src/queue/processors/system/check-expired.ts
index ba344b712..eeb6149bb 100644
--- a/packages/backend/src/queue/processors/system/check-expired.ts
+++ b/packages/backend/src/queue/processors/system/check-expired.ts
@@ -2,7 +2,7 @@ import Bull from 'bull';
 import { In, LessThan } from 'typeorm';
 import { AttestationChallenges, AuthSessions, Mutings, Notifications, PasswordResetRequests, Signins } from '@/models/index.js';
 import { publishUserEvent } from '@/services/stream.js';
-import { MINUTE, DAY, MONTH } from '@/const.js';
+import { MINUTE, MONTH } from '@/const.js';
 import { queueLogger } from '@/queue/logger.js';
 
 const logger = queueLogger.createSubLogger('check-expired');
diff --git a/packages/backend/src/remote/activitypub/kernel/create/note.ts b/packages/backend/src/remote/activitypub/kernel/create/note.ts
index 0b71566ba..892dbb26a 100644
--- a/packages/backend/src/remote/activitypub/kernel/create/note.ts
+++ b/packages/backend/src/remote/activitypub/kernel/create/note.ts
@@ -4,7 +4,7 @@ import { extractDbHost } from '@/misc/convert-host.js';
 import { StatusError } from '@/misc/fetch.js';
 import { Resolver } from '@/remote/activitypub/resolver.js';
 import { createNote, fetchNote } from '@/remote/activitypub/models/note.js';
-import { getApId, IObject, ICreate } from '@/remote/activitypub/type.js';
+import { getApId, IObject } from '@/remote/activitypub/type.js';
 
 /**
  * 投稿作成アクティビティを捌きます
diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index 0136aeea3..ed099d03e 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -1,4 +1,3 @@
-import { URL } from 'node:url';
 import promiseLimit from 'promise-limit';
 
 import config from '@/config/index.js';
@@ -40,7 +39,6 @@ const summaryLength = 2048;
  * @param uri Fetch target URI
  */
 function validateActor(x: IObject): IActor {
-
 	if (x == null) {
 		throw new Error('invalid Actor: object is null');
 	}
@@ -100,7 +98,7 @@ function validateActor(x: IObject): IActor {
  *
  * If the target Person is registered in FoundKey, it is returned.
  */
-export async function fetchPerson(uri: string, resolver: Resolver): Promise<CacheableUser | null> {
+export async function fetchPerson(uri: string): Promise<CacheableUser | null> {
 	if (typeof uri !== 'string') throw new Error('uri is not string');
 
 	const cached = uriPersonCache.get(uri);
@@ -384,7 +382,7 @@ export async function resolvePerson(uri: string, resolver: Resolver): Promise<Ca
 	if (typeof uri !== 'string') throw new Error('uri is not string');
 
 	//#region このサーバーに既に登録されていたらそれを返す
-	const exist = await fetchPerson(uri, resolver);
+	const exist = await fetchPerson(uri);
 
 	if (exist) {
 		return exist;
diff --git a/packages/backend/src/remote/activitypub/models/question.ts b/packages/backend/src/remote/activitypub/models/question.ts
index 088cdbe94..5d88e1d44 100644
--- a/packages/backend/src/remote/activitypub/models/question.ts
+++ b/packages/backend/src/remote/activitypub/models/question.ts
@@ -20,10 +20,10 @@ export async function extractPollFromQuestion(source: string | IObject, resolver
 	}
 
 	const choices = question[multiple ? 'anyOf' : 'oneOf']!
-		.map((x, i) => x.name!);
+		.map(x => x.name!);
 
 	const votes = question[multiple ? 'anyOf' : 'oneOf']!
-		.map((x, i) => x.replies && x.replies.totalItems || x._misskey_votes || 0);
+		.map(x => x.replies && x.replies.totalItems || x._misskey_votes || 0);
 
 	return {
 		choices,
diff --git a/packages/backend/src/remote/activitypub/perform.ts b/packages/backend/src/remote/activitypub/perform.ts
index 37fd2fc12..8622d43df 100644
--- a/packages/backend/src/remote/activitypub/perform.ts
+++ b/packages/backend/src/remote/activitypub/perform.ts
@@ -16,4 +16,4 @@ export async function perform(actor: CacheableRemoteUser, activity: IObject, res
 			});
 		}
 	}
-};
+}
diff --git a/packages/backend/src/remote/activitypub/request.ts b/packages/backend/src/remote/activitypub/request.ts
index 7116e8c8e..233bc025f 100644
--- a/packages/backend/src/remote/activitypub/request.ts
+++ b/packages/backend/src/remote/activitypub/request.ts
@@ -30,14 +30,15 @@ export async function request(user: { id: User['id'] }, url: string, object: any
 		// don't allow redirects on the inbox
 		redirect: 'error',
 	});
-};
+}
 
 /**
  * Get AP object with http-signature
  * @param user http-signature user
  * @param url URL to fetch
  */
-export async function signedGet(url: string, user: { id: User['id'] }): Promise<any> {
+export async function signedGet(_url: string, user: { id: User['id'] }): Promise<any> {
+	let url = _url;
 	const keypair = await getUserKeypair(user.id);
 
 	for (let redirects = 0; redirects < 3; redirects++) {
diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
index 7c0392e3c..b8a8b0618 100644
--- a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
@@ -23,20 +23,20 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async (ps) => {
 	const user = await Users.findOneBy({ id: ps.userId });
 
 	if (user == null) {
 		throw new ApiError('NO_SUCH_USER');
 	} else if (user.isAdmin) {
 		throw new ApiError('IS_ADMIN');
-	} else if(user.isModerator) {
+	} else if (user.isModerator) {
 		throw new ApiError('IS_MODERATOR');
 	}
 
 	if (Users.isLocalUser(user)) {
 		// 物理削除する前にDelete activityを送信する
-		await doPostSuspend(user).catch(e => {});
+		await doPostSuspend(user).catch(() => {});
 
 		createDeleteAccountJob(user, {
 			soft: false,
diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts b/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts
index 656d4c553..c2e5ccf24 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts
@@ -20,7 +20,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async (ps) => {
 	const announcement = await Announcements.findOneBy({ id: ps.id });
 
 	if (announcement == null) throw new ApiError('NO_SUCH_ANNOUNCEMENT');
diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
index 7a5758d75..1ffce9fbe 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
@@ -84,6 +84,6 @@ export default define(meta, paramDef, async (ps) => {
 		title: announcement.title,
 		text: announcement.text,
 		imageUrl: announcement.imageUrl,
-		reads: reads.get(announcement)!,
+		reads: reads.get(announcement),
 	}));
 });
diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts
index 6cc94ce3b..341e5636b 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts
@@ -23,7 +23,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async (ps) => {
 	const announcement = await Announcements.findOneBy({ id: ps.id });
 
 	if (announcement == null) throw new ApiError('NO_SUCH_ANNOUNCEMENT');
diff --git a/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts b/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts
index 21870a29b..b6b2b7872 100644
--- a/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/delete-all-files-of-a-user.ts
@@ -18,7 +18,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async (ps) => {
 	const files = await DriveFiles.findBy({
 		userId: ps.userId,
 	});
diff --git a/packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts b/packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts
index 4ee5c113b..b36623293 100644
--- a/packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts
+++ b/packages/backend/src/server/api/endpoints/admin/drive/clean-remote-files.ts
@@ -15,6 +15,6 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async () => {
 	createCleanRemoteFilesJob();
 });
diff --git a/packages/backend/src/server/api/endpoints/admin/drive/files.ts b/packages/backend/src/server/api/endpoints/admin/drive/files.ts
index ba32aac43..5fcda7614 100644
--- a/packages/backend/src/server/api/endpoints/admin/drive/files.ts
+++ b/packages/backend/src/server/api/endpoints/admin/drive/files.ts
@@ -39,7 +39,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async (ps) => {
 	const query = makePaginationQuery(DriveFiles.createQueryBuilder('file'), ps.sinceId, ps.untilId);
 
 	if (ps.userId) {
diff --git a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts
index 9f36e6f30..f0c3ea7c0 100644
--- a/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts
+++ b/packages/backend/src/server/api/endpoints/admin/drive/show-file.ts
@@ -163,7 +163,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async (ps) => {
 	const file = ps.fileId ? await DriveFiles.findOneBy({ id: ps.fileId }) : await DriveFiles.findOne({
 		where: [{
 			url: ps.url,
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
index a13a47376..a098217b4 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
@@ -37,7 +37,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async (ps) => {
 	const emoji = await Emojis.findOneBy({ id: ps.emojiId });
 
 	if (emoji == null) throw new ApiError('NO_SUCH_EMOJI');
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts b/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts
index b5d7ec673..91a23e90f 100644
--- a/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts
+++ b/packages/backend/src/server/api/endpoints/admin/federation/delete-all-files.ts
@@ -18,7 +18,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async (ps) => {
 	const files = await DriveFiles.findBy({
 		userHost: ps.host,
 	});
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts b/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts
index 439a802e1..a043d4601 100644
--- a/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts
+++ b/packages/backend/src/server/api/endpoints/admin/federation/refresh-remote-instance-metadata.ts
@@ -22,7 +22,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async (ps) => {
 	const instance = await Instances.findOneBy({ host: toPuny(ps.host) });
 
 	if (instance == null) {
diff --git a/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts b/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts
index 5e60e37a1..34d894b34 100644
--- a/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts
+++ b/packages/backend/src/server/api/endpoints/admin/federation/remove-all-following.ts
@@ -18,7 +18,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async (ps) => {
 	const followings = await Followings.findBy({
 		followerHost: ps.host,
 	});
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index 57e60f1c6..ba3159112 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -256,7 +256,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async () => {
 	const instance = await fetchMeta(true);
 
 	return {
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts b/packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts
index 646e2e7cc..b89360720 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/deliver-delayed.ts
@@ -39,7 +39,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps) => {
+export default define(meta, paramDef, async () => {
 	const jobs = await deliverQueue.getJobs(['delayed']);
 
 	const res = [] as [string, number][];
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts b/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts
index a8a2d3d42..274313f8a 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/inbox-delayed.ts
@@ -39,7 +39,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps) => {
+export default define(meta, paramDef, async () => {
 	const jobs = await inboxQueue.getJobs(['delayed']);
 
 	const res = [] as [string, number][];
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/stats.ts b/packages/backend/src/server/api/endpoints/admin/queue/stats.ts
index 988b5a5e3..7a0d6bdb7 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/stats.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/stats.ts
@@ -38,7 +38,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps) => {
+export default define(meta, paramDef, async () => {
 	const deliverJobCounts = await deliverQueue.getJobCounts();
 	const inboxJobCounts = await inboxQueue.getJobCounts();
 	const dbJobCounts = await dbQueue.getJobCounts();
diff --git a/packages/backend/src/server/api/endpoints/admin/relays/add.ts b/packages/backend/src/server/api/endpoints/admin/relays/add.ts
index 5fbce5411..76a89ef3d 100644
--- a/packages/backend/src/server/api/endpoints/admin/relays/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/relays/add.ts
@@ -49,7 +49,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, user) => {
+export default define(meta, paramDef, async (ps) => {
 	try {
 		if (new URL(ps.inbox).protocol !== 'https:') throw new ApiError('INVALID_URL', 'https only');
 	} catch (e) {
diff --git a/packages/backend/src/server/api/endpoints/admin/relays/list.ts b/packages/backend/src/server/api/endpoints/admin/relays/list.ts
index c90e9875f..2bc42f74a 100644
--- a/packages/backend/src/server/api/endpoints/admin/relays/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/relays/list.ts
@@ -46,6 +46,6 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, user) => {
+export default define(meta, paramDef, async () => {
 	return await listRelay();
 });
diff --git a/packages/backend/src/server/api/endpoints/admin/relays/remove.ts b/packages/backend/src/server/api/endpoints/admin/relays/remove.ts
index efd7b9a82..5dcf241b1 100644
--- a/packages/backend/src/server/api/endpoints/admin/relays/remove.ts
+++ b/packages/backend/src/server/api/endpoints/admin/relays/remove.ts
@@ -17,6 +17,6 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, user) => {
+export default define(meta, paramDef, async (ps) => {
 	return await removeRelay(ps.inbox);
 });
diff --git a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
index 473fa220e..9527f7edf 100644
--- a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
@@ -50,9 +50,9 @@ export default define(meta, paramDef, async (ps, me) => {
 	}
 
 	(async () => {
-		await doPostSuspend(user).catch(e => {});
-		await unFollowAll(user).catch(e => {});
-		await readAllNotify(user).catch(e => {});
+		await doPostSuspend(user).catch(() => {});
+		await unFollowAll(user).catch(() => {});
+		await readAllNotify(user).catch(() => {});
 	})();
 });
 
diff --git a/packages/backend/src/server/api/endpoints/ap/show.ts b/packages/backend/src/server/api/endpoints/ap/show.ts
index 7770e1220..414f71d31 100644
--- a/packages/backend/src/server/api/endpoints/ap/show.ts
+++ b/packages/backend/src/server/api/endpoints/ap/show.ts
@@ -6,7 +6,7 @@ import { extractDbHost } from '@/misc/convert-host.js';
 import { Users, Notes } from '@/models/index.js';
 import { Note } from '@/models/entities/note.js';
 import { CacheableLocalUser, User } from '@/models/entities/user.js';
-import { isActor, isPost, getApId } from '@/remote/activitypub/type.js';
+import { isActor, isPost } from '@/remote/activitypub/type.js';
 import { SchemaType } from '@/misc/schema.js';
 import { HOUR } from '@/const.js';
 import { shouldBlockInstance } from '@/misc/should-block-instance.js';
diff --git a/packages/backend/src/server/api/endpoints/auth/deny.ts b/packages/backend/src/server/api/endpoints/auth/deny.ts
index b3bb4ab8c..2c0f7abc8 100644
--- a/packages/backend/src/server/api/endpoints/auth/deny.ts
+++ b/packages/backend/src/server/api/endpoints/auth/deny.ts
@@ -27,7 +27,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, user) => {
+export default define(meta, paramDef, async (ps) => {
 	const result = await AuthSessions.delete({
 		token: ps.token,
 	});
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
index b0b2280f8..900f9480b 100644
--- a/packages/backend/src/server/api/endpoints/federation/instances.ts
+++ b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -36,7 +36,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async (ps) => {
 	const query = Instances.createQueryBuilder('instance');
 
 	switch (ps.sort) {
diff --git a/packages/backend/src/server/api/endpoints/federation/show-instance.ts b/packages/backend/src/server/api/endpoints/federation/show-instance.ts
index 22923d5df..a293bd586 100644
--- a/packages/backend/src/server/api/endpoints/federation/show-instance.ts
+++ b/packages/backend/src/server/api/endpoints/federation/show-instance.ts
@@ -26,7 +26,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async (ps) => {
 	const instance = await Instances
 		.findOneBy({ host: toPuny(ps.host) });
 
diff --git a/packages/backend/src/server/api/endpoints/hashtags/list.ts b/packages/backend/src/server/api/endpoints/hashtags/list.ts
index 4277410c8..5f0d9152c 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/list.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/list.ts
@@ -30,7 +30,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async (ps) => {
 	const query = Hashtags.createQueryBuilder('tag');
 
 	if (ps.attachedToUserOnly) query.andWhere('tag.attachedUsersCount != 0');
diff --git a/packages/backend/src/server/api/endpoints/hashtags/show.ts b/packages/backend/src/server/api/endpoints/hashtags/show.ts
index e66661a68..a3d8b5b98 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/show.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/show.ts
@@ -26,7 +26,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, user) => {
+export default define(meta, paramDef, async (ps) => {
 	const hashtag = await Hashtags.findOneBy({ name: normalizeForSearch(ps.tag) });
 	if (hashtag == null) throw new ApiError('NO_SUCH_HASHTAG');
 
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/done.ts b/packages/backend/src/server/api/endpoints/i/2fa/done.ts
index 3800290b7..e9fdd4c37 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/done.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/done.ts
@@ -1,7 +1,7 @@
 import * as speakeasy from 'speakeasy';
 import { UserProfiles } from '@/models/index.js';
-import define from '../../../define.js';
 import { ApiError } from '@/server/api/error.js';
+import define from '../../../define.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/i/regenerate-token.ts b/packages/backend/src/server/api/endpoints/i/regenerate-token.ts
index 2bec1ed17..84bfa6fd3 100644
--- a/packages/backend/src/server/api/endpoints/i/regenerate-token.ts
+++ b/packages/backend/src/server/api/endpoints/i/regenerate-token.ts
@@ -1,8 +1,8 @@
 import { comparePassword } from '@/misc/password.js';
 import { publishInternalEvent, publishMainStream, publishUserEvent } from '@/services/stream.js';
 import { Users, UserProfiles } from '@/models/index.js';
-import generateUserToken from '../../common/generate-native-user-token.js';
 import { ApiError } from '@/server/api/error.js';
+import generateUserToken from '../../common/generate-native-user-token.js';
 import define from '../../define.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/notes/reactions.ts b/packages/backend/src/server/api/endpoints/notes/reactions.ts
index 03fe4bd42..6fd0e8f16 100644
--- a/packages/backend/src/server/api/endpoints/notes/reactions.ts
+++ b/packages/backend/src/server/api/endpoints/notes/reactions.ts
@@ -51,7 +51,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	// check note visibility
-	const note = await getNote(ps.noteId, user).catch(err => {
+	await getNote(ps.noteId, user).catch(err => {
 		if (err.id === '9725d0ce-ba28-4dde-95a7-2cbb2c15de24') throw new ApiError('NO_SUCH_NOTE');
 		throw err;
 	});
diff --git a/packages/backend/src/server/api/endpoints/notes/translate.ts b/packages/backend/src/server/api/endpoints/notes/translate.ts
index 0d7ce97c1..1c4989354 100644
--- a/packages/backend/src/server/api/endpoints/notes/translate.ts
+++ b/packages/backend/src/server/api/endpoints/notes/translate.ts
@@ -3,7 +3,6 @@ import fetch from 'node-fetch';
 import config from '@/config/index.js';
 import { getAgentByUrl } from '@/misc/fetch.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
-import { Notes } from '@/models/index.js';
 import { TranslationService } from '@/models/entities/meta.js';
 import { ApiError } from '../../error.js';
 import { getNote } from '../../common/getters.js';
diff --git a/packages/backend/src/server/api/endpoints/reset-db.ts b/packages/backend/src/server/api/endpoints/reset-db.ts
index ce26e28ee..b8f969bd5 100644
--- a/packages/backend/src/server/api/endpoints/reset-db.ts
+++ b/packages/backend/src/server/api/endpoints/reset-db.ts
@@ -17,7 +17,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, user) => {
+export default define(meta, paramDef, async () => {
 	if (process.env.NODE_ENV !== 'test') throw new ApiError('ACCESS_DENIED');
 
 	await resetDb();
diff --git a/packages/backend/src/server/api/endpoints/reset-password.ts b/packages/backend/src/server/api/endpoints/reset-password.ts
index c46fcb6fd..d45b20945 100644
--- a/packages/backend/src/server/api/endpoints/reset-password.ts
+++ b/packages/backend/src/server/api/endpoints/reset-password.ts
@@ -28,7 +28,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, user) => {
+export default define(meta, paramDef, async (ps) => {
 	const req = await PasswordResetRequests.findOneBy({
 		token: ps.token,
 	});
diff --git a/packages/backend/src/server/api/endpoints/users/clips.ts b/packages/backend/src/server/api/endpoints/users/clips.ts
index 09fdf27c2..0d3706d7e 100644
--- a/packages/backend/src/server/api/endpoints/users/clips.ts
+++ b/packages/backend/src/server/api/endpoints/users/clips.ts
@@ -30,7 +30,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, user) => {
+export default define(meta, paramDef, async (ps) => {
 	const query = makePaginationQuery(Clips.createQueryBuilder('clip'), ps.sinceId, ps.untilId)
 		.andWhere('clip.userId = :userId', { userId: ps.userId })
 		.andWhere('clip.isPublic = true');
diff --git a/packages/backend/src/server/api/endpoints/users/pages.ts b/packages/backend/src/server/api/endpoints/users/pages.ts
index b1d28af84..4bfafbdb4 100644
--- a/packages/backend/src/server/api/endpoints/users/pages.ts
+++ b/packages/backend/src/server/api/endpoints/users/pages.ts
@@ -30,7 +30,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, user) => {
+export default define(meta, paramDef, async (ps) => {
 	const query = makePaginationQuery(Pages.createQueryBuilder('page'), ps.sinceId, ps.untilId)
 		.andWhere('page.userId = :userId', { userId: ps.userId })
 		.andWhere('page.visibility = \'public\'');
diff --git a/packages/backend/src/server/api/endpoints/users/stats.ts b/packages/backend/src/server/api/endpoints/users/stats.ts
index f17ff8b31..0f99e56b3 100644
--- a/packages/backend/src/server/api/endpoints/users/stats.ts
+++ b/packages/backend/src/server/api/endpoints/users/stats.ts
@@ -110,7 +110,7 @@ export const paramDef = {
 } as const;
 
 // eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
+export default define(meta, paramDef, async (ps) => {
 	const user = await Users.findOneBy({ id: ps.userId });
 	if (user == null) {
 		throw new ApiError('NO_SUCH_USER');
diff --git a/packages/backend/src/server/api/error.ts b/packages/backend/src/server/api/error.ts
index be9f4aef8..c015c7608 100644
--- a/packages/backend/src/server/api/error.ts
+++ b/packages/backend/src/server/api/error.ts
@@ -10,15 +10,16 @@ export class ApiError extends Error {
 		code: keyof errors = 'INTERNAL_ERROR',
 		info?: any | null,
 	) {
+		let _info = info, _code = code;
 		if (!(code in errors)) {
-			info = `Unknown error "${code}" occurred.`;
-			code = 'INTERNAL_ERROR';
+			_code = 'INTERNAL_ERROR';
+			_info = `Unknown error "${code}" occurred.`;
 		}
 
-		const { message, httpStatusCode } = errors[code];
+		const { message, httpStatusCode } = errors[_code];
 		super(message);
-		this.code = code;
-		this.info = info;
+		this.code = _code;
+		this.info = _info;
 		this.message = message;
 		this.httpStatusCode = httpStatusCode;
 	}
diff --git a/packages/backend/src/server/api/openapi/schemas.ts b/packages/backend/src/server/api/openapi/schemas.ts
index 04346c53b..f03da1c4d 100644
--- a/packages/backend/src/server/api/openapi/schemas.ts
+++ b/packages/backend/src/server/api/openapi/schemas.ts
@@ -4,7 +4,8 @@ export function convertSchemaToOpenApiSchema(schema: Schema) {
 	const res: any = schema;
 
 	if (schema.type === 'object' && schema.properties) {
-		res.required = Object.entries(schema.properties).filter(([k, v]) => !v.optional).map(([k]) => k);
+		res.required = Object.entries(schema.properties)
+			.flatMap(([k, v]) => v.optional ? [] : [k]);
 
 		for (const k of Object.keys(schema.properties)) {
 			res.properties[k] = convertSchemaToOpenApiSchema(schema.properties[k]);
diff --git a/packages/backend/src/server/api/private/signup-pending.ts b/packages/backend/src/server/api/private/signup-pending.ts
index 53fd2058a..09505a895 100644
--- a/packages/backend/src/server/api/private/signup-pending.ts
+++ b/packages/backend/src/server/api/private/signup-pending.ts
@@ -11,7 +11,7 @@ export default async (ctx: Koa.Context) => {
 	try {
 		const pendingUser = await UserPendings.findOneByOrFail({ code });
 
-		const { account, secret } = await signup({
+		const { account } = await signup({
 			username: pendingUser.username,
 			passwordHash: pendingUser.password,
 		});
diff --git a/packages/backend/src/server/api/stream/channels/admin.ts b/packages/backend/src/server/api/stream/channels/admin.ts
index 945182ea1..007b459df 100644
--- a/packages/backend/src/server/api/stream/channels/admin.ts
+++ b/packages/backend/src/server/api/stream/channels/admin.ts
@@ -5,7 +5,7 @@ export default class extends Channel {
 	public static shouldShare = true;
 	public static requireCredential = true;
 
-	public async init(params: any) {
+	public async init() {
 		// Subscribe admin stream
 		this.subscriber.on(`adminStream:${this.user!.id}`, data => {
 			this.send(data);
diff --git a/packages/backend/src/server/api/stream/channels/drive.ts b/packages/backend/src/server/api/stream/channels/drive.ts
index 140255acd..d7ccab5d8 100644
--- a/packages/backend/src/server/api/stream/channels/drive.ts
+++ b/packages/backend/src/server/api/stream/channels/drive.ts
@@ -5,7 +5,7 @@ export default class extends Channel {
 	public static shouldShare = true;
 	public static requireCredential = true;
 
-	public async init(params: any) {
+	public async init() {
 		// Subscribe drive stream
 		this.subscriber.on(`driveStream:${this.user!.id}`, data => {
 			this.send(data);
diff --git a/packages/backend/src/server/api/stream/channels/global-timeline.ts b/packages/backend/src/server/api/stream/channels/global-timeline.ts
index 6b6f69dfe..cefb80033 100644
--- a/packages/backend/src/server/api/stream/channels/global-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts
@@ -17,7 +17,7 @@ export default class extends Channel {
 		this.onNote = this.withPackedNote(this.onPackedNote.bind(this));
 	}
 
-	public async init(params: any) {
+	public async init() {
 		const meta = await fetchMeta();
 		if (meta.disableGlobalTimeline) {
 			if (this.user == null || (!this.user.isAdmin && !this.user.isModerator)) return;
diff --git a/packages/backend/src/server/api/stream/channels/home-timeline.ts b/packages/backend/src/server/api/stream/channels/home-timeline.ts
index e4a5bfd43..1dc81cdbc 100644
--- a/packages/backend/src/server/api/stream/channels/home-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -16,7 +16,7 @@ export default class extends Channel {
 		this.onNote = this.withPackedNote(this.onPackedNote.bind(this));
 	}
 
-	public async init(params: any) {
+	public async init() {
 		// Subscribe events
 		this.subscriber.on('notesStream', this.onNote);
 	}
diff --git a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
index 989e70590..e9e60a7c9 100644
--- a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
@@ -17,7 +17,7 @@ export default class extends Channel {
 		this.onNote = this.withPackedNote(this.onPackedNote.bind(this));
 	}
 
-	public async init(params: any) {
+	public async init() {
 		const meta = await fetchMeta();
 		if (meta.disableLocalTimeline && !this.user!.isAdmin && !this.user!.isModerator) return;
 
diff --git a/packages/backend/src/server/api/stream/channels/local-timeline.ts b/packages/backend/src/server/api/stream/channels/local-timeline.ts
index 3aa76e389..84524a154 100644
--- a/packages/backend/src/server/api/stream/channels/local-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/local-timeline.ts
@@ -16,7 +16,7 @@ export default class extends Channel {
 		this.onNote = this.withPackedNote(this.onPackedNote.bind(this));
 	}
 
-	public async init(params: any) {
+	public async init() {
 		const meta = await fetchMeta();
 		if (meta.disableLocalTimeline) {
 			if (this.user == null || (!this.user.isAdmin && !this.user.isModerator)) return;
diff --git a/packages/backend/src/server/api/stream/channels/main.ts b/packages/backend/src/server/api/stream/channels/main.ts
index 70da75e04..f95ca62c8 100644
--- a/packages/backend/src/server/api/stream/channels/main.ts
+++ b/packages/backend/src/server/api/stream/channels/main.ts
@@ -6,7 +6,7 @@ export default class extends Channel {
 	public static shouldShare = true;
 	public static requireCredential = true;
 
-	public async init(params: any) {
+	public async init() {
 		// Subscribe main stream channel
 		this.subscriber.on(`mainStream:${this.user!.id}`, async data => {
 			switch (data.type) {
diff --git a/packages/backend/src/server/api/stream/channels/messaging-index.ts b/packages/backend/src/server/api/stream/channels/messaging-index.ts
index b930785d2..1498e8649 100644
--- a/packages/backend/src/server/api/stream/channels/messaging-index.ts
+++ b/packages/backend/src/server/api/stream/channels/messaging-index.ts
@@ -5,7 +5,7 @@ export default class extends Channel {
 	public static shouldShare = true;
 	public static requireCredential = true;
 
-	public async init(params: any) {
+	public async init() {
 		// Subscribe messaging index stream
 		this.subscriber.on(`messagingIndexStream:${this.user!.id}`, data => {
 			this.send(data);
diff --git a/packages/backend/src/server/api/stream/channels/queue-stats.ts b/packages/backend/src/server/api/stream/channels/queue-stats.ts
index b67600474..f3dc7d668 100644
--- a/packages/backend/src/server/api/stream/channels/queue-stats.ts
+++ b/packages/backend/src/server/api/stream/channels/queue-stats.ts
@@ -14,7 +14,7 @@ export default class extends Channel {
 		this.onMessage = this.onMessage.bind(this);
 	}
 
-	public async init(params: any) {
+	public async init() {
 		ev.addListener('queueStats', this.onStats);
 	}
 
diff --git a/packages/backend/src/server/api/stream/channels/server-stats.ts b/packages/backend/src/server/api/stream/channels/server-stats.ts
index db75a6fa3..7369bbefd 100644
--- a/packages/backend/src/server/api/stream/channels/server-stats.ts
+++ b/packages/backend/src/server/api/stream/channels/server-stats.ts
@@ -14,7 +14,7 @@ export default class extends Channel {
 		this.onMessage = this.onMessage.bind(this);
 	}
 
-	public async init(params: any) {
+	public async init() {
 		ev.addListener('serverStats', this.onStats);
 	}
 
diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index 1c33fde10..3776c24f2 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -485,9 +485,6 @@ router.get('/_info_card_', async ctx => {
 	});
 });
 
-const override = (source: string, target: string, depth = 0) =>
-	[, ...target.split('/').filter(x => x), ...source.split('/').filter(x => x).splice(depth)].join('/');
-
 router.get('/flush', async ctx => {
 	await ctx.render('flush');
 });
diff --git a/packages/backend/src/services/chart/charts/per-user-reactions.ts b/packages/backend/src/services/chart/charts/per-user-reactions.ts
index 6e9c12f87..27345b99d 100644
--- a/packages/backend/src/services/chart/charts/per-user-reactions.ts
+++ b/packages/backend/src/services/chart/charts/per-user-reactions.ts
@@ -13,7 +13,7 @@ export default class PerUserReactionsChart extends Chart<typeof schema> {
 		super(name, schema, true);
 	}
 
-	protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {
+	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {
 		return {};
 	}
 
diff --git a/packages/backend/src/services/create-notification.ts b/packages/backend/src/services/create-notification.ts
index bbb4ab356..30499ce4c 100644
--- a/packages/backend/src/services/create-notification.ts
+++ b/packages/backend/src/services/create-notification.ts
@@ -1,6 +1,6 @@
 import { publishMainStream } from '@/services/stream.js';
 import { pushNotification } from '@/services/push-notification.js';
-import { Notifications, Mutings, UserProfiles, Users } from '@/models/index.js';
+import { Notifications, Mutings, UserProfiles } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
 import { User } from '@/models/entities/user.js';
 import { Notification } from '@/models/entities/notification.js';
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 4b4a80733..67f5e0d57 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -656,7 +656,7 @@ async function createMentionedEvents(mentionedUsers: MinimumUser[], note: Note,
 	}
 }
 
-function saveReply(reply: Note, note: Note): void {
+function saveReply(reply: Note): void {
 	Notes.increment({ id: reply.id }, 'repliesCount', 1);
 }
 
diff --git a/packages/backend/src/services/note/delete.ts b/packages/backend/src/services/note/delete.ts
index faa079e95..6075f15b1 100644
--- a/packages/backend/src/services/note/delete.ts
+++ b/packages/backend/src/services/note/delete.ts
@@ -1,4 +1,4 @@
-import { Brackets, FindOptionsWhere, In, IsNull, Not } from 'typeorm';
+import { FindOptionsWhere, In, IsNull, Not } from 'typeorm';
 import { publishNoteStream } from '@/services/stream.js';
 import renderDelete from '@/remote/activitypub/renderer/delete.js';
 import renderAnnounce from '@/remote/activitypub/renderer/announce.js';
@@ -106,7 +106,7 @@ async function findCascadingNotes(note: Note): Promise<Note[]> {
 
 		await Promise.all(replies.map(reply => {
 			// only add unique notes
-			if (cascadingNotes.find((x) => x.id == reply.id) != null) return;
+			if (cascadingNotes.find((x) => x.id === reply.id) != null) return;
 
 			cascadingNotes.push(reply);
 			return recursive(reply.id);

From 08af6fda371bc102deacc3b037d9e4c35ad6c8fd Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 3 Jan 2023 22:18:01 +0100
Subject: [PATCH 20/56] fix some type errors

---
 packages/backend/src/boot/master.ts                    | 2 +-
 packages/backend/src/misc/check-hit-antenna.ts         | 2 +-
 packages/backend/src/misc/fetch-meta.ts                | 2 +-
 packages/backend/src/models/repositories/drive-file.ts | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index 6b1fce48c..4e5327641 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -140,7 +140,7 @@ async function connectDb(): Promise<void> {
 }
 
 async function spawnWorkers(clusterLimits: Required<Config['clusterLimits']>): Promise<void> {
-	const modes = ['web', 'queue'];
+	const modes = ['web' as const, 'queue' as const];
 	const cpus = os.cpus().length;
 	for (const mode of modes.filter(mode => clusterLimits[mode] > cpus)) {
 		bootLogger.warn(`configuration warning: cluster limit for ${mode} exceeds number of cores (${cpus})`);
diff --git a/packages/backend/src/misc/check-hit-antenna.ts b/packages/backend/src/misc/check-hit-antenna.ts
index e563d749e..7091dcd07 100644
--- a/packages/backend/src/misc/check-hit-antenna.ts
+++ b/packages/backend/src/misc/check-hit-antenna.ts
@@ -22,7 +22,7 @@ export async function checkHitAntenna(antenna: Antenna, note: (Note | Packed<'No
 	if (note.visibility === 'specified') return false;
 
 	// skip if the antenna creator is blocked by the note author
-	const blockings = await blockingCache.fetch(noteUser.id);
+	const blockings = (await blockingCache.fetch(noteUser.id)) ?? [];
 	if (blockings.some(blocking => blocking === antenna.userId)) return false;
 
 	if (note.visibility === 'followers') {
diff --git a/packages/backend/src/misc/fetch-meta.ts b/packages/backend/src/misc/fetch-meta.ts
index edd6265a8..ab8c81eef 100644
--- a/packages/backend/src/misc/fetch-meta.ts
+++ b/packages/backend/src/misc/fetch-meta.ts
@@ -57,5 +57,5 @@ export async function fetchMeta(noCache = false): Promise<Meta> {
 
 	await getMeta();
 
-	return cache;
+	return cache!;
 }
diff --git a/packages/backend/src/models/repositories/drive-file.ts b/packages/backend/src/models/repositories/drive-file.ts
index 788949d6d..f75207134 100644
--- a/packages/backend/src/models/repositories/drive-file.ts
+++ b/packages/backend/src/models/repositories/drive-file.ts
@@ -126,7 +126,7 @@ export const DriveFileRepository = db.getRepository(DriveFile).extend({
 		const file = typeof src === 'object' ? src : await this.findOneBy({ id: src });
 		if (file == null) return null;
 
-		return await this.pack(file);
+		return await this.pack(file, opts);
 	},
 
 	async packMany(

From e58c940d6fbfd4f8ef59a468bb2af86941a4923d Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Tue, 3 Jan 2023 21:53:02 -0500
Subject: [PATCH 21/56] meta: Bump copyright year

---
 COPYING | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/COPYING b/COPYING
index 40dbe8b30..658556e58 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 Unless otherwise stated this repository is
 Copyright © 2014-2022 syuilo and contributors
-Copyright © 2022 FoundKey contributors
+Copyright © 2022-2023 FoundKey contributors
 And is distributed under The GNU Affero General Public License Version 3, you should have received a copy of the license file as LICENSE.
 (You may be able to run `git shortlog -se` to see a full list of authors.)
 

From 0230f819e22a5b6d1c4c5060f41949ad87fe5040 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 4 Jan 2023 19:07:40 +0100
Subject: [PATCH 22/56] fixup: wrong negation

This is a fixup for commit 417d252e9d701f95e809ebd21a33b701bc239c0b.
---
 packages/backend/src/remote/activitypub/renderer/note.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/remote/activitypub/renderer/note.ts b/packages/backend/src/remote/activitypub/renderer/note.ts
index c097d2640..62dc9ebc4 100644
--- a/packages/backend/src/remote/activitypub/renderer/note.ts
+++ b/packages/backend/src/remote/activitypub/renderer/note.ts
@@ -27,7 +27,7 @@ export default async function renderNote(note: Note, dive = true, isTalk = false
 		if (inReplyToNote != null) {
 			const inReplyToUserExists = await Users.countBy({ id: inReplyToNote.userId });
 
-			if (!inReplyToUserExists) {
+			if (inReplyToUserExists) {
 				if (inReplyToNote.uri) {
 					inReplyTo = inReplyToNote.uri;
 				} else {

From 48f8fb97df0bc28e1235fbd6dd4146861a8e1c63 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 4 Jan 2023 20:56:06 +0100
Subject: [PATCH 23/56] activitypub: use quoteUri instead of quoteUrl

It's not quite Mastodon, but still, I said they'd use a different approach...

Changelog: Changed
---
 packages/backend/src/remote/activitypub/models/note.ts    | 4 ++--
 packages/backend/src/remote/activitypub/renderer/index.ts | 4 +++-
 packages/backend/src/remote/activitypub/renderer/note.ts  | 2 +-
 packages/backend/src/remote/activitypub/type.ts           | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index 20db3c8df..f5426da3c 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -157,7 +157,7 @@ export async function createNote(value: string | IObject, resolver: Resolver, si
 	// 引用
 	let quote: Note | undefined | null;
 
-	if (note._misskey_quote || note.quoteUrl) {
+	if (note._misskey_quote || note.quoteUri) {
 		const tryResolveNote = async (uri: string): Promise<{
 			status: 'ok';
 			res: Note | null;
@@ -184,7 +184,7 @@ export async function createNote(value: string | IObject, resolver: Resolver, si
 			}
 		};
 
-		const uris = unique([note._misskey_quote, note.quoteUrl].filter((x): x is string => typeof x === 'string'));
+		const uris = unique([note._misskey_quote, note.quoteUri].filter((x): x is string => typeof x === 'string'));
 		const results = await Promise.all(uris.map(uri => tryResolveNote(uri)));
 
 		quote = results.filter((x): x is { status: 'ok', res: Note | null } => x.status === 'ok').map(x => x.res).find(x => x);
diff --git a/packages/backend/src/remote/activitypub/renderer/index.ts b/packages/backend/src/remote/activitypub/renderer/index.ts
index bf31c2227..37e73d37b 100644
--- a/packages/backend/src/remote/activitypub/renderer/index.ts
+++ b/packages/backend/src/remote/activitypub/renderer/index.ts
@@ -21,12 +21,14 @@ export const renderActivity = (x: any): IActivity | null => {
 				manuallyApprovesFollowers: 'as:manuallyApprovesFollowers',
 				sensitive: 'as:sensitive',
 				Hashtag: 'as:Hashtag',
-				quoteUrl: 'as:quoteUrl',
 				// Mastodon
 				toot: 'http://joinmastodon.org/ns#',
 				Emoji: 'toot:Emoji',
 				featured: 'toot:featured',
 				discoverable: 'toot:discoverable',
+				// Fedibird
+				fedibird: 'http://fedibird.com/ns#',
+				quoteUri: 'fedibird:quoteUri',
 				// schema
 				schema: 'http://schema.org#',
 				PropertyValue: 'schema:PropertyValue',
diff --git a/packages/backend/src/remote/activitypub/renderer/note.ts b/packages/backend/src/remote/activitypub/renderer/note.ts
index 62dc9ebc4..0d53cfe5e 100644
--- a/packages/backend/src/remote/activitypub/renderer/note.ts
+++ b/packages/backend/src/remote/activitypub/renderer/note.ts
@@ -141,7 +141,7 @@ export default async function renderNote(note: Note, dive = true, isTalk = false
 			mediaType: 'text/x.misskeymarkdown',
 		},
 		_misskey_quote: quote,
-		quoteUrl: quote,
+		quoteUri: quote,
 		published: note.createdAt.toISOString(),
 		to,
 		cc,
diff --git a/packages/backend/src/remote/activitypub/type.ts b/packages/backend/src/remote/activitypub/type.ts
index de7eb0ed8..f5b411639 100644
--- a/packages/backend/src/remote/activitypub/type.ts
+++ b/packages/backend/src/remote/activitypub/type.ts
@@ -111,7 +111,7 @@ export interface IPost extends IObject {
 		mediaType: string;
 	};
 	_misskey_quote?: string;
-	quoteUrl?: string;
+	quoteUri?: string;
 	_misskey_talk: boolean;
 }
 
@@ -122,7 +122,7 @@ export interface IQuestion extends IObject {
 		mediaType: string;
 	};
 	_misskey_quote?: string;
-	quoteUrl?: string;
+	quoteUri?: string;
 	oneOf?: IQuestionChoice[];
 	anyOf?: IQuestionChoice[];
 	endTime?: Date;

From 3efa7046bd3d2b427d2fbbdf02ddcaf2de8cc206 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 4 Jan 2023 20:59:31 +0100
Subject: [PATCH 24/56] meta: don't type check dependencies

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

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 456e46810..cea0018e1 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -7,7 +7,7 @@
 	"scripts": {
 		"build": "tsc -p tsconfig.json || echo done. && tsc-alias -p tsconfig.json",
 		"watch": "node watch.mjs",
-		"lint": "tsc --noEmit && eslint src --ext .ts",
+		"lint": "tsc --noEmit --skipLibCheck && eslint src --ext .ts",
 		"mocha": "cross-env NODE_ENV=test TS_NODE_FILES=true TS_NODE_TRANSPILE_ONLY=true TS_NODE_PROJECT=\"./test/tsconfig.json\" mocha",
 		"migrate": "npx typeorm migration:run -d ormconfig.js",
 		"start": "node --experimental-json-modules ./built/index.js",

From 334368f6e22872a38835e5712ff4939e789a3691 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 4 Jan 2023 21:39:33 +0100
Subject: [PATCH 25/56] fix: allow to pick higher visibility than chosen before

If you selected a lower visibility that one would then be used as
the parent visibility. Instead it is necessary to use two separate
variables, one for parent and one for the preselected visibility.
---
 packages/client/src/components/post-form.vue  | 26 ++++++++++++++-----
 .../src/components/visibility-picker.vue      |  5 ++--
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/packages/client/src/components/post-form.vue b/packages/client/src/components/post-form.vue
index a22235ee3..d929d8d32 100644
--- a/packages/client/src/components/post-form.vue
+++ b/packages/client/src/components/post-form.vue
@@ -133,6 +133,11 @@ let poll = $ref<{
 let useCw = $ref(false);
 let showPreview = $ref(false);
 let cw = $ref<string | null>(null);
+
+// these define the "maximum" these parameters can be set to and will be tightened further down
+let parentLocalOnly = false;
+let parentVisibility = 'public';
+
 let localOnly = $ref<boolean>(props.initialLocalOnly ?? defaultStore.state.defaultNoteLocalOnly);
 let visibility = $ref(props.initialVisibility ?? defaultStore.state.defaultNoteVisibility as foundkey.NoteVisibility);
 let visibleUsers = $ref([]);
@@ -251,12 +256,11 @@ if (props.reply && props.reply.text != null) {
 }
 
 if (props.channel) {
-	visibility = 'public';
-	localOnly = true; // TODO: チャンネルが連合するようになった折には消す
+	parentLocalOnly = true; // TODO: remove when channels are federated
 }
 
 if (props.reply) {
-	visibility = foundkey.minVisibility(props.reply.visibility, visibility);
+	parentVisibility = foundkey.minVisibility(props.reply.visibility, parentVisibility);
 	if (props.reply.visibility === 'specified') {
 		os.api('users/show', {
 			userIds: props.reply.visibleUserIds.filter(uid => uid !== $i.id && uid !== props.reply.userId),
@@ -270,10 +274,11 @@ if (props.reply) {
 			});
 		}
 	}
+	parentLocalOnly ||= props.reply.localOnly;
 }
 
 if (props.renote) {
-	visibility = foundkey.minVisibility(props.renote.visibility, visibility);
+	parentVisibility = foundkey.minVisibility(props.renote.visibility, parentVisibility);
 	if (props.renote.visibility === 'specified') {
 		os.api('users/show', {
 			userIds: props.renote.visibleUserIds.filter(uid => uid !== $i.id && uid !== props.renote.userId),
@@ -287,13 +292,18 @@ if (props.renote) {
 			});
 		}
 	}
+	parentLocalOnly ||= props.renote.localOnly;
 }
 
 if (props.specified) {
-	visibility = 'specified';
+	parentVisibility = 'specified';
 	pushVisibleUser(props.specified);
 }
 
+// set visibility and local only defaults to minimum of preselected or allowed.
+visibility = foundkey.minVisibility(visibility, parentVisibility);
+localOnly ||= parentLocalOnly;
+
 // keep cw when reply
 if (defaultStore.state.keepCw && props.reply && props.reply.cw) {
 	useCw = true;
@@ -393,8 +403,10 @@ function setVisibility() {
 	}
 
 	os.popup(defineAsyncComponent(() => import('./visibility-picker.vue')), {
-		parentVisibility: visibility,
-		parentLocalOnly: localOnly,
+		parentVisibility,
+		parentLocalOnly,
+		currentVisibility: visibility,
+		currentLocalOnly: localOnly,
 		src: visibilityButton,
 	}, {
 		changeVisibility: v => {
diff --git a/packages/client/src/components/visibility-picker.vue b/packages/client/src/components/visibility-picker.vue
index 4321a6982..50a6ff667 100644
--- a/packages/client/src/components/visibility-picker.vue
+++ b/packages/client/src/components/visibility-picker.vue
@@ -53,6 +53,7 @@ const modal = $ref<InstanceType<typeof MkModal>>();
 const props = withDefaults(defineProps<{
 	parentVisibility: foundkey.NoteVisibility;
 	parentLocalOnly: boolean;
+	currentVisibility: foundkey.NoteVisibility;
 	currentLocalOnly: boolean;
 	src?: HTMLElement;
 }>(), {
@@ -64,8 +65,8 @@ const emit = defineEmits<{
 	(ev: 'closed'): void;
 }>();
 
-let v = $ref(props.parentVisibility);
-let localOnly = $ref(props.parentLocalOnly);
+let v = $ref(props.currentVisibility);
+let localOnly = $ref(props.currentLocalOnly);
 
 const disabled = foundkey.noteVisibilities.reduce((acc, visibility) => {
 	acc[visibility] = (visibility !== foundkey.minVisibility(visibility, props.parentVisibility));

From a0c2cf328e083713033b967ad43ad3912e32f2ac Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Thu, 5 Jan 2023 20:03:38 +0100
Subject: [PATCH 26/56] server: fix redirected fetch

Don't throw a StatusError on an intended redirect.
---
 packages/backend/src/misc/fetch.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/misc/fetch.ts b/packages/backend/src/misc/fetch.ts
index 661716e25..42eb445d9 100644
--- a/packages/backend/src/misc/fetch.ts
+++ b/packages/backend/src/misc/fetch.ts
@@ -54,7 +54,11 @@ export async function getResponse(args: { url: string, method: string, body?: st
 		signal: controller.signal,
 	});
 
-	if (!res.ok) {
+	if (
+		!res.ok
+		&&
+		// intended redirect is not an error
+		!(args.redirect != 'follow' && res.status >= 300 && res.status < 400)) {
 		throw new StatusError(`${res.status} ${res.statusText}`, res.status, res.statusText);
 	}
 

From 35e9d7f9584a9f8d9c38464697cf6dd60298acb6 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Thu, 5 Jan 2023 20:50:25 +0100
Subject: [PATCH 27/56] client: fix null i18n interpolation values

Fixed the occurence that was reported in
<https://akkoma.dev/FoundKeyGang/FoundKey/issues/317> along with a similar one.

Fixes <https://akkoma.dev/FoundKeyGang/FoundKey/issues/317>

Also changed the i18n code so this should not happen any more in the general case.
---
 packages/client/src/i18n.ts                  | 2 +-
 packages/client/src/pages/note.vue           | 2 +-
 packages/client/src/scripts/get-note-menu.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/client/src/i18n.ts b/packages/client/src/i18n.ts
index 823900677..49fb1423b 100644
--- a/packages/client/src/i18n.ts
+++ b/packages/client/src/i18n.ts
@@ -33,7 +33,7 @@ class I18n<T extends Record<string, any>> {
 		// Perform string interpolation.
 		if (args) {
 			for (const [k, v] of Object.entries(args)) {
-				str = str.replace(`{${k}}`, v.toString());
+				str = str.replace(`{${k}}`, v?.toString());
 			}
 		}
 
diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue
index 412142433..1c351c5c2 100644
--- a/packages/client/src/pages/note.vue
+++ b/packages/client/src/pages/note.vue
@@ -127,7 +127,7 @@ definePageMetadata(computed(() => note ? {
 	avatar: note.user,
 	path: `/notes/${note.id}`,
 	share: {
-		title: i18n.t('noteOf', { user: note.user.name }),
+		title: i18n.t('noteOf', { user: note.user.name || note.user.username }),
 		text: note.text,
 	},
 } : null));
diff --git a/packages/client/src/scripts/get-note-menu.ts b/packages/client/src/scripts/get-note-menu.ts
index d265285a0..57445a49a 100644
--- a/packages/client/src/scripts/get-note-menu.ts
+++ b/packages/client/src/scripts/get-note-menu.ts
@@ -183,7 +183,7 @@ export function getNoteMenu(props: {
 
 	function share(): void {
 		navigator.share({
-			title: i18n.t('noteOf', { user: appearNote.user.name }),
+			title: i18n.t('noteOf', { user: appearNote.user.name || appearNote.user.username }),
 			text: appearNote.text,
 			url: `${url}/notes/${appearNote.id}`,
 		});

From 4bb814adfc4d96ddc67819bdcee94d0bf1a344d8 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Thu, 5 Jan 2023 20:55:03 +0100
Subject: [PATCH 28/56] client: add space between endpoint and code in error
 message

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

diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts
index 5cdc2acd3..24f2659de 100644
--- a/packages/client/src/os.ts
+++ b/packages/client/src/os.ts
@@ -103,7 +103,7 @@ export const apiWithDialog = ((
 	promiseDialog(promise, null, (err) => {
 		alert({
 			type: 'error',
-			text: (err.message + '\n' + (err?.endpoint ?? '') + (err?.code ?? '')).trim(),
+			text: (err.message + '\n' + (err?.endpoint ?? '') + ' ' + (err?.code ?? '')).trim(),
 		});
 	});
 

From cdba5447e62ecee4ebda2b7c2764bf6cba5e1298 Mon Sep 17 00:00:00 2001
From: Puniko <me@absturztaube.ch>
Date: Mon, 26 Dec 2022 09:09:11 +0100
Subject: [PATCH 29/56] server: remove joins to avatar and banners in children
 endpoint

Reviewed-on: https://akkoma.dev/FoundKeyGang/FoundKey/pulls/303
---
 packages/backend/src/server/api/endpoints/notes/children.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/notes/children.ts b/packages/backend/src/server/api/endpoints/notes/children.ts
index 55ef39541..091bab766 100644
--- a/packages/backend/src/server/api/endpoints/notes/children.ts
+++ b/packages/backend/src/server/api/endpoints/notes/children.ts
@@ -56,9 +56,7 @@ export const paramDef = {
 export default define(meta, paramDef, async (ps, user) => {
 	const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
 		.andWhere('note.id IN (SELECT id FROM note_replies(:noteId, :depth, :limit))', { noteId: ps.noteId, depth: ps.depth, limit: ps.limit })
-		.innerJoinAndSelect('note.user', 'user')
-		.leftJoinAndSelect('user.avatar', 'avatar')
-		.leftJoinAndSelect('user.banner', 'banner');
+		.innerJoinAndSelect('note.user', 'user');
 
 	generateVisibilityQuery(query, user);
 	if (user) {

From 5102d0bc2efd7b9995f1d3f552b60f392f694133 Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Fri, 6 Jan 2023 02:51:44 -0500
Subject: [PATCH 30/56] chore: remove unused user_group_invite table

Based on `1558257926829-UserGroupInvite.js` but switched `up` and `down`
migrations around.

Closes #314
---
 .../1672991292018-remove-user-group-invite.js | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 packages/backend/migration/1672991292018-remove-user-group-invite.js

diff --git a/packages/backend/migration/1672991292018-remove-user-group-invite.js b/packages/backend/migration/1672991292018-remove-user-group-invite.js
new file mode 100644
index 000000000..adc5d935e
--- /dev/null
+++ b/packages/backend/migration/1672991292018-remove-user-group-invite.js
@@ -0,0 +1,23 @@
+export class removeUserGroupInvite1672991292018 {
+
+    async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "user_group_invite" DROP CONSTRAINT "FK_e10924607d058004304611a436a"`);
+        await queryRunner.query(`ALTER TABLE "user_group_invite" DROP CONSTRAINT "FK_1039988afa3bf991185b277fe03"`);
+        await queryRunner.query(`DROP INDEX "IDX_d9ecaed8c6dc43f3592c229282"`);
+        await queryRunner.query(`DROP INDEX "IDX_78787741f9010886796f2320a4"`);
+        await queryRunner.query(`DROP INDEX "IDX_e10924607d058004304611a436"`);
+        await queryRunner.query(`DROP INDEX "IDX_1039988afa3bf991185b277fe0"`);
+        await queryRunner.query(`DROP TABLE "user_group_invite"`);
+    }
+
+    async down(queryRunner) {
+		await queryRunner.query(`CREATE TABLE "user_group_invite" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "userId" character varying(32) NOT NULL, "userGroupId" character varying(32) NOT NULL, CONSTRAINT "PK_3893884af0d3a5f4d01e7921a97" PRIMARY KEY ("id"))`);
+        await queryRunner.query(`CREATE INDEX "IDX_1039988afa3bf991185b277fe0" ON "user_group_invite" ("userId") `);
+        await queryRunner.query(`CREATE INDEX "IDX_e10924607d058004304611a436" ON "user_group_invite" ("userGroupId") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_78787741f9010886796f2320a4" ON "user_group_invite" ("userId", "userGroupId") `);
+        await queryRunner.query(`CREATE UNIQUE INDEX "IDX_d9ecaed8c6dc43f3592c229282" ON "user_group_joining" ("userId", "userGroupId") `);
+        await queryRunner.query(`ALTER TABLE "user_group_invite" ADD CONSTRAINT "FK_1039988afa3bf991185b277fe03" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+        await queryRunner.query(`ALTER TABLE "user_group_invite" ADD CONSTRAINT "FK_e10924607d058004304611a436a" FOREIGN KEY ("userGroupId") REFERENCES "user_group"("id") ON DELETE CASCADE ON UPDATE NO ACTION`);
+    }
+
+}

From 8f21275dd51d1e58c983ffc68d55a8122601a70b Mon Sep 17 00:00:00 2001
From: Norm <normandy@biribiri.dev>
Date: Sat, 7 Jan 2023 01:50:25 +0000
Subject: [PATCH 31/56] roadmap: Update links to reference labels instead of
 projects

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

diff --git a/ROADMAP.md b/ROADMAP.md
index 1c64c9417..b777512a1 100644
--- a/ROADMAP.md
+++ b/ROADMAP.md
@@ -3,9 +3,9 @@ Note: this document is historical.
 Everything starting with the next section is the original "idea" document that led to the foundation of FoundKey.
 
 For the current status you should see the following:
-* The Behavioral Fixes [project](https://akkoma.dev/FoundKeyGang/FoundKey/projects/3)
-* The Technological Upkeep [project](https://akkoma.dev/FoundKeyGang/FoundKey/projects/4)
-* The Features [project](https://akkoma.dev/FoundKeyGang/FoundKey/projects/5)
+* Issues labeled with [behaviour-fix](https://akkoma.dev/FoundKeyGang/FoundKey/issues?labels=44)
+* Issues labeled with [upkeep](https://akkoma.dev/FoundKeyGang/FoundKey/issues?labels=43)
+* Issues labeled with [feature](https://akkoma.dev/FoundKeyGang/FoundKey/issues?labels=42)
 
 ## Misskey Goals
 I’ve been thinking about a community misskey fork for a while now. To some of you, this is not a surprise. Let’s talk about that.

From 8772181b6f5b0fbf4705cec0bf7fca31baf4837f Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sat, 7 Jan 2023 14:48:35 +0100
Subject: [PATCH 32/56] server: refactor remote host check to validateActor

Instead of checking that an actor is not from the local host separately,
it seems like a good idea to do it in the central place that is supposed
to validate an actor.
---
 .../src/remote/activitypub/models/person.ts   | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index ed099d03e..6704f8214 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -1,4 +1,5 @@
 import promiseLimit from 'promise-limit';
+import { Not, IsNull } from 'typeorm';
 
 import config from '@/config/index.js';
 import { registerOrFetchInstanceDoc } from '@/services/register-or-fetch-instance-doc.js';
@@ -54,6 +55,12 @@ function validateActor(x: IObject): IActor {
 		throw new Error('invalid Actor: wrong id');
 	}
 
+	// This check is security critical.
+	// Without this check, an entry could be inserted into UserPublickey for a local user.
+	if (extractDbHost(uri) === extractDbHost(config.url)) {
+		throw new StatusError('cannot resolve local user', 400, 'cannot resolve local user');
+	}
+
 	if (!(typeof x.inbox === 'string' && x.inbox.length > 0)) {
 		throw new Error('invalid Actor: wrong inbox');
 	}
@@ -83,9 +90,10 @@ function validateActor(x: IObject): IActor {
 			throw new Error('invalid Actor: publicKey.id is not a string');
 		}
 
-		const expectHost = extractDbHost(uri);
 		const publicKeyIdHost = extractDbHost(x.publicKey.id);
-		if (publicKeyIdHost !== expectHost) {
+		// This is a security critical check to not insert or change an entry of
+		// UserPublickey to point to a local key id.
+		if (extractDbHost(uri) !== extractDbHost(x.publicKey.id) {
 			throw new Error('invalid Actor: publicKey.id has different host');
 		}
 	}
@@ -104,7 +112,7 @@ export async function fetchPerson(uri: string): Promise<CacheableUser | null> {
 	const cached = uriPersonCache.get(uri);
 	if (cached) return cached;
 
-	// URIがこのサーバーを指しているならデータベースからフェッチ
+	// If the URI points to this server, fetch from database.
 	if (uri.startsWith(config.url + '/')) {
 		const id = uri.split('/').pop();
 		const u = await Users.findOneBy({ id });
@@ -128,10 +136,6 @@ export async function fetchPerson(uri: string): Promise<CacheableUser | null> {
  * Personを作成します。
  */
 export async function createPerson(value: string | IObject, resolver: Resolver): Promise<User> {
-	if (getApId(value).startsWith(config.url)) {
-		throw new StatusError('cannot resolve local user', 400, 'cannot resolve local user');
-	}
-
 	const object = await resolver.resolve(value) as any;
 
 	const person = validateActor(object);
@@ -275,13 +279,8 @@ export async function createPerson(value: string | IObject, resolver: Resolver):
 export async function updatePerson(value: IObject | string, resolver: Resolver): Promise<void> {
 	const uri = getApId(value);
 
-	// skip local URIs
-	if (uri.startsWith(config.url)) {
-		return;
-	}
-
 	// do we already know this user?
-	const exist = await Users.findOneBy({ uri }) as IRemoteUser;
+	const exist = await Users.findOneBy({ uri, host: Not(IsNull()) }) as IRemoteUser;
 
 	if (exist == null) {
 		return;

From 1eda1760d12ca6671c3f14ac6662b6433a5f8986 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sat, 7 Jan 2023 19:28:18 +0100
Subject: [PATCH 33/56] server: refactor to always use deleteAccount service

This should reduce code duplication around how deletion of an actor is
handled.
---
 packages/backend/src/models/entities/user.ts  |  9 +++++-
 .../src/queue/processors/db/delete-account.ts |  6 ++--
 .../remote/activitypub/kernel/delete/actor.ts | 15 +++------
 .../api/endpoints/admin/accounts/delete.ts    | 31 ++++---------------
 .../backend/src/services/delete-account.ts    | 22 +++++++------
 5 files changed, 34 insertions(+), 49 deletions(-)

diff --git a/packages/backend/src/models/entities/user.ts b/packages/backend/src/models/entities/user.ts
index 449debcfc..0aee4c90b 100644
--- a/packages/backend/src/models/entities/user.ts
+++ b/packages/backend/src/models/entities/user.ts
@@ -155,7 +155,14 @@ export class User {
 	})
 	public isExplorable: boolean;
 
-	// アカウントが削除されたかどうかのフラグだが、完全に削除される際は物理削除なので実質削除されるまでの「削除が進行しているかどうか」のフラグ
+	// for local users:
+	// Indicates a deletion in progress.
+	// A hard delete of the record will follow after the deletion finishes.
+	//
+	// for remote users:
+	// Indicates the user was deleted by an admin.
+	// The users' data is not deleted from the database to keep them from reappearing.
+	// A hard delete of the record may follow if we receive a matching Delete activity.
 	@Column('boolean', {
 		default: false,
 		comment: 'Whether the User is deleted.',
diff --git a/packages/backend/src/queue/processors/db/delete-account.ts b/packages/backend/src/queue/processors/db/delete-account.ts
index 96f60cfe5..84e28f25d 100644
--- a/packages/backend/src/queue/processors/db/delete-account.ts
+++ b/packages/backend/src/queue/processors/db/delete-account.ts
@@ -83,10 +83,8 @@ export async function deleteAccount(job: Bull.Job<DbUserDeleteJobData>): Promise
 		}
 	}
 
-	// soft指定されている場合は物理削除しない
-	if (job.data.soft) {
-		// nop
-	} else {
+	// No physical deletion if soft is specified.
+	if (!job.data.soft) {
 		await Users.delete(job.data.user.id);
 	}
 
diff --git a/packages/backend/src/remote/activitypub/kernel/delete/actor.ts b/packages/backend/src/remote/activitypub/kernel/delete/actor.ts
index 9467eb535..ea75a9739 100644
--- a/packages/backend/src/remote/activitypub/kernel/delete/actor.ts
+++ b/packages/backend/src/remote/activitypub/kernel/delete/actor.ts
@@ -1,7 +1,7 @@
-import { createDeleteAccountJob } from '@/queue/index.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { Users } from '@/models/index.js';
 import { apLogger } from '@/remote/activitypub/logger.js';
+import { deleteAccount } from '@/services/delete-account.js';
 
 export async function deleteActor(actor: CacheableRemoteUser, uri: string): Promise<string> {
 	apLogger.info(`Deleting the Actor: ${uri}`);
@@ -17,14 +17,9 @@ export async function deleteActor(actor: CacheableRemoteUser, uri: string): Prom
 		return 'ok: gone';
 	}
 	if (user.isDeleted) {
-		apLogger.info('skip: already deleted');
+		// the actual deletion already happened by an admin, just delete the record
+		await Users.delete(actor.id);
+	} else {
+		await deleteAccount(actor);
 	}
-
-	const job = await createDeleteAccountJob(actor);
-
-	await Users.update(actor.id, {
-		isDeleted: true,
-	});
-
-	return `ok: queued ${job.name} ${job.id}`;
 }
diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
index b8a8b0618..19e3cd604 100644
--- a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
@@ -1,8 +1,6 @@
 import { Users } from '@/models/index.js';
 import { ApiError } from '@/server/api/error.js';
-import { doPostSuspend } from '@/services/suspend-user.js';
-import { publishUserEvent } from '@/services/stream.js';
-import { createDeleteAccountJob } from '@/queue/index.js';
+import { deleteAccount } from '@/services/delete-account.js';
 import define from '../../../define.js';
 
 export const meta = {
@@ -24,7 +22,10 @@ export const paramDef = {
 
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps) => {
-	const user = await Users.findOneBy({ id: ps.userId });
+	const user = await Users.findOneBy({
+		id: ps.userId,
+		isDeleted: false,
+	});
 
 	if (user == null) {
 		throw new ApiError('NO_SUCH_USER');
@@ -34,25 +35,5 @@ export default define(meta, paramDef, async (ps) => {
 		throw new ApiError('IS_MODERATOR');
 	}
 
-	if (Users.isLocalUser(user)) {
-		// 物理削除する前にDelete activityを送信する
-		await doPostSuspend(user).catch(() => {});
-
-		createDeleteAccountJob(user, {
-			soft: false,
-		});
-	} else {
-		createDeleteAccountJob(user, {
-			soft: true, // リモートユーザーの削除は、完全にDBから物理削除してしまうと再度連合してきてアカウントが復活する可能性があるため、soft指定する
-		});
-	}
-
-	await Users.update(user.id, {
-		isDeleted: true,
-	});
-
-	if (Users.isLocalUser(user)) {
-		// Terminate streaming
-		publishUserEvent(user.id, 'terminate', {});
-	}
+	await deleteAccount(user);
 });
diff --git a/packages/backend/src/services/delete-account.ts b/packages/backend/src/services/delete-account.ts
index ed3e381c4..9c8d4c277 100644
--- a/packages/backend/src/services/delete-account.ts
+++ b/packages/backend/src/services/delete-account.ts
@@ -7,17 +7,21 @@ export async function deleteAccount(user: {
 	id: string;
 	host: string | null;
 }): Promise<void> {
-	// Send Delete activity before physical deletion
-	await doPostSuspend(user).catch(() => {});
-
-	createDeleteAccountJob(user, {
-		soft: false,
-	});
-
 	await Users.update(user.id, {
 		isDeleted: true,
 	});
 
-	// Terminate streaming
-	publishUserEvent(user.id, 'terminate', {});
+	if (Users.isLocalUser(user)) {
+		// Terminate streaming
+		publishUserEvent(user.id, 'terminate', {});
+	}
+
+	// Send Delete activity before physical deletion
+	await doPostSuspend(user).catch(() => {});
+
+	createDeleteAccountJob(user, {
+		// Deleting remote users is specified as SOFT, because if they are physically deleted
+		// from the DB completely, they may be reassociated and their accounts may be reinstated.
+		soft: Users.isLocalUser(user),
+	});
 }

From c7ab8839dc78f131827974e351bfdd534d82fae3 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sat, 7 Jan 2023 19:30:06 +0100
Subject: [PATCH 34/56] BREAKING: remove admin/delete-account, change
 admin/accounts/delete

You should use the API endpoint admin/accounts/delete.
It has the same parameter and the same behaviour.

The admin/accounts/delete endpoint now requries administrator privileges
instead of just moderator privileges.

Changelog: Removed
---
 packages/backend/src/server/api/endpoints.ts  |  2 --
 .../api/endpoints/admin/accounts/delete.ts    |  2 +-
 .../api/endpoints/admin/delete-account.ts     | 31 -------------------
 packages/client/src/pages/user-info.vue       |  2 +-
 4 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 packages/backend/src/server/api/endpoints/admin/delete-account.ts

diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index 6e69b3b11..59c4305c2 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -54,7 +54,6 @@ import * as ep___admin_unsilenceUser from './endpoints/admin/unsilence-user.js';
 import * as ep___admin_unsuspendUser from './endpoints/admin/unsuspend-user.js';
 import * as ep___admin_updateMeta from './endpoints/admin/update-meta.js';
 import * as ep___admin_vacuum from './endpoints/admin/vacuum.js';
-import * as ep___admin_deleteAccount from './endpoints/admin/delete-account.js';
 import * as ep___announcements from './endpoints/announcements.js';
 import * as ep___antennas_create from './endpoints/antennas/create.js';
 import * as ep___antennas_delete from './endpoints/antennas/delete.js';
@@ -363,7 +362,6 @@ const eps = [
 	['admin/unsuspend-user', ep___admin_unsuspendUser],
 	['admin/update-meta', ep___admin_updateMeta],
 	['admin/vacuum', ep___admin_vacuum],
-	['admin/delete-account', ep___admin_deleteAccount],
 	['announcements', ep___announcements],
 	['antennas/create', ep___antennas_create],
 	['antennas/delete', ep___antennas_delete],
diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
index 19e3cd604..4f5ea5568 100644
--- a/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/accounts/delete.ts
@@ -7,7 +7,7 @@ export const meta = {
 	tags: ['admin'],
 
 	requireCredential: true,
-	requireModerator: true,
+	requireAdmin: true,
 
 	errors: ['NO_SUCH_USER', 'IS_ADMIN', 'IS_MODERATOR'],
 } as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/delete-account.ts b/packages/backend/src/server/api/endpoints/admin/delete-account.ts
deleted file mode 100644
index 2d7ef2f23..000000000
--- a/packages/backend/src/server/api/endpoints/admin/delete-account.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Users } from '@/models/index.js';
-import { deleteAccount } from '@/services/delete-account.js';
-import define from '../../define.js';
-
-export const meta = {
-	tags: ['admin'],
-
-	requireCredential: true,
-	requireAdmin: true,
-
-	res: {
-	},
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {
-		userId: { type: 'string', format: 'misskey:id' },
-	},
-	required: ['userId'],
-} as const;
-
-// eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps) => {
-	const user = await Users.findOneByOrFail({ id: ps.userId });
-	if (user.isDeleted) {
-		return;
-	}
-
-	await deleteAccount(user);
-});
diff --git a/packages/client/src/pages/user-info.vue b/packages/client/src/pages/user-info.vue
index fa0e22b99..2a4bb1be3 100644
--- a/packages/client/src/pages/user-info.vue
+++ b/packages/client/src/pages/user-info.vue
@@ -249,7 +249,7 @@ async function deleteAccount() {
 	if (typed.canceled) return;
 
 	if (typed.result === user?.username) {
-		await os.apiWithDialog('admin/delete-account', {
+		await os.apiWithDialog('admin/accounts/delete', {
 			userId: user.id,
 		});
 	} else {

From cd26e3a35c6232f8001cf79117c1863447e8af3c Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sun, 8 Jan 2023 19:34:03 +0100
Subject: [PATCH 35/56] fixup: missing parenthesis

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

diff --git a/packages/backend/src/remote/activitypub/models/person.ts b/packages/backend/src/remote/activitypub/models/person.ts
index 6704f8214..803fd03c9 100644
--- a/packages/backend/src/remote/activitypub/models/person.ts
+++ b/packages/backend/src/remote/activitypub/models/person.ts
@@ -90,10 +90,9 @@ function validateActor(x: IObject): IActor {
 			throw new Error('invalid Actor: publicKey.id is not a string');
 		}
 
-		const publicKeyIdHost = extractDbHost(x.publicKey.id);
 		// This is a security critical check to not insert or change an entry of
 		// UserPublickey to point to a local key id.
-		if (extractDbHost(uri) !== extractDbHost(x.publicKey.id) {
+		if (extractDbHost(uri) !== extractDbHost(x.publicKey.id)) {
 			throw new Error('invalid Actor: publicKey.id has different host');
 		}
 	}

From 4fe288f17c2e416bba59e9499ecea41f89e888e2 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Fri, 30 Dec 2022 13:45:19 +0100
Subject: [PATCH 36/56] server: rewrite user status queries in SQL

---
 .../backend/src/models/repositories/user.ts   | 118 +++++++-----------
 1 file changed, 48 insertions(+), 70 deletions(-)

diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index fd308dcae..11adf43e1 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -5,7 +5,6 @@ import config from '@/config/index.js';
 import { Packed } from '@/misc/schema.js';
 import { awaitAll, Promiseable } from '@/prelude/await-all.js';
 import { populateEmojis } from '@/misc/populate-emojis.js';
-import { getAntennas } from '@/misc/antenna-cache.js';
 import { USER_ACTIVE_THRESHOLD, USER_ONLINE_THRESHOLD, HOUR } from '@/const.js';
 import { Cache } from '@/misc/cache.js';
 import { db } from '@/db/postgre.js';
@@ -126,92 +125,71 @@ export const UserRepository = db.getRepository(User).extend({
 	},
 
 	async getHasUnreadMessagingMessage(userId: User['id']): Promise<boolean> {
-		const mute = await Mutings.findBy({
-			muterId: userId,
-		});
+		return await db.query(
+			`SELECT EXISTS (
+				SELECT 1
+				FROM "messaging_message"
+				WHERE
+						"recipientId" = $1
+					AND
+						NOT "isRead"
+					AND
+						"userId" NOT IN (
+							SELECT "muteeId"
+							FROM "muting"
+							WHERE "muterId" = $1
+						)
 
-		const joinings = await UserGroupJoinings.findBy({ userId });
+				UNION
 
-		const groupQs = Promise.all(joinings.map(j => MessagingMessages.createQueryBuilder('message')
-			.where('message.groupId = :groupId', { groupId: j.userGroupId })
-			.andWhere('message.userId != :userId', { userId })
-			.andWhere('NOT (:userId = ANY(message.reads))', { userId })
-			.andWhere('message.createdAt > :joinedAt', { joinedAt: j.createdAt }) // 自分が加入する前の会話については、未読扱いしない
-			.getOne().then(x => x != null)));
-
-		const [withUser, withGroups] = await Promise.all([
-			MessagingMessages.count({
-				where: {
-					recipientId: userId,
-					isRead: false,
-					...(mute.length > 0 ? { userId: Not(In(mute.map(x => x.muteeId))) } : {}),
-				},
-				take: 1,
-			}).then(count => count > 0),
-			groupQs,
-		]);
-
-		return withUser || withGroups.some(x => x);
+				SELECT 1
+				FROM "messaging_message"
+				JOIN "user_group_joining"
+					ON "messaging_message"."groupId" = "user_group_joining"."userGroupId"
+				WHERE
+						"messaging_message"."userId" != $1
+					AND
+						NOT $1 = ANY("messaging_message"."reads")
+					AND
+						"messaging_message"."createdAt" > "user_group_joining"."createdAt"
+			) AS exists`,
+			[userId]
+		).then(res => res[0].exists);
 	},
 
 	async getHasUnreadAnnouncement(userId: User['id']): Promise<boolean> {
-		const reads = await AnnouncementReads.findBy({
-			userId,
-		});
-
-		const count = await Announcements.countBy(reads.length > 0 ? {
-			id: Not(In(reads.map(read => read.announcementId))),
-		} : {});
-
-		return count > 0;
+		return await db.query(
+			`SELECT EXISTS (SELECT 1 FROM "announcement" WHERE "id" NOT IN (SELECT "announcementId" FROM "announcement_read" WHERE "userId" = $1)) AS exists`,
+			[userId]
+		).then(res => res[0].exists);
 	},
 
 	async getHasUnreadAntenna(userId: User['id']): Promise<boolean> {
-		const myAntennas = (await getAntennas()).filter(a => a.userId === userId);
-
-		const unread = myAntennas.length > 0 ? await AntennaNotes.findOneBy({
-			antennaId: In(myAntennas.map(x => x.id)),
-			read: false,
-		}) : null;
-
-		return unread != null;
+		return await db.query(
+			`SELECT EXISTS (SELECT 1 FROM "antenna_note" WHERE NOT "read" AND "antennaId" IN (SELECT "id" FROM "antenna" WHERE "userId" = $1)) AS exists`,
+			[userId]
+		).then(res => res[0].exists);
 	},
 
 	async getHasUnreadChannel(userId: User['id']): Promise<boolean> {
-		const channels = await ChannelFollowings.findBy({ followerId: userId });
-
-		const unread = channels.length > 0 ? await NoteUnreads.findOneBy({
-			userId,
-			noteChannelId: In(channels.map(x => x.followeeId)),
-		}) : null;
-
-		return unread != null;
+		return await db.query(
+			`SELECT EXISTS (SELECT 1 FROM "note_unread" WHERE "noteChannelId" IN (SELECT "followeeId" FROM "channel_following" WHERE "followerId" = $1)) AS exists`,
+			[userId]
+		).then(res => res[0].exists);
 	},
 
 	async getHasUnreadNotification(userId: User['id']): Promise<boolean> {
-		const mute = await Mutings.findBy({
-			muterId: userId,
-		});
-		const mutedUserIds = mute.map(m => m.muteeId);
-
-		const count = await Notifications.count({
-			where: {
-				notifieeId: userId,
-				...(mutedUserIds.length > 0 ? { notifierId: Not(In(mutedUserIds)) } : {}),
-				isRead: false,
-			},
-			take: 1,
-		});
-
-		return count > 0;
+		return await db.query(
+			`SELECT EXISTS (SELECT 1 FROM "notification" WHERE NOT "isRead" AND "notifieeId" = $1 AND "notifierId" NOT IN (SELECT "muteeId" FROM "muting" WHERE "muterId" = $1)) AS exists`,
+			[userId]
+		).then(res => res[0].exists);
 	},
 
 	async getHasPendingReceivedFollowRequest(userId: User['id']): Promise<boolean> {
-		const count = await FollowRequests.countBy({
-			followeeId: userId,
-		});
-
-		return count > 0;
+		return await db.query(
+			`SELECT EXISTS (SELECT 1 FROM "follow_request" WHERE "followeeId" = $1) AS exists`,
+			[userId]
+		).then(res => res[0].exists);
 	},
 
 	getOnlineStatus(user: User): 'unknown' | 'online' | 'active' | 'offline' {

From fdf30f60e6289bddcf13ce91a4db326fcdcde102 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 9 Jan 2023 20:43:12 +0100
Subject: [PATCH 37/56] server: remove SQL boolean comparisons

---
 packages/backend/src/server/activitypub/outbox.ts    |  2 +-
 .../server/api/endpoints/admin/abuse-user-reports.ts |  4 ++--
 .../src/server/api/endpoints/admin/show-users.ts     | 12 ++++++------
 .../src/server/api/endpoints/federation/instances.ts |  8 ++++----
 .../src/server/api/endpoints/i/notifications.ts      |  2 +-
 packages/backend/src/server/api/endpoints/notes.ts   |  4 ++--
 .../src/server/api/endpoints/notes/local-timeline.ts |  2 +-
 .../src/server/api/endpoints/notes/search-by-tag.ts  |  4 ++--
 packages/backend/src/server/api/endpoints/users.ts   |  8 ++++----
 .../backend/src/server/api/endpoints/users/notes.ts  |  2 +-
 .../src/server/api/endpoints/users/recommendation.ts |  4 ++--
 .../endpoints/users/search-by-username-and-host.ts   |  8 ++++----
 .../backend/src/server/api/endpoints/users/search.ts |  6 +++---
 packages/backend/src/services/drive/add-file.ts      |  2 +-
 14 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/packages/backend/src/server/activitypub/outbox.ts b/packages/backend/src/server/activitypub/outbox.ts
index d88b6c899..60e2ab711 100644
--- a/packages/backend/src/server/activitypub/outbox.ts
+++ b/packages/backend/src/server/activitypub/outbox.ts
@@ -57,7 +57,7 @@ export default async (ctx: Router.RouterContext) => {
 				.where('note.visibility = \'public\'')
 				.orWhere('note.visibility = \'home\'');
 			}))
-			.andWhere('note.localOnly = FALSE');
+			.andWhere('NOT note.localOnly');
 
 		const notes = await query.take(limit).getMany();
 
diff --git a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts b/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts
index 1e12acac4..e2e215ed8 100644
--- a/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts
+++ b/packages/backend/src/server/api/endpoints/admin/abuse-user-reports.ts
@@ -93,8 +93,8 @@ export default define(meta, paramDef, async (ps) => {
 	const query = makePaginationQuery(AbuseUserReports.createQueryBuilder('report'), ps.sinceId, ps.untilId);
 
 	switch (ps.state) {
-		case 'resolved': query.andWhere('report.resolved = TRUE'); break;
-		case 'unresolved': query.andWhere('report.resolved = FALSE'); break;
+		case 'resolved': query.andWhere('report.resolved'); break;
+		case 'unresolved': query.andWhere('NOT report.resolved'); break;
 	}
 
 	switch (ps.reporterOrigin) {
diff --git a/packages/backend/src/server/api/endpoints/admin/show-users.ts b/packages/backend/src/server/api/endpoints/admin/show-users.ts
index c15de1402..254d76a89 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-users.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-users.ts
@@ -41,13 +41,13 @@ export default define(meta, paramDef, async (ps, me) => {
 	const query = Users.createQueryBuilder('user');
 
 	switch (ps.state) {
-		case 'available': query.where('user.isSuspended = FALSE'); break;
-		case 'admin': query.where('user.isAdmin = TRUE'); break;
-		case 'moderator': query.where('user.isModerator = TRUE'); break;
-		case 'adminOrModerator': query.where('user.isAdmin = TRUE OR user.isModerator = TRUE'); break;
+		case 'available': query.where('NOT user.isSuspended'); break;
+		case 'admin': query.where('user.isAdmin'); break;
+		case 'moderator': query.where('user.isModerator'); break;
+		case 'adminOrModerator': query.where('user.isAdmin OR user.isModerator'); break;
 		case 'alive': query.where('user.updatedAt > :date', { date: new Date(Date.now() - 5 * DAY) }); break;
-		case 'silenced': query.where('user.isSilenced = TRUE'); break;
-		case 'suspended': query.where('user.isSuspended = TRUE'); break;
+		case 'silenced': query.where('user.isSilenced'); break;
+		case 'suspended': query.where('user.isSuspended'); break;
 	}
 
 	switch (ps.origin) {
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
index 900f9480b..b9f4865fa 100644
--- a/packages/backend/src/server/api/endpoints/federation/instances.ts
+++ b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -69,17 +69,17 @@ export default define(meta, paramDef, async (ps) => {
 
 	if (typeof ps.notResponding === 'boolean') {
 		if (ps.notResponding) {
-			query.andWhere('instance.isNotResponding = TRUE');
+			query.andWhere('instance.isNotResponding');
 		} else {
-			query.andWhere('instance.isNotResponding = FALSE');
+			query.andWhere('NOT instance.isNotResponding');
 		}
 	}
 
 	if (typeof ps.suspended === 'boolean') {
 		if (ps.suspended) {
-			query.andWhere('instance.isSuspended = TRUE');
+			query.andWhere('instance.isSuspended');
 		} else {
-			query.andWhere('instance.isSuspended = FALSE');
+			query.andWhere('NOT instance.isSuspended');
 		}
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/i/notifications.ts b/packages/backend/src/server/api/endpoints/i/notifications.ts
index 4a2ccdc79..b0c4790c5 100644
--- a/packages/backend/src/server/api/endpoints/i/notifications.ts
+++ b/packages/backend/src/server/api/endpoints/i/notifications.ts
@@ -72,7 +72,7 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	const suspendedQuery = Users.createQueryBuilder('users')
 		.select('users.id')
-		.where('users.isSuspended = TRUE');
+		.where('users.isSuspended');
 
 	const query = makePaginationQuery(Notifications.createQueryBuilder('notification'), ps.sinceId, ps.untilId)
 		.andWhere('notification.notifieeId = :meId', { meId: user.id })
diff --git a/packages/backend/src/server/api/endpoints/notes.ts b/packages/backend/src/server/api/endpoints/notes.ts
index 015b0338e..b00032e27 100644
--- a/packages/backend/src/server/api/endpoints/notes.ts
+++ b/packages/backend/src/server/api/endpoints/notes.ts
@@ -35,7 +35,7 @@ export const paramDef = {
 export default define(meta, paramDef, async (ps) => {
 	const query = makePaginationQuery(Notes.createQueryBuilder('note'), ps.sinceId, ps.untilId)
 		.andWhere('note.visibility = \'public\'')
-		.andWhere('note.localOnly = FALSE')
+		.andWhere('NOT note.localOnly')
 		.innerJoinAndSelect('note.user', 'user')
 		.leftJoinAndSelect('user.avatar', 'avatar')
 		.leftJoinAndSelect('user.banner', 'banner')
@@ -65,7 +65,7 @@ export default define(meta, paramDef, async (ps) => {
 	}
 
 	if (ps.poll !== undefined) {
-		query.andWhere(ps.poll ? 'note.hasPoll = TRUE' : 'note.hasPoll = FALSE');
+		query.andWhere((ps.poll ? '' : 'NOT') + 'note.hasPoll');
 	}
 
 	// TODO
diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
index 2e13fb432..f53d1788c 100644
--- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
@@ -98,7 +98,7 @@ export default define(meta, paramDef, async (ps, user) => {
 
 		if (ps.excludeNsfw) {
 			query.andWhere('note.cw IS NULL');
-			query.andWhere('0 = (SELECT COUNT(*) FROM drive_file df WHERE df.id = ANY(note."fileIds") AND df."isSensitive" = TRUE)');
+			query.andWhere('0 = (SELECT COUNT(*) FROM drive_file df WHERE df.id = ANY(note."fileIds") AND df."isSensitive")');
 		}
 	}
 	//#endregion
diff --git a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
index ef9f6c39c..4f4711491 100644
--- a/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search-by-tag.ts
@@ -127,9 +127,9 @@ export default define(meta, paramDef, async (ps, me) => {
 
 	if (ps.poll != null) {
 		if (ps.poll) {
-			query.andWhere('note.hasPoll = TRUE');
+			query.andWhere('note.hasPoll');
 		} else {
-			query.andWhere('note.hasPoll = FALSE');
+			query.andWhere('NOT note.hasPoll');
 		}
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/users.ts b/packages/backend/src/server/api/endpoints/users.ts
index e451c3664..45708883d 100644
--- a/packages/backend/src/server/api/endpoints/users.ts
+++ b/packages/backend/src/server/api/endpoints/users.ts
@@ -41,12 +41,12 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, me) => {
 	const query = Users.createQueryBuilder('user');
-	query.where('user.isExplorable = TRUE');
+	query.where('user.isExplorable');
 
 	switch (ps.state) {
-		case 'admin': query.andWhere('user.isAdmin = TRUE'); break;
-		case 'moderator': query.andWhere('user.isModerator = TRUE'); break;
-		case 'adminOrModerator': query.andWhere('user.isAdmin = TRUE OR user.isModerator = TRUE'); break;
+		case 'admin': query.andWhere('user.isAdmin'); break;
+		case 'moderator': query.andWhere('user.isModerator'); break;
+		case 'adminOrModerator': query.andWhere('user.isAdmin OR user.isModerator'); break;
 		case 'alive': query.andWhere('user.updatedAt > :date', { date: new Date(Date.now() - 5 * DAY) }); break;
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts
index f327e07a5..dddee1907 100644
--- a/packages/backend/src/server/api/endpoints/users/notes.ts
+++ b/packages/backend/src/server/api/endpoints/users/notes.ts
@@ -90,7 +90,7 @@ export default define(meta, paramDef, async (ps, me) => {
 
 		if (ps.excludeNsfw) {
 			query.andWhere('note.cw IS NULL');
-			query.andWhere('0 = (SELECT COUNT(*) FROM drive_file df WHERE df.id = ANY(note."fileIds") AND df."isSensitive" = TRUE)');
+			query.andWhere('0 = (SELECT COUNT(*) FROM drive_file df WHERE df.id = ANY(note."fileIds") AND df."isSensitive")');
 		}
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/users/recommendation.ts b/packages/backend/src/server/api/endpoints/users/recommendation.ts
index 62449a3b6..5fe5b47b5 100644
--- a/packages/backend/src/server/api/endpoints/users/recommendation.ts
+++ b/packages/backend/src/server/api/endpoints/users/recommendation.ts
@@ -36,8 +36,8 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, me) => {
 	const query = Users.createQueryBuilder('user')
-		.where('user.isLocked = FALSE')
-		.andWhere('user.isExplorable = TRUE')
+		.where('NOT user.isLocked')
+		.andWhere('user.isExplorable')
 		.andWhere('user.host IS NULL')
 		.andWhere('user.updatedAt >= :date', { date: new Date(Date.now() - (7 * DAY)) })
 		.andWhere('user.id != :meId', { meId: me.id })
diff --git a/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts b/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts
index cbde7ef79..200e2b925 100644
--- a/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts
+++ b/packages/backend/src/server/api/endpoints/users/search-by-username-and-host.ts
@@ -44,7 +44,7 @@ export default define(meta, paramDef, async (ps, me) => {
 
 	if (ps.host) {
 		const q = Users.createQueryBuilder('user')
-			.where('user.isSuspended = FALSE')
+			.where('NOT user.isSuspended')
 			.andWhere('user.host LIKE :host', { host: ps.host.toLowerCase() + '%' });
 
 		if (ps.username) {
@@ -68,7 +68,7 @@ export default define(meta, paramDef, async (ps, me) => {
 			const query = Users.createQueryBuilder('user')
 				.where(`user.id IN (${ followingQuery.getQuery() })`)
 				.andWhere('user.id != :meId', { meId: me.id })
-				.andWhere('user.isSuspended = FALSE')
+				.andWhere('NOT user.isSuspended')
 				.andWhere('user.usernameLower LIKE :username', { username: ps.username.toLowerCase() + '%' })
 				.andWhere(new Brackets(qb => { qb
 					.where('user.updatedAt IS NULL')
@@ -86,7 +86,7 @@ export default define(meta, paramDef, async (ps, me) => {
 				const otherQuery = await Users.createQueryBuilder('user')
 					.where(`user.id NOT IN (${ followingQuery.getQuery() })`)
 					.andWhere('user.id != :meId', { meId: me.id })
-					.andWhere('user.isSuspended = FALSE')
+					.andWhere('user.isSuspended')
 					.andWhere('user.usernameLower LIKE :username', { username: ps.username.toLowerCase() + '%' })
 					.andWhere('user.updatedAt IS NOT NULL');
 
@@ -101,7 +101,7 @@ export default define(meta, paramDef, async (ps, me) => {
 			}
 		} else {
 			users = await Users.createQueryBuilder('user')
-				.where('user.isSuspended = FALSE')
+				.where('user.isSuspended')
 				.andWhere('user.usernameLower LIKE :username', { username: ps.username.toLowerCase() + '%' })
 				.andWhere('user.updatedAt IS NOT NULL')
 				.orderBy('user.updatedAt', 'DESC')
diff --git a/packages/backend/src/server/api/endpoints/users/search.ts b/packages/backend/src/server/api/endpoints/users/search.ts
index 02e58cf75..18fa10401 100644
--- a/packages/backend/src/server/api/endpoints/users/search.ts
+++ b/packages/backend/src/server/api/endpoints/users/search.ts
@@ -49,7 +49,7 @@ export default define(meta, paramDef, async (ps, me) => {
 				.where('user.updatedAt IS NULL')
 				.orWhere('user.updatedAt > :activeThreshold', { activeThreshold });
 			}))
-			.andWhere('user.isSuspended = FALSE');
+			.andWhere('NOT user.isSuspended');
 
 		if (ps.origin === 'local') {
 			usernameQuery.andWhere('user.host IS NULL');
@@ -76,7 +76,7 @@ export default define(meta, paramDef, async (ps, me) => {
 				.where('user.updatedAt IS NULL')
 				.orWhere('user.updatedAt > :activeThreshold', { activeThreshold });
 			}))
-			.andWhere('user.isSuspended = FALSE');
+			.andWhere('NOT user.isSuspended');
 
 		if (ps.origin === 'local') {
 			nameQuery.andWhere('user.host IS NULL');
@@ -109,7 +109,7 @@ export default define(meta, paramDef, async (ps, me) => {
 					.where('user.updatedAt IS NULL')
 					.orWhere('user.updatedAt > :activeThreshold', { activeThreshold });
 				}))
-				.andWhere('user.isSuspended = FALSE')
+				.andWhere('NOT user.isSuspended')
 				.setParameters(profQuery.getParameters());
 
 			users = users.concat(await query
diff --git a/packages/backend/src/services/drive/add-file.ts b/packages/backend/src/services/drive/add-file.ts
index 18bff576a..70c138965 100644
--- a/packages/backend/src/services/drive/add-file.ts
+++ b/packages/backend/src/services/drive/add-file.ts
@@ -293,7 +293,7 @@ async function upload(key: string, stream: fs.ReadStream | Buffer, _type: string
 async function deleteOldFile(user: IRemoteUser): Promise<void> {
 	const q = DriveFiles.createQueryBuilder('file')
 		.where('file.userId = :userId', { userId: user.id })
-		.andWhere('file.isLink = FALSE');
+		.andWhere('NOT file.isLink');
 
 	if (user.avatarId) {
 		q.andWhere('file.id != :avatarId', { avatarId: user.avatarId });

From 8c2b7e20b25dd5073e70afc2f3b899dbfab9aecb Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 9 Jan 2023 20:44:01 +0100
Subject: [PATCH 38/56] translating comments, cleanup

---
 packages/backend/src/services/drive/add-file.ts  |  2 +-
 .../backend/src/services/drive/delete-file.ts    | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/backend/src/services/drive/add-file.ts b/packages/backend/src/services/drive/add-file.ts
index 70c138965..81da49df8 100644
--- a/packages/backend/src/services/drive/add-file.ts
+++ b/packages/backend/src/services/drive/add-file.ts
@@ -384,7 +384,7 @@ export async function addFile({
 			if (Users.isLocalUser(user)) {
 				throw new Error('no-free-space');
 			} else {
-				// (アバターまたはバナーを含まず)最も古いファイルを削除する
+				// delete oldest file (excluding banner and avatar)
 				deleteOldFile(await Users.findOneByOrFail({ id: user.id }) as IRemoteUser);
 			}
 		}
diff --git a/packages/backend/src/services/drive/delete-file.ts b/packages/backend/src/services/drive/delete-file.ts
index 624fada32..2fe8993a8 100644
--- a/packages/backend/src/services/drive/delete-file.ts
+++ b/packages/backend/src/services/drive/delete-file.ts
@@ -64,27 +64,27 @@ export async function deleteFileSync(file: DriveFile, isExpired = false): Promis
 }
 
 async function postProcess(file: DriveFile, isExpired = false): Promise<void> {
-	// リモートファイル期限切れ削除後は直リンクにする
-	if (isExpired && file.userHost !== null && file.uri != null) {
+	// Turn into a direct link after expiring a remote file.
+	if (isExpired && file.userHost != null && file.uri != null) {
+		const id = uuid();
 		DriveFiles.update(file.id, {
 			isLink: true,
 			url: file.uri,
 			thumbnailUrl: null,
 			webpublicUrl: null,
 			storedInternal: false,
-			// ローカルプロキシ用
-			accessKey: uuid(),
-			thumbnailAccessKey: 'thumbnail-' + uuid(),
-			webpublicAccessKey: 'webpublic-' + uuid(),
+			accessKey: id,
+			thumbnailAccessKey: 'thumbnail-' + id,
+			webpublicAccessKey: 'webpublic-' + id,
 		});
 	} else {
 		DriveFiles.delete(file.id);
 	}
 
-	// 統計を更新
+	// update statistics
 	driveChart.update(file, false);
 	perUserDriveChart.update(file, false);
-	if (file.userHost !== null) {
+	if (file.userHost != null) {
 		instanceChart.updateDrive(file, false);
 	}
 }

From 57d1af1117a91bee9b50115add48b0fc36bb160b Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 10 Jan 2023 20:30:47 +0100
Subject: [PATCH 39/56] remove default export in streaming API

---
 packages/backend/src/server/api/stream/index.ts | 2 +-
 packages/backend/src/server/api/streaming.ts    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts
index f3337fbfe..c39a33c74 100644
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -17,7 +17,7 @@ import { StreamEventEmitter, StreamMessages } from './types.js';
 /**
  * Main stream connection
  */
-export default class Connection {
+export class Connection {
 	public user?: User;
 	public userProfile?: UserProfile | null;
 	public following: Set<User['id']> = new Set();
diff --git a/packages/backend/src/server/api/streaming.ts b/packages/backend/src/server/api/streaming.ts
index dff353c2e..63b731770 100644
--- a/packages/backend/src/server/api/streaming.ts
+++ b/packages/backend/src/server/api/streaming.ts
@@ -5,7 +5,7 @@ import * as websocket from 'websocket';
 
 import { subscriber as redisClient } from '@/db/redis.js';
 import { Users } from '@/models/index.js';
-import MainStreamConnection from './stream/index.js';
+import { Connection } from './stream/index.js';
 import authenticate from './authenticate.js';
 
 export const initializeStreamingServer = (server: http.Server): void => {
@@ -42,7 +42,7 @@ export const initializeStreamingServer = (server: http.Server): void => {
 
 		redisClient.on('message', onRedisMessage);
 
-		const main = new MainStreamConnection(connection, ev, user, app);
+		const main = new Connection(connection, ev, user, app);
 
 		const intervalId = user ? setInterval(() => {
 			Users.update(user.id, {

From ee2fa2e0be06e61b7b8e6bbb07ba2d4e78a2073c Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 10 Jan 2023 20:35:03 +0100
Subject: [PATCH 40/56] fixup: import

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

diff --git a/packages/backend/src/server/api/stream/channel.ts b/packages/backend/src/server/api/stream/channel.ts
index a42042d13..343c47ad8 100644
--- a/packages/backend/src/server/api/stream/channel.ts
+++ b/packages/backend/src/server/api/stream/channel.ts
@@ -2,7 +2,7 @@ import { Note } from '@/models/entities/note.js';
 import { Notes } from '@/models/index.js';
 import { Packed } from '@/misc/schema.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
-import Connection from './index.js';
+import { Connection } from './index.js';
 
 /**
  * Stream channel

From e68eeba7a6b10f0dbedcb6fb24d94e0c1466c3a1 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 11 Jan 2023 19:12:58 +0100
Subject: [PATCH 41/56] fixup: remove admin/delete-account endpoint from
 foundkey-js

This is a fixup for commit c7ab8839dc78f131827974e351bfdd534d82fae3.
---
 packages/foundkey-js/src/api.types.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/foundkey-js/src/api.types.ts b/packages/foundkey-js/src/api.types.ts
index 788c663fb..8798113a5 100644
--- a/packages/foundkey-js/src/api.types.ts
+++ b/packages/foundkey-js/src/api.types.ts
@@ -65,7 +65,6 @@ export type Endpoints = {
 	'admin/unsuspend-user': { req: TODO; res: TODO; };
 	'admin/update-meta': { req: TODO; res: TODO; };
 	'admin/vacuum': { req: TODO; res: TODO; };
-	'admin/delete-account': { req: TODO; res: TODO; };
 	'announcements': { req: { limit?: number; withUnreads?: boolean; sinceId?: Announcement['id']; untilId?: Announcement['id']; }; res: Announcement[]; };
 	'antennas/create': { req: TODO; res: Antenna; };
 	'antennas/delete': { req: { antennaId: Antenna['id']; }; res: null; };

From 624628d5829e1793ab58379d486df366b3611ade Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 11 Jan 2023 19:45:18 +0100
Subject: [PATCH 42/56] client: remove unused websocket libraries

The websocket functionality is provided by foundkey-js so there is no need to import
any websocket libraries.
---
 packages/client/package.json  | 4 ----
 packages/client/src/config.ts | 1 -
 2 files changed, 5 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 3b86bb509..3dff83429 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -72,8 +72,6 @@
 		"vue": "3.2.45",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "4.0.1",
-		"websocket": "1.0.34",
-		"ws": "8.8.0"
 	},
 	"devDependencies": {
 		"@types/escape-regexp": "0.0.1",
@@ -90,8 +88,6 @@
 		"@types/throttle-debounce": "5.0.0",
 		"@types/tinycolor2": "1.4.3",
 		"@types/uuid": "8.3.4",
-		"@types/websocket": "1.0.5",
-		"@types/ws": "8.5.3",
 		"@typescript-eslint/eslint-plugin": "^5.46.1",
 		"@typescript-eslint/parser": "^5.46.1",
 		"cross-env": "7.0.3",
diff --git a/packages/client/src/config.ts b/packages/client/src/config.ts
index c20232e7e..8fa26aa2e 100644
--- a/packages/client/src/config.ts
+++ b/packages/client/src/config.ts
@@ -5,7 +5,6 @@ export const host = address.host;
 export const hostname = address.hostname;
 export const url = address.origin;
 export const apiUrl = url + '/api';
-export const wsUrl = url.replace('http://', 'ws://').replace('https://', 'wss://') + '/streaming';
 export const lang = localStorage.getItem('lang');
 export const langs = _LANGS_;
 export const locale = JSON.parse(localStorage.getItem('locale'));

From 5e2a9224f3b2e3eebd5218f6a1d95846227c2575 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 11 Jan 2023 19:50:29 +0100
Subject: [PATCH 43/56] add "fungus" as alias to emoji list

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

diff --git a/packages/client/src/emojilist.json b/packages/client/src/emojilist.json
index daa1e934b..1083ab595 100644
--- a/packages/client/src/emojilist.json
+++ b/packages/client/src/emojilist.json
@@ -619,7 +619,7 @@
 	{ "category": "animals_and_nature", "char": "🌼", "name": "blossom", "keywords": ["nature", "yellow", "flowers"] },
 	{ "category": "animals_and_nature", "char": "🌸", "name": "cherry_blossom", "keywords": ["plant", "flower", "nature", "spring"] },
 	{ "category": "animals_and_nature", "char": "💐", "name": "bouquet", "keywords": ["nature", "spring", "flowers"] },
-	{ "category": "animals_and_nature", "char": "🍄", "name": "mushroom", "keywords": ["plant", "vegetable"] },
+	{ "category": "animals_and_nature", "char": "🍄", "name": "mushroom", "keywords": ["plant", "vegetable", "fungus"] },
 	{ "category": "animals_and_nature", "char": "🪴", "name": "potted_plant", "keywords": ["plant"] },
 	{ "category": "animals_and_nature", "char": "🌰", "name": "chestnut", "keywords": ["food", "squirrel"] },
 	{ "category": "animals_and_nature", "char": "🎃", "name": "jack_o_lantern", "keywords": ["fall", "light", "creepy", "pumpkin", "halloween"] },

From 14b48fb07c4a80cba15a50beb6c4da7e89d889ef Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 11 Jan 2023 20:31:55 +0100
Subject: [PATCH 44/56] client: remove unused dependencies

---
 packages/client/package.json | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 3dff83429..91bab3431 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -15,7 +15,6 @@
 		"@rollup/pluginutils": "^4.2.1",
 		"@syuilo/aiscript": "0.11.1",
 		"@vitejs/plugin-vue": "^3.1.0",
-		"abort-controller": "3.0.0",
 		"autobind-decorator": "2.4.0",
 		"autosize": "5.0.1",
 		"blurhash": "1.1.5",
@@ -26,12 +25,9 @@
 		"chartjs-plugin-gradient": "0.5.0",
 		"chartjs-plugin-zoom": "1.2.1",
 		"compare-versions": "4.1.3",
-		"content-disposition": "0.5.4",
 		"cropperjs": "2.0.0-beta.1",
 		"date-fns": "2.28.0",
-		"escape-regexp": "0.0.1",
 		"eventemitter3": "4.0.7",
-		"feed": "4.2.2",
 		"foundkey-js": "workspace:*",
 		"idb-keyval": "6.2.0",
 		"insert-text-at-cursor": "0.3.0",
@@ -39,52 +35,29 @@
 		"katex": "0.16.0",
 		"matter-js": "0.18.0",
 		"mfm-js": "0.22.1",
-		"mocha": "10.0.0",
-		"ms": "2.1.3",
-		"nested-property": "4.0.0",
 		"photoswipe": "5.2.8",
 		"prismjs": "1.28.0",
-		"private-ip": "2.3.3",
-		"promise-limit": "2.7.0",
-		"pug": "3.0.2",
 		"punycode": "2.1.1",
-		"qrcode": "1.5.1",
-		"reflect-metadata": "0.1.13",
-		"rollup": "2.75.7",
 		"sass": "1.53.0",
-		"seedrandom": "3.0.5",
-		"strict-event-emitter-types": "2.0.0",
 		"stringz": "2.1.0",
 		"syuilo-password-strength": "0.0.1",
 		"talisman": "^1.1.4",
 		"textarea-caret": "3.1.0",
-		"three": "0.142.0",
 		"throttle-debounce": "5.0.0",
 		"tinycolor2": "1.4.2",
 		"tsc-alias": "1.7.0",
 		"tsconfig-paths": "4.1.0",
-		"twemoji-parser": "14.0.0",
 		"typescript": "^4.9.4",
 		"uuid": "8.3.2",
-		"v-debounce": "0.1.2",
-		"vanilla-tilt": "1.7.2",
 		"vite": "3.1.0",
 		"vue": "3.2.45",
 		"vue-prism-editor": "2.0.0-alpha.2",
 		"vuedraggable": "4.0.1",
 	},
 	"devDependencies": {
-		"@types/escape-regexp": "0.0.1",
-		"@types/glob": "7.2.0",
-		"@types/gulp": "4.0.9",
-		"@types/gulp-rename": "2.0.1",
-		"@types/is-url": "1.2.30",
 		"@types/katex": "0.14.0",
 		"@types/matter-js": "0.17.7",
-		"@types/mocha": "9.1.1",
 		"@types/punycode": "2.1.0",
-		"@types/qrcode": "1.5.0",
-		"@types/seedrandom": "3.0.2",
 		"@types/throttle-debounce": "5.0.0",
 		"@types/tinycolor2": "1.4.3",
 		"@types/uuid": "8.3.4",
@@ -95,6 +68,5 @@
 		"eslint": "^8.29.0",
 		"eslint-plugin-import": "^2.26.0",
 		"eslint-plugin-vue": "^9.8.0",
-		"start-server-and-test": "1.14.0"
 	}
 }

From 80e28513781d63fe23d3d4392698f4a429f1874b Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 11 Jan 2023 20:58:38 +0100
Subject: [PATCH 45/56] fixup: remove trailing comma in JSON

---
 packages/client/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/client/package.json b/packages/client/package.json
index 91bab3431..44aa9a9c9 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -52,7 +52,7 @@
 		"vite": "3.1.0",
 		"vue": "3.2.45",
 		"vue-prism-editor": "2.0.0-alpha.2",
-		"vuedraggable": "4.0.1",
+		"vuedraggable": "4.0.1"
 	},
 	"devDependencies": {
 		"@types/katex": "0.14.0",
@@ -67,6 +67,6 @@
 		"cypress": "10.3.0",
 		"eslint": "^8.29.0",
 		"eslint-plugin-import": "^2.26.0",
-		"eslint-plugin-vue": "^9.8.0",
+		"eslint-plugin-vue": "^9.8.0"
 	}
 }

From 1319dc93d9df09715253c90ec086200fa0fd7cc9 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 11 Jan 2023 22:16:01 +0100
Subject: [PATCH 46/56] server: switch websocket to ws

---
 packages/backend/package.json                 |  2 -
 .../backend/src/server/api/stream/index.ts    | 72 ++++++++------
 packages/backend/src/server/api/streaming.ts  | 94 ++++++++++---------
 3 files changed, 91 insertions(+), 77 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index cea0018e1..5d4eca072 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -113,7 +113,6 @@
 		"unzipper": "0.10.11",
 		"uuid": "8.3.2",
 		"web-push": "3.5.0",
-		"websocket": "1.0.34",
 		"ws": "8.8.0",
 		"xev": "3.0.2"
 	},
@@ -164,7 +163,6 @@
 		"@types/tmp": "0.2.3",
 		"@types/uuid": "8.3.4",
 		"@types/web-push": "3.3.2",
-		"@types/websocket": "1.0.5",
 		"@types/ws": "8.5.3",
 		"@typescript-eslint/eslint-plugin": "^5.46.1",
 		"@typescript-eslint/parser": "^5.46.1",
diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts
index c39a33c74..145c318fa 100644
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -1,5 +1,5 @@
 import { EventEmitter } from 'events';
-import * as websocket from 'websocket';
+import { WebSocket } from 'ws';
 import { readNote } from '@/services/note/read.js';
 import { User } from '@/models/entities/user.js';
 import { Channel as ChannelModel } from '@/models/entities/channel.js';
@@ -26,29 +26,29 @@ export class Connection {
 	public blocking: Set<User['id']> = new Set(); // "被"blocking
 	public followingChannels: Set<ChannelModel['id']> = new Set();
 	public token?: AccessToken;
-	private wsConnection: websocket.connection;
+	private socket: WebSocket;
 	public subscriber: StreamEventEmitter;
 	private channels: Channel[] = [];
 	private subscribingNotes: any = {};
 	private cachedNotes: Packed<'Note'>[] = [];
 
 	constructor(
-		wsConnection: websocket.connection,
+		socket: WebSocket,
 		subscriber: EventEmitter,
 		user: User | null | undefined,
 		token: AccessToken | null | undefined,
 	) {
-		this.wsConnection = wsConnection;
+		this.socket = socket;
 		this.subscriber = subscriber;
 		if (user) this.user = user;
 		if (token) this.token = token;
 
-		this.onWsConnectionMessage = this.onWsConnectionMessage.bind(this);
+		this.onMessage = this.onMessage.bind(this);
 		this.onUserEvent = this.onUserEvent.bind(this);
 		this.onNoteStreamMessage = this.onNoteStreamMessage.bind(this);
 		this.onBroadcastMessage = this.onBroadcastMessage.bind(this);
 
-		this.wsConnection.on('message', this.onWsConnectionMessage);
+		this.socket.on('message', this.onMessage);
 
 		this.subscriber.on('broadcast', data => {
 			this.onBroadcastMessage(data);
@@ -113,7 +113,7 @@ export class Connection {
 				break;
 
 			case 'terminate':
-				this.wsConnection.close();
+				this.socket.close();
 				this.dispose();
 				break;
 
@@ -122,12 +122,8 @@ export class Connection {
 		}
 	}
 
-	/**
-	 * クライアントからメッセージ受信時
-	 */
-	private async onWsConnectionMessage(data: websocket.Message) {
-		if (data.type !== 'utf8') return;
-		if (data.utf8Data == null) return;
+	private async onMessage(data: WebSocket.RawData, isRaw: boolean) {
+		if (data.isRaw) return;
 
 		let obj: Record<string, any>;
 
@@ -140,22 +136,40 @@ export class Connection {
 		const { type, body } = obj;
 
 		switch (type) {
-			case 'readNotification': this.onReadNotification(body); break;
-			case 'subNote': this.onSubscribeNote(body); break;
-			case 's': this.onSubscribeNote(body); break; // alias
-			case 'sr': this.onSubscribeNote(body); this.readNote(body); break;
-			case 'unsubNote': this.onUnsubscribeNote(body); break;
-			case 'un': this.onUnsubscribeNote(body); break; // alias
-			case 'connect': this.onChannelConnectRequested(body); break;
-			case 'disconnect': this.onChannelDisconnectRequested(body); break;
-			case 'channel': this.onChannelMessageRequested(body); break;
-			case 'ch': this.onChannelMessageRequested(body); break; // alias
+			case 'readNotification':
+				this.onReadNotification(body);
+				break;
+			case 'subNote': case 's':
+				this.onSubscribeNote(body);
+				break;
+			case 'sr':
+				this.onSubscribeNote(body);
+				this.readNote(body);
+				break;
+			case 'unsubNote': case 'un':
+				this.onUnsubscribeNote(body);
+				break;
+			case 'connect':
+				this.onChannelConnectRequested(body);
+				break;
+			case 'disconnect':
+				this.onChannelDisconnectRequested(body);
+				break;
+			case 'channel': case 'ch':
+				this.onChannelMessageRequested(body);
+				break;
 
-			// 個々のチャンネルではなくルートレベルでこれらのメッセージを受け取る理由は、
-			// クライアントの事情を考慮したとき、入力フォームはノートチャンネルやメッセージのメインコンポーネントとは別
-			// なこともあるため、それらのコンポーネントがそれぞれ各チャンネルに接続するようにするのは面倒なため。
-			case 'typingOnChannel': this.typingOnChannel(body.channel); break;
-			case 'typingOnMessaging': this.typingOnMessaging(body); break;
+			// The reason for receiving these messages at the root level rather than in
+			// individual channels is that when considering the client's circumstances, the
+			// input form may be separate from the main components of the note channel or
+			// message, and it would be cumbersome to have each of those components connect to
+			// each channel.
+			case 'typingOnChannel':
+				this.typingOnChannel(body.channel);
+				break;
+			case 'typingOnMessaging':
+				this.typingOnMessaging(body);
+				break;
 		}
 	}
 
@@ -259,7 +273,7 @@ export class Connection {
 	 * クライアントにメッセージ送信
 	 */
 	public sendMessageToWs(type: string, payload: any) {
-		this.wsConnection.send(JSON.stringify({
+		this.socket.send(JSON.stringify({
 			type,
 			body: payload,
 		}));
diff --git a/packages/backend/src/server/api/streaming.ts b/packages/backend/src/server/api/streaming.ts
index 63b731770..825896b56 100644
--- a/packages/backend/src/server/api/streaming.ts
+++ b/packages/backend/src/server/api/streaming.ts
@@ -1,8 +1,8 @@
 import { EventEmitter } from 'events';
-import { ParsedUrlQuery } from 'querystring';
 import * as http from 'node:http';
-import * as websocket from 'websocket';
+import { WebSocketServer } from 'ws';
 
+import { MINUTE } from '@/const.js';
 import { subscriber as redisClient } from '@/db/redis.js';
 import { Users } from '@/models/index.js';
 import { Connection } from './stream/index.js';
@@ -10,62 +10,64 @@ import authenticate from './authenticate.js';
 
 export const initializeStreamingServer = (server: http.Server): void => {
 	// Init websocket server
-	const ws = new websocket.server({
-		httpServer: server,
-	});
+	const ws = new WebSocketServer({ noServer: true });
 
-	ws.on('request', async (request): Promise<void> => {
-		const q = request.resourceURL.query as ParsedUrlQuery;
+	server.on('upgrade', async (request, socket, head)=> {
+		if (!request.url.startsWith('/streaming?')) {
+			socket.write('HTTP/1.1 400 Bad Request\r\n\r\n', undefined, () => socket.destroy());
+			return;
+		}
+		const q = new URLSearchParams(request.url.slice(11));
 
-		const [user, app] = await authenticate(request.httpRequest.headers.authorization, q.i)
+		const [user, app] = await authenticate(request.headers.authorization, q.get('i'))
 			.catch(err => {
-				request.reject(403, err.message);
+				socket.write('HTTP/1.1 401 Unauthorized\r\n\r\n', undefined, () => socket.destroy());
 				return [];
 			});
-		if (typeof user === 'undefined') {
-			return;
-		}
+		if (typeof user === 'undefined') return;
 
 		if (user?.isSuspended) {
-			request.reject(400);
+			socket.write('HTTP/1.1 403 Forbidden\r\n\r\n', undefined, () => socket.destroy());
 			return;
 		}
 
-		const connection = request.accept();
+		ws.handleUpgrade(request, socket, head, (socket) => {
+			const ev = new EventEmitter();
 
-		const ev = new EventEmitter();
-
-		async function onRedisMessage(_: string, data: string) {
-			const parsed = JSON.parse(data);
-			ev.emit(parsed.channel, parsed.message);
-		}
-
-		redisClient.on('message', onRedisMessage);
-
-		const main = new Connection(connection, ev, user, app);
-
-		const intervalId = user ? setInterval(() => {
-			Users.update(user.id, {
-				lastActiveDate: new Date(),
-			});
-		}, 1000 * 60 * 5) : null;
-		if (user) {
-			Users.update(user.id, {
-				lastActiveDate: new Date(),
-			});
-		}
-
-		connection.once('close', () => {
-			ev.removeAllListeners();
-			main.dispose();
-			redisClient.off('message', onRedisMessage);
-			if (intervalId) clearInterval(intervalId);
-		});
-
-		connection.on('message', async (data) => {
-			if (data.type === 'utf8' && data.utf8Data === 'ping') {
-				connection.send('pong');
+			async function onRedisMessage(_: string, data: string) {
+				const parsed = JSON.parse(data);
+				ev.emit(parsed.channel, parsed.message);
 			}
+
+			redisClient.on('message', onRedisMessage);
+
+			const main = new Connection(socket, ev, user, app);
+
+			// keep user "online" while a stream is connected
+			const intervalId = user ? setInterval(() => {
+				Users.update(user.id, {
+					lastActiveDate: new Date(),
+				});
+			}, 5 * MINUTE) : null;
+			if (user) {
+				Users.update(user.id, {
+					lastActiveDate: new Date(),
+				});
+			}
+			socket.once('close', () => {
+				ev.removeAllListeners();
+				main.dispose();
+				redisClient.off('message', onRedisMessage);
+				if (intervalId) clearInterval(intervalId);
+			});
+
+			// ping/pong mechanism
+			// TODO: the websocket protocol already specifies a ping/pong mechanism, why is this necessary?
+			socket.on('message', async (data) => {
+				if (data.type === 'utf8' && data.utf8Data === 'ping') {
+					socket.send('pong');
+				}
+			});
 		});
 	});
 };

From b8963a0119043cbe748d30424d161b285cf912f2 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Thu, 12 Jan 2023 19:27:16 +0100
Subject: [PATCH 47/56] update yarn.lock

---
 yarn.lock | 147 ------------------------------------------------------
 1 file changed, 147 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 59db1a65d..ae981623b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1853,16 +1853,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/glob@npm:7.2.0":
-  version: 7.2.0
-  resolution: "@types/glob@npm:7.2.0"
-  dependencies:
-    "@types/minimatch": "*"
-    "@types/node": "*"
-  checksum: 6ae717fedfdfdad25f3d5a568323926c64f52ef35897bcac8aca8e19bc50c0bd84630bbd063e5d52078b2137d8e7d3c26eabebd1a2f03ff350fff8a91e79fc19
-  languageName: node
-  linkType: hard
-
 "@types/graceful-fs@npm:^4.1.2":
   version: 4.1.5
   resolution: "@types/graceful-fs@npm:4.1.5"
@@ -2374,13 +2364,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/seedrandom@npm:3.0.2":
-  version: 3.0.2
-  resolution: "@types/seedrandom@npm:3.0.2"
-  checksum: 02e585601cb9764cb0eb3f92b384512f8e171422acea3d5a801a41a8a06d475b60ae520eba469bcedf0ed8ad650415919cf30a9cd6bc57090613e61bedc071ed
-  languageName: node
-  linkType: hard
-
 "@types/semver@npm:7.3.12":
   version: 7.3.12
   resolution: "@types/semver@npm:7.3.12"
@@ -2548,15 +2531,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/websocket@npm:1.0.5":
-  version: 1.0.5
-  resolution: "@types/websocket@npm:1.0.5"
-  dependencies:
-    "@types/node": "*"
-  checksum: 41c7a620f877a0165ff36e713455d888b7f5df9c51e71b5d0f47994f98cf22ccd339b8c6cfdc6bb417e950d40f405693974d393bd916971490553cc5e9e67a9d
-  languageName: node
-  linkType: hard
-
 "@types/ws@npm:8.5.3":
   version: 8.5.3
   resolution: "@types/ws@npm:8.5.3"
@@ -3740,7 +3714,6 @@ __metadata:
     "@types/tmp": 0.2.3
     "@types/uuid": 8.3.4
     "@types/web-push": 3.3.2
-    "@types/websocket": 1.0.5
     "@types/ws": 8.5.3
     "@typescript-eslint/eslint-plugin": ^5.46.1
     "@typescript-eslint/parser": ^5.46.1
@@ -3840,7 +3813,6 @@ __metadata:
     unzipper: 0.10.11
     uuid: 8.3.2
     web-push: 3.5.0
-    websocket: 1.0.34
     ws: 8.8.0
     xev: 3.0.2
   languageName: unknown
@@ -4202,16 +4174,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bufferutil@npm:^4.0.1":
-  version: 4.0.6
-  resolution: "bufferutil@npm:4.0.6"
-  dependencies:
-    node-gyp: latest
-    node-gyp-build: ^4.3.0
-  checksum: dd107560947445280af7820c3d0534127b911577d85d537e1d7e0aa30fd634853cef8a994d6e8aed3d81388ab1a20257de776164afe6a6af8e78f5f17968ebd6
-  languageName: node
-  linkType: hard
-
 "bull@npm:4.8.4":
   version: 4.8.4
   resolution: "bull@npm:4.8.4"
@@ -4741,26 +4703,15 @@ __metadata:
     "@rollup/plugin-json": 4.1.0
     "@rollup/pluginutils": ^4.2.1
     "@syuilo/aiscript": 0.11.1
-    "@types/escape-regexp": 0.0.1
-    "@types/glob": 7.2.0
-    "@types/gulp": 4.0.9
-    "@types/gulp-rename": 2.0.1
-    "@types/is-url": 1.2.30
     "@types/katex": 0.14.0
     "@types/matter-js": 0.17.7
-    "@types/mocha": 9.1.1
     "@types/punycode": 2.1.0
-    "@types/qrcode": 1.5.0
-    "@types/seedrandom": 3.0.2
     "@types/throttle-debounce": 5.0.0
     "@types/tinycolor2": 1.4.3
     "@types/uuid": 8.3.4
-    "@types/websocket": 1.0.5
-    "@types/ws": 8.5.3
     "@typescript-eslint/eslint-plugin": ^5.46.1
     "@typescript-eslint/parser": ^5.46.1
     "@vitejs/plugin-vue": ^3.1.0
-    abort-controller: 3.0.0
     autobind-decorator: 2.4.0
     autosize: 5.0.1
     blurhash: 1.1.5
@@ -4771,17 +4722,14 @@ __metadata:
     chartjs-plugin-gradient: 0.5.0
     chartjs-plugin-zoom: 1.2.1
     compare-versions: 4.1.3
-    content-disposition: 0.5.4
     cropperjs: 2.0.0-beta.1
     cross-env: 7.0.3
     cypress: 10.3.0
     date-fns: 2.28.0
-    escape-regexp: 0.0.1
     eslint: ^8.29.0
     eslint-plugin-import: ^2.26.0
     eslint-plugin-vue: ^9.8.0
     eventemitter3: 4.0.7
-    feed: 4.2.2
     foundkey-js: "workspace:*"
     idb-keyval: 6.2.0
     insert-text-at-cursor: 0.3.0
@@ -4789,42 +4737,24 @@ __metadata:
     katex: 0.16.0
     matter-js: 0.18.0
     mfm-js: 0.22.1
-    mocha: 10.0.0
-    ms: 2.1.3
-    nested-property: 4.0.0
     photoswipe: 5.2.8
     prismjs: 1.28.0
-    private-ip: 2.3.3
-    promise-limit: 2.7.0
-    pug: 3.0.2
     punycode: 2.1.1
-    qrcode: 1.5.1
-    reflect-metadata: 0.1.13
-    rollup: 2.75.7
     sass: 1.53.0
-    seedrandom: 3.0.5
-    start-server-and-test: 1.14.0
-    strict-event-emitter-types: 2.0.0
     stringz: 2.1.0
     syuilo-password-strength: 0.0.1
     talisman: ^1.1.4
     textarea-caret: 3.1.0
-    three: 0.142.0
     throttle-debounce: 5.0.0
     tinycolor2: 1.4.2
     tsc-alias: 1.7.0
     tsconfig-paths: 4.1.0
-    twemoji-parser: 14.0.0
     typescript: ^4.9.4
     uuid: 8.3.2
-    v-debounce: 0.1.2
-    vanilla-tilt: 1.7.2
     vite: 3.1.0
     vue: 3.2.45
     vue-prism-editor: 2.0.0-alpha.2
     vuedraggable: 4.0.1
-    websocket: 1.0.34
-    ws: 8.8.0
   languageName: unknown
   linkType: soft
 
@@ -12445,17 +12375,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-gyp-build@npm:^4.3.0":
-  version: 4.5.0
-  resolution: "node-gyp-build@npm:4.5.0"
-  bin:
-    node-gyp-build: bin.js
-    node-gyp-build-optional: optional.js
-    node-gyp-build-test: build-test.js
-  checksum: d888bae0fb88335f69af1b57a2294a931c5042f36e413d8d364c992c9ebfa0b96ffe773179a5a2c8f04b73856e8634e09cce108dbb9804396d3cc8c5455ff2db
-  languageName: node
-  linkType: hard
-
 "node-gyp@npm:^9.3.0":
   version: 9.3.0
   resolution: "node-gyp@npm:9.3.0"
@@ -15048,20 +14967,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rollup@npm:2.75.7":
-  version: 2.75.7
-  resolution: "rollup@npm:2.75.7"
-  dependencies:
-    fsevents: ~2.3.2
-  dependenciesMeta:
-    fsevents:
-      optional: true
-  bin:
-    rollup: dist/bin/rollup
-  checksum: a6331d46b01062b184efdcb42ce12caf2e1575f989963944534b02f5855f6f3bc239ed0c1a18893572d7695af6d83166f3aef59dbd0365084e1531cb67824674
-  languageName: node
-  linkType: hard
-
 "rollup@npm:~2.78.0":
   version: 2.78.1
   resolution: "rollup@npm:2.78.1"
@@ -16402,13 +16307,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"three@npm:0.142.0":
-  version: 0.142.0
-  resolution: "three@npm:0.142.0"
-  checksum: b920987cab222bea5fd657a498f8203546c6b613cee01d2e1a355c7e044204bbff6ef051641b026743a6d3d5261a988c84285039a94e4c94a959f1b3789ac682
-  languageName: node
-  linkType: hard
-
 "throat@npm:^6.0.1":
   version: 6.0.1
   resolution: "throat@npm:6.0.1"
@@ -17327,16 +17225,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"utf-8-validate@npm:^5.0.2":
-  version: 5.0.9
-  resolution: "utf-8-validate@npm:5.0.9"
-  dependencies:
-    node-gyp: latest
-    node-gyp-build: ^4.3.0
-  checksum: 90117f1b65e0a1256c83dfad529983617263b622f2379745311d0438c7ea31db0d134ebd0dca84c3f5847a3560a3d249644e478a9109c616f63c7ea19cac53dc
-  languageName: node
-  linkType: hard
-
 "util-deprecate@npm:^1.0.1, util-deprecate@npm:^1.0.2, util-deprecate@npm:~1.0.1":
   version: 1.0.2
   resolution: "util-deprecate@npm:1.0.2"
@@ -17371,13 +17259,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"v-debounce@npm:0.1.2":
-  version: 0.1.2
-  resolution: "v-debounce@npm:0.1.2"
-  checksum: 58428fb783581854a46acbeb1cf14beaddf51467a1cac2b4fd2053f32e6243e6ca8ff6948eca1b8ce82b849dadf12695a21b8bb3062fecbed0db812c14c0a983
-  languageName: node
-  linkType: hard
-
 "v8-compile-cache-lib@npm:^3.0.1":
   version: 3.0.1
   resolution: "v8-compile-cache-lib@npm:3.0.1"
@@ -17429,13 +17310,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vanilla-tilt@npm:1.7.2":
-  version: 1.7.2
-  resolution: "vanilla-tilt@npm:1.7.2"
-  checksum: 6909bae39a32f7fa707f848468d0bd914020dd38931821f2ce7e1f0b546a123ebd76c64fec7398b351021cf72508bb7d8af5627c92435bec5892827f62127c67
-  languageName: node
-  linkType: hard
-
 "vary@npm:^1.1.2":
   version: 1.1.2
   resolution: "vary@npm:1.1.2"
@@ -17715,20 +17589,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"websocket@npm:1.0.34":
-  version: 1.0.34
-  resolution: "websocket@npm:1.0.34"
-  dependencies:
-    bufferutil: ^4.0.1
-    debug: ^2.2.0
-    es5-ext: ^0.10.50
-    typedarray-to-buffer: ^3.1.5
-    utf-8-validate: ^5.0.2
-    yaeti: ^0.0.6
-  checksum: 8a0ce6d79cc1334bb6ea0d607f0092f3d32700b4dd19e4d5540f2a85f3b50e1f8110da0e4716737056584dde70bbebcb40bbd94bbb437d7468c71abfbfa077d8
-  languageName: node
-  linkType: hard
-
 "whatwg-encoding@npm:^1.0.5":
   version: 1.0.5
   resolution: "whatwg-encoding@npm:1.0.5"
@@ -18080,13 +17940,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"yaeti@npm:^0.0.6":
-  version: 0.0.6
-  resolution: "yaeti@npm:0.0.6"
-  checksum: 6db12c152f7c363b80071086a3ebf5032e03332604eeda988872be50d6c8469e1f13316175544fa320f72edad696c2d83843ad0ff370659045c1a68bcecfcfea
-  languageName: node
-  linkType: hard
-
 "yallist@npm:4.0.0, yallist@npm:^4.0.0":
   version: 4.0.0
   resolution: "yallist@npm:4.0.0"

From 2a8792fe07dae55c595b453224d21ea12227c29d Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Thu, 12 Jan 2023 19:40:36 +0100
Subject: [PATCH 48/56] client: add button to delete all files for moderators

The functionality was already there, there was just no button to access it
for some reason.

closes https://akkoma.dev/FoundKeyGang/FoundKey/issues/243

Changelog: Added
---
 locales/en-US.yml                       | 1 +
 packages/client/src/pages/user-info.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 76de90250..45d6af9bf 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -501,6 +501,7 @@ scratchpadDescription: "The Scratchpad provides an environment for AiScript expe
   \ in it."
 output: "Output"
 updateRemoteUser: "Update remote user information"
+deleteAllFiles: "Delete all files"
 deleteAllFilesConfirm: "Are you sure that you want to delete all files?"
 removeAllFollowing: "Unfollow all followed users"
 removeAllFollowingDescription: "Executing this unfollows all accounts from {host}.\
diff --git a/packages/client/src/pages/user-info.vue b/packages/client/src/pages/user-info.vue
index 2a4bb1be3..6196485be 100644
--- a/packages/client/src/pages/user-info.vue
+++ b/packages/client/src/pages/user-info.vue
@@ -37,6 +37,7 @@
 					{{ i18n.ts.reflectMayTakeTime }}
 					<div class="_formBlock">
 						<MkButton v-if="user.host == null && iAmModerator" inline style="margin-right: 8px;" @click="resetPassword"><i class="fas fa-key"></i> {{ i18n.ts.resetPassword }}</MkButton>
+						<MkButton inline danger @click="deleteAllFiles">{{ i18n.ts.deleteAllFiles }}</MkButton>
 						<MkButton v-if="$i.isAdmin" inline danger @click="deleteAccount">{{ i18n.ts.deleteAccount }}</MkButton>
 					</div>
 				</FormSection>

From f9c360d59f09051bb1c03031cb3ba9a890c5965e Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Thu, 12 Jan 2023 20:09:24 +0100
Subject: [PATCH 49/56] client: remove duplicated check

Since the enclosing block already checks for moderator, this check is unnecessary.
---
 packages/client/src/pages/user-info.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/pages/user-info.vue b/packages/client/src/pages/user-info.vue
index 6196485be..cce7f2efa 100644
--- a/packages/client/src/pages/user-info.vue
+++ b/packages/client/src/pages/user-info.vue
@@ -36,7 +36,7 @@
 					<FormSwitch v-model="suspended" class="_formBlock" @update:modelValue="toggleSuspend">{{ i18n.ts.suspend }}</FormSwitch>
 					{{ i18n.ts.reflectMayTakeTime }}
 					<div class="_formBlock">
-						<MkButton v-if="user.host == null && iAmModerator" inline style="margin-right: 8px;" @click="resetPassword"><i class="fas fa-key"></i> {{ i18n.ts.resetPassword }}</MkButton>
+						<MkButton v-if="user.host == null" inline style="margin-right: 8px;" @click="resetPassword"><i class="fas fa-key"></i> {{ i18n.ts.resetPassword }}</MkButton>
 						<MkButton inline danger @click="deleteAllFiles">{{ i18n.ts.deleteAllFiles }}</MkButton>
 						<MkButton v-if="$i.isAdmin" inline danger @click="deleteAccount">{{ i18n.ts.deleteAccount }}</MkButton>
 					</div>

From 11518d2f262921b3d77c4880b44ff8e20b9d6176 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Thu, 12 Jan 2023 20:53:39 +0100
Subject: [PATCH 50/56] add documentation about moderation

---
 docs/moderation.md | 85 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
 create mode 100644 docs/moderation.md

diff --git a/docs/moderation.md b/docs/moderation.md
new file mode 100644
index 000000000..1b3577da6
--- /dev/null
+++ b/docs/moderation.md
@@ -0,0 +1,85 @@
+# User moderation
+
+A lot of the user moderation activities can be found on the `user-info` page. You can reach this page by going to a users profile page, open the three dot menu, select "About" and navigating to the "Moderation" section of the page that opens.
+With the necessary privileges, this page will allow you to:
+- Toggle whether a user is a moderator (administrators on local users only)
+- Reset the users password (local users only)
+- Delete a user (administrators only)
+- Delete all files of a user
+  For remote users, cached files (if any) will be deleted.
+- Silence a user
+  This disallows a user from making a note with `public` visibility.
+  If necessary the visibility of incoming notes or locally created notes will be lowered.
+- Suspend a user
+  This will drop any incoming activities of this actor and hide them from public view on this instance.
+
+# Administrator
+
+When an instance is first set up, the initial user to be created will be made an administrator by default.
+This means that typically the instance owner is the administrator.
+It is also possible to have multiple administrators, however making a user an administrator is not implemented in the client.
+To make a user an administrator, you will need access to the database.
+This is intended for security reasons of
+1. not exposing this very dangerous functionality via the API
+2. making sure someone that has shell access to the server anyway "approves" this.
+
+To make a user an administrator, you will first need the user's ID.
+To get it you can go to the user's profile page, open the three dot menu, select "About" and copy the ID displayed there.
+Then, go to the database and run the following query, replacing `<ID>` with the ID gotten above.
+```sql
+UPDATE "user" SET "isAdmin" = true WHERE "id" = '<ID>';
+```
+
+The user that was made administrator may need to reload their client to see the changes take effect.
+
+To demote a user, you can do a similar operation, but instead with `... SET "isAdmin" = false ...`.
+
+## Immunity
+
+- Cannot be reported by local users.
+- Cannot have their password reset.
+- Cannot have their account deleted.
+- Cannot be suspended.
+- Cannot be silenced.
+- Cannot have their account details viewed by moderators.
+- Cannot be made moderators.
+
+## Abilities
+
+- Create or delete user accounts.
+- Add or remove moderators.
+- View and change instance configuration (e.g. Translation API keys).
+- View all followers and followees.
+
+Administrators also have the same ability as moderators.
+Note of course that people with access to the server and/or database access can do basically anything without restrictions (including breaking the instance).
+
+# Moderator
+
+A moderator has fewer privileges than an administrator.
+They can also be more easily added or removed by an adminstrator.
+Having moderators may be a good idea to help with user moderation.
+
+## Immunity
+
+- Cannot be reported by local users.
+- Cannot be suspended.
+
+## Abilities
+
+- Suspend users.
+- Add, list and remove relays.
+- View queue, database and server information.
+- Create, edit, delete, export and import local custom emoji.
+- View global, social and local timelines even if disabled by administrators.
+- Show, update and delete any users files and file metadata.
+  Managing emoji is described in [a separate file](emoji.md).
+- Delete any users notes.
+- Create an invitation.
+  This allows users to register an account even if (public) registrations are closed using an invite code.
+- View users' account details.
+- Suspend and unsuspend users.
+- Silence and unsilence users.
+- Handle reports.
+- Create, update and delete announcements.
+- View the moderation log.

From 83373e0c513a8163c015649e467234d36f9a3915 Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Thu, 12 Jan 2023 17:08:50 -0500
Subject: [PATCH 51/56] split build task into parallel and non-parallel
 versions

This allows FoundKey to be built on systems with 2GB or less RAM without swapping or running out of memory.
---
 docs/install.md | 3 +++
 package.json    | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/install.md b/docs/install.md
index dbdf5e0d0..330c28633 100644
--- a/docs/install.md
+++ b/docs/install.md
@@ -70,6 +70,8 @@ Build foundkey with the following:
 
 `NODE_ENV=production yarn build`
 
+If your system has at least 4GB of RAM, run `NODE_ENV=production yarn build-parallel` to speed up build times.
+
 If you're still encountering errors about some modules, use node-gyp:
 
 1. `npx node-gyp configure`
@@ -182,6 +184,7 @@ Use git to pull in the latest changes and rerun the build and migration commands
 git pull
 git submodule update --init
 yarn install
+# Use build-parallel if your system has 4GB or more RAM and want faster builds
 NODE_ENV=production yarn build
 yarn migrate
 ```
diff --git a/package.json b/package.json
index 4f47f3bf0..659ba2897 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,8 @@
 		"packages/*"
 	],
 	"scripts": {
-		"build": "yarn workspaces foreach --parallel --topological run build && yarn run gulp",
+		"build": "yarn workspaces foreach --topological run build && yarn run gulp",
+		"build-parallel": "yarn workspaces foreach --parallel --topological run build && yarn run gulp",
 		"start": "yarn workspace backend run start",
 		"start:test": "yarn workspace backend run start:test",
 		"init": "yarn migrate",

From 3d2cfc075a36e0bbefa7ec54bdd624120caf062d Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Fri, 13 Jan 2023 21:55:14 +0100
Subject: [PATCH 52/56] fixup: actually check whether the group joining is from
 the user

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

diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index 11adf43e1..6a796b223 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -147,6 +147,8 @@ export const UserRepository = db.getRepository(User).extend({
 				JOIN "user_group_joining"
 					ON "messaging_message"."groupId" = "user_group_joining"."userGroupId"
 				WHERE
+						"user_group_joining"."userId" = $1
+					AND
 						"messaging_message"."userId" != $1
 					AND
 						NOT $1 = ANY("messaging_message"."reads")

From 96e6187e835224ae41ad8c27d3748a218b647425 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sat, 14 Jan 2023 12:03:50 +0100
Subject: [PATCH 53/56] docs: admin password reset

---
 docs/moderation.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/docs/moderation.md b/docs/moderation.md
index 1b3577da6..64cf096e9 100644
--- a/docs/moderation.md
+++ b/docs/moderation.md
@@ -38,6 +38,7 @@ To demote a user, you can do a similar operation, but instead with `... SET "isA
 
 - Cannot be reported by local users.
 - Cannot have their password reset.
+  To see how you can reset an administrator password, see below.
 - Cannot have their account deleted.
 - Cannot be suspended.
 - Cannot be silenced.
@@ -54,6 +55,23 @@ To demote a user, you can do a similar operation, but instead with `... SET "isA
 Administrators also have the same ability as moderators.
 Note of course that people with access to the server and/or database access can do basically anything without restrictions (including breaking the instance).
 
+## Resetting an administrators password
+
+Administrators are blocked from the paths of resetting the password by moderators or administrators.
+However, if your server has email configured you should be able to use the "Forgot password" link on the normal signin dialog.
+
+If you did not set up email, you will need to kick of this process instead through modifying the database yourself.
+You will need the user ID whose password should be reset, indicated in the following as `<USERID>`;
+as well as a random string (a UUID would be recommended) indicated as `<TOKEN>`.
+
+Replacing the two terms above, run the following SQL query:
+```sql
+INSERT INTO "password_reset_request" VALUES ('0000000000', now(), '<TOKEN>', '<USERID>');
+```
+
+After that, navigate to `/reset-password/<TOKEN>` on your instance to finish the password reset process.
+After that you should be able to sign in with the new password you just set.
+
 # Moderator
 
 A moderator has fewer privileges than an administrator.

From 7170b86724243716f269ba86b4372a68030a4f7b Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Sat, 14 Jan 2023 13:22:09 +0100
Subject: [PATCH 54/56] fixup: websocket data parsing + logger

---
 packages/backend/src/server/api/stream/index.ts | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts
index 145c318fa..8ece8e0ff 100644
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -13,6 +13,9 @@ import { readNotification } from '../common/read-notification.js';
 import channels from './channels/index.js';
 import Channel from './channel.js';
 import { StreamEventEmitter, StreamMessages } from './types.js';
+import Logger from '@/services/logger.js';
+
+const logger = new Logger('streaming');
 
 /**
  * Main stream connection
@@ -123,13 +126,17 @@ export class Connection {
 	}
 
 	private async onMessage(data: WebSocket.RawData, isRaw: boolean) {
-		if (data.isRaw) return;
+		if (isRaw) {
+			logger.warn('received unexpected raw data from websocket');
+			return;
+		}
 
 		let obj: Record<string, any>;
 
 		try {
-			obj = JSON.parse(data.utf8Data);
-		} catch (e) {
+			obj = JSON.parse(data);
+		} catch (err) {
+			logger.error(err);
 			return;
 		}
 

From 9bdf24d3a56b67b694b4ee01890b262d97ea6a24 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 14 Jun 2022 13:18:54 +0200
Subject: [PATCH 55/56] enhance: add tag for quotes

Ref: FEP-e232
---
 .../backend/src/remote/activitypub/renderer/note.ts    | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/backend/src/remote/activitypub/renderer/note.ts b/packages/backend/src/remote/activitypub/renderer/note.ts
index 0d53cfe5e..6fd50c158 100644
--- a/packages/backend/src/remote/activitypub/renderer/note.ts
+++ b/packages/backend/src/remote/activitypub/renderer/note.ts
@@ -111,6 +111,16 @@ export default async function renderNote(note: Note, dive = true, isTalk = false
 		...apemojis,
 	];
 
+	if (quote) {
+		tag.push({
+			type: 'Link',
+			mediaType: 'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+			href: quote,
+			name: `RE: ${quote}`,
+			rel: 'https://misskey-hub.net/ns#_misskey_quote',
+		});
+	}
+
 	const asPoll = poll ? {
 		type: 'Question',
 		content: await toHtml(text, note.mentions),

From 5893a44ff58b1cd6ea5eb032ff7bc950a30d0eab Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Thu, 5 Jan 2023 22:19:34 +0100
Subject: [PATCH 56/56] server: parse quote tag syntax

Ref: FEP-e232
---
 .../src/remote/activitypub/models/note.ts     | 20 ++++---
 .../src/remote/activitypub/models/tag.ts      | 33 +++++++++++-
 .../backend/src/remote/activitypub/type.ts    | 53 ++++++++++++-------
 3 files changed, 78 insertions(+), 28 deletions(-)

diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index f5426da3c..fb9621b85 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -24,7 +24,7 @@ import { DbResolver } from '../db-resolver.js';
 import { apLogger } from '../logger.js';
 import { resolvePerson } from './person.js';
 import { resolveImage } from './image.js';
-import { extractApHashtags } from './tag.js';
+import { extractApHashtags, extractQuoteUrl } from './tag.js';
 import { extractPollFromQuestion } from './question.js';
 import { extractApMentions } from './mention.js';
 
@@ -154,10 +154,10 @@ export async function createNote(value: string | IObject, resolver: Resolver, si
 		})
 		: null;
 
-	// 引用
 	let quote: Note | undefined | null;
+	const quoteUrl = extractQuoteUrl(note.tag);
 
-	if (note._misskey_quote || note.quoteUri) {
+	if (quoteUrl || note._misskey_quote || note.quoteUri) {
 		const tryResolveNote = async (uri: string): Promise<{
 			status: 'ok';
 			res: Note | null;
@@ -184,10 +184,16 @@ export async function createNote(value: string | IObject, resolver: Resolver, si
 			}
 		};
 
-		const uris = unique([note._misskey_quote, note.quoteUri].filter((x): x is string => typeof x === 'string'));
-		const results = await Promise.all(uris.map(uri => tryResolveNote(uri)));
-
-		quote = results.filter((x): x is { status: 'ok', res: Note | null } => x.status === 'ok').map(x => x.res).find(x => x);
+		const uris = unique([quoteUrl, note._misskey_quote, note.quoteUri].filter((x): x is string => typeof x === 'string'));
+		// check the urls sequentially and abort early to not do unnecessary HTTP requests
+		// picks the first one that works
+		for (const uri in uris) {
+			const res = await tryResolveNote(uri);
+			if (res.status === 'ok') {
+				quote = res.res;
+				break;
+			}
+		}
 		if (!quote) {
 			if (results.some(x => x.status === 'temperror')) {
 				throw new Error('quote resolve failed');
diff --git a/packages/backend/src/remote/activitypub/models/tag.ts b/packages/backend/src/remote/activitypub/models/tag.ts
index 964dabad0..182a23765 100644
--- a/packages/backend/src/remote/activitypub/models/tag.ts
+++ b/packages/backend/src/remote/activitypub/models/tag.ts
@@ -1,5 +1,5 @@
 import { toArray } from '@/prelude/array.js';
-import { IObject, isHashtag, IApHashtag } from '../type.js';
+import { IObject, isHashtag, IApHashtag, isLink, ILink } from '../type.js';
 
 export function extractApHashtags(tags: IObject | IObject[] | null | undefined) {
 	if (tags == null) return [];
@@ -16,3 +16,34 @@ export function extractApHashtagObjects(tags: IObject | IObject[] | null | undef
 	if (tags == null) return [];
 	return toArray(tags).filter(isHashtag);
 }
+
+// implements FEP-e232: Object Links (2022-12-23 version)
+export function extractQuoteUrl(tags: IObject | IObject[] | null | undefined): string | null {
+	if (tags == null) return null;
+
+	// filter out correct links
+	let quotes: ILink[] = toArray(tags)
+		.filter(isLink)
+		.filter(link =>
+			[
+				'application/ld+json; profile="https://www.w3.org/ns/activitystreams"',
+				'application/activity+json'
+			].includes(link.mediaType?.toLowerCase())
+		)
+		.filter(link =>
+			toArray(link.rel)
+				.some(rel =>
+					[
+						'https://misskey-hub.net/ns#_misskey_quote',
+						'http://fedibird.com/ns#quoteUri',
+						'https://www.w3.org/ns/activitystreams#quoteUrl',
+					].includes(rel)
+				)
+		);
+
+	if (quotes.length === 0) return null;
+
+	// Deduplicate by href.
+	// If there is more than one quote, we just pick the first/a random one.
+	quotes.filter((x, i, arr) => arr.findIndex(y => x.href === y.href) === i)[0].href;
+}
diff --git a/packages/backend/src/remote/activitypub/type.ts b/packages/backend/src/remote/activitypub/type.ts
index f5b411639..23b4ccf88 100644
--- a/packages/backend/src/remote/activitypub/type.ts
+++ b/packages/backend/src/remote/activitypub/type.ts
@@ -45,7 +45,7 @@ export function getOneApId(value: ApObject): string {
 /**
  * Get ActivityStreams Object id
  */
-export function getApId(value: string | IObject): string {
+export function getApId(value: string | Object): string {
 	if (typeof value === 'string') return value;
 	if (typeof value.id === 'string') return value.id;
 	throw new Error('cannot detemine id');
@@ -54,7 +54,7 @@ export function getApId(value: string | IObject): string {
 /**
  * Get ActivityStreams Object type
  */
-export function getApType(value: IObject): string {
+export function getApType(value: Object): string {
 	if (typeof value.type === 'string') return value.type;
 	if (Array.isArray(value.type) && typeof value.type[0] === 'string') return value.type[0];
 	throw new Error('cannot detect type');
@@ -196,24 +196,6 @@ export const isPropertyValue = (object: IObject): object is IApPropertyValue =>
 	typeof object.name === 'string' &&
 	typeof (object as any).value === 'string';
 
-export interface IApMention extends IObject {
-	type: 'Mention';
-	href: string;
-}
-
-export const isMention = (object: IObject): object is IApMention =>
-	getApType(object) === 'Mention' &&
-	typeof object.href === 'string';
-
-export interface IApHashtag extends IObject {
-	type: 'Hashtag';
-	name: string;
-}
-
-export const isHashtag = (object: IObject): object is IApHashtag =>
-	getApType(object) === 'Hashtag' &&
-	typeof object.name === 'string';
-
 export interface IApEmoji extends IObject {
 	type: 'Emoji';
 	updated: Date;
@@ -293,3 +275,34 @@ export const isLike = (object: IObject): object is ILike => getApType(object) ==
 export const isAnnounce = (object: IObject): object is IAnnounce => getApType(object) === 'Announce';
 export const isBlock = (object: IObject): object is IBlock => getApType(object) === 'Block';
 export const isFlag = (object: IObject): object is IFlag => getApType(object) === 'Flag';
+
+export interface ILink {
+	href: string;
+	rel?: string | string[];
+	mediaType?: string;
+	name?: string;
+}
+
+export interface IApMention extends ILink {
+	type: 'Mention';
+}
+
+export interface IApHashtag extends ILink {
+	type: 'Hashtag';
+	name: string;
+}
+
+export const isLink = (object: Record<string, any>): object is ILink =>
+	typeof object.href === 'string'
+	&& (
+		object.rel == undefined
+		|| typeof object.rel === 'string'
+		|| (Array.isArray(object.rel) && object.rel.every(x => typeof x === 'string'))
+	)
+	&& (object.mediaType == undefined || typeof object.mediaType === 'string');
+export const isMention = (object: Record<string, any>): object is IApMention =>
+	getApType(object) === 'Mention' && isLink(object);
+export const isHashtag = (object: Record<string, any>): object is IApHashtag =>
+	getApType(object) === 'Hashtag'
+	&& isLink(object)
+	&& typeof object.name === 'string';