From 751921e24f37ed707fe44a40d88eebb1299efa35 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 1 Aug 2022 11:06:46 +0200
Subject: [PATCH 01/34] make emoji picker case insensitive

fix https://akkoma.dev/FoundKeyGang/FoundKey/issues/50
---
 packages/client/src/components/emoji-picker.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/emoji-picker.vue b/packages/client/src/components/emoji-picker.vue
index 64732e703..f863866c6 100644
--- a/packages/client/src/components/emoji-picker.vue
+++ b/packages/client/src/components/emoji-picker.vue
@@ -131,7 +131,7 @@ watch(q, () => {
 		return;
 	}
 
-	const newQ = q.value.replace(/:/g, '');
+	const newQ = q.value.replace(/:/g, '').toLowerCase();
 
 	const searchCustom = () => {
 		const max = 8;

From bcb07d819f0b20f3b696df724fceb82deb37c5a1 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 1 Aug 2022 21:18:46 +0200
Subject: [PATCH 02/34] refactor pages/miauth.vue to composition API

---
 packages/client/src/pages/miauth.vue | 76 +++++++++++++---------------
 1 file changed, 35 insertions(+), 41 deletions(-)

diff --git a/packages/client/src/pages/miauth.vue b/packages/client/src/pages/miauth.vue
index 4b3ac7761..a07d1368a 100644
--- a/packages/client/src/pages/miauth.vue
+++ b/packages/client/src/pages/miauth.vue
@@ -36,52 +36,46 @@
 </div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { } from 'vue';
 import MkSignin from '@/components/signin.vue';
 import MkButton from '@/components/ui/button.vue';
 import * as os from '@/os';
 import { login } from '@/account';
 import { appendQuery, query } from '@/scripts/url';
 
-export default defineComponent({
-	components: {
-		MkSignin,
-		MkButton,
-	},
-	props: ['session', 'callback', 'name', 'icon', 'permission'],
-	data() {
-		return {
-			state: null,
-		};
-	},
-	methods: {
-		async accept() {
-			this.state = 'waiting';
-			await os.api('miauth/gen-token', {
-				session: this.session,
-				name: this.name,
-				iconUrl: this.icon,
-				permission: this.permission,
-			});
+const props = defineProps<{
+	session: string;
+	callback: string;
+	name: string;
+	icon: string;
+	permission: string;
+}>();
 
-			this.state = 'accepted';
-			if (this.callback) {
-				location.href = appendQuery(this.callback, query({
-					session: this.session,
-				}));
-			}
-		},
-		deny() {
-			this.state = 'denied';
-		},
-		onLogin(res) {
-			login(res.i);
-		},
-	},
-});
+let state: 'waiting' | 'denied' | 'accepted' | 'initial' = $ref('initial');
+
+async function accept() {
+	state = 'waiting';
+	await os.api('miauth/gen-token', {
+		session: props.session,
+		name: props.name,
+		iconUrl: props.icon,
+		permission: props.permission,
+	});
+
+	state = 'accepted';
+	if (props.callback) {
+		location.href = appendQuery(props.callback, query({
+			session: props.session,
+		}));
+	}
+}
+
+function deny() {
+	state = 'denied';
+}
+
+function onLogin(res) {
+	login(res.i);
+}
 </script>
-
-<style lang="scss" scoped>
-
-</style>

From 2e7108382357e52340ff6a634d23c9e99d4b595e Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 1 Aug 2022 21:34:38 +0200
Subject: [PATCH 03/34] refactor classic widgets to composition API

---
 packages/client/src/ui/classic.widgets.vue | 88 ++++++++++------------
 1 file changed, 40 insertions(+), 48 deletions(-)

diff --git a/packages/client/src/ui/classic.widgets.vue b/packages/client/src/ui/classic.widgets.vue
index 845ccab36..c53a46d8e 100644
--- a/packages/client/src/ui/classic.widgets.vue
+++ b/packages/client/src/ui/classic.widgets.vue
@@ -1,66 +1,58 @@
 <template>
 <div class="ddiqwdnk">
-	<XWidgets class="widgets" :edit="editMode" :widgets="$store.reactiveState.widgets.value.filter(w => w.place === place)" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/>
+	<XWidgets class="widgets" :edit="editMode" :widgets="defaultStore.reactiveState.widgets.value.filter(w => w.place === place)" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/>
 
-	<button v-if="editMode" class="_textButton edit" style="font-size: 0.9em;" @click="editMode = false"><i class="fas fa-check"></i> {{ $ts.editWidgetsExit }}</button>
-	<button v-else class="_textButton edit" style="font-size: 0.9em;" @click="editMode = true"><i class="fas fa-pencil-alt"></i> {{ $ts.editWidgets }}</button>
+	<button v-if="editMode" class="_textButton edit" style="font-size: 0.9em;" @click="editMode = false"><i class="fas fa-check"></i> {{ i81n.ts.editWidgetsExit }}</button>
+	<button v-else class="_textButton edit" style="font-size: 0.9em;" @click="editMode = true"><i class="fas fa-pencil-alt"></i> {{ i18n.ts.editWidgets }}</button>
 </div>
 </template>
 
-<script lang="ts">
-import { defineComponent, defineAsyncComponent } from 'vue';
+<script lang="ts" setup>
+import { defineAsyncComponent, onMounted } from 'vue';
 import XWidgets from '@/components/widgets.vue';
+import { defaultStore } from '@/store';
+import { i18n } from '@/i18n';
 
-export default defineComponent({
-	components: {
-		XWidgets
-	},
+const emit = defineEmits<{
+	(ev: 'mounted'): void;
+}>();
 
-	props: {
-		place: {
-			type: String,
-		}
-	},
+const props = defineProps<{
+	place: {
+		type: string;
+	};
+}>();
 
-	emits: ['mounted'],
+let editMode: boolean = $ref(false);
 
-	data() {
-		return {
-			editMode: false,
-		};
-	},
+onMounted(() => {
+	emit('mounted');
+}
 
-	mounted() {
-		this.$emit('mounted', this.$el);
-	},
+function addWidget(widget) {
+	defaultStore.set('widgets', [{
+		...widget,
+		place: props.place,
+	}, ...defaultStore.state.widgets]);
+}
 
-	methods: {
-		addWidget(widget) {
-			this.$store.set('widgets', [{
-				...widget,
-				place: this.place,
-			}, ...this.$store.state.widgets]);
-		},
+function removeWidget(widget) {
+	defaultStore.set('widgets', defaultStore.state.widgets.filter(w => w.id !== widget.id));
+}
 
-		removeWidget(widget) {
-			this.$store.set('widgets', this.$store.state.widgets.filter(w => w.id !== widget.id));
-		},
+function updateWidget({ id, data }) {
+	defaultStore.set('widgets', defaultStore.state.widgets.map(w => w.id === id ? {
+		...w,
+		data,
+	} : w));
+}
 
-		updateWidget({ id, data }) {
-			this.$store.set('widgets', this.$store.state.widgets.map(w => w.id === id ? {
-				...w,
-				data,
-			} : w));
-		},
-
-		updateWidgets(widgets) {
-			this.$store.set('widgets', [
-				...this.$store.state.widgets.filter(w => w.place !== this.place),
-				...widgets
-			]);
-		}
-	}
-});
+function updateWidgets(widgets) {
+	defaultStore.set('widgets', [
+		...defaultStore.state.widgets.filter(w => w.place !== props.place),
+		...widgets
+	]);
+}
 </script>
 
 <style lang="scss" scoped>

From 3a07c13ac6f68526ab4f0ccf2cc546c371b569d1 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 1 Aug 2022 21:38:09 +0200
Subject: [PATCH 04/34] refactor: remove unused imports, remove use of global
 variables

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

diff --git a/packages/client/src/pages/gallery/post.vue b/packages/client/src/pages/gallery/post.vue
index a3a11d9a6..c8a224b42 100644
--- a/packages/client/src/pages/gallery/post.vue
+++ b/packages/client/src/pages/gallery/post.vue
@@ -3,7 +3,7 @@
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :content-max="1000" :margin-min="16" :margin-max="32">
 		<div class="_root">
-			<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
+			<transition :name="defaultStore.state.animation ? 'fade' : ''" mode="out-in">
 				<div v-if="post" class="rkxwuolj">
 					<div class="files">
 						<div v-for="file in post.files" :key="file.id" class="file">
@@ -55,7 +55,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, defineComponent, inject, watch } from 'vue';
+import { computed, watch } from 'vue';
 import MkButton from '@/components/ui/button.vue';
 import * as os from '@/os';
 import MkContainer from '@/components/ui/container.vue';
@@ -67,6 +67,7 @@ import { url } from '@/config';
 import { useRouter } from '@/router';
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
+import { defaultStore } from '@/store';
 
 const router = useRouter();
 

From 288049e2dcc5c8c15dc978b95b45a820ab81876f Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Mon, 1 Aug 2022 21:45:05 +0200
Subject: [PATCH 05/34] refactor: reduce usage of i18n global variables

---
 .../client/src/pages/antenna-timeline.vue     |  2 +-
 packages/client/src/pages/federation.vue      | 48 +++++++++----------
 packages/client/src/pages/miauth.vue          | 19 ++++----
 packages/client/src/ui/visitor/header.vue     | 15 +++---
 4 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/packages/client/src/pages/antenna-timeline.vue b/packages/client/src/pages/antenna-timeline.vue
index 1865781a0..1eb8322b1 100644
--- a/packages/client/src/pages/antenna-timeline.vue
+++ b/packages/client/src/pages/antenna-timeline.vue
@@ -2,7 +2,7 @@
 <MkStickyContainer>
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<div ref="rootEl" v-hotkey.global="keymap" v-size="{ min: [800] }" class="tqmomfks">
-		<div v-if="queue > 0" class="new"><button class="_buttonPrimary" @click="top()">{{ $ts.newNoteRecived }}</button></div>
+		<div v-if="queue > 0" class="new"><button class="_buttonPrimary" @click="top()">{{ i18n.ts.newNoteRecived }}</button></div>
 		<div class="tl _block">
 			<XTimeline
 				ref="tlEl" :key="antennaId"
diff --git a/packages/client/src/pages/federation.vue b/packages/client/src/pages/federation.vue
index 07c5a32bd..fa93d6c04 100644
--- a/packages/client/src/pages/federation.vue
+++ b/packages/client/src/pages/federation.vue
@@ -6,35 +6,35 @@
 			<div class="query">
 				<MkInput v-model="host" :debounce="true" class="">
 					<template #prefix><i class="fas fa-search"></i></template>
-					<template #label>{{ $ts.host }}</template>
+					<template #label>{{ i18n.ts.host }}</template>
 				</MkInput>
 				<FormSplit style="margin-top: var(--margin);">
 					<MkSelect v-model="state">
-						<template #label>{{ $ts.state }}</template>
-						<option value="all">{{ $ts.all }}</option>
-						<option value="federating">{{ $ts.federating }}</option>
-						<option value="subscribing">{{ $ts.subscribing }}</option>
-						<option value="publishing">{{ $ts.publishing }}</option>
-						<option value="suspended">{{ $ts.suspended }}</option>
-						<option value="blocked">{{ $ts.blocked }}</option>
-						<option value="notResponding">{{ $ts.notResponding }}</option>
+						<template #label>{{ i18n.ts.state }}</template>
+						<option value="all">{{ i18n.ts.all }}</option>
+						<option value="federating">{{ i18n.ts.federating }}</option>
+						<option value="subscribing">{{ i18n.ts.subscribing }}</option>
+						<option value="publishing">{{ i18n.ts.publishing }}</option>
+						<option value="suspended">{{ i18n.ts.suspended }}</option>
+						<option value="blocked">{{ i18n.ts.blocked }}</option>
+						<option value="notResponding">{{ i18n.ts.notResponding }}</option>
 					</MkSelect>
 					<MkSelect v-model="sort">
-						<template #label>{{ $ts.sort }}</template>
-						<option value="+pubSub">{{ $ts.pubSub }} ({{ $ts.descendingOrder }})</option>
-						<option value="-pubSub">{{ $ts.pubSub }} ({{ $ts.ascendingOrder }})</option>
-						<option value="+notes">{{ $ts.notes }} ({{ $ts.descendingOrder }})</option>
-						<option value="-notes">{{ $ts.notes }} ({{ $ts.ascendingOrder }})</option>
-						<option value="+users">{{ $ts.users }} ({{ $ts.descendingOrder }})</option>
-						<option value="-users">{{ $ts.users }} ({{ $ts.ascendingOrder }})</option>
-						<option value="+following">{{ $ts.following }} ({{ $ts.descendingOrder }})</option>
-						<option value="-following">{{ $ts.following }} ({{ $ts.ascendingOrder }})</option>
-						<option value="+followers">{{ $ts.followers }} ({{ $ts.descendingOrder }})</option>
-						<option value="-followers">{{ $ts.followers }} ({{ $ts.ascendingOrder }})</option>
-						<option value="+caughtAt">{{ $ts.registeredAt }} ({{ $ts.descendingOrder }})</option>
-						<option value="-caughtAt">{{ $ts.registeredAt }} ({{ $ts.ascendingOrder }})</option>
-						<option value="+lastCommunicatedAt">{{ $ts.lastCommunication }} ({{ $ts.descendingOrder }})</option>
-						<option value="-lastCommunicatedAt">{{ $ts.lastCommunication }} ({{ $ts.ascendingOrder }})</option>
+						<template #label>{{ i18n.ts.sort }}</template>
+						<option value="+pubSub">{{ i18n.ts.pubSub }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="-pubSub">{{ i18n.ts.pubSub }} ({{ i18n.ts.ascendingOrder }})</option>
+						<option value="+notes">{{ i18n.ts.notes }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="-notes">{{ i18n.ts.notes }} ({{ i18n.ts.ascendingOrder }})</option>
+						<option value="+users">{{ i18n.ts.users }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="-users">{{ i18n.ts.users }} ({{ i18n.ts.ascendingOrder }})</option>
+						<option value="+following">{{ i18n.ts.following }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="-following">{{ i18n.ts.following }} ({{ i18n.ts.ascendingOrder }})</option>
+						<option value="+followers">{{ i18n.ts.followers }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="-followers">{{ i18n.ts.followers }} ({{ i18n.ts.ascendingOrder }})</option>
+						<option value="+caughtAt">{{ i18n.ts.registeredAt }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="-caughtAt">{{ i18n.ts.registeredAt }} ({{ i18n.ts.ascendingOrder }})</option>
+						<option value="+lastCommunicatedAt">{{ i18n.ts.lastCommunication }} ({{ i18n.ts.descendingOrder }})</option>
+						<option value="-lastCommunicatedAt">{{ i18n.ts.lastCommunication }} ({{ i18n.ts.ascendingOrder }})</option>
 					</MkSelect>
 				</FormSplit>
 			</div>
diff --git a/packages/client/src/pages/miauth.vue b/packages/client/src/pages/miauth.vue
index a07d1368a..740498363 100644
--- a/packages/client/src/pages/miauth.vue
+++ b/packages/client/src/pages/miauth.vue
@@ -7,27 +7,27 @@
 	</div>
 	<div v-if="state == 'denied'" class="denied _section">
 		<div class="_content">
-			<p>{{ $ts._auth.denied }}</p>
+			<p>{{ i18n.ts._auth.denied }}</p>
 		</div>
 	</div>
 	<div v-else-if="state == 'accepted'" class="accepted _section">
 		<div class="_content">
-			<p v-if="callback">{{ $ts._auth.callback }}<MkEllipsis/></p>
-			<p v-else>{{ $ts._auth.pleaseGoBack }}</p>
+			<p v-if="callback">{{ i18n.ts._auth.callback }}<MkEllipsis/></p>
+			<p v-else>{{ i18n.ts._auth.pleaseGoBack }}</p>
 		</div>
 	</div>
 	<div v-else class="_section">
-		<div v-if="name" class="_title">{{ $t('_auth.shareAccess', { name: name }) }}</div>
-		<div v-else class="_title">{{ $ts._auth.shareAccessAsk }}</div>
+		<div v-if="name" class="_title">{{ i18n.t('_auth.shareAccess', { name: name }) }}</div>
+		<div v-else class="_title">{{ i18n.ts._auth.shareAccessAsk }}</div>
 		<div class="_content">
-			<p>{{ $ts._auth.permissionAsk }}</p>
+			<p>{{ i18n.ts._auth.permissionAsk }}</p>
 			<ul>
-				<li v-for="p in permission" :key="p">{{ $t(`_permissions.${p}`) }}</li>
+				<li v-for="p in permission" :key="p">{{ i18n.t(`_permissions.${p}`) }}</li>
 			</ul>
 		</div>
 		<div class="_footer">
-			<MkButton inline @click="deny">{{ $ts.cancel }}</MkButton>
-			<MkButton inline primary @click="accept">{{ $ts.accept }}</MkButton>
+			<MkButton inline @click="deny">{{ i18n.ts.cancel }}</MkButton>
+			<MkButton inline primary @click="accept">{{ i18n.ts.accept }}</MkButton>
 		</div>
 	</div>
 </div>
@@ -43,6 +43,7 @@ import MkButton from '@/components/ui/button.vue';
 import * as os from '@/os';
 import { login } from '@/account';
 import { appendQuery, query } from '@/scripts/url';
+import { i18n } from '@/i18n';
 
 const props = defineProps<{
 	session: string;
diff --git a/packages/client/src/ui/visitor/header.vue b/packages/client/src/ui/visitor/header.vue
index b01c147c5..71d393284 100644
--- a/packages/client/src/ui/visitor/header.vue
+++ b/packages/client/src/ui/visitor/header.vue
@@ -2,10 +2,10 @@
 <div ref="header" class="sqxihjet">
 	<div v-if="narrow === false" class="wide">
 		<div class="content">
-			<MkA to="/" class="link" active-class="active"><i class="fas fa-home icon"></i>{{ $ts.home }}</MkA>
-			<MkA to="/explore" class="link" active-class="active"><i class="fas fa-hashtag icon"></i>{{ $ts.explore }}</MkA>
-			<MkA to="/featured" class="link" active-class="active"><i class="fas fa-fire-alt icon"></i>{{ $ts.featured }}</MkA>
-			<MkA to="/channels" class="link" active-class="active"><i class="fas fa-satellite-dish icon"></i>{{ $ts.channel }}</MkA>
+			<MkA to="/" class="link" active-class="active"><i class="fas fa-home icon"></i>{{ i18n.ts.home }}</MkA>
+			<MkA to="/explore" class="link" active-class="active"><i class="fas fa-hashtag icon"></i>{{ i18n.ts.explore }}</MkA>
+			<MkA to="/featured" class="link" active-class="active"><i class="fas fa-fire-alt icon"></i>{{ i18n.ts.featured }}</MkA>
+			<MkA to="/channels" class="link" active-class="active"><i class="fas fa-satellite-dish icon"></i>{{ i18n.ts.channel }}</MkA>
 			<div v-if="info" class="page active link">
 				<div class="title">
 					<i v-if="info.icon" class="icon" :class="info.icon"></i>
@@ -18,9 +18,9 @@
 				</button>
 			</div>
 			<div class="right">
-				<button class="_button search" @click="search()"><i class="fas fa-search icon"></i><span>{{ $ts.search }}</span></button>
-				<button class="_buttonPrimary signup" @click="signup()">{{ $ts.signup }}</button>
-				<button class="_button login" @click="signin()">{{ $ts.login }}</button>
+				<button class="_button search" @click="search()"><i class="fas fa-search icon"></i><span>{{ i18n.ts.search }}</span></button>
+				<button class="_buttonPrimary signup" @click="signup()">{{ i18n.ts.signup }}</button>
+				<button class="_button login" @click="signin()">{{ i18n.ts.login }}</button>
 			</div>
 		</div>
 	</div>
@@ -47,6 +47,7 @@ import XSigninDialog from '@/components/signin-dialog.vue';
 import XSignupDialog from '@/components/signup-dialog.vue';
 import * as os from '@/os';
 import { search } from '@/scripts/search';
+import { i18n } from '@/i18n';
 
 defineProps<{
 	info: any;

From a615a76cf15ed5ced10c87e5155b8653245ff44d Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 2 Aug 2022 09:31:36 +0200
Subject: [PATCH 06/34] fix: missing parenthesis

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

diff --git a/packages/client/src/ui/classic.widgets.vue b/packages/client/src/ui/classic.widgets.vue
index c53a46d8e..d34511011 100644
--- a/packages/client/src/ui/classic.widgets.vue
+++ b/packages/client/src/ui/classic.widgets.vue
@@ -27,7 +27,7 @@ let editMode: boolean = $ref(false);
 
 onMounted(() => {
 	emit('mounted');
-}
+});
 
 function addWidget(widget) {
 	defaultStore.set('widgets', [{

From 30d8bc9259cb6b72ed76d67b21dbb4cdceca8327 Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Mon, 1 Aug 2022 16:57:34 -0400
Subject: [PATCH 07/34] refactor: welcome.setup.vue to composition api

---
 packages/client/src/pages/welcome.setup.vue | 57 ++++++++-------------
 1 file changed, 22 insertions(+), 35 deletions(-)

diff --git a/packages/client/src/pages/welcome.setup.vue b/packages/client/src/pages/welcome.setup.vue
index 4892ab6ea..e4419ef6b 100644
--- a/packages/client/src/pages/welcome.setup.vue
+++ b/packages/client/src/pages/welcome.setup.vue
@@ -21,50 +21,37 @@
 </form>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
+<script lang="ts" setup>
+import { } from 'vue';
 import MkButton from '@/components/ui/button.vue';
 import MkInput from '@/components/form/input.vue';
 import { host } from '@/config';
 import * as os from '@/os';
 import { login } from '@/account';
+import { i18n } from '@/i18n';
 
-export default defineComponent({
-	components: {
-		MkButton,
-		MkInput,
-	},
+let username = $ref('');
+let password = $ref('');
+let submitting = $ref(false);
 
-	data() {
-		return {
-			username: '',
-			password: '',
-			submitting: false,
-			host,
-		};
-	},
+function submit(): void {
+	if (submitting) return;
+	submitting = true;
 
-	methods: {
-		submit() {
-			if (this.submitting) return;
-			this.submitting = true;
+	os.api('admin/accounts/create', {
+		username,
+		password,
+	}).then(res => {
+		return login(res.token);
+	}).catch(() => {
+		submitting = false;
 
-			os.api('admin/accounts/create', {
-				username: this.username,
-				password: this.password,
-			}).then(res => {
-				return login(res.token);
-			}).catch(() => {
-				this.submitting = false;
-
-				os.alert({
-					type: 'error',
-					text: this.$ts.somethingHappened
-				});
-			});
-		}
-	}
-});
+		os.alert({
+			type: 'error',
+			text: i18n.ts.somethingHappened,
+		});
+	});
+}
 </script>
 
 <style lang="scss" scoped>

From 455758e542bda35f2d1622c0f4dbac41cffeebbe Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 2 Aug 2022 09:57:53 +0200
Subject: [PATCH 08/34] remove unused visitor ui variant

---
 packages/client/src/ui/visitor/a.vue | 235 ---------------------------
 1 file changed, 235 deletions(-)
 delete mode 100644 packages/client/src/ui/visitor/a.vue

diff --git a/packages/client/src/ui/visitor/a.vue b/packages/client/src/ui/visitor/a.vue
deleted file mode 100644
index 98593565a..000000000
--- a/packages/client/src/ui/visitor/a.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-<template>
-<div class="mk-app">
-	<div v-if="mainRouter.currentRoute?.name === 'index'" class="banner" :style="{ backgroundImage: `url(${ $instance.bannerUrl })` }">
-		<div>
-			<h1 v-if="meta"><img v-if="meta.logoImageUrl" class="logo" :src="meta.logoImageUrl"><span v-else class="text">{{ instanceName }}</span></h1>
-			<div v-if="meta" class="about">
-				<!-- eslint-disable-next-line vue/no-v-html -->
-				<div class="desc" v-html="meta.description || $ts.introMisskey"></div>
-			</div>
-			<div class="action">
-				<button class="_button primary" @click="signup()">{{ $ts.signup }}</button>
-				<button class="_button" @click="signin()">{{ $ts.login }}</button>
-			</div>
-		</div>
-	</div>
-	<div v-else class="banner-mini" :style="{ backgroundImage: `url(${ $instance.bannerUrl })` }">
-		<div>
-			<h1 v-if="meta"><img v-if="meta.logoImageUrl" class="logo" :src="meta.logoImageUrl"><span v-else class="text">{{ instanceName }}</span></h1>
-		</div>
-	</div>
-
-	<div class="main">
-		<div ref="contents" class="contents" :class="{ wallpaper }">
-			<header v-show="mainRouter.currentRoute?.name !== 'index'" ref="header" class="header">
-				<XHeader :info="pageInfo"/>
-			</header>
-			<main ref="main">
-				<RouterView/>
-			</main>
-			<div class="powered-by">
-				<b><MkA to="/">{{ host }}</MkA></b>
-				<small>Powered by <a href="https://github.com/misskey-dev/misskey" target="_blank">Misskey</a></small>
-			</div>
-		</div>
-	</div>
-</div>
-</template>
-
-<script lang="ts">
-import { defineComponent, defineAsyncComponent } from 'vue';
-import XHeader from './header.vue';
-import { host, instanceName } from '@/config';
-import { search } from '@/scripts/search';
-import * as os from '@/os';
-import MkPagination from '@/components/ui/pagination.vue';
-import MkButton from '@/components/ui/button.vue';
-import { ColdDeviceStorage } from '@/store';
-import { mainRouter } from '@/router';
-
-const DESKTOP_THRESHOLD = 1100;
-
-export default defineComponent({
-	components: {
-		XHeader,
-		MkPagination,
-		MkButton,
-	},
-
-	data() {
-		return {
-			host,
-			instanceName,
-			pageInfo: null,
-			meta: null,
-			narrow: window.innerWidth < 1280,
-			announcements: {
-				endpoint: 'announcements',
-				limit: 10,
-			},
-			mainRouter,
-			isDesktop: window.innerWidth >= DESKTOP_THRESHOLD,
-		};
-	},
-
-	computed: {
-		keymap(): any {
-			return {
-				'd': () => {
-					if (ColdDeviceStorage.get('syncDeviceDarkMode')) return;
-					this.$store.set('darkMode', !this.$store.state.darkMode);
-				},
-				's': search,
-				'h|/': () => {
-					window.open('https://misskey-hub.net/docs/keyboard-shortcut.md', '_blank');
-				},
-			};
-		},
-	},
-
-	created() {
-		document.documentElement.style.overflowY = 'scroll';
-
-		os.api('meta', { detail: true }).then(meta => {
-			this.meta = meta;
-		});
-	},
-
-	mounted() {
-		if (!this.isDesktop) {
-			window.addEventListener('resize', () => {
-				if (window.innerWidth >= DESKTOP_THRESHOLD) this.isDesktop = true;
-			}, { passive: true });
-		}
-	},
-});
-</script>
-
-<style lang="scss" scoped>
-.mk-app {
-	min-height: 100vh;
-
-	> .banner {
-		position: relative;
-		width: 100%;
-		text-align: center;
-		background-position: center;
-		background-size: cover;
-
-		> div {
-			height: 100%;
-			background: rgba(0, 0, 0, 0.3);
-
-			* {
-				color: #fff;
-			}
-					
-			> h1 {
-				margin: 0;
-				padding: 96px 32px 0 32px;
-				text-shadow: 0 0 8px black;
-
-				> .logo {
-					vertical-align: bottom;
-					max-height: 150px;
-				}
-			}
-
-			> .about {
-				padding: 32px;
-				max-width: 580px;
-				margin: 0 auto;
-				box-sizing: border-box;
-				text-shadow: 0 0 8px black;
-			}
-
-			> .action {
-				padding-bottom: 64px;
-				
-				> button {
-					display: inline-block;
-					padding: 10px 20px;
-					box-sizing: border-box;
-					text-align: center;
-					border-radius: 999px;
-					background: var(--panel);
-					color: var(--fg);
-
-					&.primary {
-						background: var(--accent);
-						color: #fff;
-					}
-
-					&:first-child {
-						margin-right: 16px;
-					}
-				}
-			}
-		}
-	}
-
-	> .banner-mini {
-		position: relative;
-		width: 100%;
-		text-align: center;
-		background-position: center;
-		background-size: cover;
-
-		> div {
-			position: relative;
-			z-index: 1;
-			height: 100%;
-			background: rgba(0, 0, 0, 0.3);
-
-			* {
-				color: #fff !important;
-			}
-
-			> header {
-				
-			}
-					
-			> h1 {
-				margin: 0;
-				padding: 32px;
-				text-shadow: 0 0 8px black;
-
-				> .logo {
-					vertical-align: bottom;
-					max-height: 100px;
-				}
-			}
-		}
-	}
-
-	> .main {
-		> .contents {
-			position: relative;
-			z-index: 1;
-
-			> .header {
-				position: sticky;
-				top: 0;
-				left: 0;
-				z-index: 1000;
-			}
-
-			> .powered-by {
-				padding: 28px;
-				font-size: 14px;
-				text-align: center;
-				border-top: 1px solid var(--divider);
-
-				> small {
-					display: block;
-					margin-top: 8px;
-					opacity: 0.5;
-				}
-			}
-		}
-	}
-}
-</style>
-
-<style lang="scss">
-</style>

From 9b5d740530497c8fda19817f2aa27b6cecb925a5 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 2 Aug 2022 10:28:29 +0200
Subject: [PATCH 09/34] refactor visitor ui kanban to composition API

---
 packages/client/src/ui/visitor/kanban.vue | 107 ++++++++--------------
 1 file changed, 38 insertions(+), 69 deletions(-)

diff --git a/packages/client/src/ui/visitor/kanban.vue b/packages/client/src/ui/visitor/kanban.vue
index 44b555725..a21df491c 100644
--- a/packages/client/src/ui/visitor/kanban.vue
+++ b/packages/client/src/ui/visitor/kanban.vue
@@ -1,22 +1,22 @@
-<!-- eslint-disable vue/no-v-html -->
 <template>
-<div class="rwqkcmrc" :style="{ backgroundImage: transparent ? 'none' : `url(${ $instance.backgroundImageUrl })` }">
+<div class="rwqkcmrc" :style="{ backgroundImage: transparent ? 'none' : `url(${ instance.backgroundImageUrl })` }">
 	<div class="back" :class="{ transparent }"></div>
 	<div class="contents">
 		<div class="wrapper">
-			<h1 v-if="meta" :class="{ full }">
-				<MkA to="/" class="link"><img v-if="meta.logoImageUrl" class="logo" :src="meta.logoImageUrl" alt="logo"><span v-else class="text">{{ instanceName }}</span></MkA>
+			<h1 v-if="instance" :class="{ full }">
+				<MkA to="/" class="link"><img v-if="instance.logoImageUrl" class="logo" :src="instance.logoImageUrl" alt="logo"><span v-else class="text">{{ instanceName }}</span></MkA>
 			</h1>
 			<template v-if="full">
-				<div v-if="meta" class="about">
-					<div class="desc" v-html="meta.description || $ts.introMisskey"></div>
+				<div v-if="instance" class="about">
+					<!-- eslint-disable-next-line vue/no-v-html -->
+					<div class="desc" v-html="instance.description || i18n.ts.introMisskey"></div>
 				</div>
 				<div class="action">
-					<button class="_buttonPrimary" @click="signup()">{{ $ts.signup }}</button>
-					<button class="_button" @click="signin()">{{ $ts.login }}</button>
+					<button class="_buttonPrimary" @click="signup()">{{ i18n.ts.signup }}</button>
+					<button class="_button" @click="signin()">{{ i18n.ts.login }}</button>
 				</div>
 				<div class="announcements panel">
-					<header>{{ $ts.announcements }}</header>
+					<header>{{ i18n.ts.announcements }}</header>
 					<MkPagination v-slot="{items}" :pagination="announcements" class="list">
 						<section v-for="announcement in items" :key="announcement.id" class="item">
 							<div class="title">{{ announcement.title }}</div>
@@ -37,73 +37,42 @@
 </div>
 </template>
 
-<script lang="ts">
-import { defineComponent, defineAsyncComponent } from 'vue';
+<script lang="ts" setup>
+import { } from 'vue';
 import { host, instanceName } from '@/config';
 import * as os from '@/os';
 import MkPagination from '@/components/ui/pagination.vue';
 import XSigninDialog from '@/components/signin-dialog.vue';
 import XSignupDialog from '@/components/signup-dialog.vue';
-import MkButton from '@/components/ui/button.vue';
+import { i18n } from '@/i18n';
+import { instance } from '@/instance';
 
-export default defineComponent({
-	components: {
-		MkPagination,
-		MkButton,
-	},
-
-	props: {
-		full: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-		transparent: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-		poweredBy: {
-			type: Boolean,
-			required: false,
-			default: false,
-		},
-	},
-
-	data() {
-		return {
-			host,
-			instanceName,
-			pageInfo: null,
-			meta: null,
-			narrow: window.innerWidth < 1280,
-			announcements: {
-				endpoint: 'announcements',
-				limit: 10,
-			},
-		};
-	},
-
-	created() {
-		os.api('meta', { detail: true }).then(meta => {
-			this.meta = meta;
-		});
-	},
-
-	methods: {
-		signin() {
-			os.popup(XSigninDialog, {
-				autoSet: true
-			}, {}, 'closed');
-		},
-
-		signup() {
-			os.popup(XSignupDialog, {
-				autoSet: true
-			}, {}, 'closed');
-		}
-	}
+withDefaults(defineProps<{
+	full?: boolean;
+	transparent?: boolean;
+	poweredBy?: boolean;
+}>(), {
+	full: false,
+	transparent: false,
+	poweredBy: false,
 });
+
+const announcements = {
+	endpoint: 'announcements',
+	limit: 10,
+};
+
+function signin(): void {
+	os.popup(XSigninDialog, {
+		autoSet: true,
+	}, {}, 'closed');
+}
+
+function signup(): void {
+	os.popup(XSignupDialog, {
+		autoSet: true,
+	}, {}, 'closed');
+}
 </script>
 
 <style lang="scss" scoped>

From a24e0e064892a6c2f831f5faad81ca3d80452489 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 2 Aug 2022 11:50:46 +0200
Subject: [PATCH 10/34] client: refactor form suspense to composition API

---
 .../client/src/components/form/suspense.vue   | 86 ++++++-------------
 1 file changed, 26 insertions(+), 60 deletions(-)

diff --git a/packages/client/src/components/form/suspense.vue b/packages/client/src/components/form/suspense.vue
index 2ad55daca..67aa71ebf 100644
--- a/packages/client/src/components/form/suspense.vue
+++ b/packages/client/src/components/form/suspense.vue
@@ -1,79 +1,45 @@
 <template>
-<transition :name="$store.state.animation ? 'fade' : ''" mode="out-in">
-	<div v-if="pending">
+<transition :name="defaultStore.state.animation ? 'fade' : ''" mode="out-in">
+	<div v-if="state == 'pending'">
 		<MkLoading/>
 	</div>
-	<div v-else-if="resolved">
+	<div v-else-if="state == 'resolved'">
 		<slot :result="result"></slot>
 	</div>
 	<div v-else>
-		<div class="wszdbhzo">
-			<div><i class="fas fa-exclamation-triangle"></i> {{ $ts.somethingHappened }}</div>
-			<MkButton inline class="retry" @click="retry"><i class="fas fa-redo-alt"></i> {{ $ts.retry }}</MkButton>
-		</div>
+		<MkError @retry="process"/>
 	</div>
 </transition>
 </template>
 
-<script lang="ts">
-import { defineComponent, PropType, ref, watch } from 'vue';
+<script lang="ts" setup>
+import { watch } from 'vue';
 import MkButton from '@/components/ui/button.vue';
+import { defaultStore } from '@/store';
 
-export default defineComponent({
-	components: {
-		MkButton
-	},
+const props = defineProps<{
+	p: () => Promise<any>;
+}>();
 
-	props: {
-		p: {
-			type: Function as PropType<() => Promise<any>>,
-			required: true,
-		}
-	},
+let state: 'pending' | 'resolved' | 'rejected' = $ref('pending');
+let result = $ref(null);
 
-	setup(props, context) {
-		const pending = ref(true);
-		const resolved = ref(false);
-		const rejected = ref(false);
-		const result = ref(null);
+const process = () => {
+	// this might be a retry so reset the state
+	state = 'pending';
 
-		const process = () => {
-			if (props.p == null) {
-				return;
-			}
-			const promise = props.p();
-			pending.value = true;
-			resolved.value = false;
-			rejected.value = false;
-			promise.then((_result) => {
-				pending.value = false;
-				resolved.value = true;
-				result.value = _result;
-			});
-			promise.catch(() => {
-				pending.value = false;
-				rejected.value = true;
-			});
-		};
+	props.p?.().then((_result) => {
+		result = _result;
+		state = 'resolved';
+	}, () => {
+		state = 'rejected';
+	});
+};
 
-		watch(() => props.p, () => {
-			process();
-		}, {
-			immediate: true
-		});
-
-		const retry = () => {
-			process();
-		};
-
-		return {
-			pending,
-			resolved,
-			rejected,
-			result,
-			retry,
-		};
-	}
+watch(() => props.p, () => {
+	process();
+}, {
+	immediate: true
 });
 </script>
 

From aa2f401a85f0c0a8ba25ff6bdf533b569eb3166f Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 2 Aug 2022 12:02:28 +0200
Subject: [PATCH 11/34] refactor: reduce use of global variables

---
 .../src/components/file-list-for-admin.vue      |  4 ++--
 packages/client/src/components/form-dialog.vue  | 15 ++++++++-------
 packages/client/src/components/global/acct.vue  |  3 ++-
 .../client/src/components/global/avatar.vue     |  4 ++--
 packages/client/src/components/global/error.vue |  3 ++-
 packages/client/src/components/launch-pad.vue   |  6 +++---
 packages/client/src/components/media-banner.vue |  5 +++--
 .../client/src/components/media-caption.vue     |  5 +++--
 packages/client/src/components/media-video.vue  |  5 +++--
 packages/client/src/components/mention.vue      |  3 ++-
 packages/client/src/components/mfm-search.vue   |  3 ++-
 packages/client/src/ui/visitor/b.vue            | 17 +++++++++--------
 12 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/packages/client/src/components/file-list-for-admin.vue b/packages/client/src/components/file-list-for-admin.vue
index 04427de45..5f077466d 100644
--- a/packages/client/src/components/file-list-for-admin.vue
+++ b/packages/client/src/components/file-list-for-admin.vue
@@ -15,14 +15,14 @@
 				</div>
 				<div>
 					<MkAcct v-if="file.user" :user="file.user"/>
-					<div v-else>{{ $ts.system }}</div>
+					<div v-else>{{ i18n.ts.system }}</div>
 				</div>
 				<div>
 					<span style="margin-right: 1em;">{{ file.type }}</span>
 					<span>{{ bytes(file.size) }}</span>
 				</div>
 				<div>
-					<span>{{ $ts.registeredDate }}: <MkTime :time="file.createdAt" mode="detail"/></span>
+					<span>{{ i18n.ts.registeredDate }}: <MkTime :time="file.createdAt" mode="detail"/></span>
 				</div>
 			</div>
 		</MkA>
diff --git a/packages/client/src/components/form-dialog.vue b/packages/client/src/components/form-dialog.vue
index f6e547655..fd51936eb 100644
--- a/packages/client/src/components/form-dialog.vue
+++ b/packages/client/src/components/form-dialog.vue
@@ -8,7 +8,7 @@
 	@click="cancel()"
 	@ok="ok()"
 	@close="cancel()"
-	@closed="$emit('closed')"
+	@closed="emit('closed')"
 >
 	<template #header>
 		{{ title }}
@@ -18,15 +18,15 @@
 		<div class="xkpnjxcv _formRoot">
 			<template v-for="item in Object.keys(form).filter(item => !form[item].hidden)">
 				<FormInput v-if="form[item].type === 'number'" v-model="values[item]" type="number" :step="form[item].step || 1" class="_formBlock">
-					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span></template>
+					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
 					<template v-if="form[item].description" #caption>{{ form[item].description }}</template>
 				</FormInput>
 				<FormInput v-else-if="form[item].type === 'string' && !form[item].multiline" v-model="values[item]" type="text" class="_formBlock">
-					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span></template>
+					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
 					<template v-if="form[item].description" #caption>{{ form[item].description }}</template>
 				</FormInput>
 				<FormTextarea v-else-if="form[item].type === 'string' && form[item].multiline" v-model="values[item]" class="_formBlock">
-					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span></template>
+					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
 					<template v-if="form[item].description" #caption>{{ form[item].description }}</template>
 				</FormTextarea>
 				<FormSwitch v-else-if="form[item].type === 'boolean'" v-model="values[item]" class="_formBlock">
@@ -34,15 +34,15 @@
 					<template v-if="form[item].description" #caption>{{ form[item].description }}</template>
 				</FormSwitch>
 				<FormSelect v-else-if="form[item].type === 'enum'" v-model="values[item]" class="_formBlock">
-					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span></template>
+					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
 					<option v-for="blockItem in form[item].enum" :key="blockItem.value" :value="blockItem.value">{{ blockItem.label }}</option>
 				</FormSelect>
 				<FormRadios v-else-if="form[item].type === 'radio'" v-model="values[item]" class="_formBlock">
-					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span></template>
+					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
 					<option v-for="blockItem in form[item].options" :key="blockItem.value" :value="blockItem.value">{{ blockItem.label }}</option>
 				</FormRadios>
 				<FormRange v-else-if="form[item].type === 'range'" v-model="values[item]" :min="form[item].min" :max="form[item].max" :step="form[item].step" :text-converter="form[item].textConverter" class="_formBlock">
-					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ $ts.optional }})</span></template>
+					<template #label><span v-text="form[item].label || item"></span><span v-if="form[item].required === false"> ({{ i18n.ts.optional }})</span></template>
 					<template v-if="form[item].description" #caption>{{ form[item].description }}</template>
 				</FormRange>
 				<MkButton v-else-if="form[item].type === 'button'" class="_formBlock" @click="form[item].action($event, values)">
@@ -64,6 +64,7 @@ import FormRange from './form/range.vue';
 import MkButton from './ui/button.vue';
 import FormRadios from './form/radios.vue';
 import XModalWindow from '@/components/ui/modal-window.vue';
+import { i18n } from '@/i18n';
 
 let dialog = $ref<InstanceType<typeof XModalWindow>>();
 let values: Record<string, any> = $ref({});
diff --git a/packages/client/src/components/global/acct.vue b/packages/client/src/components/global/acct.vue
index c3e806b5f..c35da458b 100644
--- a/packages/client/src/components/global/acct.vue
+++ b/packages/client/src/components/global/acct.vue
@@ -1,7 +1,7 @@
 <template>
 <span class="mk-acct">
 	<span class="name">@{{ user.username }}</span>
-	<span v-if="user.host || detail || $store.state.showFullAcct" class="host">@{{ user.host || host }}</span>
+	<span v-if="user.host || detail || defaultStore.state.showFullAcct" class="host">@{{ user.host || host }}</span>
 </span>
 </template>
 
@@ -9,6 +9,7 @@
 import * as misskey from 'misskey-js';
 import { toUnicode } from 'punycode/';
 import { host as hostRaw } from '@/config';
+import { defaultStore } from '@/store';
 
 defineProps<{
 	user: misskey.entities.UserDetailed;
diff --git a/packages/client/src/components/global/avatar.vue b/packages/client/src/components/global/avatar.vue
index 4868896c9..1d0862761 100644
--- a/packages/client/src/components/global/avatar.vue
+++ b/packages/client/src/components/global/avatar.vue
@@ -1,9 +1,9 @@
 <template>
-<span v-if="disableLink" v-user-preview="disablePreview ? undefined : user.id" class="eiwwqkts _noSelect" :class="{ cat: user.isCat, square: $store.state.squareAvatars }" :style="{ color }" :title="acct(user)" @click="onClick">
+<span v-if="disableLink" v-user-preview="disablePreview ? undefined : user.id" class="eiwwqkts _noSelect" :class="{ cat: user.isCat, square: defaultStore.state.squareAvatars }" :style="{ color }" :title="acct(user)" @click="onClick">
 	<img class="inner" :src="url" decoding="async"/>
 	<MkUserOnlineIndicator v-if="showIndicator" class="indicator" :user="user"/>
 </span>
-<MkA v-else v-user-preview="disablePreview ? undefined : user.id" class="eiwwqkts _noSelect" :class="{ cat: user.isCat, square: $store.state.squareAvatars }" :style="{ color }" :to="userPage(user)" :title="acct(user)" :target="target">
+<MkA v-else v-user-preview="disablePreview ? undefined : user.id" class="eiwwqkts _noSelect" :class="{ cat: user.isCat, square: defaultStore.state.squareAvatars }" :style="{ color }" :to="userPage(user)" :title="acct(user)" :target="target">
 	<img class="inner" :src="url" decoding="async"/>
 	<MkUserOnlineIndicator v-if="showIndicator" class="indicator" :user="user"/>
 </MkA>
diff --git a/packages/client/src/components/global/error.vue b/packages/client/src/components/global/error.vue
index 5e676f8cf..11130a5c3 100644
--- a/packages/client/src/components/global/error.vue
+++ b/packages/client/src/components/global/error.vue
@@ -1,5 +1,5 @@
 <template>
-<transition :name="$store.state.animation ? 'zoom' : ''" appear>
+<transition :name="defaultStore.state.animation ? 'zoom' : ''" appear>
 	<div class="mjndxjcg">
 		<img src="https://xn--931a.moe/assets/error.jpg" class="_ghost"/>
 		<p><i class="fas fa-exclamation-triangle"></i> {{ i18n.ts.somethingHappened }}</p>
@@ -11,6 +11,7 @@
 <script lang="ts" setup>
 import MkButton from '@/components/ui/button.vue';
 import { i18n } from '@/i18n';
+import { defaultSTore } from '@/store';
 
 const emit = defineEmits<{
 	(ev: 'retry'): void;
diff --git a/packages/client/src/components/launch-pad.vue b/packages/client/src/components/launch-pad.vue
index ffefc1b08..0c4df6584 100644
--- a/packages/client/src/components/launch-pad.vue
+++ b/packages/client/src/components/launch-pad.vue
@@ -18,15 +18,15 @@
 		<div class="sub">
 			<a v-click-anime href="https://misskey-hub.net/help.html" target="_blank" @click.passive="close()">
 				<i class="fas fa-question-circle icon"></i>
-				<div class="text">{{ $ts.help }}</div>
+				<div class="text">{{ i18n.ts.help }}</div>
 			</a>
 			<MkA v-click-anime to="/about" @click.passive="close()">
 				<i class="fas fa-info-circle icon"></i>
-				<div class="text">{{ $t('aboutX', { x: instanceName }) }}</div>
+				<div class="text">{{ i18n.t('aboutX', { x: instanceName }) }}</div>
 			</MkA>
 			<MkA v-click-anime to="/about-misskey" @click.passive="close()">
 				<img src="/static-assets/favicon.png" class="icon"/>
-				<div class="text">{{ $ts.aboutMisskey }}</div>
+				<div class="text">{{ i18n.ts.aboutMisskey }}</div>
 			</MkA>
 		</div>
 	</div>
diff --git a/packages/client/src/components/media-banner.vue b/packages/client/src/components/media-banner.vue
index 5093f11e9..43cdf576b 100644
--- a/packages/client/src/components/media-banner.vue
+++ b/packages/client/src/components/media-banner.vue
@@ -2,8 +2,8 @@
 <div class="mk-media-banner">
 	<div v-if="media.isSensitive && hide" class="sensitive" @click="hide = false">
 		<span class="icon"><i class="fas fa-exclamation-triangle"></i></span>
-		<b>{{ $ts.sensitive }}</b>
-		<span>{{ $ts.clickToShow }}</span>
+		<b>{{ i18n.ts.sensitive }}</b>
+		<span>{{ i18n.ts.clickToShow }}</span>
 	</div>
 	<div v-else-if="media.type.startsWith('audio') && media.type !== 'audio/midi'" class="audio">
 		<audio ref="audioEl"
@@ -29,6 +29,7 @@
 import { onMounted } from 'vue';
 import * as misskey from 'misskey-js';
 import { ColdDeviceStorage } from '@/store';
+import { i18n } from '@/i18n';
 
 const props = withDefaults(defineProps<{
 	media: misskey.entities.DriveFile;
diff --git a/packages/client/src/components/media-caption.vue b/packages/client/src/components/media-caption.vue
index bb819d9c1..deea5207e 100644
--- a/packages/client/src/components/media-caption.vue
+++ b/packages/client/src/components/media-caption.vue
@@ -9,8 +9,8 @@
 				</header>
 				<textarea v-model="inputValue" autofocus :placeholder="input.placeholder" @keydown="onInputKeydown"></textarea>
 				<div v-if="(showOkButton || showCancelButton)" class="buttons">
-					<MkButton inline primary :disabled="remainingLength < 0" @click="ok">{{ $ts.ok }}</MkButton>
-					<MkButton inline @click="cancel">{{ $ts.cancel }}</MkButton>
+					<MkButton inline primary :disabled="remainingLength < 0" @click="ok">{{ i18n.ts.ok }}</MkButton>
+					<MkButton inline @click="cancel">{{ i18n.ts.cancel }}</MkButton>
 				</div>
 			</div>
 		</div>
@@ -35,6 +35,7 @@ import MkModal from '@/components/ui/modal.vue';
 import MkButton from '@/components/ui/button.vue';
 import bytes from '@/filters/bytes';
 import number from '@/filters/number';
+import { i18n } from '@/i18n';
 
 type Input = {
 	placeholder?: string;
diff --git a/packages/client/src/components/media-video.vue b/packages/client/src/components/media-video.vue
index 5c38691e6..68fa015e9 100644
--- a/packages/client/src/components/media-video.vue
+++ b/packages/client/src/components/media-video.vue
@@ -1,8 +1,8 @@
 <template>
 <div v-if="hide" class="icozogqfvdetwohsdglrbswgrejoxbdj" @click="hide = false">
 	<div>
-		<b><i class="fas fa-exclamation-triangle"></i> {{ $ts.sensitive }}</b>
-		<span>{{ $ts.clickToShow }}</span>
+		<b><i class="fas fa-exclamation-triangle"></i> {{ i18n.ts.sensitive }}</b>
+		<span>{{ i18n.ts.clickToShow }}</span>
 	</div>
 </div>
 <div v-else class="kkjnbbplepmiyuadieoenjgutgcmtsvu">
@@ -27,6 +27,7 @@
 import { ref } from 'vue';
 import * as misskey from 'misskey-js';
 import { defaultStore } from '@/store';
+import { i18n } from '@/i18n';
 
 const props = defineProps<{
 	video: misskey.entities.DriveFile;
diff --git a/packages/client/src/components/mention.vue b/packages/client/src/components/mention.vue
index 2c8bc0c04..6f522a8ad 100644
--- a/packages/client/src/components/mention.vue
+++ b/packages/client/src/components/mention.vue
@@ -3,7 +3,7 @@
 	<img :class="$style.icon" :src="`/avatar/@${username}@${host}`" alt="">
 	<span class="main">
 		<span class="username">@{{ username }}</span>
-		<span v-if="(host != localHost) || $store.state.showFullAcct" :class="$style.mainHost">@{{ toUnicode(host) }}</span>
+		<span v-if="(host != localHost) || defaultStore.state.showFullAcct" :class="$style.mainHost">@{{ toUnicode(host) }}</span>
 	</span>
 </MkA>
 <a v-else :class="$style.root" :href="url" target="_blank" rel="noopener" :style="{ background: bgCss }">
@@ -20,6 +20,7 @@ import { useCssModule } from 'vue';
 import tinycolor from 'tinycolor2';
 import { host as localHost } from '@/config';
 import { $i } from '@/account';
+import { defaultStore } fromn '@/store';
 
 const props = defineProps<{
 	username: string;
diff --git a/packages/client/src/components/mfm-search.vue b/packages/client/src/components/mfm-search.vue
index eb7f3cafc..8cb1c685d 100644
--- a/packages/client/src/components/mfm-search.vue
+++ b/packages/client/src/components/mfm-search.vue
@@ -1,12 +1,13 @@
 <template>
 <div class="mk-search">
 	<input v-model="query" type="search" :placeholder="q">
-	<button><i class="fas fa-search"></i> {{ $ts.search }}</button>
+	<button><i class="fas fa-search"></i> {{ i18n.ts.search }}</button>
 </div>
 </template>
 
 <script lang="ts" setup>
 import { ref } from 'vue';
+import { i18n } from '@/i18n';
 
 const props = defineProps<{
 	q: string;
diff --git a/packages/client/src/ui/visitor/b.vue b/packages/client/src/ui/visitor/b.vue
index 28933f272..144a83ccb 100644
--- a/packages/client/src/ui/visitor/b.vue
+++ b/packages/client/src/ui/visitor/b.vue
@@ -21,7 +21,7 @@
 		</div>
 	</div>
 
-	<transition :name="$store.state.animation ? 'tray-back' : ''">
+	<transition :name="defaultStore.state.animation ? 'tray-back' : ''">
 		<div
 			v-if="showMenu"
 			class="menu-back _modalBg"
@@ -30,15 +30,15 @@
 		></div>
 	</transition>
 
-	<transition :name="$store.state.animation ? 'tray' : ''">
+	<transition :name="defaultStore.state.animation ? 'tray' : ''">
 		<div v-if="showMenu" class="menu">
-			<MkA to="/" class="link" active-class="active"><i class="fas fa-home icon"></i>{{ $ts.home }}</MkA>
-			<MkA to="/explore" class="link" active-class="active"><i class="fas fa-hashtag icon"></i>{{ $ts.explore }}</MkA>
-			<MkA to="/featured" class="link" active-class="active"><i class="fas fa-fire-alt icon"></i>{{ $ts.featured }}</MkA>
-			<MkA to="/channels" class="link" active-class="active"><i class="fas fa-satellite-dish icon"></i>{{ $ts.channel }}</MkA>
+			<MkA to="/" class="link" active-class="active"><i class="fas fa-home icon"></i>{{ i18n.ts.home }}</MkA>
+			<MkA to="/explore" class="link" active-class="active"><i class="fas fa-hashtag icon"></i>{{ i18n.ts.explore }}</MkA>
+			<MkA to="/featured" class="link" active-class="active"><i class="fas fa-fire-alt icon"></i>{{ i18n.ts.featured }}</MkA>
+			<MkA to="/channels" class="link" active-class="active"><i class="fas fa-satellite-dish icon"></i>{{ i18n.ts.channel }}</MkA>
 			<div class="action">
-				<button class="_buttonPrimary" @click="signup()">{{ $ts.signup }}</button>
-				<button class="_button" @click="signin()">{{ $ts.login }}</button>
+				<button class="_buttonPrimary" @click="signup()">{{ i18n.ts.signup }}</button>
+				<button class="_button" @click="signin()">{{ i18n.ts.login }}</button>
 			</div>
 		</div>
 	</transition>
@@ -59,6 +59,7 @@ import MkButton from '@/components/ui/button.vue';
 import { ColdDeviceStorage, defaultStore } from '@/store';
 import { mainRouter } from '@/router';
 import { PageMetadata, provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata';
+import { i18n } from '@/i18n';
 
 const DESKTOP_THRESHOLD = 1100;
 

From c5b3a40b0cba1d85f03ca2fbb1ab9215c4686695 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 2 Aug 2022 12:03:25 +0200
Subject: [PATCH 12/34] add nano swap files to gitignore

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

diff --git a/.gitignore b/.gitignore
index 9928d93aa..d1f97f2eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,9 @@
 # Intelij-IDEA
 /.idea
 
+# nano
+.swp
+
 # Node.js
 node_modules
 report.*.json

From f3a602c384522db8af20e210d72b0ce3fa64c365 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 2 Aug 2022 14:37:31 +0200
Subject: [PATCH 13/34] fix typo in import

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

diff --git a/packages/client/src/components/mention.vue b/packages/client/src/components/mention.vue
index 6f522a8ad..9a98f2405 100644
--- a/packages/client/src/components/mention.vue
+++ b/packages/client/src/components/mention.vue
@@ -20,7 +20,7 @@ import { useCssModule } from 'vue';
 import tinycolor from 'tinycolor2';
 import { host as localHost } from '@/config';
 import { $i } from '@/account';
-import { defaultStore } fromn '@/store';
+import { defaultStore } from '@/store';
 
 const props = defineProps<{
 	username: string;

From 646b8e08c029aecfc44daf400a90eb73462066a2 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 2 Aug 2022 17:06:08 +0200
Subject: [PATCH 14/34] fix another typo in import

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

diff --git a/packages/client/src/components/global/error.vue b/packages/client/src/components/global/error.vue
index 11130a5c3..740404a3d 100644
--- a/packages/client/src/components/global/error.vue
+++ b/packages/client/src/components/global/error.vue
@@ -11,7 +11,7 @@
 <script lang="ts" setup>
 import MkButton from '@/components/ui/button.vue';
 import { i18n } from '@/i18n';
-import { defaultSTore } from '@/store';
+import { defaultStore } from '@/store';
 
 const emit = defineEmits<{
 	(ev: 'retry'): void;

From fbcea23ef6ef125cdb974324f29c612b342ddae3 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 2 Aug 2022 21:23:16 +0200
Subject: [PATCH 15/34] fix ReferenceError in renote.ts

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

diff --git a/packages/backend/src/misc/renote.ts b/packages/backend/src/misc/renote.ts
index e4b8c06e1..015c26d65 100644
--- a/packages/backend/src/misc/renote.ts
+++ b/packages/backend/src/misc/renote.ts
@@ -1,5 +1,5 @@
 import { Note } from '@/models/entities/note.js';
 
 export function isPureRenote(note: Note): boolean {
-	return note.renoteId != null && note.text == null && (renote.fileIds == null || renote.fileIds.length === 0) && !note.hasPoll;
+	return note.renoteId != null && note.text == null && (note.fileIds == null || note.fileIds.length === 0) && !note.hasPoll;
 }

From 4122d90f561495f0c6e553e4a7969ea1bd6ded36 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 2 Aug 2022 21:46:39 +0200
Subject: [PATCH 16/34] fix typo

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

diff --git a/packages/client/src/ui/classic.widgets.vue b/packages/client/src/ui/classic.widgets.vue
index d34511011..2c57b60d8 100644
--- a/packages/client/src/ui/classic.widgets.vue
+++ b/packages/client/src/ui/classic.widgets.vue
@@ -2,7 +2,7 @@
 <div class="ddiqwdnk">
 	<XWidgets class="widgets" :edit="editMode" :widgets="defaultStore.reactiveState.widgets.value.filter(w => w.place === place)" @add-widget="addWidget" @remove-widget="removeWidget" @update-widget="updateWidget" @update-widgets="updateWidgets" @exit="editMode = false"/>
 
-	<button v-if="editMode" class="_textButton edit" style="font-size: 0.9em;" @click="editMode = false"><i class="fas fa-check"></i> {{ i81n.ts.editWidgetsExit }}</button>
+	<button v-if="editMode" class="_textButton edit" style="font-size: 0.9em;" @click="editMode = false"><i class="fas fa-check"></i> {{ i18n.ts.editWidgetsExit }}</button>
 	<button v-else class="_textButton edit" style="font-size: 0.9em;" @click="editMode = true"><i class="fas fa-pencil-alt"></i> {{ i18n.ts.editWidgets }}</button>
 </div>
 </template>

From a6df127d3b102a8effc6c9c67d9b0933ff3d3ac6 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Tue, 2 Aug 2022 23:25:36 +0200
Subject: [PATCH 17/34] fix lint "quotes"

---
 packages/backend/src/boot/master.ts            |  2 +-
 packages/backend/src/misc/get-file-info.ts     |  4 ++--
 packages/backend/src/misc/get-note-summary.ts  |  4 ++--
 .../src/queue/processors/db/delete-account.ts  |  8 ++++----
 .../processors/db/export-custom-emojis.ts      |  2 +-
 .../processors/db/import-custom-emojis.ts      |  2 +-
 packages/backend/src/queue/processors/inbox.ts | 12 ++++++------
 .../object-storage/clean-remote-files.ts       |  4 ++--
 .../processors/system/check-expired-mutings.ts |  4 ++--
 .../queue/processors/system/clean-charts.ts    |  4 ++--
 .../queue/processors/system/resync-charts.ts   |  4 ++--
 .../src/queue/processors/system/tick-charts.ts |  4 ++--
 .../remote/activitypub/kernel/accept/follow.ts |  6 +++---
 .../remote/activitypub/kernel/block/index.ts   |  6 +++---
 .../remote/activitypub/kernel/create/note.ts   |  4 ++--
 .../remote/activitypub/kernel/delete/actor.ts  |  2 +-
 .../remote/activitypub/kernel/flag/index.ts    |  4 ++--
 .../src/remote/activitypub/kernel/follow.ts    |  6 +++---
 .../src/remote/activitypub/kernel/read.ts      |  4 ++--
 .../remote/activitypub/kernel/reject/follow.ts |  6 +++---
 .../remote/activitypub/kernel/undo/accept.ts   |  6 +++---
 .../remote/activitypub/kernel/undo/block.ts    |  6 +++---
 .../remote/activitypub/kernel/undo/follow.ts   | 10 +++++-----
 .../src/remote/activitypub/kernel/undo/like.ts |  2 +-
 .../remote/activitypub/kernel/update/index.ts  |  6 +++---
 .../src/remote/activitypub/models/note.ts      |  2 +-
 .../src/remote/activitypub/renderer/note.ts    |  2 +-
 .../src/remote/activitypub/renderer/person.ts  |  2 +-
 packages/backend/src/remote/resolve-user.ts    |  2 +-
 .../server/api/common/generate-block-query.ts  |  4 ++--
 .../common/generate-muted-note-thread-query.ts |  2 +-
 .../api/common/generate-replies-query.ts       | 10 +++++-----
 .../api/common/generate-visibility-query.ts    | 10 +++++-----
 .../backend/src/server/api/common/getters.ts   |  2 +-
 .../src/server/api/common/inject-featured.ts   |  6 +++---
 .../api/common/read-messaging-message.ts       |  2 +-
 .../api/endpoints/admin/abuse-user-reports.ts  |  4 ++--
 .../api/endpoints/admin/emoji/list-remote.ts   |  4 ++--
 .../server/api/endpoints/admin/emoji/list.ts   |  2 +-
 .../api/endpoints/admin/get-index-stats.ts     |  2 +-
 .../src/server/api/endpoints/blocking/list.ts  |  2 +-
 .../api/endpoints/drive/folders/create.ts      |  2 +-
 .../api/endpoints/federation/followers.ts      |  2 +-
 .../api/endpoints/federation/following.ts      |  2 +-
 .../server/api/endpoints/federation/users.ts   |  2 +-
 .../src/server/api/endpoints/hashtags/trend.ts |  8 ++++----
 .../src/server/api/endpoints/hashtags/users.ts |  4 ++--
 .../server/api/endpoints/i/authorized-apps.ts  |  2 +-
 .../src/server/api/endpoints/i/favorites.ts    |  2 +-
 .../server/api/endpoints/i/gallery/likes.ts    |  2 +-
 .../server/api/endpoints/i/gallery/posts.ts    |  2 +-
 .../src/server/api/endpoints/i/page-likes.ts   |  2 +-
 .../src/server/api/endpoints/i/pages.ts        |  2 +-
 .../endpoints/i/read-all-messaging-messages.ts |  2 +-
 .../server/api/endpoints/i/signin-history.ts   |  2 +-
 .../api/endpoints/i/user-group-invites.ts      |  2 +-
 .../server/api/endpoints/messaging/history.ts  | 18 +++++++++---------
 .../server/api/endpoints/messaging/messages.ts |  2 +-
 .../src/server/api/endpoints/mute/list.ts      |  2 +-
 .../api/endpoints/users/gallery/posts.ts       |  2 +-
 packages/backend/src/server/file/index.ts      |  2 +-
 packages/backend/src/server/proxy/index.ts     |  2 +-
 packages/backend/src/server/web/index.ts       |  4 ++--
 .../src/services/chart/charts/federation.ts    | 18 +++++++++---------
 .../backend/src/services/drive/add-file.ts     | 16 ++++++++--------
 .../backend/src/services/following/create.ts   |  4 ++--
 .../backend/src/services/update-hashtag.ts     | 18 +++++++++---------
 packages/shared/.eslintrc.js                   |  5 +++--
 68 files changed, 156 insertions(+), 155 deletions(-)

diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index 0fa5fa959..0c936e72b 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -154,7 +154,7 @@ function spawnWorker(): Promise<void> {
 		const worker = cluster.fork();
 		worker.on('message', message => {
 			if (message === 'listenFailed') {
-				bootLogger.error(`The server Listen failed due to the previous error.`);
+				bootLogger.error('The server Listen failed due to the previous error.');
 				process.exit(1);
 			}
 			if (message !== 'ready') return;
diff --git a/packages/backend/src/misc/get-file-info.ts b/packages/backend/src/misc/get-file-info.ts
index d70dc3d70..2618a639f 100644
--- a/packages/backend/src/misc/get-file-info.ts
+++ b/packages/backend/src/misc/get-file-info.ts
@@ -58,7 +58,7 @@ export async function getFileInfo(path: string): Promise<FileInfo> {
 
 		// うまく判定できない画像は octet-stream にする
 		if (!imageSize) {
-			warnings.push(`cannot detect image dimensions`);
+			warnings.push('cannot detect image dimensions');
 			type = TYPE_OCTET_STREAM;
 		} else if (imageSize.wUnits === 'px') {
 			width = imageSize.width;
@@ -67,7 +67,7 @@ export async function getFileInfo(path: string): Promise<FileInfo> {
 
 			// 制限を超えている画像は octet-stream にする
 			if (imageSize.width > 16383 || imageSize.height > 16383) {
-				warnings.push(`image dimensions exceeds limits`);
+				warnings.push('image dimensions exceeds limits');
 				type = TYPE_OCTET_STREAM;
 			}
 		} else {
diff --git a/packages/backend/src/misc/get-note-summary.ts b/packages/backend/src/misc/get-note-summary.ts
index 45fb50964..469b9cfa4 100644
--- a/packages/backend/src/misc/get-note-summary.ts
+++ b/packages/backend/src/misc/get-note-summary.ts
@@ -6,7 +6,7 @@ import { Packed } from './schema.js';
  */
 export const getNoteSummary = (note: Packed<'Note'>): string => {
 	if (note.deletedAt) {
-		return `(❌⛔)`;
+		return '(❌⛔)';
 	}
 
 	let summary = '';
@@ -25,7 +25,7 @@ export const getNoteSummary = (note: Packed<'Note'>): string => {
 
 	// 投票が添付されているとき
 	if (note.poll) {
-		summary += ` (📊)`;
+		summary += ' (📊)';
 	}
 
 	// 返信のとき
diff --git a/packages/backend/src/queue/processors/db/delete-account.ts b/packages/backend/src/queue/processors/db/delete-account.ts
index c1657b4be..d36e2c7b7 100644
--- a/packages/backend/src/queue/processors/db/delete-account.ts
+++ b/packages/backend/src/queue/processors/db/delete-account.ts
@@ -42,7 +42,7 @@ export async function deleteAccount(job: Bull.Job<DbUserDeleteJobData>): Promise
 			await Notes.delete(notes.map(note => note.id));
 		}
 
-		logger.succ(`All of notes deleted`);
+		logger.succ('All of notes deleted');
 	}
 
 	{ // Delete files
@@ -71,15 +71,15 @@ export async function deleteAccount(job: Bull.Job<DbUserDeleteJobData>): Promise
 			}
 		}
 
-		logger.succ(`All of files deleted`);
+		logger.succ('All of files deleted');
 	}
 
 	{ // Send email notification
 		const profile = await UserProfiles.findOneByOrFail({ userId: user.id });
 		if (profile.email && profile.emailVerified) {
 			sendEmail(profile.email, 'Account deleted',
-				`Your account has been deleted.`,
-				`Your account has been deleted.`);
+				'Your account has been deleted.',
+				'Your account has been deleted.');
 		}
 	}
 
diff --git a/packages/backend/src/queue/processors/db/export-custom-emojis.ts b/packages/backend/src/queue/processors/db/export-custom-emojis.ts
index a353d7a99..e2c3bf500 100644
--- a/packages/backend/src/queue/processors/db/export-custom-emojis.ts
+++ b/packages/backend/src/queue/processors/db/export-custom-emojis.ts
@@ -16,7 +16,7 @@ import { IsNull } from 'typeorm';
 const logger = queueLogger.createSubLogger('export-custom-emojis');
 
 export async function exportCustomEmojis(job: Bull.Job, done: () => void): Promise<void> {
-	logger.info(`Exporting custom emojis ...`);
+	logger.info('Exporting custom emojis ...');
 
 	const user = await Users.findOneBy({ id: job.data.user.id });
 	if (user == null) {
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 64dfe8537..8b1190818 100644
--- a/packages/backend/src/queue/processors/db/import-custom-emojis.ts
+++ b/packages/backend/src/queue/processors/db/import-custom-emojis.ts
@@ -15,7 +15,7 @@ const logger = queueLogger.createSubLogger('import-custom-emojis');
 
 // TODO: 名前衝突時の動作を選べるようにする
 export async function importCustomEmojis(job: Bull.Job<DbUserImportJobData>, done: any): Promise<void> {
-	logger.info(`Importing custom emojis ...`);
+	logger.info('Importing custom emojis ...');
 
 	const file = await DriveFiles.findOneBy({
 		id: job.data.fileId,
diff --git a/packages/backend/src/queue/processors/inbox.ts b/packages/backend/src/queue/processors/inbox.ts
index 198dde605..636f2138c 100644
--- a/packages/backend/src/queue/processors/inbox.ts
+++ b/packages/backend/src/queue/processors/inbox.ts
@@ -69,12 +69,12 @@ export default async (job: Bull.Job<InboxJobData>): Promise<string> => {
 
 	// それでもわからなければ終了
 	if (authUser == null) {
-		return `skip: failed to resolve user`;
+		return 'skip: failed to resolve user';
 	}
 
 	// publicKey がなくても終了
 	if (authUser.key == null) {
-		return `skip: failed to resolve user publicKey`;
+		return 'skip: failed to resolve user publicKey';
 	}
 
 	// HTTP-Signatureの検証
@@ -98,18 +98,18 @@ export default async (job: Bull.Job<InboxJobData>): Promise<string> => {
 			// keyIdからLD-Signatureのユーザーを取得
 			authUser = await dbResolver.getAuthUserFromKeyId(activity.signature.creator);
 			if (authUser == null) {
-				return `skip: LD-Signatureのユーザーが取得できませんでした`;
+				return 'skip: LD-Signatureのユーザーが取得できませんでした';
 			}
 
 			if (authUser.key == null) {
-				return `skip: LD-SignatureのユーザーはpublicKeyを持っていませんでした`;
+				return 'skip: LD-SignatureのユーザーはpublicKeyを持っていませんでした';
 			}
 
 			// LD-Signature検証
 			const ldSignature = new LdSignature();
 			const verified = await ldSignature.verifyRsaSignature2017(activity, authUser.key.keyPem).catch(() => false);
 			if (!verified) {
-				return `skip: LD-Signatureの検証に失敗しました`;
+				return 'skip: LD-Signatureの検証に失敗しました';
 			}
 
 			// もう一度actorチェック
@@ -153,5 +153,5 @@ export default async (job: Bull.Job<InboxJobData>): Promise<string> => {
 
 	// アクティビティを処理
 	await perform(authUser.user, activity);
-	return `ok`;
+	return 'ok';
 };
diff --git a/packages/backend/src/queue/processors/object-storage/clean-remote-files.ts b/packages/backend/src/queue/processors/object-storage/clean-remote-files.ts
index 77da162f6..e6638edb1 100644
--- a/packages/backend/src/queue/processors/object-storage/clean-remote-files.ts
+++ b/packages/backend/src/queue/processors/object-storage/clean-remote-files.ts
@@ -8,7 +8,7 @@ import { MoreThan, Not, IsNull } from 'typeorm';
 const logger = queueLogger.createSubLogger('clean-remote-files');
 
 export default async function cleanRemoteFiles(job: Bull.Job<Record<string, unknown>>, done: any): Promise<void> {
-	logger.info(`Deleting cached remote files...`);
+	logger.info('Deleting cached remote files...');
 
 	let deletedCount = 0;
 	let cursor: any = null;
@@ -45,6 +45,6 @@ export default async function cleanRemoteFiles(job: Bull.Job<Record<string, unkn
 		job.progress(deletedCount / total);
 	}
 
-	logger.succ(`All cahced remote files has been deleted.`);
+	logger.succ('All cahced remote files has been deleted.');
 	done();
 }
diff --git a/packages/backend/src/queue/processors/system/check-expired-mutings.ts b/packages/backend/src/queue/processors/system/check-expired-mutings.ts
index 621269e7e..f8f78f317 100644
--- a/packages/backend/src/queue/processors/system/check-expired-mutings.ts
+++ b/packages/backend/src/queue/processors/system/check-expired-mutings.ts
@@ -7,7 +7,7 @@ import { publishUserEvent } from '@/services/stream.js';
 const logger = queueLogger.createSubLogger('check-expired-mutings');
 
 export async function checkExpiredMutings(job: Bull.Job<Record<string, unknown>>, done: any): Promise<void> {
-	logger.info(`Checking expired mutings...`);
+	logger.info('Checking expired mutings...');
 
 	const expired = await Mutings.createQueryBuilder('muting')
 		.where('muting.expiresAt IS NOT NULL')
@@ -25,6 +25,6 @@ export async function checkExpiredMutings(job: Bull.Job<Record<string, unknown>>
 		}
 	}
 
-	logger.succ(`All expired mutings checked.`);
+	logger.succ('All expired mutings checked.');
 	done();
 }
diff --git a/packages/backend/src/queue/processors/system/clean-charts.ts b/packages/backend/src/queue/processors/system/clean-charts.ts
index c9169d5ac..340072931 100644
--- a/packages/backend/src/queue/processors/system/clean-charts.ts
+++ b/packages/backend/src/queue/processors/system/clean-charts.ts
@@ -6,7 +6,7 @@ import { activeUsersChart, driveChart, federationChart, hashtagChart, instanceCh
 const logger = queueLogger.createSubLogger('clean-charts');
 
 export async function cleanCharts(job: Bull.Job<Record<string, unknown>>, done: any): Promise<void> {
-	logger.info(`Clean charts...`);
+	logger.info('Clean charts...');
 
 	await Promise.all([
 		federationChart.clean(),
@@ -23,6 +23,6 @@ export async function cleanCharts(job: Bull.Job<Record<string, unknown>>, done:
 		apRequestChart.clean(),
 	]);
 
-	logger.succ(`All charts successfully cleaned.`);
+	logger.succ('All charts successfully cleaned.');
 	done();
 }
diff --git a/packages/backend/src/queue/processors/system/resync-charts.ts b/packages/backend/src/queue/processors/system/resync-charts.ts
index 20012513a..61115d4b7 100644
--- a/packages/backend/src/queue/processors/system/resync-charts.ts
+++ b/packages/backend/src/queue/processors/system/resync-charts.ts
@@ -6,7 +6,7 @@ import { driveChart, notesChart, usersChart } from '@/services/chart/index.js';
 const logger = queueLogger.createSubLogger('resync-charts');
 
 export async function resyncCharts(job: Bull.Job<Record<string, unknown>>, done: any): Promise<void> {
-	logger.info(`Resync charts...`);
+	logger.info('Resync charts...');
 
 	// TODO: ユーザーごとのチャートも更新する
 	// TODO: インスタンスごとのチャートも更新する
@@ -16,6 +16,6 @@ export async function resyncCharts(job: Bull.Job<Record<string, unknown>>, done:
 		usersChart.resync(),
 	]);
 
-	logger.succ(`All charts successfully resynced.`);
+	logger.succ('All charts successfully resynced.');
 	done();
 }
diff --git a/packages/backend/src/queue/processors/system/tick-charts.ts b/packages/backend/src/queue/processors/system/tick-charts.ts
index 13403f8f7..ab198c764 100644
--- a/packages/backend/src/queue/processors/system/tick-charts.ts
+++ b/packages/backend/src/queue/processors/system/tick-charts.ts
@@ -6,7 +6,7 @@ import { activeUsersChart, driveChart, federationChart, hashtagChart, instanceCh
 const logger = queueLogger.createSubLogger('tick-charts');
 
 export async function tickCharts(job: Bull.Job<Record<string, unknown>>, done: any): Promise<void> {
-	logger.info(`Tick charts...`);
+	logger.info('Tick charts...');
 
 	await Promise.all([
 		federationChart.tick(false),
@@ -23,6 +23,6 @@ export async function tickCharts(job: Bull.Job<Record<string, unknown>>, done: a
 		apRequestChart.tick(false),
 	]);
 
-	logger.succ(`All charts successfully ticked.`);
+	logger.succ('All charts successfully ticked.');
 	done();
 }
diff --git a/packages/backend/src/remote/activitypub/kernel/accept/follow.ts b/packages/backend/src/remote/activitypub/kernel/accept/follow.ts
index 4350ef133..2d9f689be 100644
--- a/packages/backend/src/remote/activitypub/kernel/accept/follow.ts
+++ b/packages/backend/src/remote/activitypub/kernel/accept/follow.ts
@@ -11,11 +11,11 @@ export default async (actor: CacheableRemoteUser, activity: IFollow): Promise<st
 	const follower = await dbResolver.getUserFromApId(activity.actor);
 
 	if (follower == null) {
-		return `skip: follower not found`;
+		return 'skip: follower not found';
 	}
 
 	if (follower.host != null) {
-		return `skip: follower is not a local user`;
+		return 'skip: follower is not a local user';
 	}
 
 	// relay
@@ -25,5 +25,5 @@ export default async (actor: CacheableRemoteUser, activity: IFollow): Promise<st
 	}
 
 	await accept(actor, follower);
-	return `ok`;
+	return 'ok';
 };
diff --git a/packages/backend/src/remote/activitypub/kernel/block/index.ts b/packages/backend/src/remote/activitypub/kernel/block/index.ts
index 5e230ad7b..f693b7116 100644
--- a/packages/backend/src/remote/activitypub/kernel/block/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/block/index.ts
@@ -11,13 +11,13 @@ export default async (actor: CacheableRemoteUser, activity: IBlock): Promise<str
 	const blockee = await dbResolver.getUserFromApId(activity.object);
 
 	if (blockee == null) {
-		return `skip: blockee not found`;
+		return 'skip: blockee not found';
 	}
 
 	if (blockee.host != null) {
-		return `skip: ブロックしようとしているユーザーはローカルユーザーではありません`;
+		return 'skip: ブロックしようとしているユーザーはローカルユーザーではありません';
 	}
 
 	await block(await Users.findOneByOrFail({ id: actor.id }), await Users.findOneByOrFail({ id: blockee.id }));
-	return `ok`;
+	return 'ok';
 };
diff --git a/packages/backend/src/remote/activitypub/kernel/create/note.ts b/packages/backend/src/remote/activitypub/kernel/create/note.ts
index f8dabe06e..b9fcda87c 100644
--- a/packages/backend/src/remote/activitypub/kernel/create/note.ts
+++ b/packages/backend/src/remote/activitypub/kernel/create/note.ts
@@ -14,12 +14,12 @@ export default async function(resolver: Resolver, actor: CacheableRemoteUser, no
 
 	if (typeof note === 'object') {
 		if (actor.uri !== note.attributedTo) {
-			return `skip: actor.uri !== note.attributedTo`;
+			return 'skip: actor.uri !== note.attributedTo';
 		}
 
 		if (typeof note.id === 'string') {
 			if (extractDbHost(actor.uri) !== extractDbHost(note.id)) {
-				return `skip: host in actor.uri !== note.id`;
+				return 'skip: host in actor.uri !== note.id';
 			}
 		}
 	}
diff --git a/packages/backend/src/remote/activitypub/kernel/delete/actor.ts b/packages/backend/src/remote/activitypub/kernel/delete/actor.ts
index 1f94df033..9bc73e118 100644
--- a/packages/backend/src/remote/activitypub/kernel/delete/actor.ts
+++ b/packages/backend/src/remote/activitypub/kernel/delete/actor.ts
@@ -14,7 +14,7 @@ export async function deleteActor(actor: CacheableRemoteUser, uri: string): Prom
 
 	const user = await Users.findOneByOrFail({ id: actor.id });
 	if (user.isDeleted) {
-		logger.info(`skip: already deleted`);
+		logger.info('skip: already deleted');
 	}
 
 	const job = await createDeleteAccountJob(actor);
diff --git a/packages/backend/src/remote/activitypub/kernel/flag/index.ts b/packages/backend/src/remote/activitypub/kernel/flag/index.ts
index 8ada5e260..b142545ad 100644
--- a/packages/backend/src/remote/activitypub/kernel/flag/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/flag/index.ts
@@ -14,7 +14,7 @@ export default async (actor: CacheableRemoteUser, activity: IFlag): Promise<stri
 	const users = await Users.findBy({
 		id: In(userIds),
 	});
-	if (users.length < 1) return `skip`;
+	if (users.length < 1) return 'skip';
 
 	await AbuseUserReports.insert({
 		id: genId(),
@@ -27,5 +27,5 @@ export default async (actor: CacheableRemoteUser, activity: IFlag): Promise<stri
 		urls: uris.filter(uri => !uri.startsWith(config.url + '/users/')),
 	});
 
-	return `ok`;
+	return 'ok';
 };
diff --git a/packages/backend/src/remote/activitypub/kernel/follow.ts b/packages/backend/src/remote/activitypub/kernel/follow.ts
index a9e92fa22..f5d551db8 100644
--- a/packages/backend/src/remote/activitypub/kernel/follow.ts
+++ b/packages/backend/src/remote/activitypub/kernel/follow.ts
@@ -8,13 +8,13 @@ export default async (actor: CacheableRemoteUser, activity: IFollow): Promise<st
 	const followee = await dbResolver.getUserFromApId(activity.object);
 
 	if (followee == null) {
-		return `skip: followee not found`;
+		return 'skip: followee not found';
 	}
 
 	if (followee.host != null) {
-		return `skip: フォローしようとしているユーザーはローカルユーザーではありません`;
+		return 'skip: フォローしようとしているユーザーはローカルユーザーではありません';
 	}
 
 	await follow(actor, followee, activity.id);
-	return `ok`;
+	return 'ok';
 };
diff --git a/packages/backend/src/remote/activitypub/kernel/read.ts b/packages/backend/src/remote/activitypub/kernel/read.ts
index f7b0bcecd..13f64de89 100644
--- a/packages/backend/src/remote/activitypub/kernel/read.ts
+++ b/packages/backend/src/remote/activitypub/kernel/read.ts
@@ -15,11 +15,11 @@ export const performReadActivity = async (actor: CacheableRemoteUser, activity:
 
 	const message = await MessagingMessages.findOneBy({ id: messageId });
 	if (message == null) {
-		return `skip: message not found`;
+		return 'skip: message not found';
 	}
 
 	if (actor.id !== message.recipientId) {
-		return `skip: actor is not a message recipient`;
+		return 'skip: actor is not a message recipient';
 	}
 
 	await readUserMessagingMessage(message.recipientId!, message.userId, [message.id]);
diff --git a/packages/backend/src/remote/activitypub/kernel/reject/follow.ts b/packages/backend/src/remote/activitypub/kernel/reject/follow.ts
index 824ac69d7..5ad32d26a 100644
--- a/packages/backend/src/remote/activitypub/kernel/reject/follow.ts
+++ b/packages/backend/src/remote/activitypub/kernel/reject/follow.ts
@@ -12,11 +12,11 @@ export default async (actor: CacheableRemoteUser, activity: IFollow): Promise<st
 	const follower = await dbResolver.getUserFromApId(activity.actor);
 
 	if (follower == null) {
-		return `skip: follower not found`;
+		return 'skip: follower not found';
 	}
 
 	if (!Users.isLocalUser(follower)) {
-		return `skip: follower is not a local user`;
+		return 'skip: follower is not a local user';
 	}
 
 	// relay
@@ -26,5 +26,5 @@ export default async (actor: CacheableRemoteUser, activity: IFollow): Promise<st
 	}
 
 	await remoteReject(actor, follower);
-	return `ok`;
+	return 'ok';
 };
diff --git a/packages/backend/src/remote/activitypub/kernel/undo/accept.ts b/packages/backend/src/remote/activitypub/kernel/undo/accept.ts
index 2e8a215af..c9710ab31 100644
--- a/packages/backend/src/remote/activitypub/kernel/undo/accept.ts
+++ b/packages/backend/src/remote/activitypub/kernel/undo/accept.ts
@@ -9,7 +9,7 @@ export default async (actor: CacheableRemoteUser, activity: IAccept): Promise<st
 
 	const follower = await dbResolver.getUserFromApId(activity.object);
 	if (follower == null) {
-		return `skip: follower not found`;
+		return 'skip: follower not found';
 	}
 
 	const following = await Followings.findOneBy({
@@ -19,8 +19,8 @@ export default async (actor: CacheableRemoteUser, activity: IAccept): Promise<st
 
 	if (following) {
 		await unfollow(follower, actor);
-		return `ok: unfollowed`;
+		return 'ok: unfollowed';
 	}
 
-	return `skip: フォローされていない`;
+	return 'skip: フォローされていない';
 };
diff --git a/packages/backend/src/remote/activitypub/kernel/undo/block.ts b/packages/backend/src/remote/activitypub/kernel/undo/block.ts
index 4ac669857..4c5e5d144 100644
--- a/packages/backend/src/remote/activitypub/kernel/undo/block.ts
+++ b/packages/backend/src/remote/activitypub/kernel/undo/block.ts
@@ -9,13 +9,13 @@ export default async (actor: CacheableRemoteUser, activity: IBlock): Promise<str
 	const blockee = await dbResolver.getUserFromApId(activity.object);
 
 	if (blockee == null) {
-		return `skip: blockee not found`;
+		return 'skip: blockee not found';
 	}
 
 	if (blockee.host != null) {
-		return `skip: ブロック解除しようとしているユーザーはローカルユーザーではありません`;
+		return 'skip: ブロック解除しようとしているユーザーはローカルユーザーではありません';
 	}
 
 	await unblock(await Users.findOneByOrFail({ id: actor.id }), blockee);
-	return `ok`;
+	return 'ok';
 };
diff --git a/packages/backend/src/remote/activitypub/kernel/undo/follow.ts b/packages/backend/src/remote/activitypub/kernel/undo/follow.ts
index 6a43c1444..d2e9d26cc 100644
--- a/packages/backend/src/remote/activitypub/kernel/undo/follow.ts
+++ b/packages/backend/src/remote/activitypub/kernel/undo/follow.ts
@@ -10,11 +10,11 @@ export default async (actor: CacheableRemoteUser, activity: IFollow): Promise<st
 
 	const followee = await dbResolver.getUserFromApId(activity.object);
 	if (followee == null) {
-		return `skip: followee not found`;
+		return 'skip: followee not found';
 	}
 
 	if (followee.host != null) {
-		return `skip: フォロー解除しようとしているユーザーはローカルユーザーではありません`;
+		return 'skip: フォロー解除しようとしているユーザーはローカルユーザーではありません';
 	}
 
 	const req = await FollowRequests.findOneBy({
@@ -29,13 +29,13 @@ export default async (actor: CacheableRemoteUser, activity: IFollow): Promise<st
 
 	if (req) {
 		await cancelRequest(followee, actor);
-		return `ok: follow request canceled`;
+		return 'ok: follow request canceled';
 	}
 
 	if (following) {
 		await unfollow(actor, followee);
-		return `ok: unfollowed`;
+		return 'ok: unfollowed';
 	}
 
-	return `skip: リクエストもフォローもされていない`;
+	return 'skip: リクエストもフォローもされていない';
 };
diff --git a/packages/backend/src/remote/activitypub/kernel/undo/like.ts b/packages/backend/src/remote/activitypub/kernel/undo/like.ts
index 01aeba1fb..2797e4501 100644
--- a/packages/backend/src/remote/activitypub/kernel/undo/like.ts
+++ b/packages/backend/src/remote/activitypub/kernel/undo/like.ts
@@ -17,5 +17,5 @@ export default async (actor: CacheableRemoteUser, activity: ILike) => {
 		throw e;
 	});
 
-	return `ok`;
+	return 'ok';
 };
diff --git a/packages/backend/src/remote/activitypub/kernel/update/index.ts b/packages/backend/src/remote/activitypub/kernel/update/index.ts
index 9e8a81bb3..1a700f275 100644
--- a/packages/backend/src/remote/activitypub/kernel/update/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/update/index.ts
@@ -10,7 +10,7 @@ import { updatePerson } from '../../models/person.js';
  */
 export default async (actor: CacheableRemoteUser, activity: IUpdate): Promise<string> => {
 	if ('actor' in activity && actor.uri !== activity.actor) {
-		return `skip: invalid actor`;
+		return 'skip: invalid actor';
 	}
 
 	apLogger.debug('Update');
@@ -24,10 +24,10 @@ export default async (actor: CacheableRemoteUser, activity: IUpdate): Promise<st
 
 	if (isActor(object)) {
 		await updatePerson(actor.uri!, resolver, object);
-		return `ok: Person updated`;
+		return 'ok: Person updated';
 	} else if (getApType(object) === 'Question') {
 		await updateQuestion(object).catch(e => console.log(e));
-		return `ok: Question updated`;
+		return 'ok: Question updated';
 	} else {
 		return `skip: Unknown type: ${getApType(object)}`;
 	}
diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index 5d63f2605..f9aad08dc 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -131,7 +131,7 @@ export async function createNote(value: string | IObject, resolver?: Resolver, s
 	const reply: Note | null = note.inReplyTo
 		? await resolveNote(note.inReplyTo, resolver).then(x => {
 			if (x == null) {
-				logger.warn(`Specified inReplyTo, but nout found`);
+				logger.warn('Specified inReplyTo, but nout found');
 				throw new Error('inReplyTo not found');
 			} else {
 				return x;
diff --git a/packages/backend/src/remote/activitypub/renderer/note.ts b/packages/backend/src/remote/activitypub/renderer/note.ts
index b3bafaa3a..7001b6c0d 100644
--- a/packages/backend/src/remote/activitypub/renderer/note.ts
+++ b/packages/backend/src/remote/activitypub/renderer/note.ts
@@ -139,7 +139,7 @@ export default async function renderNote(note: Note, dive = true, isTalk = false
 		_misskey_content: text,
 		source: {
 			content: text,
-			mediaType: "text/x.misskeymarkdown",
+			mediaType: 'text/x.misskeymarkdown',
 		},
 		_misskey_quote: quote,
 		quoteUrl: quote,
diff --git a/packages/backend/src/remote/activitypub/renderer/person.ts b/packages/backend/src/remote/activitypub/renderer/person.ts
index cd2fd74d4..c3ac1b924 100644
--- a/packages/backend/src/remote/activitypub/renderer/person.ts
+++ b/packages/backend/src/remote/activitypub/renderer/person.ts
@@ -72,7 +72,7 @@ export async function renderPerson(user: ILocalUser) {
 		tag,
 		manuallyApprovesFollowers: user.isLocked,
 		discoverable: !!user.isExplorable,
-		publicKey: renderKey(user, keypair, `#main-key`),
+		publicKey: renderKey(user, keypair, '#main-key'),
 		isCat: user.isCat,
 		attachment: attachment.length ? attachment : undefined,
 	} as any;
diff --git a/packages/backend/src/remote/resolve-user.ts b/packages/backend/src/remote/resolve-user.ts
index 6fc6f2c4d..37fbdd8cc 100644
--- a/packages/backend/src/remote/resolve-user.ts
+++ b/packages/backend/src/remote/resolve-user.ts
@@ -67,7 +67,7 @@ export async function resolveUser(username: string, host: string | null): Promis
 			// validate uri
 			const uri = new URL(self.href);
 			if (uri.hostname !== host) {
-				throw new Error(`Invalid uri`);
+				throw new Error('Invalid uri');
 			}
 
 			await Users.update({
diff --git a/packages/backend/src/server/api/common/generate-block-query.ts b/packages/backend/src/server/api/common/generate-block-query.ts
index 60db1e731..380693725 100644
--- a/packages/backend/src/server/api/common/generate-block-query.ts
+++ b/packages/backend/src/server/api/common/generate-block-query.ts
@@ -14,11 +14,11 @@ export function generateBlockedUserQuery(q: SelectQueryBuilder<any>, me: { id: U
 	q
 		.andWhere(`note.userId NOT IN (${ blockingQuery.getQuery() })`)
 		.andWhere(new Brackets(qb => { qb
-			.where(`note.replyUserId IS NULL`)
+			.where('note.replyUserId IS NULL')
 			.orWhere(`note.replyUserId NOT IN (${ blockingQuery.getQuery() })`);
 		}))
 		.andWhere(new Brackets(qb => { qb
-			.where(`note.renoteUserId IS NULL`)
+			.where('note.renoteUserId IS NULL')
 			.orWhere(`note.renoteUserId NOT IN (${ blockingQuery.getQuery() })`);
 		}));
 
diff --git a/packages/backend/src/server/api/common/generate-muted-note-thread-query.ts b/packages/backend/src/server/api/common/generate-muted-note-thread-query.ts
index 7263ea2e6..117aac815 100644
--- a/packages/backend/src/server/api/common/generate-muted-note-thread-query.ts
+++ b/packages/backend/src/server/api/common/generate-muted-note-thread-query.ts
@@ -9,7 +9,7 @@ export function generateMutedNoteThreadQuery(q: SelectQueryBuilder<any>, me: { i
 
 	q.andWhere(`note.id NOT IN (${ mutedQuery.getQuery() })`);
 	q.andWhere(new Brackets(qb => { qb
-		.where(`note.threadId IS NULL`)
+		.where('note.threadId IS NULL')
 		.orWhere(`note.threadId NOT IN (${ mutedQuery.getQuery() })`);
 	}));
 
diff --git a/packages/backend/src/server/api/common/generate-replies-query.ts b/packages/backend/src/server/api/common/generate-replies-query.ts
index 301782eab..751dcaf4e 100644
--- a/packages/backend/src/server/api/common/generate-replies-query.ts
+++ b/packages/backend/src/server/api/common/generate-replies-query.ts
@@ -4,22 +4,22 @@ import { Brackets, SelectQueryBuilder } from 'typeorm';
 export function generateRepliesQuery(q: SelectQueryBuilder<any>, me?: Pick<User, 'id' | 'showTimelineReplies'> | null) {
 	if (me == null) {
 		q.andWhere(new Brackets(qb => { qb
-			.where(`note.replyId IS NULL`) // 返信ではない
+			.where('note.replyId IS NULL') // 返信ではない
 			.orWhere(new Brackets(qb => { qb // 返信だけど投稿者自身への返信
-				.where(`note.replyId IS NOT NULL`)
+				.where('note.replyId IS NOT NULL')
 				.andWhere('note.replyUserId = note.userId');
 			}));
 		}));
 	} else if (!me.showTimelineReplies) {
 		q.andWhere(new Brackets(qb => { qb
-			.where(`note.replyId IS NULL`) // 返信ではない
+			.where('note.replyId IS NULL') // 返信ではない
 			.orWhere('note.replyUserId = :meId', { meId: me.id }) // 返信だけど自分のノートへの返信
 			.orWhere(new Brackets(qb => { qb // 返信だけど自分の行った返信
-				.where(`note.replyId IS NOT NULL`)
+				.where('note.replyId IS NOT NULL')
 				.andWhere('note.userId = :meId', { meId: me.id });
 			}))
 			.orWhere(new Brackets(qb => { qb // 返信だけど投稿者自身への返信
-				.where(`note.replyId IS NOT NULL`)
+				.where('note.replyId IS NOT NULL')
 				.andWhere('note.replyUserId = note.userId');
 			}));
 		}));
diff --git a/packages/backend/src/server/api/common/generate-visibility-query.ts b/packages/backend/src/server/api/common/generate-visibility-query.ts
index b50b6812f..2c94e7b3a 100644
--- a/packages/backend/src/server/api/common/generate-visibility-query.ts
+++ b/packages/backend/src/server/api/common/generate-visibility-query.ts
@@ -6,8 +6,8 @@ export function generateVisibilityQuery(q: SelectQueryBuilder<any>, me?: { id: U
 	// This code must always be synchronized with the checks in Notes.isVisibleForMe.
 	if (me == null) {
 		q.andWhere(new Brackets(qb => { qb
-			.where(`note.visibility = 'public'`)
-			.orWhere(`note.visibility = 'home'`);
+			.where("note.visibility = 'public'")
+			.orWhere("note.visibility = 'home'");
 		}));
 	} else {
 		const followingQuery = Followings.createQueryBuilder('following')
@@ -17,8 +17,8 @@ export function generateVisibilityQuery(q: SelectQueryBuilder<any>, me?: { id: U
 		q.andWhere(new Brackets(qb => { qb
 			// 公開投稿である
 			.where(new Brackets(qb => { qb
-				.where(`note.visibility = 'public'`)
-				.orWhere(`note.visibility = 'home'`);
+				.where("note.visibility = 'public'")
+				.orWhere("note.visibility = 'home'");
 			}))
 			// または 自分自身
 			.orWhere('note.userId = :meId')
@@ -27,7 +27,7 @@ export function generateVisibilityQuery(q: SelectQueryBuilder<any>, me?: { id: U
 			.orWhere(':meId = ANY(note.mentions)')
 			.orWhere(new Brackets(qb => { qb
 				// または フォロワー宛ての投稿であり、
-				.where(`note.visibility = 'followers'`)
+				.where("note.visibility = 'followers'")
 				.andWhere(new Brackets(qb => { qb
 					// 自分がフォロワーである
 					.where(`note.userId IN (${ followingQuery.getQuery() })`)
diff --git a/packages/backend/src/server/api/common/getters.ts b/packages/backend/src/server/api/common/getters.ts
index c5a1e765e..f5fba27f6 100644
--- a/packages/backend/src/server/api/common/getters.ts
+++ b/packages/backend/src/server/api/common/getters.ts
@@ -9,7 +9,7 @@ import { generateVisibilityQuery } from './generate-visibility-query.js';
  */
 export async function getNote(noteId: Note['id'], me: { id: User['id'] } | null) {
 	const query = Notes.createQueryBuilder('note')
-		.where("note.id = :id", {
+		.where('note.id = :id', {
 			id: noteId,
 		});
 
diff --git a/packages/backend/src/server/api/common/inject-featured.ts b/packages/backend/src/server/api/common/inject-featured.ts
index f7cdd365e..a1c1fff53 100644
--- a/packages/backend/src/server/api/common/inject-featured.ts
+++ b/packages/backend/src/server/api/common/inject-featured.ts
@@ -21,9 +21,9 @@ export async function injectFeatured(timeline: Note[], user?: User | null) {
 	const query = Notes.createQueryBuilder('note')
 		.addSelect('note.score')
 		.where('note.userHost IS NULL')
-		.andWhere(`note.score > 0`)
-		.andWhere(`note.createdAt > :date`, { date: new Date(Date.now() - day) })
-		.andWhere(`note.visibility = 'public'`)
+		.andWhere('note.score > 0')
+		.andWhere('note.createdAt > :date', { date: new Date(Date.now() - day) })
+		.andWhere("note.visibility = 'public'")
 		.innerJoinAndSelect('note.user', 'user');
 
 	if (user) {
diff --git a/packages/backend/src/server/api/common/read-messaging-message.ts b/packages/backend/src/server/api/common/read-messaging-message.ts
index c4c18ffa0..c5d8ff089 100644
--- a/packages/backend/src/server/api/common/read-messaging-message.ts
+++ b/packages/backend/src/server/api/common/read-messaging-message.ts
@@ -124,7 +124,7 @@ export async function readGroupMessagingMessage(
 	} else {
 		// そのグループにおいて未読がなければイベント発行
 		const unreadExist = await MessagingMessages.createQueryBuilder('message')
-			.where(`message.groupId = :groupId`, { groupId: groupId })
+			.where('message.groupId = :groupId', { groupId: groupId })
 			.andWhere('message.userId != :userId', { userId: userId })
 			.andWhere('NOT (:userId = ANY(message.reads))', { userId: userId })
 			.andWhere('message.createdAt > :joinedAt', { joinedAt: joining.createdAt }) // 自分が加入する前の会話については、未読扱いしない
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 a3cf7fea7..6db368ccb 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
@@ -82,8 +82,8 @@ export const paramDef = {
 		sinceId: { type: 'string', format: 'misskey:id' },
 		untilId: { type: 'string', format: 'misskey:id' },
 		state: { type: 'string', nullable: true, default: null },
-		reporterOrigin: { type: 'string', enum: ['combined', 'local', 'remote'], default: "combined" },
-		targetUserOrigin: { type: 'string', enum: ['combined', 'local', 'remote'], default: "combined" },
+		reporterOrigin: { type: 'string', enum: ['combined', 'local', 'remote'], default: 'combined' },
+		targetUserOrigin: { type: 'string', enum: ['combined', 'local', 'remote'], default: 'combined' },
 	},
 	required: [],
 } as const;
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
index d16689a28..7ca43c428 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
@@ -73,9 +73,9 @@ export default define(meta, paramDef, async (ps) => {
 	const q = makePaginationQuery(Emojis.createQueryBuilder('emoji'), ps.sinceId, ps.untilId);
 
 	if (ps.host == null) {
-		q.andWhere(`emoji.host IS NOT NULL`);
+		q.andWhere('emoji.host IS NOT NULL');
 	} else {
-		q.andWhere(`emoji.host = :host`, { host: toPuny(ps.host) });
+		q.andWhere('emoji.host = :host', { host: toPuny(ps.host) });
 	}
 
 	if (ps.query) {
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
index 6192978fa..0e7bc004a 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
@@ -65,7 +65,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps) => {
 	const q = makePaginationQuery(Emojis.createQueryBuilder('emoji'), ps.sinceId, ps.untilId)
-		.andWhere(`emoji.host IS NULL`);
+		.andWhere('emoji.host IS NULL');
 
 	let emojis: Emoji[];
 
diff --git a/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts b/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts
index dd16473f3..3a4b2647d 100644
--- a/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts
+++ b/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts
@@ -16,7 +16,7 @@ export const paramDef = {
 
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async () => {
-	const stats = await db.query(`SELECT * FROM pg_indexes;`).then(recs => {
+	const stats = await db.query('SELECT * FROM pg_indexes;').then(recs => {
 		const res = [] as { tablename: string; indexname: string; }[];
 		for (const rec of recs) {
 			res.push(rec);
diff --git a/packages/backend/src/server/api/endpoints/blocking/list.ts b/packages/backend/src/server/api/endpoints/blocking/list.ts
index 29095ebe2..58ff7bd86 100644
--- a/packages/backend/src/server/api/endpoints/blocking/list.ts
+++ b/packages/backend/src/server/api/endpoints/blocking/list.ts
@@ -33,7 +33,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, me) => {
 	const query = makePaginationQuery(Blockings.createQueryBuilder('blocking'), ps.sinceId, ps.untilId)
-		.andWhere(`blocking.blockerId = :meId`, { meId: me.id });
+		.andWhere('blocking.blockerId = :meId', { meId: me.id });
 
 	const blockings = await query
 		.take(ps.limit)
diff --git a/packages/backend/src/server/api/endpoints/drive/folders/create.ts b/packages/backend/src/server/api/endpoints/drive/folders/create.ts
index 3d7f514c8..4c9146e6b 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/create.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/create.ts
@@ -29,7 +29,7 @@ export const meta = {
 export const paramDef = {
 	type: 'object',
 	properties: {
-		name: { type: 'string', default: "Untitled", maxLength: 200 },
+		name: { type: 'string', default: 'Untitled', maxLength: 200 },
 		parentId: { type: 'string', format: 'misskey:id', nullable: true },
 	},
 	required: [],
diff --git a/packages/backend/src/server/api/endpoints/federation/followers.ts b/packages/backend/src/server/api/endpoints/federation/followers.ts
index 7b1197d1e..1cf17e33b 100644
--- a/packages/backend/src/server/api/endpoints/federation/followers.ts
+++ b/packages/backend/src/server/api/endpoints/federation/followers.ts
@@ -32,7 +32,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, me) => {
 	const query = makePaginationQuery(Followings.createQueryBuilder('following'), ps.sinceId, ps.untilId)
-		.andWhere(`following.followeeHost = :host`, { host: ps.host });
+		.andWhere('following.followeeHost = :host', { host: ps.host });
 
 	const followings = await query
 		.take(ps.limit)
diff --git a/packages/backend/src/server/api/endpoints/federation/following.ts b/packages/backend/src/server/api/endpoints/federation/following.ts
index ed1f142d8..cc3fb19a7 100644
--- a/packages/backend/src/server/api/endpoints/federation/following.ts
+++ b/packages/backend/src/server/api/endpoints/federation/following.ts
@@ -32,7 +32,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, me) => {
 	const query = makePaginationQuery(Followings.createQueryBuilder('following'), ps.sinceId, ps.untilId)
-		.andWhere(`following.followerHost = :host`, { host: ps.host });
+		.andWhere('following.followerHost = :host', { host: ps.host });
 
 	const followings = await query
 		.take(ps.limit)
diff --git a/packages/backend/src/server/api/endpoints/federation/users.ts b/packages/backend/src/server/api/endpoints/federation/users.ts
index 65ad9f88d..5f50502ec 100644
--- a/packages/backend/src/server/api/endpoints/federation/users.ts
+++ b/packages/backend/src/server/api/endpoints/federation/users.ts
@@ -32,7 +32,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, me) => {
 	const query = makePaginationQuery(Users.createQueryBuilder('user'), ps.sinceId, ps.untilId)
-		.andWhere(`user.host = :host`, { host: ps.host });
+		.andWhere('user.host = :host', { host: ps.host });
 
 	const users = await query
 		.take(ps.limit)
diff --git a/packages/backend/src/server/api/endpoints/hashtags/trend.ts b/packages/backend/src/server/api/endpoints/hashtags/trend.ts
index 9cdbc8941..5cb01b3cd 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/trend.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/trend.ts
@@ -68,12 +68,12 @@ export default define(meta, paramDef, async () => {
 	now.setMinutes(Math.round(now.getMinutes() / 5) * 5, 0, 0);
 
 	const tagNotes = await Notes.createQueryBuilder('note')
-		.where(`note.createdAt > :date`, { date: new Date(now.getTime() - rangeA) })
+		.where('note.createdAt > :date', { date: new Date(now.getTime() - rangeA) })
 		.andWhere(new Brackets(qb => { qb
-			.where(`note.visibility = 'public'`)
-			.orWhere(`note.visibility = 'home'`);
+			.where("note.visibility = 'public'")
+			.orWhere("note.visibility = 'home'");
 		}))
-		.andWhere(`note.tags != '{}'`)
+		.andWhere("note.tags != '{}'")
 		.select(['note.tags', 'note.userId'])
 		.cache(60000) // 1 min
 		.getMany();
diff --git a/packages/backend/src/server/api/endpoints/hashtags/users.ts b/packages/backend/src/server/api/endpoints/hashtags/users.ts
index a5df21a7e..196513b93 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/users.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/users.ts
@@ -24,8 +24,8 @@ export const paramDef = {
 		tag: { type: 'string' },
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
 		sort: { type: 'string', enum: ['+follower', '-follower', '+createdAt', '-createdAt', '+updatedAt', '-updatedAt'] },
-		state: { type: 'string', enum: ['all', 'alive'], default: "all" },
-		origin: { type: 'string', enum: ['combined', 'local', 'remote'], default: "local" },
+		state: { type: 'string', enum: ['all', 'alive'], default: 'all' },
+		origin: { type: 'string', enum: ['combined', 'local', 'remote'], default: 'local' },
 	},
 	required: ['tag', 'sort'],
 } as const;
diff --git a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts
index 68bd103a6..2cef26067 100644
--- a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts
+++ b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts
@@ -12,7 +12,7 @@ export const paramDef = {
 	properties: {
 		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
 		offset: { type: 'integer', default: 0 },
-		sort: { type: 'string', enum: ['desc', 'asc'], default: "desc" },
+		sort: { type: 'string', enum: ['desc', 'asc'], default: 'desc' },
 	},
 	required: [],
 } as const;
diff --git a/packages/backend/src/server/api/endpoints/i/favorites.ts b/packages/backend/src/server/api/endpoints/i/favorites.ts
index 3c420e4d0..b273c86e0 100644
--- a/packages/backend/src/server/api/endpoints/i/favorites.ts
+++ b/packages/backend/src/server/api/endpoints/i/favorites.ts
@@ -33,7 +33,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	const query = makePaginationQuery(NoteFavorites.createQueryBuilder('favorite'), ps.sinceId, ps.untilId)
-		.andWhere(`favorite.userId = :meId`, { meId: user.id })
+		.andWhere('favorite.userId = :meId', { meId: user.id })
 		.leftJoinAndSelect('favorite.note', 'note');
 
 	const favorites = await query
diff --git a/packages/backend/src/server/api/endpoints/i/gallery/likes.ts b/packages/backend/src/server/api/endpoints/i/gallery/likes.ts
index a38383f30..9e7c11e25 100644
--- a/packages/backend/src/server/api/endpoints/i/gallery/likes.ts
+++ b/packages/backend/src/server/api/endpoints/i/gallery/likes.ts
@@ -44,7 +44,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	const query = makePaginationQuery(GalleryLikes.createQueryBuilder('like'), ps.sinceId, ps.untilId)
-		.andWhere(`like.userId = :meId`, { meId: user.id })
+		.andWhere('like.userId = :meId', { meId: user.id })
 		.leftJoinAndSelect('like.post', 'post');
 
 	const likes = await query
diff --git a/packages/backend/src/server/api/endpoints/i/gallery/posts.ts b/packages/backend/src/server/api/endpoints/i/gallery/posts.ts
index b4edb5f73..990e1be2a 100644
--- a/packages/backend/src/server/api/endpoints/i/gallery/posts.ts
+++ b/packages/backend/src/server/api/endpoints/i/gallery/posts.ts
@@ -33,7 +33,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	const query = makePaginationQuery(GalleryPosts.createQueryBuilder('post'), ps.sinceId, ps.untilId)
-		.andWhere(`post.userId = :meId`, { meId: user.id });
+		.andWhere('post.userId = :meId', { meId: user.id });
 
 	const posts = await query
 		.take(ps.limit)
diff --git a/packages/backend/src/server/api/endpoints/i/page-likes.ts b/packages/backend/src/server/api/endpoints/i/page-likes.ts
index 71e326e2f..2e5f35919 100644
--- a/packages/backend/src/server/api/endpoints/i/page-likes.ts
+++ b/packages/backend/src/server/api/endpoints/i/page-likes.ts
@@ -43,7 +43,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	const query = makePaginationQuery(PageLikes.createQueryBuilder('like'), ps.sinceId, ps.untilId)
-		.andWhere(`like.userId = :meId`, { meId: user.id })
+		.andWhere('like.userId = :meId', { meId: user.id })
 		.leftJoinAndSelect('like.page', 'page');
 
 	const likes = await query
diff --git a/packages/backend/src/server/api/endpoints/i/pages.ts b/packages/backend/src/server/api/endpoints/i/pages.ts
index f28aed3fd..dcc1233b7 100644
--- a/packages/backend/src/server/api/endpoints/i/pages.ts
+++ b/packages/backend/src/server/api/endpoints/i/pages.ts
@@ -33,7 +33,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	const query = makePaginationQuery(Pages.createQueryBuilder('page'), ps.sinceId, ps.untilId)
-		.andWhere(`page.userId = :meId`, { meId: user.id });
+		.andWhere('page.userId = :meId', { meId: user.id });
 
 	const pages = await query
 		.take(ps.limit)
diff --git a/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts b/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts
index 7ff6409ca..6d9f2dda6 100644
--- a/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts
+++ b/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts
@@ -32,7 +32,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		.set({
 			reads: (() => `array_append("reads", '${user.id}')`) as any,
 		})
-		.where(`groupId = :groupId`, { groupId: j.userGroupId })
+		.where('groupId = :groupId', { groupId: j.userGroupId })
 		.andWhere('userId != :userId', { userId: user.id })
 		.andWhere('NOT (:userId = ANY(reads))', { userId: user.id })
 		.execute()));
diff --git a/packages/backend/src/server/api/endpoints/i/signin-history.ts b/packages/backend/src/server/api/endpoints/i/signin-history.ts
index ca3741166..c3c33a8ba 100644
--- a/packages/backend/src/server/api/endpoints/i/signin-history.ts
+++ b/packages/backend/src/server/api/endpoints/i/signin-history.ts
@@ -21,7 +21,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	const query = makePaginationQuery(Signins.createQueryBuilder('signin'), ps.sinceId, ps.untilId)
-		.andWhere(`signin.userId = :meId`, { meId: user.id });
+		.andWhere('signin.userId = :meId', { meId: user.id });
 
 	const history = await query.take(ps.limit).getMany();
 
diff --git a/packages/backend/src/server/api/endpoints/i/user-group-invites.ts b/packages/backend/src/server/api/endpoints/i/user-group-invites.ts
index 1d7e4a16b..3f78532fe 100644
--- a/packages/backend/src/server/api/endpoints/i/user-group-invites.ts
+++ b/packages/backend/src/server/api/endpoints/i/user-group-invites.ts
@@ -44,7 +44,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	const query = makePaginationQuery(UserGroupInvitations.createQueryBuilder('invitation'), ps.sinceId, ps.untilId)
-		.andWhere(`invitation.userId = :meId`, { meId: user.id })
+		.andWhere('invitation.userId = :meId', { meId: user.id })
 		.leftJoinAndSelect('invitation.userGroup', 'user_group');
 
 	const invitations = await query
diff --git a/packages/backend/src/server/api/endpoints/messaging/history.ts b/packages/backend/src/server/api/endpoints/messaging/history.ts
index ea0600d0e..df14a6a84 100644
--- a/packages/backend/src/server/api/endpoints/messaging/history.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/history.ts
@@ -55,26 +55,26 @@ export default define(meta, paramDef, async (ps, user) => {
 			.orderBy('message.createdAt', 'DESC');
 
 		if (ps.group) {
-			query.where(`message.groupId IN (:...groups)`, { groups: groups });
+			query.where('message.groupId IN (:...groups)', { groups: groups });
 
 			if (found.length > 0) {
-				query.andWhere(`message.groupId NOT IN (:...found)`, { found: found });
+				query.andWhere('message.groupId NOT IN (:...found)', { found: found });
 			}
 		} else {
 			query.where(new Brackets(qb => { qb
-				.where(`message.userId = :userId`, { userId: user.id })
-				.orWhere(`message.recipientId = :userId`, { userId: user.id });
+				.where('message.userId = :userId', { userId: user.id })
+				.orWhere('message.recipientId = :userId', { userId: user.id });
 			}));
-			query.andWhere(`message.groupId IS NULL`);
+			query.andWhere('message.groupId IS NULL');
 
 			if (found.length > 0) {
-				query.andWhere(`message.userId NOT IN (:...found)`, { found: found });
-				query.andWhere(`message.recipientId NOT IN (:...found)`, { found: found });
+				query.andWhere('message.userId NOT IN (:...found)', { found: found });
+				query.andWhere('message.recipientId NOT IN (:...found)', { found: found });
 			}
 
 			if (mute.length > 0) {
-				query.andWhere(`message.userId NOT IN (:...mute)`, { mute: mute.map(m => m.muteeId) });
-				query.andWhere(`message.recipientId NOT IN (:...mute)`, { mute: mute.map(m => m.muteeId) });
+				query.andWhere('message.userId NOT IN (:...mute)', { mute: mute.map(m => m.muteeId) });
+				query.andWhere('message.recipientId NOT IN (:...mute)', { mute: mute.map(m => m.muteeId) });
 			}
 		}
 
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages.ts b/packages/backend/src/server/api/endpoints/messaging/messages.ts
index dbf1f6c86..60a27c6ec 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages.ts
@@ -125,7 +125,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		}
 
 		const query = makePaginationQuery(MessagingMessages.createQueryBuilder('message'), ps.sinceId, ps.untilId)
-			.andWhere(`message.groupId = :groupId`, { groupId: recipientGroup.id });
+			.andWhere('message.groupId = :groupId', { groupId: recipientGroup.id });
 
 		const messages = await query.take(ps.limit).getMany();
 
diff --git a/packages/backend/src/server/api/endpoints/mute/list.ts b/packages/backend/src/server/api/endpoints/mute/list.ts
index 31283cf4c..1f7e8d923 100644
--- a/packages/backend/src/server/api/endpoints/mute/list.ts
+++ b/packages/backend/src/server/api/endpoints/mute/list.ts
@@ -33,7 +33,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, me) => {
 	const query = makePaginationQuery(Mutings.createQueryBuilder('muting'), ps.sinceId, ps.untilId)
-		.andWhere(`muting.muterId = :meId`, { meId: me.id });
+		.andWhere('muting.muterId = :meId', { meId: me.id });
 
 	const mutings = await query
 		.take(ps.limit)
diff --git a/packages/backend/src/server/api/endpoints/users/gallery/posts.ts b/packages/backend/src/server/api/endpoints/users/gallery/posts.ts
index 35bf2df59..ae3b9c743 100644
--- a/packages/backend/src/server/api/endpoints/users/gallery/posts.ts
+++ b/packages/backend/src/server/api/endpoints/users/gallery/posts.ts
@@ -32,7 +32,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	const query = makePaginationQuery(GalleryPosts.createQueryBuilder('post'), ps.sinceId, ps.untilId)
-		.andWhere(`post.userId = :userId`, { userId: ps.userId });
+		.andWhere('post.userId = :userId', { userId: ps.userId });
 
 	const posts = await query
 		.take(ps.limit)
diff --git a/packages/backend/src/server/file/index.ts b/packages/backend/src/server/file/index.ts
index 07a493700..4c4707e61 100644
--- a/packages/backend/src/server/file/index.ts
+++ b/packages/backend/src/server/file/index.ts
@@ -17,7 +17,7 @@ const _dirname = dirname(_filename);
 const app = new Koa();
 app.use(cors());
 app.use(async (ctx, next) => {
-	ctx.set('Content-Security-Policy', `default-src 'none'; img-src 'self'; media-src 'self'; style-src 'unsafe-inline'`);
+	ctx.set('Content-Security-Policy', "default-src 'none'; img-src 'self'; media-src 'self'; style-src 'unsafe-inline'");
 	await next();
 });
 
diff --git a/packages/backend/src/server/proxy/index.ts b/packages/backend/src/server/proxy/index.ts
index 506ba10ef..0132817b4 100644
--- a/packages/backend/src/server/proxy/index.ts
+++ b/packages/backend/src/server/proxy/index.ts
@@ -11,7 +11,7 @@ import { proxyMedia } from './proxy-media.js';
 const app = new Koa();
 app.use(cors());
 app.use(async (ctx, next) => {
-	ctx.set('Content-Security-Policy', `default-src 'none'; img-src 'self'; media-src 'self'; style-src 'unsafe-inline'`);
+	ctx.set('Content-Security-Policy', "default-src 'none'; img-src 'self'; media-src 'self'; style-src 'unsafe-inline'");
 	await next();
 });
 
diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index 03ee8d5ba..b3de4d4db 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -185,8 +185,8 @@ router.get('/twemoji-badge/(.*)', async ctx => {
 });
 
 // ServiceWorker
-router.get(`/sw.js`, async ctx => {
-	await send(ctx as any, `/sw.js`, {
+router.get('/sw.js', async ctx => {
+	await send(ctx as any, '/sw.js', {
 		root: swAssets,
 		maxage: 10 * MINUTE,
 	});
diff --git a/packages/backend/src/services/chart/charts/federation.ts b/packages/backend/src/services/chart/charts/federation.ts
index 10221ee1e..08be08da3 100644
--- a/packages/backend/src/services/chart/charts/federation.ts
+++ b/packages/backend/src/services/chart/charts/federation.ts
@@ -40,21 +40,21 @@ export default class FederationChart extends Chart<typeof schema> {
 			Followings.createQueryBuilder('following')
 				.select('COUNT(DISTINCT following.followeeHost)')
 				.where('following.followeeHost IS NOT NULL')
-				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : `following.followeeHost NOT IN (:...blocked)`, { blocked: meta.blockedHosts })
+				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'following.followeeHost NOT IN (:...blocked)', { blocked: meta.blockedHosts })
 				.andWhere(`following.followeeHost NOT IN (${ suspendedInstancesQuery.getQuery() })`)
 				.getRawOne()
 				.then(x => parseInt(x.count, 10)),
 			Followings.createQueryBuilder('following')
 				.select('COUNT(DISTINCT following.followerHost)')
 				.where('following.followerHost IS NOT NULL')
-				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : `following.followerHost NOT IN (:...blocked)`, { blocked: meta.blockedHosts })
+				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'following.followerHost NOT IN (:...blocked)', { blocked: meta.blockedHosts })
 				.andWhere(`following.followerHost NOT IN (${ suspendedInstancesQuery.getQuery() })`)
 				.getRawOne()
 				.then(x => parseInt(x.count, 10)),
 			Followings.createQueryBuilder('following')
 				.select('COUNT(DISTINCT following.followeeHost)')
 				.where('following.followeeHost IS NOT NULL')
-				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : `following.followeeHost NOT IN (:...blocked)`, { blocked: meta.blockedHosts })
+				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'following.followeeHost NOT IN (:...blocked)', { blocked: meta.blockedHosts })
 				.andWhere(`following.followeeHost NOT IN (${ suspendedInstancesQuery.getQuery() })`)
 				.andWhere(`following.followeeHost IN (${ pubsubSubQuery.getQuery() })`)
 				.setParameters(pubsubSubQuery.getParameters())
@@ -63,17 +63,17 @@ export default class FederationChart extends Chart<typeof schema> {
 			Instances.createQueryBuilder('instance')
 				.select('COUNT(instance.id)')
 				.where(`instance.host IN (${ subInstancesQuery.getQuery() })`)
-				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : `instance.host NOT IN (:...blocked)`, { blocked: meta.blockedHosts })
-				.andWhere(`instance.isSuspended = false`)
-				.andWhere(`instance.lastCommunicatedAt > :gt`, { gt: new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)) })
+				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'instance.host NOT IN (:...blocked)', { blocked: meta.blockedHosts })
+				.andWhere('instance.isSuspended = false')
+				.andWhere('instance.lastCommunicatedAt > :gt', { gt: new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)) })
 				.getRawOne()
 				.then(x => parseInt(x.count, 10)),
 			Instances.createQueryBuilder('instance')
 				.select('COUNT(instance.id)')
 				.where(`instance.host IN (${ pubInstancesQuery.getQuery() })`)
-				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : `instance.host NOT IN (:...blocked)`, { blocked: meta.blockedHosts })
-				.andWhere(`instance.isSuspended = false`)
-				.andWhere(`instance.lastCommunicatedAt > :gt`, { gt: new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)) })
+				.andWhere(meta.blockedHosts.length === 0 ? '1=1' : 'instance.host NOT IN (:...blocked)', { blocked: meta.blockedHosts })
+				.andWhere('instance.isSuspended = false')
+				.andWhere('instance.lastCommunicatedAt > :gt', { gt: new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)) })
 				.getRawOne()
 				.then(x => parseInt(x.count, 10)),
 		]);
diff --git a/packages/backend/src/services/drive/add-file.ts b/packages/backend/src/services/drive/add-file.ts
index fc5ac0a89..4566c0fbf 100644
--- a/packages/backend/src/services/drive/add-file.ts
+++ b/packages/backend/src/services/drive/add-file.ts
@@ -171,7 +171,7 @@ export async function generateAlts(path: string, type: string, generateWeb: bool
 	}
 
 	if (!['image/jpeg', 'image/png', 'image/webp', 'image/svg+xml'].includes(type)) {
-		logger.debug(`web image and thumbnail not created (not an required file)`);
+		logger.debug('web image and thumbnail not created (not an required file)');
 		return {
 			webpublic: null,
 			thumbnail: null,
@@ -212,7 +212,7 @@ export async function generateAlts(path: string, type: string, generateWeb: bool
 	let webpublic: IImage | null = null;
 
 	if (generateWeb && !satisfyWebpublic) {
-		logger.info(`creating web image`);
+		logger.info('creating web image');
 
 		try {
 			if (['image/jpeg', 'image/webp'].includes(type)) {
@@ -222,14 +222,14 @@ export async function generateAlts(path: string, type: string, generateWeb: bool
 			} else if (['image/svg+xml'].includes(type)) {
 				webpublic = await convertSharpToPng(img, 2048, 2048);
 			} else {
-				logger.debug(`web image not created (not an required image)`);
+				logger.debug('web image not created (not an required image)');
 			}
 		} catch (err) {
-			logger.warn(`web image not created (an error occured)`, err as Error);
+			logger.warn('web image not created (an error occured)', err as Error);
 		}
 	} else {
-		if (satisfyWebpublic) logger.info(`web image not created (original satisfies webpublic)`);
-		else logger.info(`web image not created (from remote)`);
+		if (satisfyWebpublic) logger.info('web image not created (original satisfies webpublic)');
+		else logger.info('web image not created (from remote)');
 	}
 	// #endregion webpublic
 
@@ -240,10 +240,10 @@ export async function generateAlts(path: string, type: string, generateWeb: bool
 		if (['image/jpeg', 'image/webp', 'image/png', 'image/svg+xml'].includes(type)) {
 			thumbnail = await convertSharpToWebp(img, 498, 280);
 		} else {
-			logger.debug(`thumbnail not created (not an required file)`);
+			logger.debug('thumbnail not created (not an required file)');
 		}
 	} catch (err) {
-		logger.warn(`thumbnail not created (an error occured)`, err as Error);
+		logger.warn('thumbnail not created (an error occured)', err as Error);
 	}
 	// #endregion thumbnail
 
diff --git a/packages/backend/src/services/following/create.ts b/packages/backend/src/services/following/create.ts
index 72c24676b..16129f780 100644
--- a/packages/backend/src/services/following/create.ts
+++ b/packages/backend/src/services/following/create.ts
@@ -94,8 +94,8 @@ export async function insertFollowingDoc(followee: { id: User['id']; host: User[
 		Users.pack(followee.id, follower, {
 			detail: true,
 		}).then(async packed => {
-			publishUserEvent(follower.id, 'follow', packed as Packed<"UserDetailedNotMe">);
-			publishMainStream(follower.id, 'follow', packed as Packed<"UserDetailedNotMe">);
+			publishUserEvent(follower.id, 'follow', packed as Packed<'UserDetailedNotMe'>);
+			publishMainStream(follower.id, 'follow', packed as Packed<'UserDetailedNotMe'>);
 
 			const webhooks = (await getActiveWebhooks()).filter(x => x.userId === follower.id && x.on.includes('follow'));
 			for (const webhook of webhooks) {
diff --git a/packages/backend/src/services/update-hashtag.ts b/packages/backend/src/services/update-hashtag.ts
index 23b210b7a..07468db0f 100644
--- a/packages/backend/src/services/update-hashtag.ts
+++ b/packages/backend/src/services/update-hashtag.ts
@@ -39,44 +39,44 @@ export async function updateHashtag(user: { id: User['id']; host: User['host'];
 				// 自分が初めてこのタグを使ったなら
 				if (!index.attachedUserIds.some(id => id === user.id)) {
 					set.attachedUserIds = () => `array_append("attachedUserIds", '${user.id}')`;
-					set.attachedUsersCount = () => `"attachedUsersCount" + 1`;
+					set.attachedUsersCount = () => '"attachedUsersCount" + 1';
 				}
 				// 自分が(ローカル内で)初めてこのタグを使ったなら
 				if (Users.isLocalUser(user) && !index.attachedLocalUserIds.some(id => id === user.id)) {
 					set.attachedLocalUserIds = () => `array_append("attachedLocalUserIds", '${user.id}')`;
-					set.attachedLocalUsersCount = () => `"attachedLocalUsersCount" + 1`;
+					set.attachedLocalUsersCount = () => '"attachedLocalUsersCount" + 1';
 				}
 				// 自分が(リモートで)初めてこのタグを使ったなら
 				if (Users.isRemoteUser(user) && !index.attachedRemoteUserIds.some(id => id === user.id)) {
 					set.attachedRemoteUserIds = () => `array_append("attachedRemoteUserIds", '${user.id}')`;
-					set.attachedRemoteUsersCount = () => `"attachedRemoteUsersCount" + 1`;
+					set.attachedRemoteUsersCount = () => '"attachedRemoteUsersCount" + 1';
 				}
 			} else {
 				set.attachedUserIds = () => `array_remove("attachedUserIds", '${user.id}')`;
-				set.attachedUsersCount = () => `"attachedUsersCount" - 1`;
+				set.attachedUsersCount = () => '"attachedUsersCount" - 1';
 				if (Users.isLocalUser(user)) {
 					set.attachedLocalUserIds = () => `array_remove("attachedLocalUserIds", '${user.id}')`;
-					set.attachedLocalUsersCount = () => `"attachedLocalUsersCount" - 1`;
+					set.attachedLocalUsersCount = () => '"attachedLocalUsersCount" - 1';
 				} else {
 					set.attachedRemoteUserIds = () => `array_remove("attachedRemoteUserIds", '${user.id}')`;
-					set.attachedRemoteUsersCount = () => `"attachedRemoteUsersCount" - 1`;
+					set.attachedRemoteUsersCount = () => '"attachedRemoteUsersCount" - 1';
 				}
 			}
 		} else {
 			// 自分が初めてこのタグを使ったなら
 			if (!index.mentionedUserIds.some(id => id === user.id)) {
 				set.mentionedUserIds = () => `array_append("mentionedUserIds", '${user.id}')`;
-				set.mentionedUsersCount = () => `"mentionedUsersCount" + 1`;
+				set.mentionedUsersCount = () => '"mentionedUsersCount" + 1';
 			}
 			// 自分が(ローカル内で)初めてこのタグを使ったなら
 			if (Users.isLocalUser(user) && !index.mentionedLocalUserIds.some(id => id === user.id)) {
 				set.mentionedLocalUserIds = () => `array_append("mentionedLocalUserIds", '${user.id}')`;
-				set.mentionedLocalUsersCount = () => `"mentionedLocalUsersCount" + 1`;
+				set.mentionedLocalUsersCount = () => '"mentionedLocalUsersCount" + 1';
 			}
 			// 自分が(リモートで)初めてこのタグを使ったなら
 			if (Users.isRemoteUser(user) && !index.mentionedRemoteUserIds.some(id => id === user.id)) {
 				set.mentionedRemoteUserIds = () => `array_append("mentionedRemoteUserIds", '${user.id}')`;
-				set.mentionedRemoteUsersCount = () => `"mentionedRemoteUsersCount" + 1`;
+				set.mentionedRemoteUsersCount = () => '"mentionedRemoteUsersCount" + 1';
 			}
 		}
 
diff --git a/packages/shared/.eslintrc.js b/packages/shared/.eslintrc.js
index 3aef6484e..a50992a48 100644
--- a/packages/shared/.eslintrc.js
+++ b/packages/shared/.eslintrc.js
@@ -22,7 +22,7 @@ module.exports = {
 		'eol-last': ['error', 'always'],
 		'semi': ['error', 'always'],
 		'semi-spacing': ['error', { 'before': false, 'after': true }],
-		'quotes': ['warn', 'single'],
+		'quotes': ['error', 'single', { 'avoidEscape': true }],
 		'comma-dangle': ['warn', 'always-multiline'],
 		'keyword-spacing': ['error', {
 			'before': true,
@@ -76,6 +76,7 @@ module.exports = {
 		'import/no-default-export': ['warn'],
 		'import/order': ['warn', {
 			'groups': ['builtin', 'external', 'internal', 'parent', 'sibling', 'index', 'object', 'type'],
-		}]
+		}],
+		'object-shorthand': ['warn', 'consistent-as-needed'],
 	},
 };

From 2fa90e7f43f1a953badef0fd4a988fb7d9da8c17 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 3 Aug 2022 00:18:31 +0200
Subject: [PATCH 18/34] fix lints in backend boot

---
 packages/backend/src/boot/index.ts  | 6 ++++--
 packages/backend/src/boot/master.ts | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/boot/index.ts b/packages/backend/src/boot/index.ts
index c3d059225..0cfeca1d3 100644
--- a/packages/backend/src/boot/index.ts
+++ b/packages/backend/src/boot/index.ts
@@ -17,7 +17,7 @@ const ev = new Xev();
 /**
  * Init process
  */
-export default async function() {
+export default async function(): void {
 	process.title = `Misskey (${cluster.isPrimary ? 'master' : 'worker'})`;
 
 	if (cluster.isPrimary || envOption.disableClustering) {
@@ -68,7 +68,9 @@ if (!envOption.quiet) {
 process.on('uncaughtException', err => {
 	try {
 		logger.error(err);
-	} catch { }
+	} catch {
+		// if that fails too there is nothing we can do
+	}
 });
 
 // Dying away...
diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index 0c936e72b..fa3f31215 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -10,8 +10,8 @@ import semver from 'semver';
 import Logger from '@/services/logger.js';
 import loadConfig from '@/config/load.js';
 import { Config } from '@/config/types.js';
-import { envOption } from '../env.js';
 import { showMachineInfo } from '@/misc/show-machine-info.js';
+import { envOption } from '../env.js';
 import { db, initDb } from '../db/postgre.js';
 
 const _filename = fileURLToPath(import.meta.url);
@@ -24,7 +24,7 @@ const bootLogger = logger.createSubLogger('boot', 'magenta', false);
 
 const themeColor = chalk.hex('#86b300');
 
-function greet() {
+function greet(): void {
 	if (!envOption.quiet) {
 		//#region Misskey logo
 		const v = `v${meta.version}`;
@@ -49,7 +49,7 @@ function greet() {
 /**
  * Init master process
  */
-export async function masterMain() {
+export async function masterMain(): void {
 	let config!: Config;
 
 	// initialize app
@@ -142,7 +142,7 @@ async function connectDb(): Promise<void> {
 	}
 }
 
-async function spawnWorkers(limit: number = 1) {
+async function spawnWorkers(limit = 1): void {
 	const workers = Math.min(limit, os.cpus().length);
 	bootLogger.info(`Starting ${workers} worker${workers === 1 ? '' : 's'}...`);
 	await Promise.all([...Array(workers)].map(spawnWorker));

From bc1c66e16eb0c65482af3d5935dd1d752acd9f7b Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 3 Aug 2022 11:00:48 +0200
Subject: [PATCH 19/34] remove admin/drive/cleanup API

This API endpoint is not working correctly and can cause unintended data loss:
It may remove emojis that have been imported from other instances.

See also https://github.com/misskey-dev/misskey/issues/8222
---
 ...659516638000-drive-file-user-constraint.js | 13 +++++++++
 .../backend/src/models/entities/drive-file.ts |  2 +-
 packages/backend/src/server/api/endpoints.ts  |  2 --
 .../api/endpoints/admin/drive/cleanup.ts      | 28 -------------------
 4 files changed, 14 insertions(+), 31 deletions(-)
 create mode 100644 packages/backend/migration/1659516638000-drive-file-user-constraint.js
 delete mode 100644 packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts

diff --git a/packages/backend/migration/1659516638000-drive-file-user-constraint.js b/packages/backend/migration/1659516638000-drive-file-user-constraint.js
new file mode 100644
index 000000000..42a5cfbba
--- /dev/null
+++ b/packages/backend/migration/1659516638000-drive-file-user-constraint.js
@@ -0,0 +1,13 @@
+export class driveFileUserConstraint1659516638000 {
+	name = 'driveFileUserConstraint1659516638000';
+
+    async up(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "drive_file" DROP CONSTRAINT "FK_860fa6f6c7df5bb887249fba22e"`);
+		await queryRunner.query(`ALTER TABLE "drive_file" ADD CONSTRAINT "FK_860fa6f6c7df5bb887249fba22e" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE RESTRICT`);
+    }
+
+    async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "drive_file" DROP CONSTRAINT "FK_860fa6f6c7df5bb887249fba22e"`);
+		await queryRunner.query(`ALTER TABLE "drive_file" ADD CONSTRAINT "FK_860fa6f6c7df5bb887249fba22e" FOREIGN KEY ("userId") REFERENCES "user"("id") ON DELETE SET NULL`);
+    }
+}
diff --git a/packages/backend/src/models/entities/drive-file.ts b/packages/backend/src/models/entities/drive-file.ts
index a636d1d51..1b175be8e 100644
--- a/packages/backend/src/models/entities/drive-file.ts
+++ b/packages/backend/src/models/entities/drive-file.ts
@@ -24,7 +24,7 @@ export class DriveFile {
 	public userId: User['id'] | null;
 
 	@ManyToOne(type => User, {
-		onDelete: 'SET NULL',
+		onDelete: 'RESTRICT',
 	})
 	@JoinColumn()
 	public user: User | null;
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index 9eedfd53c..88c389040 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -10,7 +10,6 @@ import * as ep___admin_announcements_list from './endpoints/admin/announcements/
 import * as ep___admin_announcements_update from './endpoints/admin/announcements/update.js';
 import * as ep___admin_deleteAllFilesOfAUser from './endpoints/admin/delete-all-files-of-a-user.js';
 import * as ep___admin_drive_cleanRemoteFiles from './endpoints/admin/drive/clean-remote-files.js';
-import * as ep___admin_drive_cleanup from './endpoints/admin/drive/cleanup.js';
 import * as ep___admin_drive_files from './endpoints/admin/drive/files.js';
 import * as ep___admin_drive_showFile from './endpoints/admin/drive/show-file.js';
 import * as ep___admin_emoji_addAliasesBulk from './endpoints/admin/emoji/add-aliases-bulk.js';
@@ -320,7 +319,6 @@ const eps = [
 	['admin/announcements/update', ep___admin_announcements_update],
 	['admin/delete-all-files-of-a-user', ep___admin_deleteAllFilesOfAUser],
 	['admin/drive/clean-remote-files', ep___admin_drive_cleanRemoteFiles],
-	['admin/drive/cleanup', ep___admin_drive_cleanup],
 	['admin/drive/files', ep___admin_drive_files],
 	['admin/drive/show-file', ep___admin_drive_showFile],
 	['admin/emoji/add-aliases-bulk', ep___admin_emoji_addAliasesBulk],
diff --git a/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts b/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts
deleted file mode 100644
index 3db942e6c..000000000
--- a/packages/backend/src/server/api/endpoints/admin/drive/cleanup.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { IsNull } from 'typeorm';
-import define from '../../../define.js';
-import { deleteFile } from '@/services/drive/delete-file.js';
-import { DriveFiles } from '@/models/index.js';
-
-export const meta = {
-	tags: ['admin'],
-
-	requireCredential: true,
-	requireModerator: true,
-} as const;
-
-export const paramDef = {
-	type: 'object',
-	properties: {},
-	required: [],
-} as const;
-
-// eslint-disable-next-line import/no-default-export
-export default define(meta, paramDef, async (ps, me) => {
-	const files = await DriveFiles.findBy({
-		userId: IsNull(),
-	});
-
-	for (const file of files) {
-		deleteFile(file);
-	}
-});

From 37e47a257e2665d29caac8e4b2df93d976522dd6 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 3 Aug 2022 13:18:33 +0200
Subject: [PATCH 20/34] fix lints "import/order" and "import/no-duplicate"

Also simplified some import paths by replacing relative with absolute paths.
---
 packages/backend/src/boot/master.ts           |  4 ++--
 packages/backend/src/boot/worker.ts           |  2 +-
 packages/backend/src/daemons/janitor.ts       |  5 +++--
 packages/backend/src/misc/antenna-cache.ts    |  2 +-
 packages/backend/src/misc/app-lock.ts         |  2 +-
 packages/backend/src/misc/captcha.ts          |  4 ++--
 .../backend/src/misc/check-hit-antenna.ts     |  2 +-
 packages/backend/src/misc/convert-host.ts     |  2 +-
 packages/backend/src/misc/download-url.ts     |  8 +++----
 .../backend/src/misc/fetch-proxy-account.ts   |  2 +-
 packages/backend/src/misc/populate-emojis.ts  |  4 ++--
 packages/backend/src/misc/reaction-lib.ts     |  6 ++---
 packages/backend/src/misc/webhook-cache.ts    |  2 +-
 .../src/models/entities/abuse-user-report.ts  |  2 +-
 .../src/models/entities/access-token.ts       |  2 +-
 .../src/models/entities/announcement-read.ts  |  2 +-
 .../src/models/entities/antenna-note.ts       |  2 +-
 .../backend/src/models/entities/antenna.ts    |  2 +-
 packages/backend/src/models/entities/app.ts   |  2 +-
 .../models/entities/attestation-challenge.ts  |  2 +-
 .../src/models/entities/auth-session.ts       |  2 +-
 .../backend/src/models/entities/blocking.ts   |  2 +-
 .../src/models/entities/channel-following.ts  |  2 +-
 .../models/entities/channel-note-pining.ts    |  2 +-
 .../backend/src/models/entities/channel.ts    |  2 +-
 .../backend/src/models/entities/clip-note.ts  |  2 +-
 packages/backend/src/models/entities/clip.ts  |  2 +-
 .../backend/src/models/entities/drive-file.ts |  2 +-
 .../src/models/entities/drive-folder.ts       |  2 +-
 .../src/models/entities/follow-request.ts     |  2 +-
 .../backend/src/models/entities/following.ts  |  2 +-
 .../src/models/entities/gallery-like.ts       |  2 +-
 .../src/models/entities/gallery-post.ts       |  2 +-
 .../backend/src/models/entities/hashtag.ts    |  2 +-
 .../src/models/entities/messaging-message.ts  |  2 +-
 packages/backend/src/models/entities/meta.ts  |  2 +-
 .../src/models/entities/moderation-log.ts     |  2 +-
 .../backend/src/models/entities/muted-note.ts |  4 ++--
 .../backend/src/models/entities/muting.ts     |  2 +-
 .../src/models/entities/note-favorite.ts      |  2 +-
 .../src/models/entities/note-reaction.ts      |  2 +-
 .../src/models/entities/note-thread-muting.ts |  2 +-
 .../src/models/entities/note-unread.ts        |  2 +-
 .../src/models/entities/note-watching.ts      |  2 +-
 packages/backend/src/models/entities/note.ts  |  4 ++--
 .../src/models/entities/notification.ts       |  4 ++--
 .../backend/src/models/entities/page-like.ts  |  2 +-
 packages/backend/src/models/entities/page.ts  |  2 +-
 .../backend/src/models/entities/poll-vote.ts  |  2 +-
 packages/backend/src/models/entities/poll.ts  |  2 +-
 .../backend/src/models/entities/promo-note.ts |  2 +-
 .../backend/src/models/entities/promo-read.ts |  2 +-
 .../src/models/entities/registry-item.ts      |  2 +-
 .../backend/src/models/entities/signin.ts     |  2 +-
 .../src/models/entities/sw-subscription.ts    |  2 +-
 .../models/entities/user-group-invitation.ts  |  2 +-
 .../src/models/entities/user-group-joining.ts |  2 +-
 .../backend/src/models/entities/user-group.ts |  2 +-
 .../src/models/entities/user-keypair.ts       |  2 +-
 .../src/models/entities/user-list-joining.ts  |  2 +-
 .../backend/src/models/entities/user-list.ts  |  2 +-
 .../src/models/entities/user-note-pining.ts   |  2 +-
 .../src/models/entities/user-profile.ts       |  2 +-
 .../src/models/entities/user-publickey.ts     |  2 +-
 .../src/models/entities/user-security-key.ts  |  2 +-
 .../backend/src/models/entities/webhook.ts    |  2 +-
 .../models/repositories/abuse-user-report.ts  |  2 +-
 .../backend/src/models/repositories/app.ts    |  2 +-
 .../src/models/repositories/auth-session.ts   |  4 ++--
 .../src/models/repositories/blocking.ts       |  6 ++---
 .../src/models/repositories/channel.ts        |  4 ++--
 .../backend/src/models/repositories/clip.ts   |  4 ++--
 .../src/models/repositories/drive-folder.ts   |  4 ++--
 .../src/models/repositories/follow-request.ts |  2 +-
 .../src/models/repositories/following.ts      |  6 ++---
 .../src/models/repositories/gallery-post.ts   |  6 ++---
 .../models/repositories/messaging-message.ts  |  4 ++--
 .../models/repositories/moderation-logs.ts    |  2 +-
 .../backend/src/models/repositories/muting.ts |  6 ++---
 .../src/models/repositories/note-favorite.ts  |  2 +-
 .../src/models/repositories/note-reaction.ts  |  6 ++---
 .../backend/src/models/repositories/note.ts   | 18 +++++++--------
 .../src/models/repositories/notification.ts   | 10 ++++-----
 .../src/models/repositories/page-like.ts      |  2 +-
 .../src/models/repositories/user-group.ts     |  2 +-
 .../src/models/repositories/user-list.ts      |  2 +-
 packages/backend/src/queue/index.ts           |  6 ++---
 .../src/queue/processors/db/delete-account.ts | 10 ++++-----
 .../queue/processors/db/delete-drive-files.ts |  7 +++---
 .../queue/processors/db/export-blocking.ts    | 10 ++++-----
 .../processors/db/export-custom-emojis.ts     | 17 +++++++-------
 .../queue/processors/db/export-following.ts   | 14 ++++++------
 .../src/queue/processors/db/export-mute.ts    | 10 ++++-----
 .../src/queue/processors/db/export-notes.ts   | 12 +++++-----
 .../queue/processors/db/export-user-lists.ts  | 10 ++++-----
 .../queue/processors/db/import-blocking.ts    |  8 +++----
 .../processors/db/import-custom-emojis.ts     |  8 +++----
 .../queue/processors/db/import-following.ts   | 10 ++++-----
 .../src/queue/processors/db/import-muting.ts  | 20 ++++++++---------
 .../queue/processors/db/import-user-lists.ts  | 14 ++++++------
 .../backend/src/queue/processors/deliver.ts   |  2 +-
 .../backend/src/queue/processors/inbox.ts     |  2 +-
 .../object-storage/clean-remote-files.ts      |  8 +++----
 .../processors/object-storage/delete-file.ts  |  2 +-
 .../system/check-expired-mutings.ts           |  2 +-
 .../queue/processors/system/clean-charts.ts   |  2 +-
 .../queue/processors/system/resync-charts.ts  |  2 +-
 .../queue/processors/system/tick-charts.ts    |  2 +-
 .../src/queue/processors/webhook-deliver.ts   |  6 ++---
 packages/backend/src/queue/types.ts           |  2 +-
 .../src/remote/activitypub/audience.ts        |  8 +++----
 .../src/remote/activitypub/deliver-manager.ts |  6 ++---
 .../activitypub/kernel/accept/follow.ts       |  2 +-
 .../remote/activitypub/kernel/accept/index.ts |  6 ++---
 .../remote/activitypub/kernel/add/index.ts    |  4 ++--
 .../activitypub/kernel/announce/index.ts      |  6 ++---
 .../activitypub/kernel/announce/note.ts       | 10 ++++-----
 .../remote/activitypub/kernel/block/index.ts  |  4 ++--
 .../remote/activitypub/kernel/create/index.ts |  6 ++---
 .../remote/activitypub/kernel/create/note.ts  |  6 ++---
 .../remote/activitypub/kernel/delete/actor.ts |  2 +-
 .../remote/activitypub/kernel/delete/index.ts |  4 ++--
 .../remote/activitypub/kernel/delete/note.ts  |  4 ++--
 .../remote/activitypub/kernel/flag/index.ts   |  8 +++----
 .../src/remote/activitypub/kernel/index.ts    |  8 +++----
 .../src/remote/activitypub/kernel/like.ts     |  2 +-
 .../src/remote/activitypub/kernel/read.ts     |  4 ++--
 .../activitypub/kernel/reject/follow.ts       |  4 ++--
 .../remote/activitypub/kernel/reject/index.ts |  6 ++---
 .../remote/activitypub/kernel/remove/index.ts |  2 +-
 .../remote/activitypub/kernel/undo/accept.ts  |  2 +-
 .../activitypub/kernel/undo/announce.ts       |  2 +-
 .../remote/activitypub/kernel/undo/block.ts   |  4 ++--
 .../remote/activitypub/kernel/undo/follow.ts  |  2 +-
 .../remote/activitypub/kernel/undo/index.ts   |  4 ++--
 .../remote/activitypub/kernel/undo/like.ts    |  2 +-
 .../remote/activitypub/misc/ld-signature.ts   |  2 +-
 .../src/remote/activitypub/models/image.ts    |  4 ++--
 .../src/remote/activitypub/models/note.ts     | 22 +++++++++----------
 .../src/remote/activitypub/models/question.ts |  4 ++--
 .../backend/src/remote/activitypub/perform.ts |  2 +-
 .../src/remote/activitypub/renderer/index.ts  |  6 ++---
 .../src/remote/activitypub/renderer/key.ts    |  2 +-
 .../src/remote/activitypub/renderer/like.ts   |  2 +-
 .../src/remote/activitypub/renderer/person.ts | 14 ++++++------
 .../src/remote/activitypub/resolver.ts        |  6 ++---
 packages/backend/src/remote/resolve-user.ts   | 12 +++++-----
 packages/backend/src/server/activitypub.ts    | 12 +++++-----
 .../src/server/activitypub/featured.ts        |  4 ++--
 .../backend/src/server/activitypub/outbox.ts  |  2 +-
 .../backend/src/server/api/authenticate.ts    |  2 +-
 .../server/api/common/generate-block-query.ts |  2 +-
 .../api/common/generate-channel-query.ts      |  2 +-
 .../api/common/generate-muted-note-query.ts   |  2 +-
 .../generate-muted-note-thread-query.ts       |  2 +-
 .../api/common/generate-replies-query.ts      |  2 +-
 .../api/common/generate-visibility-query.ts   |  2 +-
 .../api/common/read-messaging-message.ts      |  6 ++---
 .../server/api/common/read-notification.ts    |  2 +-
 .../backend/src/server/api/common/signup.ts   |  6 ++---
 packages/backend/src/server/api/define.ts     |  4 ++--
 .../api/endpoints/admin/abuse-user-reports.ts |  2 +-
 .../api/endpoints/admin/accounts/create.ts    |  6 ++---
 .../api/endpoints/admin/accounts/delete.ts    |  2 +-
 .../endpoints/admin/announcements/create.ts   |  2 +-
 .../endpoints/admin/announcements/delete.ts   |  2 +-
 .../endpoints/admin/announcements/update.ts   |  2 +-
 .../admin/delete-all-files-of-a-user.ts       |  2 +-
 .../admin/drive/clean-remote-files.ts         |  2 +-
 .../api/endpoints/admin/drive/show-file.ts    |  2 +-
 .../endpoints/admin/emoji/add-aliases-bulk.ts |  4 ++--
 .../server/api/endpoints/admin/emoji/add.ts   | 10 ++++-----
 .../server/api/endpoints/admin/emoji/copy.ts  |  4 ++--
 .../api/endpoints/admin/emoji/delete-bulk.ts  |  4 ++--
 .../api/endpoints/admin/emoji/delete.ts       |  4 ++--
 .../api/endpoints/admin/emoji/import-zip.ts   |  2 +-
 .../api/endpoints/admin/emoji/list-remote.ts  |  2 +-
 .../server/api/endpoints/admin/emoji/list.ts  |  6 ++---
 .../admin/emoji/remove-aliases-bulk.ts        |  4 ++--
 .../endpoints/admin/emoji/set-aliases-bulk.ts |  4 ++--
 .../admin/emoji/set-category-bulk.ts          |  4 ++--
 .../api/endpoints/admin/emoji/update.ts       |  6 ++---
 .../admin/federation/delete-all-files.ts      |  2 +-
 .../refresh-remote-instance-metadata.ts       |  2 +-
 .../admin/federation/remove-all-following.ts  |  2 +-
 .../admin/federation/update-instance.ts       |  2 +-
 .../api/endpoints/admin/get-index-stats.ts    |  2 +-
 .../src/server/api/endpoints/admin/invite.ts  |  2 +-
 .../src/server/api/endpoints/admin/meta.ts    |  2 +-
 .../api/endpoints/admin/moderators/add.ts     |  2 +-
 .../api/endpoints/admin/moderators/remove.ts  |  2 +-
 .../api/endpoints/admin/promo/create.ts       |  2 +-
 .../server/api/endpoints/admin/queue/clear.ts |  2 +-
 .../endpoints/admin/queue/deliver-delayed.ts  |  2 +-
 .../endpoints/admin/queue/inbox-delayed.ts    |  2 +-
 .../server/api/endpoints/admin/relays/add.ts  |  2 +-
 .../server/api/endpoints/admin/relays/list.ts |  2 +-
 .../api/endpoints/admin/relays/remove.ts      |  2 +-
 .../api/endpoints/admin/reset-password.ts     |  2 +-
 .../admin/resolve-abuse-user-report.ts        |  2 +-
 .../server/api/endpoints/admin/send-email.ts  |  2 +-
 .../server/api/endpoints/admin/server-info.ts |  4 ++--
 .../endpoints/admin/show-moderation-logs.ts   |  2 +-
 .../api/endpoints/admin/silence-user.ts       |  2 +-
 .../api/endpoints/admin/suspend-user.ts       |  2 +-
 .../api/endpoints/admin/unsilence-user.ts     |  2 +-
 .../api/endpoints/admin/unsuspend-user.ts     |  2 +-
 .../server/api/endpoints/admin/update-meta.ts |  2 +-
 .../src/server/api/endpoints/admin/vacuum.ts  |  2 +-
 .../server/api/endpoints/antennas/create.ts   |  4 ++--
 .../server/api/endpoints/antennas/delete.ts   |  4 ++--
 .../src/server/api/endpoints/antennas/list.ts |  2 +-
 .../server/api/endpoints/antennas/notes.ts    |  4 ++--
 .../src/server/api/endpoints/antennas/show.ts |  2 +-
 .../server/api/endpoints/antennas/update.ts   |  4 ++--
 .../src/server/api/endpoints/ap/get.ts        |  2 +-
 .../src/server/api/endpoints/ap/show.ts       |  4 ++--
 .../src/server/api/endpoints/app/create.ts    |  2 +-
 .../src/server/api/endpoints/app/show.ts      |  2 +-
 .../src/server/api/endpoints/auth/accept.ts   |  4 ++--
 .../api/endpoints/auth/session/generate.ts    |  4 ++--
 .../server/api/endpoints/auth/session/show.ts |  2 +-
 .../api/endpoints/auth/session/userkey.ts     |  2 +-
 .../server/api/endpoints/blocking/create.ts   |  4 ++--
 .../server/api/endpoints/blocking/delete.ts   |  4 ++--
 .../src/server/api/endpoints/blocking/list.ts |  2 +-
 .../server/api/endpoints/channels/create.ts   |  4 ++--
 .../server/api/endpoints/channels/featured.ts |  2 +-
 .../server/api/endpoints/channels/follow.ts   |  4 ++--
 .../server/api/endpoints/channels/followed.ts |  2 +-
 .../server/api/endpoints/channels/owned.ts    |  2 +-
 .../src/server/api/endpoints/channels/show.ts |  2 +-
 .../server/api/endpoints/channels/timeline.ts |  4 ++--
 .../server/api/endpoints/channels/unfollow.ts |  4 ++--
 .../server/api/endpoints/channels/update.ts   |  2 +-
 .../api/endpoints/charts/user/following.ts    |  2 +-
 .../server/api/endpoints/clips/add-note.ts    |  4 ++--
 .../src/server/api/endpoints/clips/create.ts  |  2 +-
 .../src/server/api/endpoints/clips/delete.ts  |  2 +-
 .../src/server/api/endpoints/clips/list.ts    |  2 +-
 .../src/server/api/endpoints/clips/notes.ts   |  2 +-
 .../server/api/endpoints/clips/remove-note.ts |  2 +-
 .../src/server/api/endpoints/clips/show.ts    |  2 +-
 .../src/server/api/endpoints/clips/update.ts  |  2 +-
 .../src/server/api/endpoints/drive/files.ts   |  2 +-
 .../endpoints/drive/files/attached-notes.ts   |  2 +-
 .../endpoints/drive/files/check-existence.ts  |  2 +-
 .../api/endpoints/drive/files/create.ts       |  6 ++---
 .../api/endpoints/drive/files/delete.ts       |  2 +-
 .../server/api/endpoints/drive/files/find.ts  |  4 ++--
 .../api/endpoints/drive/files/update.ts       |  2 +-
 .../endpoints/drive/files/upload-from-url.ts  |  2 +-
 .../src/server/api/endpoints/drive/folders.ts |  2 +-
 .../api/endpoints/drive/folders/create.ts     |  4 ++--
 .../api/endpoints/drive/folders/delete.ts     |  4 ++--
 .../api/endpoints/drive/folders/find.ts       |  4 ++--
 .../api/endpoints/drive/folders/show.ts       |  2 +-
 .../api/endpoints/drive/folders/update.ts     |  2 +-
 .../src/server/api/endpoints/drive/stream.ts  |  2 +-
 .../api/endpoints/email-address/available.ts  |  2 +-
 .../api/endpoints/export-custom-emojis.ts     |  2 +-
 .../api/endpoints/federation/followers.ts     |  2 +-
 .../api/endpoints/federation/following.ts     |  2 +-
 .../api/endpoints/federation/instances.ts     |  2 +-
 .../api/endpoints/federation/show-instance.ts |  2 +-
 .../federation/update-remote-user.ts          |  2 +-
 .../server/api/endpoints/federation/users.ts  |  2 +-
 .../server/api/endpoints/following/create.ts  |  6 ++---
 .../server/api/endpoints/following/delete.ts  |  4 ++--
 .../api/endpoints/following/invalidate.ts     |  4 ++--
 .../endpoints/following/requests/cancel.ts    |  4 ++--
 .../api/endpoints/following/requests/list.ts  |  2 +-
 .../server/api/endpoints/gallery/featured.ts  |  2 +-
 .../server/api/endpoints/gallery/popular.ts   |  2 +-
 .../src/server/api/endpoints/gallery/posts.ts |  2 +-
 .../api/endpoints/gallery/posts/create.ts     |  4 ++--
 .../api/endpoints/gallery/posts/delete.ts     |  2 +-
 .../api/endpoints/gallery/posts/like.ts       |  4 ++--
 .../api/endpoints/gallery/posts/show.ts       |  2 +-
 .../api/endpoints/gallery/posts/unlike.ts     |  2 +-
 .../api/endpoints/gallery/posts/update.ts     |  2 +-
 .../src/server/api/endpoints/hashtags/list.ts |  2 +-
 .../server/api/endpoints/hashtags/search.ts   |  2 +-
 .../src/server/api/endpoints/hashtags/show.ts |  4 ++--
 .../server/api/endpoints/hashtags/trend.ts    |  2 +-
 .../server/api/endpoints/hashtags/users.ts    |  2 +-
 .../src/server/api/endpoints/i/2fa/done.ts    |  2 +-
 .../server/api/endpoints/i/2fa/key-done.ts    |  6 ++---
 .../api/endpoints/i/2fa/password-less.ts      |  2 +-
 .../api/endpoints/i/2fa/register-key.ts       |  6 ++---
 .../server/api/endpoints/i/2fa/remove-key.ts  |  2 +-
 .../server/api/endpoints/i/2fa/unregister.ts  |  2 +-
 .../src/server/api/endpoints/i/apps.ts        |  2 +-
 .../server/api/endpoints/i/authorized-apps.ts |  2 +-
 .../server/api/endpoints/i/change-password.ts |  2 +-
 .../server/api/endpoints/i/export-blocking.ts |  2 +-
 .../api/endpoints/i/export-following.ts       |  2 +-
 .../src/server/api/endpoints/i/export-mute.ts |  2 +-
 .../server/api/endpoints/i/export-notes.ts    |  2 +-
 .../api/endpoints/i/export-user-lists.ts      |  2 +-
 .../src/server/api/endpoints/i/favorites.ts   |  2 +-
 .../server/api/endpoints/i/gallery/likes.ts   |  2 +-
 .../server/api/endpoints/i/gallery/posts.ts   |  2 +-
 .../endpoints/i/get-word-muted-notes-count.ts |  2 +-
 .../server/api/endpoints/i/import-blocking.ts |  4 ++--
 .../api/endpoints/i/import-following.ts       |  4 ++--
 .../server/api/endpoints/i/import-muting.ts   |  4 ++--
 .../api/endpoints/i/import-user-lists.ts      |  4 ++--
 .../src/server/api/endpoints/i/page-likes.ts  |  2 +-
 .../src/server/api/endpoints/i/pages.ts       |  2 +-
 .../backend/src/server/api/endpoints/i/pin.ts |  2 +-
 .../i/read-all-messaging-messages.ts          |  2 +-
 .../api/endpoints/i/read-all-unread-notes.ts  |  2 +-
 .../api/endpoints/i/read-announcement.ts      |  4 ++--
 .../api/endpoints/i/regenerate-token.ts       |  2 +-
 .../api/endpoints/i/registry/get-all.ts       |  2 +-
 .../api/endpoints/i/registry/get-detail.ts    |  2 +-
 .../server/api/endpoints/i/registry/get.ts    |  2 +-
 .../endpoints/i/registry/keys-with-type.ts    |  2 +-
 .../server/api/endpoints/i/registry/keys.ts   |  2 +-
 .../server/api/endpoints/i/registry/remove.ts |  2 +-
 .../server/api/endpoints/i/registry/scopes.ts |  2 +-
 .../server/api/endpoints/i/registry/set.ts    |  2 +-
 .../server/api/endpoints/i/revoke-token.ts    |  2 +-
 .../server/api/endpoints/i/signin-history.ts  |  2 +-
 .../src/server/api/endpoints/i/unpin.ts       |  2 +-
 .../server/api/endpoints/i/update-email.ts    |  8 +++----
 .../src/server/api/endpoints/i/update.ts      |  4 ++--
 .../api/endpoints/i/user-group-invites.ts     |  2 +-
 .../server/api/endpoints/i/webhooks/create.ts |  2 +-
 .../server/api/endpoints/i/webhooks/delete.ts |  4 ++--
 .../server/api/endpoints/i/webhooks/list.ts   |  2 +-
 .../server/api/endpoints/i/webhooks/show.ts   |  2 +-
 .../server/api/endpoints/i/webhooks/update.ts |  4 ++--
 .../server/api/endpoints/messaging/history.ts |  4 ++--
 .../api/endpoints/messaging/messages.ts       |  4 ++--
 .../endpoints/messaging/messages/create.ts    |  6 ++---
 .../endpoints/messaging/messages/delete.ts    |  4 ++--
 .../api/endpoints/messaging/messages/read.ts  |  2 +-
 .../server/api/endpoints/miauth/gen-token.ts  |  2 +-
 .../src/server/api/endpoints/mute/create.ts   |  6 ++---
 .../src/server/api/endpoints/mute/delete.ts   |  4 ++--
 .../src/server/api/endpoints/mute/list.ts     |  2 +-
 .../src/server/api/endpoints/my/apps.ts       |  2 +-
 .../src/server/api/endpoints/notes/create.ts  |  2 +-
 .../src/server/api/endpoints/notes/delete.ts  |  2 +-
 .../api/endpoints/notes/reactions/delete.ts   |  2 +-
 .../src/server/api/endpoints/notes/search.ts  |  2 +-
 .../server/api/endpoints/notes/unrenote.ts    |  2 +-
 .../src/server/api/endpoints/pages/create.ts  |  2 +-
 .../src/server/api/endpoints/pages/update.ts  |  2 +-
 .../api/endpoints/request-reset-password.ts   |  2 +-
 .../backend/src/server/api/endpoints/stats.ts |  6 ++---
 .../api/endpoints/users/gallery/posts.ts      |  2 +-
 .../api/endpoints/users/recommendation.ts     |  2 +-
 packages/backend/src/server/api/limiter.ts    |  2 +-
 .../src/server/api/openapi/gen-spec.ts        |  2 +-
 .../backend/src/server/api/private/signin.ts  | 10 ++++-----
 .../backend/src/server/api/private/signup.ts  |  2 +-
 .../backend/src/server/api/service/discord.ts |  2 +-
 .../backend/src/server/api/service/github.ts  |  2 +-
 .../backend/src/server/api/service/twitter.ts |  2 +-
 .../backend/src/server/api/stream/channel.ts  |  2 +-
 .../src/server/api/stream/channels/antenna.ts |  4 ++--
 .../src/server/api/stream/channels/channel.ts |  4 ++--
 .../api/stream/channels/global-timeline.ts    |  2 +-
 .../src/server/api/stream/channels/hashtag.ts |  2 +-
 .../api/stream/channels/home-timeline.ts      |  2 +-
 .../api/stream/channels/hybrid-timeline.ts    |  2 +-
 .../api/stream/channels/local-timeline.ts     |  2 +-
 .../src/server/api/stream/channels/main.ts    |  2 +-
 .../server/api/stream/channels/messaging.ts   |  4 ++--
 .../server/api/stream/channels/user-list.ts   |  2 +-
 packages/backend/src/server/api/streaming.ts  | 10 ++++-----
 .../src/server/file/send-drive-file.ts        |  2 +-
 packages/backend/src/server/nodeinfo.ts       |  2 +-
 .../backend/src/server/proxy/proxy-media.ts   |  2 +-
 packages/backend/src/server/web/index.ts      |  2 +-
 packages/backend/src/server/well-known.ts     |  4 ++--
 .../backend/src/services/blocking/create.ts   |  3 +--
 .../backend/src/services/blocking/delete.ts   |  2 +-
 .../src/services/chart/charts/active-users.ts |  2 +-
 .../src/services/chart/charts/drive.ts        |  2 +-
 .../src/services/chart/charts/federation.ts   |  4 ++--
 .../src/services/chart/charts/hashtag.ts      |  2 +-
 .../src/services/chart/charts/instance.ts     |  2 +-
 .../src/services/chart/charts/notes.ts        |  4 ++--
 .../services/chart/charts/per-user-drive.ts   |  2 +-
 .../chart/charts/per-user-following.ts        |  4 ++--
 .../services/chart/charts/per-user-notes.ts   |  2 +-
 .../chart/charts/per-user-reactions.ts        |  2 +-
 .../src/services/chart/charts/users.ts        |  4 ++--
 packages/backend/src/services/chart/core.ts   |  2 +-
 .../src/services/create-system-user.ts        |  4 ++--
 .../backend/src/services/drive/add-file.ts    | 18 +++++++--------
 .../backend/src/services/drive/delete-file.ts |  4 ++--
 .../drive/generate-video-thumbnail.ts         |  2 +-
 .../src/services/drive/upload-from-url.ts     |  4 ++--
 .../src/services/fetch-instance-metadata.ts   |  2 +-
 .../backend/src/services/following/create.ts  | 11 +++++-----
 .../backend/src/services/following/delete.ts  |  6 ++---
 .../backend/src/services/following/reject.ts  |  2 +-
 .../services/following/requests/accept-all.ts |  2 +-
 .../src/services/following/requests/accept.ts |  2 +-
 .../backend/src/services/instance-actor.ts    |  4 ++--
 packages/backend/src/services/logger.ts       |  5 ++---
 .../backend/src/services/messages/create.ts   |  2 +-
 packages/backend/src/services/note/create.ts  | 16 +++++++-------
 packages/backend/src/services/note/delete.ts  |  2 +-
 .../backend/src/services/note/polls/vote.ts   |  2 +-
 .../src/services/note/reaction/create.ts      |  6 ++---
 packages/backend/src/services/note/read.ts    |  2 +-
 .../src/services/send-email-notification.ts   |  2 +-
 packages/backend/src/services/send-email.ts   |  2 +-
 packages/backend/src/services/stream.ts       |  2 +-
 packages/backend/src/services/suspend-user.ts |  2 +-
 .../backend/src/services/unsuspend-user.ts    |  2 +-
 417 files changed, 710 insertions(+), 716 deletions(-)

diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index fa3f31215..1093e6edc 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -11,8 +11,8 @@ import Logger from '@/services/logger.js';
 import loadConfig from '@/config/load.js';
 import { Config } from '@/config/types.js';
 import { showMachineInfo } from '@/misc/show-machine-info.js';
-import { envOption } from '../env.js';
-import { db, initDb } from '../db/postgre.js';
+import { envOption } from '@/env.js';
+import { db, initDb } from '@/db/postgre.js';
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
diff --git a/packages/backend/src/boot/worker.ts b/packages/backend/src/boot/worker.ts
index 8038e2563..98731660d 100644
--- a/packages/backend/src/boot/worker.ts
+++ b/packages/backend/src/boot/worker.ts
@@ -1,5 +1,5 @@
 import cluster from 'node:cluster';
-import { initDb } from '../db/postgre.js';
+import { initDb } from '@/db/postgre.js';
 
 /**
  * Init worker process
diff --git a/packages/backend/src/daemons/janitor.ts b/packages/backend/src/daemons/janitor.ts
index f2a1bfcc2..4f56ecd98 100644
--- a/packages/backend/src/daemons/janitor.ts
+++ b/packages/backend/src/daemons/janitor.ts
@@ -1,8 +1,9 @@
 // TODO: 消したい
 
-const interval = 30 * 60 * 1000;
-import { AttestationChallenges } from '@/models/index.js';
 import { LessThan } from 'typeorm';
+import { AttestationChallenges } from '@/models/index.js';
+
+const interval = 30 * 60 * 1000;
 
 /**
  * Clean up database occasionally
diff --git a/packages/backend/src/misc/antenna-cache.ts b/packages/backend/src/misc/antenna-cache.ts
index dcf96c161..4ea5a29df 100644
--- a/packages/backend/src/misc/antenna-cache.ts
+++ b/packages/backend/src/misc/antenna-cache.ts
@@ -1,6 +1,6 @@
 import { Antennas } from '@/models/index.js';
 import { Antenna } from '@/models/entities/antenna.js';
-import { subsdcriber } from '../db/redis.js';
+import { subsdcriber } from '@/db/redis.js';
 
 let antennasFetched = false;
 let antennas: Antenna[] = [];
diff --git a/packages/backend/src/misc/app-lock.ts b/packages/backend/src/misc/app-lock.ts
index b5089cc6a..295c3728e 100644
--- a/packages/backend/src/misc/app-lock.ts
+++ b/packages/backend/src/misc/app-lock.ts
@@ -1,6 +1,6 @@
-import { redisClient } from '../db/redis.js';
 import { promisify } from 'node:util';
 import redisLock from 'redis-lock';
+import { redisClient } from '@/db/redis.js';
 
 /**
  * Retry delay (ms) for lock acquisition
diff --git a/packages/backend/src/misc/captcha.ts b/packages/backend/src/misc/captcha.ts
index 9a87a4a3c..2a128c25f 100644
--- a/packages/backend/src/misc/captcha.ts
+++ b/packages/backend/src/misc/captcha.ts
@@ -1,7 +1,7 @@
-import fetch from 'node-fetch';
 import { URLSearchParams } from 'node:url';
-import { getAgentByUrl } from './fetch.js';
+import fetch from 'node-fetch';
 import config from '@/config/index.js';
+import { getAgentByUrl } from './fetch.js';
 
 export async function verifyRecaptcha(secret: string, response: string) {
 	const result = await getCaptchaResponse('https://www.recaptcha.net/recaptcha/api/siteverify', secret, response).catch(e => {
diff --git a/packages/backend/src/misc/check-hit-antenna.ts b/packages/backend/src/misc/check-hit-antenna.ts
index d9cedee7d..6f39aff75 100644
--- a/packages/backend/src/misc/check-hit-antenna.ts
+++ b/packages/backend/src/misc/check-hit-antenna.ts
@@ -2,8 +2,8 @@ import { Antenna } from '@/models/entities/antenna.js';
 import { Note } from '@/models/entities/note.js';
 import { User } from '@/models/entities/user.js';
 import { UserListJoinings, UserGroupJoinings, Blockings } from '@/models/index.js';
-import { getFullApAccount } from './convert-host.js';
 import * as Acct from '@/misc/acct.js';
+import { getFullApAccount } from './convert-host.js';
 import { Packed } from './schema.js';
 import { Cache } from './cache.js';
 
diff --git a/packages/backend/src/misc/convert-host.ts b/packages/backend/src/misc/convert-host.ts
index 7eb940a7e..ac572b22c 100644
--- a/packages/backend/src/misc/convert-host.ts
+++ b/packages/backend/src/misc/convert-host.ts
@@ -1,6 +1,6 @@
 import { URL } from 'node:url';
-import config from '@/config/index.js';
 import { toASCII } from 'punycode';
+import config from '@/config/index.js';
 
 export function getFullApAccount(username: string, host: string | null) {
 	return host ? `${username}@${toPuny(host)}` : `${username}@${toPuny(config.host)}`;
diff --git a/packages/backend/src/misc/download-url.ts b/packages/backend/src/misc/download-url.ts
index 7c57b140e..05eb27aa7 100644
--- a/packages/backend/src/misc/download-url.ts
+++ b/packages/backend/src/misc/download-url.ts
@@ -1,13 +1,13 @@
 import * as fs from 'node:fs';
 import * as stream from 'node:stream';
 import * as util from 'node:util';
-import got, * as Got from 'got';
-import { httpAgent, httpsAgent, StatusError } from './fetch.js';
-import config from '@/config/index.js';
 import chalk from 'chalk';
-import Logger from '@/services/logger.js';
+import got, * as Got from 'got';
 import IPCIDR from 'ip-cidr';
 import PrivateIp from 'private-ip';
+import config from '@/config/index.js';
+import Logger from '@/services/logger.js';
+import { httpAgent, httpsAgent, StatusError } from './fetch.js';
 
 const pipeline = util.promisify(stream.pipeline);
 
diff --git a/packages/backend/src/misc/fetch-proxy-account.ts b/packages/backend/src/misc/fetch-proxy-account.ts
index b61bba264..491a5221c 100644
--- a/packages/backend/src/misc/fetch-proxy-account.ts
+++ b/packages/backend/src/misc/fetch-proxy-account.ts
@@ -1,6 +1,6 @@
-import { fetchMeta } from './fetch-meta.js';
 import { ILocalUser } from '@/models/entities/user.js';
 import { Users } from '@/models/index.js';
+import { fetchMeta } from './fetch-meta.js';
 
 export async function fetchProxyAccount(): Promise<ILocalUser | null> {
 	const meta = await fetchMeta();
diff --git a/packages/backend/src/misc/populate-emojis.ts b/packages/backend/src/misc/populate-emojis.ts
index 6a185d09f..c77fe31bf 100644
--- a/packages/backend/src/misc/populate-emojis.ts
+++ b/packages/backend/src/misc/populate-emojis.ts
@@ -1,12 +1,12 @@
 import { In, IsNull } from 'typeorm';
+import config from '@/config/index.js';
 import { Emojis } from '@/models/index.js';
 import { Emoji } from '@/models/entities/emoji.js';
 import { Note } from '@/models/entities/note.js';
+import { query } from '@/prelude/url.js';
 import { Cache } from './cache.js';
 import { isSelfHost, toPunyNullable } from './convert-host.js';
 import { decodeReaction } from './reaction-lib.js';
-import config from '@/config/index.js';
-import { query } from '@/prelude/url.js';
 
 const cache = new Cache<Emoji | null>(1000 * 60 * 60 * 12);
 
diff --git a/packages/backend/src/misc/reaction-lib.ts b/packages/backend/src/misc/reaction-lib.ts
index fefc2781f..5f70be1fd 100644
--- a/packages/backend/src/misc/reaction-lib.ts
+++ b/packages/backend/src/misc/reaction-lib.ts
@@ -1,9 +1,9 @@
 /* eslint-disable key-spacing */
-import { emojiRegex } from './emoji-regex.js';
-import { fetchMeta } from './fetch-meta.js';
+import { IsNull } from 'typeorm';
 import { Emojis } from '@/models/index.js';
 import { toPunyNullable } from './convert-host.js';
-import { IsNull } from 'typeorm';
+import { emojiRegex } from './emoji-regex.js';
+import { fetchMeta } from './fetch-meta.js';
 
 const legacies: Record<string, string> = {
 	'like':     '👍',
diff --git a/packages/backend/src/misc/webhook-cache.ts b/packages/backend/src/misc/webhook-cache.ts
index 4bd233366..478f22d9c 100644
--- a/packages/backend/src/misc/webhook-cache.ts
+++ b/packages/backend/src/misc/webhook-cache.ts
@@ -1,6 +1,6 @@
 import { Webhooks } from '@/models/index.js';
 import { Webhook } from '@/models/entities/webhook.js';
-import { subsdcriber } from '../db/redis.js';
+import { subsdcriber } from '@/db/redis.js';
 
 let webhooksFetched = false;
 let webhooks: Webhook[] = [];
diff --git a/packages/backend/src/models/entities/abuse-user-report.ts b/packages/backend/src/models/entities/abuse-user-report.ts
index 4f5126163..305c465f0 100644
--- a/packages/backend/src/models/entities/abuse-user-report.ts
+++ b/packages/backend/src/models/entities/abuse-user-report.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 export class AbuseUserReport {
diff --git a/packages/backend/src/models/entities/access-token.ts b/packages/backend/src/models/entities/access-token.ts
index c6e2141a4..59e6b8857 100644
--- a/packages/backend/src/models/entities/access-token.ts
+++ b/packages/backend/src/models/entities/access-token.ts
@@ -1,7 +1,7 @@
 import { Entity, PrimaryColumn, Index, Column, ManyToOne, JoinColumn } from 'typeorm';
+import { id } from '../id.js';
 import { User } from './user.js';
 import { App } from './app.js';
-import { id } from '../id.js';
 
 @Entity()
 export class AccessToken {
diff --git a/packages/backend/src/models/entities/announcement-read.ts b/packages/backend/src/models/entities/announcement-read.ts
index e4d256a86..6e21dc1b4 100644
--- a/packages/backend/src/models/entities/announcement-read.ts
+++ b/packages/backend/src/models/entities/announcement-read.ts
@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from '../id.js';
 import { User } from './user.js';
 import { Announcement } from './announcement.js';
-import { id } from '../id.js';
 
 @Entity()
 @Index(['userId', 'announcementId'], { unique: true })
diff --git a/packages/backend/src/models/entities/antenna-note.ts b/packages/backend/src/models/entities/antenna-note.ts
index fcca493fe..46f600d4e 100644
--- a/packages/backend/src/models/entities/antenna-note.ts
+++ b/packages/backend/src/models/entities/antenna-note.ts
@@ -1,7 +1,7 @@
 import { Entity, Index, JoinColumn, Column, ManyToOne, PrimaryColumn } from 'typeorm';
+import { id } from '../id.js';
 import { Note } from './note.js';
 import { Antenna } from './antenna.js';
-import { id } from '../id.js';
 
 @Entity()
 @Index(['noteId', 'antennaId'], { unique: true })
diff --git a/packages/backend/src/models/entities/antenna.ts b/packages/backend/src/models/entities/antenna.ts
index 6c8bb13e5..b500d597d 100644
--- a/packages/backend/src/models/entities/antenna.ts
+++ b/packages/backend/src/models/entities/antenna.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 import { UserList } from './user-list.js';
 import { UserGroupJoining } from './user-group-joining.js';
 
diff --git a/packages/backend/src/models/entities/app.ts b/packages/backend/src/models/entities/app.ts
index 46c11548a..567f840bb 100644
--- a/packages/backend/src/models/entities/app.ts
+++ b/packages/backend/src/models/entities/app.ts
@@ -1,6 +1,6 @@
 import { Entity, PrimaryColumn, Column, Index, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 export class App {
diff --git a/packages/backend/src/models/entities/attestation-challenge.ts b/packages/backend/src/models/entities/attestation-challenge.ts
index c40df2329..a5725342e 100644
--- a/packages/backend/src/models/entities/attestation-challenge.ts
+++ b/packages/backend/src/models/entities/attestation-challenge.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, JoinColumn, Column, ManyToOne, Index } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 export class AttestationChallenge {
diff --git a/packages/backend/src/models/entities/auth-session.ts b/packages/backend/src/models/entities/auth-session.ts
index 295d1b486..51f79e475 100644
--- a/packages/backend/src/models/entities/auth-session.ts
+++ b/packages/backend/src/models/entities/auth-session.ts
@@ -1,7 +1,7 @@
 import { Entity, PrimaryColumn, Index, Column, ManyToOne, JoinColumn } from 'typeorm';
+import { id } from '../id.js';
 import { User } from './user.js';
 import { App } from './app.js';
-import { id } from '../id.js';
 
 @Entity()
 export class AuthSession {
diff --git a/packages/backend/src/models/entities/blocking.ts b/packages/backend/src/models/entities/blocking.ts
index 4ac73a00b..c13962567 100644
--- a/packages/backend/src/models/entities/blocking.ts
+++ b/packages/backend/src/models/entities/blocking.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 @Index(['blockerId', 'blockeeId'], { unique: true })
diff --git a/packages/backend/src/models/entities/channel-following.ts b/packages/backend/src/models/entities/channel-following.ts
index 029dd6cf1..f914fe592 100644
--- a/packages/backend/src/models/entities/channel-following.ts
+++ b/packages/backend/src/models/entities/channel-following.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 import { Channel } from './channel.js';
 
 @Entity()
diff --git a/packages/backend/src/models/entities/channel-note-pining.ts b/packages/backend/src/models/entities/channel-note-pining.ts
index 23be3b69d..28f2e51dc 100644
--- a/packages/backend/src/models/entities/channel-note-pining.ts
+++ b/packages/backend/src/models/entities/channel-note-pining.ts
@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from '../id.js';
 import { Note } from './note.js';
 import { Channel } from './channel.js';
-import { id } from '../id.js';
 
 @Entity()
 @Index(['channelId', 'noteId'], { unique: true })
diff --git a/packages/backend/src/models/entities/channel.ts b/packages/backend/src/models/entities/channel.ts
index abf6668bd..82f7cd6b9 100644
--- a/packages/backend/src/models/entities/channel.ts
+++ b/packages/backend/src/models/entities/channel.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 import { DriveFile } from './drive-file.js';
 
 @Entity()
diff --git a/packages/backend/src/models/entities/clip-note.ts b/packages/backend/src/models/entities/clip-note.ts
index 6f3688550..59d589461 100644
--- a/packages/backend/src/models/entities/clip-note.ts
+++ b/packages/backend/src/models/entities/clip-note.ts
@@ -1,7 +1,7 @@
 import { Entity, Index, JoinColumn, Column, ManyToOne, PrimaryColumn } from 'typeorm';
+import { id } from '../id.js';
 import { Note } from './note.js';
 import { Clip } from './clip.js';
-import { id } from '../id.js';
 
 @Entity()
 @Index(['noteId', 'clipId'], { unique: true })
diff --git a/packages/backend/src/models/entities/clip.ts b/packages/backend/src/models/entities/clip.ts
index 1386684c3..b4b7568c8 100644
--- a/packages/backend/src/models/entities/clip.ts
+++ b/packages/backend/src/models/entities/clip.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 export class Clip {
diff --git a/packages/backend/src/models/entities/drive-file.ts b/packages/backend/src/models/entities/drive-file.ts
index 1b175be8e..9ad7fb83d 100644
--- a/packages/backend/src/models/entities/drive-file.ts
+++ b/packages/backend/src/models/entities/drive-file.ts
@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from '../id.js';
 import { User } from './user.js';
 import { DriveFolder } from './drive-folder.js';
-import { id } from '../id.js';
 
 @Entity()
 @Index(['userId', 'folderId', 'id'])
diff --git a/packages/backend/src/models/entities/drive-folder.ts b/packages/backend/src/models/entities/drive-folder.ts
index d4022c6eb..2d952cae9 100644
--- a/packages/backend/src/models/entities/drive-folder.ts
+++ b/packages/backend/src/models/entities/drive-folder.ts
@@ -1,6 +1,6 @@
 import { JoinColumn, ManyToOne, Entity, PrimaryColumn, Index, Column } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 export class DriveFolder {
diff --git a/packages/backend/src/models/entities/follow-request.ts b/packages/backend/src/models/entities/follow-request.ts
index 89946f6d3..3a2e48ce9 100644
--- a/packages/backend/src/models/entities/follow-request.ts
+++ b/packages/backend/src/models/entities/follow-request.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 @Index(['followerId', 'followeeId'], { unique: true })
diff --git a/packages/backend/src/models/entities/following.ts b/packages/backend/src/models/entities/following.ts
index b283ca7e8..55b9dc84f 100644
--- a/packages/backend/src/models/entities/following.ts
+++ b/packages/backend/src/models/entities/following.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 @Index(['followerId', 'followeeId'], { unique: true })
diff --git a/packages/backend/src/models/entities/gallery-like.ts b/packages/backend/src/models/entities/gallery-like.ts
index 4ce166d19..a8ff57899 100644
--- a/packages/backend/src/models/entities/gallery-like.ts
+++ b/packages/backend/src/models/entities/gallery-like.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 import { GalleryPost } from './gallery-post.js';
 
 @Entity()
diff --git a/packages/backend/src/models/entities/gallery-post.ts b/packages/backend/src/models/entities/gallery-post.ts
index 774cb946e..6ed392d86 100644
--- a/packages/backend/src/models/entities/gallery-post.ts
+++ b/packages/backend/src/models/entities/gallery-post.ts
@@ -1,6 +1,6 @@
 import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 import { DriveFile } from './drive-file.js';
 
 @Entity()
diff --git a/packages/backend/src/models/entities/hashtag.ts b/packages/backend/src/models/entities/hashtag.ts
index 6bd991f62..c830a3f34 100644
--- a/packages/backend/src/models/entities/hashtag.ts
+++ b/packages/backend/src/models/entities/hashtag.ts
@@ -1,6 +1,6 @@
 import { Entity, PrimaryColumn, Index, Column } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 export class Hashtag {
diff --git a/packages/backend/src/models/entities/messaging-message.ts b/packages/backend/src/models/entities/messaging-message.ts
index 099fb7aa0..4ac387813 100644
--- a/packages/backend/src/models/entities/messaging-message.ts
+++ b/packages/backend/src/models/entities/messaging-message.ts
@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from '../id.js';
 import { User } from './user.js';
 import { DriveFile } from './drive-file.js';
-import { id } from '../id.js';
 import { UserGroup } from './user-group.js';
 
 @Entity()
diff --git a/packages/backend/src/models/entities/meta.ts b/packages/backend/src/models/entities/meta.ts
index c6a4c9f41..43bd22903 100644
--- a/packages/backend/src/models/entities/meta.ts
+++ b/packages/backend/src/models/entities/meta.ts
@@ -1,6 +1,6 @@
 import { Entity, Column, PrimaryColumn, ManyToOne, JoinColumn } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 import { Clip } from './clip.js';
 
 @Entity()
diff --git a/packages/backend/src/models/entities/moderation-log.ts b/packages/backend/src/models/entities/moderation-log.ts
index c99e55078..47b0bc715 100644
--- a/packages/backend/src/models/entities/moderation-log.ts
+++ b/packages/backend/src/models/entities/moderation-log.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 export class ModerationLog {
diff --git a/packages/backend/src/models/entities/muted-note.ts b/packages/backend/src/models/entities/muted-note.ts
index 96a4fa8e3..c75262ece 100644
--- a/packages/backend/src/models/entities/muted-note.ts
+++ b/packages/backend/src/models/entities/muted-note.ts
@@ -1,8 +1,8 @@
 import { Entity, Index, JoinColumn, Column, ManyToOne, PrimaryColumn } from 'typeorm';
+import { mutedNoteReasons } from '@/types.js';
+import { id } from '../id.js';
 import { Note } from './note.js';
 import { User } from './user.js';
-import { id } from '../id.js';
-import { mutedNoteReasons } from '../../types.js';
 
 @Entity()
 @Index(['noteId', 'userId'], { unique: true })
diff --git a/packages/backend/src/models/entities/muting.ts b/packages/backend/src/models/entities/muting.ts
index 8f9e69063..19ff0da84 100644
--- a/packages/backend/src/models/entities/muting.ts
+++ b/packages/backend/src/models/entities/muting.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 @Index(['muterId', 'muteeId'], { unique: true })
diff --git a/packages/backend/src/models/entities/note-favorite.ts b/packages/backend/src/models/entities/note-favorite.ts
index fe065b77a..63fb54bbe 100644
--- a/packages/backend/src/models/entities/note-favorite.ts
+++ b/packages/backend/src/models/entities/note-favorite.ts
@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from '../id.js';
 import { Note } from './note.js';
 import { User } from './user.js';
-import { id } from '../id.js';
 
 @Entity()
 @Index(['userId', 'noteId'], { unique: true })
diff --git a/packages/backend/src/models/entities/note-reaction.ts b/packages/backend/src/models/entities/note-reaction.ts
index d7bc60989..d84e64304 100644
--- a/packages/backend/src/models/entities/note-reaction.ts
+++ b/packages/backend/src/models/entities/note-reaction.ts
@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from '../id.js';
 import { User } from './user.js';
 import { Note } from './note.js';
-import { id } from '../id.js';
 
 @Entity()
 @Index(['userId', 'noteId'], { unique: true })
diff --git a/packages/backend/src/models/entities/note-thread-muting.ts b/packages/backend/src/models/entities/note-thread-muting.ts
index 8c5f7bbab..0f2a29171 100644
--- a/packages/backend/src/models/entities/note-thread-muting.ts
+++ b/packages/backend/src/models/entities/note-thread-muting.ts
@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from '../id.js';
 import { User } from './user.js';
 import { Note } from './note.js';
-import { id } from '../id.js';
 
 @Entity()
 @Index(['userId', 'threadId'], { unique: true })
diff --git a/packages/backend/src/models/entities/note-unread.ts b/packages/backend/src/models/entities/note-unread.ts
index a7acf254d..3219970f3 100644
--- a/packages/backend/src/models/entities/note-unread.ts
+++ b/packages/backend/src/models/entities/note-unread.ts
@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from '../id.js';
 import { User } from './user.js';
 import { Note } from './note.js';
-import { id } from '../id.js';
 import { Channel } from './channel.js';
 
 @Entity()
diff --git a/packages/backend/src/models/entities/note-watching.ts b/packages/backend/src/models/entities/note-watching.ts
index ed82e7dfe..d51d14693 100644
--- a/packages/backend/src/models/entities/note-watching.ts
+++ b/packages/backend/src/models/entities/note-watching.ts
@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from '../id.js';
 import { User } from './user.js';
 import { Note } from './note.js';
-import { id } from '../id.js';
 
 @Entity()
 @Index(['userId', 'noteId'], { unique: true })
diff --git a/packages/backend/src/models/entities/note.ts b/packages/backend/src/models/entities/note.ts
index 0ffeb85f6..ee7cbec43 100644
--- a/packages/backend/src/models/entities/note.ts
+++ b/packages/backend/src/models/entities/note.ts
@@ -1,8 +1,8 @@
 import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
+import { noteVisibilities } from '@/types.js';
+import { id } from '../id.js';
 import { User } from './user.js';
 import { DriveFile } from './drive-file.js';
-import { id } from '../id.js';
-import { noteVisibilities } from '../../types.js';
 import { Channel } from './channel.js';
 
 @Entity()
diff --git a/packages/backend/src/models/entities/notification.ts b/packages/backend/src/models/entities/notification.ts
index db3dba363..1fd69d5e8 100644
--- a/packages/backend/src/models/entities/notification.ts
+++ b/packages/backend/src/models/entities/notification.ts
@@ -1,11 +1,11 @@
 import { Entity, Index, JoinColumn, ManyToOne, Column, PrimaryColumn } from 'typeorm';
-import { User } from './user.js';
+import { notificationTypes } from '@/types.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 import { Note } from './note.js';
 import { FollowRequest } from './follow-request.js';
 import { UserGroupInvitation } from './user-group-invitation.js';
 import { AccessToken } from './access-token.js';
-import { notificationTypes } from '@/types.js';
 
 @Entity()
 export class Notification {
diff --git a/packages/backend/src/models/entities/page-like.ts b/packages/backend/src/models/entities/page-like.ts
index 17f4ebf52..6c8e03f7e 100644
--- a/packages/backend/src/models/entities/page-like.ts
+++ b/packages/backend/src/models/entities/page-like.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 import { Page } from './page.js';
 
 @Entity()
diff --git a/packages/backend/src/models/entities/page.ts b/packages/backend/src/models/entities/page.ts
index baad3a36f..5b0ac90b2 100644
--- a/packages/backend/src/models/entities/page.ts
+++ b/packages/backend/src/models/entities/page.ts
@@ -1,6 +1,6 @@
 import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 import { DriveFile } from './drive-file.js';
 
 @Entity()
diff --git a/packages/backend/src/models/entities/poll-vote.ts b/packages/backend/src/models/entities/poll-vote.ts
index fca1cd009..442c58d35 100644
--- a/packages/backend/src/models/entities/poll-vote.ts
+++ b/packages/backend/src/models/entities/poll-vote.ts
@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from '../id.js';
 import { User } from './user.js';
 import { Note } from './note.js';
-import { id } from '../id.js';
 
 @Entity()
 @Index(['userId', 'noteId', 'choice'], { unique: true })
diff --git a/packages/backend/src/models/entities/poll.ts b/packages/backend/src/models/entities/poll.ts
index 83d0873cc..de40ee719 100644
--- a/packages/backend/src/models/entities/poll.ts
+++ b/packages/backend/src/models/entities/poll.ts
@@ -1,8 +1,8 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, OneToOne } from 'typeorm';
+import { noteVisibilities } from '@/types.js';
 import { id } from '../id.js';
 import { Note } from './note.js';
 import { User } from './user.js';
-import { noteVisibilities } from '../../types.js';
 
 @Entity()
 export class Poll {
diff --git a/packages/backend/src/models/entities/promo-note.ts b/packages/backend/src/models/entities/promo-note.ts
index d110b81e9..13b0b9742 100644
--- a/packages/backend/src/models/entities/promo-note.ts
+++ b/packages/backend/src/models/entities/promo-note.ts
@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, OneToOne } from 'typeorm';
+import { id } from '../id.js';
 import { Note } from './note.js';
 import { User } from './user.js';
-import { id } from '../id.js';
 
 @Entity()
 export class PromoNote {
diff --git a/packages/backend/src/models/entities/promo-read.ts b/packages/backend/src/models/entities/promo-read.ts
index a63b79cd1..ca5d08054 100644
--- a/packages/backend/src/models/entities/promo-read.ts
+++ b/packages/backend/src/models/entities/promo-read.ts
@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from '../id.js';
 import { Note } from './note.js';
 import { User } from './user.js';
-import { id } from '../id.js';
 
 @Entity()
 @Index(['userId', 'noteId'], { unique: true })
diff --git a/packages/backend/src/models/entities/registry-item.ts b/packages/backend/src/models/entities/registry-item.ts
index 283796df9..7f8c5d6a2 100644
--- a/packages/backend/src/models/entities/registry-item.ts
+++ b/packages/backend/src/models/entities/registry-item.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 // TODO: 同じdomain、同じscope、同じkeyのレコードは二つ以上存在しないように制約付けたい
 @Entity()
diff --git a/packages/backend/src/models/entities/signin.ts b/packages/backend/src/models/entities/signin.ts
index ba81f45e4..d50c052e9 100644
--- a/packages/backend/src/models/entities/signin.ts
+++ b/packages/backend/src/models/entities/signin.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 export class Signin {
diff --git a/packages/backend/src/models/entities/sw-subscription.ts b/packages/backend/src/models/entities/sw-subscription.ts
index 59144d348..801a5fd81 100644
--- a/packages/backend/src/models/entities/sw-subscription.ts
+++ b/packages/backend/src/models/entities/sw-subscription.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 export class SwSubscription {
diff --git a/packages/backend/src/models/entities/user-group-invitation.ts b/packages/backend/src/models/entities/user-group-invitation.ts
index 10f357049..d51ec6324 100644
--- a/packages/backend/src/models/entities/user-group-invitation.ts
+++ b/packages/backend/src/models/entities/user-group-invitation.ts
@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from '../id.js';
 import { User } from './user.js';
 import { UserGroup } from './user-group.js';
-import { id } from '../id.js';
 
 @Entity()
 @Index(['userId', 'userGroupId'], { unique: true })
diff --git a/packages/backend/src/models/entities/user-group-joining.ts b/packages/backend/src/models/entities/user-group-joining.ts
index 62a814218..fbce5f6e7 100644
--- a/packages/backend/src/models/entities/user-group-joining.ts
+++ b/packages/backend/src/models/entities/user-group-joining.ts
@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from '../id.js';
 import { User } from './user.js';
 import { UserGroup } from './user-group.js';
-import { id } from '../id.js';
 
 @Entity()
 @Index(['userId', 'userGroupId'], { unique: true })
diff --git a/packages/backend/src/models/entities/user-group.ts b/packages/backend/src/models/entities/user-group.ts
index 8d5de1d92..1538153bf 100644
--- a/packages/backend/src/models/entities/user-group.ts
+++ b/packages/backend/src/models/entities/user-group.ts
@@ -1,6 +1,6 @@
 import { Entity, Index, JoinColumn, Column, PrimaryColumn, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 export class UserGroup {
diff --git a/packages/backend/src/models/entities/user-keypair.ts b/packages/backend/src/models/entities/user-keypair.ts
index 85fa06297..7db39f6df 100644
--- a/packages/backend/src/models/entities/user-keypair.ts
+++ b/packages/backend/src/models/entities/user-keypair.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, JoinColumn, Column, OneToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 export class UserKeypair {
diff --git a/packages/backend/src/models/entities/user-list-joining.ts b/packages/backend/src/models/entities/user-list-joining.ts
index 12f28c414..f66151ff9 100644
--- a/packages/backend/src/models/entities/user-list-joining.ts
+++ b/packages/backend/src/models/entities/user-list-joining.ts
@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from '../id.js';
 import { User } from './user.js';
 import { UserList } from './user-list.js';
-import { id } from '../id.js';
 
 @Entity()
 @Index(['userId', 'userListId'], { unique: true })
diff --git a/packages/backend/src/models/entities/user-list.ts b/packages/backend/src/models/entities/user-list.ts
index ca69394e9..4e895b1d1 100644
--- a/packages/backend/src/models/entities/user-list.ts
+++ b/packages/backend/src/models/entities/user-list.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 export class UserList {
diff --git a/packages/backend/src/models/entities/user-note-pining.ts b/packages/backend/src/models/entities/user-note-pining.ts
index c91ab7fdd..c4ba30bef 100644
--- a/packages/backend/src/models/entities/user-note-pining.ts
+++ b/packages/backend/src/models/entities/user-note-pining.ts
@@ -1,7 +1,7 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
+import { id } from '../id.js';
 import { Note } from './note.js';
 import { User } from './user.js';
-import { id } from '../id.js';
 
 @Entity()
 @Index(['userId', 'noteId'], { unique: true })
diff --git a/packages/backend/src/models/entities/user-profile.ts b/packages/backend/src/models/entities/user-profile.ts
index 1778742ea..251b998be 100644
--- a/packages/backend/src/models/entities/user-profile.ts
+++ b/packages/backend/src/models/entities/user-profile.ts
@@ -1,8 +1,8 @@
 import { Entity, Column, Index, OneToOne, JoinColumn, PrimaryColumn } from 'typeorm';
+import { ffVisibility, notificationTypes } from '@/types.js';
 import { id } from '../id.js';
 import { User } from './user.js';
 import { Page } from './page.js';
-import { ffVisibility, notificationTypes } from '@/types.js';
 
 // TODO: このテーブルで管理している情報すべてレジストリで管理するようにしても良いかも
 //       ただ、「emailVerified が true なユーザーを find する」のようなクエリは書けなくなるからウーン
diff --git a/packages/backend/src/models/entities/user-publickey.ts b/packages/backend/src/models/entities/user-publickey.ts
index 31ed60de8..c0a439227 100644
--- a/packages/backend/src/models/entities/user-publickey.ts
+++ b/packages/backend/src/models/entities/user-publickey.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, OneToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 export class UserPublickey {
diff --git a/packages/backend/src/models/entities/user-security-key.ts b/packages/backend/src/models/entities/user-security-key.ts
index c4f2a852e..78f78a501 100644
--- a/packages/backend/src/models/entities/user-security-key.ts
+++ b/packages/backend/src/models/entities/user-security-key.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, JoinColumn, Column, ManyToOne, Index } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 @Entity()
 export class UserSecurityKey {
diff --git a/packages/backend/src/models/entities/webhook.ts b/packages/backend/src/models/entities/webhook.ts
index 56b411f87..f89fe06c0 100644
--- a/packages/backend/src/models/entities/webhook.ts
+++ b/packages/backend/src/models/entities/webhook.ts
@@ -1,6 +1,6 @@
 import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typeorm';
-import { User } from './user.js';
 import { id } from '../id.js';
+import { User } from './user.js';
 
 export const webhookEventTypes = ['mention', 'unfollow', 'follow', 'followed', 'note', 'reply', 'renote', 'reaction'] as const;
 
diff --git a/packages/backend/src/models/repositories/abuse-user-report.ts b/packages/backend/src/models/repositories/abuse-user-report.ts
index d1adf3f30..cf0c33e7c 100644
--- a/packages/backend/src/models/repositories/abuse-user-report.ts
+++ b/packages/backend/src/models/repositories/abuse-user-report.ts
@@ -1,7 +1,7 @@
 import { db } from '@/db/postgre.js';
-import { Users } from '../index.js';
 import { AbuseUserReport } from '@/models/entities/abuse-user-report.js';
 import { awaitAll } from '@/prelude/await-all.js';
+import { Users } from '../index.js';
 
 export const AbuseUserReportRepository = db.getRepository(AbuseUserReport).extend({
 	async pack(
diff --git a/packages/backend/src/models/repositories/app.ts b/packages/backend/src/models/repositories/app.ts
index 0ede7be14..9f30442a1 100644
--- a/packages/backend/src/models/repositories/app.ts
+++ b/packages/backend/src/models/repositories/app.ts
@@ -1,7 +1,7 @@
 import { db } from '@/db/postgre.js';
+import { Packed } from '@/misc/schema.js';
 import { App } from '@/models/entities/app.js';
 import { AccessTokens } from '../index.js';
-import { Packed } from '@/misc/schema.js';
 import { User } from '../entities/user.js';
 
 export const AppRepository = db.getRepository(App).extend({
diff --git a/packages/backend/src/models/repositories/auth-session.ts b/packages/backend/src/models/repositories/auth-session.ts
index 3f1f6f489..55ce446fb 100644
--- a/packages/backend/src/models/repositories/auth-session.ts
+++ b/packages/backend/src/models/repositories/auth-session.ts
@@ -1,8 +1,8 @@
 import { db } from '@/db/postgre.js';
-import { Apps } from '../index.js';
 import { AuthSession } from '@/models/entities/auth-session.js';
-import { awaitAll } from '@/prelude/await-all.js';
 import { User } from '@/models/entities/user.js';
+import { awaitAll } from '@/prelude/await-all.js';
+import { Apps } from '../index.js';
 
 export const AuthSessionRepository = db.getRepository(AuthSession).extend({
 	async pack(
diff --git a/packages/backend/src/models/repositories/blocking.ts b/packages/backend/src/models/repositories/blocking.ts
index 1d569fb87..1c0b4c9ff 100644
--- a/packages/backend/src/models/repositories/blocking.ts
+++ b/packages/backend/src/models/repositories/blocking.ts
@@ -1,9 +1,9 @@
 import { db } from '@/db/postgre.js';
-import { Users } from '../index.js';
-import { Blocking } from '@/models/entities/blocking.js';
-import { awaitAll } from '@/prelude/await-all.js';
 import { Packed } from '@/misc/schema.js';
+import { Blocking } from '@/models/entities/blocking.js';
 import { User } from '@/models/entities/user.js';
+import { awaitAll } from '@/prelude/await-all.js';
+import { Users } from '../index.js';
 
 export const BlockingRepository = db.getRepository(Blocking).extend({
 	async pack(
diff --git a/packages/backend/src/models/repositories/channel.ts b/packages/backend/src/models/repositories/channel.ts
index 213ac3671..f6c2088c2 100644
--- a/packages/backend/src/models/repositories/channel.ts
+++ b/packages/backend/src/models/repositories/channel.ts
@@ -1,8 +1,8 @@
 import { db } from '@/db/postgre.js';
-import { Channel } from '@/models/entities/channel.js';
 import { Packed } from '@/misc/schema.js';
-import { DriveFiles, ChannelFollowings, NoteUnreads } from '../index.js';
+import { Channel } from '@/models/entities/channel.js';
 import { User } from '@/models/entities/user.js';
+import { DriveFiles, ChannelFollowings, NoteUnreads } from '../index.js';
 
 export const ChannelRepository = db.getRepository(Channel).extend({
 	async pack(
diff --git a/packages/backend/src/models/repositories/clip.ts b/packages/backend/src/models/repositories/clip.ts
index b4a342905..80096a539 100644
--- a/packages/backend/src/models/repositories/clip.ts
+++ b/packages/backend/src/models/repositories/clip.ts
@@ -1,8 +1,8 @@
 import { db } from '@/db/postgre.js';
-import { Clip } from '@/models/entities/clip.js';
 import { Packed } from '@/misc/schema.js';
-import { Users } from '../index.js';
+import { Clip } from '@/models/entities/clip.js';
 import { awaitAll } from '@/prelude/await-all.js';
+import { Users } from '../index.js';
 
 export const ClipRepository = db.getRepository(Clip).extend({
 	async pack(
diff --git a/packages/backend/src/models/repositories/drive-folder.ts b/packages/backend/src/models/repositories/drive-folder.ts
index ab5f3dab6..598b909b4 100644
--- a/packages/backend/src/models/repositories/drive-folder.ts
+++ b/packages/backend/src/models/repositories/drive-folder.ts
@@ -1,8 +1,8 @@
 import { db } from '@/db/postgre.js';
-import { DriveFolders, DriveFiles } from '../index.js';
+import { Packed } from '@/misc/schema.js';
 import { DriveFolder } from '@/models/entities/drive-folder.js';
 import { awaitAll } from '@/prelude/await-all.js';
-import { Packed } from '@/misc/schema.js';
+import { DriveFolders, DriveFiles } from '../index.js';
 
 export const DriveFolderRepository = db.getRepository(DriveFolder).extend({
 	async pack(
diff --git a/packages/backend/src/models/repositories/follow-request.ts b/packages/backend/src/models/repositories/follow-request.ts
index c4a7203aa..2bded951b 100644
--- a/packages/backend/src/models/repositories/follow-request.ts
+++ b/packages/backend/src/models/repositories/follow-request.ts
@@ -1,7 +1,7 @@
 import { db } from '@/db/postgre.js';
 import { FollowRequest } from '@/models/entities/follow-request.js';
-import { Users } from '../index.js';
 import { User } from '@/models/entities/user.js';
+import { Users } from '../index.js';
 
 export const FollowRequestRepository = db.getRepository(FollowRequest).extend({
 	async pack(
diff --git a/packages/backend/src/models/repositories/following.ts b/packages/backend/src/models/repositories/following.ts
index 46109244f..d70b89819 100644
--- a/packages/backend/src/models/repositories/following.ts
+++ b/packages/backend/src/models/repositories/following.ts
@@ -1,9 +1,9 @@
 import { db } from '@/db/postgre.js';
-import { Users } from '../index.js';
-import { Following } from '@/models/entities/following.js';
-import { awaitAll } from '@/prelude/await-all.js';
 import { Packed } from '@/misc/schema.js';
+import { Following } from '@/models/entities/following.js';
 import { User } from '@/models/entities/user.js';
+import { awaitAll } from '@/prelude/await-all.js';
+import { Users } from '../index.js';
 
 type LocalFollowerFollowing = Following & {
 	followerHost: null;
diff --git a/packages/backend/src/models/repositories/gallery-post.ts b/packages/backend/src/models/repositories/gallery-post.ts
index bb8d40b75..7c54001ec 100644
--- a/packages/backend/src/models/repositories/gallery-post.ts
+++ b/packages/backend/src/models/repositories/gallery-post.ts
@@ -1,9 +1,9 @@
 import { db } from '@/db/postgre.js';
-import { GalleryPost } from '@/models/entities/gallery-post.js';
 import { Packed } from '@/misc/schema.js';
-import { Users, DriveFiles, GalleryLikes } from '../index.js';
-import { awaitAll } from '@/prelude/await-all.js';
+import { GalleryPost } from '@/models/entities/gallery-post.js';
 import { User } from '@/models/entities/user.js';
+import { awaitAll } from '@/prelude/await-all.js';
+import { Users, DriveFiles, GalleryLikes } from '../index.js';
 
 export const GalleryPostRepository = db.getRepository(GalleryPost).extend({
 	async pack(
diff --git a/packages/backend/src/models/repositories/messaging-message.ts b/packages/backend/src/models/repositories/messaging-message.ts
index 6c51c93ff..b3a7ea465 100644
--- a/packages/backend/src/models/repositories/messaging-message.ts
+++ b/packages/backend/src/models/repositories/messaging-message.ts
@@ -1,8 +1,8 @@
 import { db } from '@/db/postgre.js';
-import { MessagingMessage } from '@/models/entities/messaging-message.js';
-import { Users, DriveFiles, UserGroups } from '../index.js';
 import { Packed } from '@/misc/schema.js';
+import { MessagingMessage } from '@/models/entities/messaging-message.js';
 import { User } from '@/models/entities/user.js';
+import { Users, DriveFiles, UserGroups } from '../index.js';
 
 export const MessagingMessageRepository = db.getRepository(MessagingMessage).extend({
 	async pack(
diff --git a/packages/backend/src/models/repositories/moderation-logs.ts b/packages/backend/src/models/repositories/moderation-logs.ts
index 1488b1eab..77f479425 100644
--- a/packages/backend/src/models/repositories/moderation-logs.ts
+++ b/packages/backend/src/models/repositories/moderation-logs.ts
@@ -1,7 +1,7 @@
 import { db } from '@/db/postgre.js';
-import { Users } from '../index.js';
 import { ModerationLog } from '@/models/entities/moderation-log.js';
 import { awaitAll } from '@/prelude/await-all.js';
+import { Users } from '../index.js';
 
 export const ModerationLogRepository = db.getRepository(ModerationLog).extend({
 	async pack(
diff --git a/packages/backend/src/models/repositories/muting.ts b/packages/backend/src/models/repositories/muting.ts
index 7891b10fb..c34e908cf 100644
--- a/packages/backend/src/models/repositories/muting.ts
+++ b/packages/backend/src/models/repositories/muting.ts
@@ -1,9 +1,9 @@
 import { db } from '@/db/postgre.js';
-import { Users } from '../index.js';
-import { Muting } from '@/models/entities/muting.js';
-import { awaitAll } from '@/prelude/await-all.js';
 import { Packed } from '@/misc/schema.js';
+import { Muting } from '@/models/entities/muting.js';
 import { User } from '@/models/entities/user.js';
+import { awaitAll } from '@/prelude/await-all.js';
+import { Users } from '../index.js';
 
 export const MutingRepository = db.getRepository(Muting).extend({
 	async pack(
diff --git a/packages/backend/src/models/repositories/note-favorite.ts b/packages/backend/src/models/repositories/note-favorite.ts
index 1d5702053..8d09d6bfb 100644
--- a/packages/backend/src/models/repositories/note-favorite.ts
+++ b/packages/backend/src/models/repositories/note-favorite.ts
@@ -1,7 +1,7 @@
 import { db } from '@/db/postgre.js';
 import { NoteFavorite } from '@/models/entities/note-favorite.js';
-import { Notes } from '../index.js';
 import { User } from '@/models/entities/user.js';
+import { Notes } from '../index.js';
 
 export const NoteFavoriteRepository = db.getRepository(NoteFavorite).extend({
 	async pack(
diff --git a/packages/backend/src/models/repositories/note-reaction.ts b/packages/backend/src/models/repositories/note-reaction.ts
index 46084a9a1..b76ec0401 100644
--- a/packages/backend/src/models/repositories/note-reaction.ts
+++ b/packages/backend/src/models/repositories/note-reaction.ts
@@ -1,9 +1,9 @@
 import { db } from '@/db/postgre.js';
-import { NoteReaction } from '@/models/entities/note-reaction.js';
-import { Notes, Users } from '../index.js';
-import { Packed } from '@/misc/schema.js';
 import { convertLegacyReaction } from '@/misc/reaction-lib.js';
+import { Packed } from '@/misc/schema.js';
+import { NoteReaction } from '@/models/entities/note-reaction.js';
 import { User } from '@/models/entities/user.js';
+import { Notes, Users } from '../index.js';
 
 export const NoteReactionRepository = db.getRepository(NoteReaction).extend({
 	async pack(
diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts
index e697b4cea..b1311818d 100644
--- a/packages/backend/src/models/repositories/note.ts
+++ b/packages/backend/src/models/repositories/note.ts
@@ -1,16 +1,16 @@
 import { In } from 'typeorm';
 import * as mfm from 'mfm-js';
-import { Note } from '@/models/entities/note.js';
-import { User } from '@/models/entities/user.js';
-import { Users, PollVotes, DriveFiles, NoteReactions, Followings, Polls, Channels } from '../index.js';
-import { Packed } from '@/misc/schema.js';
-import { nyaize } from '@/misc/nyaize.js';
-import { awaitAll } from '@/prelude/await-all.js';
-import { convertLegacyReaction, convertLegacyReactions, decodeReaction } from '@/misc/reaction-lib.js';
-import { NoteReaction } from '@/models/entities/note-reaction.js';
-import { aggregateNoteEmojis, populateEmojis, prefetchEmojis } from '@/misc/populate-emojis.js';
 import { db } from '@/db/postgre.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
+import { nyaize } from '@/misc/nyaize.js';
+import { aggregateNoteEmojis, populateEmojis, prefetchEmojis } from '@/misc/populate-emojis.js';
+import { convertLegacyReaction, convertLegacyReactions, decodeReaction } from '@/misc/reaction-lib.js';
+import { Packed } from '@/misc/schema.js';
+import { Note } from '@/models/entities/note.js';
+import { NoteReaction } from '@/models/entities/note-reaction.js';
+import { User } from '@/models/entities/user.js';
+import { awaitAll } from '@/prelude/await-all.js';
+import { Users, PollVotes, DriveFiles, NoteReactions, Followings, Polls, Channels } from '../index.js';
 
 async function populatePoll(note: Note, meId: User['id'] | null) {
 	const poll = await Polls.findOneByOrFail({ noteId: note.id });
diff --git a/packages/backend/src/models/repositories/notification.ts b/packages/backend/src/models/repositories/notification.ts
index 9afcea1f0..169743ce7 100644
--- a/packages/backend/src/models/repositories/notification.ts
+++ b/packages/backend/src/models/repositories/notification.ts
@@ -1,13 +1,13 @@
 import { In } from 'typeorm';
-import { Users, Notes, UserGroupInvitations, AccessTokens, NoteReactions } from '../index.js';
-import { Notification } from '@/models/entities/notification.js';
-import { awaitAll } from '@/prelude/await-all.js';
+import { db } from '@/db/postgre.js';
+import { aggregateNoteEmojis, prefetchEmojis } from '@/misc/populate-emojis.js';
 import { Packed } from '@/misc/schema.js';
 import { Note } from '@/models/entities/note.js';
 import { NoteReaction } from '@/models/entities/note-reaction.js';
+import { Notification } from '@/models/entities/notification.js';
 import { User } from '@/models/entities/user.js';
-import { aggregateNoteEmojis, prefetchEmojis } from '@/misc/populate-emojis.js';
-import { db } from '@/db/postgre.js';
+import { awaitAll } from '@/prelude/await-all.js';
+import { Users, Notes, UserGroupInvitations, AccessTokens, NoteReactions } from '../index.js';
 
 export const NotificationRepository = db.getRepository(Notification).extend({
 	async pack(
diff --git a/packages/backend/src/models/repositories/page-like.ts b/packages/backend/src/models/repositories/page-like.ts
index 87d6accc3..f4bcbc564 100644
--- a/packages/backend/src/models/repositories/page-like.ts
+++ b/packages/backend/src/models/repositories/page-like.ts
@@ -1,7 +1,7 @@
 import { db } from '@/db/postgre.js';
 import { PageLike } from '@/models/entities/page-like.js';
-import { Pages } from '../index.js';
 import { User } from '@/models/entities/user.js';
+import { Pages } from '../index.js';
 
 export const PageLikeRepository = db.getRepository(PageLike).extend({
 	async pack(
diff --git a/packages/backend/src/models/repositories/user-group.ts b/packages/backend/src/models/repositories/user-group.ts
index 6eb923424..01566c6f2 100644
--- a/packages/backend/src/models/repositories/user-group.ts
+++ b/packages/backend/src/models/repositories/user-group.ts
@@ -1,7 +1,7 @@
 import { db } from '@/db/postgre.js';
+import { Packed } from '@/misc/schema.js';
 import { UserGroup } from '@/models/entities/user-group.js';
 import { UserGroupJoinings } from '../index.js';
-import { Packed } from '@/misc/schema.js';
 
 export const UserGroupRepository = db.getRepository(UserGroup).extend({
 	async pack(
diff --git a/packages/backend/src/models/repositories/user-list.ts b/packages/backend/src/models/repositories/user-list.ts
index 2b6f411ef..fffa3ca74 100644
--- a/packages/backend/src/models/repositories/user-list.ts
+++ b/packages/backend/src/models/repositories/user-list.ts
@@ -1,7 +1,7 @@
 import { db } from '@/db/postgre.js';
+import { Packed } from '@/misc/schema.js';
 import { UserList } from '@/models/entities/user-list.js';
 import { UserListJoinings } from '../index.js';
-import { Packed } from '@/misc/schema.js';
 
 export const UserListRepository = db.getRepository(UserList).extend({
 	async pack(
diff --git a/packages/backend/src/queue/index.ts b/packages/backend/src/queue/index.ts
index c5fd7de1c..0896848c4 100644
--- a/packages/backend/src/queue/index.ts
+++ b/packages/backend/src/queue/index.ts
@@ -2,6 +2,9 @@ import httpSignature from '@peertube/http-signature';
 import { v4 as uuid } from 'uuid';
 
 import config from '@/config/index.js';
+import { DriveFile } from '@/models/entities/drive-file.js';
+import { Webhook, webhookEventTypes } from '@/models/entities/webhook.js';
+import { IActivity } from '@/remote/activitypub/type.js';
 import { envOption } from '../env.js';
 
 import processDeliver from './processors/deliver.js';
@@ -12,12 +15,9 @@ import processSystemQueue from './processors/system/index.js';
 import processWebhookDeliver from './processors/webhook-deliver.js';
 import { endedPollNotification } from './processors/ended-poll-notification.js';
 import { queueLogger } from './logger.js';
-import { DriveFile } from '@/models/entities/drive-file.js';
 import { getJobInfo } from './get-job-info.js';
 import { systemQueue, dbQueue, deliverQueue, inboxQueue, objectStorageQueue, endedPollNotificationQueue, webhookDeliverQueue } from './queues.js';
 import { ThinUser } from './types.js';
-import { IActivity } from '@/remote/activitypub/type.js';
-import { Webhook, webhookEventTypes } from '@/models/entities/webhook.js';
 
 function renderError(e: Error): any {
 	return {
diff --git a/packages/backend/src/queue/processors/db/delete-account.ts b/packages/backend/src/queue/processors/db/delete-account.ts
index d36e2c7b7..96f60cfe5 100644
--- a/packages/backend/src/queue/processors/db/delete-account.ts
+++ b/packages/backend/src/queue/processors/db/delete-account.ts
@@ -1,10 +1,10 @@
 import Bull from 'bull';
-import { queueLogger } from '../../logger.js';
-import { DriveFiles, Notes, UserProfiles, Users } from '@/models/index.js';
-import { DbUserDeleteJobData } from '@/queue/types.js';
-import { Note } from '@/models/entities/note.js';
-import { DriveFile } from '@/models/entities/drive-file.js';
 import { MoreThan } from 'typeorm';
+import { DriveFiles, Notes, UserProfiles, Users } from '@/models/index.js';
+import { DriveFile } from '@/models/entities/drive-file.js';
+import { Note } from '@/models/entities/note.js';
+import { queueLogger } from '@/queue/logger.js';
+import { DbUserDeleteJobData } from '@/queue/types.js';
 import { deleteFileSync } from '@/services/drive/delete-file.js';
 import { sendEmail } from '@/services/send-email.js';
 
diff --git a/packages/backend/src/queue/processors/db/delete-drive-files.ts b/packages/backend/src/queue/processors/db/delete-drive-files.ts
index b3832d9f0..0c59ea716 100644
--- a/packages/backend/src/queue/processors/db/delete-drive-files.ts
+++ b/packages/backend/src/queue/processors/db/delete-drive-files.ts
@@ -1,10 +1,9 @@
 import Bull from 'bull';
-
-import { queueLogger } from '../../logger.js';
-import { deleteFileSync } from '@/services/drive/delete-file.js';
-import { Users, DriveFiles } from '@/models/index.js';
 import { MoreThan } from 'typeorm';
+import { Users, DriveFiles } from '@/models/index.js';
+import { deleteFileSync } from '@/services/drive/delete-file.js';
 import { DbUserJobData } from '@/queue/types.js';
+import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('delete-drive-files');
 
diff --git a/packages/backend/src/queue/processors/db/export-blocking.ts b/packages/backend/src/queue/processors/db/export-blocking.ts
index f5e0424a7..be4f9b96b 100644
--- a/packages/backend/src/queue/processors/db/export-blocking.ts
+++ b/packages/backend/src/queue/processors/db/export-blocking.ts
@@ -1,14 +1,14 @@
-import Bull from 'bull';
 import * as fs from 'node:fs';
-
-import { queueLogger } from '../../logger.js';
-import { addFile } from '@/services/drive/add-file.js';
+import Bull from 'bull';
 import { format as dateFormat } from 'date-fns';
+import { MoreThan } from 'typeorm';
+
 import { getFullApAccount } from '@/misc/convert-host.js';
 import { createTemp } from '@/misc/create-temp.js';
 import { Users, Blockings } from '@/models/index.js';
-import { MoreThan } from 'typeorm';
 import { DbUserJobData } from '@/queue/types.js';
+import { addFile } from '@/services/drive/add-file.js';
+import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('export-blocking');
 
diff --git a/packages/backend/src/queue/processors/db/export-custom-emojis.ts b/packages/backend/src/queue/processors/db/export-custom-emojis.ts
index e2c3bf500..4872703f5 100644
--- a/packages/backend/src/queue/processors/db/export-custom-emojis.ts
+++ b/packages/backend/src/queue/processors/db/export-custom-emojis.ts
@@ -1,17 +1,16 @@
-import Bull from 'bull';
 import * as fs from 'node:fs';
-
-import mime from 'mime-types';
 import archiver from 'archiver';
-import { queueLogger } from '../../logger.js';
-import { addFile } from '@/services/drive/add-file.js';
+import Bull from 'bull';
 import { format as dateFormat } from 'date-fns';
-import { Users, Emojis } from '@/models/index.js';
-import { } from '@/queue/types.js';
+import mime from 'mime-types';
+import { IsNull } from 'typeorm';
+import config from '@/config/index.js';
 import { createTemp, createTempDir } from '@/misc/create-temp.js';
 import { downloadUrl } from '@/misc/download-url.js';
-import config from '@/config/index.js';
-import { IsNull } from 'typeorm';
+import { Users, Emojis } from '@/models/index.js';
+import { } from '@/queue/types.js';
+import { addFile } from '@/services/drive/add-file.js';
+import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('export-custom-emojis');
 
diff --git a/packages/backend/src/queue/processors/db/export-following.ts b/packages/backend/src/queue/processors/db/export-following.ts
index 4ac165567..9f7647876 100644
--- a/packages/backend/src/queue/processors/db/export-following.ts
+++ b/packages/backend/src/queue/processors/db/export-following.ts
@@ -1,15 +1,15 @@
-import Bull from 'bull';
 import * as fs from 'node:fs';
-
-import { queueLogger } from '../../logger.js';
-import { addFile } from '@/services/drive/add-file.js';
+import Bull from 'bull';
 import { format as dateFormat } from 'date-fns';
+import { In, MoreThan, Not } from 'typeorm';
+
 import { getFullApAccount } from '@/misc/convert-host.js';
 import { createTemp } from '@/misc/create-temp.js';
-import { Users, Followings, Mutings } from '@/models/index.js';
-import { In, MoreThan, Not } from 'typeorm';
-import { DbUserJobData } from '@/queue/types.js';
 import { Following } from '@/models/entities/following.js';
+import { Users, Followings, Mutings } from '@/models/index.js';
+import { DbUserJobData } from '@/queue/types.js';
+import { addFile } from '@/services/drive/add-file.js';
+import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('export-following');
 
diff --git a/packages/backend/src/queue/processors/db/export-mute.ts b/packages/backend/src/queue/processors/db/export-mute.ts
index 6a36cfa07..14103ba78 100644
--- a/packages/backend/src/queue/processors/db/export-mute.ts
+++ b/packages/backend/src/queue/processors/db/export-mute.ts
@@ -1,14 +1,14 @@
-import Bull from 'bull';
 import * as fs from 'node:fs';
-
-import { queueLogger } from '../../logger.js';
-import { addFile } from '@/services/drive/add-file.js';
+import Bull from 'bull';
 import { format as dateFormat } from 'date-fns';
+import { IsNull, MoreThan } from 'typeorm';
+
 import { getFullApAccount } from '@/misc/convert-host.js';
 import { createTemp } from '@/misc/create-temp.js';
 import { Users, Mutings } from '@/models/index.js';
-import { IsNull, MoreThan } from 'typeorm';
 import { DbUserJobData } from '@/queue/types.js';
+import { addFile } from '@/services/drive/add-file.js';
+import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('export-mute');
 
diff --git a/packages/backend/src/queue/processors/db/export-notes.ts b/packages/backend/src/queue/processors/db/export-notes.ts
index 051fcdf38..707845d41 100644
--- a/packages/backend/src/queue/processors/db/export-notes.ts
+++ b/packages/backend/src/queue/processors/db/export-notes.ts
@@ -1,15 +1,15 @@
-import Bull from 'bull';
 import * as fs from 'node:fs';
-
-import { queueLogger } from '../../logger.js';
-import { addFile } from '@/services/drive/add-file.js';
+import Bull from 'bull';
 import { format as dateFormat } from 'date-fns';
-import { Users, Notes, Polls } from '@/models/index.js';
 import { MoreThan } from 'typeorm';
+
+import { createTemp } from '@/misc/create-temp.js';
 import { Note } from '@/models/entities/note.js';
 import { Poll } from '@/models/entities/poll.js';
+import { Users, Notes, Polls } from '@/models/index.js';
 import { DbUserJobData } from '@/queue/types.js';
-import { createTemp } from '@/misc/create-temp.js';
+import { addFile } from '@/services/drive/add-file.js';
+import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('export-notes');
 
diff --git a/packages/backend/src/queue/processors/db/export-user-lists.ts b/packages/backend/src/queue/processors/db/export-user-lists.ts
index 71dd72df2..41849227a 100644
--- a/packages/backend/src/queue/processors/db/export-user-lists.ts
+++ b/packages/backend/src/queue/processors/db/export-user-lists.ts
@@ -1,14 +1,14 @@
-import Bull from 'bull';
 import * as fs from 'node:fs';
-
-import { queueLogger } from '../../logger.js';
-import { addFile } from '@/services/drive/add-file.js';
+import Bull from 'bull';
 import { format as dateFormat } from 'date-fns';
+import { In } from 'typeorm';
+
 import { getFullApAccount } from '@/misc/convert-host.js';
 import { createTemp } from '@/misc/create-temp.js';
 import { Users, UserLists, UserListJoinings } from '@/models/index.js';
-import { In } from 'typeorm';
 import { DbUserJobData } from '@/queue/types.js';
+import { addFile } from '@/services/drive/add-file.js';
+import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('export-user-lists');
 
diff --git a/packages/backend/src/queue/processors/db/import-blocking.ts b/packages/backend/src/queue/processors/db/import-blocking.ts
index fd9cb9f1b..ec6061aba 100644
--- a/packages/backend/src/queue/processors/db/import-blocking.ts
+++ b/packages/backend/src/queue/processors/db/import-blocking.ts
@@ -1,14 +1,14 @@
 import Bull from 'bull';
+import { IsNull } from 'typeorm';
 
-import { queueLogger } from '../../logger.js';
 import * as Acct from '@/misc/acct.js';
-import { resolveUser } from '@/remote/resolve-user.js';
-import { downloadTextFile } from '@/misc/download-text-file.js';
 import { isSelfHost, toPuny } from '@/misc/convert-host.js';
+import { downloadTextFile } from '@/misc/download-text-file.js';
 import { Users, DriveFiles } from '@/models/index.js';
 import { DbUserImportJobData } from '@/queue/types.js';
+import { resolveUser } from '@/remote/resolve-user.js';
 import block from '@/services/blocking/create.js';
-import { IsNull } from 'typeorm';
+import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('import-blocking');
 
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 8b1190818..2ad208b0d 100644
--- a/packages/backend/src/queue/processors/db/import-custom-emojis.ts
+++ b/packages/backend/src/queue/processors/db/import-custom-emojis.ts
@@ -1,15 +1,15 @@
-import Bull from 'bull';
 import * as fs from 'node:fs';
+import Bull from 'bull';
 import unzipper from 'unzipper';
 
-import { queueLogger } from '../../logger.js';
+import { db } from '@/db/postgre.js';
 import { createTempDir } from '@/misc/create-temp.js';
 import { downloadUrl } from '@/misc/download-url.js';
+import { genId } from '@/misc/gen-id.js';
 import { DriveFiles, Emojis } from '@/models/index.js';
 import { DbUserImportJobData } from '@/queue/types.js';
 import { addFile } from '@/services/drive/add-file.js';
-import { genId } from '@/misc/gen-id.js';
-import { db } from '@/db/postgre.js';
+import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('import-custom-emojis');
 
diff --git a/packages/backend/src/queue/processors/db/import-following.ts b/packages/backend/src/queue/processors/db/import-following.ts
index 8ce2c367d..a19612389 100644
--- a/packages/backend/src/queue/processors/db/import-following.ts
+++ b/packages/backend/src/queue/processors/db/import-following.ts
@@ -1,14 +1,14 @@
 import Bull from 'bull';
+import { IsNull } from 'typeorm';
 
-import { queueLogger } from '../../logger.js';
-import follow from '@/services/following/create.js';
 import * as Acct from '@/misc/acct.js';
-import { resolveUser } from '@/remote/resolve-user.js';
-import { downloadTextFile } from '@/misc/download-text-file.js';
 import { isSelfHost, toPuny } from '@/misc/convert-host.js';
+import { downloadTextFile } from '@/misc/download-text-file.js';
 import { Users, DriveFiles } from '@/models/index.js';
 import { DbUserImportJobData } from '@/queue/types.js';
-import { IsNull } from 'typeorm';
+import { resolveUser } from '@/remote/resolve-user.js';
+import follow from '@/services/following/create.js';
+import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('import-following');
 
diff --git a/packages/backend/src/queue/processors/db/import-muting.ts b/packages/backend/src/queue/processors/db/import-muting.ts
index 8552b797b..b0c69829b 100644
--- a/packages/backend/src/queue/processors/db/import-muting.ts
+++ b/packages/backend/src/queue/processors/db/import-muting.ts
@@ -1,16 +1,16 @@
 import Bull from 'bull';
-
-import { queueLogger } from '../../logger.js';
-import * as Acct from '@/misc/acct.js';
-import { resolveUser } from '@/remote/resolve-user.js';
-import { downloadTextFile } from '@/misc/download-text-file.js';
-import { isSelfHost, toPuny } from '@/misc/convert-host.js';
-import { Users, DriveFiles, Mutings } from '@/models/index.js';
-import { DbUserImportJobData } from '@/queue/types.js';
-import { User } from '@/models/entities/user.js';
-import { genId } from '@/misc/gen-id.js';
 import { IsNull } from 'typeorm';
 
+import * as Acct from '@/misc/acct.js';
+import { isSelfHost, toPuny } from '@/misc/convert-host.js';
+import { downloadTextFile } from '@/misc/download-text-file.js';
+import { genId } from '@/misc/gen-id.js';
+import { Users, DriveFiles, Mutings } from '@/models/index.js';
+import { User } from '@/models/entities/user.js';
+import { DbUserImportJobData } from '@/queue/types.js';
+import { resolveUser } from '@/remote/resolve-user.js';
+import { queueLogger } from '../../logger.js';
+
 const logger = queueLogger.createSubLogger('import-muting');
 
 export async function importMuting(job: Bull.Job<DbUserImportJobData>, done: any): Promise<void> {
diff --git a/packages/backend/src/queue/processors/db/import-user-lists.ts b/packages/backend/src/queue/processors/db/import-user-lists.ts
index 9919b7c53..f291ab6d7 100644
--- a/packages/backend/src/queue/processors/db/import-user-lists.ts
+++ b/packages/backend/src/queue/processors/db/import-user-lists.ts
@@ -1,15 +1,15 @@
 import Bull from 'bull';
+import { IsNull } from 'typeorm';
 
-import { queueLogger } from '../../logger.js';
 import * as Acct from '@/misc/acct.js';
+import { isSelfHost, toPuny } from '@/misc/convert-host.js';
+import { downloadTextFile } from '@/misc/download-text-file.js';
+import { genId } from '@/misc/gen-id.js';
+import { DriveFiles, Users, UserLists, UserListJoinings } from '@/models/index.js';
+import { DbUserImportJobData } from '@/queue/types.js';
 import { resolveUser } from '@/remote/resolve-user.js';
 import { pushUserToUserList } from '@/services/user-list/push.js';
-import { downloadTextFile } from '@/misc/download-text-file.js';
-import { isSelfHost, toPuny } from '@/misc/convert-host.js';
-import { DriveFiles, Users, UserLists, UserListJoinings } from '@/models/index.js';
-import { genId } from '@/misc/gen-id.js';
-import { DbUserImportJobData } from '@/queue/types.js';
-import { IsNull } from 'typeorm';
+import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('import-user-lists');
 
diff --git a/packages/backend/src/queue/processors/deliver.ts b/packages/backend/src/queue/processors/deliver.ts
index 291c05766..a9229a4bc 100644
--- a/packages/backend/src/queue/processors/deliver.ts
+++ b/packages/backend/src/queue/processors/deliver.ts
@@ -10,8 +10,8 @@ import { fetchMeta } from '@/misc/fetch-meta.js';
 import { toPuny } from '@/misc/convert-host.js';
 import { Cache } from '@/misc/cache.js';
 import { Instance } from '@/models/entities/instance.js';
-import { DeliverJobData } from '../types.js';
 import { StatusError } from '@/misc/fetch.js';
+import { DeliverJobData } from '../types.js';
 
 const logger = new Logger('deliver');
 
diff --git a/packages/backend/src/queue/processors/inbox.ts b/packages/backend/src/queue/processors/inbox.ts
index 636f2138c..f48c5e266 100644
--- a/packages/backend/src/queue/processors/inbox.ts
+++ b/packages/backend/src/queue/processors/inbox.ts
@@ -10,13 +10,13 @@ import { fetchMeta } from '@/misc/fetch-meta.js';
 import { toPuny, extractDbHost } from '@/misc/convert-host.js';
 import { getApId } from '@/remote/activitypub/type.js';
 import { fetchInstanceMetadata } from '@/services/fetch-instance-metadata.js';
-import { InboxJobData } from '../types.js';
 import DbResolver from '@/remote/activitypub/db-resolver.js';
 import { resolvePerson } from '@/remote/activitypub/models/person.js';
 import { LdSignature } from '@/remote/activitypub/misc/ld-signature.js';
 import { StatusError } from '@/misc/fetch.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { UserPublickey } from '@/models/entities/user-publickey.js';
+import { InboxJobData } from '../types.js';
 
 const logger = new Logger('inbox');
 
diff --git a/packages/backend/src/queue/processors/object-storage/clean-remote-files.ts b/packages/backend/src/queue/processors/object-storage/clean-remote-files.ts
index e6638edb1..918337d09 100644
--- a/packages/backend/src/queue/processors/object-storage/clean-remote-files.ts
+++ b/packages/backend/src/queue/processors/object-storage/clean-remote-files.ts
@@ -1,10 +1,10 @@
 import Bull from 'bull';
-
-import { queueLogger } from '../../logger.js';
-import { deleteFileSync } from '@/services/drive/delete-file.js';
-import { DriveFiles } from '@/models/index.js';
 import { MoreThan, Not, IsNull } from 'typeorm';
 
+import { DriveFiles } from '@/models/index.js';
+import { deleteFileSync } from '@/services/drive/delete-file.js';
+import { queueLogger } from '../../logger.js';
+
 const logger = queueLogger.createSubLogger('clean-remote-files');
 
 export default async function cleanRemoteFiles(job: Bull.Job<Record<string, unknown>>, done: any): Promise<void> {
diff --git a/packages/backend/src/queue/processors/object-storage/delete-file.ts b/packages/backend/src/queue/processors/object-storage/delete-file.ts
index c271e3ddd..399a9d150 100644
--- a/packages/backend/src/queue/processors/object-storage/delete-file.ts
+++ b/packages/backend/src/queue/processors/object-storage/delete-file.ts
@@ -1,5 +1,5 @@
-import { ObjectStorageFileJobData } from '@/queue/types.js';
 import Bull from 'bull';
+import { ObjectStorageFileJobData } from '@/queue/types.js';
 import { deleteObjectStorageFile } from '@/services/drive/delete-file.js';
 
 export default async (job: Bull.Job<ObjectStorageFileJobData>) => {
diff --git a/packages/backend/src/queue/processors/system/check-expired-mutings.ts b/packages/backend/src/queue/processors/system/check-expired-mutings.ts
index f8f78f317..60dd83a48 100644
--- a/packages/backend/src/queue/processors/system/check-expired-mutings.ts
+++ b/packages/backend/src/queue/processors/system/check-expired-mutings.ts
@@ -1,8 +1,8 @@
 import Bull from 'bull';
 import { In } from 'typeorm';
 import { Mutings } from '@/models/index.js';
-import { queueLogger } from '../../logger.js';
 import { publishUserEvent } from '@/services/stream.js';
+import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('check-expired-mutings');
 
diff --git a/packages/backend/src/queue/processors/system/clean-charts.ts b/packages/backend/src/queue/processors/system/clean-charts.ts
index 340072931..0b4c7f0ea 100644
--- a/packages/backend/src/queue/processors/system/clean-charts.ts
+++ b/packages/backend/src/queue/processors/system/clean-charts.ts
@@ -1,7 +1,7 @@
 import Bull from 'bull';
 
-import { queueLogger } from '../../logger.js';
 import { activeUsersChart, driveChart, federationChart, hashtagChart, instanceChart, notesChart, perUserDriveChart, perUserFollowingChart, perUserNotesChart, perUserReactionsChart, usersChart, apRequestChart } from '@/services/chart/index.js';
+import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('clean-charts');
 
diff --git a/packages/backend/src/queue/processors/system/resync-charts.ts b/packages/backend/src/queue/processors/system/resync-charts.ts
index 61115d4b7..292ba9f81 100644
--- a/packages/backend/src/queue/processors/system/resync-charts.ts
+++ b/packages/backend/src/queue/processors/system/resync-charts.ts
@@ -1,7 +1,7 @@
 import Bull from 'bull';
 
-import { queueLogger } from '../../logger.js';
 import { driveChart, notesChart, usersChart } from '@/services/chart/index.js';
+import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('resync-charts');
 
diff --git a/packages/backend/src/queue/processors/system/tick-charts.ts b/packages/backend/src/queue/processors/system/tick-charts.ts
index ab198c764..27b048a61 100644
--- a/packages/backend/src/queue/processors/system/tick-charts.ts
+++ b/packages/backend/src/queue/processors/system/tick-charts.ts
@@ -1,7 +1,7 @@
 import Bull from 'bull';
 
-import { queueLogger } from '../../logger.js';
 import { activeUsersChart, driveChart, federationChart, hashtagChart, instanceChart, notesChart, perUserDriveChart, perUserFollowingChart, perUserNotesChart, perUserReactionsChart, usersChart, apRequestChart } from '@/services/chart/index.js';
+import { queueLogger } from '../../logger.js';
 
 const logger = queueLogger.createSubLogger('tick-charts');
 
diff --git a/packages/backend/src/queue/processors/webhook-deliver.ts b/packages/backend/src/queue/processors/webhook-deliver.ts
index 8d751a649..64396b458 100644
--- a/packages/backend/src/queue/processors/webhook-deliver.ts
+++ b/packages/backend/src/queue/processors/webhook-deliver.ts
@@ -1,9 +1,9 @@
 import Bull from 'bull';
-import Logger from '@/services/logger.js';
-import { WebhookDeliverJobData } from '../types.js';
+import config from '@/config/index.js';
 import { getResponse, StatusError } from '@/misc/fetch.js';
 import { Webhooks } from '@/models/index.js';
-import config from '@/config/index.js';
+import Logger from '@/services/logger.js';
+import { WebhookDeliverJobData } from '../types.js';
 
 const logger = new Logger('webhook');
 
diff --git a/packages/backend/src/queue/types.ts b/packages/backend/src/queue/types.ts
index 5ea472556..e37b731c9 100644
--- a/packages/backend/src/queue/types.ts
+++ b/packages/backend/src/queue/types.ts
@@ -1,9 +1,9 @@
+import httpSignature from '@peertube/http-signature';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { Note } from '@/models/entities/note';
 import { User } from '@/models/entities/user.js';
 import { Webhook } from '@/models/entities/webhook';
 import { IActivity } from '@/remote/activitypub/type.js';
-import httpSignature from '@peertube/http-signature';
 
 export type DeliverJobData = {
 	/** Actor */
diff --git a/packages/backend/src/remote/activitypub/audience.ts b/packages/backend/src/remote/activitypub/audience.ts
index dda730091..92a028824 100644
--- a/packages/backend/src/remote/activitypub/audience.ts
+++ b/packages/backend/src/remote/activitypub/audience.ts
@@ -1,9 +1,9 @@
-import { ApObject, getApIds } from './type.js';
-import Resolver from './resolver.js';
-import { resolvePerson } from './models/person.js';
-import { unique, concat } from '@/prelude/array.js';
 import promiseLimit from 'promise-limit';
 import { CacheableRemoteUser, CacheableUser } from '@/models/entities/user.js';
+import { unique, concat } from '@/prelude/array.js';
+import { resolvePerson } from './models/person.js';
+import Resolver from './resolver.js';
+import { ApObject, getApIds } from './type.js';
 
 type Visibility = 'public' | 'home' | 'followers' | 'specified';
 
diff --git a/packages/backend/src/remote/activitypub/deliver-manager.ts b/packages/backend/src/remote/activitypub/deliver-manager.ts
index 4c1999e4c..e0af5b8f9 100644
--- a/packages/backend/src/remote/activitypub/deliver-manager.ts
+++ b/packages/backend/src/remote/activitypub/deliver-manager.ts
@@ -1,7 +1,7 @@
-import { Users, Followings } from '@/models/index.js';
-import { ILocalUser, IRemoteUser, User } from '@/models/entities/user.js';
-import { deliver } from '@/queue/index.js';
 import { IsNull, Not } from 'typeorm';
+import { ILocalUser, IRemoteUser, User } from '@/models/entities/user.js';
+import { Users, Followings } from '@/models/index.js';
+import { deliver } from '@/queue/index.js';
 
 //#region types
 interface IRecipe {
diff --git a/packages/backend/src/remote/activitypub/kernel/accept/follow.ts b/packages/backend/src/remote/activitypub/kernel/accept/follow.ts
index 2d9f689be..d2d4bc964 100644
--- a/packages/backend/src/remote/activitypub/kernel/accept/follow.ts
+++ b/packages/backend/src/remote/activitypub/kernel/accept/follow.ts
@@ -1,8 +1,8 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import accept from '@/services/following/requests/accept.js';
+import { relayAccepted } from '@/services/relay.js';
 import { IFollow } from '../../type.js';
 import DbResolver from '../../db-resolver.js';
-import { relayAccepted } from '@/services/relay.js';
 
 export default async (actor: CacheableRemoteUser, activity: IFollow): Promise<string> => {
 	// ※ activityはこっちから投げたフォローリクエストなので、activity.actorは存在するローカルユーザーである必要がある
diff --git a/packages/backend/src/remote/activitypub/kernel/accept/index.ts b/packages/backend/src/remote/activitypub/kernel/accept/index.ts
index 78ef75ade..0965e76df 100644
--- a/packages/backend/src/remote/activitypub/kernel/accept/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/accept/index.ts
@@ -1,8 +1,8 @@
-import Resolver from '../../resolver.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import acceptFollow from './follow.js';
-import { IAccept, isFollow, getApType } from '../../type.js';
 import { apLogger } from '../../logger.js';
+import Resolver from '../../resolver.js';
+import { IAccept, isFollow, getApType } from '../../type.js';
+import acceptFollow from './follow.js';
 
 const logger = apLogger;
 
diff --git a/packages/backend/src/remote/activitypub/kernel/add/index.ts b/packages/backend/src/remote/activitypub/kernel/add/index.ts
index c813414f9..a705cfede 100644
--- a/packages/backend/src/remote/activitypub/kernel/add/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/add/index.ts
@@ -1,7 +1,7 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import { IAdd } from '../../type.js';
-import { resolveNote } from '../../models/note.js';
 import { addPinned } from '@/services/i/pin.js';
+import { resolveNote } from '../../models/note.js';
+import { IAdd } from '../../type.js';
 
 export default async (actor: CacheableRemoteUser, activity: IAdd): Promise<void> => {
 	if ('actor' in activity && actor.uri !== activity.actor) {
diff --git a/packages/backend/src/remote/activitypub/kernel/announce/index.ts b/packages/backend/src/remote/activitypub/kernel/announce/index.ts
index ae7e507c9..d26d7b02b 100644
--- a/packages/backend/src/remote/activitypub/kernel/announce/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/announce/index.ts
@@ -1,8 +1,8 @@
-import Resolver from '../../resolver.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import announceNote from './note.js';
-import { IAnnounce, getApId } from '../../type.js';
 import { apLogger } from '../../logger.js';
+import Resolver from '../../resolver.js';
+import { IAnnounce, getApId } from '../../type.js';
+import announceNote from './note.js';
 
 const logger = apLogger;
 
diff --git a/packages/backend/src/remote/activitypub/kernel/announce/note.ts b/packages/backend/src/remote/activitypub/kernel/announce/note.ts
index 759cb4ae8..8a6e50a91 100644
--- a/packages/backend/src/remote/activitypub/kernel/announce/note.ts
+++ b/packages/backend/src/remote/activitypub/kernel/announce/note.ts
@@ -1,15 +1,15 @@
-import Resolver from '../../resolver.js';
 import post from '@/services/note/create.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import { IAnnounce, getApId } from '../../type.js';
-import { fetchNote, resolveNote } from '../../models/note.js';
-import { apLogger } from '../../logger.js';
 import { extractDbHost } from '@/misc/convert-host.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { getApLock } from '@/misc/app-lock.js';
-import { parseAudience } from '../../audience.js';
 import { StatusError } from '@/misc/fetch.js';
 import { Notes } from '@/models/index.js';
+import { parseAudience } from '../../audience.js';
+import { apLogger } from '../../logger.js';
+import { fetchNote, resolveNote } from '../../models/note.js';
+import Resolver from '../../resolver.js';
+import { IAnnounce, getApId } from '../../type.js';
 
 const logger = apLogger;
 
diff --git a/packages/backend/src/remote/activitypub/kernel/block/index.ts b/packages/backend/src/remote/activitypub/kernel/block/index.ts
index f693b7116..dc7e648cf 100644
--- a/packages/backend/src/remote/activitypub/kernel/block/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/block/index.ts
@@ -1,8 +1,8 @@
-import { IBlock } from '../../type.js';
 import block from '@/services/blocking/create.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import DbResolver from '../../db-resolver.js';
 import { Users } from '@/models/index.js';
+import DbResolver from '../../db-resolver.js';
+import { IBlock } from '../../type.js';
 
 export default async (actor: CacheableRemoteUser, activity: IBlock): Promise<string> => {
 	// ※ activity.objectにブロック対象があり、それは存在するローカルユーザーのはず
diff --git a/packages/backend/src/remote/activitypub/kernel/create/index.ts b/packages/backend/src/remote/activitypub/kernel/create/index.ts
index c253f9f66..beaefb3f1 100644
--- a/packages/backend/src/remote/activitypub/kernel/create/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/create/index.ts
@@ -1,9 +1,9 @@
-import Resolver from '../../resolver.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import createNote from './note.js';
+import { toArray, concat, unique } from '@/prelude/array.js';
+import Resolver from '../../resolver.js';
 import { ICreate, getApId, isPost, getApType } from '../../type.js';
 import { apLogger } from '../../logger.js';
-import { toArray, concat, unique } from '@/prelude/array.js';
+import createNote from './note.js';
 
 const logger = apLogger;
 
diff --git a/packages/backend/src/remote/activitypub/kernel/create/note.ts b/packages/backend/src/remote/activitypub/kernel/create/note.ts
index b9fcda87c..52ece6b96 100644
--- a/packages/backend/src/remote/activitypub/kernel/create/note.ts
+++ b/packages/backend/src/remote/activitypub/kernel/create/note.ts
@@ -1,10 +1,10 @@
-import Resolver from '../../resolver.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import { createNote, fetchNote } from '../../models/note.js';
-import { getApId, IObject, ICreate } from '../../type.js';
 import { getApLock } from '@/misc/app-lock.js';
 import { extractDbHost } from '@/misc/convert-host.js';
 import { StatusError } from '@/misc/fetch.js';
+import Resolver from '../../resolver.js';
+import { createNote, fetchNote } from '../../models/note.js';
+import { getApId, IObject, ICreate } from '../../type.js';
 
 /**
  * 投稿作成アクティビティを捌きます
diff --git a/packages/backend/src/remote/activitypub/kernel/delete/actor.ts b/packages/backend/src/remote/activitypub/kernel/delete/actor.ts
index 9bc73e118..ebc4a2eab 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 { apLogger } from '../../logger.js';
 import { createDeleteAccountJob } from '@/queue/index.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { Users } from '@/models/index.js';
+import { apLogger } from '../../logger.js';
 
 const logger = apLogger;
 
diff --git a/packages/backend/src/remote/activitypub/kernel/delete/index.ts b/packages/backend/src/remote/activitypub/kernel/delete/index.ts
index c7064f553..3d51e0545 100644
--- a/packages/backend/src/remote/activitypub/kernel/delete/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/delete/index.ts
@@ -1,8 +1,8 @@
-import deleteNote from './note.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import { IDelete, getApId, isTombstone, IObject, validPost, validActor } from '../../type.js';
 import { toSingle } from '@/prelude/array.js';
+import { IDelete, getApId, isTombstone, IObject, validPost, validActor } from '../../type.js';
 import { deleteActor } from './actor.js';
+import deleteNote from './note.js';
 
 /**
  * 削除アクティビティを捌きます
diff --git a/packages/backend/src/remote/activitypub/kernel/delete/note.ts b/packages/backend/src/remote/activitypub/kernel/delete/note.ts
index 1f44c3556..1867cc535 100644
--- a/packages/backend/src/remote/activitypub/kernel/delete/note.ts
+++ b/packages/backend/src/remote/activitypub/kernel/delete/note.ts
@@ -1,9 +1,9 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import deleteNode from '@/services/note/delete.js';
-import { apLogger } from '../../logger.js';
-import DbResolver from '../../db-resolver.js';
 import { getApLock } from '@/misc/app-lock.js';
 import { deleteMessage } from '@/services/messages/delete.js';
+import DbResolver from '../../db-resolver.js';
+import { apLogger } from '../../logger.js';
 
 const logger = apLogger;
 
diff --git a/packages/backend/src/remote/activitypub/kernel/flag/index.ts b/packages/backend/src/remote/activitypub/kernel/flag/index.ts
index b142545ad..4ec8e36f6 100644
--- a/packages/backend/src/remote/activitypub/kernel/flag/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/flag/index.ts
@@ -1,9 +1,9 @@
-import { CacheableRemoteUser } from '@/models/entities/user.js';
-import config from '@/config/index.js';
-import { IFlag, getApIds } from '../../type.js';
-import { AbuseUserReports, Users } from '@/models/index.js';
 import { In } from 'typeorm';
+import config from '@/config/index.js';
 import { genId } from '@/misc/gen-id.js';
+import { CacheableRemoteUser } from '@/models/entities/user.js';
+import { AbuseUserReports, Users } from '@/models/index.js';
+import { IFlag, getApIds } from '../../type.js';
 
 export default async (actor: CacheableRemoteUser, activity: IFlag): Promise<string> => {
 	// objectは `(User|Note) | (User|Note)[]` だけど、全パターンDBスキーマと対応させられないので
diff --git a/packages/backend/src/remote/activitypub/kernel/index.ts b/packages/backend/src/remote/activitypub/kernel/index.ts
index 65158b4e5..e2da77ef0 100644
--- a/packages/backend/src/remote/activitypub/kernel/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/index.ts
@@ -1,5 +1,8 @@
-import { IObject, isCreate, isDelete, isUpdate, isRead, isFollow, isAccept, isReject, isAdd, isRemove, isAnnounce, isLike, isUndo, isBlock, isCollectionOrOrderedCollection, isCollection, isFlag } from '../type.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
+import { toArray } from '@/prelude/array.js';
+import { apLogger } from '../logger.js';
+import Resolver from '../resolver.js';
+import { IObject, isCreate, isDelete, isUpdate, isRead, isFollow, isAccept, isReject, isAdd, isRemove, isAnnounce, isLike, isUndo, isBlock, isCollectionOrOrderedCollection, isCollection, isFlag } from '../type.js';
 import create from './create/index.js';
 import performDeleteActivity from './delete/index.js';
 import performUpdateActivity from './update/index.js';
@@ -14,9 +17,6 @@ import add from './add/index.js';
 import remove from './remove/index.js';
 import block from './block/index.js';
 import flag from './flag/index.js';
-import { apLogger } from '../logger.js';
-import Resolver from '../resolver.js';
-import { toArray } from '@/prelude/array.js';
 
 export async function performActivity(actor: CacheableRemoteUser, activity: IObject) {
 	if (isCollectionOrOrderedCollection(activity)) {
diff --git a/packages/backend/src/remote/activitypub/kernel/like.ts b/packages/backend/src/remote/activitypub/kernel/like.ts
index 2b65ff738..b9faa38d1 100644
--- a/packages/backend/src/remote/activitypub/kernel/like.ts
+++ b/packages/backend/src/remote/activitypub/kernel/like.ts
@@ -1,6 +1,6 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import { ILike, getApId } from '../type.js';
 import create from '@/services/note/reaction/create.js';
+import { ILike, getApId } from '../type.js';
 import { fetchNote, extractEmojis } from '../models/note.js';
 
 export default async (actor: CacheableRemoteUser, activity: ILike) => {
diff --git a/packages/backend/src/remote/activitypub/kernel/read.ts b/packages/backend/src/remote/activitypub/kernel/read.ts
index 13f64de89..d367fb669 100644
--- a/packages/backend/src/remote/activitypub/kernel/read.ts
+++ b/packages/backend/src/remote/activitypub/kernel/read.ts
@@ -1,8 +1,8 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import { IRead, getApId } from '../type.js';
 import { isSelfHost, extractDbHost } from '@/misc/convert-host.js';
 import { MessagingMessages } from '@/models/index.js';
-import { readUserMessagingMessage } from '../../../server/api/common/read-messaging-message.js';
+import { readUserMessagingMessage } from '@/server/api/common/read-messaging-message.js';
+import { IRead, getApId } from '../type.js';
 
 export const performReadActivity = async (actor: CacheableRemoteUser, activity: IRead): Promise<string> => {
 	const id = await getApId(activity.object);
diff --git a/packages/backend/src/remote/activitypub/kernel/reject/follow.ts b/packages/backend/src/remote/activitypub/kernel/reject/follow.ts
index 5ad32d26a..203e01ea9 100644
--- a/packages/backend/src/remote/activitypub/kernel/reject/follow.ts
+++ b/packages/backend/src/remote/activitypub/kernel/reject/follow.ts
@@ -1,9 +1,9 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { remoteReject } from '@/services/following/reject.js';
-import { IFollow } from '../../type.js';
-import DbResolver from '../../db-resolver.js';
 import { relayRejected } from '@/services/relay.js';
 import { Users } from '@/models/index.js';
+import { IFollow } from '../../type.js';
+import DbResolver from '../../db-resolver.js';
 
 export default async (actor: CacheableRemoteUser, activity: IFollow): Promise<string> => {
 	// ※ activityはこっちから投げたフォローリクエストなので、activity.actorは存在するローカルユーザーである必要がある
diff --git a/packages/backend/src/remote/activitypub/kernel/reject/index.ts b/packages/backend/src/remote/activitypub/kernel/reject/index.ts
index 00f08842f..138b7e35f 100644
--- a/packages/backend/src/remote/activitypub/kernel/reject/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/reject/index.ts
@@ -1,8 +1,8 @@
-import Resolver from '../../resolver.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import rejectFollow from './follow.js';
-import { IReject, isFollow, getApType } from '../../type.js';
 import { apLogger } from '../../logger.js';
+import { IReject, isFollow, getApType } from '../../type.js';
+import Resolver from '../../resolver.js';
+import rejectFollow from './follow.js';
 
 const logger = apLogger;
 
diff --git a/packages/backend/src/remote/activitypub/kernel/remove/index.ts b/packages/backend/src/remote/activitypub/kernel/remove/index.ts
index 11a994a83..5ff71c91f 100644
--- a/packages/backend/src/remote/activitypub/kernel/remove/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/remove/index.ts
@@ -1,7 +1,7 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
+import { removePinned } from '@/services/i/pin.js';
 import { IRemove } from '../../type.js';
 import { resolveNote } from '../../models/note.js';
-import { removePinned } from '@/services/i/pin.js';
 
 export default async (actor: CacheableRemoteUser, activity: IRemove): Promise<void> => {
 	if ('actor' in activity && actor.uri !== activity.actor) {
diff --git a/packages/backend/src/remote/activitypub/kernel/undo/accept.ts b/packages/backend/src/remote/activitypub/kernel/undo/accept.ts
index c9710ab31..ac90a5d17 100644
--- a/packages/backend/src/remote/activitypub/kernel/undo/accept.ts
+++ b/packages/backend/src/remote/activitypub/kernel/undo/accept.ts
@@ -1,8 +1,8 @@
 import unfollow from '@/services/following/delete.js';
-import { IAccept } from '../../type.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { Followings } from '@/models/index.js';
 import DbResolver from '../../db-resolver.js';
+import { IAccept } from '../../type.js';
 
 export default async (actor: CacheableRemoteUser, activity: IAccept): Promise<string> => {
 	const dbResolver = new DbResolver();
diff --git a/packages/backend/src/remote/activitypub/kernel/undo/announce.ts b/packages/backend/src/remote/activitypub/kernel/undo/announce.ts
index 417f39722..3752e178b 100644
--- a/packages/backend/src/remote/activitypub/kernel/undo/announce.ts
+++ b/packages/backend/src/remote/activitypub/kernel/undo/announce.ts
@@ -1,7 +1,7 @@
 import { Notes } from '@/models/index.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import { IAnnounce, getApId } from '../../type.js';
 import deleteNote from '@/services/note/delete.js';
+import { IAnnounce, getApId } from '../../type.js';
 
 export const undoAnnounce = async (actor: CacheableRemoteUser, activity: IAnnounce): Promise<string> => {
 	const uri = getApId(activity);
diff --git a/packages/backend/src/remote/activitypub/kernel/undo/block.ts b/packages/backend/src/remote/activitypub/kernel/undo/block.ts
index 4c5e5d144..6bb426fec 100644
--- a/packages/backend/src/remote/activitypub/kernel/undo/block.ts
+++ b/packages/backend/src/remote/activitypub/kernel/undo/block.ts
@@ -1,8 +1,8 @@
-import { IBlock } from '../../type.js';
 import unblock from '@/services/blocking/delete.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import DbResolver from '../../db-resolver.js';
 import { Users } from '@/models/index.js';
+import { IBlock } from '../../type.js';
+import DbResolver from '../../db-resolver.js';
 
 export default async (actor: CacheableRemoteUser, activity: IBlock): Promise<string> => {
 	const dbResolver = new DbResolver();
diff --git a/packages/backend/src/remote/activitypub/kernel/undo/follow.ts b/packages/backend/src/remote/activitypub/kernel/undo/follow.ts
index d2e9d26cc..3989b5708 100644
--- a/packages/backend/src/remote/activitypub/kernel/undo/follow.ts
+++ b/packages/backend/src/remote/activitypub/kernel/undo/follow.ts
@@ -1,8 +1,8 @@
 import unfollow from '@/services/following/delete.js';
 import cancelRequest from '@/services/following/requests/cancel.js';
-import { IFollow } from '../../type.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
 import { FollowRequests, Followings } from '@/models/index.js';
+import { IFollow } from '../../type.js';
 import DbResolver from '../../db-resolver.js';
 
 export default async (actor: CacheableRemoteUser, activity: IFollow): Promise<string> => {
diff --git a/packages/backend/src/remote/activitypub/kernel/undo/index.ts b/packages/backend/src/remote/activitypub/kernel/undo/index.ts
index 27d433eb3..80f69ec63 100644
--- a/packages/backend/src/remote/activitypub/kernel/undo/index.ts
+++ b/packages/backend/src/remote/activitypub/kernel/undo/index.ts
@@ -1,12 +1,12 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
+import { apLogger } from '../../logger.js';
+import Resolver from '../../resolver.js';
 import { IUndo, isFollow, isBlock, isLike, isAnnounce, getApType, isAccept } from '../../type.js';
 import unfollow from './follow.js';
 import unblock from './block.js';
 import undoLike from './like.js';
 import undoAccept from './accept.js';
 import { undoAnnounce } from './announce.js';
-import Resolver from '../../resolver.js';
-import { apLogger } from '../../logger.js';
 
 const logger = apLogger;
 
diff --git a/packages/backend/src/remote/activitypub/kernel/undo/like.ts b/packages/backend/src/remote/activitypub/kernel/undo/like.ts
index 2797e4501..d00d9c3f3 100644
--- a/packages/backend/src/remote/activitypub/kernel/undo/like.ts
+++ b/packages/backend/src/remote/activitypub/kernel/undo/like.ts
@@ -1,6 +1,6 @@
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import { ILike, getApId } from '../../type.js';
 import deleteReaction from '@/services/note/reaction/delete.js';
+import { ILike, getApId } from '../../type.js';
 import { fetchNote } from '../../models/note.js';
 
 /**
diff --git a/packages/backend/src/remote/activitypub/misc/ld-signature.ts b/packages/backend/src/remote/activitypub/misc/ld-signature.ts
index 362a543ec..c943b35af 100644
--- a/packages/backend/src/remote/activitypub/misc/ld-signature.ts
+++ b/packages/backend/src/remote/activitypub/misc/ld-signature.ts
@@ -1,8 +1,8 @@
 import * as crypto from 'node:crypto';
 import jsonld from 'jsonld';
-import { CONTEXTS } from './contexts.js';
 import fetch from 'node-fetch';
 import { httpAgent, httpsAgent } from '@/misc/fetch.js';
+import { CONTEXTS } from './contexts.js';
 
 // RsaSignature2017 based from https://github.com/transmute-industries/RsaSignature2017
 
diff --git a/packages/backend/src/remote/activitypub/models/image.ts b/packages/backend/src/remote/activitypub/models/image.ts
index 173fb22e9..40da9ac27 100644
--- a/packages/backend/src/remote/activitypub/models/image.ts
+++ b/packages/backend/src/remote/activitypub/models/image.ts
@@ -1,12 +1,12 @@
 import { uploadFromUrl } from '@/services/drive/upload-from-url.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import Resolver from '../resolver.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
-import { apLogger } from '../logger.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { DriveFiles } from '@/models/index.js';
 import { truncate } from '@/misc/truncate.js';
 import { DB_MAX_IMAGE_COMMENT_LENGTH } from '@/misc/hard-limits.js';
+import Resolver from '../resolver.js';
+import { apLogger } from '../logger.js';
 
 const logger = apLogger;
 
diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index f9aad08dc..eed8a6096 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -1,32 +1,32 @@
 import promiseLimit from 'promise-limit';
 
 import config from '@/config/index.js';
-import Resolver from '../resolver.js';
 import post from '@/services/note/create.js';
-import { resolvePerson } from './person.js';
-import { resolveImage } from './image.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
-import { htmlToMfm } from '../misc/html-to-mfm.js';
-import { extractApHashtags } from './tag.js';
 import { unique, toArray, toSingle } from '@/prelude/array.js';
-import { extractPollFromQuestion } from './question.js';
 import vote from '@/services/note/polls/vote.js';
-import { apLogger } from '../logger.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { deliverQuestionUpdate } from '@/services/note/polls/update.js';
 import { extractDbHost, toPuny } from '@/misc/convert-host.js';
 import { Emojis, Polls, MessagingMessages } from '@/models/index.js';
 import { Note } from '@/models/entities/note.js';
-import { IObject, getOneApId, getApId, getOneApHrefNullable, validPost, IPost, isEmoji, getApType } from '../type.js';
 import { Emoji } from '@/models/entities/emoji.js';
 import { genId } from '@/misc/gen-id.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { getApLock } from '@/misc/app-lock.js';
 import { createMessage } from '@/services/messages/create.js';
-import { parseAudience } from '../audience.js';
-import { extractApMentions } from './mention.js';
-import DbResolver from '../db-resolver.js';
 import { StatusError } from '@/misc/fetch.js';
+import { parseAudience } from '../audience.js';
+import { IObject, getOneApId, getApId, getOneApHrefNullable, validPost, IPost, isEmoji, getApType } from '../type.js';
+import DbResolver from '../db-resolver.js';
+import Resolver from '../resolver.js';
+import { htmlToMfm } from '../misc/html-to-mfm.js';
+import { apLogger } from '../logger.js';
+import { resolvePerson } from './person.js';
+import { resolveImage } from './image.js';
+import { extractApHashtags } from './tag.js';
+import { extractPollFromQuestion } from './question.js';
+import { extractApMentions } from './mention.js';
 
 const logger = apLogger;
 
diff --git a/packages/backend/src/remote/activitypub/models/question.ts b/packages/backend/src/remote/activitypub/models/question.ts
index f0321fdf2..43393737c 100644
--- a/packages/backend/src/remote/activitypub/models/question.ts
+++ b/packages/backend/src/remote/activitypub/models/question.ts
@@ -1,9 +1,9 @@
 import config from '@/config/index.js';
+import { Notes, Polls } from '@/models/index.js';
+import { IPoll } from '@/models/entities/poll.js';
 import Resolver from '../resolver.js';
 import { IObject, IQuestion, isQuestion } from '../type.js';
 import { apLogger } from '../logger.js';
-import { Notes, Polls } from '@/models/index.js';
-import { IPoll } from '@/models/entities/poll.js';
 
 export async function extractPollFromQuestion(source: string | IObject, resolver?: Resolver): Promise<IPoll> {
 	if (resolver == null) resolver = new Resolver();
diff --git a/packages/backend/src/remote/activitypub/perform.ts b/packages/backend/src/remote/activitypub/perform.ts
index a3c10ba94..bdcf10e76 100644
--- a/packages/backend/src/remote/activitypub/perform.ts
+++ b/packages/backend/src/remote/activitypub/perform.ts
@@ -1,5 +1,5 @@
-import { IObject } from './type.js';
 import { CacheableRemoteUser } from '@/models/entities/user.js';
+import { IObject } from './type.js';
 import { performActivity } from './kernel/index.js';
 import { updatePerson } from './models/person.js';
 
diff --git a/packages/backend/src/remote/activitypub/renderer/index.ts b/packages/backend/src/remote/activitypub/renderer/index.ts
index f100b77ce..d082d2a97 100644
--- a/packages/backend/src/remote/activitypub/renderer/index.ts
+++ b/packages/backend/src/remote/activitypub/renderer/index.ts
@@ -1,9 +1,9 @@
-import config from '@/config/index.js';
 import { v4 as uuid } from 'uuid';
-import { IActivity } from '../type.js';
-import { LdSignature } from '../misc/ld-signature.js';
+import config from '@/config/index.js';
 import { getUserKeypair } from '@/misc/keypair-store.js';
 import { User } from '@/models/entities/user.js';
+import { IActivity } from '../type.js';
+import { LdSignature } from '../misc/ld-signature.js';
 
 export const renderActivity = (x: any): IActivity | null => {
 	if (x == null) return null;
diff --git a/packages/backend/src/remote/activitypub/renderer/key.ts b/packages/backend/src/remote/activitypub/renderer/key.ts
index c4f3d464f..805d3cc68 100644
--- a/packages/backend/src/remote/activitypub/renderer/key.ts
+++ b/packages/backend/src/remote/activitypub/renderer/key.ts
@@ -1,7 +1,7 @@
+import { createPublicKey } from 'node:crypto';
 import config from '@/config/index.js';
 import { ILocalUser } from '@/models/entities/user.js';
 import { UserKeypair } from '@/models/entities/user-keypair.js';
-import { createPublicKey } from 'node:crypto';
 
 export default (user: ILocalUser, key: UserKeypair, postfix?: string) => ({
 	id: `${config.url}/users/${user.id}${postfix || '/publickey'}`,
diff --git a/packages/backend/src/remote/activitypub/renderer/like.ts b/packages/backend/src/remote/activitypub/renderer/like.ts
index 00fb72e8a..3978bc961 100644
--- a/packages/backend/src/remote/activitypub/renderer/like.ts
+++ b/packages/backend/src/remote/activitypub/renderer/like.ts
@@ -1,8 +1,8 @@
+import { IsNull } from 'typeorm';
 import config from '@/config/index.js';
 import { NoteReaction } from '@/models/entities/note-reaction.js';
 import { Note } from '@/models/entities/note.js';
 import { Emojis } from '@/models/index.js';
-import { IsNull } from 'typeorm';
 import renderEmoji from './emoji.js';
 
 export const renderLike = async (noteReaction: NoteReaction, note: Note) => {
diff --git a/packages/backend/src/remote/activitypub/renderer/person.ts b/packages/backend/src/remote/activitypub/renderer/person.ts
index c3ac1b924..d9c009bcf 100644
--- a/packages/backend/src/remote/activitypub/renderer/person.ts
+++ b/packages/backend/src/remote/activitypub/renderer/person.ts
@@ -1,16 +1,16 @@
 import { URL } from 'node:url';
 import * as mfm from 'mfm-js';
-import renderImage from './image.js';
-import renderKey from './key.js';
 import config from '@/config/index.js';
 import { ILocalUser } from '@/models/entities/user.js';
-import { toHtml } from '../../../mfm/to-html.js';
-import { getEmojis } from './note.js';
-import renderEmoji from './emoji.js';
-import { IIdentifier } from '../models/identifier.js';
-import renderHashtag from './hashtag.js';
+import { toHtml } from '@/mfm/to-html.js';
 import { DriveFiles, UserProfiles } from '@/models/index.js';
 import { getUserKeypair } from '@/misc/keypair-store.js';
+import { IIdentifier } from '../models/identifier.js';
+import renderImage from './image.js';
+import renderKey from './key.js';
+import { getEmojis } from './note.js';
+import renderEmoji from './emoji.js';
+import renderHashtag from './hashtag.js';
 
 export async function renderPerson(user: ILocalUser) {
 	const id = `${config.url}/users/${user.id}`;
diff --git a/packages/backend/src/remote/activitypub/resolver.ts b/packages/backend/src/remote/activitypub/resolver.ts
index 962408177..0fdc19547 100644
--- a/packages/backend/src/remote/activitypub/resolver.ts
+++ b/packages/backend/src/remote/activitypub/resolver.ts
@@ -4,10 +4,7 @@ import { ILocalUser } from '@/models/entities/user.js';
 import { getInstanceActor } from '@/services/instance-actor.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { extractDbHost, isSelfHost } from '@/misc/convert-host.js';
-import { signedGet } from './request.js';
-import { IObject, isCollectionOrOrderedCollection, ICollection, IOrderedCollection } from './type.js';
 import { Notes, NoteReactions, Polls, Users } from '@/models/index.js';
-import { parseUri } from './db-resolver.js';
 import renderNote from '@/remote/activitypub/renderer/note.js';
 import { renderLike } from '@/remote/activitypub/renderer/like.js';
 import { renderPerson } from '@/remote/activitypub/renderer/person.js';
@@ -15,6 +12,9 @@ import renderQuestion from '@/remote/activitypub/renderer/question.js';
 import renderCreate from '@/remote/activitypub/renderer/create.js';
 import { renderActivity } from '@/remote/activitypub/renderer/index.js';
 import renderFollow from '@/remote/activitypub/renderer/follow.js';
+import { signedGet } from './request.js';
+import { IObject, isCollectionOrOrderedCollection, ICollection, IOrderedCollection } from './type.js';
+import { parseUri } from './db-resolver.js';
 
 export default class Resolver {
 	private history: Set<string>;
diff --git a/packages/backend/src/remote/resolve-user.ts b/packages/backend/src/remote/resolve-user.ts
index 37fbdd8cc..62032cf58 100644
--- a/packages/backend/src/remote/resolve-user.ts
+++ b/packages/backend/src/remote/resolve-user.ts
@@ -1,13 +1,13 @@
 import { URL } from 'node:url';
-import webFinger from './webfinger.js';
-import config from '@/config/index.js';
-import { createPerson, updatePerson } from './activitypub/models/person.js';
-import { remoteLogger } from './logger.js';
 import chalk from 'chalk';
+import { IsNull } from 'typeorm';
+import config from '@/config/index.js';
+import { toPuny } from '@/misc/convert-host.js';
 import { User, IRemoteUser } from '@/models/entities/user.js';
 import { Users } from '@/models/index.js';
-import { toPuny } from '@/misc/convert-host.js';
-import { IsNull } from 'typeorm';
+import webFinger from './webfinger.js';
+import { createPerson, updatePerson } from './activitypub/models/person.js';
+import { remoteLogger } from './logger.js';
 
 const logger = remoteLogger.createSubLogger('resolve-user');
 
diff --git a/packages/backend/src/server/activitypub.ts b/packages/backend/src/server/activitypub.ts
index cd5f917c4..36bc4caf2 100644
--- a/packages/backend/src/server/activitypub.ts
+++ b/packages/backend/src/server/activitypub.ts
@@ -1,5 +1,6 @@
-import Router from '@koa/router';
 import json from 'koa-json-body';
+import Router from '@koa/router';
+import { In, IsNull, Not } from 'typeorm';
 import httpSignature from '@peertube/http-signature';
 
 import { renderActivity } from '@/remote/activitypub/renderer/index.js';
@@ -7,18 +8,17 @@ import renderNote from '@/remote/activitypub/renderer/note.js';
 import renderKey from '@/remote/activitypub/renderer/key.js';
 import { renderPerson } from '@/remote/activitypub/renderer/person.js';
 import renderEmoji from '@/remote/activitypub/renderer/emoji.js';
-import Outbox, { packActivity } from './activitypub/outbox.js';
-import Followers from './activitypub/followers.js';
-import Following from './activitypub/following.js';
-import Featured from './activitypub/featured.js';
 import { inbox as processInbox } from '@/queue/index.js';
 import { isSelfHost } from '@/misc/convert-host.js';
 import { Notes, Users, Emojis, NoteReactions } from '@/models/index.js';
 import { ILocalUser, User } from '@/models/entities/user.js';
-import { In, IsNull, Not } from 'typeorm';
 import { renderLike } from '@/remote/activitypub/renderer/like.js';
 import { getUserKeypair } from '@/misc/keypair-store.js';
 import renderFollow from '@/remote/activitypub/renderer/follow.js';
+import Outbox, { packActivity } from './activitypub/outbox.js';
+import Followers from './activitypub/followers.js';
+import Following from './activitypub/following.js';
+import Featured from './activitypub/featured.js';
 
 // Init router
 const router = new Router();
diff --git a/packages/backend/src/server/activitypub/featured.ts b/packages/backend/src/server/activitypub/featured.ts
index c03fd1049..09906250f 100644
--- a/packages/backend/src/server/activitypub/featured.ts
+++ b/packages/backend/src/server/activitypub/featured.ts
@@ -1,11 +1,11 @@
 import Router from '@koa/router';
+import { IsNull } from 'typeorm';
 import config from '@/config/index.js';
 import { renderActivity } from '@/remote/activitypub/renderer/index.js';
 import renderOrderedCollection from '@/remote/activitypub/renderer/ordered-collection.js';
-import { setResponseType } from '../activitypub.js';
 import renderNote from '@/remote/activitypub/renderer/note.js';
 import { Users, Notes, UserNotePinings } from '@/models/index.js';
-import { IsNull } from 'typeorm';
+import { setResponseType } from '../activitypub.js';
 
 export default async (ctx: Router.RouterContext) => {
 	const userId = ctx.params.user;
diff --git a/packages/backend/src/server/activitypub/outbox.ts b/packages/backend/src/server/activitypub/outbox.ts
index feefff227..d88b6c899 100644
--- a/packages/backend/src/server/activitypub/outbox.ts
+++ b/packages/backend/src/server/activitypub/outbox.ts
@@ -11,9 +11,9 @@ import { countIf } from '@/prelude/array.js';
 import * as url from '@/prelude/url.js';
 import { Users, Notes } from '@/models/index.js';
 import { Note } from '@/models/entities/note.js';
+import { isPureRenote } from '@/misc/renote.js';
 import { makePaginationQuery } from '../api/common/make-pagination-query.js';
 import { setResponseType } from '../activitypub.js';
-import { isPureRenote } from '@/misc/renote.js';
 
 export default async (ctx: Router.RouterContext) => {
 	const userId = ctx.params.user;
diff --git a/packages/backend/src/server/api/authenticate.ts b/packages/backend/src/server/api/authenticate.ts
index 39be06c29..253d8f58a 100644
--- a/packages/backend/src/server/api/authenticate.ts
+++ b/packages/backend/src/server/api/authenticate.ts
@@ -1,10 +1,10 @@
-import isNativeToken from './common/is-native-token.js';
 import { CacheableLocalUser, ILocalUser } from '@/models/entities/user.js';
 import { Users, AccessTokens, Apps } from '@/models/index.js';
 import { AccessToken } from '@/models/entities/access-token.js';
 import { Cache } from '@/misc/cache.js';
 import { App } from '@/models/entities/app.js';
 import { localUserByIdCache, localUserByNativeTokenCache } from '@/services/user-cache.js';
+import isNativeToken from './common/is-native-token.js';
 
 const appCache = new Cache<App>(Infinity);
 
diff --git a/packages/backend/src/server/api/common/generate-block-query.ts b/packages/backend/src/server/api/common/generate-block-query.ts
index 380693725..42db0c241 100644
--- a/packages/backend/src/server/api/common/generate-block-query.ts
+++ b/packages/backend/src/server/api/common/generate-block-query.ts
@@ -1,6 +1,6 @@
+import { Brackets, SelectQueryBuilder } from 'typeorm';
 import { User } from '@/models/entities/user.js';
 import { Blockings } from '@/models/index.js';
-import { Brackets, SelectQueryBuilder } from 'typeorm';
 
 // ここでいうBlockedは被Blockedの意
 export function generateBlockedUserQuery(q: SelectQueryBuilder<any>, me: { id: User['id'] }) {
diff --git a/packages/backend/src/server/api/common/generate-channel-query.ts b/packages/backend/src/server/api/common/generate-channel-query.ts
index 333bb73b8..93003bfa0 100644
--- a/packages/backend/src/server/api/common/generate-channel-query.ts
+++ b/packages/backend/src/server/api/common/generate-channel-query.ts
@@ -1,6 +1,6 @@
+import { Brackets, SelectQueryBuilder } from 'typeorm';
 import { User } from '@/models/entities/user.js';
 import { ChannelFollowings } from '@/models/index.js';
-import { Brackets, SelectQueryBuilder } from 'typeorm';
 
 export function generateChannelQuery(q: SelectQueryBuilder<any>, me?: { id: User['id'] } | null) {
 	if (me == null) {
diff --git a/packages/backend/src/server/api/common/generate-muted-note-query.ts b/packages/backend/src/server/api/common/generate-muted-note-query.ts
index f544e334d..562dc4e3d 100644
--- a/packages/backend/src/server/api/common/generate-muted-note-query.ts
+++ b/packages/backend/src/server/api/common/generate-muted-note-query.ts
@@ -1,6 +1,6 @@
+import { SelectQueryBuilder } from 'typeorm';
 import { User } from '@/models/entities/user.js';
 import { MutedNotes } from '@/models/index.js';
-import { SelectQueryBuilder } from 'typeorm';
 
 export function generateMutedNoteQuery(q: SelectQueryBuilder<any>, me: { id: User['id'] }) {
 	const mutedQuery = MutedNotes.createQueryBuilder('muted')
diff --git a/packages/backend/src/server/api/common/generate-muted-note-thread-query.ts b/packages/backend/src/server/api/common/generate-muted-note-thread-query.ts
index 117aac815..681ec4eb2 100644
--- a/packages/backend/src/server/api/common/generate-muted-note-thread-query.ts
+++ b/packages/backend/src/server/api/common/generate-muted-note-thread-query.ts
@@ -1,6 +1,6 @@
+import { Brackets, SelectQueryBuilder } from 'typeorm';
 import { User } from '@/models/entities/user.js';
 import { NoteThreadMutings } from '@/models/index.js';
-import { Brackets, SelectQueryBuilder } from 'typeorm';
 
 export function generateMutedNoteThreadQuery(q: SelectQueryBuilder<any>, me: { id: User['id'] }) {
 	const mutedQuery = NoteThreadMutings.createQueryBuilder('threadMuted')
diff --git a/packages/backend/src/server/api/common/generate-replies-query.ts b/packages/backend/src/server/api/common/generate-replies-query.ts
index 751dcaf4e..31880382e 100644
--- a/packages/backend/src/server/api/common/generate-replies-query.ts
+++ b/packages/backend/src/server/api/common/generate-replies-query.ts
@@ -1,5 +1,5 @@
-import { User } from '@/models/entities/user.js';
 import { Brackets, SelectQueryBuilder } from 'typeorm';
+import { User } from '@/models/entities/user.js';
 
 export function generateRepliesQuery(q: SelectQueryBuilder<any>, me?: Pick<User, 'id' | 'showTimelineReplies'> | null) {
 	if (me == null) {
diff --git a/packages/backend/src/server/api/common/generate-visibility-query.ts b/packages/backend/src/server/api/common/generate-visibility-query.ts
index 2c94e7b3a..12b610cde 100644
--- a/packages/backend/src/server/api/common/generate-visibility-query.ts
+++ b/packages/backend/src/server/api/common/generate-visibility-query.ts
@@ -1,6 +1,6 @@
+import { Brackets, SelectQueryBuilder } from 'typeorm';
 import { User } from '@/models/entities/user.js';
 import { Followings } from '@/models/index.js';
-import { Brackets, SelectQueryBuilder } from 'typeorm';
 
 export function generateVisibilityQuery(q: SelectQueryBuilder<any>, me?: { id: User['id'] } | null) {
 	// This code must always be synchronized with the checks in Notes.isVisibleForMe.
diff --git a/packages/backend/src/server/api/common/read-messaging-message.ts b/packages/backend/src/server/api/common/read-messaging-message.ts
index c5d8ff089..e1080020f 100644
--- a/packages/backend/src/server/api/common/read-messaging-message.ts
+++ b/packages/backend/src/server/api/common/read-messaging-message.ts
@@ -1,11 +1,9 @@
-import { publishMainStream, publishGroupMessagingStream } from '@/services/stream.js';
-import { publishMessagingStream } from '@/services/stream.js';
-import { publishMessagingIndexStream } from '@/services/stream.js';
+import { In } from 'typeorm';
+import { publishMainStream, publishMessagingStream, publishMessagingIndexStream, publishGroupMessagingStream } from '@/services/stream.js';
 import { pushNotification } from '@/services/push-notification.js';
 import { User, IRemoteUser } from '@/models/entities/user.js';
 import { MessagingMessage } from '@/models/entities/messaging-message.js';
 import { MessagingMessages, UserGroupJoinings, Users } from '@/models/index.js';
-import { In } from 'typeorm';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { UserGroup } from '@/models/entities/user-group.js';
 import { toArray } from '@/prelude/array.js';
diff --git a/packages/backend/src/server/api/common/read-notification.ts b/packages/backend/src/server/api/common/read-notification.ts
index cf993ade3..041610d62 100644
--- a/packages/backend/src/server/api/common/read-notification.ts
+++ b/packages/backend/src/server/api/common/read-notification.ts
@@ -1,9 +1,9 @@
+import { In } from 'typeorm';
 import { publishMainStream } from '@/services/stream.js';
 import { pushNotification } from '@/services/push-notification.js';
 import { User } from '@/models/entities/user.js';
 import { Notification } from '@/models/entities/notification.js';
 import { Notifications, Users } from '@/models/index.js';
-import { In } from 'typeorm';
 
 export async function readNotification(
 	userId: User['id'],
diff --git a/packages/backend/src/server/api/common/signup.ts b/packages/backend/src/server/api/common/signup.ts
index abc142472..ca9b5248d 100644
--- a/packages/backend/src/server/api/common/signup.ts
+++ b/packages/backend/src/server/api/common/signup.ts
@@ -1,16 +1,16 @@
-import bcrypt from 'bcryptjs';
 import { generateKeyPair } from 'node:crypto';
-import generateUserToken from './generate-native-user-token.js';
+import bcrypt from 'bcryptjs';
+import { IsNull } from 'typeorm';
 import { User } from '@/models/entities/user.js';
 import { Users, UsedUsernames } from '@/models/index.js';
 import { UserProfile } from '@/models/entities/user-profile.js';
-import { IsNull } from 'typeorm';
 import { genId } from '@/misc/gen-id.js';
 import { toPunyNullable } from '@/misc/convert-host.js';
 import { UserKeypair } from '@/models/entities/user-keypair.js';
 import { usersChart } from '@/services/chart/index.js';
 import { UsedUsername } from '@/models/entities/used-username.js';
 import { db } from '@/db/postgre.js';
+import generateUserToken from './generate-native-user-token.js';
 
 export async function signup(opts: {
 	username: User['username'];
diff --git a/packages/backend/src/server/api/define.ts b/packages/backend/src/server/api/define.ts
index 47dcb44ea..6000357bd 100644
--- a/packages/backend/src/server/api/define.ts
+++ b/packages/backend/src/server/api/define.ts
@@ -1,10 +1,10 @@
 import * as fs from 'node:fs';
 import Ajv from 'ajv';
 import { CacheableLocalUser, ILocalUser } from '@/models/entities/user.js';
-import { IEndpointMeta } from './endpoints.js';
-import { ApiError } from './error.js';
 import { Schema, SchemaType } from '@/misc/schema.js';
 import { AccessToken } from '@/models/entities/access-token.js';
+import { IEndpointMeta } from './endpoints.js';
+import { ApiError } from './error.js';
 
 export type Response = Record<string, any> | void;
 
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 6db368ccb..1e12acac4 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
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import { AbuseUserReports } from '@/models/index.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
index 5f8921999..8da4c3d68 100644
--- a/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/accounts/create.ts
@@ -1,7 +1,7 @@
-import define from '../../../define.js';
-import { Users } from '@/models/index.js';
-import { signup } from '../../../common/signup.js';
 import { IsNull } from 'typeorm';
+import { Users } from '@/models/index.js';
+import define from '../../../define.js';
+import { signup } from '../../../common/signup.js';
 
 export const meta = {
 	tags: ['admin'],
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 629d70058..623b909f4 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,8 @@
-import define from '../../../define.js';
 import { Users } from '@/models/index.js';
 import { doPostSuspend } from '@/services/suspend-user.js';
 import { publishUserEvent } from '@/services/stream.js';
 import { createDeleteAccountJob } from '@/queue/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/create.ts b/packages/backend/src/server/api/endpoints/admin/announcements/create.ts
index 33076b6d3..e1ea545ba 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/create.ts
@@ -1,6 +1,6 @@
-import define from '../../../define.js';
 import { Announcements } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
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 c17765f4f..0debf2579 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/delete.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { Announcements } from '@/models/index.js';
+import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 
 export const meta = {
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 61ce106d8..af1fa4568 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { Announcements } from '@/models/index.js';
+import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 
 export const meta = {
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 dc1976624..21870a29b 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
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import { deleteFile } from '@/services/drive/delete-file.js';
 import { DriveFiles } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['admin'],
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 bab149532..4ee5c113b 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
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { createCleanRemoteFilesJob } from '@/queue/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
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 039df74f1..ebe378c4f 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
@@ -1,6 +1,6 @@
+import { DriveFiles } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { DriveFiles } from '@/models/index.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts
index 9329ca5ad..3d3ce1fe2 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts
@@ -1,7 +1,7 @@
-import define from '../../../define.js';
-import { Emojis } from '@/models/index.js';
 import { In } from 'typeorm';
+import { Emojis } from '@/models/index.js';
 import { db } from '@/db/postgre.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
index 67349c24e..8b5cf0ab3 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
@@ -1,11 +1,11 @@
-import define from '../../../define.js';
-import { Emojis, DriveFiles } from '@/models/index.js';
-import { genId } from '@/misc/gen-id.js';
-import { insertModerationLog } from '@/services/insert-moderation-log.js';
-import { ApiError } from '../../../error.js';
 import rndstr from 'rndstr';
 import { publishBroadcastStream } from '@/services/stream.js';
 import { db } from '@/db/postgre.js';
+import { Emojis, DriveFiles } from '@/models/index.js';
+import { genId } from '@/misc/gen-id.js';
+import { insertModerationLog } from '@/services/insert-moderation-log.js';
+import define from '../../../define.js';
+import { ApiError } from '../../../error.js';
 
 export const meta = {
 	tags: ['admin'],
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 7010ade0d..e5bbaefe9 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts
@@ -1,11 +1,11 @@
-import define from '../../../define.js';
 import { Emojis } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
-import { ApiError } from '../../../error.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { uploadFromUrl } from '@/services/drive/upload-from-url.js';
 import { publishBroadcastStream } from '@/services/stream.js';
 import { db } from '@/db/postgre.js';
+import define from '../../../define.js';
+import { ApiError } from '../../../error.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts
index ae253bf62..3149e6f6f 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts
@@ -1,8 +1,8 @@
-import define from '../../../define.js';
-import { Emojis } from '@/models/index.js';
 import { In } from 'typeorm';
+import { Emojis } from '@/models/index.js';
 import { insertModerationLog } from '@/services/insert-moderation-log.js';
 import { db } from '@/db/postgre.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
index 67dbf28d8..b4aae07e8 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
@@ -1,8 +1,8 @@
-import define from '../../../define.js';
 import { Emojis } from '@/models/index.js';
 import { insertModerationLog } from '@/services/insert-moderation-log.js';
-import { ApiError } from '../../../error.js';
 import { db } from '@/db/postgre.js';
+import define from '../../../define.js';
+import { ApiError } from '../../../error.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts b/packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts
index 7eac9d479..48adef12b 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/import-zip.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { createImportCustomEmojisJob } from '@/queue/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	secure: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
index 7ca43c428..b3134210d 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/list-remote.ts
@@ -1,6 +1,6 @@
-import define from '../../../define.js';
 import { Emojis } from '@/models/index.js';
 import { toPuny } from '@/misc/convert-host.js';
+import define from '../../../define.js';
 import { makePaginationQuery } from '../../../common/make-pagination-query.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
index 0e7bc004a..51e987682 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
@@ -1,7 +1,7 @@
-import define from '../../../define.js';
-import { Emojis } from '@/models/index.js';
-import { makePaginationQuery } from '../../../common/make-pagination-query.js';
 import { Emoji } from '@/models/entities/emoji.js';
+import { Emojis } from '@/models/index.js';
+import define from '../../../define.js';
+import { makePaginationQuery } from '../../../common/make-pagination-query.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts
index 15cbf60dc..cd948386e 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts
@@ -1,7 +1,7 @@
-import define from '../../../define.js';
-import { Emojis } from '@/models/index.js';
 import { In } from 'typeorm';
 import { db } from '@/db/postgre.js';
+import { Emojis } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts
index 6c7266b16..bc0cf3f04 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts
@@ -1,7 +1,7 @@
-import define from '../../../define.js';
-import { Emojis } from '@/models/index.js';
 import { In } from 'typeorm';
+import { Emojis } from '@/models/index.js';
 import { db } from '@/db/postgre.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts
index cd805dd56..07e9cc7c8 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts
@@ -1,7 +1,7 @@
-import define from '../../../define.js';
-import { Emojis } from '@/models/index.js';
 import { In } from 'typeorm';
 import { db } from '@/db/postgre.js';
+import { Emojis } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
index 5b547b3b7..70820e8df 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
@@ -1,7 +1,7 @@
-import define from '../../../define.js';
-import { Emojis } from '@/models/index.js';
-import { ApiError } from '../../../error.js';
 import { db } from '@/db/postgre.js';
+import { Emojis } from '@/models/index.js';
+import define from '../../../define.js';
+import { ApiError } from '../../../error.js';
 
 export const meta = {
 	tags: ['admin'],
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 da5420147..b5d7ec673 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
@@ -1,6 +1,6 @@
-import define from '../../../define.js';
 import { deleteFile } from '@/services/drive/delete-file.js';
 import { DriveFiles } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
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 cb2be5ab3..5c691a1bc 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
@@ -1,7 +1,7 @@
-import define from '../../../define.js';
 import { Instances } from '@/models/index.js';
 import { toPuny } from '@/misc/convert-host.js';
 import { fetchInstanceMetadata } from '@/services/fetch-instance-metadata.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
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 b7ee27db6..5e60e37a1 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
@@ -1,6 +1,6 @@
-import define from '../../../define.js';
 import deleteFollowing from '@/services/following/delete.js';
 import { Followings, Users } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
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 278131fb3..bcfe9077e 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
@@ -1,6 +1,6 @@
-import define from '../../../define.js';
 import { Instances } from '@/models/index.js';
 import { toPuny } from '@/misc/convert-host.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts b/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts
index 3a4b2647d..fb9b4e44f 100644
--- a/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts
+++ b/packages/backend/src/server/api/endpoints/admin/get-index-stats.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { db } from '@/db/postgre.js';
+import define from '../../define.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/invite.ts b/packages/backend/src/server/api/endpoints/admin/invite.ts
index 7e950cf87..a7b2dac4d 100644
--- a/packages/backend/src/server/api/endpoints/admin/invite.ts
+++ b/packages/backend/src/server/api/endpoints/admin/invite.ts
@@ -1,7 +1,7 @@
 import rndstr from 'rndstr';
-import define from '../../define.js';
 import { RegistrationTickets } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index 5d7973669..4e3f33cfc 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -1,7 +1,7 @@
 import config from '@/config/index.js';
-import define from '../../define.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { MAX_NOTE_TEXT_LENGTH } from '@/const.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['meta'],
diff --git a/packages/backend/src/server/api/endpoints/admin/moderators/add.ts b/packages/backend/src/server/api/endpoints/admin/moderators/add.ts
index 7b209c2d9..2c46e1fc5 100644
--- a/packages/backend/src/server/api/endpoints/admin/moderators/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/moderators/add.ts
@@ -1,6 +1,6 @@
-import define from '../../../define.js';
 import { Users } from '@/models/index.js';
 import { publishInternalEvent } from '@/services/stream.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/moderators/remove.ts b/packages/backend/src/server/api/endpoints/admin/moderators/remove.ts
index a01e9f3c6..19e507fe4 100644
--- a/packages/backend/src/server/api/endpoints/admin/moderators/remove.ts
+++ b/packages/backend/src/server/api/endpoints/admin/moderators/remove.ts
@@ -1,6 +1,6 @@
-import define from '../../../define.js';
 import { Users } from '@/models/index.js';
 import { publishInternalEvent } from '@/services/stream.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/promo/create.ts b/packages/backend/src/server/api/endpoints/admin/promo/create.ts
index b5142fcf0..006c85fa9 100644
--- a/packages/backend/src/server/api/endpoints/admin/promo/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/promo/create.ts
@@ -1,7 +1,7 @@
+import { PromoNotes } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 import { getNote } from '../../../common/getters.js';
-import { PromoNotes } from '@/models/index.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/clear.ts b/packages/backend/src/server/api/endpoints/admin/queue/clear.ts
index 8f015c280..cf38ed22d 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/clear.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/clear.ts
@@ -1,6 +1,6 @@
-import define from '../../../define.js';
 import { destroy } from '@/queue/index.js';
 import { insertModerationLog } from '@/services/insert-moderation-log.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
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 70f7d77de..646e2e7cc 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
@@ -1,5 +1,5 @@
-import { deliverQueue } from '@/queue/queues.js';
 import { URL } from 'node:url';
+import { deliverQueue } from '@/queue/queues.js';
 import define from '../../../define.js';
 
 export const meta = {
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 2235ce8f9..a8a2d3d42 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
@@ -1,6 +1,6 @@
 import { URL } from 'node:url';
-import define from '../../../define.js';
 import { inboxQueue } from '@/queue/queues.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
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 348e9baca..caee34787 100644
--- a/packages/backend/src/server/api/endpoints/admin/relays/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/relays/add.ts
@@ -1,6 +1,6 @@
 import { URL } from 'node:url';
-import define from '../../../define.js';
 import { addRelay } from '@/services/relay.js';
+import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 
 export const meta = {
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 89ec651e6..c90e9875f 100644
--- a/packages/backend/src/server/api/endpoints/admin/relays/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/relays/list.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { listRelay } from '@/services/relay.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
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 b59cf72c5..efd7b9a82 100644
--- a/packages/backend/src/server/api/endpoints/admin/relays/remove.ts
+++ b/packages/backend/src/server/api/endpoints/admin/relays/remove.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { removeRelay } from '@/services/relay.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/reset-password.ts b/packages/backend/src/server/api/endpoints/admin/reset-password.ts
index be4c2dcee..d0a98ff5b 100644
--- a/packages/backend/src/server/api/endpoints/admin/reset-password.ts
+++ b/packages/backend/src/server/api/endpoints/admin/reset-password.ts
@@ -1,7 +1,7 @@
-import define from '../../define.js';
 import bcrypt from 'bcryptjs';
 import rndstr from 'rndstr';
 import { Users, UserProfiles } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts b/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts
index 27b2f547d..fa674280c 100644
--- a/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts
+++ b/packages/backend/src/server/api/endpoints/admin/resolve-abuse-user-report.ts
@@ -1,9 +1,9 @@
-import define from '../../define.js';
 import { AbuseUserReports, Users } from '@/models/index.js';
 import { getInstanceActor } from '@/services/instance-actor.js';
 import { deliver } from '@/queue/index.js';
 import { renderActivity } from '@/remote/activitypub/renderer/index.js';
 import { renderFlag } from '@/remote/activitypub/renderer/flag.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/send-email.ts b/packages/backend/src/server/api/endpoints/admin/send-email.ts
index bbdd66e4c..bd0c740cd 100644
--- a/packages/backend/src/server/api/endpoints/admin/send-email.ts
+++ b/packages/backend/src/server/api/endpoints/admin/send-email.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { sendEmail } from '@/services/send-email.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/server-info.ts b/packages/backend/src/server/api/endpoints/admin/server-info.ts
index 85c6fb82e..61d80f5f2 100644
--- a/packages/backend/src/server/api/endpoints/admin/server-info.ts
+++ b/packages/backend/src/server/api/endpoints/admin/server-info.ts
@@ -1,8 +1,8 @@
 import * as os from 'node:os';
 import si from 'systeminformation';
-import define from '../../define.js';
-import { redisClient } from '../../../../db/redis.js';
 import { db } from '@/db/postgre.js';
+import { redisClient } from '@/db/redis.js';
+import define from '../../define.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts b/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts
index 3545536aa..0dd0cbe1b 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-moderation-logs.ts
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import { ModerationLogs } from '@/models/index.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/silence-user.ts b/packages/backend/src/server/api/endpoints/admin/silence-user.ts
index 17b9f3b5a..24bd2dd3f 100644
--- a/packages/backend/src/server/api/endpoints/admin/silence-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/silence-user.ts
@@ -1,7 +1,7 @@
-import define from '../../define.js';
 import { Users } from '@/models/index.js';
 import { insertModerationLog } from '@/services/insert-moderation-log.js';
 import { publishInternalEvent } from '@/services/stream.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['admin'],
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 ed513eda0..8b62daf7a 100644
--- a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
@@ -1,10 +1,10 @@
-import define from '../../define.js';
 import deleteFollowing from '@/services/following/delete.js';
 import { Users, Followings, Notifications } from '@/models/index.js';
 import { User } from '@/models/entities/user.js';
 import { insertModerationLog } from '@/services/insert-moderation-log.js';
 import { doPostSuspend } from '@/services/suspend-user.js';
 import { publishUserEvent } from '@/services/stream.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts b/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts
index a4b373f5c..6d20233c5 100644
--- a/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/unsilence-user.ts
@@ -1,7 +1,7 @@
-import define from '../../define.js';
 import { Users } from '@/models/index.js';
 import { insertModerationLog } from '@/services/insert-moderation-log.js';
 import { publishInternalEvent } from '@/services/stream.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
index 5cf26251b..4f4fe4a0e 100644
--- a/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/unsuspend-user.ts
@@ -1,7 +1,7 @@
-import define from '../../define.js';
 import { Users } from '@/models/index.js';
 import { insertModerationLog } from '@/services/insert-moderation-log.js';
 import { doPostUnsuspend } from '@/services/unsuspend-user.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
index bd75e0f93..93b261c18 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -1,7 +1,7 @@
-import define from '../../define.js';
 import { Meta } from '@/models/entities/meta.js';
 import { insertModerationLog } from '@/services/insert-moderation-log.js';
 import { db } from '@/db/postgre.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/admin/vacuum.ts b/packages/backend/src/server/api/endpoints/admin/vacuum.ts
index 0546acfac..0250dc29e 100644
--- a/packages/backend/src/server/api/endpoints/admin/vacuum.ts
+++ b/packages/backend/src/server/api/endpoints/admin/vacuum.ts
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import { insertModerationLog } from '@/services/insert-moderation-log.js';
 import { db } from '@/db/postgre.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['admin'],
diff --git a/packages/backend/src/server/api/endpoints/antennas/create.ts b/packages/backend/src/server/api/endpoints/antennas/create.ts
index 7a4923b94..dca31edb1 100644
--- a/packages/backend/src/server/api/endpoints/antennas/create.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/create.ts
@@ -1,8 +1,8 @@
-import define from '../../define.js';
 import { genId } from '@/misc/gen-id.js';
 import { Antennas, UserLists, UserGroupJoinings } from '@/models/index.js';
-import { ApiError } from '../../error.js';
 import { publishInternalEvent } from '@/services/stream.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['antennas'],
diff --git a/packages/backend/src/server/api/endpoints/antennas/delete.ts b/packages/backend/src/server/api/endpoints/antennas/delete.ts
index ced34ba31..d87f9ba00 100644
--- a/packages/backend/src/server/api/endpoints/antennas/delete.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/delete.ts
@@ -1,7 +1,7 @@
-import define from '../../define.js';
-import { ApiError } from '../../error.js';
 import { Antennas } from '@/models/index.js';
 import { publishInternalEvent } from '@/services/stream.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['antennas'],
diff --git a/packages/backend/src/server/api/endpoints/antennas/list.ts b/packages/backend/src/server/api/endpoints/antennas/list.ts
index c519b452e..f4804c79d 100644
--- a/packages/backend/src/server/api/endpoints/antennas/list.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/list.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { Antennas } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['antennas', 'account'],
diff --git a/packages/backend/src/server/api/endpoints/antennas/notes.ts b/packages/backend/src/server/api/endpoints/antennas/notes.ts
index 8aac55b4a..a46d6759a 100644
--- a/packages/backend/src/server/api/endpoints/antennas/notes.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/notes.ts
@@ -1,11 +1,11 @@
-import define from '../../define.js';
 import readNote from '@/services/note/read.js';
 import { Antennas, Notes, AntennaNotes } from '@/models/index.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
-import { ApiError } from '../../error.js';
 import { generateBlockedUserQuery } from '../../common/generate-block-query.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['antennas', 'account', 'notes'],
diff --git a/packages/backend/src/server/api/endpoints/antennas/show.ts b/packages/backend/src/server/api/endpoints/antennas/show.ts
index dd693789c..11e6e95c9 100644
--- a/packages/backend/src/server/api/endpoints/antennas/show.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/show.ts
@@ -1,6 +1,6 @@
+import { Antennas } from '@/models/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { Antennas } from '@/models/index.js';
 
 export const meta = {
 	tags: ['antennas', 'account'],
diff --git a/packages/backend/src/server/api/endpoints/antennas/update.ts b/packages/backend/src/server/api/endpoints/antennas/update.ts
index edfedc175..e36696486 100644
--- a/packages/backend/src/server/api/endpoints/antennas/update.ts
+++ b/packages/backend/src/server/api/endpoints/antennas/update.ts
@@ -1,7 +1,7 @@
-import define from '../../define.js';
-import { ApiError } from '../../error.js';
 import { Antennas, UserLists, UserGroupJoinings } from '@/models/index.js';
 import { publishInternalEvent } from '@/services/stream.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['antennas'],
diff --git a/packages/backend/src/server/api/endpoints/ap/get.ts b/packages/backend/src/server/api/endpoints/ap/get.ts
index 559bc277f..6e7804953 100644
--- a/packages/backend/src/server/api/endpoints/ap/get.ts
+++ b/packages/backend/src/server/api/endpoints/ap/get.ts
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import Resolver from '@/remote/activitypub/resolver.js';
 import { HOUR } from '@/const.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['federation'],
diff --git a/packages/backend/src/server/api/endpoints/ap/show.ts b/packages/backend/src/server/api/endpoints/ap/show.ts
index 7426daeec..7c585c530 100644
--- a/packages/backend/src/server/api/endpoints/ap/show.ts
+++ b/packages/backend/src/server/api/endpoints/ap/show.ts
@@ -1,10 +1,8 @@
-import define from '../../define.js';
 import config from '@/config/index.js';
 import { createPerson } from '@/remote/activitypub/models/person.js';
 import { createNote } from '@/remote/activitypub/models/note.js';
 import DbResolver from '@/remote/activitypub/db-resolver.js';
 import Resolver from '@/remote/activitypub/resolver.js';
-import { ApiError } from '../../error.js';
 import { extractDbHost } from '@/misc/convert-host.js';
 import { Users, Notes } from '@/models/index.js';
 import { Note } from '@/models/entities/note.js';
@@ -13,6 +11,8 @@ import { fetchMeta } from '@/misc/fetch-meta.js';
 import { isActor, isPost, getApId } from '@/remote/activitypub/type.js';
 import { SchemaType } from '@/misc/schema.js';
 import { HOUR } from '@/const.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['federation'],
diff --git a/packages/backend/src/server/api/endpoints/app/create.ts b/packages/backend/src/server/api/endpoints/app/create.ts
index 3c72699ca..327711823 100644
--- a/packages/backend/src/server/api/endpoints/app/create.ts
+++ b/packages/backend/src/server/api/endpoints/app/create.ts
@@ -1,8 +1,8 @@
-import define from '../../define.js';
 import { Apps } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
 import { unique } from '@/prelude/array.js';
 import { secureRndstr } from '@/misc/secure-rndstr.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['app'],
diff --git a/packages/backend/src/server/api/endpoints/app/show.ts b/packages/backend/src/server/api/endpoints/app/show.ts
index 451969d97..3b84fa07b 100644
--- a/packages/backend/src/server/api/endpoints/app/show.ts
+++ b/packages/backend/src/server/api/endpoints/app/show.ts
@@ -1,6 +1,6 @@
+import { Apps } from '@/models/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { Apps } from '@/models/index.js';
 
 export const meta = {
 	tags: ['app'],
diff --git a/packages/backend/src/server/api/endpoints/auth/accept.ts b/packages/backend/src/server/api/endpoints/auth/accept.ts
index b5c06792b..f87d460b9 100644
--- a/packages/backend/src/server/api/endpoints/auth/accept.ts
+++ b/packages/backend/src/server/api/endpoints/auth/accept.ts
@@ -1,9 +1,9 @@
 import * as crypto from 'node:crypto';
-import define from '../../define.js';
-import { ApiError } from '../../error.js';
 import { AuthSessions, AccessTokens, Apps } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
 import { secureRndstr } from '@/misc/secure-rndstr.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['auth'],
diff --git a/packages/backend/src/server/api/endpoints/auth/session/generate.ts b/packages/backend/src/server/api/endpoints/auth/session/generate.ts
index 717c3e508..a7a44756b 100644
--- a/packages/backend/src/server/api/endpoints/auth/session/generate.ts
+++ b/packages/backend/src/server/api/endpoints/auth/session/generate.ts
@@ -1,9 +1,9 @@
 import { v4 as uuid } from 'uuid';
 import config from '@/config/index.js';
-import define from '../../../define.js';
-import { ApiError } from '../../../error.js';
 import { Apps, AuthSessions } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
+import define from '../../../define.js';
+import { ApiError } from '../../../error.js';
 
 export const meta = {
 	tags: ['auth'],
diff --git a/packages/backend/src/server/api/endpoints/auth/session/show.ts b/packages/backend/src/server/api/endpoints/auth/session/show.ts
index 3f3a4d142..91ff9c12e 100644
--- a/packages/backend/src/server/api/endpoints/auth/session/show.ts
+++ b/packages/backend/src/server/api/endpoints/auth/session/show.ts
@@ -1,6 +1,6 @@
+import { AuthSessions } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { AuthSessions } from '@/models/index.js';
 
 export const meta = {
 	tags: ['auth'],
diff --git a/packages/backend/src/server/api/endpoints/auth/session/userkey.ts b/packages/backend/src/server/api/endpoints/auth/session/userkey.ts
index 89884ed38..36c915ea4 100644
--- a/packages/backend/src/server/api/endpoints/auth/session/userkey.ts
+++ b/packages/backend/src/server/api/endpoints/auth/session/userkey.ts
@@ -1,6 +1,6 @@
+import { Apps, AuthSessions, AccessTokens, Users } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { Apps, AuthSessions, AccessTokens, Users } from '@/models/index.js';
 
 export const meta = {
 	tags: ['auth'],
diff --git a/packages/backend/src/server/api/endpoints/blocking/create.ts b/packages/backend/src/server/api/endpoints/blocking/create.ts
index 4e88f32fb..95e3fca23 100644
--- a/packages/backend/src/server/api/endpoints/blocking/create.ts
+++ b/packages/backend/src/server/api/endpoints/blocking/create.ts
@@ -1,9 +1,9 @@
 import create from '@/services/blocking/create.js';
+import { Blockings, NoteWatchings, Users } from '@/models/index.js';
+import { HOUR } from '@/const.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
 import { getUser } from '../../common/getters.js';
-import { Blockings, NoteWatchings, Users } from '@/models/index.js';
-import { HOUR } from '@/const.js';
 
 export const meta = {
 	tags: ['account'],
diff --git a/packages/backend/src/server/api/endpoints/blocking/delete.ts b/packages/backend/src/server/api/endpoints/blocking/delete.ts
index 37215bbd6..4c3234f97 100644
--- a/packages/backend/src/server/api/endpoints/blocking/delete.ts
+++ b/packages/backend/src/server/api/endpoints/blocking/delete.ts
@@ -1,9 +1,9 @@
 import deleteBlocking from '@/services/blocking/delete.js';
+import { Blockings, Users } from '@/models/index.js';
+import { HOUR } from '@/const.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
 import { getUser } from '../../common/getters.js';
-import { Blockings, Users } from '@/models/index.js';
-import { HOUR } from '@/const.js';
 
 export const meta = {
 	tags: ['account'],
diff --git a/packages/backend/src/server/api/endpoints/blocking/list.ts b/packages/backend/src/server/api/endpoints/blocking/list.ts
index 58ff7bd86..6c064d7ec 100644
--- a/packages/backend/src/server/api/endpoints/blocking/list.ts
+++ b/packages/backend/src/server/api/endpoints/blocking/list.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { Blockings } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/channels/create.ts b/packages/backend/src/server/api/endpoints/channels/create.ts
index 94dcfe502..ac8d63dd8 100644
--- a/packages/backend/src/server/api/endpoints/channels/create.ts
+++ b/packages/backend/src/server/api/endpoints/channels/create.ts
@@ -1,8 +1,8 @@
-import define from '../../define.js';
-import { ApiError } from '../../error.js';
 import { Channels, DriveFiles } from '@/models/index.js';
 import { Channel } from '@/models/entities/channel.js';
 import { genId } from '@/misc/gen-id.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['channels'],
diff --git a/packages/backend/src/server/api/endpoints/channels/featured.ts b/packages/backend/src/server/api/endpoints/channels/featured.ts
index 73980c0fa..9c8f63e6c 100644
--- a/packages/backend/src/server/api/endpoints/channels/featured.ts
+++ b/packages/backend/src/server/api/endpoints/channels/featured.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { Channels } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['channels'],
diff --git a/packages/backend/src/server/api/endpoints/channels/follow.ts b/packages/backend/src/server/api/endpoints/channels/follow.ts
index 895ffed0b..9107ec4e8 100644
--- a/packages/backend/src/server/api/endpoints/channels/follow.ts
+++ b/packages/backend/src/server/api/endpoints/channels/follow.ts
@@ -1,8 +1,8 @@
-import define from '../../define.js';
-import { ApiError } from '../../error.js';
 import { Channels, ChannelFollowings } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
 import { publishUserEvent } from '@/services/stream.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['channels'],
diff --git a/packages/backend/src/server/api/endpoints/channels/followed.ts b/packages/backend/src/server/api/endpoints/channels/followed.ts
index e4aa4d161..865f45850 100644
--- a/packages/backend/src/server/api/endpoints/channels/followed.ts
+++ b/packages/backend/src/server/api/endpoints/channels/followed.ts
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import { Channels, ChannelFollowings } from '@/models/index.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['channels', 'account'],
diff --git a/packages/backend/src/server/api/endpoints/channels/owned.ts b/packages/backend/src/server/api/endpoints/channels/owned.ts
index ed7e41cac..40c0928bb 100644
--- a/packages/backend/src/server/api/endpoints/channels/owned.ts
+++ b/packages/backend/src/server/api/endpoints/channels/owned.ts
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import { Channels } from '@/models/index.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['channels', 'account'],
diff --git a/packages/backend/src/server/api/endpoints/channels/show.ts b/packages/backend/src/server/api/endpoints/channels/show.ts
index 87665a986..0e55e73a0 100644
--- a/packages/backend/src/server/api/endpoints/channels/show.ts
+++ b/packages/backend/src/server/api/endpoints/channels/show.ts
@@ -1,6 +1,6 @@
+import { Channels } from '@/models/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { Channels } from '@/models/index.js';
 
 export const meta = {
 	tags: ['channels'],
diff --git a/packages/backend/src/server/api/endpoints/channels/timeline.ts b/packages/backend/src/server/api/endpoints/channels/timeline.ts
index deaa29901..90db2db37 100644
--- a/packages/backend/src/server/api/endpoints/channels/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/channels/timeline.ts
@@ -1,8 +1,8 @@
+import { Notes, Channels } from '@/models/index.js';
+import { activeUsersChart } from '@/services/chart/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { Notes, Channels } from '@/models/index.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
-import { activeUsersChart } from '@/services/chart/index.js';
 
 export const meta = {
 	tags: ['notes', 'channels'],
diff --git a/packages/backend/src/server/api/endpoints/channels/unfollow.ts b/packages/backend/src/server/api/endpoints/channels/unfollow.ts
index e065d897a..262af1720 100644
--- a/packages/backend/src/server/api/endpoints/channels/unfollow.ts
+++ b/packages/backend/src/server/api/endpoints/channels/unfollow.ts
@@ -1,7 +1,7 @@
-import define from '../../define.js';
-import { ApiError } from '../../error.js';
 import { Channels, ChannelFollowings } from '@/models/index.js';
 import { publishUserEvent } from '@/services/stream.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['channels'],
diff --git a/packages/backend/src/server/api/endpoints/channels/update.ts b/packages/backend/src/server/api/endpoints/channels/update.ts
index 13104f324..4ca9369d1 100644
--- a/packages/backend/src/server/api/endpoints/channels/update.ts
+++ b/packages/backend/src/server/api/endpoints/channels/update.ts
@@ -1,6 +1,6 @@
+import { Channels, DriveFiles } from '@/models/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { Channels, DriveFiles } from '@/models/index.js';
 
 export const meta = {
 	tags: ['channels'],
diff --git a/packages/backend/src/server/api/endpoints/charts/user/following.ts b/packages/backend/src/server/api/endpoints/charts/user/following.ts
index f5d42e21c..d7f2334ea 100644
--- a/packages/backend/src/server/api/endpoints/charts/user/following.ts
+++ b/packages/backend/src/server/api/endpoints/charts/user/following.ts
@@ -1,6 +1,6 @@
-import define from '../../../define.js';
 import { getJsonSchema } from '@/services/chart/core.js';
 import { perUserFollowingChart } from '@/services/chart/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['charts', 'users', 'following'],
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 91baa8eb7..15828303b 100644
--- a/packages/backend/src/server/api/endpoints/clips/add-note.ts
+++ b/packages/backend/src/server/api/endpoints/clips/add-note.ts
@@ -1,7 +1,7 @@
-import define from '../../define.js';
 import { ClipNotes, Clips } from '@/models/index.js';
-import { ApiError } from '../../error.js';
 import { genId } from '@/misc/gen-id.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 import { getNote } from '../../common/getters.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/clips/create.ts b/packages/backend/src/server/api/endpoints/clips/create.ts
index 4afe4222a..25408282c 100644
--- a/packages/backend/src/server/api/endpoints/clips/create.ts
+++ b/packages/backend/src/server/api/endpoints/clips/create.ts
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import { genId } from '@/misc/gen-id.js';
 import { Clips } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['clips'],
diff --git a/packages/backend/src/server/api/endpoints/clips/delete.ts b/packages/backend/src/server/api/endpoints/clips/delete.ts
index b6c0eb702..a6c10f546 100644
--- a/packages/backend/src/server/api/endpoints/clips/delete.ts
+++ b/packages/backend/src/server/api/endpoints/clips/delete.ts
@@ -1,6 +1,6 @@
+import { Clips } from '@/models/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { Clips } from '@/models/index.js';
 
 export const meta = {
 	tags: ['clips'],
diff --git a/packages/backend/src/server/api/endpoints/clips/list.ts b/packages/backend/src/server/api/endpoints/clips/list.ts
index 378811eba..53e1e3b00 100644
--- a/packages/backend/src/server/api/endpoints/clips/list.ts
+++ b/packages/backend/src/server/api/endpoints/clips/list.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { Clips } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['clips', 'account'],
diff --git a/packages/backend/src/server/api/endpoints/clips/notes.ts b/packages/backend/src/server/api/endpoints/clips/notes.ts
index 4ace747ef..b8614d6e1 100644
--- a/packages/backend/src/server/api/endpoints/clips/notes.ts
+++ b/packages/backend/src/server/api/endpoints/clips/notes.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { ClipNotes, Clips, Notes } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
 import { generateMutedUserQuery } from '../../common/generate-muted-user-query.js';
diff --git a/packages/backend/src/server/api/endpoints/clips/remove-note.ts b/packages/backend/src/server/api/endpoints/clips/remove-note.ts
index 8b90e31f6..a6a5eeca2 100644
--- a/packages/backend/src/server/api/endpoints/clips/remove-note.ts
+++ b/packages/backend/src/server/api/endpoints/clips/remove-note.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { ClipNotes, Clips } from '@/models/index.js';
+import define from '../../define.js';
 import { ApiError } from '../../error.js';
 import { getNote } from '../../common/getters.js';
 
diff --git a/packages/backend/src/server/api/endpoints/clips/show.ts b/packages/backend/src/server/api/endpoints/clips/show.ts
index c3d73c168..88a5c2eeb 100644
--- a/packages/backend/src/server/api/endpoints/clips/show.ts
+++ b/packages/backend/src/server/api/endpoints/clips/show.ts
@@ -1,6 +1,6 @@
+import { Clips } from '@/models/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { Clips } from '@/models/index.js';
 
 export const meta = {
 	tags: ['clips', 'account'],
diff --git a/packages/backend/src/server/api/endpoints/clips/update.ts b/packages/backend/src/server/api/endpoints/clips/update.ts
index b67d844f6..2878042ba 100644
--- a/packages/backend/src/server/api/endpoints/clips/update.ts
+++ b/packages/backend/src/server/api/endpoints/clips/update.ts
@@ -1,6 +1,6 @@
+import { Clips } from '@/models/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { Clips } from '@/models/index.js';
 
 export const meta = {
 	tags: ['clips'],
diff --git a/packages/backend/src/server/api/endpoints/drive/files.ts b/packages/backend/src/server/api/endpoints/drive/files.ts
index 40e6c16c9..fe0d23e83 100644
--- a/packages/backend/src/server/api/endpoints/drive/files.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { DriveFiles } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
index 415a8cc69..69718b926 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/attached-notes.ts
@@ -1,6 +1,6 @@
+import { DriveFiles, Notes } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { DriveFiles, Notes } from '@/models/index.js';
 
 export const meta = {
 	tags: ['drive', 'notes'],
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 bbae9bf4e..ef12d1837 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
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { DriveFiles } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['drive'],
diff --git a/packages/backend/src/server/api/endpoints/drive/files/create.ts b/packages/backend/src/server/api/endpoints/drive/files/create.ts
index 68ddd586e..123eadfce 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/create.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/create.ts
@@ -1,10 +1,10 @@
 import { addFile } from '@/services/drive/add-file.js';
-import define from '../../../define.js';
-import { apiLogger } from '../../../logger.js';
-import { ApiError } from '../../../error.js';
 import { DriveFiles } from '@/models/index.js';
 import { DB_MAX_IMAGE_COMMENT_LENGTH } from '@/misc/hard-limits.js';
 import { HOUR } from '@/const.js';
+import define from '../../../define.js';
+import { apiLogger } from '../../../logger.js';
+import { ApiError } from '../../../error.js';
 
 export const meta = {
 	tags: ['drive'],
diff --git a/packages/backend/src/server/api/endpoints/drive/files/delete.ts b/packages/backend/src/server/api/endpoints/drive/files/delete.ts
index 261ab0356..a3f608c9d 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/delete.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/delete.ts
@@ -1,8 +1,8 @@
 import { deleteFile } from '@/services/drive/delete-file.js';
 import { publishDriveStream } from '@/services/stream.js';
+import { DriveFiles } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { DriveFiles } from '@/models/index.js';
 
 export const meta = {
 	tags: ['drive'],
diff --git a/packages/backend/src/server/api/endpoints/drive/files/find.ts b/packages/backend/src/server/api/endpoints/drive/files/find.ts
index 245fb45a6..d9b76cdb0 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/find.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/find.ts
@@ -1,6 +1,6 @@
-import define from '../../../define.js';
-import { DriveFiles } from '@/models/index.js';
 import { IsNull } from 'typeorm';
+import { DriveFiles } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/drive/files/update.ts b/packages/backend/src/server/api/endpoints/drive/files/update.ts
index 612e7f164..e6922cfaa 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/update.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/update.ts
@@ -1,7 +1,7 @@
 import { publishDriveStream } from '@/services/stream.js';
+import { DriveFiles, DriveFolders } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { DriveFiles, DriveFolders } from '@/models/index.js';
 
 export const meta = {
 	tags: ['drive'],
diff --git a/packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts b/packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts
index 88a448f21..56f9ccbae 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/upload-from-url.ts
@@ -1,8 +1,8 @@
 import { uploadFromUrl } from '@/services/drive/upload-from-url.js';
-import define from '../../../define.js';
 import { DriveFiles } from '@/models/index.js';
 import { publishMainStream } from '@/services/stream.js';
 import { HOUR } from '@/const.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['drive'],
diff --git a/packages/backend/src/server/api/endpoints/drive/folders.ts b/packages/backend/src/server/api/endpoints/drive/folders.ts
index d4d530ba9..e243952c7 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { DriveFolders } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/drive/folders/create.ts b/packages/backend/src/server/api/endpoints/drive/folders/create.ts
index 4c9146e6b..ebbc23289 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/create.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/create.ts
@@ -1,8 +1,8 @@
 import { publishDriveStream } from '@/services/stream.js';
-import define from '../../../define.js';
-import { ApiError } from '../../../error.js';
 import { DriveFolders } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
+import define from '../../../define.js';
+import { ApiError } from '../../../error.js';
 
 export const meta = {
 	tags: ['drive'],
diff --git a/packages/backend/src/server/api/endpoints/drive/folders/delete.ts b/packages/backend/src/server/api/endpoints/drive/folders/delete.ts
index ab9d411ec..a4176312e 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/delete.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/delete.ts
@@ -1,7 +1,7 @@
-import define from '../../../define.js';
 import { publishDriveStream } from '@/services/stream.js';
-import { ApiError } from '../../../error.js';
 import { DriveFolders, DriveFiles } from '@/models/index.js';
+import define from '../../../define.js';
+import { ApiError } from '../../../error.js';
 
 export const meta = {
 	tags: ['drive'],
diff --git a/packages/backend/src/server/api/endpoints/drive/folders/find.ts b/packages/backend/src/server/api/endpoints/drive/folders/find.ts
index 1feab273a..c3329b70c 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/find.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/find.ts
@@ -1,6 +1,6 @@
-import define from '../../../define.js';
-import { DriveFolders } from '@/models/index.js';
 import { IsNull } from 'typeorm';
+import { DriveFolders } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['drive'],
diff --git a/packages/backend/src/server/api/endpoints/drive/folders/show.ts b/packages/backend/src/server/api/endpoints/drive/folders/show.ts
index 1e7aa2b16..afb448214 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/show.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/show.ts
@@ -1,6 +1,6 @@
+import { DriveFolders } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { DriveFolders } from '@/models/index.js';
 
 export const meta = {
 	tags: ['drive'],
diff --git a/packages/backend/src/server/api/endpoints/drive/folders/update.ts b/packages/backend/src/server/api/endpoints/drive/folders/update.ts
index 1aa2e8429..a87420042 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders/update.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders/update.ts
@@ -1,7 +1,7 @@
 import { publishDriveStream } from '@/services/stream.js';
+import { DriveFolders } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { DriveFolders } from '@/models/index.js';
 
 export const meta = {
 	tags: ['drive'],
diff --git a/packages/backend/src/server/api/endpoints/drive/stream.ts b/packages/backend/src/server/api/endpoints/drive/stream.ts
index 99e8d024f..26f7f5ee7 100644
--- a/packages/backend/src/server/api/endpoints/drive/stream.ts
+++ b/packages/backend/src/server/api/endpoints/drive/stream.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { DriveFiles } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/email-address/available.ts b/packages/backend/src/server/api/endpoints/email-address/available.ts
index 07064ce9f..9695fb6ba 100644
--- a/packages/backend/src/server/api/endpoints/email-address/available.ts
+++ b/packages/backend/src/server/api/endpoints/email-address/available.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { validateEmailForAccount } from '@/services/validate-email-for-account.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['users'],
diff --git a/packages/backend/src/server/api/endpoints/export-custom-emojis.ts b/packages/backend/src/server/api/endpoints/export-custom-emojis.ts
index 3dc9d4e9f..5d923ef6d 100644
--- a/packages/backend/src/server/api/endpoints/export-custom-emojis.ts
+++ b/packages/backend/src/server/api/endpoints/export-custom-emojis.ts
@@ -1,6 +1,6 @@
 import { createExportCustomEmojisJob } from '@/queue/index.js';
-import define from '../define.js';
 import { HOUR } from '@/const.js';
+import define from '../define.js';
 
 export const meta = {
 	secure: true,
diff --git a/packages/backend/src/server/api/endpoints/federation/followers.ts b/packages/backend/src/server/api/endpoints/federation/followers.ts
index 1cf17e33b..ace3309ad 100644
--- a/packages/backend/src/server/api/endpoints/federation/followers.ts
+++ b/packages/backend/src/server/api/endpoints/federation/followers.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { Followings } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/federation/following.ts b/packages/backend/src/server/api/endpoints/federation/following.ts
index cc3fb19a7..8bbb678ea 100644
--- a/packages/backend/src/server/api/endpoints/federation/following.ts
+++ b/packages/backend/src/server/api/endpoints/federation/following.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { Followings } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
index 39c49c266..2a517cf13 100644
--- a/packages/backend/src/server/api/endpoints/federation/instances.ts
+++ b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import { Instances } from '@/models/index.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['federation'],
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 2fbb8a15c..4768796a9 100644
--- a/packages/backend/src/server/api/endpoints/federation/show-instance.ts
+++ b/packages/backend/src/server/api/endpoints/federation/show-instance.ts
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import { Instances } from '@/models/index.js';
 import { toPuny } from '@/misc/convert-host.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['federation'],
diff --git a/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts b/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts
index 409cc7695..8b7be8e36 100644
--- a/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts
+++ b/packages/backend/src/server/api/endpoints/federation/update-remote-user.ts
@@ -1,6 +1,6 @@
+import { updatePerson } from '@/remote/activitypub/models/person.js';
 import define from '../../define.js';
 import { getRemoteUser } from '../../common/getters.js';
-import { updatePerson } from '@/remote/activitypub/models/person.js';
 
 export const meta = {
 	tags: ['federation'],
diff --git a/packages/backend/src/server/api/endpoints/federation/users.ts b/packages/backend/src/server/api/endpoints/federation/users.ts
index 5f50502ec..15a8dbb5f 100644
--- a/packages/backend/src/server/api/endpoints/federation/users.ts
+++ b/packages/backend/src/server/api/endpoints/federation/users.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { Users } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/following/create.ts b/packages/backend/src/server/api/endpoints/following/create.ts
index 3a12a55b8..1bca40f16 100644
--- a/packages/backend/src/server/api/endpoints/following/create.ts
+++ b/packages/backend/src/server/api/endpoints/following/create.ts
@@ -1,10 +1,10 @@
 import create from '@/services/following/create.js';
-import define from '../../define.js';
-import { ApiError } from '../../error.js';
-import { getUser } from '../../common/getters.js';
 import { Followings, Users } from '@/models/index.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { HOUR } from '@/const.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
+import { getUser } from '../../common/getters.js';
 
 export const meta = {
 	tags: ['following', 'users'],
diff --git a/packages/backend/src/server/api/endpoints/following/delete.ts b/packages/backend/src/server/api/endpoints/following/delete.ts
index a454f2d72..3f9c217de 100644
--- a/packages/backend/src/server/api/endpoints/following/delete.ts
+++ b/packages/backend/src/server/api/endpoints/following/delete.ts
@@ -1,9 +1,9 @@
 import deleteFollowing from '@/services/following/delete.js';
+import { Followings, Users } from '@/models/index.js';
+import { HOUR } from '@/const.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
 import { getUser } from '../../common/getters.js';
-import { Followings, Users } from '@/models/index.js';
-import { HOUR } from '@/const.js';
 
 export const meta = {
 	tags: ['following', 'users'],
diff --git a/packages/backend/src/server/api/endpoints/following/invalidate.ts b/packages/backend/src/server/api/endpoints/following/invalidate.ts
index cf3a21406..b9e84d81a 100644
--- a/packages/backend/src/server/api/endpoints/following/invalidate.ts
+++ b/packages/backend/src/server/api/endpoints/following/invalidate.ts
@@ -1,9 +1,9 @@
 import deleteFollowing from '@/services/following/delete.js';
+import { Followings, Users } from '@/models/index.js';
+import { HOUR } from '@/const.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
 import { getUser } from '../../common/getters.js';
-import { Followings, Users } from '@/models/index.js';
-import { HOUR } from '@/const.js';
 
 export const meta = {
 	tags: ['following', 'users'],
diff --git a/packages/backend/src/server/api/endpoints/following/requests/cancel.ts b/packages/backend/src/server/api/endpoints/following/requests/cancel.ts
index 80d37fb07..5f3a9c691 100644
--- a/packages/backend/src/server/api/endpoints/following/requests/cancel.ts
+++ b/packages/backend/src/server/api/endpoints/following/requests/cancel.ts
@@ -1,9 +1,9 @@
 import cancelFollowRequest from '@/services/following/requests/cancel.js';
+import { Users } from '@/models/index.js';
+import { IdentifiableError } from '@/misc/identifiable-error.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 import { getUser } from '../../../common/getters.js';
-import { Users } from '@/models/index.js';
-import { IdentifiableError } from '@/misc/identifiable-error.js';
 
 export const meta = {
 	tags: ['following', 'account'],
diff --git a/packages/backend/src/server/api/endpoints/following/requests/list.ts b/packages/backend/src/server/api/endpoints/following/requests/list.ts
index a8f42c481..4e43c4948 100644
--- a/packages/backend/src/server/api/endpoints/following/requests/list.ts
+++ b/packages/backend/src/server/api/endpoints/following/requests/list.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { FollowRequests } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['following', 'account'],
diff --git a/packages/backend/src/server/api/endpoints/gallery/featured.ts b/packages/backend/src/server/api/endpoints/gallery/featured.ts
index e6acd3691..835f34002 100644
--- a/packages/backend/src/server/api/endpoints/gallery/featured.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/featured.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { GalleryPosts } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['gallery'],
diff --git a/packages/backend/src/server/api/endpoints/gallery/popular.ts b/packages/backend/src/server/api/endpoints/gallery/popular.ts
index c4c8982fc..552810e54 100644
--- a/packages/backend/src/server/api/endpoints/gallery/popular.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/popular.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { GalleryPosts } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['gallery'],
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts.ts b/packages/backend/src/server/api/endpoints/gallery/posts.ts
index 428ba9cc7..3a21afae1 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts.ts
@@ -1,6 +1,6 @@
+import { GalleryPosts } from '@/models/index.js';
 import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
-import { GalleryPosts } from '@/models/index.js';
 
 export const meta = {
 	tags: ['gallery'],
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 61bf99411..17c64bce3 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/create.ts
@@ -1,9 +1,9 @@
-import define from '../../../define.js';
 import { DriveFiles, GalleryPosts } from '@/models/index.js';
-import { genId } from '../../../../../misc/gen-id.js';
+import { genId } from '@/misc/gen-id.js';
 import { GalleryPost } from '@/models/entities/gallery-post.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { HOUR } from '@/const.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['gallery'],
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts b/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts
index b00ee0e2a..83bae3af8 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/delete.ts
@@ -1,6 +1,6 @@
+import { GalleryPosts } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { GalleryPosts } from '@/models/index.js';
 
 export const meta = {
 	tags: ['gallery'],
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 b858114ae..d58427a64 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/like.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/like.ts
@@ -1,7 +1,7 @@
-import define from '../../../define.js';
-import { ApiError } from '../../../error.js';
 import { GalleryPosts, GalleryLikes } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
+import define from '../../../define.js';
+import { ApiError } from '../../../error.js';
 
 export const meta = {
 	tags: ['gallery'],
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/show.ts b/packages/backend/src/server/api/endpoints/gallery/posts/show.ts
index 4f6dafd7c..5fa28b48b 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/show.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/show.ts
@@ -1,6 +1,6 @@
+import { GalleryPosts } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { GalleryPosts } from '@/models/index.js';
 
 export const meta = {
 	tags: ['gallery'],
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts b/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts
index d136239e5..fd1a10f2b 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/unlike.ts
@@ -1,6 +1,6 @@
+import { GalleryPosts, GalleryLikes } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { GalleryPosts, GalleryLikes } from '@/models/index.js';
 
 export const meta = {
 	tags: ['gallery'],
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 7e49d4e28..48a51fc0d 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts/update.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts/update.ts
@@ -1,7 +1,7 @@
-import define from '../../../define.js';
 import { DriveFiles, GalleryPosts } from '@/models/index.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { HOUR } from '@/const.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['gallery'],
diff --git a/packages/backend/src/server/api/endpoints/hashtags/list.ts b/packages/backend/src/server/api/endpoints/hashtags/list.ts
index 50e36386c..4277410c8 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/list.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/list.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { Hashtags } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['hashtags'],
diff --git a/packages/backend/src/server/api/endpoints/hashtags/search.ts b/packages/backend/src/server/api/endpoints/hashtags/search.ts
index c28984477..bc31b0419 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/search.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/search.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { Hashtags } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['hashtags'],
diff --git a/packages/backend/src/server/api/endpoints/hashtags/show.ts b/packages/backend/src/server/api/endpoints/hashtags/show.ts
index 5b78f6ac7..ae3d1449f 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/show.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/show.ts
@@ -1,7 +1,7 @@
-import define from '../../define.js';
-import { ApiError } from '../../error.js';
 import { Hashtags } from '@/models/index.js';
 import { normalizeForSearch } from '@/misc/normalize-for-search.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['hashtags'],
diff --git a/packages/backend/src/server/api/endpoints/hashtags/trend.ts b/packages/backend/src/server/api/endpoints/hashtags/trend.ts
index 5cb01b3cd..069f1bc64 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/trend.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/trend.ts
@@ -1,10 +1,10 @@
 import { Brackets } from 'typeorm';
-import define from '../../define.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { Notes } from '@/models/index.js';
 import { Note } from '@/models/entities/note.js';
 import { safeForSql } from '@/misc/safe-for-sql.js';
 import { normalizeForSearch } from '@/misc/normalize-for-search.js';
+import define from '../../define.js';
 
 /*
 トレンドに載るためには「『直近a分間のユニーク投稿数が今からa分前～今からb分前の間のユニーク投稿数のn倍以上』のハッシュタグの上位5位以内に入る」ことが必要
diff --git a/packages/backend/src/server/api/endpoints/hashtags/users.ts b/packages/backend/src/server/api/endpoints/hashtags/users.ts
index 196513b93..bc691b0c3 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/users.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/users.ts
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import { Users } from '@/models/index.js';
 import { normalizeForSearch } from '@/misc/normalize-for-search.js';
+import define from '../../define.js';
 
 export const meta = {
 	requireCredential: false,
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 35806b2bc..aef3bbed4 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/done.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/done.ts
@@ -1,6 +1,6 @@
 import * as speakeasy from 'speakeasy';
-import define from '../../../define.js';
 import { UserProfiles } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts
index 1afb34bfd..73cc481af 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/key-done.ts
@@ -1,7 +1,6 @@
-import bcrypt from 'bcryptjs';
 import { promisify } from 'node:util';
+import bcrypt from 'bcryptjs';
 import * as cbor from 'cbor';
-import define from '../../../define.js';
 import {
 	UserProfiles,
 	UserSecurityKeys,
@@ -9,8 +8,9 @@ import {
 	Users,
 } from '@/models/index.js';
 import config from '@/config/index.js';
-import { procedures, hash } from '../../../2fa.js';
 import { publishMainStream } from '@/services/stream.js';
+import define from '../../../define.js';
+import { procedures, hash } from '../../../2fa.js';
 
 const cborDecodeFirst = promisify(cbor.decodeFirst) as any;
 const rpIdHashReal = hash(Buffer.from(config.hostname, 'utf-8'));
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts b/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts
index 4bfa24f97..45e8b3ff3 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/password-less.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { UserProfiles } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
index e906b8204..555b98d5a 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/register-key.ts
@@ -1,9 +1,9 @@
-import bcrypt from 'bcryptjs';
-import define from '../../../define.js';
-import { UserProfiles, AttestationChallenges } from '@/models/index.js';
 import { promisify } from 'node:util';
 import * as crypto from 'node:crypto';
+import bcrypt from 'bcryptjs';
+import { UserProfiles, AttestationChallenges } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
+import define from '../../../define.js';
 import { hash } from '../../../2fa.js';
 
 const randomBytes = promisify(crypto.randomBytes);
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts
index eb2f75308..4467290b8 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/remove-key.ts
@@ -1,7 +1,7 @@
 import bcrypt from 'bcryptjs';
-import define from '../../../define.js';
 import { UserProfiles, UserSecurityKeys, Users } from '@/models/index.js';
 import { publishMainStream } from '@/services/stream.js';
+import define from '../../../define.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts b/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts
index 45e7a9863..4deefa37b 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/unregister.ts
@@ -1,6 +1,6 @@
 import bcrypt from 'bcryptjs';
-import define from '../../../define.js';
 import { UserProfiles } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/i/apps.ts b/packages/backend/src/server/api/endpoints/i/apps.ts
index eca955884..3f8baf3dd 100644
--- a/packages/backend/src/server/api/endpoints/i/apps.ts
+++ b/packages/backend/src/server/api/endpoints/i/apps.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { AccessTokens } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts
index 2cef26067..d54a76ddd 100644
--- a/packages/backend/src/server/api/endpoints/i/authorized-apps.ts
+++ b/packages/backend/src/server/api/endpoints/i/authorized-apps.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { AccessTokens, Apps } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/i/change-password.ts b/packages/backend/src/server/api/endpoints/i/change-password.ts
index f9f6a33a8..5f625b695 100644
--- a/packages/backend/src/server/api/endpoints/i/change-password.ts
+++ b/packages/backend/src/server/api/endpoints/i/change-password.ts
@@ -1,6 +1,6 @@
 import bcrypt from 'bcryptjs';
-import define from '../../define.js';
 import { UserProfiles } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/i/export-blocking.ts b/packages/backend/src/server/api/endpoints/i/export-blocking.ts
index 682d39552..07381fa90 100644
--- a/packages/backend/src/server/api/endpoints/i/export-blocking.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-blocking.ts
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import { createExportBlockingJob } from '@/queue/index.js';
 import { HOUR } from '@/const.js';
+import define from '../../define.js';
 
 export const meta = {
 	secure: true,
diff --git a/packages/backend/src/server/api/endpoints/i/export-following.ts b/packages/backend/src/server/api/endpoints/i/export-following.ts
index 3d56ab7ee..a1f2912dc 100644
--- a/packages/backend/src/server/api/endpoints/i/export-following.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-following.ts
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import { createExportFollowingJob } from '@/queue/index.js';
 import { HOUR } from '@/const.js';
+import define from '../../define.js';
 
 export const meta = {
 	secure: true,
diff --git a/packages/backend/src/server/api/endpoints/i/export-mute.ts b/packages/backend/src/server/api/endpoints/i/export-mute.ts
index b6cc1eea4..92fd30f27 100644
--- a/packages/backend/src/server/api/endpoints/i/export-mute.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-mute.ts
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import { createExportMuteJob } from '@/queue/index.js';
 import { HOUR } from '@/const.js';
+import define from '../../define.js';
 
 export const meta = {
 	secure: true,
diff --git a/packages/backend/src/server/api/endpoints/i/export-notes.ts b/packages/backend/src/server/api/endpoints/i/export-notes.ts
index 4856b84ab..6c9da1113 100644
--- a/packages/backend/src/server/api/endpoints/i/export-notes.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-notes.ts
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import { createExportNotesJob } from '@/queue/index.js';
 import { DAY } from '@/const.js';
+import define from '../../define.js';
 
 export const meta = {
 	secure: true,
diff --git a/packages/backend/src/server/api/endpoints/i/export-user-lists.ts b/packages/backend/src/server/api/endpoints/i/export-user-lists.ts
index 1aa02707d..2295f0586 100644
--- a/packages/backend/src/server/api/endpoints/i/export-user-lists.ts
+++ b/packages/backend/src/server/api/endpoints/i/export-user-lists.ts
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import { createExportUserListsJob } from '@/queue/index.js';
 import { MINUTE } from '@/const.js';
+import define from '../../define.js';
 
 export const meta = {
 	secure: true,
diff --git a/packages/backend/src/server/api/endpoints/i/favorites.ts b/packages/backend/src/server/api/endpoints/i/favorites.ts
index b273c86e0..25f5b4fa5 100644
--- a/packages/backend/src/server/api/endpoints/i/favorites.ts
+++ b/packages/backend/src/server/api/endpoints/i/favorites.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { NoteFavorites } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/i/gallery/likes.ts b/packages/backend/src/server/api/endpoints/i/gallery/likes.ts
index 9e7c11e25..563af4091 100644
--- a/packages/backend/src/server/api/endpoints/i/gallery/likes.ts
+++ b/packages/backend/src/server/api/endpoints/i/gallery/likes.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { GalleryLikes } from '@/models/index.js';
+import define from '../../../define.js';
 import { makePaginationQuery } from '../../../common/make-pagination-query.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/i/gallery/posts.ts b/packages/backend/src/server/api/endpoints/i/gallery/posts.ts
index 990e1be2a..2ecd47f1b 100644
--- a/packages/backend/src/server/api/endpoints/i/gallery/posts.ts
+++ b/packages/backend/src/server/api/endpoints/i/gallery/posts.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { GalleryPosts } from '@/models/index.js';
+import define from '../../../define.js';
 import { makePaginationQuery } from '../../../common/make-pagination-query.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts b/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts
index e7d7518c5..728e9289f 100644
--- a/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts
+++ b/packages/backend/src/server/api/endpoints/i/get-word-muted-notes-count.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { MutedNotes } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['account'],
diff --git a/packages/backend/src/server/api/endpoints/i/import-blocking.ts b/packages/backend/src/server/api/endpoints/i/import-blocking.ts
index 5e5bcba7a..f3ea6a42f 100644
--- a/packages/backend/src/server/api/endpoints/i/import-blocking.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-blocking.ts
@@ -1,8 +1,8 @@
-import define from '../../define.js';
 import { createImportBlockingJob } from '@/queue/index.js';
-import { ApiError } from '../../error.js';
 import { DriveFiles } from '@/models/index.js';
 import { HOUR } from '@/const.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	secure: true,
diff --git a/packages/backend/src/server/api/endpoints/i/import-following.ts b/packages/backend/src/server/api/endpoints/i/import-following.ts
index 28d9d38fa..e5a4f1adf 100644
--- a/packages/backend/src/server/api/endpoints/i/import-following.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-following.ts
@@ -1,8 +1,8 @@
-import define from '../../define.js';
 import { createImportFollowingJob } from '@/queue/index.js';
-import { ApiError } from '../../error.js';
 import { DriveFiles } from '@/models/index.js';
 import { HOUR } from '@/const.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	secure: true,
diff --git a/packages/backend/src/server/api/endpoints/i/import-muting.ts b/packages/backend/src/server/api/endpoints/i/import-muting.ts
index 4165da020..29acb5638 100644
--- a/packages/backend/src/server/api/endpoints/i/import-muting.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-muting.ts
@@ -1,8 +1,8 @@
-import define from '../../define.js';
 import { createImportMutingJob } from '@/queue/index.js';
-import { ApiError } from '../../error.js';
 import { DriveFiles } from '@/models/index.js';
 import { HOUR } from '@/const.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	secure: true,
diff --git a/packages/backend/src/server/api/endpoints/i/import-user-lists.ts b/packages/backend/src/server/api/endpoints/i/import-user-lists.ts
index 6b3949c99..1158af3a1 100644
--- a/packages/backend/src/server/api/endpoints/i/import-user-lists.ts
+++ b/packages/backend/src/server/api/endpoints/i/import-user-lists.ts
@@ -1,8 +1,8 @@
-import define from '../../define.js';
 import { createImportUserListsJob } from '@/queue/index.js';
-import { ApiError } from '../../error.js';
 import { DriveFiles } from '@/models/index.js';
 import { HOUR } from '@/const.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	secure: true,
diff --git a/packages/backend/src/server/api/endpoints/i/page-likes.ts b/packages/backend/src/server/api/endpoints/i/page-likes.ts
index 2e5f35919..159b9c25b 100644
--- a/packages/backend/src/server/api/endpoints/i/page-likes.ts
+++ b/packages/backend/src/server/api/endpoints/i/page-likes.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { PageLikes } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/i/pages.ts b/packages/backend/src/server/api/endpoints/i/pages.ts
index dcc1233b7..7e1820d45 100644
--- a/packages/backend/src/server/api/endpoints/i/pages.ts
+++ b/packages/backend/src/server/api/endpoints/i/pages.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { Pages } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/i/pin.ts b/packages/backend/src/server/api/endpoints/i/pin.ts
index 67b7026be..64f6a719d 100644
--- a/packages/backend/src/server/api/endpoints/i/pin.ts
+++ b/packages/backend/src/server/api/endpoints/i/pin.ts
@@ -1,7 +1,7 @@
 import { addPinned } from '@/services/i/pin.js';
+import { Users } from '@/models/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { Users } from '@/models/index.js';
 
 export const meta = {
 	tags: ['account', 'notes'],
diff --git a/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts b/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts
index 6d9f2dda6..9b49dc9f7 100644
--- a/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts
+++ b/packages/backend/src/server/api/endpoints/i/read-all-messaging-messages.ts
@@ -1,6 +1,6 @@
 import { publishMainStream } from '@/services/stream.js';
-import define from '../../define.js';
 import { MessagingMessages, UserGroupJoinings } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['account', 'messaging'],
diff --git a/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts b/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts
index 49f3deb33..7a1c3f739 100644
--- a/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts
+++ b/packages/backend/src/server/api/endpoints/i/read-all-unread-notes.ts
@@ -1,6 +1,6 @@
 import { publishMainStream } from '@/services/stream.js';
-import define from '../../define.js';
 import { NoteUnreads } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['account'],
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 45b6e98c8..44d533667 100644
--- a/packages/backend/src/server/api/endpoints/i/read-announcement.ts
+++ b/packages/backend/src/server/api/endpoints/i/read-announcement.ts
@@ -1,8 +1,8 @@
-import define from '../../define.js';
-import { ApiError } from '../../error.js';
 import { genId } from '@/misc/gen-id.js';
 import { AnnouncementReads, Announcements, Users } from '@/models/index.js';
 import { publishMainStream } from '@/services/stream.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['account'],
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 af929b04e..37cdf4846 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 bcrypt from 'bcryptjs';
 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 define from '../../define.js';
-import { Users, UserProfiles } from '@/models/index.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/i/registry/get-all.ts b/packages/backend/src/server/api/endpoints/i/registry/get-all.ts
index d0b16dbc4..d92bc7af9 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/get-all.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/get-all.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { RegistryItems } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts b/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts
index cc5d5a8c6..744b1d05b 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/get-detail.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { RegistryItems } from '@/models/index.js';
+import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/i/registry/get.ts b/packages/backend/src/server/api/endpoints/i/registry/get.ts
index a79319744..1bae3c886 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/get.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/get.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { RegistryItems } from '@/models/index.js';
+import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts b/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts
index ac209c06a..d9982b036 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/keys-with-type.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { RegistryItems } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/i/registry/keys.ts b/packages/backend/src/server/api/endpoints/i/registry/keys.ts
index 5ea1a9d34..b625f50ca 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/keys.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/keys.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { RegistryItems } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/i/registry/remove.ts b/packages/backend/src/server/api/endpoints/i/registry/remove.ts
index 92473654c..8467b2513 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/remove.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/remove.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { RegistryItems } from '@/models/index.js';
+import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/i/registry/scopes.ts b/packages/backend/src/server/api/endpoints/i/registry/scopes.ts
index de4b313e2..d946fe609 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/scopes.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/scopes.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { RegistryItems } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/i/registry/set.ts b/packages/backend/src/server/api/endpoints/i/registry/set.ts
index d380b428a..03d81d8c4 100644
--- a/packages/backend/src/server/api/endpoints/i/registry/set.ts
+++ b/packages/backend/src/server/api/endpoints/i/registry/set.ts
@@ -1,7 +1,7 @@
 import { publishMainStream } from '@/services/stream.js';
-import define from '../../../define.js';
 import { RegistryItems } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
+import define from '../../../define.js';
 
 export const meta = {
 	requireCredential: true,
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 c69245379..26c20cba9 100644
--- a/packages/backend/src/server/api/endpoints/i/revoke-token.ts
+++ b/packages/backend/src/server/api/endpoints/i/revoke-token.ts
@@ -1,6 +1,6 @@
-import define from '../../define.js';
 import { AccessTokens } from '@/models/index.js';
 import { publishUserEvent } from '@/services/stream.js';
+import define from '../../define.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/i/signin-history.ts b/packages/backend/src/server/api/endpoints/i/signin-history.ts
index c3c33a8ba..3ac1a2549 100644
--- a/packages/backend/src/server/api/endpoints/i/signin-history.ts
+++ b/packages/backend/src/server/api/endpoints/i/signin-history.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { Signins } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/i/unpin.ts b/packages/backend/src/server/api/endpoints/i/unpin.ts
index 9912689da..2c63f8a88 100644
--- a/packages/backend/src/server/api/endpoints/i/unpin.ts
+++ b/packages/backend/src/server/api/endpoints/i/unpin.ts
@@ -1,7 +1,7 @@
 import { removePinned } from '@/services/i/pin.js';
+import { Users } from '@/models/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { Users } from '@/models/index.js';
 
 export const meta = {
 	tags: ['account', 'notes'],
diff --git a/packages/backend/src/server/api/endpoints/i/update-email.ts b/packages/backend/src/server/api/endpoints/i/update-email.ts
index 7cfb88978..3f9411de4 100644
--- a/packages/backend/src/server/api/endpoints/i/update-email.ts
+++ b/packages/backend/src/server/api/endpoints/i/update-email.ts
@@ -1,13 +1,13 @@
-import { publishMainStream } from '@/services/stream.js';
-import define from '../../define.js';
 import rndstr from 'rndstr';
-import config from '@/config/index.js';
 import bcrypt from 'bcryptjs';
+import { publishMainStream } from '@/services/stream.js';
+import config from '@/config/index.js';
 import { Users, UserProfiles } from '@/models/index.js';
 import { sendEmail } from '@/services/send-email.js';
-import { ApiError } from '../../error.js';
 import { validateEmailForAccount } from '@/services/validate-email-for-account.js';
 import { HOUR } from '@/const.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	requireCredential: true,
diff --git a/packages/backend/src/server/api/endpoints/i/update.ts b/packages/backend/src/server/api/endpoints/i/update.ts
index b2964e68c..36581c08f 100644
--- a/packages/backend/src/server/api/endpoints/i/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/update.ts
@@ -3,17 +3,17 @@ import * as mfm from 'mfm-js';
 import { publishMainStream, publishUserEvent } from '@/services/stream.js';
 import acceptAllFollowRequests from '@/services/following/requests/accept-all.js';
 import { publishToFollowers } from '@/services/i/update.js';
-import define from '../../define.js';
 import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mfm.js';
 import { extractHashtags } from '@/misc/extract-hashtags.js';
 import { updateUsertags } from '@/services/update-hashtag.js';
-import { ApiError } from '../../error.js';
 import { Users, DriveFiles, UserProfiles, Pages } from '@/models/index.js';
 import { User } from '@/models/entities/user.js';
 import { UserProfile } from '@/models/entities/user-profile.js';
 import { notificationTypes } from '@/types.js';
 import { normalizeForSearch } from '@/misc/normalize-for-search.js';
 import { langmap } from '@/misc/langmap.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
 
 export const meta = {
 	tags: ['account'],
diff --git a/packages/backend/src/server/api/endpoints/i/user-group-invites.ts b/packages/backend/src/server/api/endpoints/i/user-group-invites.ts
index 3f78532fe..5bf20e67b 100644
--- a/packages/backend/src/server/api/endpoints/i/user-group-invites.ts
+++ b/packages/backend/src/server/api/endpoints/i/user-group-invites.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { UserGroupInvitations } from '@/models/index.js';
+import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/create.ts b/packages/backend/src/server/api/endpoints/i/webhooks/create.ts
index 2e2fd00b8..383eee433 100644
--- a/packages/backend/src/server/api/endpoints/i/webhooks/create.ts
+++ b/packages/backend/src/server/api/endpoints/i/webhooks/create.ts
@@ -1,8 +1,8 @@
-import define from '../../../define.js';
 import { genId } from '@/misc/gen-id.js';
 import { Webhooks } from '@/models/index.js';
 import { publishInternalEvent } from '@/services/stream.js';
 import { webhookEventTypes } from '@/models/entities/webhook.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['webhooks'],
diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts b/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts
index 2821eaa5f..81ac30541 100644
--- a/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts
+++ b/packages/backend/src/server/api/endpoints/i/webhooks/delete.ts
@@ -1,7 +1,7 @@
-import define from '../../../define.js';
-import { ApiError } from '../../../error.js';
 import { Webhooks } from '@/models/index.js';
 import { publishInternalEvent } from '@/services/stream.js';
+import define from '../../../define.js';
+import { ApiError } from '../../../error.js';
 
 export const meta = {
 	tags: ['webhooks'],
diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/list.ts b/packages/backend/src/server/api/endpoints/i/webhooks/list.ts
index 54e456373..40e40f548 100644
--- a/packages/backend/src/server/api/endpoints/i/webhooks/list.ts
+++ b/packages/backend/src/server/api/endpoints/i/webhooks/list.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { Webhooks } from '@/models/index.js';
+import define from '../../../define.js';
 
 export const meta = {
 	tags: ['webhooks', 'account'],
diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/show.ts b/packages/backend/src/server/api/endpoints/i/webhooks/show.ts
index 02fa1edb5..d45a39813 100644
--- a/packages/backend/src/server/api/endpoints/i/webhooks/show.ts
+++ b/packages/backend/src/server/api/endpoints/i/webhooks/show.ts
@@ -1,6 +1,6 @@
+import { Webhooks } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { Webhooks } from '@/models/index.js';
 
 export const meta = {
 	tags: ['webhooks'],
diff --git a/packages/backend/src/server/api/endpoints/i/webhooks/update.ts b/packages/backend/src/server/api/endpoints/i/webhooks/update.ts
index f87b9753f..0ffa8a318 100644
--- a/packages/backend/src/server/api/endpoints/i/webhooks/update.ts
+++ b/packages/backend/src/server/api/endpoints/i/webhooks/update.ts
@@ -1,8 +1,8 @@
-import define from '../../../define.js';
-import { ApiError } from '../../../error.js';
 import { Webhooks } from '@/models/index.js';
 import { publishInternalEvent } from '@/services/stream.js';
 import { webhookEventTypes } from '@/models/entities/webhook.js';
+import define from '../../../define.js';
+import { ApiError } from '../../../error.js';
 
 export const meta = {
 	tags: ['webhooks'],
diff --git a/packages/backend/src/server/api/endpoints/messaging/history.ts b/packages/backend/src/server/api/endpoints/messaging/history.ts
index df14a6a84..ac46407cc 100644
--- a/packages/backend/src/server/api/endpoints/messaging/history.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/history.ts
@@ -1,7 +1,7 @@
-import define from '../../define.js';
+import { Brackets } from 'typeorm';
 import { MessagingMessage } from '@/models/entities/messaging-message.js';
 import { MessagingMessages, Mutings, UserGroupJoinings } from '@/models/index.js';
-import { Brackets } from 'typeorm';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['messaging'],
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages.ts b/packages/backend/src/server/api/endpoints/messaging/messages.ts
index 60a27c6ec..c8006f490 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages.ts
@@ -1,9 +1,9 @@
+import { Brackets } from 'typeorm';
+import { MessagingMessages, UserGroups, UserGroupJoinings, Users } from '@/models/index.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
 import { getUser } from '../../common/getters.js';
-import { MessagingMessages, UserGroups, UserGroupJoinings, Users } from '@/models/index.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
-import { Brackets } from 'typeorm';
 import { readUserMessagingMessage, readGroupMessagingMessage, deliverReadActivity } from '../../common/read-messaging-message.js';
 
 export const meta = {
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 1bb87cf4c..d930a5871 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages/create.ts
@@ -1,10 +1,10 @@
-import define from '../../../define.js';
-import { ApiError } from '../../../error.js';
-import { getUser } from '../../../common/getters.js';
 import { DriveFiles, UserGroups, UserGroupJoinings, Blockings } from '@/models/index.js';
 import { User } from '@/models/entities/user.js';
 import { UserGroup } from '@/models/entities/user-group.js';
 import { createMessage } from '@/services/messages/create.js';
+import define from '../../../define.js';
+import { ApiError } from '../../../error.js';
+import { getUser } from '../../../common/getters.js';
 
 export const meta = {
 	tags: ['messaging'],
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts b/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts
index 17d295700..1997a8eda 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages/delete.ts
@@ -1,8 +1,8 @@
-import define from '../../../define.js';
-import { ApiError } from '../../../error.js';
 import { MessagingMessages } from '@/models/index.js';
 import { deleteMessage } from '@/services/messages/delete.js';
 import { SECOND, HOUR } from '@/const.js';
+import define from '../../../define.js';
+import { ApiError } from '../../../error.js';
 
 export const meta = {
 	tags: ['messaging'],
diff --git a/packages/backend/src/server/api/endpoints/messaging/messages/read.ts b/packages/backend/src/server/api/endpoints/messaging/messages/read.ts
index db12ae922..c02b53469 100644
--- a/packages/backend/src/server/api/endpoints/messaging/messages/read.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/messages/read.ts
@@ -1,6 +1,6 @@
+import { MessagingMessages } from '@/models/index.js';
 import define from '../../../define.js';
 import { ApiError } from '../../../error.js';
-import { MessagingMessages } from '@/models/index.js';
 import { readUserMessagingMessage, readGroupMessagingMessage } from '../../../common/read-messaging-message.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/miauth/gen-token.ts b/packages/backend/src/server/api/endpoints/miauth/gen-token.ts
index 73ecdaeb0..a295cf778 100644
--- a/packages/backend/src/server/api/endpoints/miauth/gen-token.ts
+++ b/packages/backend/src/server/api/endpoints/miauth/gen-token.ts
@@ -1,7 +1,7 @@
-import define from '../../define.js';
 import { AccessTokens } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
 import { secureRndstr } from '@/misc/secure-rndstr.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['auth'],
diff --git a/packages/backend/src/server/api/endpoints/mute/create.ts b/packages/backend/src/server/api/endpoints/mute/create.ts
index 7e857e673..f10fe0e2f 100644
--- a/packages/backend/src/server/api/endpoints/mute/create.ts
+++ b/packages/backend/src/server/api/endpoints/mute/create.ts
@@ -1,10 +1,10 @@
-import define from '../../define.js';
-import { ApiError } from '../../error.js';
-import { getUser } from '../../common/getters.js';
 import { genId } from '@/misc/gen-id.js';
 import { Mutings, NoteWatchings } from '@/models/index.js';
 import { Muting } from '@/models/entities/muting.js';
 import { publishUserEvent } from '@/services/stream.js';
+import define from '../../define.js';
+import { ApiError } from '../../error.js';
+import { getUser } from '../../common/getters.js';
 
 export const meta = {
 	tags: ['account'],
diff --git a/packages/backend/src/server/api/endpoints/mute/delete.ts b/packages/backend/src/server/api/endpoints/mute/delete.ts
index 0b173dbe2..eed38528a 100644
--- a/packages/backend/src/server/api/endpoints/mute/delete.ts
+++ b/packages/backend/src/server/api/endpoints/mute/delete.ts
@@ -1,8 +1,8 @@
+import { Mutings } from '@/models/index.js';
+import { publishUserEvent } from '@/services/stream.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
 import { getUser } from '../../common/getters.js';
-import { Mutings } from '@/models/index.js';
-import { publishUserEvent } from '@/services/stream.js';
 
 export const meta = {
 	tags: ['account'],
diff --git a/packages/backend/src/server/api/endpoints/mute/list.ts b/packages/backend/src/server/api/endpoints/mute/list.ts
index 1f7e8d923..bea4877b7 100644
--- a/packages/backend/src/server/api/endpoints/mute/list.ts
+++ b/packages/backend/src/server/api/endpoints/mute/list.ts
@@ -1,6 +1,6 @@
+import { Mutings } from '@/models/index.js';
 import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
-import { Mutings } from '@/models/index.js';
 
 export const meta = {
 	tags: ['account'],
diff --git a/packages/backend/src/server/api/endpoints/my/apps.ts b/packages/backend/src/server/api/endpoints/my/apps.ts
index 85b75c15d..f5348fddd 100644
--- a/packages/backend/src/server/api/endpoints/my/apps.ts
+++ b/packages/backend/src/server/api/endpoints/my/apps.ts
@@ -1,5 +1,5 @@
-import define from '../../define.js';
 import { Apps } from '@/models/index.js';
+import define from '../../define.js';
 
 export const meta = {
 	tags: ['account', 'app'],
diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
index 38d2f9cef..5138e8f7b 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -6,11 +6,11 @@ import { DriveFile } from '@/models/entities/drive-file.js';
 import { Note } from '@/models/entities/note.js';
 import { Channel } from '@/models/entities/channel.js';
 import { MAX_NOTE_TEXT_LENGTH, HOUR } from '@/const.js';
+import { isPureRenote } from '@/misc/renote.js';
 import { noteVisibilities } from '../../../../types.js';
 import { ApiError } from '../../error.js';
 import define from '../../define.js';
 import { getNote } from '../../common/getters.js';
-import { isPureRenote } from '@/misc/renote.js';
 
 export const meta = {
 	tags: ['notes'],
diff --git a/packages/backend/src/server/api/endpoints/notes/delete.ts b/packages/backend/src/server/api/endpoints/notes/delete.ts
index 34d23448e..8aa1af85e 100644
--- a/packages/backend/src/server/api/endpoints/notes/delete.ts
+++ b/packages/backend/src/server/api/endpoints/notes/delete.ts
@@ -1,9 +1,9 @@
 import deleteNote from '@/services/note/delete.js';
 import { Users } from '@/models/index.js';
+import { SECOND, HOUR } from '@/const.js';
 import define from '../../define.js';
 import { getNote } from '../../common/getters.js';
 import { ApiError } from '../../error.js';
-import { SECOND, HOUR } from '@/const.js';
 
 export const meta = {
 	tags: ['notes'],
diff --git a/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts b/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts
index c25d88d1b..e1bb63197 100644
--- a/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts
+++ b/packages/backend/src/server/api/endpoints/notes/reactions/delete.ts
@@ -1,8 +1,8 @@
 import deleteReaction from '@/services/note/reaction/delete.js';
+import { SECOND, HOUR } from '@/const.js';
 import define from '../../../define.js';
 import { getNote } from '../../../common/getters.js';
 import { ApiError } from '../../../error.js';
-import { SECOND, HOUR } from '@/const.js';
 
 export const meta = {
 	tags: ['reactions', 'notes'],
diff --git a/packages/backend/src/server/api/endpoints/notes/search.ts b/packages/backend/src/server/api/endpoints/notes/search.ts
index 4e2cdae80..1d393f796 100644
--- a/packages/backend/src/server/api/endpoints/notes/search.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search.ts
@@ -1,7 +1,7 @@
 import { In } from 'typeorm';
 import { Notes } from '@/models/index.js';
 import config from '@/config/index.js';
-import es from '../../../../db/elasticsearch.js';
+import es from '@/db/elasticsearch.js';
 import define from '../../define.js';
 import { makePaginationQuery } from '../../common/make-pagination-query.js';
 import { generateVisibilityQuery } from '../../common/generate-visibility-query.js';
diff --git a/packages/backend/src/server/api/endpoints/notes/unrenote.ts b/packages/backend/src/server/api/endpoints/notes/unrenote.ts
index 1089a9e37..68fab7889 100644
--- a/packages/backend/src/server/api/endpoints/notes/unrenote.ts
+++ b/packages/backend/src/server/api/endpoints/notes/unrenote.ts
@@ -1,9 +1,9 @@
 import deleteNote from '@/services/note/delete.js';
 import { Notes, Users } from '@/models/index.js';
+import { SECOND, HOUR } from '@/const.js';
 import define from '../../define.js';
 import { getNote } from '../../common/getters.js';
 import { ApiError } from '../../error.js';
-import { SECOND, HOUR } from '@/const.js';
 
 export const meta = {
 	tags: ['notes'],
diff --git a/packages/backend/src/server/api/endpoints/pages/create.ts b/packages/backend/src/server/api/endpoints/pages/create.ts
index e7b78fb38..2257cd736 100644
--- a/packages/backend/src/server/api/endpoints/pages/create.ts
+++ b/packages/backend/src/server/api/endpoints/pages/create.ts
@@ -1,9 +1,9 @@
 import { Pages, DriveFiles } from '@/models/index.js';
 import { genId } from '@/misc/gen-id.js';
 import { Page } from '@/models/entities/page.js';
+import { HOUR } from '@/const.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { HOUR } from '@/const.js';
 
 export const meta = {
 	tags: ['pages'],
diff --git a/packages/backend/src/server/api/endpoints/pages/update.ts b/packages/backend/src/server/api/endpoints/pages/update.ts
index 8230ea09b..9fa6a7fc5 100644
--- a/packages/backend/src/server/api/endpoints/pages/update.ts
+++ b/packages/backend/src/server/api/endpoints/pages/update.ts
@@ -1,8 +1,8 @@
 import { Not } from 'typeorm';
 import { Pages, DriveFiles } from '@/models/index.js';
+import { HOUR } from '@/const.js';
 import define from '../../define.js';
 import { ApiError } from '../../error.js';
-import { HOUR } from '@/const.js';
 
 export const meta = {
 	tags: ['pages'],
diff --git a/packages/backend/src/server/api/endpoints/request-reset-password.ts b/packages/backend/src/server/api/endpoints/request-reset-password.ts
index d76f3254a..3aae59e33 100644
--- a/packages/backend/src/server/api/endpoints/request-reset-password.ts
+++ b/packages/backend/src/server/api/endpoints/request-reset-password.ts
@@ -4,8 +4,8 @@ import config from '@/config/index.js';
 import { Users, UserProfiles, PasswordResetRequests } from '@/models/index.js';
 import { sendEmail } from '@/services/send-email.js';
 import { genId } from '@/misc/gen-id.js';
-import define from '../define.js';
 import { HOUR } from '@/const.js';
+import define from '../define.js';
 
 export const meta = {
 	tags: ['reset password'],
diff --git a/packages/backend/src/server/api/endpoints/stats.ts b/packages/backend/src/server/api/endpoints/stats.ts
index cc94f8bf2..c32e5f45e 100644
--- a/packages/backend/src/server/api/endpoints/stats.ts
+++ b/packages/backend/src/server/api/endpoints/stats.ts
@@ -1,7 +1,7 @@
-import { Instances, NoteReactions, Notes, Users } from '@/models/index.js';
-import define from '../define.js';
-import { } from '@/services/chart/index.js';
 import { IsNull } from 'typeorm';
+import { Instances, NoteReactions, Notes, Users } from '@/models/index.js';
+import { } from '@/services/chart/index.js';
+import define from '../define.js';
 
 export const meta = {
 	requireCredential: false,
diff --git a/packages/backend/src/server/api/endpoints/users/gallery/posts.ts b/packages/backend/src/server/api/endpoints/users/gallery/posts.ts
index ae3b9c743..8184c4ce4 100644
--- a/packages/backend/src/server/api/endpoints/users/gallery/posts.ts
+++ b/packages/backend/src/server/api/endpoints/users/gallery/posts.ts
@@ -1,5 +1,5 @@
-import define from '../../../define.js';
 import { GalleryPosts } from '@/models/index.js';
+import define from '../../../define.js';
 import { makePaginationQuery } from '../../../common/make-pagination-query.js';
 
 export const meta = {
diff --git a/packages/backend/src/server/api/endpoints/users/recommendation.ts b/packages/backend/src/server/api/endpoints/users/recommendation.ts
index d4dc524d9..62449a3b6 100644
--- a/packages/backend/src/server/api/endpoints/users/recommendation.ts
+++ b/packages/backend/src/server/api/endpoints/users/recommendation.ts
@@ -1,8 +1,8 @@
 import { Users, Followings } from '@/models/index.js';
+import { DAY } from '@/const.js';
 import define from '../../define.js';
 import { generateMutedUserQueryForUsers } from '../../common/generate-muted-user-query.js';
 import { generateBlockedUserQuery, generateBlockQueryForUsers } from '../../common/generate-block-query.js';
-import { DAY } from '@/const.js';
 
 export const meta = {
 	tags: ['users'],
diff --git a/packages/backend/src/server/api/limiter.ts b/packages/backend/src/server/api/limiter.ts
index 4915c04be..2b835d446 100644
--- a/packages/backend/src/server/api/limiter.ts
+++ b/packages/backend/src/server/api/limiter.ts
@@ -1,6 +1,6 @@
 import Limiter from 'ratelimiter';
 import Logger from '@/services/logger.js';
-import { redisClient } from '../../db/redis.js';
+import { redisClient } from '@/db/redis.js';
 import { IEndpointMeta } from './endpoints.js';
 
 const logger = new Logger('limiter');
diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts
index 289bd8088..abc070ec5 100644
--- a/packages/backend/src/server/api/openapi/gen-spec.ts
+++ b/packages/backend/src/server/api/openapi/gen-spec.ts
@@ -1,5 +1,5 @@
-import endpoints from '../endpoints.js';
 import config from '@/config/index.js';
+import endpoints from '../endpoints.js';
 import { errors as basicErrors } from './errors.js';
 import { schemas, convertSchemaToOpenApiSchema } from './schemas.js';
 
diff --git a/packages/backend/src/server/api/private/signin.ts b/packages/backend/src/server/api/private/signin.ts
index 79b31764f..a84f458ac 100644
--- a/packages/backend/src/server/api/private/signin.ts
+++ b/packages/backend/src/server/api/private/signin.ts
@@ -1,16 +1,16 @@
+import { randomBytes } from 'node:crypto';
+import { IsNull } from 'typeorm';
 import Koa from 'koa';
 import bcrypt from 'bcryptjs';
 import * as speakeasy from 'speakeasy';
-import signin from '../common/signin.js';
 import config from '@/config/index.js';
 import { Users, Signins, UserProfiles, UserSecurityKeys, AttestationChallenges } from '@/models/index.js';
 import { ILocalUser } from '@/models/entities/user.js';
 import { genId } from '@/misc/gen-id.js';
-import { verifyLogin, hash } from '../2fa.js';
-import { randomBytes } from 'node:crypto';
-import { IsNull } from 'typeorm';
-import { limiter } from '../limiter.js';
 import { getIpHash } from '@/misc/get-ip-hash.js';
+import signin from '../common/signin.js';
+import { verifyLogin, hash } from '../2fa.js';
+import { limiter } from '../limiter.js';
 
 export default async (ctx: Koa.Context) => {
 	ctx.set('Access-Control-Allow-Origin', config.url);
diff --git a/packages/backend/src/server/api/private/signup.ts b/packages/backend/src/server/api/private/signup.ts
index 26f172637..db83d269f 100644
--- a/packages/backend/src/server/api/private/signup.ts
+++ b/packages/backend/src/server/api/private/signup.ts
@@ -4,11 +4,11 @@ import bcrypt from 'bcryptjs';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { verifyHcaptcha, verifyRecaptcha } from '@/misc/captcha.js';
 import { Users, RegistrationTickets, UserPendings } from '@/models/index.js';
-import { signup } from '../common/signup.js';
 import config from '@/config/index.js';
 import { sendEmail } from '@/services/send-email.js';
 import { genId } from '@/misc/gen-id.js';
 import { validateEmailForAccount } from '@/services/validate-email-for-account.js';
+import { signup } from '../common/signup.js';
 
 export default async (ctx: Koa.Context) => {
 	const body = ctx.request.body;
diff --git a/packages/backend/src/server/api/service/discord.ts b/packages/backend/src/server/api/service/discord.ts
index 97cbcbecd..6e23e753e 100644
--- a/packages/backend/src/server/api/service/discord.ts
+++ b/packages/backend/src/server/api/service/discord.ts
@@ -9,7 +9,7 @@ import { publishMainStream } from '@/services/stream.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { Users, UserProfiles } from '@/models/index.js';
 import { ILocalUser } from '@/models/entities/user.js';
-import { redisClient } from '../../../db/redis.js';
+import { redisClient } from '@/db/redis.js';
 import signin from '../common/signin.js';
 
 function getUserToken(ctx: Koa.BaseContext): string | null {
diff --git a/packages/backend/src/server/api/service/github.ts b/packages/backend/src/server/api/service/github.ts
index 04dbd1f7a..5eba108f4 100644
--- a/packages/backend/src/server/api/service/github.ts
+++ b/packages/backend/src/server/api/service/github.ts
@@ -9,7 +9,7 @@ import { publishMainStream } from '@/services/stream.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { Users, UserProfiles } from '@/models/index.js';
 import { ILocalUser } from '@/models/entities/user.js';
-import { redisClient } from '../../../db/redis.js';
+import { redisClient } from '@/db/redis.js';
 import signin from '../common/signin.js';
 
 function getUserToken(ctx: Koa.BaseContext): string | null {
diff --git a/packages/backend/src/server/api/service/twitter.ts b/packages/backend/src/server/api/service/twitter.ts
index 2b4f9f6da..276a3f75b 100644
--- a/packages/backend/src/server/api/service/twitter.ts
+++ b/packages/backend/src/server/api/service/twitter.ts
@@ -8,8 +8,8 @@ import config from '@/config/index.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { Users, UserProfiles } from '@/models/index.js';
 import { ILocalUser } from '@/models/entities/user.js';
+import { redisClient } from '@/db/redis.js';
 import signin from '../common/signin.js';
-import { redisClient } from '../../../db/redis.js';
 
 function getUserToken(ctx: Koa.BaseContext): string | null {
 	return ((ctx.headers['cookie'] || '').match(/igi=(\w+)/) || [null, null])[1];
diff --git a/packages/backend/src/server/api/stream/channel.ts b/packages/backend/src/server/api/stream/channel.ts
index c9cffd2d3..fd6924dfe 100644
--- a/packages/backend/src/server/api/stream/channel.ts
+++ b/packages/backend/src/server/api/stream/channel.ts
@@ -1,8 +1,8 @@
-import Connection from '.';
 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 '.';
 
 /**
  * Stream channel
diff --git a/packages/backend/src/server/api/stream/channels/antenna.ts b/packages/backend/src/server/api/stream/channels/antenna.ts
index a9a98e904..2b5deeec0 100644
--- a/packages/backend/src/server/api/stream/channels/antenna.ts
+++ b/packages/backend/src/server/api/stream/channels/antenna.ts
@@ -1,8 +1,8 @@
-import Channel from '../channel.js';
 import { Notes } from '@/models/index.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
-import { StreamMessages } from '../types.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
+import { StreamMessages } from '../types.js';
+import Channel from '../channel.js';
 
 export default class extends Channel {
 	public readonly chName = 'antenna';
diff --git a/packages/backend/src/server/api/stream/channels/channel.ts b/packages/backend/src/server/api/stream/channels/channel.ts
index 5a26ea7bf..6bcaeb1be 100644
--- a/packages/backend/src/server/api/stream/channels/channel.ts
+++ b/packages/backend/src/server/api/stream/channels/channel.ts
@@ -1,9 +1,9 @@
-import Channel from '../channel.js';
 import { Users } from '@/models/index.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
 import { User } from '@/models/entities/user.js';
-import { StreamMessages } from '../types.js';
 import { Packed } from '@/misc/schema.js';
+import { StreamMessages } from '../types.js';
+import Channel from '../channel.js';
 
 export default class extends Channel {
 	public readonly chName = 'channel';
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 391851ecd..1e163cf52 100644
--- a/packages/backend/src/server/api/stream/channels/global-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts
@@ -1,9 +1,9 @@
-import Channel from '../channel.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { checkWordMute } from '@/misc/check-word-mute.js';
 import { isInstanceMuted } from '@/misc/is-instance-muted.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
 import { Packed } from '@/misc/schema.js';
+import Channel from '../channel.js';
 
 export default class extends Channel {
 	public readonly chName = 'globalTimeline';
diff --git a/packages/backend/src/server/api/stream/channels/hashtag.ts b/packages/backend/src/server/api/stream/channels/hashtag.ts
index f9f7ae410..8eab28298 100644
--- a/packages/backend/src/server/api/stream/channels/hashtag.ts
+++ b/packages/backend/src/server/api/stream/channels/hashtag.ts
@@ -1,7 +1,7 @@
-import Channel from '../channel.js';
 import { normalizeForSearch } from '@/misc/normalize-for-search.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
 import { Packed } from '@/misc/schema.js';
+import Channel from '../channel.js';
 
 export default class extends Channel {
 	public readonly chName = 'hashtag';
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 9f5188547..e6885dabf 100644
--- a/packages/backend/src/server/api/stream/channels/home-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -1,8 +1,8 @@
-import Channel from '../channel.js';
 import { checkWordMute } from '@/misc/check-word-mute.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
 import { isInstanceMuted } from '@/misc/is-instance-muted.js';
 import { Packed } from '@/misc/schema.js';
+import Channel from '../channel.js';
 
 export default class extends Channel {
 	public readonly chName = 'homeTimeline';
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 e73136b8e..3fd47173c 100644
--- a/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/hybrid-timeline.ts
@@ -1,9 +1,9 @@
-import Channel from '../channel.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { checkWordMute } from '@/misc/check-word-mute.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
 import { isInstanceMuted } from '@/misc/is-instance-muted.js';
 import { Packed } from '@/misc/schema.js';
+import Channel from '../channel.js';
 
 export default class extends Channel {
 	public readonly chName = 'hybridTimeline';
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 729de6d4a..5c205318b 100644
--- a/packages/backend/src/server/api/stream/channels/local-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/local-timeline.ts
@@ -1,8 +1,8 @@
-import Channel from '../channel.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { checkWordMute } from '@/misc/check-word-mute.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
 import { Packed } from '@/misc/schema.js';
+import Channel from '../channel.js';
 
 export default class extends Channel {
 	public readonly chName = 'localTimeline';
diff --git a/packages/backend/src/server/api/stream/channels/main.ts b/packages/backend/src/server/api/stream/channels/main.ts
index 7f42263db..70da75e04 100644
--- a/packages/backend/src/server/api/stream/channels/main.ts
+++ b/packages/backend/src/server/api/stream/channels/main.ts
@@ -1,5 +1,5 @@
-import Channel from '../channel.js';
 import { isInstanceMuted, isUserFromMutedInstance } from '@/misc/is-instance-muted.js';
+import Channel from '../channel.js';
 
 export default class extends Channel {
 	public readonly chName = 'main';
diff --git a/packages/backend/src/server/api/stream/channels/messaging.ts b/packages/backend/src/server/api/stream/channels/messaging.ts
index 877d44c38..ef3ac2ab8 100644
--- a/packages/backend/src/server/api/stream/channels/messaging.ts
+++ b/packages/backend/src/server/api/stream/channels/messaging.ts
@@ -1,8 +1,8 @@
-import { readUserMessagingMessage, readGroupMessagingMessage, deliverReadActivity } from '../../common/read-messaging-message.js';
-import Channel from '../channel.js';
 import { UserGroupJoinings, Users, MessagingMessages } from '@/models/index.js';
 import { User, ILocalUser, IRemoteUser } from '@/models/entities/user.js';
 import { UserGroup } from '@/models/entities/user-group.js';
+import { readUserMessagingMessage, readGroupMessagingMessage, deliverReadActivity } from '../../common/read-messaging-message.js';
+import Channel from '../channel.js';
 import { StreamMessages } from '../types.js';
 
 export default class extends Channel {
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 9b2476148..be061f68d 100644
--- a/packages/backend/src/server/api/stream/channels/user-list.ts
+++ b/packages/backend/src/server/api/stream/channels/user-list.ts
@@ -1,8 +1,8 @@
-import Channel from '../channel.js';
 import { UserListJoinings, UserLists } from '@/models/index.js';
 import { User } from '@/models/entities/user.js';
 import { isUserRelated } from '@/misc/is-user-related.js';
 import { Packed } from '@/misc/schema.js';
+import Channel from '../channel.js';
 
 export default class extends Channel {
 	public readonly chName = 'userList';
diff --git a/packages/backend/src/server/api/streaming.ts b/packages/backend/src/server/api/streaming.ts
index cfe209d09..6d430a938 100644
--- a/packages/backend/src/server/api/streaming.ts
+++ b/packages/backend/src/server/api/streaming.ts
@@ -1,12 +1,12 @@
 import * as http from 'node:http';
+import { EventEmitter } from 'events';
+import { ParsedUrlQuery } from 'querystring';
 import * as websocket from 'websocket';
 
-import MainStreamConnection from './stream/index.js';
-import { ParsedUrlQuery } from 'querystring';
-import authenticate from './authenticate.js';
-import { EventEmitter } from 'events';
-import { subsdcriber as redisClient } from '../../db/redis.js';
+import { subsdcriber as redisClient } from '@/db/redis.js';
 import { Users } from '@/models/index.js';
+import MainStreamConnection from './stream/index.js';
+import authenticate from './authenticate.js';
 
 export const initializeStreamingServer = (server: http.Server) => {
 	// Init websocket server
diff --git a/packages/backend/src/server/file/send-drive-file.ts b/packages/backend/src/server/file/send-drive-file.ts
index a57bbf6b2..0ae16d94c 100644
--- a/packages/backend/src/server/file/send-drive-file.ts
+++ b/packages/backend/src/server/file/send-drive-file.ts
@@ -4,7 +4,6 @@ import { dirname } from 'node:path';
 import Koa from 'koa';
 import send from 'koa-send';
 import rename from 'rename';
-import { serverLogger } from '../index.js';
 import { contentDisposition } from '@/misc/content-disposition.js';
 import { DriveFiles } from '@/models/index.js';
 import { InternalStorage } from '@/services/drive/internal-storage.js';
@@ -15,6 +14,7 @@ import { convertToWebp, convertToPng } from '@/services/drive/image-processor.js
 import { GenerateVideoThumbnail } from '@/services/drive/generate-video-thumbnail.js';
 import { StatusError } from '@/misc/fetch.js';
 import { FILE_TYPE_BROWSERSAFE } from '@/const.js';
+import { serverLogger } from '../index.js';
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
diff --git a/packages/backend/src/server/nodeinfo.ts b/packages/backend/src/server/nodeinfo.ts
index 764718f30..a4a388ed6 100644
--- a/packages/backend/src/server/nodeinfo.ts
+++ b/packages/backend/src/server/nodeinfo.ts
@@ -1,8 +1,8 @@
 import Router from '@koa/router';
+import { IsNull, MoreThan } from 'typeorm';
 import config from '@/config/index.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
 import { Users, Notes } from '@/models/index.js';
-import { IsNull, MoreThan } from 'typeorm';
 import { MAX_NOTE_TEXT_LENGTH } from '@/const.js';
 import { Cache } from '@/misc/cache.js';
 
diff --git a/packages/backend/src/server/proxy/proxy-media.ts b/packages/backend/src/server/proxy/proxy-media.ts
index ca036e8fd..18bcd0ace 100644
--- a/packages/backend/src/server/proxy/proxy-media.ts
+++ b/packages/backend/src/server/proxy/proxy-media.ts
@@ -7,8 +7,8 @@ import { downloadUrl } from '@/misc/download-url.js';
 import { detectType } from '@/misc/get-file-info.js';
 import { StatusError } from '@/misc/fetch.js';
 import { FILE_TYPE_BROWSERSAFE } from '@/const.js';
-import { serverLogger } from '../index.js';
 import { isMimeImage } from '@/misc/is-mime-image.js';
+import { serverLogger } from '../index.js';
 
 // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 export async function proxyMedia(ctx: Koa.Context) {
diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index b3de4d4db..09758465b 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -22,11 +22,11 @@ import { Users, Notes, UserProfiles, Pages, Channels, Clips, GalleryPosts } from
 import * as Acct from '@/misc/acct.js';
 import { getNoteSummary } from '@/misc/get-note-summary.js';
 import { queues } from '@/queue/queues.js';
+import { MINUTE, DAY } from '@/const.js';
 import { genOpenapiSpec } from '../api/openapi/gen-spec.js';
 import { urlPreviewHandler } from './url-preview.js';
 import { manifestHandler } from './manifest.js';
 import packFeed from './feed.js';
-import { MINUTE, DAY } from '@/const.js';
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
diff --git a/packages/backend/src/server/well-known.ts b/packages/backend/src/server/well-known.ts
index 1d094f2ed..91131560e 100644
--- a/packages/backend/src/server/well-known.ts
+++ b/packages/backend/src/server/well-known.ts
@@ -1,12 +1,12 @@
 import Router from '@koa/router';
+import { FindOptionsWhere, IsNull } from 'typeorm';
 
 import config from '@/config/index.js';
 import * as Acct from '@/misc/acct.js';
-import { links } from './nodeinfo.js';
 import { escapeAttribute, escapeValue } from '@/prelude/xml.js';
 import { Users } from '@/models/index.js';
 import { User } from '@/models/entities/user.js';
-import { FindOptionsWhere, IsNull } from 'typeorm';
+import { links } from './nodeinfo.js';
 
 // Init router
 const router = new Router();
diff --git a/packages/backend/src/services/blocking/create.ts b/packages/backend/src/services/blocking/create.ts
index 9767b2d10..8665f5d6f 100644
--- a/packages/backend/src/services/blocking/create.ts
+++ b/packages/backend/src/services/blocking/create.ts
@@ -3,7 +3,7 @@ import { renderActivity } from '@/remote/activitypub/renderer/index.js';
 import renderFollow from '@/remote/activitypub/renderer/follow.js';
 import renderUndo from '@/remote/activitypub/renderer/undo.js';
 import { renderBlock } from '@/remote/activitypub/renderer/block.js';
-import { deliver } from '@/queue/index.js';
+import { deliver, webhookDeliver } from '@/queue/index.js';
 import renderReject from '@/remote/activitypub/renderer/reject.js';
 import { Blocking } from '@/models/entities/blocking.js';
 import { User } from '@/models/entities/user.js';
@@ -11,7 +11,6 @@ import { Blockings, Users, FollowRequests, Followings, UserListJoinings, UserLis
 import { perUserFollowingChart } from '@/services/chart/index.js';
 import { genId } from '@/misc/gen-id.js';
 import { getActiveWebhooks } from '@/misc/webhook-cache.js';
-import { webhookDeliver } from '@/queue/index.js';
 
 export default async function(blocker: User, blockee: User) {
 	await Promise.all([
diff --git a/packages/backend/src/services/blocking/delete.ts b/packages/backend/src/services/blocking/delete.ts
index 62fb1d07f..82f92f05a 100644
--- a/packages/backend/src/services/blocking/delete.ts
+++ b/packages/backend/src/services/blocking/delete.ts
@@ -2,9 +2,9 @@ import { renderActivity } from '@/remote/activitypub/renderer/index.js';
 import { renderBlock } from '@/remote/activitypub/renderer/block.js';
 import renderUndo from '@/remote/activitypub/renderer/undo.js';
 import { deliver } from '@/queue/index.js';
-import Logger from '../logger.js';
 import { CacheableUser } from '@/models/entities/user.js';
 import { Blockings, Users } from '@/models/index.js';
+import Logger from '../logger.js';
 
 const logger = new Logger('blocking/delete');
 
diff --git a/packages/backend/src/services/chart/charts/active-users.ts b/packages/backend/src/services/chart/charts/active-users.ts
index fb0160500..81b74a1c7 100644
--- a/packages/backend/src/services/chart/charts/active-users.ts
+++ b/packages/backend/src/services/chart/charts/active-users.ts
@@ -1,5 +1,5 @@
-import Chart, { KVs } from '../core.js';
 import { User } from '@/models/entities/user.js';
+import Chart, { KVs } from '../core.js';
 import { name, schema } from './entities/active-users.js';
 
 const week = 1000 * 60 * 60 * 24 * 7;
diff --git a/packages/backend/src/services/chart/charts/drive.ts b/packages/backend/src/services/chart/charts/drive.ts
index 494027209..5e6e901b7 100644
--- a/packages/backend/src/services/chart/charts/drive.ts
+++ b/packages/backend/src/services/chart/charts/drive.ts
@@ -1,5 +1,5 @@
-import Chart, { KVs } from '../core.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
+import Chart, { KVs } from '../core.js';
 import { name, schema } from './entities/drive.js';
 
 /**
diff --git a/packages/backend/src/services/chart/charts/federation.ts b/packages/backend/src/services/chart/charts/federation.ts
index 08be08da3..3bc62f4cd 100644
--- a/packages/backend/src/services/chart/charts/federation.ts
+++ b/packages/backend/src/services/chart/charts/federation.ts
@@ -1,7 +1,7 @@
-import Chart, { KVs } from '../core.js';
 import { Followings, Instances } from '@/models/index.js';
-import { name, schema } from './entities/federation.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
+import Chart, { KVs } from '../core.js';
+import { name, schema } from './entities/federation.js';
 
 /**
  * フェデレーションに関するチャート
diff --git a/packages/backend/src/services/chart/charts/hashtag.ts b/packages/backend/src/services/chart/charts/hashtag.ts
index 31f7fa95d..cc83f4b9f 100644
--- a/packages/backend/src/services/chart/charts/hashtag.ts
+++ b/packages/backend/src/services/chart/charts/hashtag.ts
@@ -1,6 +1,6 @@
-import Chart, { KVs } from '../core.js';
 import { User } from '@/models/entities/user.js';
 import { Users } from '@/models/index.js';
+import Chart, { KVs } from '../core.js';
 import { name, schema } from './entities/hashtag.js';
 
 /**
diff --git a/packages/backend/src/services/chart/charts/instance.ts b/packages/backend/src/services/chart/charts/instance.ts
index fe29ba522..90538fb8b 100644
--- a/packages/backend/src/services/chart/charts/instance.ts
+++ b/packages/backend/src/services/chart/charts/instance.ts
@@ -1,8 +1,8 @@
-import Chart, { KVs } from '../core.js';
 import { DriveFiles, Followings, Users, Notes } from '@/models/index.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { Note } from '@/models/entities/note.js';
 import { toPuny } from '@/misc/convert-host.js';
+import Chart, { KVs } from '../core.js';
 import { name, schema } from './entities/instance.js';
 
 /**
diff --git a/packages/backend/src/services/chart/charts/notes.ts b/packages/backend/src/services/chart/charts/notes.ts
index bb14b62f3..64a1cdfe0 100644
--- a/packages/backend/src/services/chart/charts/notes.ts
+++ b/packages/backend/src/services/chart/charts/notes.ts
@@ -1,7 +1,7 @@
-import Chart, { KVs } from '../core.js';
-import { Notes } from '@/models/index.js';
 import { Not, IsNull } from 'typeorm';
+import { Notes } from '@/models/index.js';
 import { Note } from '@/models/entities/note.js';
+import Chart, { KVs } from '../core.js';
 import { name, schema } from './entities/notes.js';
 
 /**
diff --git a/packages/backend/src/services/chart/charts/per-user-drive.ts b/packages/backend/src/services/chart/charts/per-user-drive.ts
index 5f75dc688..db566c81c 100644
--- a/packages/backend/src/services/chart/charts/per-user-drive.ts
+++ b/packages/backend/src/services/chart/charts/per-user-drive.ts
@@ -1,6 +1,6 @@
-import Chart, { KVs } from '../core.js';
 import { DriveFiles } from '@/models/index.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
+import Chart, { KVs } from '../core.js';
 import { name, schema } from './entities/per-user-drive.js';
 
 /**
diff --git a/packages/backend/src/services/chart/charts/per-user-following.ts b/packages/backend/src/services/chart/charts/per-user-following.ts
index 02b149f52..3d77a4f64 100644
--- a/packages/backend/src/services/chart/charts/per-user-following.ts
+++ b/packages/backend/src/services/chart/charts/per-user-following.ts
@@ -1,7 +1,7 @@
-import Chart, { KVs } from '../core.js';
-import { Followings, Users } from '@/models/index.js';
 import { Not, IsNull } from 'typeorm';
+import { Followings, Users } from '@/models/index.js';
 import { User } from '@/models/entities/user.js';
+import Chart, { KVs } from '../core.js';
 import { name, schema } from './entities/per-user-following.js';
 
 /**
diff --git a/packages/backend/src/services/chart/charts/per-user-notes.ts b/packages/backend/src/services/chart/charts/per-user-notes.ts
index b9191dd08..e67c91693 100644
--- a/packages/backend/src/services/chart/charts/per-user-notes.ts
+++ b/packages/backend/src/services/chart/charts/per-user-notes.ts
@@ -1,7 +1,7 @@
-import Chart, { KVs } from '../core.js';
 import { User } from '@/models/entities/user.js';
 import { Notes } from '@/models/index.js';
 import { Note } from '@/models/entities/note.js';
+import Chart, { KVs } from '../core.js';
 import { name, schema } from './entities/per-user-notes.js';
 
 /**
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 3a830e118..6e9c12f87 100644
--- a/packages/backend/src/services/chart/charts/per-user-reactions.ts
+++ b/packages/backend/src/services/chart/charts/per-user-reactions.ts
@@ -1,7 +1,7 @@
-import Chart, { KVs } from '../core.js';
 import { User } from '@/models/entities/user.js';
 import { Note } from '@/models/entities/note.js';
 import { Users } from '@/models/index.js';
+import Chart, { KVs } from '../core.js';
 import { name, schema } from './entities/per-user-reactions.js';
 
 /**
diff --git a/packages/backend/src/services/chart/charts/users.ts b/packages/backend/src/services/chart/charts/users.ts
index acb16ead8..4888571d2 100644
--- a/packages/backend/src/services/chart/charts/users.ts
+++ b/packages/backend/src/services/chart/charts/users.ts
@@ -1,7 +1,7 @@
-import Chart, { KVs } from '../core.js';
-import { Users } from '@/models/index.js';
 import { Not, IsNull } from 'typeorm';
+import { Users } from '@/models/index.js';
 import { User } from '@/models/entities/user.js';
+import Chart, { KVs } from '../core.js';
 import { name, schema } from './entities/users.js';
 
 /**
diff --git a/packages/backend/src/services/chart/core.ts b/packages/backend/src/services/chart/core.ts
index 2960bac8f..862de8e5d 100644
--- a/packages/backend/src/services/chart/core.ts
+++ b/packages/backend/src/services/chart/core.ts
@@ -5,11 +5,11 @@
  */
 
 import * as nestedProperty from 'nested-property';
-import Logger from '../logger.js';
 import { EntitySchema, Repository, LessThan, Between } from 'typeorm';
 import { dateUTC, isTimeSame, isTimeBefore, subtractTime, addTime } from '@/prelude/time.js';
 import { getChartInsertLock } from '@/misc/app-lock.js';
 import { db } from '@/db/postgre.js';
+import Logger from '../logger.js';
 
 const logger = new Logger('chart', 'white', process.env.NODE_ENV !== 'test');
 
diff --git a/packages/backend/src/services/create-system-user.ts b/packages/backend/src/services/create-system-user.ts
index bae91ec4c..4ca5f5fc4 100644
--- a/packages/backend/src/services/create-system-user.ts
+++ b/packages/backend/src/services/create-system-user.ts
@@ -1,14 +1,14 @@
 import bcrypt from 'bcryptjs';
 import { v4 as uuid } from 'uuid';
-import generateNativeUserToken from '../server/api/common/generate-native-user-token.js';
+import { IsNull } from 'typeorm';
 import { genRsaKeyPair } from '@/misc/gen-key-pair.js';
 import { User } from '@/models/entities/user.js';
 import { UserProfile } from '@/models/entities/user-profile.js';
-import { IsNull } from 'typeorm';
 import { genId } from '@/misc/gen-id.js';
 import { UserKeypair } from '@/models/entities/user-keypair.js';
 import { UsedUsername } from '@/models/entities/used-username.js';
 import { db } from '@/db/postgre.js';
+import generateNativeUserToken from '../server/api/common/generate-native-user-token.js';
 
 export async function createSystemUser(username: string) {
 	const password = uuid();
diff --git a/packages/backend/src/services/drive/add-file.ts b/packages/backend/src/services/drive/add-file.ts
index 4566c0fbf..f7b784188 100644
--- a/packages/backend/src/services/drive/add-file.ts
+++ b/packages/backend/src/services/drive/add-file.ts
@@ -1,27 +1,27 @@
 import * as fs from 'node:fs';
 
 import { v4 as uuid } from 'uuid';
+import S3 from 'aws-sdk/clients/s3.js';
+import { IsNull } from 'typeorm';
+import sharp from 'sharp';
 
+import { FILE_TYPE_BROWSERSAFE } from '@/const.js';
 import { publishMainStream, publishDriveStream } from '@/services/stream.js';
-import { deleteFile } from './delete-file.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
-import { GenerateVideoThumbnail } from './generate-video-thumbnail.js';
-import { driveLogger } from './logger.js';
-import { IImage, convertSharpToJpeg, convertSharpToWebp, convertSharpToPng } from './image-processor.js';
 import { contentDisposition } from '@/misc/content-disposition.js';
 import { getFileInfo } from '@/misc/get-file-info.js';
 import { DriveFiles, DriveFolders, Users, UserProfiles } from '@/models/index.js';
-import { InternalStorage } from './internal-storage.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { IRemoteUser, User } from '@/models/entities/user.js';
 import { driveChart, perUserDriveChart, instanceChart } from '@/services/chart/index.js';
 import { genId } from '@/misc/gen-id.js';
 import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js';
-import S3 from 'aws-sdk/clients/s3.js';
+import { deleteFile } from './delete-file.js';
+import { GenerateVideoThumbnail } from './generate-video-thumbnail.js';
+import { driveLogger } from './logger.js';
+import { IImage, convertSharpToJpeg, convertSharpToWebp, convertSharpToPng } from './image-processor.js';
+import { InternalStorage } from './internal-storage.js';
 import { getS3 } from './s3.js';
-import sharp from 'sharp';
-import { FILE_TYPE_BROWSERSAFE } from '@/const.js';
-import { IsNull } from 'typeorm';
 
 const logger = driveLogger.createSubLogger('register', 'yellow');
 
diff --git a/packages/backend/src/services/drive/delete-file.ts b/packages/backend/src/services/drive/delete-file.ts
index 75faf17ae..c4f7dba1c 100644
--- a/packages/backend/src/services/drive/delete-file.ts
+++ b/packages/backend/src/services/drive/delete-file.ts
@@ -1,11 +1,11 @@
+import { v4 as uuid } from 'uuid';
 import { DriveFile } from '@/models/entities/drive-file.js';
-import { InternalStorage } from './internal-storage.js';
 import { DriveFiles } from '@/models/index.js';
 import { driveChart, perUserDriveChart, instanceChart } from '@/services/chart/index.js';
 import { createDeleteObjectStorageFileJob } from '@/queue/index.js';
 import { fetchMeta } from '@/misc/fetch-meta.js';
+import { InternalStorage } from './internal-storage.js';
 import { getS3 } from './s3.js';
-import { v4 as uuid } from 'uuid';
 
 export async function deleteFile(file: DriveFile, isExpired = false) {
 	if (file.storedInternal) {
diff --git a/packages/backend/src/services/drive/generate-video-thumbnail.ts b/packages/backend/src/services/drive/generate-video-thumbnail.ts
index a0b96c1a1..116ca7ff6 100644
--- a/packages/backend/src/services/drive/generate-video-thumbnail.ts
+++ b/packages/backend/src/services/drive/generate-video-thumbnail.ts
@@ -1,6 +1,6 @@
+import FFmpeg from 'fluent-ffmpeg';
 import { createTempDir } from '@/misc/create-temp.js';
 import { IImage, convertToJpeg } from './image-processor.js';
-import FFmpeg from 'fluent-ffmpeg';
 
 export async function GenerateVideoThumbnail(source: string): Promise<IImage> {
 	const [dir, cleanup] = await createTempDir();
diff --git a/packages/backend/src/services/drive/upload-from-url.ts b/packages/backend/src/services/drive/upload-from-url.ts
index 001fc49ee..252ba0b7e 100644
--- a/packages/backend/src/services/drive/upload-from-url.ts
+++ b/packages/backend/src/services/drive/upload-from-url.ts
@@ -1,12 +1,12 @@
 import { URL } from 'node:url';
-import { addFile } from './add-file.js';
 import { User } from '@/models/entities/user.js';
-import { driveLogger } from './logger.js';
 import { createTemp } from '@/misc/create-temp.js';
 import { downloadUrl } from '@/misc/download-url.js';
 import { DriveFolder } from '@/models/entities/drive-folder.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { DriveFiles } from '@/models/index.js';
+import { addFile } from './add-file.js';
+import { driveLogger } from './logger.js';
 
 const logger = driveLogger.createSubLogger('downloader');
 
diff --git a/packages/backend/src/services/fetch-instance-metadata.ts b/packages/backend/src/services/fetch-instance-metadata.ts
index ee1245132..cd8cc7f33 100644
--- a/packages/backend/src/services/fetch-instance-metadata.ts
+++ b/packages/backend/src/services/fetch-instance-metadata.ts
@@ -1,3 +1,4 @@
+import { URL } from 'node:url';
 import { DOMWindow, JSDOM } from 'jsdom';
 import fetch from 'node-fetch';
 import tinycolor from 'tinycolor2';
@@ -6,7 +7,6 @@ import { Instance } from '@/models/entities/instance.js';
 import { Instances } from '@/models/index.js';
 import { getFetchInstanceMetadataLock } from '@/misc/app-lock.js';
 import Logger from './logger.js';
-import { URL } from 'node:url';
 
 const logger = new Logger('metadata', 'cyan');
 
diff --git a/packages/backend/src/services/following/create.ts b/packages/backend/src/services/following/create.ts
index 16129f780..b866c8383 100644
--- a/packages/backend/src/services/following/create.ts
+++ b/packages/backend/src/services/following/create.ts
@@ -3,20 +3,19 @@ import { renderActivity } from '@/remote/activitypub/renderer/index.js';
 import renderFollow from '@/remote/activitypub/renderer/follow.js';
 import renderAccept from '@/remote/activitypub/renderer/accept.js';
 import renderReject from '@/remote/activitypub/renderer/reject.js';
-import { deliver } from '@/queue/index.js';
-import createFollowRequest from './requests/create.js';
-import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc.js';
-import Logger from '../logger.js';
+import { deliver, webhookDeliver } from '@/queue/index.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
 import { User } from '@/models/entities/user.js';
 import { Followings, Users, FollowRequests, Blockings, Instances, UserProfiles } from '@/models/index.js';
 import { instanceChart, perUserFollowingChart } from '@/services/chart/index.js';
 import { genId } from '@/misc/gen-id.js';
-import { createNotification } from '../create-notification.js';
 import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js';
 import { Packed } from '@/misc/schema.js';
 import { getActiveWebhooks } from '@/misc/webhook-cache.js';
-import { webhookDeliver } from '@/queue/index.js';
+import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc.js';
+import Logger from '../logger.js';
+import { createNotification } from '../create-notification.js';
+import createFollowRequest from './requests/create.js';
 
 const logger = new Logger('following/create');
 
diff --git a/packages/backend/src/services/following/delete.ts b/packages/backend/src/services/following/delete.ts
index 91b5a3d61..b99ff73e2 100644
--- a/packages/backend/src/services/following/delete.ts
+++ b/packages/backend/src/services/following/delete.ts
@@ -4,12 +4,12 @@ import renderFollow from '@/remote/activitypub/renderer/follow.js';
 import renderUndo from '@/remote/activitypub/renderer/undo.js';
 import renderReject from '@/remote/activitypub/renderer/reject.js';
 import { deliver, webhookDeliver } from '@/queue/index.js';
-import Logger from '../logger.js';
-import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc.js';
-import { User } from '@/models/entities/user.js';
 import { Followings, Users, Instances } from '@/models/index.js';
 import { instanceChart, perUserFollowingChart } from '@/services/chart/index.js';
 import { getActiveWebhooks } from '@/misc/webhook-cache.js';
+import { User } from '@/models/entities/user.js';
+import Logger from '../logger.js';
+import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc.js';
 
 const logger = new Logger('following/delete');
 
diff --git a/packages/backend/src/services/following/reject.ts b/packages/backend/src/services/following/reject.ts
index 5d0f89dba..21e472af1 100644
--- a/packages/backend/src/services/following/reject.ts
+++ b/packages/backend/src/services/following/reject.ts
@@ -5,8 +5,8 @@ import { deliver, webhookDeliver } from '@/queue/index.js';
 import { publishMainStream, publishUserEvent } from '@/services/stream.js';
 import { ILocalUser, IRemoteUser } from '@/models/entities/user.js';
 import { Users, FollowRequests, Followings } from '@/models/index.js';
-import { decrementFollowing } from './delete.js';
 import { getActiveWebhooks } from '@/misc/webhook-cache.js';
+import { decrementFollowing } from './delete.js';
 
 type Local = ILocalUser | {
 	id: ILocalUser['id'];
diff --git a/packages/backend/src/services/following/requests/accept-all.ts b/packages/backend/src/services/following/requests/accept-all.ts
index 5fbb549e0..2a1344d65 100644
--- a/packages/backend/src/services/following/requests/accept-all.ts
+++ b/packages/backend/src/services/following/requests/accept-all.ts
@@ -1,6 +1,6 @@
-import accept from './accept.js';
 import { User } from '@/models/entities/user.js';
 import { FollowRequests, Users } from '@/models/index.js';
+import accept from './accept.js';
 
 /**
  * 指定したユーザー宛てのフォローリクエストをすべて承認
diff --git a/packages/backend/src/services/following/requests/accept.ts b/packages/backend/src/services/following/requests/accept.ts
index 15427764f..66abb0646 100644
--- a/packages/backend/src/services/following/requests/accept.ts
+++ b/packages/backend/src/services/following/requests/accept.ts
@@ -3,10 +3,10 @@ import renderFollow from '@/remote/activitypub/renderer/follow.js';
 import renderAccept from '@/remote/activitypub/renderer/accept.js';
 import { deliver } from '@/queue/index.js';
 import { publishMainStream } from '@/services/stream.js';
-import { insertFollowingDoc } from '../create.js';
 import { User, CacheableUser } from '@/models/entities/user.js';
 import { FollowRequests, Users } from '@/models/index.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
+import { insertFollowingDoc } from '../create.js';
 
 export default async function(followee: { id: User['id']; host: User['host']; uri: User['host']; inbox: User['inbox']; sharedInbox: User['sharedInbox']; }, follower: CacheableUser) {
 	const request = await FollowRequests.findOneBy({
diff --git a/packages/backend/src/services/instance-actor.ts b/packages/backend/src/services/instance-actor.ts
index bddd0355a..6d46fc24c 100644
--- a/packages/backend/src/services/instance-actor.ts
+++ b/packages/backend/src/services/instance-actor.ts
@@ -1,8 +1,8 @@
-import { createSystemUser } from './create-system-user.js';
+import { IsNull } from 'typeorm';
 import { ILocalUser } from '@/models/entities/user.js';
 import { Users } from '@/models/index.js';
 import { Cache } from '@/misc/cache.js';
-import { IsNull } from 'typeorm';
+import { createSystemUser } from './create-system-user.js';
 
 const ACTOR_USERNAME = 'instance.actor' as const;
 
diff --git a/packages/backend/src/services/logger.ts b/packages/backend/src/services/logger.ts
index 89d6d5720..2d30c757b 100644
--- a/packages/backend/src/services/logger.ts
+++ b/packages/backend/src/services/logger.ts
@@ -2,10 +2,9 @@ import cluster from 'node:cluster';
 import chalk from 'chalk';
 import { default as convertColor } from 'color-convert';
 import { format as dateFormat } from 'date-fns';
-import { envOption } from '../env.js';
-import config from '@/config/index.js';
-
 import * as SyslogPro from 'syslog-pro';
+import config from '@/config/index.js';
+import { envOption } from '../env.js';
 
 type Domain = {
 	name: string;
diff --git a/packages/backend/src/services/messages/create.ts b/packages/backend/src/services/messages/create.ts
index e6b320492..4c76bee5e 100644
--- a/packages/backend/src/services/messages/create.ts
+++ b/packages/backend/src/services/messages/create.ts
@@ -1,3 +1,4 @@
+import { Not } from 'typeorm';
 import { CacheableUser, User } from '@/models/entities/user.js';
 import { UserGroup } from '@/models/entities/user-group.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
@@ -6,7 +7,6 @@ import { genId } from '@/misc/gen-id.js';
 import { MessagingMessage } from '@/models/entities/messaging-message.js';
 import { publishMessagingStream, publishMessagingIndexStream, publishMainStream, publishGroupMessagingStream } from '@/services/stream.js';
 import { pushNotification } from '@/services/push-notification.js';
-import { Not } from 'typeorm';
 import { Note } from '@/models/entities/note.js';
 import renderNote from '@/remote/activitypub/renderer/note.js';
 import renderCreate from '@/remote/activitypub/renderer/create.js';
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 51fcac0b9..5b60847fd 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -1,5 +1,7 @@
+import { Not, In } from 'typeorm';
 import * as mfm from 'mfm-js';
-import es from '../../db/elasticsearch.js';
+import { db } from '@/db/postgre.js';
+import es from '@/db/elasticsearch.js';
 import { publishMainStream, publishNotesStream } from '@/services/stream.js';
 import DeliverManager from '@/remote/activitypub/deliver-manager.js';
 import renderNote from '@/remote/activitypub/renderer/note.js';
@@ -8,10 +10,8 @@ import renderAnnounce from '@/remote/activitypub/renderer/announce.js';
 import { renderActivity } from '@/remote/activitypub/renderer/index.js';
 import { resolveUser } from '@/remote/resolve-user.js';
 import config from '@/config/index.js';
-import { updateHashtags } from '../update-hashtag.js';
 import { concat } from '@/prelude/array.js';
 import { insertNoteUnread } from '@/services/note/unread.js';
-import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc.js';
 import { extractMentions } from '@/misc/extract-mentions.js';
 import { extractCustomEmojisFromMfm } from '@/misc/extract-custom-emojis-from-mfm.js';
 import { extractHashtags } from '@/misc/extract-hashtags.js';
@@ -19,18 +19,14 @@ import { Note, IMentionedRemoteUsers } from '@/models/entities/note.js';
 import { Mutings, Users, NoteWatchings, Notes, Instances, UserProfiles, MutedNotes, Channels, ChannelFollowings, NoteThreadMutings } from '@/models/index.js';
 import { DriveFile } from '@/models/entities/drive-file.js';
 import { App } from '@/models/entities/app.js';
-import { Not, In } from 'typeorm';
 import { User, ILocalUser, IRemoteUser } from '@/models/entities/user.js';
 import { genId } from '@/misc/gen-id.js';
 import { notesChart, perUserNotesChart, activeUsersChart, instanceChart } from '@/services/chart/index.js';
 import { Poll, IPoll } from '@/models/entities/poll.js';
-import { createNotification } from '../create-notification.js';
 import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js';
 import { checkHitAntenna } from '@/misc/check-hit-antenna.js';
 import { checkWordMute } from '@/misc/check-word-mute.js';
-import { addNoteToAntenna } from '../add-note-to-antenna.js';
 import { countSameRenotes } from '@/misc/count-same-renotes.js';
-import { deliverToRelays } from '../relay.js';
 import { Channel } from '@/models/entities/channel.js';
 import { normalizeForSearch } from '@/misc/normalize-for-search.js';
 import { getAntennas } from '@/misc/antenna-cache.js';
@@ -38,8 +34,12 @@ import { endedPollNotificationQueue } from '@/queue/queues.js';
 import { webhookDeliver } from '@/queue/index.js';
 import { Cache } from '@/misc/cache.js';
 import { UserProfile } from '@/models/entities/user-profile.js';
-import { db } from '@/db/postgre.js';
 import { getActiveWebhooks } from '@/misc/webhook-cache.js';
+import { updateHashtags } from '../update-hashtag.js';
+import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc.js';
+import { createNotification } from '../create-notification.js';
+import { addNoteToAntenna } from '../add-note-to-antenna.js';
+import { deliverToRelays } from '../relay.js';
 
 const mutedWordsCache = new Cache<{ userId: UserProfile['userId']; mutedWords: UserProfile['mutedWords']; }[]>(1000 * 60 * 5);
 
diff --git a/packages/backend/src/services/note/delete.ts b/packages/backend/src/services/note/delete.ts
index 54ba5c6cb..f224f527d 100644
--- a/packages/backend/src/services/note/delete.ts
+++ b/packages/backend/src/services/note/delete.ts
@@ -12,9 +12,9 @@ import { Notes, Users, Instances } from '@/models/index.js';
 import { notesChart, perUserNotesChart, instanceChart } from '@/services/chart/index.js';
 import { deliverToFollowers, deliverToUser } from '@/remote/activitypub/deliver-manager.js';
 import { countSameRenotes } from '@/misc/count-same-renotes.js';
+import { isPureRenote } from '@/misc/renote.js';
 import { registerOrFetchInstanceDoc } from '../register-or-fetch-instance-doc.js';
 import { deliverToRelays } from '../relay.js';
-import { isPureRenote } from '@/misc/renote.js';
 
 /**
  * 投稿を削除します。
diff --git a/packages/backend/src/services/note/polls/vote.ts b/packages/backend/src/services/note/polls/vote.ts
index 327ef0c56..07136db5b 100644
--- a/packages/backend/src/services/note/polls/vote.ts
+++ b/packages/backend/src/services/note/polls/vote.ts
@@ -1,8 +1,8 @@
+import { Not } from 'typeorm';
 import { publishNoteStream } from '@/services/stream.js';
 import { CacheableUser } from '@/models/entities/user.js';
 import { Note } from '@/models/entities/note.js';
 import { PollVotes, NoteWatchings, Polls, Blockings } from '@/models/index.js';
-import { Not } from 'typeorm';
 import { genId } from '@/misc/gen-id.js';
 import { createNotification } from '../../create-notification.js';
 
diff --git a/packages/backend/src/services/note/reaction/create.ts b/packages/backend/src/services/note/reaction/create.ts
index 83d302826..4d2a4d3bd 100644
--- a/packages/backend/src/services/note/reaction/create.ts
+++ b/packages/backend/src/services/note/reaction/create.ts
@@ -1,3 +1,4 @@
+import { IsNull, Not } from 'typeorm';
 import { publishNoteStream } from '@/services/stream.js';
 import { renderLike } from '@/remote/activitypub/renderer/like.js';
 import DeliverManager from '@/remote/activitypub/deliver-manager.js';
@@ -6,14 +7,13 @@ import { toDbReaction, decodeReaction } from '@/misc/reaction-lib.js';
 import { User, IRemoteUser } from '@/models/entities/user.js';
 import { Note } from '@/models/entities/note.js';
 import { NoteReactions, Users, NoteWatchings, Notes, Emojis, Blockings } from '@/models/index.js';
-import { IsNull, Not } from 'typeorm';
 import { perUserReactionsChart } from '@/services/chart/index.js';
 import { genId } from '@/misc/gen-id.js';
-import { createNotification } from '../../create-notification.js';
-import deleteReaction from './delete.js';
 import { isDuplicateKeyValueError } from '@/misc/is-duplicate-key-value-error.js';
 import { NoteReaction } from '@/models/entities/note-reaction.js';
 import { IdentifiableError } from '@/misc/identifiable-error.js';
+import { createNotification } from '../../create-notification.js';
+import deleteReaction from './delete.js';
 
 export default async (user: { id: User['id']; host: User['host']; }, note: Note, reaction?: string) => {
 	// Check blocking
diff --git a/packages/backend/src/services/note/read.ts b/packages/backend/src/services/note/read.ts
index 915a9e9ee..cc2b8ac4e 100644
--- a/packages/backend/src/services/note/read.ts
+++ b/packages/backend/src/services/note/read.ts
@@ -1,8 +1,8 @@
+import { Not, IsNull, In } from 'typeorm';
 import { publishMainStream } from '@/services/stream.js';
 import { Note } from '@/models/entities/note.js';
 import { User } from '@/models/entities/user.js';
 import { NoteUnreads, AntennaNotes, Users, Followings, ChannelFollowings } from '@/models/index.js';
-import { Not, IsNull, In } from 'typeorm';
 import { Channel } from '@/models/entities/channel.js';
 import { checkHitAntenna } from '@/misc/check-hit-antenna.js';
 import { getAntennas } from '@/misc/antenna-cache.js';
diff --git a/packages/backend/src/services/send-email-notification.ts b/packages/backend/src/services/send-email-notification.ts
index 4a2f94b42..9360cd088 100644
--- a/packages/backend/src/services/send-email-notification.ts
+++ b/packages/backend/src/services/send-email-notification.ts
@@ -1,8 +1,8 @@
 import { UserProfiles } from '@/models/index.js';
 import { User } from '@/models/entities/user.js';
-import { sendEmail } from './send-email.js';
 import { I18n } from '@/misc/i18n.js';
 import * as Acct from '@/misc/acct.js';
+import { sendEmail } from './send-email.js';
 // TODO
 //const locales = await import('../../../../locales/index.js');
 
diff --git a/packages/backend/src/services/send-email.ts b/packages/backend/src/services/send-email.ts
index b35d22548..0e454a755 100644
--- a/packages/backend/src/services/send-email.ts
+++ b/packages/backend/src/services/send-email.ts
@@ -1,7 +1,7 @@
 import * as nodemailer from 'nodemailer';
 import { fetchMeta } from '@/misc/fetch-meta.js';
-import Logger from './logger.js';
 import config from '@/config/index.js';
+import Logger from './logger.js';
 
 export const logger = new Logger('email');
 
diff --git a/packages/backend/src/services/stream.ts b/packages/backend/src/services/stream.ts
index 4895bbace..7d57c1881 100644
--- a/packages/backend/src/services/stream.ts
+++ b/packages/backend/src/services/stream.ts
@@ -1,4 +1,4 @@
-import { redisClient } from '../db/redis.js';
+import { redisClient } from '@/db/redis.js';
 import { User } from '@/models/entities/user.js';
 import { Note } from '@/models/entities/note.js';
 import { UserList } from '@/models/entities/user-list.js';
diff --git a/packages/backend/src/services/suspend-user.ts b/packages/backend/src/services/suspend-user.ts
index e96b06a35..df8d034ff 100644
--- a/packages/backend/src/services/suspend-user.ts
+++ b/packages/backend/src/services/suspend-user.ts
@@ -1,10 +1,10 @@
+import { Not, IsNull } from 'typeorm';
 import renderDelete from '@/remote/activitypub/renderer/delete.js';
 import { renderActivity } from '@/remote/activitypub/renderer/index.js';
 import { deliver } from '@/queue/index.js';
 import config from '@/config/index.js';
 import { User } from '@/models/entities/user.js';
 import { Users, Followings } from '@/models/index.js';
-import { Not, IsNull } from 'typeorm';
 import { publishInternalEvent } from '@/services/stream.js';
 
 export async function doPostSuspend(user: { id: User['id']; host: User['host'] }) {
diff --git a/packages/backend/src/services/unsuspend-user.ts b/packages/backend/src/services/unsuspend-user.ts
index 44a0d01ca..3ed7ce850 100644
--- a/packages/backend/src/services/unsuspend-user.ts
+++ b/packages/backend/src/services/unsuspend-user.ts
@@ -1,3 +1,4 @@
+import { Not, IsNull } from 'typeorm';
 import renderDelete from '@/remote/activitypub/renderer/delete.js';
 import renderUndo from '@/remote/activitypub/renderer/undo.js';
 import { renderActivity } from '@/remote/activitypub/renderer/index.js';
@@ -5,7 +6,6 @@ import { deliver } from '@/queue/index.js';
 import config from '@/config/index.js';
 import { User } from '@/models/entities/user.js';
 import { Users, Followings } from '@/models/index.js';
-import { Not, IsNull } from 'typeorm';
 import { publishInternalEvent } from '@/services/stream.js';
 
 export async function doPostUnsuspend(user: User) {

From c8f49bae76752fb6245571786f72bbdeccaf9924 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 3 Aug 2022 14:49:55 +0200
Subject: [PATCH 21/34] fix lint "object-shorthand"

---
 packages/backend/src/db/postgre.ts            |  2 +-
 packages/backend/src/misc/keypair-store.ts    |  2 +-
 .../src/models/repositories/drive-file.ts     |  2 +-
 .../backend/src/models/repositories/note.ts   |  2 +-
 .../backend/src/models/repositories/user.ts   | 10 ++---
 packages/backend/src/queue/index.ts           | 40 +++++++++----------
 .../processors/db/export-custom-emojis.ts     |  6 +--
 .../src/queue/processors/db/export-notes.ts   |  2 +-
 .../remote/activitypub/misc/ld-signature.ts   |  2 +-
 .../src/remote/activitypub/models/note.ts     |  4 +-
 .../activitypub/renderer/follow-user.ts       |  2 +-
 .../src/remote/activitypub/renderer/note.ts   |  4 +-
 packages/backend/src/remote/resolve-user.ts   |  2 +-
 .../backend/src/server/api/authenticate.ts    |  2 +-
 .../api/common/make-pagination-query.ts       |  8 ++--
 .../api/common/read-messaging-message.ts      | 10 ++---
 .../backend/src/server/api/common/signup.ts   |  2 +-
 packages/backend/src/server/api/endpoints.ts  |  2 +-
 .../server/api/endpoints/admin/emoji/add.ts   |  2 +-
 .../api/endpoints/admin/emoji/delete-bulk.ts  |  4 +-
 .../api/endpoints/admin/emoji/delete.ts       |  4 +-
 .../src/server/api/endpoints/app/create.ts    |  2 +-
 .../src/server/api/endpoints/auth/accept.ts   |  2 +-
 .../api/endpoints/auth/session/generate.ts    |  2 +-
 .../backend/src/server/api/endpoints/drive.ts |  2 +-
 .../src/server/api/endpoints/i/2fa/done.ts    |  2 +-
 .../server/api/endpoints/messaging/history.ts |  8 ++--
 .../src/server/api/endpoints/notes/create.ts  |  2 +-
 .../users/search-by-username-and-host.ts      |  2 +-
 .../src/server/api/endpoints/users/search.ts  |  6 +--
 .../src/server/api/openapi/gen-spec.ts        |  2 +-
 .../backend/src/server/api/private/signin.ts  |  2 +-
 .../backend/src/server/api/private/signup.ts  |  2 +-
 .../backend/src/server/api/service/discord.ts | 26 ++++++------
 .../backend/src/server/api/service/github.ts  |  8 ++--
 .../backend/src/server/api/stream/channel.ts  |  4 +-
 .../backend/src/server/api/stream/index.ts    |  6 +--
 packages/backend/src/server/web/index.ts      |  2 +-
 .../backend/src/server/web/url-preview.ts     |  2 +-
 .../src/services/add-note-to-antenna.ts       |  2 +-
 .../src/services/chart/charts/federation.ts   | 10 ++---
 packages/backend/src/services/chart/core.ts   | 22 +++++-----
 .../src/services/create-notification.ts       |  4 +-
 .../src/services/create-system-user.ts        |  2 +-
 .../src/services/drive/upload-from-url.ts     |  4 +-
 .../src/services/insert-moderation-log.ts     |  2 +-
 packages/backend/src/services/logger.ts       |  2 +-
 packages/backend/src/services/note/create.ts  |  2 +-
 packages/backend/src/services/note/delete.ts  |  4 +-
 .../backend/src/services/note/polls/vote.ts   |  8 ++--
 .../src/services/note/reaction/create.ts      |  4 +-
 packages/backend/src/services/note/read.ts    |  8 ++--
 packages/backend/src/services/note/unread.ts  |  4 +-
 .../backend/src/services/push-notification.ts |  6 +--
 packages/backend/src/services/send-email.ts   |  6 +--
 packages/backend/src/services/stream.ts       |  8 ++--
 packages/shared/.eslintrc.js                  |  2 +-
 57 files changed, 140 insertions(+), 156 deletions(-)

diff --git a/packages/backend/src/db/postgre.ts b/packages/backend/src/db/postgre.ts
index 95386f724..d36032dad 100644
--- a/packages/backend/src/db/postgre.ts
+++ b/packages/backend/src/db/postgre.ts
@@ -202,7 +202,7 @@ export const db = new DataSource({
 	logging: log,
 	logger: log ? new MyCustomLogger() : undefined,
 	maxQueryExecutionTime: 300,
-	entities: entities,
+	entities,
 	migrations: ['../../migration/*.js'],
 });
 
diff --git a/packages/backend/src/misc/keypair-store.ts b/packages/backend/src/misc/keypair-store.ts
index 1183b9a78..9babf3ec5 100644
--- a/packages/backend/src/misc/keypair-store.ts
+++ b/packages/backend/src/misc/keypair-store.ts
@@ -6,5 +6,5 @@ import { Cache } from './cache.js';
 const cache = new Cache<UserKeypair>(Infinity);
 
 export async function getUserKeypair(userId: User['id']): Promise<UserKeypair> {
-	return await cache.fetch(userId, () => UserKeypairs.findOneByOrFail({ userId: userId }));
+	return await cache.fetch(userId, () => UserKeypairs.findOneByOrFail({ userId }));
 }
diff --git a/packages/backend/src/models/repositories/drive-file.ts b/packages/backend/src/models/repositories/drive-file.ts
index bead76962..fbfa832ae 100644
--- a/packages/backend/src/models/repositories/drive-file.ts
+++ b/packages/backend/src/models/repositories/drive-file.ts
@@ -68,7 +68,7 @@ export const DriveFileRepository = db.getRepository(DriveFile).extend({
 
 		const { sum } = await this
 			.createQueryBuilder('file')
-			.where('file.userId = :id', { id: id })
+			.where('file.userId = :id', { id })
 			.andWhere('file.isLink = FALSE')
 			.select('SUM(file.size)', 'sum')
 			.getRawOne();
diff --git a/packages/backend/src/models/repositories/note.ts b/packages/backend/src/models/repositories/note.ts
index b1311818d..38080c205 100644
--- a/packages/backend/src/models/repositories/note.ts
+++ b/packages/backend/src/models/repositories/note.ts
@@ -172,7 +172,7 @@ export const NoteRepository = db.getRepository(Note).extend({
 			user: Users.pack(note.user ?? note.userId, me, {
 				detail: false,
 			}),
-			text: text,
+			text,
 			cw: note.cw,
 			visibility: note.visibility,
 			localOnly: note.localOnly || undefined,
diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts
index e14118505..9bc921168 100644
--- a/packages/backend/src/models/repositories/user.ts
+++ b/packages/backend/src/models/repositories/user.ts
@@ -120,12 +120,12 @@ export const UserRepository = db.getRepository(User).extend({
 			muterId: userId,
 		});
 
-		const joinings = await UserGroupJoinings.findBy({ userId: userId });
+		const joinings = await UserGroupJoinings.findBy({ userId });
 
 		const groupQs = Promise.all(joinings.map(j => MessagingMessages.createQueryBuilder('message')
 			.where('message.groupId = :groupId', { groupId: j.userGroupId })
-			.andWhere('message.userId != :userId', { userId: userId })
-			.andWhere('NOT (:userId = ANY(message.reads))', { userId: userId })
+			.andWhere('message.userId != :userId', { userId })
+			.andWhere('NOT (:userId = ANY(message.reads))', { userId })
 			.andWhere('message.createdAt > :joinedAt', { joinedAt: j.createdAt }) // 自分が加入する前の会話については、未読扱いしない
 			.getOne().then(x => x != null)));
 
@@ -146,7 +146,7 @@ export const UserRepository = db.getRepository(User).extend({
 
 	async getHasUnreadAnnouncement(userId: User['id']): Promise<boolean> {
 		const reads = await AnnouncementReads.findBy({
-			userId: userId,
+			userId,
 		});
 
 		const count = await Announcements.countBy(reads.length > 0 ? {
@@ -171,7 +171,7 @@ export const UserRepository = db.getRepository(User).extend({
 		const channels = await ChannelFollowings.findBy({ followerId: userId });
 
 		const unread = channels.length > 0 ? await NoteUnreads.findOneBy({
-			userId: userId,
+			userId,
 			noteChannelId: In(channels.map(x => x.followeeId)),
 		}) : null;
 
diff --git a/packages/backend/src/queue/index.ts b/packages/backend/src/queue/index.ts
index 0896848c4..dc8c7abd3 100644
--- a/packages/backend/src/queue/index.ts
+++ b/packages/backend/src/queue/index.ts
@@ -107,7 +107,7 @@ export function deliver(user: ThinUser, content: unknown, to: string | null) {
 
 export function inbox(activity: IActivity, signature: httpSignature.IParsedSignature) {
 	const data = {
-		activity: activity,
+		activity,
 		signature,
 	};
 
@@ -124,7 +124,7 @@ export function inbox(activity: IActivity, signature: httpSignature.IParsedSigna
 
 export function createDeleteDriveFilesJob(user: ThinUser) {
 	return dbQueue.add('deleteDriveFiles', {
-		user: user,
+		user,
 	}, {
 		removeOnComplete: true,
 		removeOnFail: true,
@@ -133,7 +133,7 @@ export function createDeleteDriveFilesJob(user: ThinUser) {
 
 export function createExportCustomEmojisJob(user: ThinUser) {
 	return dbQueue.add('exportCustomEmojis', {
-		user: user,
+		user,
 	}, {
 		removeOnComplete: true,
 		removeOnFail: true,
@@ -142,7 +142,7 @@ export function createExportCustomEmojisJob(user: ThinUser) {
 
 export function createExportNotesJob(user: ThinUser) {
 	return dbQueue.add('exportNotes', {
-		user: user,
+		user,
 	}, {
 		removeOnComplete: true,
 		removeOnFail: true,
@@ -151,7 +151,7 @@ export function createExportNotesJob(user: ThinUser) {
 
 export function createExportFollowingJob(user: ThinUser, excludeMuting = false, excludeInactive = false) {
 	return dbQueue.add('exportFollowing', {
-		user: user,
+		user,
 		excludeMuting,
 		excludeInactive,
 	}, {
@@ -162,7 +162,7 @@ export function createExportFollowingJob(user: ThinUser, excludeMuting = false,
 
 export function createExportMuteJob(user: ThinUser) {
 	return dbQueue.add('exportMute', {
-		user: user,
+		user,
 	}, {
 		removeOnComplete: true,
 		removeOnFail: true,
@@ -171,7 +171,7 @@ export function createExportMuteJob(user: ThinUser) {
 
 export function createExportBlockingJob(user: ThinUser) {
 	return dbQueue.add('exportBlocking', {
-		user: user,
+		user,
 	}, {
 		removeOnComplete: true,
 		removeOnFail: true,
@@ -180,7 +180,7 @@ export function createExportBlockingJob(user: ThinUser) {
 
 export function createExportUserListsJob(user: ThinUser) {
 	return dbQueue.add('exportUserLists', {
-		user: user,
+		user,
 	}, {
 		removeOnComplete: true,
 		removeOnFail: true,
@@ -189,8 +189,8 @@ export function createExportUserListsJob(user: ThinUser) {
 
 export function createImportFollowingJob(user: ThinUser, fileId: DriveFile['id']) {
 	return dbQueue.add('importFollowing', {
-		user: user,
-		fileId: fileId,
+		user,
+		fileId,
 	}, {
 		removeOnComplete: true,
 		removeOnFail: true,
@@ -199,8 +199,8 @@ export function createImportFollowingJob(user: ThinUser, fileId: DriveFile['id']
 
 export function createImportMutingJob(user: ThinUser, fileId: DriveFile['id']) {
 	return dbQueue.add('importMuting', {
-		user: user,
-		fileId: fileId,
+		user,
+		fileId,
 	}, {
 		removeOnComplete: true,
 		removeOnFail: true,
@@ -209,8 +209,8 @@ export function createImportMutingJob(user: ThinUser, fileId: DriveFile['id']) {
 
 export function createImportBlockingJob(user: ThinUser, fileId: DriveFile['id']) {
 	return dbQueue.add('importBlocking', {
-		user: user,
-		fileId: fileId,
+		user,
+		fileId,
 	}, {
 		removeOnComplete: true,
 		removeOnFail: true,
@@ -219,8 +219,8 @@ export function createImportBlockingJob(user: ThinUser, fileId: DriveFile['id'])
 
 export function createImportUserListsJob(user: ThinUser, fileId: DriveFile['id']) {
 	return dbQueue.add('importUserLists', {
-		user: user,
-		fileId: fileId,
+		user,
+		fileId,
 	}, {
 		removeOnComplete: true,
 		removeOnFail: true,
@@ -229,8 +229,8 @@ export function createImportUserListsJob(user: ThinUser, fileId: DriveFile['id']
 
 export function createImportCustomEmojisJob(user: ThinUser, fileId: DriveFile['id']) {
 	return dbQueue.add('importCustomEmojis', {
-		user: user,
-		fileId: fileId,
+		user,
+		fileId,
 	}, {
 		removeOnComplete: true,
 		removeOnFail: true,
@@ -239,7 +239,7 @@ export function createImportCustomEmojisJob(user: ThinUser, fileId: DriveFile['i
 
 export function createDeleteAccountJob(user: ThinUser, opts: { soft?: boolean; } = {}) {
 	return dbQueue.add('deleteAccount', {
-		user: user,
+		user,
 		soft: opts.soft,
 	}, {
 		removeOnComplete: true,
@@ -249,7 +249,7 @@ export function createDeleteAccountJob(user: ThinUser, opts: { soft?: boolean; }
 
 export function createDeleteObjectStorageFileJob(key: string) {
 	return objectStorageQueue.add('deleteFile', {
-		key: key,
+		key,
 	}, {
 		removeOnComplete: true,
 		removeOnFail: true,
diff --git a/packages/backend/src/queue/processors/db/export-custom-emojis.ts b/packages/backend/src/queue/processors/db/export-custom-emojis.ts
index 4872703f5..39c5141da 100644
--- a/packages/backend/src/queue/processors/db/export-custom-emojis.ts
+++ b/packages/backend/src/queue/processors/db/export-custom-emojis.ts
@@ -76,9 +76,9 @@ export async function exportCustomEmojis(job: Bull.Job, done: () => void): Promi
 		}
 
 		const content = JSON.stringify({
-			fileName: fileName,
-			downloaded: downloaded,
-			emoji: emoji,
+			fileName,
+			downloaded,
+			emoji,
 		});
 		const isFirst = customEmojis.indexOf(emoji) === 0;
 
diff --git a/packages/backend/src/queue/processors/db/export-notes.ts b/packages/backend/src/queue/processors/db/export-notes.ts
index 707845d41..dc8434ff8 100644
--- a/packages/backend/src/queue/processors/db/export-notes.ts
+++ b/packages/backend/src/queue/processors/db/export-notes.ts
@@ -109,7 +109,7 @@ function serialize(note: Note, poll: Poll | null = null): Record<string, unknown
 		fileIds: note.fileIds,
 		replyId: note.replyId,
 		renoteId: note.renoteId,
-		poll: poll,
+		poll,
 		cw: note.cw,
 		visibility: note.visibility,
 		visibleUserIds: note.visibleUserIds,
diff --git a/packages/backend/src/remote/activitypub/misc/ld-signature.ts b/packages/backend/src/remote/activitypub/misc/ld-signature.ts
index c943b35af..49a8dbbe9 100644
--- a/packages/backend/src/remote/activitypub/misc/ld-signature.ts
+++ b/packages/backend/src/remote/activitypub/misc/ld-signature.ts
@@ -102,7 +102,7 @@ export class LdSignature {
 			const document = await this.fetchDocument(url);
 			return {
 				contextUrl: null,
-				document: document,
+				document,
 				documentUrl: url,
 			};
 		};
diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index eed8a6096..b1fa1a0cb 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -77,8 +77,8 @@ export async function createNote(value: string | IObject, resolver?: Resolver, s
 			resolver: {
 				history: resolver.getHistory(),
 			},
-			value: value,
-			object: object,
+			value,
+			object,
 		});
 		throw new Error('invalid note');
 	}
diff --git a/packages/backend/src/remote/activitypub/renderer/follow-user.ts b/packages/backend/src/remote/activitypub/renderer/follow-user.ts
index 9a8a16d74..bf7287c8f 100644
--- a/packages/backend/src/remote/activitypub/renderer/follow-user.ts
+++ b/packages/backend/src/remote/activitypub/renderer/follow-user.ts
@@ -7,6 +7,6 @@ import { User } from '@/models/entities/user.js';
  * @param id Follower|Followee ID
  */
 export default async function renderFollowUser(id: User['id']): Promise<any> {
-	const user = await Users.findOneByOrFail({ id: id });
+	const user = await Users.findOneByOrFail({ id });
 	return Users.isLocalUser(user) ? `${config.url}/users/${user.id}` : user.uri;
 }
diff --git a/packages/backend/src/remote/activitypub/renderer/note.ts b/packages/backend/src/remote/activitypub/renderer/note.ts
index 7001b6c0d..f705aabac 100644
--- a/packages/backend/src/remote/activitypub/renderer/note.ts
+++ b/packages/backend/src/remote/activitypub/renderer/note.ts
@@ -112,9 +112,7 @@ export default async function renderNote(note: Note, dive = true, isTalk = false
 
 	const asPoll = poll ? {
 		type: 'Question',
-		content: toHtml(Object.assign({}, note, {
-			text: text,
-		})),
+		content: toHtml(Object.assign({}, note, { text })),
 		[poll.expiresAt && poll.expiresAt < new Date() ? 'closed' : 'endTime']: poll.expiresAt,
 		[poll.multiple ? 'anyOf' : 'oneOf']: poll.choices.map((text, i) => ({
 			type: 'Note',
diff --git a/packages/backend/src/remote/resolve-user.ts b/packages/backend/src/remote/resolve-user.ts
index 62032cf58..6a8d4bee0 100644
--- a/packages/backend/src/remote/resolve-user.ts
+++ b/packages/backend/src/remote/resolve-user.ts
@@ -72,7 +72,7 @@ export async function resolveUser(username: string, host: string | null): Promis
 
 			await Users.update({
 				usernameLower,
-				host: host,
+				host,
 			}, {
 				uri: self.href,
 			});
diff --git a/packages/backend/src/server/api/authenticate.ts b/packages/backend/src/server/api/authenticate.ts
index 253d8f58a..1dc971d2b 100644
--- a/packages/backend/src/server/api/authenticate.ts
+++ b/packages/backend/src/server/api/authenticate.ts
@@ -51,7 +51,7 @@ export default async (authorization: string | null | undefined, bodyToken: strin
 			where: [{
 				hash: token.toLowerCase(), // app
 			}, {
-				token: token, // miauth
+				token, // miauth
 			}],
 		});
 
diff --git a/packages/backend/src/server/api/common/make-pagination-query.ts b/packages/backend/src/server/api/common/make-pagination-query.ts
index 51c11e5df..91cdfec2c 100644
--- a/packages/backend/src/server/api/common/make-pagination-query.ts
+++ b/packages/backend/src/server/api/common/make-pagination-query.ts
@@ -2,14 +2,14 @@ import { SelectQueryBuilder } from 'typeorm';
 
 export function makePaginationQuery<T>(q: SelectQueryBuilder<T>, sinceId?: string, untilId?: string, sinceDate?: number, untilDate?: number) {
 	if (sinceId && untilId) {
-		q.andWhere(`${q.alias}.id > :sinceId`, { sinceId: sinceId });
-		q.andWhere(`${q.alias}.id < :untilId`, { untilId: untilId });
+		q.andWhere(`${q.alias}.id > :sinceId`, { sinceId });
+		q.andWhere(`${q.alias}.id < :untilId`, { untilId });
 		q.orderBy(`${q.alias}.id`, 'DESC');
 	} else if (sinceId) {
-		q.andWhere(`${q.alias}.id > :sinceId`, { sinceId: sinceId });
+		q.andWhere(`${q.alias}.id > :sinceId`, { sinceId });
 		q.orderBy(`${q.alias}.id`, 'ASC');
 	} else if (untilId) {
-		q.andWhere(`${q.alias}.id < :untilId`, { untilId: untilId });
+		q.andWhere(`${q.alias}.id < :untilId`, { untilId });
 		q.orderBy(`${q.alias}.id`, 'DESC');
 	} else if (sinceDate && untilDate) {
 		q.andWhere(`${q.alias}.createdAt > :sinceDate`, { sinceDate: new Date(sinceDate) });
diff --git a/packages/backend/src/server/api/common/read-messaging-message.ts b/packages/backend/src/server/api/common/read-messaging-message.ts
index e1080020f..4f660a4e2 100644
--- a/packages/backend/src/server/api/common/read-messaging-message.ts
+++ b/packages/backend/src/server/api/common/read-messaging-message.ts
@@ -79,7 +79,7 @@ export async function readGroupMessagingMessage(
 
 	// check joined
 	const joining = await UserGroupJoinings.findOneBy({
-		userId: userId,
+		userId,
 		userGroupId: groupId,
 	});
 
@@ -111,7 +111,7 @@ export async function readGroupMessagingMessage(
 	// Publish event
 	publishGroupMessagingStream(groupId, 'read', {
 		ids: reads,
-		userId: userId,
+		userId,
 	});
 	publishMessagingIndexStream(userId, 'read', reads);
 
@@ -122,9 +122,9 @@ export async function readGroupMessagingMessage(
 	} else {
 		// そのグループにおいて未読がなければイベント発行
 		const unreadExist = await MessagingMessages.createQueryBuilder('message')
-			.where('message.groupId = :groupId', { groupId: groupId })
-			.andWhere('message.userId != :userId', { userId: userId })
-			.andWhere('NOT (:userId = ANY(message.reads))', { userId: userId })
+			.where('message.groupId = :groupId', { groupId })
+			.andWhere('message.userId != :userId', { userId })
+			.andWhere('NOT (:userId = ANY(message.reads))', { userId })
 			.andWhere('message.createdAt > :joinedAt', { joinedAt: joining.createdAt }) // 自分が加入する前の会話については、未読扱いしない
 			.getOne().then(x => x != null);
 
diff --git a/packages/backend/src/server/api/common/signup.ts b/packages/backend/src/server/api/common/signup.ts
index ca9b5248d..7178a7420 100644
--- a/packages/backend/src/server/api/common/signup.ts
+++ b/packages/backend/src/server/api/common/signup.ts
@@ -81,7 +81,7 @@ export async function signup(opts: {
 		account = await transactionalEntityManager.save(new User({
 			id: genId(),
 			createdAt: new Date(),
-			username: username,
+			username,
 			usernameLower: username.toLowerCase(),
 			host: toPunyNullable(host),
 			token: secret,
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index 88c389040..372fd503f 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -718,7 +718,7 @@ export interface IEndpoint {
 
 const endpoints: IEndpoint[] = eps.map(([name, ep]) => {
 	return {
-		name: name,
+		name,
 		exec: ep.default,
 		meta: ep.meta || {},
 		params: ep.paramDef,
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
index 8b5cf0ab3..ecfed084f 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts
@@ -41,7 +41,7 @@ export default define(meta, paramDef, async (ps, me) => {
 	const emoji = await Emojis.insert({
 		id: genId(),
 		updatedAt: new Date(),
-		name: name,
+		name,
 		category: null,
 		host: null,
 		aliases: [],
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts
index 3149e6f6f..4aef8b898 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts
@@ -32,8 +32,6 @@ export default define(meta, paramDef, async (ps, me) => {
 	
 		await db.queryResultCache!.remove(['meta_emojis']);
 	
-		insertModerationLog(me, 'deleteEmoji', {
-			emoji: emoji,
-		});
+		insertModerationLog(me, 'deleteEmoji', { emoji });
 	}
 });
diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
index b4aae07e8..3cb1402e4 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts
@@ -37,7 +37,5 @@ export default define(meta, paramDef, async (ps, me) => {
 
 	await db.queryResultCache!.remove(['meta_emojis']);
 
-	insertModerationLog(me, 'deleteEmoji', {
-		emoji: emoji,
-	});
+	insertModerationLog(me, 'deleteEmoji', { emoji });
 });
diff --git a/packages/backend/src/server/api/endpoints/app/create.ts b/packages/backend/src/server/api/endpoints/app/create.ts
index 327711823..c92e542a1 100644
--- a/packages/backend/src/server/api/endpoints/app/create.ts
+++ b/packages/backend/src/server/api/endpoints/app/create.ts
@@ -44,7 +44,7 @@ export default define(meta, paramDef, async (ps, user) => {
 		description: ps.description,
 		permission: ps.permission,
 		callbackUrl: ps.callbackUrl,
-		secret: secret,
+		secret,
 	}).then(x => Apps.findOneByOrFail(x.identifiers[0]));
 
 	return await Apps.pack(app, null, {
diff --git a/packages/backend/src/server/api/endpoints/auth/accept.ts b/packages/backend/src/server/api/endpoints/auth/accept.ts
index f87d460b9..dac74afcc 100644
--- a/packages/backend/src/server/api/endpoints/auth/accept.ts
+++ b/packages/backend/src/server/api/endpoints/auth/accept.ts
@@ -67,7 +67,7 @@ export default define(meta, paramDef, async (ps, user) => {
 			appId: session.appId,
 			userId: user.id,
 			token: accessToken,
-			hash: hash,
+			hash,
 		});
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/auth/session/generate.ts b/packages/backend/src/server/api/endpoints/auth/session/generate.ts
index a7a44756b..f40d70c2b 100644
--- a/packages/backend/src/server/api/endpoints/auth/session/generate.ts
+++ b/packages/backend/src/server/api/endpoints/auth/session/generate.ts
@@ -62,7 +62,7 @@ export default define(meta, paramDef, async (ps) => {
 		id: genId(),
 		createdAt: new Date(),
 		appId: app.id,
-		token: token,
+		token,
 	}).then(x => AuthSessions.findOneByOrFail(x.identifiers[0]));
 
 	return {
diff --git a/packages/backend/src/server/api/endpoints/drive.ts b/packages/backend/src/server/api/endpoints/drive.ts
index 47e940cdd..5af27c37f 100644
--- a/packages/backend/src/server/api/endpoints/drive.ts
+++ b/packages/backend/src/server/api/endpoints/drive.ts
@@ -40,6 +40,6 @@ export default define(meta, paramDef, async (ps, user) => {
 
 	return {
 		capacity: 1024 * 1024 * instance.localDriveCapacityMb,
-		usage: usage,
+		usage,
 	};
 });
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 aef3bbed4..730f77916 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/done.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/done.ts
@@ -29,7 +29,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	const verified = (speakeasy as any).totp.verify({
 		secret: profile.twoFactorTempSecret,
 		encoding: 'base32',
-		token: token,
+		token,
 	});
 
 	if (!verified) {
diff --git a/packages/backend/src/server/api/endpoints/messaging/history.ts b/packages/backend/src/server/api/endpoints/messaging/history.ts
index ac46407cc..ff22828fa 100644
--- a/packages/backend/src/server/api/endpoints/messaging/history.ts
+++ b/packages/backend/src/server/api/endpoints/messaging/history.ts
@@ -55,10 +55,10 @@ export default define(meta, paramDef, async (ps, user) => {
 			.orderBy('message.createdAt', 'DESC');
 
 		if (ps.group) {
-			query.where('message.groupId IN (:...groups)', { groups: groups });
+			query.where('message.groupId IN (:...groups)', { groups });
 
 			if (found.length > 0) {
-				query.andWhere('message.groupId NOT IN (:...found)', { found: found });
+				query.andWhere('message.groupId NOT IN (:...found)', { found });
 			}
 		} else {
 			query.where(new Brackets(qb => { qb
@@ -68,8 +68,8 @@ export default define(meta, paramDef, async (ps, user) => {
 			query.andWhere('message.groupId IS NULL');
 
 			if (found.length > 0) {
-				query.andWhere('message.userId NOT IN (:...found)', { found: found });
-				query.andWhere('message.recipientId NOT IN (:...found)', { found: found });
+				query.andWhere('message.userId NOT IN (:...found)', { found });
+				query.andWhere('message.recipientId NOT IN (:...found)', { found });
 			}
 
 			if (mute.length > 0) {
diff --git a/packages/backend/src/server/api/endpoints/notes/create.ts b/packages/backend/src/server/api/endpoints/notes/create.ts
index 5138e8f7b..8d13fb483 100644
--- a/packages/backend/src/server/api/endpoints/notes/create.ts
+++ b/packages/backend/src/server/api/endpoints/notes/create.ts
@@ -274,7 +274,7 @@ export default define(meta, paramDef, async (ps, user) => {
 	// 投稿を作成
 	const note = await create(user, {
 		createdAt: new Date(),
-		files: files,
+		files,
 		poll: ps.poll ? {
 			choices: ps.poll.choices,
 			multiple: ps.poll.multiple || false,
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 12a45edfa..5dd10bb1f 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
@@ -71,7 +71,7 @@ export default define(meta, paramDef, async (ps, me) => {
 				.andWhere('user.usernameLower LIKE :username', { username: ps.username.toLowerCase() + '%' })
 				.andWhere(new Brackets(qb => { qb
 					.where('user.updatedAt IS NULL')
-					.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
+					.orWhere('user.updatedAt > :activeThreshold', { activeThreshold });
 				}));
 
 			query.setParameters(followingQuery.getParameters());
diff --git a/packages/backend/src/server/api/endpoints/users/search.ts b/packages/backend/src/server/api/endpoints/users/search.ts
index 01729de66..ae7efac3a 100644
--- a/packages/backend/src/server/api/endpoints/users/search.ts
+++ b/packages/backend/src/server/api/endpoints/users/search.ts
@@ -46,7 +46,7 @@ export default define(meta, paramDef, async (ps, me) => {
 			.where('user.usernameLower LIKE :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
 			.andWhere(new Brackets(qb => { qb
 				.where('user.updatedAt IS NULL')
-				.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
+				.orWhere('user.updatedAt > :activeThreshold', { activeThreshold });
 			}))
 			.andWhere('user.isSuspended = FALSE');
 
@@ -73,7 +73,7 @@ export default define(meta, paramDef, async (ps, me) => {
 			}))
 			.andWhere(new Brackets(qb => { qb
 				.where('user.updatedAt IS NULL')
-				.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
+				.orWhere('user.updatedAt > :activeThreshold', { activeThreshold });
 			}))
 			.andWhere('user.isSuspended = FALSE');
 
@@ -104,7 +104,7 @@ export default define(meta, paramDef, async (ps, me) => {
 				.where(`user.id IN (${ profQuery.getQuery() })`)
 				.andWhere(new Brackets(qb => { qb
 					.where('user.updatedAt IS NULL')
-					.orWhere('user.updatedAt > :activeThreshold', { activeThreshold: activeThreshold });
+					.orWhere('user.updatedAt > :activeThreshold', { activeThreshold });
 				}))
 				.andWhere('user.isSuspended = FALSE')
 				.setParameters(profQuery.getParameters());
diff --git a/packages/backend/src/server/api/openapi/gen-spec.ts b/packages/backend/src/server/api/openapi/gen-spec.ts
index abc070ec5..e3cbf2d47 100644
--- a/packages/backend/src/server/api/openapi/gen-spec.ts
+++ b/packages/backend/src/server/api/openapi/gen-spec.ts
@@ -25,7 +25,7 @@ export function genOpenapiSpec() {
 		paths: {} as any,
 
 		components: {
-			schemas: schemas,
+			schemas,
 
 			securitySchemes: {
 				ApiKeyAuth: {
diff --git a/packages/backend/src/server/api/private/signin.ts b/packages/backend/src/server/api/private/signin.ts
index a84f458ac..4544a75d3 100644
--- a/packages/backend/src/server/api/private/signin.ts
+++ b/packages/backend/src/server/api/private/signin.ts
@@ -118,7 +118,7 @@ export default async (ctx: Koa.Context) => {
 		const verified = (speakeasy as any).totp.verify({
 			secret: profile.twoFactorSecret,
 			encoding: 'base32',
-			token: token,
+			token,
 			window: 2,
 		});
 
diff --git a/packages/backend/src/server/api/private/signup.ts b/packages/backend/src/server/api/private/signup.ts
index db83d269f..bb2a11437 100644
--- a/packages/backend/src/server/api/private/signup.ts
+++ b/packages/backend/src/server/api/private/signup.ts
@@ -80,7 +80,7 @@ export default async (ctx: Koa.Context) => {
 			createdAt: new Date(),
 			code,
 			email: emailAddress,
-			username: username,
+			username,
 			password: hash,
 		});
 
diff --git a/packages/backend/src/server/api/service/discord.ts b/packages/backend/src/server/api/service/discord.ts
index 6e23e753e..ad6161add 100644
--- a/packages/backend/src/server/api/service/discord.ts
+++ b/packages/backend/src/server/api/service/discord.ts
@@ -184,7 +184,7 @@ router.get('/dc/cb', async ctx => {
 		}
 
 		const profile = await UserProfiles.createQueryBuilder()
-			.where('"integrations"->\'discord\'->>\'id\' = :id', { id: id })
+			.where('"integrations"->\'discord\'->>\'id\' = :id', { id })
 			.andWhere('"userHost" IS NULL')
 			.getOne();
 
@@ -197,12 +197,12 @@ router.get('/dc/cb', async ctx => {
 			integrations: {
 				...profile.integrations,
 				discord: {
-					id: id,
-					accessToken: accessToken,
-					refreshToken: refreshToken,
-					expiresDate: expiresDate,
-					username: username,
-					discriminator: discriminator,
+					id,
+					accessToken,
+					refreshToken,
+					expiresDate,
+					username,
+					discriminator,
 				},
 			},
 		});
@@ -264,12 +264,12 @@ router.get('/dc/cb', async ctx => {
 			integrations: {
 				...profile.integrations,
 				discord: {
-					accessToken: accessToken,
-					refreshToken: refreshToken,
-					expiresDate: expiresDate,
-					id: id,
-					username: username,
-					discriminator: discriminator,
+					accessToken,
+					refreshToken,
+					expiresDate,
+					id,
+					username,
+					discriminator,
 				},
 			},
 		});
diff --git a/packages/backend/src/server/api/service/github.ts b/packages/backend/src/server/api/service/github.ts
index 5eba108f4..a66a4c43b 100644
--- a/packages/backend/src/server/api/service/github.ts
+++ b/packages/backend/src/server/api/service/github.ts
@@ -176,7 +176,7 @@ router.get('/gh/cb', async ctx => {
 		}
 
 		const link = await UserProfiles.createQueryBuilder()
-			.where('"integrations"->\'github\'->>\'id\' = :id', { id: id })
+			.where('"integrations"->\'github\'->>\'id\' = :id', { id })
 			.andWhere('"userHost" IS NULL')
 			.getOne();
 
@@ -239,9 +239,9 @@ router.get('/gh/cb', async ctx => {
 			integrations: {
 				...profile.integrations,
 				github: {
-					accessToken: accessToken,
-					id: id,
-					login: login,
+					accessToken,
+					id,
+					login,
 				},
 			},
 		});
diff --git a/packages/backend/src/server/api/stream/channel.ts b/packages/backend/src/server/api/stream/channel.ts
index fd6924dfe..05d170aa8 100644
--- a/packages/backend/src/server/api/stream/channel.ts
+++ b/packages/backend/src/server/api/stream/channel.ts
@@ -53,8 +53,8 @@ export default abstract class Channel {
 
 		this.connection.sendMessageToWs('channel', {
 			id: this.id,
-			type: type,
-			body: body,
+			type,
+			body,
 		});
 	}
 
diff --git a/packages/backend/src/server/api/stream/index.ts b/packages/backend/src/server/api/stream/index.ts
index 66cd3714c..549c52a36 100644
--- a/packages/backend/src/server/api/stream/index.ts
+++ b/packages/backend/src/server/api/stream/index.ts
@@ -244,7 +244,7 @@ export default class Connection {
 	 */
 	public sendMessageToWs(type: string, payload: any) {
 		this.wsConnection.send(JSON.stringify({
-			type: type,
+			type,
 			body: payload,
 		}));
 	}
@@ -267,9 +267,7 @@ export default class Connection {
 		ch.init(params);
 
 		if (pong) {
-			this.sendMessageToWs('connected', {
-				id: id,
-			});
+			this.sendMessageToWs('connected', { id });
 		}
 	}
 
diff --git a/packages/backend/src/server/web/index.ts b/packages/backend/src/server/web/index.ts
index 09758465b..cf404f6bb 100644
--- a/packages/backend/src/server/web/index.ts
+++ b/packages/backend/src/server/web/index.ts
@@ -479,7 +479,7 @@ router.get('/_info_card_', async ctx => {
 	await ctx.render('info-card', {
 		version: config.version,
 		host: config.host,
-		meta: meta,
+		meta,
 		originalUsersCount: await Users.countBy({ host: IsNull() }),
 		originalNotesCount: await Notes.countBy({ userHost: IsNull() }),
 	});
diff --git a/packages/backend/src/server/web/url-preview.ts b/packages/backend/src/server/web/url-preview.ts
index 1e259649f..10ec4874b 100644
--- a/packages/backend/src/server/web/url-preview.ts
+++ b/packages/backend/src/server/web/url-preview.ts
@@ -29,7 +29,7 @@ export const urlPreviewHandler = async (ctx: Koa.Context) => {
 
 	try {
 		const summary = meta.summalyProxy ? await getJson(`${meta.summalyProxy}?${query({
-			url: url,
+			url,
 			lang: lang ?? 'ja-JP',
 		})}`) : await summaly.default(url, {
 			followRedirects: false,
diff --git a/packages/backend/src/services/add-note-to-antenna.ts b/packages/backend/src/services/add-note-to-antenna.ts
index 1f344222e..99bf1630d 100644
--- a/packages/backend/src/services/add-note-to-antenna.ts
+++ b/packages/backend/src/services/add-note-to-antenna.ts
@@ -14,7 +14,7 @@ export async function addNoteToAntenna(antenna: Antenna, note: Note, noteUser: {
 		id: genId(),
 		antennaId: antenna.id,
 		noteId: note.id,
-		read: read,
+		read,
 	});
 
 	publishAntennaStream(antenna.id, 'note', note);
diff --git a/packages/backend/src/services/chart/charts/federation.ts b/packages/backend/src/services/chart/charts/federation.ts
index 3bc62f4cd..5ee7786ec 100644
--- a/packages/backend/src/services/chart/charts/federation.ts
+++ b/packages/backend/src/services/chart/charts/federation.ts
@@ -79,11 +79,11 @@ export default class FederationChart extends Chart<typeof schema> {
 		]);
 
 		return {
-			'sub': sub,
-			'pub': pub,
-			'pubsub': pubsub,
-			'subActive': subActive,
-			'pubActive': pubActive,
+			sub,
+			pub,
+			pubsub,
+			subActive,
+			pubActive,
 		};
 	}
 
diff --git a/packages/backend/src/services/chart/core.ts b/packages/backend/src/services/chart/core.ts
index 862de8e5d..a33e4e60c 100644
--- a/packages/backend/src/services/chart/core.ts
+++ b/packages/backend/src/services/chart/core.ts
@@ -266,9 +266,7 @@ export default abstract class Chart<T extends Schema> {
 			new Error('not happen') as never;
 
 		return repository.findOne({
-			where: group ? {
-				group: group,
-			} : {},
+			where: group ? { group } : {},
 			order: {
 				date: -1,
 			},
@@ -294,7 +292,7 @@ export default abstract class Chart<T extends Schema> {
 		// 現在(=今のHour or Day)のログ
 		const currentLog = await repository.findOneBy({
 			date: Chart.dateToTimestamp(current),
-			...(group ? { group: group } : {}),
+			...(group ? { group } : {}),
 		}) as RawRecord<T> | undefined;
 
 		// ログがあればそれを返して終了
@@ -333,8 +331,8 @@ export default abstract class Chart<T extends Schema> {
 		try {
 			// ロック内でもう1回チェックする
 			const currentLog = await repository.findOneBy({
-				date: date,
-				...(group ? { group: group } : {}),
+				date,
+				...(group ? { group } : {}),
 			}) as RawRecord<T> | undefined;
 
 			// ログがあればそれを返して終了
@@ -348,8 +346,8 @@ export default abstract class Chart<T extends Schema> {
 
 			// 新規ログ挿入
 			log = await repository.insert({
-				date: date,
-				...(group ? { group: group } : {}),
+				date,
+				...(group ? { group } : {}),
 				...columns,
 			}).then(x => repository.findOneByOrFail(x.identifiers[0])) as RawRecord<T>;
 
@@ -582,7 +580,7 @@ export default abstract class Chart<T extends Schema> {
 		let logs = await repository.find({
 			where: {
 				date: Between(Chart.dateToTimestamp(gt), Chart.dateToTimestamp(lt)),
-				...(group ? { group: group } : {}),
+				...(group ? { group } : {}),
 			},
 			order: {
 				date: -1,
@@ -594,9 +592,7 @@ export default abstract class Chart<T extends Schema> {
 			// もっとも新しいログを持ってくる
 			// (すくなくともひとつログが無いと隙間埋めできないため)
 			const recentLog = await repository.findOne({
-				where: group ? {
-					group: group,
-				} : {},
+				where: group ? { group } : {},
 				order: {
 					date: -1,
 				},
@@ -613,7 +609,7 @@ export default abstract class Chart<T extends Schema> {
 			const outdatedLog = await repository.findOne({
 				where: {
 					date: LessThan(Chart.dateToTimestamp(gt)),
-					...(group ? { group: group } : {}),
+					...(group ? { group } : {}),
 				},
 				order: {
 					date: -1,
diff --git a/packages/backend/src/services/create-notification.ts b/packages/backend/src/services/create-notification.ts
index d53a4235b..ece868a1c 100644
--- a/packages/backend/src/services/create-notification.ts
+++ b/packages/backend/src/services/create-notification.ts
@@ -23,8 +23,8 @@ export async function createNotification(
 	const notification = await Notifications.insert({
 		id: genId(),
 		createdAt: new Date(),
-		notifieeId: notifieeId,
-		type: type,
+		notifieeId,
+		type,
 		// 相手がこの通知をミュートしているようなら、既読を予めつけておく
 		isRead: isMuted,
 		...data,
diff --git a/packages/backend/src/services/create-system-user.ts b/packages/backend/src/services/create-system-user.ts
index 4ca5f5fc4..8d74c90f2 100644
--- a/packages/backend/src/services/create-system-user.ts
+++ b/packages/backend/src/services/create-system-user.ts
@@ -36,7 +36,7 @@ export async function createSystemUser(username: string) {
 		account = await transactionalEntityManager.insert(User, {
 			id: genId(),
 			createdAt: new Date(),
-			username: username,
+			username,
 			usernameLower: username.toLowerCase(),
 			host: null,
 			token: secret,
diff --git a/packages/backend/src/services/drive/upload-from-url.ts b/packages/backend/src/services/drive/upload-from-url.ts
index 252ba0b7e..67056cf84 100644
--- a/packages/backend/src/services/drive/upload-from-url.ts
+++ b/packages/backend/src/services/drive/upload-from-url.ts
@@ -54,8 +54,8 @@ export async function uploadFromUrl({
 		return driveFile!;
 	} catch (e) {
 		logger.error(`Failed to create drive file: ${e}`, {
-			url: url,
-			e: e,
+			url,
+			e,
 		});
 		throw e;
 	} finally {
diff --git a/packages/backend/src/services/insert-moderation-log.ts b/packages/backend/src/services/insert-moderation-log.ts
index 0a7c472d8..821199962 100644
--- a/packages/backend/src/services/insert-moderation-log.ts
+++ b/packages/backend/src/services/insert-moderation-log.ts
@@ -7,7 +7,7 @@ export async function insertModerationLog(moderator: { id: User['id'] }, type: s
 		id: genId(),
 		createdAt: new Date(),
 		userId: moderator.id,
-		type: type,
+		type,
 		info: info || {},
 	});
 }
diff --git a/packages/backend/src/services/logger.ts b/packages/backend/src/services/logger.ts
index 2d30c757b..a2bc940d8 100644
--- a/packages/backend/src/services/logger.ts
+++ b/packages/backend/src/services/logger.ts
@@ -22,7 +22,7 @@ export default class Logger {
 	constructor(domain: string, color?: string, store = true) {
 		this.domain = {
 			name: domain,
-			color: color,
+			color,
 		};
 		this.store = store;
 
diff --git a/packages/backend/src/services/note/create.ts b/packages/backend/src/services/note/create.ts
index 5b60847fd..4312deb30 100644
--- a/packages/backend/src/services/note/create.ts
+++ b/packages/backend/src/services/note/create.ts
@@ -72,7 +72,7 @@ class NotificationManager {
 			}
 		} else {
 			this.queue.push({
-				reason: reason,
+				reason,
 				target: notifiee,
 			});
 		}
diff --git a/packages/backend/src/services/note/delete.ts b/packages/backend/src/services/note/delete.ts
index f224f527d..620a05e1a 100644
--- a/packages/backend/src/services/note/delete.ts
+++ b/packages/backend/src/services/note/delete.ts
@@ -35,9 +35,7 @@ export default async function(user: { id: User['id']; uri: User['uri']; host: Us
 	}
 
 	if (!quiet) {
-		publishNoteStream(note.id, 'deleted', {
-			deletedAt: deletedAt,
-		});
+		publishNoteStream(note.id, 'deleted', { deletedAt });
 
 		//#region ローカルの投稿なら削除アクティビティを配送
 		if (Users.isLocalUser(user) && !note.localOnly) {
diff --git a/packages/backend/src/services/note/polls/vote.ts b/packages/backend/src/services/note/polls/vote.ts
index 07136db5b..2c902f3ed 100644
--- a/packages/backend/src/services/note/polls/vote.ts
+++ b/packages/backend/src/services/note/polls/vote.ts
@@ -45,7 +45,7 @@ export default async function(user: CacheableUser, note: Note, choice: number) {
 		createdAt: new Date(),
 		noteId: note.id,
 		userId: user.id,
-		choice: choice,
+		choice,
 	});
 
 	// Increment votes count
@@ -53,7 +53,7 @@ export default async function(user: CacheableUser, note: Note, choice: number) {
 	await Polls.query(`UPDATE poll SET votes[${index}] = votes[${index}] + 1 WHERE "noteId" = '${poll.noteId}'`);
 
 	publishNoteStream(note.id, 'pollVoted', {
-		choice: choice,
+		choice,
 		userId: user.id,
 	});
 
@@ -61,7 +61,7 @@ export default async function(user: CacheableUser, note: Note, choice: number) {
 	createNotification(note.userId, 'pollVote', {
 		notifierId: user.id,
 		noteId: note.id,
-		choice: choice,
+		choice,
 	});
 
 	// Fetch watchers
@@ -74,7 +74,7 @@ export default async function(user: CacheableUser, note: Note, choice: number) {
 			createNotification(watcher.userId, 'pollVote', {
 				notifierId: user.id,
 				noteId: note.id,
-				choice: choice,
+				choice,
 			});
 		}
 	});
diff --git a/packages/backend/src/services/note/reaction/create.ts b/packages/backend/src/services/note/reaction/create.ts
index 4d2a4d3bd..1647ca4bc 100644
--- a/packages/backend/src/services/note/reaction/create.ts
+++ b/packages/backend/src/services/note/reaction/create.ts
@@ -103,7 +103,7 @@ export default async (user: { id: User['id']; host: User['host']; }, note: Note,
 		createNotification(note.userId, 'reaction', {
 			notifierId: user.id,
 			noteId: note.id,
-			reaction: reaction,
+			reaction,
 		});
 	}
 
@@ -116,7 +116,7 @@ export default async (user: { id: User['id']; host: User['host']; }, note: Note,
 			createNotification(watcher.userId, 'reaction', {
 				notifierId: user.id,
 				noteId: note.id,
-				reaction: reaction,
+				reaction,
 			});
 		}
 	});
diff --git a/packages/backend/src/services/note/read.ts b/packages/backend/src/services/note/read.ts
index cc2b8ac4e..15bf8d3de 100644
--- a/packages/backend/src/services/note/read.ts
+++ b/packages/backend/src/services/note/read.ts
@@ -62,14 +62,14 @@ export default async function(
 	if ((readMentions.length > 0) || (readSpecifiedNotes.length > 0) || (readChannelNotes.length > 0)) {
 		// Remove the record
 		await NoteUnreads.delete({
-			userId: userId,
+			userId,
 			noteId: In([...readMentions.map(n => n.id), ...readSpecifiedNotes.map(n => n.id), ...readChannelNotes.map(n => n.id)]),
 		});
 
 		// TODO: ↓まとめてクエリしたい
 
 		NoteUnreads.countBy({
-			userId: userId,
+			userId,
 			isMentioned: true,
 		}).then(mentionsCount => {
 			if (mentionsCount === 0) {
@@ -79,7 +79,7 @@ export default async function(
 		});
 
 		NoteUnreads.countBy({
-			userId: userId,
+			userId,
 			isSpecified: true,
 		}).then(specifiedCount => {
 			if (specifiedCount === 0) {
@@ -89,7 +89,7 @@ export default async function(
 		});
 
 		NoteUnreads.countBy({
-			userId: userId,
+			userId,
 			noteChannelId: Not(IsNull()),
 		}).then(channelNoteCount => {
 			if (channelNoteCount === 0) {
diff --git a/packages/backend/src/services/note/unread.ts b/packages/backend/src/services/note/unread.ts
index d9ed711e0..d10b37a43 100644
--- a/packages/backend/src/services/note/unread.ts
+++ b/packages/backend/src/services/note/unread.ts
@@ -19,7 +19,7 @@ export async function insertNoteUnread(userId: User['id'], note: Note, params: {
 
 	// スレッドミュート
 	const threadMute = await NoteThreadMutings.findOneBy({
-		userId: userId,
+		userId,
 		threadId: note.threadId || note.id,
 	});
 	if (threadMute) return;
@@ -27,7 +27,7 @@ export async function insertNoteUnread(userId: User['id'], note: Note, params: {
 	const unread = {
 		id: genId(),
 		noteId: note.id,
-		userId: userId,
+		userId,
 		isSpecified: params.isSpecified,
 		isMentioned: params.isMentioned,
 		noteChannelId: note.channelId,
diff --git a/packages/backend/src/services/push-notification.ts b/packages/backend/src/services/push-notification.ts
index 5c3bafbb3..a763f5399 100644
--- a/packages/backend/src/services/push-notification.ts
+++ b/packages/backend/src/services/push-notification.ts
@@ -47,9 +47,7 @@ export async function pushNotification<T extends keyof pushNotificationsTypes>(u
 		meta.swPrivateKey);
 
 	// Fetch
-	const subscriptions = await SwSubscriptions.findBy({
-		userId: userId,
-	});
+	const subscriptions = await SwSubscriptions.findBy({ userId });
 
 	for (const subscription of subscriptions) {
 		const pushSubscription = {
@@ -73,7 +71,7 @@ export async function pushNotification<T extends keyof pushNotificationsTypes>(u
 
 			if (err.statusCode === 410) {
 				SwSubscriptions.delete({
-					userId: userId,
+					userId,
 					endpoint: subscription.endpoint,
 					auth: subscription.auth,
 					publickey: subscription.publickey,
diff --git a/packages/backend/src/services/send-email.ts b/packages/backend/src/services/send-email.ts
index 0e454a755..08bc12a30 100644
--- a/packages/backend/src/services/send-email.ts
+++ b/packages/backend/src/services/send-email.ts
@@ -29,9 +29,9 @@ export async function sendEmail(to: string, subject: string, html: string, text:
 		// TODO: htmlサニタイズ
 		const info = await transporter.sendMail({
 			from: meta.email!,
-			to: to,
-			subject: subject,
-			text: text,
+			to,
+			subject,
+			text,
 			html: `<!doctype html>
 <html>
 	<head>
diff --git a/packages/backend/src/services/stream.ts b/packages/backend/src/services/stream.ts
index 7d57c1881..0119d7fdf 100644
--- a/packages/backend/src/services/stream.ts
+++ b/packages/backend/src/services/stream.ts
@@ -26,12 +26,12 @@ import {
 class Publisher {
 	private publish = (channel: StreamChannels, type: string | null, value?: any): void => {
 		const message = type == null ? value : value == null ?
-			{ type: type, body: null } :
-			{ type: type, body: value };
+			{ type, body: null } :
+			{ type, body: value };
 
 		redisClient.publish(config.host, JSON.stringify({
-			channel: channel,
-			message: message,
+			channel,
+			message,
 		}));
 	};
 
diff --git a/packages/shared/.eslintrc.js b/packages/shared/.eslintrc.js
index a50992a48..76b8070f3 100644
--- a/packages/shared/.eslintrc.js
+++ b/packages/shared/.eslintrc.js
@@ -77,6 +77,6 @@ module.exports = {
 		'import/order': ['warn', {
 			'groups': ['builtin', 'external', 'internal', 'parent', 'sibling', 'index', 'object', 'type'],
 		}],
-		'object-shorthand': ['warn', 'consistent-as-needed'],
+		'object-shorthand': ['warn', 'always'],
 	},
 };

From 585e4f5c42cfafb6cdf7eb601ab435d6a4d85a96 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 3 Aug 2022 22:28:06 +0200
Subject: [PATCH 22/34] fix textarea not updating properly

fixes https://akkoma.dev/FoundKeyGang/FoundKey/issues/54
---
 packages/client/src/components/form/textarea.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/components/form/textarea.vue b/packages/client/src/components/form/textarea.vue
index 347454f67..f2b5a4e74 100644
--- a/packages/client/src/components/form/textarea.vue
+++ b/packages/client/src/components/form/textarea.vue
@@ -95,7 +95,7 @@ const updated = (): void => {
 };
 const debouncedUpdated = debounce(1000, updated);
 
-watch(modelValue, () => {
+watch($$(v), () => {
 	if (!props.manualSave) {
 		if (props.debounce) {
 			debouncedUpdated();

From 4fbe2e065e75ed3e5b4dfdfd4be3baa03cc447c3 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Wed, 3 Aug 2022 22:48:13 +0200
Subject: [PATCH 23/34] client: fix lint "quotes"

---
 packages/client/src/components/post-form-attaches.vue | 4 ++--
 packages/client/src/components/ui/container.vue       | 2 +-
 packages/client/src/scripts/initialize-sw.ts          | 2 +-
 packages/client/src/scripts/physics.ts                | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/components/post-form-attaches.vue b/packages/client/src/components/post-form-attaches.vue
index 6b9827407..f0011ed03 100644
--- a/packages/client/src/components/post-form-attaches.vue
+++ b/packages/client/src/components/post-form-attaches.vue
@@ -88,11 +88,11 @@ export default defineComponent({
 		},
 
 		async describe(file) {
-			os.popup(defineAsyncComponent(() => import("@/components/media-caption.vue")), {
+			os.popup(defineAsyncComponent(() => import('@/components/media-caption.vue')), {
 				title: this.$ts.describeFile,
 				input: {
 					placeholder: this.$ts.inputNewDescription,
-					default: file.comment !== null ? file.comment : "",
+					default: file.comment !== null ? file.comment : '',
 				},
 				image: file
 			}, {
diff --git a/packages/client/src/components/ui/container.vue b/packages/client/src/components/ui/container.vue
index 7c595d811..79920323d 100644
--- a/packages/client/src/components/ui/container.vue
+++ b/packages/client/src/components/ui/container.vue
@@ -79,7 +79,7 @@ export default defineComponent({
 			const headerHeight = this.showHeader ? this.$refs.header.offsetHeight : 0;
 			this.$el.style.minHeight = `${headerHeight}px`;
 			if (showBody) {
-				this.$el.style.flexBasis = `auto`;
+				this.$el.style.flexBasis = 'auto';
 			} else {
 				this.$el.style.flexBasis = `${headerHeight}px`;
 			}
diff --git a/packages/client/src/scripts/initialize-sw.ts b/packages/client/src/scripts/initialize-sw.ts
index 7bacfbdf0..04d39b66d 100644
--- a/packages/client/src/scripts/initialize-sw.ts
+++ b/packages/client/src/scripts/initialize-sw.ts
@@ -6,7 +6,7 @@ import { lang } from '@/config';
 export async function initializeSw() {
 	if (!('serviceWorker' in navigator)) return;
 
-	navigator.serviceWorker.register(`/sw.js`, { scope: '/', type: 'classic' });
+	navigator.serviceWorker.register('/sw.js', { scope: '/', type: 'classic' });
 	navigator.serviceWorker.ready.then(registration => {
 		registration.active?.postMessage({
 			msg: 'initialize',
diff --git a/packages/client/src/scripts/physics.ts b/packages/client/src/scripts/physics.ts
index 9e657906c..47a168eed 100644
--- a/packages/client/src/scripts/physics.ts
+++ b/packages/client/src/scripts/physics.ts
@@ -109,7 +109,7 @@ export function physics(container: HTMLElement) {
 	render.mouse = mouse;
 
 	for (const objEl of objEls) {
-		objEl.style.position = `absolute`;
+		objEl.style.position = 'absolute';
 		objEl.style.top = 0;
 		objEl.style.left = 0;
 		objEl.style.margin = 0;

From a3a3cb72580fb95ae251d505ca97a13de0706526 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Thu, 4 Aug 2022 00:20:59 +0200
Subject: [PATCH 24/34] remove --quiet flag from eslint

This flag means to hide warnings which is not generally desirable.
Even if warnings do not affect the end result of running CI it would
still be nice to be able to see the warnings when running the lints
normally or in CI.
---
 packages/backend/package.json | 2 +-
 packages/client/package.json  | 2 +-
 packages/sw/package.json      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index ac27a242a..09fb52b3d 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -5,7 +5,7 @@
 	"scripts": {
 		"build": "tsc -p tsconfig.json || echo done. && tsc-alias -p tsconfig.json",
 		"watch": "node watch.mjs",
-		"lint": "eslint --quiet src --ext .ts",
+		"lint": "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",
 		"test": "npm run mocha"
 	},
diff --git a/packages/client/package.json b/packages/client/package.json
index cbc9d8d34..3122c83cb 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -3,7 +3,7 @@
 	"scripts": {
 		"watch": "vite build --watch --mode development",
 		"build": "vite build",
-		"lint": "eslint --quiet src --ext .ts,.vue"
+		"lint": "eslint src --ext .ts,.vue"
 	},
 	"resolutions": {
 		"chokidar": "^3.3.1",
diff --git a/packages/sw/package.json b/packages/sw/package.json
index e333c7bf5..7cb069610 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -3,7 +3,7 @@
 	"scripts": {
 		"watch": "node build.js watch",
 		"build": "node build.js",
-		"lint": "eslint --quiet src --ext .ts"
+		"lint": "eslint src --ext .ts"
 	},
 	"resolutions": {},
 	"dependencies": {

From e2bf2715a6462ed377b033956d65260157f042ea Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Thu, 4 Aug 2022 10:20:48 +0200
Subject: [PATCH 25/34] fix spelling error

---
 packages/backend/src/db/redis.ts             | 4 ++--
 packages/backend/src/misc/antenna-cache.ts   | 4 ++--
 packages/backend/src/misc/webhook-cache.ts   | 4 ++--
 packages/backend/src/server/api/streaming.ts | 2 +-
 packages/backend/src/services/user-cache.ts  | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/backend/src/db/redis.ts b/packages/backend/src/db/redis.ts
index 1843d2317..cd9c81eb3 100644
--- a/packages/backend/src/db/redis.ts
+++ b/packages/backend/src/db/redis.ts
@@ -12,7 +12,7 @@ export function createConnection() {
 	});
 }
 
-export const subsdcriber = createConnection();
-subsdcriber.subscribe(config.host);
+export const subscriber = createConnection();
+subscriber.subscribe(config.host);
 
 export const redisClient = createConnection();
diff --git a/packages/backend/src/misc/antenna-cache.ts b/packages/backend/src/misc/antenna-cache.ts
index 4ea5a29df..97249c146 100644
--- a/packages/backend/src/misc/antenna-cache.ts
+++ b/packages/backend/src/misc/antenna-cache.ts
@@ -1,6 +1,6 @@
 import { Antennas } from '@/models/index.js';
 import { Antenna } from '@/models/entities/antenna.js';
-import { subsdcriber } from '@/db/redis.js';
+import { subscriber } from '@/db/redis.js';
 
 let antennasFetched = false;
 let antennas: Antenna[] = [];
@@ -14,7 +14,7 @@ export async function getAntennas() {
 	return antennas;
 }
 
-subsdcriber.on('message', async (_, data) => {
+subscriber.on('message', async (_, data) => {
 	const obj = JSON.parse(data);
 
 	if (obj.channel === 'internal') {
diff --git a/packages/backend/src/misc/webhook-cache.ts b/packages/backend/src/misc/webhook-cache.ts
index 478f22d9c..5e72dbd92 100644
--- a/packages/backend/src/misc/webhook-cache.ts
+++ b/packages/backend/src/misc/webhook-cache.ts
@@ -1,6 +1,6 @@
 import { Webhooks } from '@/models/index.js';
 import { Webhook } from '@/models/entities/webhook.js';
-import { subsdcriber } from '@/db/redis.js';
+import { subscriber } from '@/db/redis.js';
 
 let webhooksFetched = false;
 let webhooks: Webhook[] = [];
@@ -16,7 +16,7 @@ export async function getActiveWebhooks() {
 	return webhooks;
 }
 
-subsdcriber.on('message', async (_, data) => {
+subscriber.on('message', async (_, data) => {
 	const obj = JSON.parse(data);
 
 	if (obj.channel === 'internal') {
diff --git a/packages/backend/src/server/api/streaming.ts b/packages/backend/src/server/api/streaming.ts
index 6d430a938..7cf365faf 100644
--- a/packages/backend/src/server/api/streaming.ts
+++ b/packages/backend/src/server/api/streaming.ts
@@ -3,7 +3,7 @@ import { EventEmitter } from 'events';
 import { ParsedUrlQuery } from 'querystring';
 import * as websocket from 'websocket';
 
-import { subsdcriber as redisClient } from '@/db/redis.js';
+import { subscriber as redisClient } from '@/db/redis.js';
 import { Users } from '@/models/index.js';
 import MainStreamConnection from './stream/index.js';
 import authenticate from './authenticate.js';
diff --git a/packages/backend/src/services/user-cache.ts b/packages/backend/src/services/user-cache.ts
index 39b9e98eb..d95a8968a 100644
--- a/packages/backend/src/services/user-cache.ts
+++ b/packages/backend/src/services/user-cache.ts
@@ -1,14 +1,14 @@
 import { CacheableLocalUser, CacheableUser, ILocalUser } from '@/models/entities/user.js';
 import { Users } from '@/models/index.js';
 import { Cache } from '@/misc/cache.js';
-import { subsdcriber } from '@/db/redis.js';
+import { subscriber } from '@/db/redis.js';
 
 export const userByIdCache = new Cache<CacheableUser>(Infinity);
 export const localUserByNativeTokenCache = new Cache<CacheableLocalUser | null>(Infinity);
 export const localUserByIdCache = new Cache<CacheableLocalUser>(Infinity);
 export const uriPersonCache = new Cache<CacheableUser | null>(Infinity);
 
-subsdcriber.on('message', async (_, data) => {
+subscriber.on('message', async (_, data) => {
 	const obj = JSON.parse(data);
 
 	if (obj.channel === 'internal') {

From 09a7eabda137e77f81ab31f65d69329670693c8d Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Thu, 4 Aug 2022 11:00:02 +0200
Subject: [PATCH 26/34] backend: fix lint "no-throw-literal"

---
 packages/backend/src/boot/master.ts                  |  7 +++----
 packages/backend/src/config/load.ts                  |  2 +-
 packages/backend/src/misc/captcha.ts                 | 12 ++++++------
 packages/backend/src/misc/gen-id.ts                  |  2 +-
 packages/backend/src/prelude/time.ts                 |  2 +-
 .../src/queue/processors/db/import-blocking.ts       |  2 +-
 .../src/queue/processors/db/import-following.ts      |  2 +-
 .../backend/src/queue/processors/db/import-muting.ts |  2 +-
 packages/backend/src/queue/processors/deliver.ts     |  2 +-
 packages/backend/src/queue/processors/inbox.ts       |  2 +-
 .../backend/src/queue/processors/webhook-deliver.ts  |  2 +-
 .../src/remote/activitypub/misc/ld-signature.ts      |  4 ++--
 .../backend/src/remote/activitypub/models/note.ts    |  4 ++--
 .../src/server/api/endpoints/admin/relays/add.ts     |  3 ++-
 .../src/server/api/endpoints/admin/suspend-user.ts   |  2 +-
 .../src/server/api/endpoints/notes/search-by-tag.ts  |  6 +++---
 .../backend/src/server/api/endpoints/reset-db.ts     |  2 +-
 .../backend/src/services/fetch-instance-metadata.ts  | 12 ++++++------
 packages/backend/src/services/relay.ts               |  2 +-
 19 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index 1093e6edc..8583823ee 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -110,13 +110,12 @@ function loadConfigBoot(): Config {
 	try {
 		config = loadConfig();
 	} catch (exception) {
-		if (typeof exception === 'string') {
-			configLogger.error(exception);
-			process.exit(1);
-		}
 		if (exception.code === 'ENOENT') {
 			configLogger.error('Configuration file not found', null, true);
 			process.exit(1);
+		} else if (e instanceof Error) {
+			configLogger.error(e.message);
+			process.exit(1);
 		}
 		throw exception;
 	}
diff --git a/packages/backend/src/config/load.ts b/packages/backend/src/config/load.ts
index d82c8a396..535f258df 100644
--- a/packages/backend/src/config/load.ts
+++ b/packages/backend/src/config/load.ts
@@ -59,6 +59,6 @@ function tryCreateUrl(url: string) {
 	try {
 		return new URL(url);
 	} catch (e) {
-		throw `url="${url}" is not a valid URL.`;
+		throw new Error(`url="${url}" is not a valid URL.`);
 	}
 }
diff --git a/packages/backend/src/misc/captcha.ts b/packages/backend/src/misc/captcha.ts
index 2a128c25f..4238116fe 100644
--- a/packages/backend/src/misc/captcha.ts
+++ b/packages/backend/src/misc/captcha.ts
@@ -5,23 +5,23 @@ import { getAgentByUrl } from './fetch.js';
 
 export async function verifyRecaptcha(secret: string, response: string) {
 	const result = await getCaptchaResponse('https://www.recaptcha.net/recaptcha/api/siteverify', secret, response).catch(e => {
-		throw `recaptcha-request-failed: ${e}`;
+		throw new Error(`recaptcha-request-failed: ${e.message}`);
 	});
 
 	if (result.success !== true) {
 		const errorCodes = result['error-codes'] ? result['error-codes']?.join(', ') : '';
-		throw `recaptcha-failed: ${errorCodes}`;
+		throw new Error(`recaptcha-failed: ${errorCodes}`);
 	}
 }
 
 export async function verifyHcaptcha(secret: string, response: string) {
 	const result = await getCaptchaResponse('https://hcaptcha.com/siteverify', secret, response).catch(e => {
-		throw `hcaptcha-request-failed: ${e}`;
+		throw new Error(`hcaptcha-request-failed: ${e.message}`);
 	});
 
 	if (result.success !== true) {
 		const errorCodes = result['error-codes'] ? result['error-codes']?.join(', ') : '';
-		throw `hcaptcha-failed: ${errorCodes}`;
+		throw new Error(`hcaptcha-failed: ${errorCodes}`);
 	}
 }
 
@@ -46,11 +46,11 @@ async function getCaptchaResponse(url: string, secret: string, response: string)
 		//timeout: 10 * 1000,
 		agent: getAgentByUrl,
 	}).catch(e => {
-		throw `${e.message || e}`;
+		throw new Error(`${e.message || e}`);
 	});
 
 	if (!res.ok) {
-		throw `${res.status}`;
+		throw new Error(`${res.status}`);
 	}
 
 	return await res.json() as CaptchaResponse;
diff --git a/packages/backend/src/misc/gen-id.ts b/packages/backend/src/misc/gen-id.ts
index 1a7a511b6..3caa81906 100644
--- a/packages/backend/src/misc/gen-id.ts
+++ b/packages/backend/src/misc/gen-id.ts
@@ -13,7 +13,7 @@ export function genId(date?: Date): string {
 	let t = date.getTime();
 	t -= TIME2000;
 	if (t < 0) t = 0;
-	if (isNaN(t)) throw 'Failed to create AID: Invalid Date';
+	if (isNaN(t)) throw new Error('Failed to create AID: Invalid Date');
 	const time = t.toString(36).padStart(8, '0');
 
 	counter++;
diff --git a/packages/backend/src/prelude/time.ts b/packages/backend/src/prelude/time.ts
index 34e8b6b17..0da1f7913 100644
--- a/packages/backend/src/prelude/time.ts
+++ b/packages/backend/src/prelude/time.ts
@@ -13,7 +13,7 @@ export function dateUTC(time: number[]): Date {
 					: time.length === 7 ? Date.UTC(time[0], time[1], time[2], time[3], time[4], time[5], time[6])
 					: null;
 
-	if (!d) throw 'wrong number of arguments';
+	if (!d) throw new Error('wrong number of arguments');
 
 	return new Date(d);
 }
diff --git a/packages/backend/src/queue/processors/db/import-blocking.ts b/packages/backend/src/queue/processors/db/import-blocking.ts
index ec6061aba..33bf45730 100644
--- a/packages/backend/src/queue/processors/db/import-blocking.ts
+++ b/packages/backend/src/queue/processors/db/import-blocking.ts
@@ -55,7 +55,7 @@ export async function importBlocking(job: Bull.Job<DbUserImportJobData>, done: a
 			}
 
 			if (target == null) {
-				throw `cannot resolve user: @${username}@${host}`;
+				throw new Error(`cannot resolve user: @${username}@${host}`);
 			}
 
 			// skip myself
diff --git a/packages/backend/src/queue/processors/db/import-following.ts b/packages/backend/src/queue/processors/db/import-following.ts
index a19612389..e01ffe517 100644
--- a/packages/backend/src/queue/processors/db/import-following.ts
+++ b/packages/backend/src/queue/processors/db/import-following.ts
@@ -55,7 +55,7 @@ export async function importFollowing(job: Bull.Job<DbUserImportJobData>, done:
 			}
 
 			if (target == null) {
-				throw `cannot resolve user: @${username}@${host}`;
+				throw new Error(`cannot resolve user: @${username}@${host}`);
 			}
 
 			// skip myself
diff --git a/packages/backend/src/queue/processors/db/import-muting.ts b/packages/backend/src/queue/processors/db/import-muting.ts
index b0c69829b..ec7c6a8d7 100644
--- a/packages/backend/src/queue/processors/db/import-muting.ts
+++ b/packages/backend/src/queue/processors/db/import-muting.ts
@@ -56,7 +56,7 @@ export async function importMuting(job: Bull.Job<DbUserImportJobData>, done: any
 			}
 
 			if (target == null) {
-				throw `cannot resolve user: @${username}@${host}`;
+				throw new Error(`cannot resolve user: @${username}@${host}`);
 			}
 
 			// skip myself
diff --git a/packages/backend/src/queue/processors/deliver.ts b/packages/backend/src/queue/processors/deliver.ts
index a9229a4bc..a7a0e4be9 100644
--- a/packages/backend/src/queue/processors/deliver.ts
+++ b/packages/backend/src/queue/processors/deliver.ts
@@ -89,7 +89,7 @@ export default async (job: Bull.Job<DeliverJobData>) => {
 			}
 
 			// 5xx etc.
-			throw `${res.statusCode} ${res.statusMessage}`;
+			throw new Error(`${res.statusCode} ${res.statusMessage}`);
 		} else {
 			// DNS error, socket error, timeout ...
 			throw res;
diff --git a/packages/backend/src/queue/processors/inbox.ts b/packages/backend/src/queue/processors/inbox.ts
index f48c5e266..bf25aca20 100644
--- a/packages/backend/src/queue/processors/inbox.ts
+++ b/packages/backend/src/queue/processors/inbox.ts
@@ -62,7 +62,7 @@ export default async (job: Bull.Job<InboxJobData>): Promise<string> => {
 				if (e.isClientError) {
 					return `skip: Ignored deleted actors on both ends ${activity.actor} - ${e.statusCode}`;
 				}
-				throw `Error in actor ${activity.actor} - ${e.statusCode || e}`;
+				throw new Error(`Error in actor ${activity.actor} - ${e.statusCode || e}`);
 			}
 		}
 	}
diff --git a/packages/backend/src/queue/processors/webhook-deliver.ts b/packages/backend/src/queue/processors/webhook-deliver.ts
index 64396b458..07dfb61c6 100644
--- a/packages/backend/src/queue/processors/webhook-deliver.ts
+++ b/packages/backend/src/queue/processors/webhook-deliver.ts
@@ -49,7 +49,7 @@ export default async (job: Bull.Job<WebhookDeliverJobData>) => {
 			}
 
 			// 5xx etc.
-			throw `${res.statusCode} ${res.statusMessage}`;
+			throw new Error(`${res.statusCode} ${res.statusMessage}`);
 		} else {
 			// DNS error, socket error, timeout ...
 			throw res;
diff --git a/packages/backend/src/remote/activitypub/misc/ld-signature.ts b/packages/backend/src/remote/activitypub/misc/ld-signature.ts
index 49a8dbbe9..4e0940a72 100644
--- a/packages/backend/src/remote/activitypub/misc/ld-signature.ts
+++ b/packages/backend/src/remote/activitypub/misc/ld-signature.ts
@@ -85,7 +85,7 @@ export class LdSignature {
 
 	private getLoader() {
 		return async (url: string): Promise<any> => {
-			if (!url.match('^https?\:\/\/')) throw `Invalid URL ${url}`;
+			if (!url.match('^https?\:\/\/')) throw new Error(`Invalid URL ${url}`);
 
 			if (this.preLoad) {
 				if (url in CONTEXTS) {
@@ -118,7 +118,7 @@ export class LdSignature {
 			agent: u => u.protocol === 'http:' ? httpAgent : httpsAgent,
 		}).then(res => {
 			if (!res.ok) {
-				throw `${res.status} ${res.statusText}`;
+				throw new Error(`${res.status} ${res.statusText}`);
 			} else {
 				return res.json();
 			}
diff --git a/packages/backend/src/remote/activitypub/models/note.ts b/packages/backend/src/remote/activitypub/models/note.ts
index b1fa1a0cb..c532f81ae 100644
--- a/packages/backend/src/remote/activitypub/models/note.ts
+++ b/packages/backend/src/remote/activitypub/models/note.ts
@@ -189,7 +189,7 @@ export async function createNote(value: string | IObject, resolver?: Resolver, s
 		quote = results.filter((x): x is { status: 'ok', res: Note | null } => x.status === 'ok').map(x => x.res).find(x => x);
 		if (!quote) {
 			if (results.some(x => x.status === 'temperror')) {
-				throw 'quote resolve failed';
+				throw new Error('quote resolve failed');
 			}
 		}
 	}
@@ -276,7 +276,7 @@ export async function resolveNote(value: string | IObject, resolver?: Resolver):
 
 	// ブロックしてたら中断
 	const meta = await fetchMeta();
-	if (meta.blockedHosts.includes(extractDbHost(uri))) throw { statusCode: 451 };
+	if (meta.blockedHosts.includes(extractDbHost(uri))) throw new StatusError('host blocked', 451, `host ${extractDbHost(uri)} is blocked`);
 
 	const unlock = await getApLock(uri);
 
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 caee34787..94f757bdc 100644
--- a/packages/backend/src/server/api/endpoints/admin/relays/add.ts
+++ b/packages/backend/src/server/api/endpoints/admin/relays/add.ts
@@ -27,6 +27,7 @@ export const meta = {
 				format: 'id',
 			},
 			inbox: {
+				description: 'URL of the inbox, must be a https scheme URL',
 				type: 'string',
 				optional: false, nullable: false,
 				format: 'url',
@@ -56,7 +57,7 @@ export const paramDef = {
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
 	try {
-		if (new URL(ps.inbox).protocol !== 'https:') throw 'https only';
+		if (new URL(ps.inbox).protocol !== 'https:') throw new Error('https only');
 	} catch {
 		throw new ApiError(meta.errors.invalidUrl);
 	}
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 8b62daf7a..90ad703a3 100644
--- a/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
+++ b/packages/backend/src/server/api/endpoints/admin/suspend-user.ts
@@ -68,7 +68,7 @@ async function unFollowAll(follower: User) {
 		});
 
 		if (followee == null) {
-			throw `Cant find followee ${following.followeeId}`;
+			throw new Error(`Cant find followee ${following.followeeId}`);
 		}
 
 		await deleteFollowing(follower, followee, true);
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 777de7221..ef9f6c39c 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
@@ -86,14 +86,14 @@ export default define(meta, paramDef, async (ps, me) => {
 
 	try {
 		if (ps.tag) {
-			if (!safeForSql(ps.tag)) throw 'Injection';
+			if (!safeForSql(ps.tag)) throw new Error('Injection');
 			query.andWhere(`'{"${normalizeForSearch(ps.tag)}"}' <@ note.tags`);
 		} else {
 			query.andWhere(new Brackets(qb => {
 				for (const tags of ps.query!) {
 					qb.orWhere(new Brackets(qb => {
 						for (const tag of tags) {
-							if (!safeForSql(tag)) throw 'Injection';
+							if (!safeForSql(tag)) throw new Error('Injection');
 							qb.andWhere(`'{"${normalizeForSearch(tag)}"}' <@ note.tags`);
 						}
 					}));
@@ -101,7 +101,7 @@ export default define(meta, paramDef, async (ps, me) => {
 			}));
 		}
 	} catch (e) {
-		if (e === 'Injection') return [];
+		if (e.message === 'Injection') return [];
 		throw e;
 	}
 
diff --git a/packages/backend/src/server/api/endpoints/reset-db.ts b/packages/backend/src/server/api/endpoints/reset-db.ts
index 02adfb540..7f17339e9 100644
--- a/packages/backend/src/server/api/endpoints/reset-db.ts
+++ b/packages/backend/src/server/api/endpoints/reset-db.ts
@@ -21,7 +21,7 @@ export const paramDef = {
 
 // eslint-disable-next-line import/no-default-export
 export default define(meta, paramDef, async (ps, user) => {
-	if (process.env.NODE_ENV !== 'test') throw 'NODE_ENV is not a test';
+	if (process.env.NODE_ENV !== 'test') throw new Error('NODE_ENV is not a test');
 
 	await resetDb();
 
diff --git a/packages/backend/src/services/fetch-instance-metadata.ts b/packages/backend/src/services/fetch-instance-metadata.ts
index cd8cc7f33..d318ed74c 100644
--- a/packages/backend/src/services/fetch-instance-metadata.ts
+++ b/packages/backend/src/services/fetch-instance-metadata.ts
@@ -94,14 +94,14 @@ async function fetchNodeinfo(instance: Instance): Promise<NodeInfo> {
 		const wellknown = await getJson('https://' + instance.host + '/.well-known/nodeinfo')
 			.catch(e => {
 				if (e.statusCode === 404) {
-					throw 'No nodeinfo provided';
+					throw new Error('No nodeinfo provided');
 				} else {
-					throw e.statusCode || e.message;
+					throw new Error(e.statusCode || e.message);
 				}
 			}) as Record<string, unknown>;
 
 		if (wellknown.links == null || !Array.isArray(wellknown.links)) {
-			throw 'No wellknown links';
+			throw new Error('No wellknown links');
 		}
 
 		const links = wellknown.links as any[];
@@ -112,19 +112,19 @@ async function fetchNodeinfo(instance: Instance): Promise<NodeInfo> {
 		const link = lnik2_1 || lnik2_0 || lnik1_0;
 
 		if (link == null) {
-			throw 'No nodeinfo link provided';
+			throw new Error('No nodeinfo link provided');
 		}
 
 		const info = await getJson(link.href)
 			.catch(e => {
-				throw e.statusCode || e.message;
+				throw new Error(e.statusCode || e.message);
 			});
 
 		logger.succ(`Successfuly fetched nodeinfo of ${instance.host}`);
 
 		return info as NodeInfo;
 	} catch (e) {
-		logger.error(`Failed to fetch nodeinfo of ${instance.host}: ${e}`);
+		logger.error(`Failed to fetch nodeinfo of ${instance.host}: ${e.message}`);
 
 		throw e;
 	}
diff --git a/packages/backend/src/services/relay.ts b/packages/backend/src/services/relay.ts
index 6bc430443..a05645f09 100644
--- a/packages/backend/src/services/relay.ts
+++ b/packages/backend/src/services/relay.ts
@@ -47,7 +47,7 @@ export async function removeRelay(inbox: string) {
 	});
 
 	if (relay == null) {
-		throw 'relay not found';
+		throw new Error('relay not found');
 	}
 
 	const relayActor = await getRelayActor();

From cbefddc07148d59e643bc91f9ceb1d7fa3553255 Mon Sep 17 00:00:00 2001
From: Johann150 <johann.galle@protonmail.com>
Date: Fri, 5 Aug 2022 08:36:59 +0200
Subject: [PATCH 27/34] fix: copy visibility for renotes

The backend does not allow follower only and direct notes to be renoted
but these are prohibited for the renote button anyway.
---
 packages/client/src/components/renote-button.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/src/components/renote-button.vue b/packages/client/src/components/renote-button.vue
index 3bcbe665b..a067b884f 100644
--- a/packages/client/src/components/renote-button.vue
+++ b/packages/client/src/components/renote-button.vue
@@ -63,7 +63,8 @@ export default defineComponent({
 				icon: 'fas fa-retweet',
 				action: () => {
 					os.api('notes/create', {
-						renoteId: props.note.id
+						renoteId: props.note.id,
+						visibility: props.note.visibility,
 					});
 				}
 			}, {

From 62d1f0acbdec5f6000cdf82b5d9cb5689fcd58fd Mon Sep 17 00:00:00 2001
From: Norm <normandy@biribiri.dev>
Date: Sun, 7 Aug 2022 11:51:35 +0000
Subject: [PATCH 28/34] Update 'CHANGELOG.md'

Add in changes that were made since FoundKey diverged from upstream
---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5caa96b51..84c4bfa72 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@ You should also include the user name that made the change.
 - ハイライトがみつけるに統合されました
 - カスタム絵文字ページはインスタンス情報ページに統合されました
 - 連合ページはインスタンス情報ページに統合されました
+- Remove ads @Johann150
+- Simplify ID generation: Only the `aid` generation algorithm will be supported going forward. @Johann150
 
 ### Improvements
 - Client: Fix URL-encoded routing
@@ -32,6 +34,10 @@ You should also include the user name that made the change.
 - Server: Improve performance
 - Server: Supports IPv6 on Redis transport. @mei23  
   IPv4/IPv6 is used by default. You can tune this behavior via `redis.family`.
+- Backend: Improve mutes and blocks @toast
+- Hide metadata of private notes @Johann150
+- Add padding to pages @norm
+- Emoji picker is now case-insensitive @Johann150
 
 ### Bugfixes
 - Server: Fix GenerateVideoThumbnail failed @mei23

From aabc30cd02e6d81f86685d10f8def844b8645f9d Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Sun, 7 Aug 2022 10:36:12 -0400
Subject: [PATCH 29/34] Archive old changelog

This reverts commit 62d1f0acbdec5f6000cdf82b5d9cb5689fcd58fd and moves
the current changelog to CHANGELOG-OLD.md.

The current format is pretty messy and wasn't really much better than a
git shortlog. Changelogs are meant for end-users to know what changed
between versions. Most probably won't care much about refactors but may
be interested in UI changes, feature additions/removals, and maybe
client API changes (for 3rd party clients).
---
 CHANGELOG.md => CHANGELOG-OLD.md | 6 ------
 1 file changed, 6 deletions(-)
 rename CHANGELOG.md => CHANGELOG-OLD.md (99%)

diff --git a/CHANGELOG.md b/CHANGELOG-OLD.md
similarity index 99%
rename from CHANGELOG.md
rename to CHANGELOG-OLD.md
index 84c4bfa72..5caa96b51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG-OLD.md
@@ -15,8 +15,6 @@ You should also include the user name that made the change.
 - ハイライトがみつけるに統合されました
 - カスタム絵文字ページはインスタンス情報ページに統合されました
 - 連合ページはインスタンス情報ページに統合されました
-- Remove ads @Johann150
-- Simplify ID generation: Only the `aid` generation algorithm will be supported going forward. @Johann150
 
 ### Improvements
 - Client: Fix URL-encoded routing
@@ -34,10 +32,6 @@ You should also include the user name that made the change.
 - Server: Improve performance
 - Server: Supports IPv6 on Redis transport. @mei23  
   IPv4/IPv6 is used by default. You can tune this behavior via `redis.family`.
-- Backend: Improve mutes and blocks @toast
-- Hide metadata of private notes @Johann150
-- Add padding to pages @norm
-- Emoji picker is now case-insensitive @Johann150
 
 ### Bugfixes
 - Server: Fix GenerateVideoThumbnail failed @mei23

From a693c05c0e7590ed37daadad1a94112fd5a3f139 Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Sun, 7 Aug 2022 11:20:21 -0400
Subject: [PATCH 30/34] Create new changelog

This changelog uses the Keep a Changelog format: https://keepachangelog.com/en/1.0.0/
---
 CHANGELOG.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 CHANGELOG.md

diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..f28c0842f
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,51 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+This changelog covers changes since Misskey v12.111.1, the version prior to the FoundKey fork.
+For older Misskey versions, see [CHANGELOG-OLD.md](./CHANGELOG-OLD.md).
+
+## [Unreleased]
+### Added
+- Server: Replies can now be fetched recursively.
+
+### Changed
+- Server: Replies/quotes cannot have a more open visibility than the parent post
+- Client: Searching in the emoji picker is now case insensitive
+- Client: MFM search button changed to a no-op
+- Client: Fix URL-encoded routing
+- Server: Allow GET method for some endpoints
+- Server: Add rate limit to i/notifications
+- Client: Improve control panel
+- Client: Show warning in control panel when there is an unresolved abuse report
+- Client: For notes with specified visibility, show recipients when hovering over visibility symbol.
+- Client: Add rss-ticker widget
+- Client: Removing entries from a clip
+- Client: Poll highlights in explore page
+- Make possible to delete an account by admin
+- Improve player detection in URL preview
+- Add Badge Image to Push Notification
+- Server: Improve performance
+- Server: Supports IPv6 on Redis transport.
+  IPv4/IPv6 is used by default. You can tune this behavior via `redis.family`.
+- Custom Emoji pages have been merged into the Instance Info page
+- Mutes and blocks now apply recursively to replies and renotes.
+
+### Removed
+- Ability to show advertisements
+- Server: ID generation methods other than `aid`
+
+### Fixed
+- Server: Video thumbnails are now generated properly
+- Server: Ensure temp directory cleanup
+- Favicons of remote instances now show up
+- Client: Fix switch to receive email notifications
+- Client: Page freezes when trying to open configuration page of existing webhooks
+- Client: Fix a bug where new chat messages don't show up
+- Client: Fix collapsing long notes
+- Client: Add padding to pages
+
+### Security
+- Hide metadata of private notes

From 3345b4efe1ba76911f1b6e3b53de7299be0d7842 Mon Sep 17 00:00:00 2001
From: Norm <normandy@biribiri.dev>
Date: Mon, 8 Aug 2022 12:28:01 +0000
Subject: [PATCH 31/34] Update version in package.json

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

diff --git a/package.json b/package.json
index ffec400f9..444b3c0d6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "foundkey",
-	"version": "12.111.1-test.1",
+	"version": "13.0.0-preview.1",
 	"repository": {
 		"type": "git",
 		"url": "https://akkoma.dev/FoundKeyGang/FoundKey.git"

From 4fcbf3af36ccbf2f5f549d230e4352f6a025013a Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Sun, 7 Aug 2022 20:33:06 -0400
Subject: [PATCH 32/34] refactor: classic.sidebar.vue to composition api

---
 packages/client/src/ui/classic.sidebar.vue | 152 +++++++++------------
 1 file changed, 64 insertions(+), 88 deletions(-)

diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue
index 6c0ce023e..f080e3a18 100644
--- a/packages/client/src/ui/classic.sidebar.vue
+++ b/packages/client/src/ui/classic.sidebar.vue
@@ -1,34 +1,34 @@
 <template>
-<div class="npcljfve" :class="{ iconOnly }">
-	<button v-click-anime class="item _button account" @click="openAccountMenu">
+<div ref="sidebar" class="npcljfve" :class="{ iconOnly }">
+	<button v-if="$i" v-click-anime class="item _button account" @click="openAccountMenuWrapper">
 		<MkAvatar :user="$i" class="avatar"/><MkAcct class="text" :user="$i"/>
 	</button>
 	<div class="post" data-cy-open-post-form @click="post">
 		<MkButton class="button" gradate full rounded>
-			<i class="fas fa-pencil-alt fa-fw"></i><span v-if="!iconOnly" class="text">{{ $ts.note }}</span>
+			<i class="fas fa-pencil-alt fa-fw"></i><span v-if="!iconOnly" class="text">{{ i18n.ts.note }}</span>
 		</MkButton>
 	</div>
 	<div class="divider"></div>
 	<MkA v-click-anime class="item index" active-class="active" to="/" exact>
-		<i class="fas fa-home fa-fw"></i><span class="text">{{ $ts.timeline }}</span>
+		<i class="fas fa-home fa-fw"></i><span class="text">{{ i18n.ts.timeline }}</span>
 	</MkA>
 	<template v-for="item in menu">
 		<div v-if="item === '-'" class="divider"></div>
 		<component :is="menuDef[item].to ? 'MkA' : 'button'" v-else-if="menuDef[item] && (menuDef[item].show !== false)" v-click-anime class="item _button" :class="item" active-class="active" :to="menuDef[item].to" v-on="menuDef[item].action ? { click: menuDef[item].action } : {}">
-			<i class="fa-fw" :class="menuDef[item].icon"></i><span class="text">{{ $ts[menuDef[item].title] }}</span>
+			<i class="fa-fw" :class="menuDef[item].icon"></i><span class="text">{{ i18n.ts[menuDef[item].title] }}</span>
 			<span v-if="menuDef[item].indicated" class="indicator"><i class="fas fa-circle"></i></span>
 		</component>
 	</template>
 	<div class="divider"></div>
-	<MkA v-if="$i.isAdmin || $i.isModerator" v-click-anime class="item" active-class="active" to="/admin" :behavior="settingsWindowed ? 'modalWindow' : null">
-		<i class="fas fa-door-open fa-fw"></i><span class="text">{{ $ts.controlPanel }}</span>
+	<MkA v-if="adminOrModerator" v-click-anime class="item" active-class="active" to="/admin" :behavior="settingsWindowed ? 'modalWindow' : null">
+		<i class="fas fa-door-open fa-fw"></i><span class="text">{{ i18n.ts.controlPanel }}</span>
 	</MkA>
 	<button v-click-anime class="item _button" @click="more">
-		<i class="fas fa-ellipsis-h fa-fw"></i><span class="text">{{ $ts.more }}</span>
+		<i class="fas fa-ellipsis-h fa-fw"></i><span class="text">{{ i18n.ts.more }}</span>
 		<span v-if="otherNavItemIndicated" class="indicator"><i class="fas fa-circle"></i></span>
 	</button>
 	<MkA v-click-anime class="item" active-class="active" to="/settings" :behavior="settingsWindowed ? 'modalWindow' : null">
-		<i class="fas fa-cog fa-fw"></i><span class="text">{{ $ts.settings }}</span>
+		<i class="fas fa-cog fa-fw"></i><span class="text">{{ i18n.ts.settings }}</span>
 	</MkA>
 	<div class="divider"></div>
 	<div class="about">
@@ -36,103 +36,79 @@
 			<img :src="$instance.iconUrl || $instance.faviconUrl || '/favicon.ico'" class="_ghost"/>
 		</MkA>
 	</div>
-	<!--<MisskeyLogo class="misskey"/>-->
 </div>
 </template>
 
-<script lang="ts">
-import { defineAsyncComponent, defineComponent } from 'vue';
-import { host } from '@/config';
-import { search } from '@/scripts/search';
+<script lang="ts" setup>
+import { defineAsyncComponent, watch, defineEmits, onMounted, nextTick } from 'vue';
 import * as os from '@/os';
 import { menuDef } from '@/menu';
-import { openAccountMenu } from '@/account';
+import { openAccountMenu, $i } from '@/account';
 import MkButton from '@/components/ui/button.vue';
 import { StickySidebar } from '@/scripts/sticky-sidebar';
-//import MisskeyLogo from '@assets/client/misskey.svg';
+import { defaultStore } from '@/store';
+import { i18n } from '@/i18n';
 
-export default defineComponent({
-	components: {
-		MkButton,
-		//MisskeyLogo,
-	},
+let iconOnly = $ref(false);
+let settingsWindowed = $ref(false);
+let sidebar: HTMLElement | null = $ref(null);
 
-	data() {
-		return {
-			host: host,
-			accounts: [],
-			connection: null,
-			menuDef: menuDef,
-			iconOnly: false,
-			settingsWindowed: false,
-		};
-	},
+const menu = $computed(() => defaultStore.state.menu);
+const otherNavItemIndicated = $computed(() => {
+	for (const def in menuDef) {
+		if (menu.includes(def)) continue;
+		if (menuDef[def].indicated) return true;
+	}
+	return false;
+});
+const adminOrModerator = $computed(() => $i && ($i.isAdmin || $i.isModerator));
 
-	computed: {
-		menu(): string[] {
-			return this.$store.state.menu;
-		},
+const emit = defineEmits<{
+	(ev: 'change-view-mode'): void;
+}>();
 
-		otherNavItemIndicated(): boolean {
-			for (const def in this.menuDef) {
-				if (this.menu.includes(def)) continue;
-				if (this.menuDef[def].indicated) return true;
-			}
-			return false;
-		},
-	},
+watch(() => defaultStore.reactiveState.menuDisplay.value, () => {
+	calcViewState();
+});
 
-	watch: {
-		'$store.reactiveState.menuDisplay.value'() {
-			this.calcViewState();
-		},
+watch(iconOnly, () => {
+	nextTick(() => {
+		emit('change-view-mode');
+	});
+});
 
-		iconOnly() {
-			this.$nextTick(() => {
-				this.$emit('change-view-mode');
-			});
-		},
-	},
-
-	created() {
-		window.addEventListener('resize', this.calcViewState);
-		this.calcViewState();
-	},
-
-	mounted() {
-		const sticky = new StickySidebar(this.$el.parentElement, 16);
+onMounted(() => {
+	if (sidebar && sidebar.parentElement) {
+		const sticky = new StickySidebar(sidebar.parentElement, 16);
 		window.addEventListener('scroll', () => {
 			sticky.calc(window.scrollY);
 		}, { passive: true });
-	},
-
-	methods: {
-		calcViewState() {
-			this.iconOnly = (window.innerWidth <= 1400) || (this.$store.state.menuDisplay === 'sideIcon');
-			this.settingsWindowed = (window.innerWidth > 1400);
-		},
-
-		post() {
-			os.post();
-		},
-
-		search() {
-			search();
-		},
-
-		more(ev) {
-			os.popup(defineAsyncComponent(() => import('@/components/launch-pad.vue')), {
-				src: ev.currentTarget ?? ev.target,
-			}, {}, 'closed');
-		},
-
-		openAccountMenu: (ev) => {
-			openAccountMenu({
-				withExtraOperation: true,
-			}, ev);
-		},
 	}
 });
+
+function calcViewState(): void {
+	iconOnly = (window.innerWidth <= 1400) || (defaultStore.state.menuDisplay === 'sideIcon');
+	settingsWindowed = (window.innerWidth > 1400);
+}
+
+function post(): void {
+	os.post();
+}
+
+function more(ev: { currentTarget: any; target: any; }): void {
+	os.popup(defineAsyncComponent(() => import('@/components/launch-pad.vue')), {
+		src: ev.currentTarget ?? ev.target,
+	}, {}, 'closed');
+}
+
+function openAccountMenuWrapper(ev: MouseEvent): void {
+	openAccountMenu({
+		withExtraOperation: true,
+	}, ev);
+}
+
+window.addEventListener('resize', calcViewState);
+calcViewState();
 </script>
 
 <style lang="scss" scoped>

From e6daf45cd741caa1e8488f6c86d119fd1b73c33b Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Sun, 7 Aug 2022 20:38:13 -0400
Subject: [PATCH 33/34] Use optional chaining for onMounted sidebar

---
 packages/client/src/ui/classic.sidebar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue
index f080e3a18..dcec77c78 100644
--- a/packages/client/src/ui/classic.sidebar.vue
+++ b/packages/client/src/ui/classic.sidebar.vue
@@ -78,7 +78,7 @@ watch(iconOnly, () => {
 });
 
 onMounted(() => {
-	if (sidebar && sidebar.parentElement) {
+	if (sidebar?.parentElement) {
 		const sticky = new StickySidebar(sidebar.parentElement, 16);
 		window.addEventListener('scroll', () => {
 			sticky.calc(window.scrollY);

From 7f5d7ffd9328357044a5e1017d7308f1eeec5c89 Mon Sep 17 00:00:00 2001
From: Francis Dinh <normandy@biribiri.dev>
Date: Mon, 8 Aug 2022 06:25:35 -0400
Subject: [PATCH 34/34] Address review feedback

---
 packages/client/src/ui/classic.sidebar.vue | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue
index dcec77c78..f5f234195 100644
--- a/packages/client/src/ui/classic.sidebar.vue
+++ b/packages/client/src/ui/classic.sidebar.vue
@@ -3,7 +3,7 @@
 	<button v-if="$i" v-click-anime class="item _button account" @click="openAccountMenuWrapper">
 		<MkAvatar :user="$i" class="avatar"/><MkAcct class="text" :user="$i"/>
 	</button>
-	<div class="post" data-cy-open-post-form @click="post">
+	<div class="post" data-cy-open-post-form @click="() => { os.post(); }">
 		<MkButton class="button" gradate full rounded>
 			<i class="fas fa-pencil-alt fa-fw"></i><span v-if="!iconOnly" class="text">{{ i18n.ts.note }}</span>
 		</MkButton>
@@ -20,7 +20,7 @@
 		</component>
 	</template>
 	<div class="divider"></div>
-	<MkA v-if="adminOrModerator" v-click-anime class="item" active-class="active" to="/admin" :behavior="settingsWindowed ? 'modalWindow' : null">
+	<MkA v-if="iAmModerator" v-click-anime class="item" active-class="active" to="/admin" :behavior="settingsWindowed ? 'modalWindow' : null">
 		<i class="fas fa-door-open fa-fw"></i><span class="text">{{ i18n.ts.controlPanel }}</span>
 	</MkA>
 	<button v-click-anime class="item _button" @click="more">
@@ -43,7 +43,7 @@
 import { defineAsyncComponent, watch, defineEmits, onMounted, nextTick } from 'vue';
 import * as os from '@/os';
 import { menuDef } from '@/menu';
-import { openAccountMenu, $i } from '@/account';
+import { openAccountMenu, $i, iAmModerator } from '@/account';
 import MkButton from '@/components/ui/button.vue';
 import { StickySidebar } from '@/scripts/sticky-sidebar';
 import { defaultStore } from '@/store';
@@ -61,15 +61,12 @@ const otherNavItemIndicated = $computed(() => {
 	}
 	return false;
 });
-const adminOrModerator = $computed(() => $i && ($i.isAdmin || $i.isModerator));
 
 const emit = defineEmits<{
 	(ev: 'change-view-mode'): void;
 }>();
 
-watch(() => defaultStore.reactiveState.menuDisplay.value, () => {
-	calcViewState();
-});
+watch(defaultStore.reactiveState.menuDisplay, calcViewState);
 
 watch(iconOnly, () => {
 	nextTick(() => {
@@ -90,12 +87,10 @@ function calcViewState(): void {
 	iconOnly = (window.innerWidth <= 1400) || (defaultStore.state.menuDisplay === 'sideIcon');
 	settingsWindowed = (window.innerWidth > 1400);
 }
+window.addEventListener('resize', calcViewState);
+calcViewState();
 
-function post(): void {
-	os.post();
-}
-
-function more(ev: { currentTarget: any; target: any; }): void {
+function more(ev: MouseEvent): void {
 	os.popup(defineAsyncComponent(() => import('@/components/launch-pad.vue')), {
 		src: ev.currentTarget ?? ev.target,
 	}, {}, 'closed');
@@ -106,9 +101,6 @@ function openAccountMenuWrapper(ev: MouseEvent): void {
 		withExtraOperation: true,
 	}, ev);
 }
-
-window.addEventListener('resize', calcViewState);
-calcViewState();
 </script>
 
 <style lang="scss" scoped>