From 2606167f0da856a200d61c0f1cecf0e02844c0f4 Mon Sep 17 00:00:00 2001
From: anatawa12 <anatawa12@icloud.com>
Date: Fri, 7 Jul 2023 20:05:11 +0900
Subject: [PATCH 01/31] chore: collapse renote of my note (#11166)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore(frontend): 自分のnoteのrenoteも省略するように

Co-authored-by: madorama <madorama999@gmail.com>

* docs(changelog): add 見たことのあるRenoteを省略して表示をオンのときに自分のnoteのrenoteを省略するように

---------

Co-authored-by: madorama <madorama999@gmail.com>
---
 CHANGELOG.md                                | 1 +
 packages/frontend/src/components/MkNote.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a366729e4..97309f737 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 - ドライブファイルのメニューで画像をクロップできるように
 - 画像を動画と同様に簡単に隠せるように
 - オリジナル画像を保持せずにアップロードする場合webpでアップロードされるように(Safari以外)
+- 見たことのあるRenoteを省略して表示をオンのときに自分のnoteのrenoteを省略するように
 
 ### Server
 - JSON.parse の回数を削減することで、ストリーミングのパフォーマンスを向上しました
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index 7c9ddadbf..8fc5e0de5 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -222,7 +222,7 @@ const translation = ref<any>(null);
 const translating = ref(false);
 const showTicker = (defaultStore.state.instanceTicker === 'always') || (defaultStore.state.instanceTicker === 'remote' && appearNote.user.instance);
 const canRenote = computed(() => ['public', 'home'].includes(appearNote.visibility) || appearNote.userId === $i.id);
-let renoteCollapsed = $ref(defaultStore.state.collapseRenotes && isRenote && (($i && ($i.id === note.userId)) || (appearNote.myReaction != null)));
+let renoteCollapsed = $ref(defaultStore.state.collapseRenotes && isRenote && (($i && ($i.id === note.userId || $i.id === appearNote.userId)) || (appearNote.myReaction != null)));
 
 const keymap = {
 	'r': () => reply(true),

From eacc90debc439beb59902cc2008d92d114a5f9de Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Fri, 7 Jul 2023 20:18:06 +0900
Subject: [PATCH 02/31] =?UTF-8?q?fix(client):=20ZenUI=E3=81=A7=E3=83=9D?=
 =?UTF-8?q?=E3=83=83=E3=83=97=E3=82=A2=E3=83=83=E3=83=97=E3=81=AE=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=E4=BD=8D=E7=BD=AE=E3=81=8C=E3=81=8A=E3=81=8B=E3=81=97?=
 =?UTF-8?q?=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                         | 1 +
 packages/frontend/src/ui/minimum.vue | 6 ++++--
 packages/frontend/src/ui/zen.vue     | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 97309f737..7ed8b9d4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 ### Client
 - Fix: サーバーメトリクスが90度傾いている
 - Fix: sparkle内にリンクを入れるとクリック不能になる問題の修正
+- Fix: ZenUIでポップアップの表示位置がおかしい問題を修正
 - deck UIのカラムのメニューからアンテナとリストの編集画面を開けるように
 - ドライブファイルのメニューで画像をクロップできるように
 - 画像を動画と同様に簡単に隠せるように
diff --git a/packages/frontend/src/ui/minimum.vue b/packages/frontend/src/ui/minimum.vue
index e656f00bb..baba9e4da 100644
--- a/packages/frontend/src/ui/minimum.vue
+++ b/packages/frontend/src/ui/minimum.vue
@@ -1,6 +1,8 @@
 <template>
-<div :class="$style.root" style="container-type: inline-size;">
-	<RouterView/>
+<div :class="$style.root">
+	<div style="container-type: inline-size;">
+		<RouterView/>
+	</div>
 
 	<XCommon/>
 </div>
diff --git a/packages/frontend/src/ui/zen.vue b/packages/frontend/src/ui/zen.vue
index d516a5df7..6c8a98641 100644
--- a/packages/frontend/src/ui/zen.vue
+++ b/packages/frontend/src/ui/zen.vue
@@ -1,6 +1,8 @@
 <template>
-<div :class="showBottom ? $style.rootWithBottom : $style.root" style="container-type: inline-size;">
-	<RouterView/>
+<div :class="showBottom ? $style.rootWithBottom : $style.root">
+	<div style="container-type: inline-size;">
+		<RouterView/>
+	</div>
 
 	<XCommon/>
 </div>

From 4c879b3a336aee944cf611a9d01649d62a00d622 Mon Sep 17 00:00:00 2001
From: Yuriha <121590760+yuriha-chan@users.noreply.github.com>
Date: Fri, 7 Jul 2023 23:28:27 +0900
Subject: [PATCH 03/31] perf(backend): Improve performance of
 FetchInstanceMetadata (#11128)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Perf: Avoid retries to acquire lock in fetchInstanceMetadata

* Fix

* Add Changelog

* Fix typo

* Fix lint

* 記法をMisskey式にする

* ????

* refactor
https://github.com/misskey-dev/misskey/pull/11128#pullrequestreview-1518059366

* refactor

* getいらない？

* fix

* fix

* Update CHANGELOG.md

* clean up

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
---
 CHANGELOG.md                                  |  1 +
 packages/backend/src/core/AppLockService.ts   |  5 --
 .../src/core/FetchInstanceMetadataService.ts  | 49 +++++++++++--------
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ed8b9d4f..288ab0796 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 
 ### Server
 - JSON.parse の回数を削減することで、ストリーミングのパフォーマンスを向上しました
+- 連合の配送ジョブのパフォーマンスを向上（ロック機構の見直し、Redisキャッシュの活用）
 
 ## 13.13.2
 
diff --git a/packages/backend/src/core/AppLockService.ts b/packages/backend/src/core/AppLockService.ts
index 8dd805552..6ccaec26b 100644
--- a/packages/backend/src/core/AppLockService.ts
+++ b/packages/backend/src/core/AppLockService.ts
@@ -32,11 +32,6 @@ export class AppLockService {
 		return this.lock(`ap-object:${uri}`, timeout);
 	}
 
-	@bindThis
-	public getFetchInstanceMetadataLock(host: string, timeout = 30 * 1000): Promise<() => void> {
-		return this.lock(`instance:${host}`, timeout);
-	}
-
 	@bindThis
 	public getChartInsertLock(lockKey: string, timeout = 30 * 1000): Promise<() => void> {
 		return this.lock(`chart-insert:${lockKey}`, timeout);
diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts
index 9de633350..96ee77d05 100644
--- a/packages/backend/src/core/FetchInstanceMetadataService.ts
+++ b/packages/backend/src/core/FetchInstanceMetadataService.ts
@@ -3,8 +3,6 @@ import { Inject, Injectable } from '@nestjs/common';
 import { JSDOM } from 'jsdom';
 import tinycolor from 'tinycolor2';
 import type { Instance } from '@/models/entities/Instance.js';
-import type { InstancesRepository } from '@/models/index.js';
-import { AppLockService } from '@/core/AppLockService.js';
 import type Logger from '@/logger.js';
 import { DI } from '@/di-symbols.js';
 import { LoggerService } from '@/core/LoggerService.js';
@@ -12,6 +10,7 @@ import { HttpRequestService } from '@/core/HttpRequestService.js';
 import { bindThis } from '@/decorators.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import type { DOMWindow } from 'jsdom';
+import * as Redis from 'ioredis';
 
 type NodeInfo = {
 	openRegistrations?: unknown;
@@ -37,33 +36,43 @@ export class FetchInstanceMetadataService {
 	private logger: Logger;
 
 	constructor(
-		@Inject(DI.instancesRepository)
-		private instancesRepository: InstancesRepository,
-
-		private appLockService: AppLockService,
 		private httpRequestService: HttpRequestService,
 		private loggerService: LoggerService,
 		private federatedInstanceService: FederatedInstanceService,
+		@Inject(DI.redis)
+		private redisClient: Redis.Redis,
 	) {
 		this.logger = this.loggerService.getLogger('metadata', 'cyan');
 	}
 
+	@bindThis
+	public async tryLock(host: string): Promise<boolean> {
+		const mutex = await this.redisClient.set(`fetchInstanceMetadata:mutex:${host}`, '1', 'GET');
+		return mutex !== '1';
+	}
+
+	@bindThis
+	public unlock(host: string): Promise<'OK'> {
+		return this.redisClient.set(`fetchInstanceMetadata:mutex:${host}`, '0');
+	}
+
 	@bindThis
 	public async fetchInstanceMetadata(instance: Instance, force = false): Promise<void> {
-		const unlock = await this.appLockService.getFetchInstanceMetadataLock(instance.host);
-	
-		if (!force) {
-			const _instance = await this.instancesRepository.findOneBy({ host: instance.host });
-			const now = Date.now();
-			if (_instance && _instance.infoUpdatedAt && (now - _instance.infoUpdatedAt.getTime() < 1000 * 60 * 60 * 24)) {
-				unlock();
-				return;
-			}
-		}
-	
-		this.logger.info(`Fetching metadata of ${instance.host} ...`);
-	
+		const host = instance.host;
+		// Acquire mutex to ensure no parallel runs
+		if (!await this.tryLock(host)) return;
 		try {
+			if (!force) {
+				const _instance = await this.federatedInstanceService.fetch(host);
+				const now = Date.now();
+				if (_instance && _instance.infoUpdatedAt && (now - _instance.infoUpdatedAt.getTime() < 1000 * 60 * 60 * 24)) {
+					// unlock at the finally caluse
+					return;
+				}
+			}
+	
+			this.logger.info(`Fetching metadata of ${instance.host} ...`);
+	
 			const [info, dom, manifest] = await Promise.all([
 				this.fetchNodeinfo(instance).catch(() => null),
 				this.fetchDom(instance).catch(() => null),
@@ -104,7 +113,7 @@ export class FetchInstanceMetadataService {
 		} catch (e) {
 			this.logger.error(`Failed to update metadata of ${instance.host}: ${e}`);
 		} finally {
-			unlock();
+			await this.unlock(host);
 		}
 	}
 

From d84796588c1472334ddaf696a817f015c245ce44 Mon Sep 17 00:00:00 2001
From: okayurisotto <okayurisotto@proton.me>
Date: Sat, 8 Jul 2023 07:08:16 +0900
Subject: [PATCH 04/31] cleanup: trim trailing whitespace (#11136)

* cleanup: trim trailing whitespace

* update(`.editorconfig`)

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 .devcontainer/docker-compose.yml              |   2 +-
 .editorconfig                                 |   4 +
 CONTRIBUTING.md                               |   4 +-
 README.md                                     |   6 +-
 assets/title_float.svg                        |   4 +-
 cypress/e2e/basic.cy.js                       |   2 +-
 .../backend/src/core/AccountMoveService.ts    |   2 +-
 packages/backend/src/core/AiService.ts        |   8 +-
 packages/backend/src/core/AntennaService.ts   |  30 ++---
 packages/backend/src/core/CaptchaService.ts   |  12 +-
 .../src/core/CreateSystemUserService.ts       |  22 ++--
 .../backend/src/core/CustomEmojiService.ts    |   6 +-
 .../backend/src/core/DeleteAccountService.ts  |   4 +-
 packages/backend/src/core/EmailService.ts     |  18 +--
 .../src/core/FederatedInstanceService.ts      |  10 +-
 .../src/core/FetchInstanceMetadataService.ts  |  92 +++++++--------
 packages/backend/src/core/FileInfoService.ts  |  16 +--
 .../backend/src/core/HttpRequestService.ts    |   8 +-
 packages/backend/src/core/IdService.ts        |   2 +-
 .../backend/src/core/InstanceActorService.ts  |   4 +-
 packages/backend/src/core/MetaService.ts      |   8 +-
 packages/backend/src/core/MfmService.ts       | 108 +++++++++---------
 .../backend/src/core/NoteCreateService.ts     |   4 +-
 .../backend/src/core/NoteDeleteService.ts     |   2 +-
 packages/backend/src/core/NoteReadService.ts  |   4 +-
 .../backend/src/core/NotificationService.ts   |   2 +-
 packages/backend/src/core/PollService.ts      |  20 ++--
 .../src/core/PushNotificationService.ts       |  12 +-
 packages/backend/src/core/QueryService.ts     |  40 +++----
 packages/backend/src/core/RelayService.ts     |  28 ++---
 .../src/core/RemoteUserResolveService.ts      |  30 ++---
 packages/backend/src/core/RoleService.ts      |   2 +-
 packages/backend/src/core/SignupService.ts    |  30 ++---
 .../core/TwoFactorAuthenticationService.ts    |  86 +++++++-------
 .../backend/src/core/UserSuspendService.ts    |  24 ++--
 .../src/core/VideoProcessingService.ts        |   2 +-
 packages/backend/src/core/WebhookService.ts   |   2 +-
 .../src/core/activitypub/ApAudienceService.ts |  24 ++--
 .../core/activitypub/ApDbResolverService.ts   |   4 +-
 .../activitypub/ApDeliverManagerService.ts    |   2 +-
 .../src/core/activitypub/ApMfmService.ts      |   4 +-
 .../core/activitypub/models/ApImageService.ts |   2 +-
 .../activitypub/models/ApMentionService.ts    |   4 +-
 .../core/activitypub/models/ApNoteService.ts  | 102 ++++++++---------
 .../activitypub/models/ApPersonService.ts     |   4 +-
 .../core/entities/DriveFileEntityService.ts   |   2 +-
 .../src/core/entities/NoteEntityService.ts    |  10 +-
 .../entities/NoteReactionEntityService.ts     |   2 +-
 .../entities/NotificationEntityService.ts     |   2 +-
 .../src/core/entities/UserEntityService.ts    |   2 +-
 .../backend/src/daemons/QueueStatsService.ts  |   2 +-
 packages/backend/src/misc/json-schema.ts      |   2 +-
 packages/backend/src/misc/prelude/url.ts      |   2 +-
 .../src/models/entities/UserProfile.ts        |   2 +-
 .../src/queue/QueueProcessorService.ts        |   2 +-
 .../ExportAntennasProcessorService.ts         |   2 +-
 .../ImportAntennasProcessorService.ts         |   6 +-
 .../ImportCustomEmojisProcessorService.ts     |   2 +-
 .../WebhookDeliverProcessorService.ts         |  10 +-
 .../src/server/api/AuthenticateService.ts     |  16 +--
 .../src/server/api/RateLimiterService.ts      |  20 ++--
 .../backend/src/server/api/SigninService.ts   |   2 +-
 .../backend/src/server/api/endpoint-base.ts   |  10 +-
 .../endpoints/admin/announcements/update.ts   |   2 +-
 .../server/api/endpoints/admin/emoji/list.ts  |   2 +-
 .../api/endpoints/admin/emoji/update.ts       |   2 +-
 .../api/endpoints/admin/queue/promote.ts      |   2 +-
 .../server/api/endpoints/admin/update-meta.ts |   2 +-
 .../server/api/endpoints/channels/timeline.ts |   2 +-
 .../api/endpoints/drive/files/update.ts       |   2 +-
 .../backend/src/server/api/endpoints/emoji.ts |   2 +-
 .../src/server/api/endpoints/emojis.ts        |   2 +-
 .../server/api/endpoints/hashtags/users.ts    |   2 +-
 .../backend/src/server/api/endpoints/i.ts     |   2 +-
 .../server/api/endpoints/i/2fa/update-key.ts  |   2 +-
 .../backend/src/server/api/endpoints/meta.ts  |   2 +-
 .../backend/src/server/api/endpoints/notes.ts |  16 +--
 .../src/server/api/endpoints/notes/search.ts  |   4 +-
 .../server/api/endpoints/notes/translate.ts   |   2 +-
 .../src/server/api/endpoints/roles/notes.ts   |   2 +-
 .../users/lists/create-from-public.ts         |   4 +-
 .../api/endpoints/users/lists/favorite.ts     |   2 +-
 .../src/server/api/endpoints/users/search.ts  |   2 +-
 .../src/server/api/stream/ChannelsService.ts  |   2 +-
 .../src/server/api/stream/channels/hashtag.ts |   2 +-
 .../api/stream/channels/home-timeline.ts      |   2 +-
 .../api/stream/channels/role-timeline.ts      |   2 +-
 .../server/api/stream/channels/user-list.ts   |   2 +-
 .../backend/src/server/web/FeedService.ts     |  12 +-
 packages/backend/src/server/web/bios.js       |   6 +-
 packages/backend/src/server/web/cli.js        |   6 +-
 .../backend/src/server/web/views/base.pug     |   4 +-
 .../backend/src/server/web/views/error.pug    |   4 +-
 .../backend/src/server/web/views/note.pug     |   2 +-
 .../backend/test/prelude/get-api-validator.ts |   2 +-
 packages/backend/test/unit/DriveService.ts    |   2 +-
 packages/backend/test/unit/FileInfoService.ts |  22 ++--
 packages/backend/test/unit/RelayService.ts    |   8 +-
 packages/backend/test/unit/chart.ts           |  12 +-
 packages/frontend/src/boot/main-boot.ts       |   2 +-
 .../src/components/MkDrive.folder.vue         |   6 +-
 .../src/components/MkDrive.navFolder.vue      |   6 +-
 packages/frontend/src/components/MkDrive.vue  |   6 +-
 .../src/components/MkFileListForAdmin.vue     |   2 +-
 .../src/components/MkFlashPreview.vue         |   2 +-
 .../frontend/src/components/MkMediaVideo.vue  |   4 +-
 .../src/components/MkNoteDetailed.vue         |   2 +-
 .../frontend/src/components/MkSuperMenu.vue   |   2 +-
 .../frontend/src/components/MkUserPopup.vue   |   2 +-
 .../MkUserSetupDialog.Follow.stories.impl.ts  |   2 +-
 .../MkUserSetupDialog.Privacy.stories.impl.ts |   2 +-
 .../MkUserSetupDialog.Profile.stories.impl.ts |   2 +-
 .../src/components/MkUserSetupDialog.User.vue |   2 +-
 .../MkUserSetupDialog.stories.impl.ts         |   2 +-
 .../global/MkMisskeyFlavoredMarkdown.ts       |   2 +-
 .../frontend/src/directives/adaptive-bg.ts    |   2 +-
 .../src/directives/adaptive-border.ts         |   2 +-
 packages/frontend/src/directives/panel.ts     |   2 +-
 packages/frontend/src/filters/date.ts         |   2 +-
 packages/frontend/src/local-storage.ts        |   2 +-
 packages/frontend/src/nirax.ts                |   6 +-
 packages/frontend/src/pages/about.emojis.vue  |   4 +-
 packages/frontend/src/pages/admin/index.vue   |   2 +-
 .../frontend/src/pages/admin/moderation.vue   |   2 +-
 .../src/pages/admin/overview.ap-requests.vue  |   2 +-
 .../src/pages/admin/overview.federation.vue   |   2 +-
 .../src/pages/admin/overview.queue.vue        |   2 +-
 .../frontend/src/pages/admin/overview.vue     |   2 +-
 .../frontend/src/pages/admin/roles.editor.vue |   2 +-
 .../frontend/src/pages/channel-editor.vue     |   6 +-
 packages/frontend/src/pages/clip.vue          |   2 +-
 .../src/pages/custom-emojis-manager.vue       |   4 +-
 packages/frontend/src/pages/follow.vue        |   2 +-
 packages/frontend/src/pages/instance-info.vue |   2 +-
 packages/frontend/src/pages/list.vue          |   2 +-
 packages/frontend/src/pages/registry.keys.vue |   2 +-
 .../frontend/src/pages/registry.value.vue     |   2 +-
 .../frontend/src/pages/reset-password.vue     |   2 +-
 .../src/pages/settings/drive-cleaner.vue      |   2 +-
 .../frontend/src/pages/settings/navbar.vue    |   2 +-
 .../pages/settings/preferences-backups.vue    |   4 +-
 .../frontend/src/pages/settings/privacy.vue   |   4 +-
 .../frontend/src/pages/settings/roles.vue     |   2 +-
 .../frontend/src/pages/settings/security.vue  |   2 +-
 packages/frontend/src/pizzax.ts               |  10 +-
 packages/frontend/src/scripts/aiscript/ui.ts  |   2 +-
 .../frontend/src/scripts/get-user-menu.ts     |   2 +-
 packages/frontend/src/scripts/lookup.ts       |   2 +-
 packages/frontend/src/scripts/url.ts          |   2 +-
 .../frontend/src/scripts/use-note-capture.ts  |   4 +-
 packages/frontend/src/style.scss              |   4 +-
 .../frontend/src/themes/l-botanical.json5     |   2 +-
 packages/frontend/src/ui/classic.header.vue   |   4 +-
 packages/frontend/src/ui/classic.vue          |   2 +-
 .../src/widgets/WidgetAiscriptApp.vue         |   2 +-
 .../frontend/src/widgets/WidgetClicker.vue    |   2 +-
 .../src/widgets/WidgetNotifications.vue       |   2 +-
 packages/misskey-js/src/streaming.ts          |   2 +-
 packages/misskey-js/test-d/streaming.ts       |   2 +-
 packages/misskey-js/test/api.ts               |   8 +-
 packages/misskey-js/test/streaming.ts         |   2 +-
 161 files changed, 615 insertions(+), 609 deletions(-)

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 8f8c5a13a..2809cd2ca 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   app:
-    build: 
+    build:
       context: .
       dockerfile: Dockerfile
 
diff --git a/.editorconfig b/.editorconfig
index a6f988f8d..def7baa1a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,6 +6,10 @@ indent_size = 2
 charset = utf-8
 insert_final_newline = true
 end_of_line = lf
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
 
 [*.{yml,yaml}]
 indent_style = space
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f6b3804f8..896fb6b08 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -106,7 +106,7 @@ If your language is not listed in Crowdin, please open an issue.
 ![Crowdin](https://d322cqt584bo4o.cloudfront.net/misskey/localized.svg)
 
 ## Development
-During development, it is useful to use the 
+During development, it is useful to use the
 
 ```
 pnpm dev
@@ -150,7 +150,7 @@ Prepare DB/Redis for testing.
 ```
 docker compose -f packages/backend/test/docker-compose.yml up
 ```
-Alternatively, prepare an empty (data can be erased) DB and edit `.config/test.yml`. 
+Alternatively, prepare an empty (data can be erased) DB and edit `.config/test.yml`.
 
 Run all test.
 ```
diff --git a/README.md b/README.md
index 2aae4bb86..ab4388c2e 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
 <a href="https://misskey-hub.net">
 	<img src="./assets/title_float.svg" alt="Misskey logo" style="border-radius:50%" width="400"/>
 </a>
-	
+
 **🌎 **[Misskey](https://misskey-hub.net/)** is an open source, decentralized social media platform that's free forever! 🚀**
-	
+
 ---
 
 <a href="https://misskey-hub.net/instances.html">
@@ -21,7 +21,7 @@
 
 <a href="https://www.patreon.com/syuilo">
 		<img src="https://custom-icon-badges.herokuapp.com/badge/become_a-patron-F96854?logoColor=F96854&style=for-the-badge&logo=patreon&labelColor=363B40" alt="become a patron"/></a>
-	
+
 ---
 
 [![codecov](https://codecov.io/gh/misskey-dev/misskey/branch/develop/graph/badge.svg?token=R6IQZ3QJOL)](https://codecov.io/gh/misskey-dev/misskey)
diff --git a/assets/title_float.svg b/assets/title_float.svg
index 43205ac1c..ed1749e32 100644
--- a/assets/title_float.svg
+++ b/assets/title_float.svg
@@ -23,13 +23,13 @@
     </rdf:RDF>
   </metadata>
 	<style>
-		#g8 { 
+		#g8 {
     	animation-name: floating;
     	animation-duration: 3s;
     	animation-iteration-count: infinite;
    	 	animation-timing-function: ease-in-out;
 		}
- 
+
 		@keyframes floating {
     	0% { transform: translate(0,  0px); }
     	50% { transform: translate(0, -5px); }
diff --git a/cypress/e2e/basic.cy.js b/cypress/e2e/basic.cy.js
index 2515c14ad..2bf91cb00 100644
--- a/cypress/e2e/basic.cy.js
+++ b/cypress/e2e/basic.cy.js
@@ -56,7 +56,7 @@ describe('After setup instance', () => {
 		cy.get('[data-cy-signup-rules-notes-agree] [data-cy-switch-toggle]').click();
 		cy.get('[data-cy-signup-rules-continue]').should('not.be.disabled');
 		cy.get('[data-cy-signup-rules-continue]').click();
-	
+
 		cy.get('[data-cy-signup-submit]').should('be.disabled');
 		cy.get('[data-cy-signup-username] input').type('alice');
 		cy.get('[data-cy-signup-submit]').should('be.disabled');
diff --git a/packages/backend/src/core/AccountMoveService.ts b/packages/backend/src/core/AccountMoveService.ts
index ab11785e2..69d83b13b 100644
--- a/packages/backend/src/core/AccountMoveService.ts
+++ b/packages/backend/src/core/AccountMoveService.ts
@@ -295,7 +295,7 @@ export class AccountMoveService {
 	 * dstユーザーのalsoKnownAsをfetchPersonしていき、本当にmovedToUrlをdstに指定するユーザーが存在するのかを調べる
 	 *
 	 * @param dst movedToUrlを指定するユーザー
-	 * @param check 
+	 * @param check
 	 * @param instant checkがtrueであるユーザーが最初に見つかったら即座にreturnするかどうか
 	 * @returns Promise<LocalUser | RemoteUser | null>
 	 */
diff --git a/packages/backend/src/core/AiService.ts b/packages/backend/src/core/AiService.ts
index 059e335ef..02501b832 100644
--- a/packages/backend/src/core/AiService.ts
+++ b/packages/backend/src/core/AiService.ts
@@ -31,16 +31,16 @@ export class AiService {
 				const cpuFlags = await this.getCpuFlags();
 				isSupportedCpu = REQUIRED_CPU_FLAGS.every(required => cpuFlags.includes(required));
 			}
-	
+
 			if (!isSupportedCpu) {
 				console.error('This CPU cannot use TensorFlow.');
 				return null;
 			}
-	
+
 			const tf = await import('@tensorflow/tfjs-node');
-	
+
 			if (this.model == null) this.model = await nsfw.load(`file://${_dirname}/../../nsfw-model/`, { size: 299 });
-	
+
 			const buffer = await fs.promises.readFile(path);
 			const image = await tf.node.decodeImage(buffer, 3) as any;
 			try {
diff --git a/packages/backend/src/core/AntennaService.ts b/packages/backend/src/core/AntennaService.ts
index d8df37191..9310fd8b5 100644
--- a/packages/backend/src/core/AntennaService.ts
+++ b/packages/backend/src/core/AntennaService.ts
@@ -99,7 +99,7 @@ export class AntennaService implements OnApplicationShutdown {
 				'MAXLEN', '~', '200',
 				'*',
 				'note', note.id);
-			
+
 			this.globalEventService.publishAntennaStream(antenna.id, 'note', note);
 		}
 
@@ -112,16 +112,16 @@ export class AntennaService implements OnApplicationShutdown {
 	public async checkHitAntenna(antenna: Antenna, note: (Note | Packed<'Note'>), noteUser: { id: User['id']; username: string; host: string | null; }): Promise<boolean> {
 		if (note.visibility === 'specified') return false;
 		if (note.visibility === 'followers') return false;
-	
+
 		if (!antenna.withReplies && note.replyId != null) return false;
-	
+
 		if (antenna.src === 'home') {
 			// TODO
 		} else if (antenna.src === 'list') {
 			const listUsers = (await this.userListJoiningsRepository.findBy({
 				userListId: antenna.userListId!,
 			})).map(x => x.userId);
-	
+
 			if (!listUsers.includes(note.userId)) return false;
 		} else if (antenna.src === 'users') {
 			const accts = antenna.users.map(x => {
@@ -130,32 +130,32 @@ export class AntennaService implements OnApplicationShutdown {
 			});
 			if (!accts.includes(this.utilityService.getFullApAccount(noteUser.username, noteUser.host).toLowerCase())) return false;
 		}
-	
+
 		const keywords = antenna.keywords
 			// Clean up
 			.map(xs => xs.filter(x => x !== ''))
 			.filter(xs => xs.length > 0);
-	
+
 		if (keywords.length > 0) {
 			if (note.text == null && note.cw == null) return false;
 
 			const _text = (note.text ?? '') + '\n' + (note.cw ?? '');
-	
+
 			const matched = keywords.some(and =>
 				and.every(keyword =>
 					antenna.caseSensitive
 						? _text.includes(keyword)
 						: _text.toLowerCase().includes(keyword.toLowerCase()),
 				));
-	
+
 			if (!matched) return false;
 		}
-	
+
 		const excludeKeywords = antenna.excludeKeywords
 			// Clean up
 			.map(xs => xs.filter(x => x !== ''))
 			.filter(xs => xs.length > 0);
-	
+
 		if (excludeKeywords.length > 0) {
 			if (note.text == null && note.cw == null) return false;
 
@@ -167,16 +167,16 @@ export class AntennaService implements OnApplicationShutdown {
 						? _text.includes(keyword)
 						: _text.toLowerCase().includes(keyword.toLowerCase()),
 				));
-	
+
 			if (matched) return false;
 		}
-	
+
 		if (antenna.withFile) {
 			if (note.fileIds && note.fileIds.length === 0) return false;
 		}
-	
+
 		// TODO: eval expression
-	
+
 		return true;
 	}
 
@@ -188,7 +188,7 @@ export class AntennaService implements OnApplicationShutdown {
 			});
 			this.antennasFetched = true;
 		}
-	
+
 		return this.antennas;
 	}
 
diff --git a/packages/backend/src/core/CaptchaService.ts b/packages/backend/src/core/CaptchaService.ts
index 1a52a229c..10cfdba25 100644
--- a/packages/backend/src/core/CaptchaService.ts
+++ b/packages/backend/src/core/CaptchaService.ts
@@ -20,7 +20,7 @@ export class CaptchaService {
 			secret,
 			response,
 		});
-	
+
 		const res = await this.httpRequestService.send(url, {
 			method: 'POST',
 			body: params.toString(),
@@ -28,14 +28,14 @@ export class CaptchaService {
 				'Content-Type': 'application/x-www-form-urlencoded',
 			},
 		}, { throwErrorWhenResponseNotOk: false });
-	
+
 		if (!res.ok) {
 			throw new Error(`${res.status}`);
 		}
-	
+
 		return await res.json() as CaptchaResponse;
-	}	
-	
+	}
+
 	@bindThis
 	public async verifyRecaptcha(secret: string, response: string | null | undefined): Promise<void> {
 		if (response == null) {
@@ -73,7 +73,7 @@ export class CaptchaService {
 		if (response == null) {
 			throw new Error('turnstile-failed: no response provided');
 		}
-	
+
 		const result = await this.getCaptchaResponse('https://challenges.cloudflare.com/turnstile/v0/siteverify', secret, response).catch(err => {
 			throw new Error(`turnstile-request-failed: ${err}`);
 		});
diff --git a/packages/backend/src/core/CreateSystemUserService.ts b/packages/backend/src/core/CreateSystemUserService.ts
index 8f887d90f..0bfbe2b17 100644
--- a/packages/backend/src/core/CreateSystemUserService.ts
+++ b/packages/backend/src/core/CreateSystemUserService.ts
@@ -25,27 +25,27 @@ export class CreateSystemUserService {
 	@bindThis
 	public async createSystemUser(username: string): Promise<User> {
 		const password = uuid();
-	
+
 		// Generate hash of password
 		const salt = await bcrypt.genSalt(8);
 		const hash = await bcrypt.hash(password, salt);
-	
+
 		// Generate secret
 		const secret = generateNativeUserToken();
-	
+
 		const keyPair = await genRsaKeyPair(4096);
-	
+
 		let account!: User;
-	
+
 		// Start transaction
 		await this.db.transaction(async transactionalEntityManager => {
 			const exist = await transactionalEntityManager.findOneBy(User, {
 				usernameLower: username.toLowerCase(),
 				host: IsNull(),
 			});
-	
+
 			if (exist) throw new Error('the user is already exists');
-	
+
 			account = await transactionalEntityManager.insert(User, {
 				id: this.idService.genId(),
 				createdAt: new Date(),
@@ -58,25 +58,25 @@ export class CreateSystemUserService {
 				isExplorable: false,
 				isBot: true,
 			}).then(x => transactionalEntityManager.findOneByOrFail(User, x.identifiers[0]));
-	
+
 			await transactionalEntityManager.insert(UserKeypair, {
 				publicKey: keyPair.publicKey,
 				privateKey: keyPair.privateKey,
 				userId: account.id,
 			});
-	
+
 			await transactionalEntityManager.insert(UserProfile, {
 				userId: account.id,
 				autoAcceptFollowed: false,
 				password: hash,
 			});
-	
+
 			await transactionalEntityManager.insert(UsedUsername, {
 				createdAt: new Date(),
 				username: username.toLowerCase(),
 			});
 		});
-	
+
 		return account;
 	}
 }
diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
index 5f2ced77e..661d956bd 100644
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -140,7 +140,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 
 			this.globalEventService.publishBroadcastStream('emojiAdded', {
 				emoji: updated,
-			});	
+			});
 		}
 	}
 
@@ -194,7 +194,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 		}
 
 		this.localEmojisCache.refresh();
-	
+
 		this.globalEventService.publishBroadcastStream('emojiUpdated', {
 			emojis: await this.emojiEntityService.packDetailedMany(ids),
 		});
@@ -215,7 +215,7 @@ export class CustomEmojiService implements OnApplicationShutdown {
 			emojis: await this.emojiEntityService.packDetailedMany(ids),
 		});
 	}
-	
+
 	@bindThis
 	public async setLicenseBulk(ids: Emoji['id'][], license: string | null) {
 		await this.emojisRepository.update({
diff --git a/packages/backend/src/core/DeleteAccountService.ts b/packages/backend/src/core/DeleteAccountService.ts
index 327283106..3a0592441 100644
--- a/packages/backend/src/core/DeleteAccountService.ts
+++ b/packages/backend/src/core/DeleteAccountService.ts
@@ -28,11 +28,11 @@ export class DeleteAccountService {
 
 		// 物理削除する前にDelete activityを送信する
 		await this.userSuspendService.doPostSuspend(user).catch(e => {});
-	
+
 		this.queueService.createDeleteAccountJob(user, {
 			soft: false,
 		});
-	
+
 		await this.usersRepository.update(user.id, {
 			isDeleted: true,
 		});
diff --git a/packages/backend/src/core/EmailService.ts b/packages/backend/src/core/EmailService.ts
index 59932a5b8..a04e9c122 100644
--- a/packages/backend/src/core/EmailService.ts
+++ b/packages/backend/src/core/EmailService.ts
@@ -29,12 +29,12 @@ export class EmailService {
 	@bindThis
 	public async sendEmail(to: string, subject: string, html: string, text: string) {
 		const meta = await this.metaService.fetch(true);
-	
+
 		const iconUrl = `${this.config.url}/static-assets/mi-white.png`;
 		const emailSettingUrl = `${this.config.url}/settings/email`;
-	
+
 		const enableAuth = meta.smtpUser != null && meta.smtpUser !== '';
-	
+
 		const transporter = nodemailer.createTransport({
 			host: meta.smtpHost,
 			port: meta.smtpPort,
@@ -46,7 +46,7 @@ export class EmailService {
 				pass: meta.smtpPass,
 			} : undefined,
 		} as any);
-	
+
 		try {
 			// TODO: htmlサニタイズ
 			const info = await transporter.sendMail({
@@ -135,7 +135,7 @@ export class EmailService {
 	</body>
 </html>`,
 			});
-	
+
 			this.logger.info(`Message sent: ${info.messageId}`);
 		} catch (err) {
 			this.logger.error(err as Error);
@@ -149,12 +149,12 @@ export class EmailService {
 		reason: null | 'used' | 'format' | 'disposable' | 'mx' | 'smtp';
 	}> {
 		const meta = await this.metaService.fetch();
-	
+
 		const exist = await this.userProfilesRepository.countBy({
 			emailVerified: true,
 			email: emailAddress,
 		});
-	
+
 		const validated = meta.enableActiveEmailValidation ? await validateEmail({
 			email: emailAddress,
 			validateRegex: true,
@@ -163,9 +163,9 @@ export class EmailService {
 			validateDisposable: true, // 捨てアドかどうかチェック
 			validateSMTP: false, // 日本だと25ポートが殆どのプロバイダーで塞がれていてタイムアウトになるので
 		}) : { valid: true, reason: null };
-	
+
 		const available = exist === 0 && validated.valid;
-	
+
 		return {
 			available,
 			reason: available ? null :
diff --git a/packages/backend/src/core/FederatedInstanceService.ts b/packages/backend/src/core/FederatedInstanceService.ts
index 3603d59dc..a76203894 100644
--- a/packages/backend/src/core/FederatedInstanceService.ts
+++ b/packages/backend/src/core/FederatedInstanceService.ts
@@ -43,19 +43,19 @@ export class FederatedInstanceService implements OnApplicationShutdown {
 	@bindThis
 	public async fetch(host: string): Promise<Instance> {
 		host = this.utilityService.toPuny(host);
-	
+
 		const cached = await this.federatedInstanceCache.get(host);
 		if (cached) return cached;
-	
+
 		const index = await this.instancesRepository.findOneBy({ host });
-	
+
 		if (index == null) {
 			const i = await this.instancesRepository.insert({
 				id: this.idService.genId(),
 				host,
 				firstRetrievedAt: new Date(),
 			}).then(x => this.instancesRepository.findOneByOrFail(x.identifiers[0]));
-	
+
 			this.federatedInstanceCache.set(host, i);
 			return i;
 		} else {
@@ -74,7 +74,7 @@ export class FederatedInstanceService implements OnApplicationShutdown {
 			.then((response) => {
 				return response.raw[0];
 			});
-	
+
 		this.federatedInstanceCache.set(result.host, result);
 	}
 
diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts
index 96ee77d05..127c4c315 100644
--- a/packages/backend/src/core/FetchInstanceMetadataService.ts
+++ b/packages/backend/src/core/FetchInstanceMetadataService.ts
@@ -58,6 +58,8 @@ export class FetchInstanceMetadataService {
 
 	@bindThis
 	public async fetchInstanceMetadata(instance: Instance, force = false): Promise<void> {
+		try {
+
 		const host = instance.host;
 		// Acquire mutex to ensure no parallel runs
 		if (!await this.tryLock(host)) return;
@@ -72,13 +74,13 @@ export class FetchInstanceMetadataService {
 			}
 	
 			this.logger.info(`Fetching metadata of ${instance.host} ...`);
-	
+ 
 			const [info, dom, manifest] = await Promise.all([
 				this.fetchNodeinfo(instance).catch(() => null),
 				this.fetchDom(instance).catch(() => null),
 				this.fetchManifest(instance).catch(() => null),
 			]);
-	
+
 			const [favicon, icon, themeColor, name, description] = await Promise.all([
 				this.fetchFaviconUrl(instance, dom).catch(() => null),
 				this.fetchIconUrl(instance, dom, manifest).catch(() => null),
@@ -86,13 +88,13 @@ export class FetchInstanceMetadataService {
 				this.getSiteName(info, dom, manifest).catch(() => null),
 				this.getDescription(info, dom, manifest).catch(() => null),
 			]);
-	
+
 			this.logger.succ(`Successfuly fetched metadata of ${instance.host}`);
-	
+
 			const updates = {
 				infoUpdatedAt: new Date(),
 			} as Record<string, any>;
-	
+
 			if (info) {
 				updates.softwareName = typeof info.software?.name === 'string' ? info.software.name.toLowerCase() : '?';
 				updates.softwareVersion = info.software?.version;
@@ -100,15 +102,15 @@ export class FetchInstanceMetadataService {
 				updates.maintainerName = info.metadata ? info.metadata.maintainer ? (info.metadata.maintainer.name ?? null) : null : null;
 				updates.maintainerEmail = info.metadata ? info.metadata.maintainer ? (info.metadata.maintainer.email ?? null) : null : null;
 			}
-	
+
 			if (name) updates.name = name;
 			if (description) updates.description = description;
 			if (icon || favicon) updates.iconUrl = icon ?? favicon;
 			if (favicon) updates.faviconUrl = favicon;
 			if (themeColor) updates.themeColor = themeColor;
-	
+
 			await this.federatedInstanceService.update(instance.id, updates);
-	
+
 			this.logger.succ(`Successfuly updated metadata of ${instance.host}`);
 		} catch (e) {
 			this.logger.error(`Failed to update metadata of ${instance.host}: ${e}`);
@@ -120,7 +122,7 @@ export class FetchInstanceMetadataService {
 	@bindThis
 	private async fetchNodeinfo(instance: Instance): Promise<NodeInfo> {
 		this.logger.info(`Fetching nodeinfo of ${instance.host} ...`);
-	
+
 		try {
 			const wellknown = await this.httpRequestService.getJson('https://' + instance.host + '/.well-known/nodeinfo')
 				.catch(err => {
@@ -130,33 +132,33 @@ export class FetchInstanceMetadataService {
 						throw err.statusCode ?? err.message;
 					}
 				}) as Record<string, unknown>;
-	
+
 			if (wellknown.links == null || !Array.isArray(wellknown.links)) {
 				throw new Error('No wellknown links');
 			}
-	
+
 			const links = wellknown.links as any[];
-	
+
 			const lnik1_0 = links.find(link => link.rel === 'http://nodeinfo.diaspora.software/ns/schema/1.0');
 			const lnik2_0 = links.find(link => link.rel === 'http://nodeinfo.diaspora.software/ns/schema/2.0');
 			const lnik2_1 = links.find(link => link.rel === 'http://nodeinfo.diaspora.software/ns/schema/2.1');
 			const link = lnik2_1 ?? lnik2_0 ?? lnik1_0;
-	
+
 			if (link == null) {
 				throw new Error('No nodeinfo link provided');
 			}
-	
+
 			const info = await this.httpRequestService.getJson(link.href)
 				.catch(err => {
 					throw err.statusCode ?? err.message;
 				});
-	
+
 			this.logger.succ(`Successfuly fetched nodeinfo of ${instance.host}`);
-	
+
 			return info as NodeInfo;
 		} catch (err) {
 			this.logger.error(`Failed to fetch nodeinfo of ${instance.host}: ${err}`);
-	
+
 			throw err;
 		}
 	}
@@ -164,51 +166,51 @@ export class FetchInstanceMetadataService {
 	@bindThis
 	private async fetchDom(instance: Instance): Promise<DOMWindow['document']> {
 		this.logger.info(`Fetching HTML of ${instance.host} ...`);
-	
+
 		const url = 'https://' + instance.host;
-	
+
 		const html = await this.httpRequestService.getHtml(url);
-	
+
 		const { window } = new JSDOM(html);
 		const doc = window.document;
-	
+
 		return doc;
 	}
 
 	@bindThis
 	private async fetchManifest(instance: Instance): Promise<Record<string, unknown> | null> {
 		const url = 'https://' + instance.host;
-	
+
 		const manifestUrl = url + '/manifest.json';
-	
+
 		const manifest = await this.httpRequestService.getJson(manifestUrl) as Record<string, unknown>;
-	
+
 		return manifest;
 	}
 
 	@bindThis
 	private async fetchFaviconUrl(instance: Instance, doc: DOMWindow['document'] | null): Promise<string | null> {
 		const url = 'https://' + instance.host;
-	
+
 		if (doc) {
 			// https://github.com/misskey-dev/misskey/pull/8220#issuecomment-1025104043
 			const href = Array.from(doc.getElementsByTagName('link')).reverse().find(link => link.relList.contains('icon'))?.href;
-	
+
 			if (href) {
 				return (new URL(href, url)).href;
 			}
 		}
-	
+
 		const faviconUrl = url + '/favicon.ico';
-	
+
 		const favicon = await this.httpRequestService.send(faviconUrl, {
 			method: 'HEAD',
 		}, { throwErrorWhenResponseNotOk: false });
-	
+
 		if (favicon.ok) {
 			return faviconUrl;
 		}
-	
+
 		return null;
 	}
 
@@ -218,38 +220,38 @@ export class FetchInstanceMetadataService {
 			const url = 'https://' + instance.host;
 			return (new URL(manifest.icons[0].src, url)).href;
 		}
-	
+
 		if (doc) {
 			const url = 'https://' + instance.host;
-	
+
 			// https://github.com/misskey-dev/misskey/pull/8220#issuecomment-1025104043
 			const links = Array.from(doc.getElementsByTagName('link')).reverse();
 			// https://github.com/misskey-dev/misskey/pull/8220/files/0ec4eba22a914e31b86874f12448f88b3e58dd5a#r796487559
-			const href = 
+			const href =
 				[
 					links.find(link => link.relList.contains('apple-touch-icon-precomposed'))?.href,
 					links.find(link => link.relList.contains('apple-touch-icon'))?.href,
 					links.find(link => link.relList.contains('icon'))?.href,
 				]
 					.find(href => href);
-	
+
 			if (href) {
 				return (new URL(href, url)).href;
 			}
 		}
-	
+
 		return null;
 	}
 
 	@bindThis
 	private async getThemeColor(info: NodeInfo | null, doc: DOMWindow['document'] | null, manifest: Record<string, any> | null): Promise<string | null> {
 		const themeColor = info?.metadata?.themeColor ?? doc?.querySelector('meta[name="theme-color"]')?.getAttribute('content') ?? manifest?.theme_color;
-	
+
 		if (themeColor) {
 			const color = new tinycolor(themeColor);
 			if (color.isValid()) return color.toHexString();
 		}
-	
+
 		return null;
 	}
 
@@ -262,19 +264,19 @@ export class FetchInstanceMetadataService {
 				return info.metadata.name;
 			}
 		}
-	
+
 		if (doc) {
 			const og = doc.querySelector('meta[property="og:title"]')?.getAttribute('content');
-	
+
 			if (og) {
 				return og;
 			}
 		}
-	
+
 		if (manifest) {
 			return manifest.name ?? manifest.short_name;
 		}
-	
+
 		return null;
 	}
 
@@ -287,23 +289,23 @@ export class FetchInstanceMetadataService {
 				return info.metadata.description;
 			}
 		}
-	
+
 		if (doc) {
 			const meta = doc.querySelector('meta[name="description"]')?.getAttribute('content');
 			if (meta) {
 				return meta;
 			}
-	
+
 			const og = doc.querySelector('meta[property="og:description"]')?.getAttribute('content');
 			if (og) {
 				return og;
 			}
 		}
-	
+
 		if (manifest) {
 			return manifest.name ?? manifest.short_name;
 		}
-	
+
 		return null;
 	}
 }
diff --git a/packages/backend/src/core/FileInfoService.ts b/packages/backend/src/core/FileInfoService.ts
index d6c51ad55..d43575b33 100644
--- a/packages/backend/src/core/FileInfoService.ts
+++ b/packages/backend/src/core/FileInfoService.ts
@@ -161,20 +161,20 @@ export class FileInfoService {
 	private async detectSensitivity(source: string, mime: string, sensitiveThreshold: number, sensitiveThresholdForPorn: number, analyzeVideo: boolean): Promise<[sensitive: boolean, porn: boolean]> {
 		let sensitive = false;
 		let porn = false;
-	
+
 		function judgePrediction(result: readonly predictionType[]): [sensitive: boolean, porn: boolean] {
 			let sensitive = false;
 			let porn = false;
-	
+
 			if ((result.find(x => x.className === 'Sexy')?.probability ?? 0) > sensitiveThreshold) sensitive = true;
 			if ((result.find(x => x.className === 'Hentai')?.probability ?? 0) > sensitiveThreshold) sensitive = true;
 			if ((result.find(x => x.className === 'Porn')?.probability ?? 0) > sensitiveThreshold) sensitive = true;
-	
+
 			if ((result.find(x => x.className === 'Porn')?.probability ?? 0) > sensitiveThresholdForPorn) porn = true;
-	
+
 			return [sensitive, porn];
 		}
-	
+
 		if ([
 			'image/jpeg',
 			'image/png',
@@ -253,10 +253,10 @@ export class FileInfoService {
 				disposeOutDir();
 			}
 		}
-	
+
 		return [sensitive, porn];
 	}
-	
+
 	private async *asyncIterateFrames(cwd: string, command: FFmpeg.FfmpegCommand): AsyncGenerator<string, void> {
 		const watcher = new FSWatcher({
 			cwd,
@@ -295,7 +295,7 @@ export class FileInfoService {
 			}
 		}
 	}
-	
+
 	@bindThis
 	private exists(path: string): Promise<boolean> {
 		return fs.promises.access(path).then(() => true, () => false);
diff --git a/packages/backend/src/core/HttpRequestService.ts b/packages/backend/src/core/HttpRequestService.ts
index 375aa846c..4f2c26114 100644
--- a/packages/backend/src/core/HttpRequestService.ts
+++ b/packages/backend/src/core/HttpRequestService.ts
@@ -42,21 +42,21 @@ export class HttpRequestService {
 			errorTtl: 30,	// 30secs
 			lookup: false,	// nativeのdns.lookupにfallbackしない
 		});
-		
+
 		this.http = new http.Agent({
 			keepAlive: true,
 			keepAliveMsecs: 30 * 1000,
 			lookup: cache.lookup,
 		} as http.AgentOptions);
-		
+
 		this.https = new https.Agent({
 			keepAlive: true,
 			keepAliveMsecs: 30 * 1000,
 			lookup: cache.lookup,
 		} as https.AgentOptions);
-		
+
 		const maxSockets = Math.max(256, config.deliverJobConcurrency ?? 128);
-		
+
 		this.httpAgent = config.proxy
 			? new HttpProxyAgent({
 				keepAlive: true,
diff --git a/packages/backend/src/core/IdService.ts b/packages/backend/src/core/IdService.ts
index 60098bc81..4d129407c 100644
--- a/packages/backend/src/core/IdService.ts
+++ b/packages/backend/src/core/IdService.ts
@@ -23,7 +23,7 @@ export class IdService {
 	@bindThis
 	public genId(date?: Date): string {
 		if (!date || (date > new Date())) date = new Date();
-	
+
 		switch (this.method) {
 			case 'aid': return genAid(date);
 			case 'meid': return genMeid(date);
diff --git a/packages/backend/src/core/InstanceActorService.ts b/packages/backend/src/core/InstanceActorService.ts
index 4fb3fc5b4..2e047dc5c 100644
--- a/packages/backend/src/core/InstanceActorService.ts
+++ b/packages/backend/src/core/InstanceActorService.ts
@@ -26,12 +26,12 @@ export class InstanceActorService {
 	public async getInstanceActor(): Promise<LocalUser> {
 		const cached = this.cache.get();
 		if (cached) return cached;
-	
+
 		const user = await this.usersRepository.findOneBy({
 			host: IsNull(),
 			username: ACTOR_USERNAME,
 		}) as LocalUser | undefined;
-	
+
 		if (user) {
 			this.cache.set(user);
 			return user;
diff --git a/packages/backend/src/core/MetaService.ts b/packages/backend/src/core/MetaService.ts
index 5acc9ad9a..aae0a9134 100644
--- a/packages/backend/src/core/MetaService.ts
+++ b/packages/backend/src/core/MetaService.ts
@@ -56,7 +56,7 @@ export class MetaService implements OnApplicationShutdown {
 	@bindThis
 	public async fetch(noCache = false): Promise<Meta> {
 		if (!noCache && this.cache) return this.cache;
-	
+
 		return await this.db.transaction(async transactionalEntityManager => {
 			// 過去のバグでレコードが複数出来てしまっている可能性があるので新しいIDを優先する
 			const metas = await transactionalEntityManager.find(Meta, {
@@ -64,9 +64,9 @@ export class MetaService implements OnApplicationShutdown {
 					id: 'DESC',
 				},
 			});
-	
+
 			const meta = metas[0];
-	
+
 			if (meta) {
 				this.cache = meta;
 				return meta;
@@ -81,7 +81,7 @@ export class MetaService implements OnApplicationShutdown {
 						['id'],
 					)
 					.then((x) => transactionalEntityManager.findOneByOrFail(Meta, x.identifiers[0]));
-	
+
 				this.cache = saved;
 				return saved;
 			}
diff --git a/packages/backend/src/core/MfmService.ts b/packages/backend/src/core/MfmService.ts
index dffee16e0..38aaa8452 100644
--- a/packages/backend/src/core/MfmService.ts
+++ b/packages/backend/src/core/MfmService.ts
@@ -27,29 +27,29 @@ export class MfmService {
 	public fromHtml(html: string, hashtagNames?: string[]): string {
 		// some AP servers like Pixelfed use br tags as well as newlines
 		html = html.replace(/<br\s?\/?>\r?\n/gi, '\n');
-	
+
 		const dom = parse5.parseFragment(html);
-	
+
 		let text = '';
-	
+
 		for (const n of dom.childNodes) {
 			analyze(n);
 		}
-	
+
 		return text.trim();
-	
+
 		function getText(node: TreeAdapter.Node): string {
 			if (treeAdapter.isTextNode(node)) return node.value;
 			if (!treeAdapter.isElementNode(node)) return '';
 			if (node.nodeName === 'br') return '\n';
-	
+
 			if (node.childNodes) {
 				return node.childNodes.map(n => getText(n)).join('');
 			}
-	
+
 			return '';
 		}
-	
+
 		function appendChildren(childNodes: TreeAdapter.ChildNode[]): void {
 			if (childNodes) {
 				for (const n of childNodes) {
@@ -57,35 +57,35 @@ export class MfmService {
 				}
 			}
 		}
-	
+
 		function analyze(node: TreeAdapter.Node) {
 			if (treeAdapter.isTextNode(node)) {
 				text += node.value;
 				return;
 			}
-	
+
 			// Skip comment or document type node
 			if (!treeAdapter.isElementNode(node)) return;
-	
+
 			switch (node.nodeName) {
 				case 'br': {
 					text += '\n';
 					break;
 				}
-	
+
 				case 'a':
 				{
 					const txt = getText(node);
 					const rel = node.attrs.find(x => x.name === 'rel');
 					const href = node.attrs.find(x => x.name === 'href');
-	
+
 					// ハッシュタグ
 					if (hashtagNames && href && hashtagNames.map(x => x.toLowerCase()).includes(txt.toLowerCase())) {
 						text += txt;
 					// メンション
 					} else if (txt.startsWith('@') && !(rel && rel.value.startsWith('me '))) {
 						const part = txt.split('@');
-	
+
 						if (part.length === 2 && href) {
 							//#region ホスト名部分が省略されているので復元する
 							const acct = `${txt}@${(new URL(href.value)).hostname}`;
@@ -116,12 +116,12 @@ export class MfmService {
 								return `[${txt}](${href.value})`;
 							}
 						};
-	
+
 						text += generateLink();
 					}
 					break;
 				}
-	
+
 				case 'h1':
 				{
 					text += '【';
@@ -129,7 +129,7 @@ export class MfmService {
 					text += '】\n';
 					break;
 				}
-	
+
 				case 'b':
 				case 'strong':
 				{
@@ -138,7 +138,7 @@ export class MfmService {
 					text += '**';
 					break;
 				}
-	
+
 				case 'small':
 				{
 					text += '<small>';
@@ -146,7 +146,7 @@ export class MfmService {
 					text += '</small>';
 					break;
 				}
-	
+
 				case 's':
 				case 'del':
 				{
@@ -155,7 +155,7 @@ export class MfmService {
 					text += '~~';
 					break;
 				}
-	
+
 				case 'i':
 				case 'em':
 				{
@@ -164,7 +164,7 @@ export class MfmService {
 					text += '</i>';
 					break;
 				}
-	
+
 				// block code (<pre><code>)
 				case 'pre': {
 					if (node.childNodes.length === 1 && node.childNodes[0].nodeName === 'code') {
@@ -176,7 +176,7 @@ export class MfmService {
 					}
 					break;
 				}
-	
+
 				// inline code (<code>)
 				case 'code': {
 					text += '`';
@@ -184,7 +184,7 @@ export class MfmService {
 					text += '`';
 					break;
 				}
-	
+
 				case 'blockquote': {
 					const t = getText(node);
 					if (t) {
@@ -193,7 +193,7 @@ export class MfmService {
 					}
 					break;
 				}
-	
+
 				case 'p':
 				case 'h2':
 				case 'h3':
@@ -205,7 +205,7 @@ export class MfmService {
 					appendChildren(node.childNodes);
 					break;
 				}
-	
+
 				// other block elements
 				case 'div':
 				case 'header':
@@ -219,7 +219,7 @@ export class MfmService {
 					appendChildren(node.childNodes);
 					break;
 				}
-	
+
 				default:	// includes inline elements
 				{
 					appendChildren(node.childNodes);
@@ -234,48 +234,48 @@ export class MfmService {
 		if (nodes == null) {
 			return null;
 		}
-	
+
 		const { window } = new Window();
-	
+
 		const doc = window.document;
-	
+
 		function appendChildren(children: mfm.MfmNode[], targetElement: any): void {
 			if (children) {
 				for (const child of children.map(x => (handlers as any)[x.type](x))) targetElement.appendChild(child);
 			}
 		}
-	
+
 		const handlers: { [K in mfm.MfmNode['type']]: (node: mfm.NodeType<K>) => any } = {
 			bold: (node) => {
 				const el = doc.createElement('b');
 				appendChildren(node.children, el);
 				return el;
 			},
-	
+
 			small: (node) => {
 				const el = doc.createElement('small');
 				appendChildren(node.children, el);
 				return el;
 			},
-	
+
 			strike: (node) => {
 				const el = doc.createElement('del');
 				appendChildren(node.children, el);
 				return el;
 			},
-	
+
 			italic: (node) => {
 				const el = doc.createElement('i');
 				appendChildren(node.children, el);
 				return el;
 			},
-	
+
 			fn: (node) => {
 				const el = doc.createElement('i');
 				appendChildren(node.children, el);
 				return el;
 			},
-	
+
 			blockCode: (node) => {
 				const pre = doc.createElement('pre');
 				const inner = doc.createElement('code');
@@ -283,21 +283,21 @@ export class MfmService {
 				pre.appendChild(inner);
 				return pre;
 			},
-	
+
 			center: (node) => {
 				const el = doc.createElement('div');
 				appendChildren(node.children, el);
 				return el;
 			},
-	
+
 			emojiCode: (node) => {
 				return doc.createTextNode(`\u200B:${node.props.name}:\u200B`);
 			},
-	
+
 			unicodeEmoji: (node) => {
 				return doc.createTextNode(node.props.emoji);
 			},
-	
+
 			hashtag: (node) => {
 				const a = doc.createElement('a');
 				a.setAttribute('href', `${this.config.url}/tags/${node.props.hashtag}`);
@@ -305,32 +305,32 @@ export class MfmService {
 				a.setAttribute('rel', 'tag');
 				return a;
 			},
-	
+
 			inlineCode: (node) => {
 				const el = doc.createElement('code');
 				el.textContent = node.props.code;
 				return el;
 			},
-	
+
 			mathInline: (node) => {
 				const el = doc.createElement('code');
 				el.textContent = node.props.formula;
 				return el;
 			},
-	
+
 			mathBlock: (node) => {
 				const el = doc.createElement('code');
 				el.textContent = node.props.formula;
 				return el;
 			},
-	
+
 			link: (node) => {
 				const a = doc.createElement('a');
 				a.setAttribute('href', node.props.url);
 				appendChildren(node.children, a);
 				return a;
 			},
-	
+
 			mention: (node) => {
 				const a = doc.createElement('a');
 				const { username, host, acct } = node.props;
@@ -340,47 +340,47 @@ export class MfmService {
 				a.textContent = acct;
 				return a;
 			},
-	
+
 			quote: (node) => {
 				const el = doc.createElement('blockquote');
 				appendChildren(node.children, el);
 				return el;
 			},
-	
+
 			text: (node) => {
 				const el = doc.createElement('span');
 				const nodes = node.props.text.split(/\r\n|\r|\n/).map(x => doc.createTextNode(x));
-	
+
 				for (const x of intersperse<FIXME | 'br'>('br', nodes)) {
 					el.appendChild(x === 'br' ? doc.createElement('br') : x);
 				}
-	
+
 				return el;
 			},
-	
+
 			url: (node) => {
 				const a = doc.createElement('a');
 				a.setAttribute('href', node.props.url);
 				a.textContent = node.props.url;
 				return a;
 			},
-	
+
 			search: (node) => {
 				const a = doc.createElement('a');
 				a.setAttribute('href', `https://www.google.com/search?q=${node.props.query}`);
 				a.textContent = node.props.content;
 				return a;
 			},
-	
+
 			plain: (node) => {
 				const el = doc.createElement('span');
 				appendChildren(node.children, el);
 				return el;
 			},
 		};
-	
+
 		appendChildren(nodes, doc.body);
-	
+
 		return `<p>${doc.body.innerHTML}</p>`;
-	}	
+	}
 }
diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts
index 1c8491bf5..fb36ca3b6 100644
--- a/packages/backend/src/core/NoteCreateService.ts
+++ b/packages/backend/src/core/NoteCreateService.ts
@@ -672,7 +672,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 		// Register to search database
 		this.index(note);
 	}
-	
+
 	@bindThis
 	private isSensitive(note: Option, sensitiveWord: string[]): boolean {
 		if (sensitiveWord.length > 0) {
@@ -758,7 +758,7 @@ export class NoteCreateService implements OnApplicationShutdown {
 	@bindThis
 	private index(note: Note) {
 		if (note.text == null && note.cw == null) return;
-		
+
 		this.searchService.indexNote(note);
 	}
 
diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index 3612ac806..10381c7e6 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -45,7 +45,7 @@ export class NoteDeleteService {
 		private perUserNotesChart: PerUserNotesChart,
 		private instanceChart: InstanceChart,
 	) {}
-	
+
 	/**
 	 * 投稿を削除します。
 	 * @param user 投稿者
diff --git a/packages/backend/src/core/NoteReadService.ts b/packages/backend/src/core/NoteReadService.ts
index e57e57d31..b84591e26 100644
--- a/packages/backend/src/core/NoteReadService.ts
+++ b/packages/backend/src/core/NoteReadService.ts
@@ -99,7 +99,7 @@ export class NoteReadService implements OnApplicationShutdown {
 			});
 
 			// TODO: ↓まとめてクエリしたい
-	
+
 			this.noteUnreadsRepository.countBy({
 				userId: userId,
 				isMentioned: true,
@@ -109,7 +109,7 @@ export class NoteReadService implements OnApplicationShutdown {
 					this.globalEventService.publishMainStream(userId, 'readAllUnreadMentions');
 				}
 			});
-	
+
 			this.noteUnreadsRepository.countBy({
 				userId: userId,
 				isSpecified: true,
diff --git a/packages/backend/src/core/NotificationService.ts b/packages/backend/src/core/NotificationService.ts
index ed47165f7..8e25f8228 100644
--- a/packages/backend/src/core/NotificationService.ts
+++ b/packages/backend/src/core/NotificationService.ts
@@ -46,7 +46,7 @@ export class NotificationService implements OnApplicationShutdown {
 		force = false,
 	) {
 		const latestReadNotificationId = await this.redisClient.get(`latestReadNotification:${userId}`);
-		
+
 		const latestNotificationIdsRes = await this.redisClient.xrevrange(
 			`notificationTimeline:${userId}`,
 			'+',
diff --git a/packages/backend/src/core/PollService.ts b/packages/backend/src/core/PollService.ts
index 368753d9a..be1940005 100644
--- a/packages/backend/src/core/PollService.ts
+++ b/packages/backend/src/core/PollService.ts
@@ -39,12 +39,12 @@ export class PollService {
 	@bindThis
 	public async vote(user: User, note: Note, choice: number) {
 		const poll = await this.pollsRepository.findOneBy({ noteId: note.id });
-	
+
 		if (poll == null) throw new Error('poll not found');
-	
+
 		// Check whether is valid choice
 		if (poll.choices[choice] == null) throw new Error('invalid choice param');
-	
+
 		// Check blocking
 		if (note.userId !== user.id) {
 			const blocked = await this.userBlockingService.checkBlocked(note.userId, user.id);
@@ -52,13 +52,13 @@ export class PollService {
 				throw new Error('blocked');
 			}
 		}
-	
+
 		// if already voted
 		const exist = await this.pollVotesRepository.findBy({
 			noteId: note.id,
 			userId: user.id,
 		});
-	
+
 		if (poll.multiple) {
 			if (exist.some(x => x.choice === choice)) {
 				throw new Error('already voted');
@@ -66,7 +66,7 @@ export class PollService {
 		} else if (exist.length !== 0) {
 			throw new Error('already voted');
 		}
-	
+
 		// Create vote
 		await this.pollVotesRepository.insert({
 			id: this.idService.genId(),
@@ -75,11 +75,11 @@ export class PollService {
 			userId: user.id,
 			choice: choice,
 		});
-	
+
 		// Increment votes count
 		const index = choice + 1; // In SQL, array index is 1 based
 		await this.pollsRepository.query(`UPDATE poll SET votes[${index}] = votes[${index}] + 1 WHERE "noteId" = '${poll.noteId}'`);
-	
+
 		this.globalEventService.publishNoteStream(note.id, 'pollVoted', {
 			choice: choice,
 			userId: user.id,
@@ -90,10 +90,10 @@ export class PollService {
 	public async deliverQuestionUpdate(noteId: Note['id']) {
 		const note = await this.notesRepository.findOneBy({ id: noteId });
 		if (note == null) throw new Error('note not found');
-	
+
 		const user = await this.usersRepository.findOneBy({ id: note.userId });
 		if (user == null) throw new Error('note not found');
-	
+
 		if (this.userEntityService.isLocalUser(user)) {
 			const content = this.apRendererService.addContext(this.apRendererService.renderUpdate(await this.apRendererService.renderNote(note, false), user));
 			this.apDeliverManagerService.deliverToFollowers(user, content);
diff --git a/packages/backend/src/core/PushNotificationService.ts b/packages/backend/src/core/PushNotificationService.ts
index 9ee83df64..e1c3d3943 100644
--- a/packages/backend/src/core/PushNotificationService.ts
+++ b/packages/backend/src/core/PushNotificationService.ts
@@ -31,7 +31,7 @@ function truncateBody<T extends keyof PushNotificationsTypes>(type: T, body: Pus
 				...body.note,
 				// textをgetNoteSummaryしたものに置き換える
 				text: getNoteSummary(('type' in body && body.type === 'renote') ? body.note.renote as Packed<'Note'> : body.note),
-	
+
 				cw: undefined,
 				reply: undefined,
 				renote: undefined,
@@ -69,16 +69,16 @@ export class PushNotificationService implements OnApplicationShutdown {
 	@bindThis
 	public async pushNotification<T extends keyof PushNotificationsTypes>(userId: string, type: T, body: PushNotificationsTypes[T]) {
 		const meta = await this.metaService.fetch();
-	
+
 		if (!meta.enableServiceWorker || meta.swPublicKey == null || meta.swPrivateKey == null) return;
-	
+
 		// アプリケーションの連絡先と、サーバーサイドの鍵ペアの情報を登録
 		push.setVapidDetails(this.config.url,
 			meta.swPublicKey,
 			meta.swPrivateKey);
-	
+
 		const subscriptions = await this.subscriptionsCache.fetch(userId);
-	
+
 		for (const subscription of subscriptions) {
 			if ([
 				'readAllNotifications',
@@ -103,7 +103,7 @@ export class PushNotificationService implements OnApplicationShutdown {
 				//swLogger.info(err.statusCode);
 				//swLogger.info(err.headers);
 				//swLogger.info(err.body);
-	
+
 				if (err.statusCode === 410) {
 					this.swSubscriptionsRepository.delete({
 						userId: userId,
diff --git a/packages/backend/src/core/QueryService.ts b/packages/backend/src/core/QueryService.ts
index bf50a1cde..435d5d238 100644
--- a/packages/backend/src/core/QueryService.ts
+++ b/packages/backend/src/core/QueryService.ts
@@ -60,8 +60,8 @@ export class QueryService {
 			q.orderBy(`${q.alias}.id`, 'DESC');
 		}
 		return q;
-	}	
-	
+	}
+
 	// ここでいうBlockedは被Blockedの意
 	@bindThis
 	public generateBlockedUserQuery(q: SelectQueryBuilder<any>, me: { id: User['id'] }): void {
@@ -109,18 +109,18 @@ export class QueryService {
 			q.andWhere('note.channelId IS NULL');
 		} else {
 			q.leftJoinAndSelect('note.channel', 'channel');
-	
+
 			const channelFollowingQuery = this.channelFollowingsRepository.createQueryBuilder('channelFollowing')
 				.select('channelFollowing.followeeId')
 				.where('channelFollowing.followerId = :followerId', { followerId: me.id });
-	
+
 			q.andWhere(new Brackets(qb => { qb
 				// チャンネルのノートではない
 				.where('note.channelId IS NULL')
 				// または自分がフォローしているチャンネルのノート
 				.orWhere(`note.channelId IN (${ channelFollowingQuery.getQuery() })`);
 			}));
-	
+
 			q.setParameters(channelFollowingQuery.getParameters());
 		}
 	}
@@ -130,9 +130,9 @@ export class QueryService {
 		const mutedQuery = this.mutedNotesRepository.createQueryBuilder('muted')
 			.select('muted.noteId')
 			.where('muted.userId = :userId', { userId: me.id });
-	
+
 		q.andWhere(`note.id NOT IN (${ mutedQuery.getQuery() })`);
-	
+
 		q.setParameters(mutedQuery.getParameters());
 	}
 
@@ -141,13 +141,13 @@ export class QueryService {
 		const mutedQuery = this.noteThreadMutingsRepository.createQueryBuilder('threadMuted')
 			.select('threadMuted.threadId')
 			.where('threadMuted.userId = :userId', { userId: me.id });
-	
+
 		q.andWhere(`note.id NOT IN (${ mutedQuery.getQuery() })`);
 		q.andWhere(new Brackets(qb => { qb
 			.where('note.threadId IS NULL')
 			.orWhere(`note.threadId NOT IN (${ mutedQuery.getQuery() })`);
 		}));
-	
+
 		q.setParameters(mutedQuery.getParameters());
 	}
 
@@ -156,15 +156,15 @@ export class QueryService {
 		const mutingQuery = this.mutingsRepository.createQueryBuilder('muting')
 			.select('muting.muteeId')
 			.where('muting.muterId = :muterId', { muterId: me.id });
-	
+
 		if (exclude) {
 			mutingQuery.andWhere('muting.muteeId != :excludeId', { excludeId: exclude.id });
 		}
-	
+
 		const mutingInstanceQuery = this.userProfilesRepository.createQueryBuilder('user_profile')
 			.select('user_profile.mutedInstances')
 			.where('user_profile.userId = :muterId', { muterId: me.id });
-	
+
 		// 投稿の作者をミュートしていない かつ
 		// 投稿の返信先の作者をミュートしていない かつ
 		// 投稿の引用元の作者をミュートしていない
@@ -191,7 +191,7 @@ export class QueryService {
 				.where('note.renoteUserHost IS NULL')
 				.orWhere(`NOT ((${ mutingInstanceQuery.getQuery() })::jsonb ? note.renoteUserHost)`);
 			}));
-	
+
 		q.setParameters(mutingQuery.getParameters());
 		q.setParameters(mutingInstanceQuery.getParameters());
 	}
@@ -201,9 +201,9 @@ export class QueryService {
 		const mutingQuery = this.mutingsRepository.createQueryBuilder('muting')
 			.select('muting.muteeId')
 			.where('muting.muterId = :muterId', { muterId: me.id });
-	
+
 		q.andWhere(`user.id NOT IN (${ mutingQuery.getQuery() })`);
-	
+
 		q.setParameters(mutingQuery.getParameters());
 	}
 
@@ -245,7 +245,7 @@ export class QueryService {
 			const followingQuery = this.followingsRepository.createQueryBuilder('following')
 				.select('following.followeeId')
 				.where('following.followerId = :meId');
-	
+
 			q.andWhere(new Brackets(qb => { qb
 				// 公開投稿である
 				.where(new Brackets(qb => { qb
@@ -268,7 +268,7 @@ export class QueryService {
 					}));
 				}));
 			}));
-	
+
 			q.setParameters({ meId: me.id });
 		}
 	}
@@ -278,10 +278,10 @@ export class QueryService {
 		const mutingQuery = this.renoteMutingsRepository.createQueryBuilder('renote_muting')
 			.select('renote_muting.muteeId')
 			.where('renote_muting.muterId = :muterId', { muterId: me.id });
-	
+
 		q.andWhere(new Brackets(qb => {
 			qb
-				.where(new Brackets(qb => { 
+				.where(new Brackets(qb => {
 					qb.where('note.renoteId IS NOT NULL');
 					qb.andWhere('note.text IS NULL');
 					qb.andWhere(`note.userId NOT IN (${ mutingQuery.getQuery() })`);
@@ -289,7 +289,7 @@ export class QueryService {
 				.orWhere('note.renoteId IS NULL')
 				.orWhere('note.text IS NOT NULL');
 		}));
-		
+
 		q.setParameters(mutingQuery.getParameters());
 	}
 }
diff --git a/packages/backend/src/core/RelayService.ts b/packages/backend/src/core/RelayService.ts
index 9d34d82be..c0113a21d 100644
--- a/packages/backend/src/core/RelayService.ts
+++ b/packages/backend/src/core/RelayService.ts
@@ -39,9 +39,9 @@ export class RelayService {
 			host: IsNull(),
 			username: ACTOR_USERNAME,
 		});
-	
+
 		if (user) return user as LocalUser;
-	
+
 		const created = await this.createSystemUserService.createSystemUser(ACTOR_USERNAME);
 		return created as LocalUser;
 	}
@@ -53,12 +53,12 @@ export class RelayService {
 			inbox,
 			status: 'requesting',
 		}).then(x => this.relaysRepository.findOneByOrFail(x.identifiers[0]));
-	
+
 		const relayActor = await this.getRelayActor();
 		const follow = await this.apRendererService.renderFollowRelay(relay, relayActor);
 		const activity = this.apRendererService.addContext(follow);
 		this.queueService.deliver(relayActor, activity, relay.inbox, false);
-	
+
 		return relay;
 	}
 
@@ -67,17 +67,17 @@ export class RelayService {
 		const relay = await this.relaysRepository.findOneBy({
 			inbox,
 		});
-	
+
 		if (relay == null) {
 			throw new Error('relay not found');
 		}
-	
+
 		const relayActor = await this.getRelayActor();
 		const follow = this.apRendererService.renderFollowRelay(relay, relayActor);
 		const undo = this.apRendererService.renderUndo(follow, relayActor);
 		const activity = this.apRendererService.addContext(undo);
 		this.queueService.deliver(relayActor, activity, relay.inbox, false);
-	
+
 		await this.relaysRepository.delete(relay.id);
 	}
 
@@ -86,13 +86,13 @@ export class RelayService {
 		const relays = await this.relaysRepository.find();
 		return relays;
 	}
-	
+
 	@bindThis
 	public async relayAccepted(id: string): Promise<string> {
 		const result = await this.relaysRepository.update(id, {
 			status: 'accepted',
 		});
-	
+
 		return JSON.stringify(result);
 	}
 
@@ -101,24 +101,24 @@ export class RelayService {
 		const result = await this.relaysRepository.update(id, {
 			status: 'rejected',
 		});
-	
+
 		return JSON.stringify(result);
 	}
 
 	@bindThis
 	public async deliverToRelays(user: { id: User['id']; host: null; }, activity: any): Promise<void> {
 		if (activity == null) return;
-	
+
 		const relays = await this.relaysCache.fetch(() => this.relaysRepository.findBy({
 			status: 'accepted',
 		}));
 		if (relays.length === 0) return;
-	
+
 		const copy = deepClone(activity);
 		if (!copy.to) copy.to = ['https://www.w3.org/ns/activitystreams#Public'];
-	
+
 		const signed = await this.apRendererService.attachLdSignature(copy, user);
-	
+
 		for (const relay of relays) {
 			this.queueService.deliver(user, signed, relay.inbox, false);
 		}
diff --git a/packages/backend/src/core/RemoteUserResolveService.ts b/packages/backend/src/core/RemoteUserResolveService.ts
index ff68c2421..ed15a1f1c 100644
--- a/packages/backend/src/core/RemoteUserResolveService.ts
+++ b/packages/backend/src/core/RemoteUserResolveService.ts
@@ -35,7 +35,7 @@ export class RemoteUserResolveService {
 	@bindThis
 	public async resolveUser(username: string, host: string | null): Promise<LocalUser | RemoteUser> {
 		const usernameLower = username.toLowerCase();
-	
+
 		if (host == null) {
 			this.logger.info(`return local user: ${usernameLower}`);
 			return await this.usersRepository.findOneBy({ usernameLower, host: IsNull() }).then(u => {
@@ -46,9 +46,9 @@ export class RemoteUserResolveService {
 				}
 			}) as LocalUser;
 		}
-	
+
 		host = this.utilityService.toPuny(host);
-	
+
 		if (this.config.host === host) {
 			this.logger.info(`return local user: ${usernameLower}`);
 			return await this.usersRepository.findOneBy({ usernameLower, host: IsNull() }).then(u => {
@@ -59,39 +59,39 @@ export class RemoteUserResolveService {
 				}
 			}) as LocalUser;
 		}
-	
+
 		const user = await this.usersRepository.findOneBy({ usernameLower, host }) as RemoteUser | null;
-	
+
 		const acctLower = `${usernameLower}@${host}`;
-	
+
 		if (user == null) {
 			const self = await this.resolveSelf(acctLower);
-	
+
 			this.logger.succ(`return new remote user: ${chalk.magenta(acctLower)}`);
 			return await this.apPersonService.createPerson(self.href);
 		}
-	
+
 		// ユーザー情報が古い場合は、WebFilgerからやりなおして返す
 		if (user.lastFetchedAt == null || Date.now() - user.lastFetchedAt.getTime() > 1000 * 60 * 60 * 24) {
 			// 繋がらないインスタンスに何回も試行するのを防ぐ, 後続の同様処理の連続試行を防ぐ ため 試行前にも更新する
 			await this.usersRepository.update(user.id, {
 				lastFetchedAt: new Date(),
 			});
-	
+
 			this.logger.info(`try resync: ${acctLower}`);
 			const self = await this.resolveSelf(acctLower);
-	
+
 			if (user.uri !== self.href) {
 				// if uri mismatch, Fix (user@host <=> AP's Person id(RemoteUser.uri)) mapping.
 				this.logger.info(`uri missmatch: ${acctLower}`);
 				this.logger.info(`recovery missmatch uri for (username=${username}, host=${host}) from ${user.uri} to ${self.href}`);
-	
+
 				// validate uri
 				const uri = new URL(self.href);
 				if (uri.hostname !== host) {
 					throw new Error('Invalid uri');
 				}
-	
+
 				await this.usersRepository.update({
 					usernameLower,
 					host: host,
@@ -101,9 +101,9 @@ export class RemoteUserResolveService {
 			} else {
 				this.logger.info(`uri is fine: ${acctLower}`);
 			}
-	
+
 			await this.apPersonService.updatePerson(self.href);
-	
+
 			this.logger.info(`return resynced remote user: ${acctLower}`);
 			return await this.usersRepository.findOneBy({ uri: self.href }).then(u => {
 				if (u == null) {
@@ -113,7 +113,7 @@ export class RemoteUserResolveService {
 				}
 			});
 		}
-	
+
 		this.logger.info(`return existing remote user: ${acctLower}`);
 		return user;
 	}
diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts
index 23ecf0157..b0bfb44dc 100644
--- a/packages/backend/src/core/RoleService.ts
+++ b/packages/backend/src/core/RoleService.ts
@@ -392,7 +392,7 @@ export class RoleService implements OnApplicationShutdown {
 	@bindThis
 	public async unassign(userId: User['id'], roleId: Role['id']): Promise<void> {
 		const now = new Date();
-	
+
 		const existing = await this.roleAssignmentsRepository.findOneBy({ roleId, userId });
 		if (existing == null) {
 			throw new RoleService.NotAssignedError();
diff --git a/packages/backend/src/core/SignupService.ts b/packages/backend/src/core/SignupService.ts
index 29eb65fda..e6b17a874 100644
--- a/packages/backend/src/core/SignupService.ts
+++ b/packages/backend/src/core/SignupService.ts
@@ -50,31 +50,31 @@ export class SignupService {
 	}) {
 		const { username, password, passwordHash, host } = opts;
 		let hash = passwordHash;
-	
+
 		// Validate username
 		if (!this.userEntityService.validateLocalUsername(username)) {
 			throw new Error('INVALID_USERNAME');
 		}
-	
+
 		if (password != null && passwordHash == null) {
 			// Validate password
 			if (!this.userEntityService.validatePassword(password)) {
 				throw new Error('INVALID_PASSWORD');
 			}
-	
+
 			// Generate hash of password
 			const salt = await bcrypt.genSalt(8);
 			hash = await bcrypt.hash(password, salt);
 		}
-	
+
 		// Generate secret
 		const secret = generateUserToken();
-	
+
 		// Check username duplication
 		if (await this.usersRepository.findOneBy({ usernameLower: username.toLowerCase(), host: IsNull() })) {
 			throw new Error('DUPLICATED_USERNAME');
 		}
-	
+
 		// Check deleted username duplication
 		if (await this.usedUsernamesRepository.findOneBy({ username: username.toLowerCase() })) {
 			throw new Error('USED_USERNAME');
@@ -106,18 +106,18 @@ export class SignupService {
 			}, (err, publicKey, privateKey) =>
 				err ? rej(err) : res([publicKey, privateKey]),
 			));
-	
+
 		let account!: User;
-	
+
 		// Start transaction
 		await this.db.transaction(async transactionalEntityManager => {
 			const exist = await transactionalEntityManager.findOneBy(User, {
 				usernameLower: username.toLowerCase(),
 				host: IsNull(),
 			});
-	
+
 			if (exist) throw new Error(' the username is already used');
-	
+
 			account = await transactionalEntityManager.save(new User({
 				id: this.idService.genId(),
 				createdAt: new Date(),
@@ -127,27 +127,27 @@ export class SignupService {
 				token: secret,
 				isRoot: isTheFirstUser,
 			}));
-	
+
 			await transactionalEntityManager.save(new UserKeypair({
 				publicKey: keyPair[0],
 				privateKey: keyPair[1],
 				userId: account.id,
 			}));
-	
+
 			await transactionalEntityManager.save(new UserProfile({
 				userId: account.id,
 				autoAcceptFollowed: true,
 				password: hash,
 			}));
-	
+
 			await transactionalEntityManager.save(new UsedUsername({
 				createdAt: new Date(),
 				username: username.toLowerCase(),
 			}));
 		});
-	
+
 		this.usersChart.update(account, true);
-	
+
 		return { account, secret };
 	}
 }
diff --git a/packages/backend/src/core/TwoFactorAuthenticationService.ts b/packages/backend/src/core/TwoFactorAuthenticationService.ts
index dda78236e..d4cf186a2 100644
--- a/packages/backend/src/core/TwoFactorAuthenticationService.ts
+++ b/packages/backend/src/core/TwoFactorAuthenticationService.ts
@@ -69,7 +69,7 @@ function verifyCertificateChain(certificates: string[]) {
 
 		const certStruct = jsrsasign.ASN1HEX.getTLVbyList(certificate.hex!, 0, [0]);
 		if (certStruct == null) throw new Error('certStruct is null');
-		
+
 		const algorithm = certificate.getSignatureAlgorithmField();
 		const signatureHex = certificate.getSignatureValueHex();
 
@@ -143,19 +143,19 @@ export class TwoFactorAuthenticationService {
 		if (clientData.type !== 'webauthn.get') {
 			throw new Error('type is not webauthn.get');
 		}
-	
+
 		if (this.hash(clientData.challenge).toString('hex') !== challenge) {
 			throw new Error('challenge mismatch');
 		}
 		if (clientData.origin !== this.config.scheme + '://' + this.config.host) {
 			throw new Error('origin mismatch');
 		}
-	
+
 		const verificationData = Buffer.concat(
 			[authenticatorData, this.hash(clientDataJSON)],
 			32 + authenticatorData.length,
 		);
-	
+
 		return crypto
 			.createVerify('SHA256')
 			.update(verificationData)
@@ -168,7 +168,7 @@ export class TwoFactorAuthenticationService {
 			none: {
 				verify({ publicKey }: { publicKey: Map<number, Buffer> }) {
 					const negTwo = publicKey.get(-2);
-		
+
 					if (!negTwo || negTwo.length !== 32) {
 						throw new Error('invalid or no -2 key given');
 					}
@@ -176,12 +176,12 @@ export class TwoFactorAuthenticationService {
 					if (!negThree || negThree.length !== 32) {
 						throw new Error('invalid or no -3 key given');
 					}
-		
+
 					const publicKeyU2F = Buffer.concat(
 						[ECC_PRELUDE, negTwo, negThree],
 						1 + 32 + 32,
 					);
-		
+
 					return {
 						publicKey: publicKeyU2F,
 						valid: true,
@@ -207,16 +207,16 @@ export class TwoFactorAuthenticationService {
 					if (attStmt.alg !== -7) {
 						throw new Error('alg mismatch');
 					}
-		
+
 					const verificationData = Buffer.concat([
 						authenticatorData,
 						clientDataHash,
 					]);
-		
+
 					const attCert: Buffer = attStmt.x5c[0];
-		
+
 					const negTwo = publicKey.get(-2);
-		
+
 					if (!negTwo || negTwo.length !== 32) {
 						throw new Error('invalid or no -2 key given');
 					}
@@ -224,23 +224,23 @@ export class TwoFactorAuthenticationService {
 					if (!negThree || negThree.length !== 32) {
 						throw new Error('invalid or no -3 key given');
 					}
-		
+
 					const publicKeyData = Buffer.concat(
 						[ECC_PRELUDE, negTwo, negThree],
 						1 + 32 + 32,
 					);
-		
+
 					if (!attCert.equals(publicKeyData)) {
 						throw new Error('public key mismatch');
 					}
-		
+
 					const isValid = crypto
 						.createVerify('SHA256')
 						.update(verificationData)
 						.verify(PEMString(attCert), attStmt.sig);
-		
+
 					// TODO: Check 'attestationChallenge' field in extension of cert matches hash(clientDataJSON)
-		
+
 					return {
 						valid: isValid,
 						publicKey: publicKeyData,
@@ -267,43 +267,43 @@ export class TwoFactorAuthenticationService {
 					const verificationData = this.hash(
 						Buffer.concat([authenticatorData, clientDataHash]),
 					);
-		
+
 					const jwsParts = attStmt.response.toString('utf-8').split('.');
-		
+
 					const header = JSON.parse(base64URLDecode(jwsParts[0]).toString('utf-8'));
 					const response = JSON.parse(
 						base64URLDecode(jwsParts[1]).toString('utf-8'),
 					);
 					const signature = jwsParts[2];
-		
+
 					if (!verificationData.equals(Buffer.from(response.nonce, 'base64'))) {
 						throw new Error('invalid nonce');
 					}
-		
+
 					const certificateChain = header.x5c
 						.map((key: any) => PEMString(key))
 						.concat([GSR2]);
-		
+
 					if (getCertSubject(certificateChain[0]).CN !== 'attest.android.com') {
 						throw new Error('invalid common name');
 					}
-		
+
 					if (!verifyCertificateChain(certificateChain)) {
 						throw new Error('Invalid certificate chain!');
 					}
-		
+
 					const signatureBase = Buffer.from(
 						jwsParts[0] + '.' + jwsParts[1],
 						'utf-8',
 					);
-		
+
 					const valid = crypto
 						.createVerify('sha256')
 						.update(signatureBase)
 						.verify(certificateChain[0], base64URLDecode(signature));
-		
+
 					const negTwo = publicKey.get(-2);
-		
+
 					if (!negTwo || negTwo.length !== 32) {
 						throw new Error('invalid or no -2 key given');
 					}
@@ -311,7 +311,7 @@ export class TwoFactorAuthenticationService {
 					if (!negThree || negThree.length !== 32) {
 						throw new Error('invalid or no -3 key given');
 					}
-		
+
 					const publicKeyData = Buffer.concat(
 						[ECC_PRELUDE, negTwo, negThree],
 						1 + 32 + 32,
@@ -342,17 +342,17 @@ export class TwoFactorAuthenticationService {
 						authenticatorData,
 						clientDataHash,
 					]);
-		
+
 					if (attStmt.x5c) {
 						const attCert = attStmt.x5c[0];
-		
+
 						const validSignature = crypto
 							.createVerify('SHA256')
 							.update(verificationData)
 							.verify(PEMString(attCert), attStmt.sig);
-		
+
 						const negTwo = publicKey.get(-2);
-		
+
 						if (!negTwo || negTwo.length !== 32) {
 							throw new Error('invalid or no -2 key given');
 						}
@@ -360,12 +360,12 @@ export class TwoFactorAuthenticationService {
 						if (!negThree || negThree.length !== 32) {
 							throw new Error('invalid or no -3 key given');
 						}
-		
+
 						const publicKeyData = Buffer.concat(
 							[ECC_PRELUDE, negTwo, negThree],
 							1 + 32 + 32,
 						);
-		
+
 						return {
 							valid: validSignature,
 							publicKey: publicKeyData,
@@ -375,12 +375,12 @@ export class TwoFactorAuthenticationService {
 						throw new Error('ECDAA-Verify is not supported');
 					} else {
 						if (attStmt.alg !== -7) throw new Error('alg mismatch');
-		
+
 						throw new Error('self attestation is not supported');
 					}
 				},
 			},
-		
+
 			'fido-u2f': {
 				verify({
 					attStmt,
@@ -401,13 +401,13 @@ export class TwoFactorAuthenticationService {
 					if (x5c.length !== 1) {
 						throw new Error('x5c length does not match expectation');
 					}
-		
+
 					const attCert = x5c[0];
-		
+
 					// TODO: make sure attCert is an Elliptic Curve (EC) public key over the P-256 curve
-		
+
 					const negTwo: Buffer = publicKey.get(-2);
-		
+
 					if (!negTwo || negTwo.length !== 32) {
 						throw new Error('invalid or no -2 key given');
 					}
@@ -415,12 +415,12 @@ export class TwoFactorAuthenticationService {
 					if (!negThree || negThree.length !== 32) {
 						throw new Error('invalid or no -3 key given');
 					}
-		
+
 					const publicKeyU2F = Buffer.concat(
 						[ECC_PRELUDE, negTwo, negThree],
 						1 + 32 + 32,
 					);
-		
+
 					const verificationData = Buffer.concat([
 						NULL_BYTE,
 						rpIdHash,
@@ -428,12 +428,12 @@ export class TwoFactorAuthenticationService {
 						credentialId,
 						publicKeyU2F,
 					]);
-		
+
 					const validSignature = crypto
 						.createVerify('SHA256')
 						.update(verificationData)
 						.verify(PEMString(attCert), attStmt.sig);
-		
+
 					return {
 						valid: validSignature,
 						publicKey: publicKeyU2F,
diff --git a/packages/backend/src/core/UserSuspendService.ts b/packages/backend/src/core/UserSuspendService.ts
index b197d335d..28ae32681 100644
--- a/packages/backend/src/core/UserSuspendService.ts
+++ b/packages/backend/src/core/UserSuspendService.ts
@@ -32,13 +32,13 @@ export class UserSuspendService {
 	@bindThis
 	public async doPostSuspend(user: { id: User['id']; host: User['host'] }): Promise<void> {
 		this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: true });
-	
+
 		if (this.userEntityService.isLocalUser(user)) {
 			// 知り得る全SharedInboxにDelete配信
 			const content = this.apRendererService.addContext(this.apRendererService.renderDelete(this.userEntityService.genLocalUserUri(user.id), user));
-	
+
 			const queue: string[] = [];
-	
+
 			const followings = await this.followingsRepository.find({
 				where: [
 					{ followerSharedInbox: Not(IsNull()) },
@@ -46,13 +46,13 @@ export class UserSuspendService {
 				],
 				select: ['followerSharedInbox', 'followeeSharedInbox'],
 			});
-	
+
 			const inboxes = followings.map(x => x.followerSharedInbox ?? x.followeeSharedInbox);
-	
+
 			for (const inbox of inboxes) {
 				if (inbox != null && !queue.includes(inbox)) queue.push(inbox);
 			}
-	
+
 			for (const inbox of queue) {
 				this.queueService.deliver(user, content, inbox, true);
 			}
@@ -62,13 +62,13 @@ export class UserSuspendService {
 	@bindThis
 	public async doPostUnsuspend(user: User): Promise<void> {
 		this.globalEventService.publishInternalEvent('userChangeSuspendedState', { id: user.id, isSuspended: false });
-	
+
 		if (this.userEntityService.isLocalUser(user)) {
 			// 知り得る全SharedInboxにUndo Delete配信
 			const content = this.apRendererService.addContext(this.apRendererService.renderUndo(this.apRendererService.renderDelete(this.userEntityService.genLocalUserUri(user.id), user), user));
-	
+
 			const queue: string[] = [];
-	
+
 			const followings = await this.followingsRepository.find({
 				where: [
 					{ followerSharedInbox: Not(IsNull()) },
@@ -76,13 +76,13 @@ export class UserSuspendService {
 				],
 				select: ['followerSharedInbox', 'followeeSharedInbox'],
 			});
-	
+
 			const inboxes = followings.map(x => x.followerSharedInbox ?? x.followeeSharedInbox);
-	
+
 			for (const inbox of inboxes) {
 				if (inbox != null && !queue.includes(inbox)) queue.push(inbox);
 			}
-	
+
 			for (const inbox of queue) {
 				this.queueService.deliver(user as any, content, inbox, true);
 			}
diff --git a/packages/backend/src/core/VideoProcessingService.ts b/packages/backend/src/core/VideoProcessingService.ts
index 5869905db..89681f337 100644
--- a/packages/backend/src/core/VideoProcessingService.ts
+++ b/packages/backend/src/core/VideoProcessingService.ts
@@ -21,7 +21,7 @@ export class VideoProcessingService {
 	@bindThis
 	public async generateVideoThumbnail(source: string): Promise<IImage> {
 		const [dir, cleanup] = await createTempDir();
-	
+
 		try {
 			await new Promise((res, rej) => {
 				FFmpeg({
diff --git a/packages/backend/src/core/WebhookService.ts b/packages/backend/src/core/WebhookService.ts
index 467755a07..b6f526390 100644
--- a/packages/backend/src/core/WebhookService.ts
+++ b/packages/backend/src/core/WebhookService.ts
@@ -31,7 +31,7 @@ export class WebhookService implements OnApplicationShutdown {
 			});
 			this.webhooksFetched = true;
 		}
-	
+
 		return this.webhooks;
 	}
 
diff --git a/packages/backend/src/core/activitypub/ApAudienceService.ts b/packages/backend/src/core/activitypub/ApAudienceService.ts
index 8282a6324..0eab7fa33 100644
--- a/packages/backend/src/core/activitypub/ApAudienceService.ts
+++ b/packages/backend/src/core/activitypub/ApAudienceService.ts
@@ -27,14 +27,14 @@ export class ApAudienceService {
 	public async parseAudience(actor: RemoteUser, to?: ApObject, cc?: ApObject, resolver?: Resolver): Promise<AudienceInfo> {
 		const toGroups = this.groupingAudience(getApIds(to), actor);
 		const ccGroups = this.groupingAudience(getApIds(cc), actor);
-	
+
 		const others = unique(concat([toGroups.other, ccGroups.other]));
-	
+
 		const limit = promiseLimit<User | null>(2);
 		const mentionedUsers = (await Promise.all(
 			others.map(id => limit(() => this.apPersonService.resolvePerson(id, resolver).catch(() => null))),
 		)).filter((x): x is User => x != null);
-	
+
 		if (toGroups.public.length > 0) {
 			return {
 				visibility: 'public',
@@ -42,7 +42,7 @@ export class ApAudienceService {
 				visibleUsers: [],
 			};
 		}
-	
+
 		if (ccGroups.public.length > 0) {
 			return {
 				visibility: 'home',
@@ -50,7 +50,7 @@ export class ApAudienceService {
 				visibleUsers: [],
 			};
 		}
-	
+
 		if (toGroups.followers.length > 0) {
 			return {
 				visibility: 'followers',
@@ -58,14 +58,14 @@ export class ApAudienceService {
 				visibleUsers: [],
 			};
 		}
-	
+
 		return {
 			visibility: 'specified',
 			mentionedUsers,
 			visibleUsers: mentionedUsers,
 		};
 	}
-	
+
 	@bindThis
 	private groupingAudience(ids: string[], actor: RemoteUser) {
 		const groups = {
@@ -73,7 +73,7 @@ export class ApAudienceService {
 			followers: [] as string[],
 			other: [] as string[],
 		};
-	
+
 		for (const id of ids) {
 			if (this.isPublic(id)) {
 				groups.public.push(id);
@@ -83,12 +83,12 @@ export class ApAudienceService {
 				groups.other.push(id);
 			}
 		}
-	
+
 		groups.other = unique(groups.other);
-	
+
 		return groups;
 	}
-	
+
 	@bindThis
 	private isPublic(id: string) {
 		return [
@@ -97,7 +97,7 @@ export class ApAudienceService {
 			'Public',
 		].includes(id);
 	}
-	
+
 	@bindThis
 	private isFollowers(id: string, actor: RemoteUser) {
 		return (
diff --git a/packages/backend/src/core/activitypub/ApDbResolverService.ts b/packages/backend/src/core/activitypub/ApDbResolverService.ts
index ca148916d..20283a163 100644
--- a/packages/backend/src/core/activitypub/ApDbResolverService.ts
+++ b/packages/backend/src/core/activitypub/ApDbResolverService.ts
@@ -121,7 +121,7 @@ export class ApDbResolverService implements OnApplicationShutdown {
 			const key = await this.userPublickeysRepository.findOneBy({
 				keyId,
 			});
-	
+
 			if (key == null) return null;
 
 			return key;
@@ -147,7 +147,7 @@ export class ApDbResolverService implements OnApplicationShutdown {
 
 		if (user == null) return null;
 
-		const key = await this.publicKeyByUserIdCache.fetch(user.id, () => this.userPublickeysRepository.findOneBy({ userId: user.id }), v => v != null); 
+		const key = await this.publicKeyByUserIdCache.fetch(user.id, () => this.userPublickeysRepository.findOneBy({ userId: user.id }), v => v != null);
 
 		return {
 			user,
diff --git a/packages/backend/src/core/activitypub/ApDeliverManagerService.ts b/packages/backend/src/core/activitypub/ApDeliverManagerService.ts
index 6e910eb53..82c2c9f71 100644
--- a/packages/backend/src/core/activitypub/ApDeliverManagerService.ts
+++ b/packages/backend/src/core/activitypub/ApDeliverManagerService.ts
@@ -90,7 +90,7 @@ export class ApDeliverManagerService {
 			this.followingsRepository,
 			this.queueService,
 
-			actor, 
+			actor,
 			activity,
 		);
 	}
diff --git a/packages/backend/src/core/activitypub/ApMfmService.ts b/packages/backend/src/core/activitypub/ApMfmService.ts
index 6116822f7..411cf17d1 100644
--- a/packages/backend/src/core/activitypub/ApMfmService.ts
+++ b/packages/backend/src/core/activitypub/ApMfmService.ts
@@ -21,7 +21,7 @@ export class ApMfmService {
 	@bindThis
 	public htmlToMfm(html: string, tag?: IObject | IObject[]) {
 		const hashtagNames = extractApHashtagObjects(tag).map(x => x.name).filter((x): x is string => x != null);
-	
+
 		return this.mfmService.fromHtml(html, hashtagNames);
 	}
 
@@ -29,5 +29,5 @@ export class ApMfmService {
 	public getNoteHtml(note: Note) {
 		if (!note.text) return '';
 		return this.mfmService.toHtml(mfm.parse(note.text), JSON.parse(note.mentionedRemoteUsers));
-	}	
+	}
 }
diff --git a/packages/backend/src/core/activitypub/models/ApImageService.ts b/packages/backend/src/core/activitypub/models/ApImageService.ts
index 0043907c2..79c5ae958 100644
--- a/packages/backend/src/core/activitypub/models/ApImageService.ts
+++ b/packages/backend/src/core/activitypub/models/ApImageService.ts
@@ -32,7 +32,7 @@ export class ApImageService {
 	) {
 		this.logger = this.apLoggerService.logger;
 	}
-	
+
 	/**
 	 * Imageを作成します。
 	 */
diff --git a/packages/backend/src/core/activitypub/models/ApMentionService.ts b/packages/backend/src/core/activitypub/models/ApMentionService.ts
index c581840ca..9beefc8fc 100644
--- a/packages/backend/src/core/activitypub/models/ApMentionService.ts
+++ b/packages/backend/src/core/activitypub/models/ApMentionService.ts
@@ -29,10 +29,10 @@ export class ApMentionService {
 		const mentionedUsers = (await Promise.all(
 			hrefs.map(x => limit(() => this.apPersonService.resolvePerson(x, resolver).catch(() => null))),
 		)).filter((x): x is User => x != null);
-	
+
 		return mentionedUsers;
 	}
-	
+
 	@bindThis
 	public extractApMentionObjects(tags: IObject | IObject[] | null | undefined): IApMention[] {
 		if (tags == null) return [];
diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index 76757f530..60a3e5680 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -55,7 +55,7 @@ export class ApNoteService {
 		// 循環参照のため / for circular dependency
 		@Inject(forwardRef(() => ApPersonService))
 		private apPersonService: ApPersonService,
-	
+
 		private utilityService: UtilityService,
 		private apAudienceService: ApAudienceService,
 		private apMentionService: ApMentionService,
@@ -74,15 +74,15 @@ export class ApNoteService {
 	@bindThis
 	public validateNote(object: IObject, uri: string) {
 		const expectHost = this.utilityService.extractDbHost(uri);
-	
+
 		if (object == null) {
 			return new Error('invalid Note: object is null');
 		}
-	
+
 		if (!validPost.includes(getApType(object))) {
 			return new Error(`invalid Note: invalid object type ${getApType(object)}`);
 		}
-	
+
 		if (object.id && this.utilityService.extractDbHost(object.id) !== expectHost) {
 			return new Error(`invalid Note: id has different host. expected: ${expectHost}, actual: ${this.utilityService.extractDbHost(object.id)}`);
 		}
@@ -91,10 +91,10 @@ export class ApNoteService {
 		if (object.attributedTo && actualHost !== expectHost) {
 			return new Error(`invalid Note: attributedTo has different host. expected: ${expectHost}, actual: ${actualHost}`);
 		}
-	
+
 		return null;
 	}
-	
+
 	/**
 	 * Noteをフェッチします。
 	 *
@@ -104,16 +104,16 @@ export class ApNoteService {
 	public async fetchNote(object: string | IObject): Promise<Note | null> {
 		return await this.apDbResolverService.getNoteFromApId(object);
 	}
-	
+
 	/**
 	 * Noteを作成します。
 	 */
 	@bindThis
 	public async createNote(value: string | IObject, resolver?: Resolver, silent = false): Promise<Note | null> {
 		if (resolver == null) resolver = this.apResolverService.createResolver();
-	
+
 		const object = await resolver.resolve(value);
-	
+
 		const entryUri = getApId(value);
 		const err = this.validateNote(object, entryUri);
 		if (err) {
@@ -126,9 +126,9 @@ export class ApNoteService {
 			});
 			throw new Error('invalid note');
 		}
-	
+
 		const note = object as IPost;
-	
+
 		this.logger.debug(`Note fetched: ${JSON.stringify(note, null, 2)}`);
 
 		if (note.id && !checkHttps(note.id)) {
@@ -140,21 +140,21 @@ export class ApNoteService {
 		if (url && !checkHttps(url)) {
 			throw new Error('unexpected shcema of note url: ' + url);
 		}
-	
+
 		this.logger.info(`Creating the Note: ${note.id}`);
-	
+
 		// 投稿者をフェッチ
 		const actor = await this.apPersonService.resolvePerson(getOneApId(note.attributedTo!), resolver) as RemoteUser;
-	
+
 		// 投稿者が凍結されていたらスキップ
 		if (actor.isSuspended) {
 			throw new Error('actor has been suspended');
 		}
-		
+
 		const noteAudience = await this.apAudienceService.parseAudience(actor, note.to, note.cc, resolver);
 		let visibility = noteAudience.visibility;
 		const visibleUsers = noteAudience.visibleUsers;
-	
+
 		// Audience (to, cc) が指定されてなかった場合
 		if (visibility === 'specified' && visibleUsers.length === 0) {
 			if (typeof value === 'string') {	// 入力がstringならばresolverでGETが発生している
@@ -162,23 +162,23 @@ export class ApNoteService {
 				visibility = 'public';
 			}
 		}
-	
+
 		const apMentions = await this.apMentionService.extractApMentions(note.tag, resolver);
 		const apHashtags = await extractApHashtags(note.tag);
-	
+
 		// 添付ファイル
 		// TODO: attachmentは必ずしもImageではない
 		// TODO: attachmentは必ずしも配列ではない
 		// Noteがsensitiveなら添付もsensitiveにする
 		const limit = promiseLimit(2);
-	
+
 		note.attachment = Array.isArray(note.attachment) ? note.attachment : note.attachment ? [note.attachment] : [];
 		const files = note.attachment
 			.map(attach => attach.sensitive = note.sensitive)
 			? (await Promise.all(note.attachment.map(x => limit(() => this.apImageService.resolveImage(actor, x)) as Promise<DriveFile>)))
 				.filter(image => image != null)
 			: [];
-	
+
 		// リプライ
 		const reply: Note | null = note.inReplyTo
 			? await this.resolveNote(note.inReplyTo, resolver).then(x => {
@@ -193,10 +193,10 @@ export class ApNoteService {
 				throw err;
 			})
 			: null;
-	
+
 		// 引用
 		let quote: Note | undefined | null;
-	
+
 		if (note._misskey_quote || note.quoteUrl) {
 			const tryResolveNote = async (uri: string): Promise<{
 				status: 'ok';
@@ -223,10 +223,10 @@ export class ApNoteService {
 					};
 				}
 			};
-	
+
 			const uris = unique([note._misskey_quote, note.quoteUrl].filter((x): x is string => typeof x === 'string'));
 			const results = await Promise.all(uris.map(uri => tryResolveNote(uri)));
-	
+
 			quote = results.filter((x): x is { status: 'ok', res: Note | null } => x.status === 'ok').map(x => x.res).find(x => x);
 			if (!quote) {
 				if (results.some(x => x.status === 'temperror')) {
@@ -234,9 +234,9 @@ export class ApNoteService {
 				}
 			}
 		}
-	
+
 		const cw = note.summary === '' ? null : note.summary;
-	
+
 		// テキストのパース
 		let text: string | null = null;
 		if (note.source?.mediaType === 'text/x.misskeymarkdown' && typeof note.source.content === 'string') {
@@ -246,38 +246,38 @@ export class ApNoteService {
 		} else if (typeof note.content === 'string') {
 			text = this.apMfmService.htmlToMfm(note.content, note.tag);
 		}
-	
+
 		// vote
 		if (reply && reply.hasPoll) {
 			const poll = await this.pollsRepository.findOneByOrFail({ noteId: reply.id });
-	
+
 			const tryCreateVote = async (name: string, index: number): Promise<null> => {
 				if (poll.expiresAt && Date.now() > new Date(poll.expiresAt).getTime()) {
 					this.logger.warn(`vote to expired poll from AP: actor=${actor.username}@${actor.host}, note=${note.id}, choice=${name}`);
 				} else if (index >= 0) {
 					this.logger.info(`vote from AP: actor=${actor.username}@${actor.host}, note=${note.id}, choice=${name}`);
 					await this.pollService.vote(actor, reply, index);
-	
+
 					// リモートフォロワーにUpdate配信
 					this.pollService.deliverQuestionUpdate(reply.id);
 				}
 				return null;
 			};
-	
+
 			if (note.name) {
 				return await tryCreateVote(note.name, poll.choices.findIndex(x => x === note.name));
 			}
 		}
-	
+
 		const emojis = await this.extractEmojis(note.tag ?? [], actor.host).catch(e => {
 			this.logger.info(`extractEmojis: ${e}`);
 			return [] as Emoji[];
 		});
-	
+
 		const apEmojis = emojis.map(emoji => emoji.name);
-	
+
 		const poll = await this.apQuestionService.extractPollFromQuestion(note, resolver).catch(() => undefined);
-		
+
 		return await this.noteCreateService.create(actor, {
 			createdAt: note.published ? new Date(note.published) : null,
 			files,
@@ -297,7 +297,7 @@ export class ApNoteService {
 			url: url,
 		}, silent);
 	}
-	
+
 	/**
 	 * Noteを解決します。
 	 *
@@ -308,26 +308,26 @@ export class ApNoteService {
 	public async resolveNote(value: string | IObject, resolver?: Resolver): Promise<Note | null> {
 		const uri = typeof value === 'string' ? value : value.id;
 		if (uri == null) throw new Error('missing uri');
-	
+
 		// ブロックしてたら中断
 		const meta = await this.metaService.fetch();
 		if (this.utilityService.isBlockedHost(meta.blockedHosts, this.utilityService.extractDbHost(uri))) throw new StatusError('blocked host', 451);
-	
+
 		const unlock = await this.appLockService.getApLock(uri);
-	
+
 		try {
 			//#region このサーバーに既に登録されていたらそれを返す
 			const exist = await this.fetchNote(uri);
-	
+
 			if (exist) {
 				return exist;
 			}
 			//#endregion
-	
+
 			if (uri.startsWith(this.config.url)) {
 				throw new StatusError('cannot resolve local note', 400, 'cannot resolve local note');
 			}
-	
+
 			// リモートサーバーからフェッチしてきて登録
 			// ここでuriの代わりに添付されてきたNote Objectが指定されていると、サーバーフェッチを経ずにノートが生成されるが
 			// 添付されてきたNote Objectは偽装されている可能性があるため、常にuriを指定してサーバーフェッチを行う。
@@ -336,26 +336,26 @@ export class ApNoteService {
 			unlock();
 		}
 	}
-	
+
 	@bindThis
 	public async extractEmojis(tags: IObject | IObject[], host: string): Promise<Emoji[]> {
 		host = this.utilityService.toPuny(host);
-	
+
 		if (!tags) return [];
-	
+
 		const eomjiTags = toArray(tags).filter(isEmoji);
 
 		const existingEmojis = await this.emojisRepository.findBy({
 			host,
 			name: In(eomjiTags.map(tag => tag.name!.replaceAll(':', ''))),
 		});
-	
+
 		return await Promise.all(eomjiTags.map(async tag => {
 			const name = tag.name!.replaceAll(':', '');
 			tag.icon = toSingle(tag.icon);
-	
+
 			const exists = existingEmojis.find(x => x.name === name);
-	
+
 			if (exists) {
 				if ((tag.updated != null && exists.updatedAt == null)
 					|| (tag.id != null && exists.uri == null)
@@ -371,18 +371,18 @@ export class ApNoteService {
 						publicUrl: tag.icon!.url,
 						updatedAt: new Date(),
 					});
-	
+
 					return await this.emojisRepository.findOneBy({
 						host,
 						name,
 					}) as Emoji;
 				}
-	
+
 				return exists;
 			}
-	
+
 			this.logger.info(`register emoji host=${host}, name=${name}`);
-	
+
 			return await this.emojisRepository.insert({
 				id: this.idService.genId(),
 				host,
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index f52ebed10..afe89e5a1 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -415,7 +415,7 @@ export class ApPersonService implements OnModuleInit {
 	 * Personの情報を更新します。
 	 * Misskeyに対象のPersonが登録されていなければ無視します。
 	 * もしアカウントの移行が確認された場合、アカウント移行処理を行います。
-	 * 
+	 *
 	 * @param uri URI of Person
 	 * @param resolver Resolver
 	 * @param hint Hint of Person object (この値が正当なPersonの場合、Remote resolveをせずに更新に利用します)
@@ -688,7 +688,7 @@ export class ApPersonService implements OnModuleInit {
 			// (uriが存在しなかったり応答がなかったりする場合resolvePersonはthrow Errorする)
 			dst = await this.resolvePerson(src.movedToUri);
 		}
- 
+
 		if (dst.movedToUri === dst.uri) return 'skip: movedTo itself (dst)'; // ？？？
 		if (src.movedToUri !== dst.uri) return 'skip: missmatch uri'; // ？？？
 		if (dst.movedToUri === src.uri) return 'skip: dst.movedToUri === src.uri';
diff --git a/packages/backend/src/core/entities/DriveFileEntityService.ts b/packages/backend/src/core/entities/DriveFileEntityService.ts
index d82f36d97..80442af09 100644
--- a/packages/backend/src/core/entities/DriveFileEntityService.ts
+++ b/packages/backend/src/core/entities/DriveFileEntityService.ts
@@ -47,7 +47,7 @@ export class DriveFileEntityService {
 		private videoProcessingService: VideoProcessingService,
 	) {
 	}
-	
+
 	@bindThis
 	public validateFileName(name: string): boolean {
 		return (
diff --git a/packages/backend/src/core/entities/NoteEntityService.ts b/packages/backend/src/core/entities/NoteEntityService.ts
index 32269a410..e730c0eb8 100644
--- a/packages/backend/src/core/entities/NoteEntityService.ts
+++ b/packages/backend/src/core/entities/NoteEntityService.ts
@@ -24,7 +24,7 @@ export class NoteEntityService implements OnModuleInit {
 	private driveFileEntityService: DriveFileEntityService;
 	private customEmojiService: CustomEmojiService;
 	private reactionService: ReactionService;
-	
+
 	constructor(
 		private moduleRef: ModuleRef,
 
@@ -68,7 +68,7 @@ export class NoteEntityService implements OnModuleInit {
 		this.customEmojiService = this.moduleRef.get('CustomEmojiService');
 		this.reactionService = this.moduleRef.get('ReactionService');
 	}
-	
+
 	@bindThis
 	private async hideNote(packedNote: Packed<'Note'>, meId: User['id'] | null) {
 	// TODO: isVisibleForMe を使うようにしても良さそう(型違うけど)
@@ -457,12 +457,12 @@ export class NoteEntityService implements OnModuleInit {
 		const query = this.notesRepository.createQueryBuilder('note')
 			.where('note.userId = :userId', { userId })
 			.andWhere('note.renoteId = :renoteId', { renoteId });
-	
+
 		// 指定した投稿を除く
 		if (excludeNoteId) {
 			query.andWhere('note.id != :excludeNoteId', { excludeNoteId });
 		}
-	
+
 		return await query.getCount();
-	}	
+	}
 }
diff --git a/packages/backend/src/core/entities/NoteReactionEntityService.ts b/packages/backend/src/core/entities/NoteReactionEntityService.ts
index 8f943ba24..d454ddb70 100644
--- a/packages/backend/src/core/entities/NoteReactionEntityService.ts
+++ b/packages/backend/src/core/entities/NoteReactionEntityService.ts
@@ -17,7 +17,7 @@ export class NoteReactionEntityService implements OnModuleInit {
 	private userEntityService: UserEntityService;
 	private noteEntityService: NoteEntityService;
 	private reactionService: ReactionService;
-	
+
 	constructor(
 		private moduleRef: ModuleRef,
 
diff --git a/packages/backend/src/core/entities/NotificationEntityService.ts b/packages/backend/src/core/entities/NotificationEntityService.ts
index d76b86395..02c698284 100644
--- a/packages/backend/src/core/entities/NotificationEntityService.ts
+++ b/packages/backend/src/core/entities/NotificationEntityService.ts
@@ -59,7 +59,7 @@ export class NotificationEntityService implements OnModuleInit {
 		meId: User['id'],
 		// eslint-disable-next-line @typescript-eslint/ban-types
 		options: {
-			
+
 		},
 		hint?: {
 			packedNotes: Map<Note['id'], Packed<'Note'>>;
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index f1a4e56c0..6dacaa103 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -113,7 +113,7 @@ export class UserEntityService implements OnModuleInit {
 
 		@Inject(DI.pagesRepository)
 		private pagesRepository: PagesRepository,
-		
+
 		@Inject(DI.userMemosRepository)
 		private userMemosRepository: UserMemoRepository,
 
diff --git a/packages/backend/src/daemons/QueueStatsService.ts b/packages/backend/src/daemons/QueueStatsService.ts
index 53a0d14cd..4d0cb96a2 100644
--- a/packages/backend/src/daemons/QueueStatsService.ts
+++ b/packages/backend/src/daemons/QueueStatsService.ts
@@ -81,7 +81,7 @@ export class QueueStatsService implements OnApplicationShutdown {
 
 		this.intervalId = setInterval(tick, interval);
 	}
-	
+
 	@bindThis
 	public dispose(): void {
 		clearInterval(this.intervalId);
diff --git a/packages/backend/src/misc/json-schema.ts b/packages/backend/src/misc/json-schema.ts
index e748f93a2..7579040c6 100644
--- a/packages/backend/src/misc/json-schema.ts
+++ b/packages/backend/src/misc/json-schema.ts
@@ -131,7 +131,7 @@ type NullOrUndefined<p extends Schema, T> =
 	| T;
 
 // https://stackoverflow.com/questions/54938141/typescript-convert-union-to-intersection
-// Get intersection from union 
+// Get intersection from union
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void) ? I : never;
 type PartialIntersection<T> = Partial<UnionToIntersection<T>>;
 
diff --git a/packages/backend/src/misc/prelude/url.ts b/packages/backend/src/misc/prelude/url.ts
index 9b1dabc78..523967828 100644
--- a/packages/backend/src/misc/prelude/url.ts
+++ b/packages/backend/src/misc/prelude/url.ts
@@ -2,7 +2,7 @@
  * 1. 配列に何も入っていない時はクエリを付けない
  * 2. プロパティがundefinedの時はクエリを付けない
  * （new URLSearchParams(obj)ではそこまで丁寧なことをしてくれない）
- */ 
+ */
 export function query(obj: Record<string, unknown>): string {
 	const params = Object.entries(obj)
 		.filter(([, v]) => Array.isArray(v) ? v.length : v !== undefined)
diff --git a/packages/backend/src/models/entities/UserProfile.ts b/packages/backend/src/models/entities/UserProfile.ts
index 236ee8f98..c4ed9db9b 100644
--- a/packages/backend/src/models/entities/UserProfile.ts
+++ b/packages/backend/src/models/entities/UserProfile.ts
@@ -207,7 +207,7 @@ export class UserProfile {
 	public mutedInstances: string[];
 
 	@Column('enum', {
-		enum: [ 
+		enum: [
 			...notificationTypes,
 			// マイグレーションで削除が困難なので古いenumは残しておく
 			...obsoleteNotificationTypes,
diff --git a/packages/backend/src/queue/QueueProcessorService.ts b/packages/backend/src/queue/QueueProcessorService.ts
index 42f9c1af7..f575b1718 100644
--- a/packages/backend/src/queue/QueueProcessorService.ts
+++ b/packages/backend/src/queue/QueueProcessorService.ts
@@ -283,7 +283,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		});
 
 		const relationshipLogger = this.logger.createSubLogger('relationship');
-	
+
 		this.relationshipQueueWorker
 			.on('active', (job) => relationshipLogger.debug(`active id=${job.id}`))
 			.on('completed', (job, result) => relationshipLogger.debug(`completed(${result}) id=${job.id}`))
diff --git a/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts b/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts
index ac52325c8..21c0bfe80 100644
--- a/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts
+++ b/packages/backend/src/queue/processors/ExportAntennasProcessorService.ts
@@ -30,7 +30,7 @@ export class ExportAntennasProcessorService {
 
 		@Inject(DI.userListJoiningsRepository)
 		private userListJoiningsRepository: UserListJoiningsRepository,
-	
+
 		private driveService: DriveService,
 		private utilityService: UtilityService,
 		private queueLoggerService: QueueLoggerService,
diff --git a/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts b/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts
index 0c09f2796..74ef20fdd 100644
--- a/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts
+++ b/packages/backend/src/queue/processors/ImportAntennasProcessorService.ts
@@ -17,11 +17,11 @@ const validate = new Ajv().compile({
 	properties: {
 		name: { type: 'string', minLength: 1, maxLength: 100 },
 		src: { type: 'string', enum: ['home', 'all', 'users', 'list'] },
-		userListAccts: { 
-			type: 'array', 
+		userListAccts: {
+			type: 'array',
 			items: {
 				type: 'string',
-			}, 
+			},
 			nullable: true,
 		},
 		keywords: { type: 'array', items: {
diff --git a/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts b/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts
index d86256787..4ba749ec5 100644
--- a/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts
+++ b/packages/backend/src/queue/processors/ImportCustomEmojisProcessorService.ts
@@ -113,7 +113,7 @@ export class ImportCustomEmojisProcessorService {
 			}
 
 			cleanup();
-	
+
 			this.logger.succ('Imported');
 		});
 		unzipStream.pipe(extractor);
diff --git a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
index 8b40c1674..25e91761e 100644
--- a/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
+++ b/packages/backend/src/queue/processors/WebhookDeliverProcessorService.ts
@@ -31,7 +31,7 @@ export class WebhookDeliverProcessorService {
 	public async process(job: Bull.Job<WebhookDeliverJobData>): Promise<string> {
 		try {
 			this.logger.debug(`delivering ${job.data.webhookId}`);
-	
+
 			const res = await this.httpRequestService.send(job.data.to, {
 				method: 'POST',
 				headers: {
@@ -50,25 +50,25 @@ export class WebhookDeliverProcessorService {
 					body: job.data.content,
 				}),
 			});
-	
+
 			this.webhooksRepository.update({ id: job.data.webhookId }, {
 				latestSentAt: new Date(),
 				latestStatus: res.status,
 			});
-	
+
 			return 'Success';
 		} catch (res) {
 			this.webhooksRepository.update({ id: job.data.webhookId }, {
 				latestSentAt: new Date(),
 				latestStatus: res instanceof StatusError ? res.statusCode : 1,
 			});
-	
+
 			if (res instanceof StatusError) {
 				// 4xx
 				if (res.isClientError) {
 					throw new Bull.UnrecoverableError(`${res.statusCode} ${res.statusMessage}`);
 				}
-	
+
 				// 5xx etc.
 				throw new Error(`${res.statusCode} ${res.statusMessage}`);
 			} else {
diff --git a/packages/backend/src/server/api/AuthenticateService.ts b/packages/backend/src/server/api/AuthenticateService.ts
index 4ad0197d8..8b0fff80d 100644
--- a/packages/backend/src/server/api/AuthenticateService.ts
+++ b/packages/backend/src/server/api/AuthenticateService.ts
@@ -40,15 +40,15 @@ export class AuthenticateService implements OnApplicationShutdown {
 		if (token == null) {
 			return [null, null];
 		}
-	
+
 		if (isNativeToken(token)) {
 			const user = await this.cacheService.localUserByNativeTokenCache.fetch(token,
 				() => this.usersRepository.findOneBy({ token }) as Promise<LocalUser | null>);
-	
+
 			if (user == null) {
 				throw new AuthenticationError('user not found');
 			}
-	
+
 			return [user, null];
 		} else {
 			const accessToken = await this.accessTokensRepository.findOne({
@@ -58,24 +58,24 @@ export class AuthenticateService implements OnApplicationShutdown {
 					token: token, // miauth
 				}],
 			});
-	
+
 			if (accessToken == null) {
 				throw new AuthenticationError('invalid signature');
 			}
-	
+
 			this.accessTokensRepository.update(accessToken.id, {
 				lastUsedAt: new Date(),
 			});
-	
+
 			const user = await this.cacheService.localUserByIdCache.fetch(accessToken.userId,
 				() => this.usersRepository.findOneBy({
 					id: accessToken.userId,
 				}) as Promise<LocalUser>);
-	
+
 			if (accessToken.appId) {
 				const app = await this.appCache.fetch(accessToken.appId,
 					() => this.appsRepository.findOneByOrFail({ id: accessToken.appId! }));
-	
+
 				return [user, {
 					id: accessToken.id,
 					permission: app.permission,
diff --git a/packages/backend/src/server/api/RateLimiterService.ts b/packages/backend/src/server/api/RateLimiterService.ts
index fe2db1d66..f6ffbfab5 100644
--- a/packages/backend/src/server/api/RateLimiterService.ts
+++ b/packages/backend/src/server/api/RateLimiterService.ts
@@ -38,14 +38,14 @@ export class RateLimiterService {
 					max: 1,
 					db: this.redisClient,
 				});
-		
+
 				minIntervalLimiter.get((err, info) => {
 					if (err) {
 						return reject('ERR');
 					}
-		
+
 					this.logger.debug(`${actor} ${limitation.key} min remaining: ${info.remaining}`);
-		
+
 					if (info.remaining === 0) {
 						reject('BRIEF_REQUEST_INTERVAL');
 					} else {
@@ -57,7 +57,7 @@ export class RateLimiterService {
 					}
 				});
 			};
-		
+
 			// Long term limit
 			const max = (): void => {
 				const limiter = new Limiter({
@@ -66,14 +66,14 @@ export class RateLimiterService {
 					max: limitation.max! / factor,
 					db: this.redisClient,
 				});
-		
+
 				limiter.get((err, info) => {
 					if (err) {
 						return reject('ERR');
 					}
-		
+
 					this.logger.debug(`${actor} ${limitation.key} max remaining: ${info.remaining}`);
-		
+
 					if (info.remaining === 0) {
 						reject('RATE_LIMIT_EXCEEDED');
 					} else {
@@ -81,13 +81,13 @@ export class RateLimiterService {
 					}
 				});
 			};
-		
+
 			const hasShortTermLimit = typeof limitation.minInterval === 'number';
-		
+
 			const hasLongTermLimit =
 				typeof limitation.duration === 'number' &&
 				typeof limitation.max === 'number';
-		
+
 			if (hasShortTermLimit) {
 				min();
 			} else if (hasLongTermLimit) {
diff --git a/packages/backend/src/server/api/SigninService.ts b/packages/backend/src/server/api/SigninService.ts
index aaf1d10b4..96666f1f4 100644
--- a/packages/backend/src/server/api/SigninService.ts
+++ b/packages/backend/src/server/api/SigninService.ts
@@ -36,7 +36,7 @@ export class SigninService {
 				headers: request.headers as any,
 				success: true,
 			}).then(x => this.signinsRepository.findOneByOrFail(x.identifiers[0]));
-	
+
 			// Publish signin event
 			this.globalEventService.publishMainStream(user.id, 'signin', await this.signinEntityService.pack(record));
 		});
diff --git a/packages/backend/src/server/api/endpoint-base.ts b/packages/backend/src/server/api/endpoint-base.ts
index 05141854c..364fa7a19 100644
--- a/packages/backend/src/server/api/endpoint-base.ts
+++ b/packages/backend/src/server/api/endpoint-base.ts
@@ -34,23 +34,23 @@ export abstract class Endpoint<T extends IEndpointMeta, Ps extends Schema> {
 
 		this.exec = (params: any, user: T['requireCredential'] extends true ? LocalUser : LocalUser | null, token: AccessToken | null, file?: File, ip?: string | null, headers?: Record<string, string> | null) => {
 			let cleanup: undefined | (() => void) = undefined;
-	
+
 			if (meta.requireFile) {
 				cleanup = () => {
 					if (file) fs.unlink(file.path, () => {});
 				};
-	
+
 				if (file == null) return Promise.reject(new ApiError({
 					message: 'File required.',
 					code: 'FILE_REQUIRED',
 					id: '4267801e-70d1-416a-b011-4ee502885d8b',
 				}));
 			}
-	
+
 			const valid = validate(params);
 			if (!valid) {
 				if (file) cleanup!();
-	
+
 				const errors = validate.errors!;
 				const err = new ApiError({
 					message: 'Invalid param.',
@@ -62,7 +62,7 @@ export abstract class Endpoint<T extends IEndpointMeta, Ps extends Schema> {
 				});
 				return Promise.reject(err);
 			}
-	
+
 			return cb(params as SchemaType<Ps>, user, token, file, cleanup, ip, headers);
 		};
 	}
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 12db1f78f..8cf9341a7 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/update.ts
@@ -47,7 +47,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				title: ps.title,
 				text: ps.text,
 				/* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- 空の文字列の場合、nullを渡すようにするため */
-				imageUrl: ps.imageUrl || null, 
+				imageUrl: ps.imageUrl || null,
 			});
 		});
 	}
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 4aa4ad82b..1a6a36168 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
@@ -90,7 +90,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				const queryarry = ps.query.match(/\:([a-z0-9_]*)\:/g);
 
 				if (queryarry) {
-					emojis = emojis.filter(emoji => 
+					emojis = emojis.filter(emoji =>
 						queryarry.includes(`:${emoji.name}:`)
 					);
 				} else {
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 fb22bdc47..edc1af5a5 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts
@@ -70,7 +70,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				driveFile = await this.driveFilesRepository.findOneBy({ id: ps.fileId });
 				if (driveFile == null) throw new ApiError(meta.errors.noSuchFile);
 			}
-	
+
 			await this.customEmojiService.update(ps.id, {
 				driveFile,
 				name: ps.name,
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/promote.ts b/packages/backend/src/server/api/endpoints/admin/queue/promote.ts
index 4e57e6613..9140f392c 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/promote.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/promote.ts
@@ -36,7 +36,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 						await queue.promote();
 					}
 					break;
-				
+
 				case 'inbox':
 					delayedQueues = await this.queueService.inboxQueue.getDelayed();
 					for (let queueIndex = 0; queueIndex < delayedQueues.length; queueIndex++) {
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 5c9d8e3fa..0b20b058f 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -136,7 +136,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			if (Array.isArray(ps.sensitiveWords)) {
 				set.sensitiveWords = ps.sensitiveWords.filter(Boolean);
 			}
-		
+
 			if (ps.themeColor !== undefined) {
 				set.themeColor = ps.themeColor;
 			}
diff --git a/packages/backend/src/server/api/endpoints/channels/timeline.ts b/packages/backend/src/server/api/endpoints/channels/timeline.ts
index c881074ba..833bd63c1 100644
--- a/packages/backend/src/server/api/endpoints/channels/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/channels/timeline.ts
@@ -77,7 +77,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 			const limit = ps.limit + (ps.untilId ? 1 : 0); // untilIdに指定したものも含まれるため+1
 			let noteIdsRes: [string, string[]][] = [];
-			
+
 			if (!ps.sinceId && !ps.sinceDate) {
 				noteIdsRes = await this.redisClient.xrevrange(
 					`channelTimeline:${channel.id}`,
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 3ecbba22b..c43f812e2 100644
--- a/packages/backend/src/server/api/endpoints/drive/files/update.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files/update.ts
@@ -40,7 +40,7 @@ export const meta = {
 			code: 'NO_SUCH_FOLDER',
 			id: 'ea8fb7a5-af77-4a08-b608-c0218176cd73',
 		},
-		
+
 		restrictedByRole: {
 			message: 'This feature is restricted by your role.',
 			code: 'RESTRICTED_BY_ROLE',
diff --git a/packages/backend/src/server/api/endpoints/emoji.ts b/packages/backend/src/server/api/endpoints/emoji.ts
index 681d3e649..51027f35c 100644
--- a/packages/backend/src/server/api/endpoints/emoji.ts
+++ b/packages/backend/src/server/api/endpoints/emoji.ts
@@ -36,7 +36,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
 		@Inject(DI.config)
 		private config: Config,
-	
+
 		@Inject(DI.emojisRepository)
 		private emojisRepository: EmojisRepository,
 
diff --git a/packages/backend/src/server/api/endpoints/emojis.ts b/packages/backend/src/server/api/endpoints/emojis.ts
index 13cc709d3..3c2d0ce4a 100644
--- a/packages/backend/src/server/api/endpoints/emojis.ts
+++ b/packages/backend/src/server/api/endpoints/emojis.ts
@@ -43,7 +43,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
 		@Inject(DI.config)
 		private config: Config,
-	
+
 		@Inject(DI.emojisRepository)
 		private emojisRepository: EmojisRepository,
 
diff --git a/packages/backend/src/server/api/endpoints/hashtags/users.ts b/packages/backend/src/server/api/endpoints/hashtags/users.ts
index dd3549020..a86faf41a 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/users.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/users.ts
@@ -39,7 +39,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
-		
+
 		private userEntityService: UserEntityService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
diff --git a/packages/backend/src/server/api/endpoints/i.ts b/packages/backend/src/server/api/endpoints/i.ts
index a3e3e02a1..743e3f8ab 100644
--- a/packages/backend/src/server/api/endpoints/i.ts
+++ b/packages/backend/src/server/api/endpoints/i.ts
@@ -68,7 +68,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				});
 				userProfile.loggedInDates = [...userProfile.loggedInDates, today];
 			}
-			
+
 			return await this.userEntityService.pack<true, true>(userProfile.user!, userProfile.user!, {
 				detail: true,
 				includeSecrets: isSecure,
diff --git a/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts b/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts
index d98f60fa5..2ef5e5a27 100644
--- a/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts
+++ b/packages/backend/src/server/api/endpoints/i/2fa/update-key.ts
@@ -61,7 +61,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			if (key.userId !== me.id) {
 				throw new ApiError(meta.errors.accessDenied);
 			}
-	
+
 			await this.userSecurityKeysRepository.update(key.id, {
 				name: ps.name,
 			});
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 3b3c5caa0..6ef5f0d5c 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -250,7 +250,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
 		@Inject(DI.config)
 		private config: Config,
-	
+
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
diff --git a/packages/backend/src/server/api/endpoints/notes.ts b/packages/backend/src/server/api/endpoints/notes.ts
index 5fbc7aba5..a6e9707d3 100644
--- a/packages/backend/src/server/api/endpoints/notes.ts
+++ b/packages/backend/src/server/api/endpoints/notes.ts
@@ -53,34 +53,34 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.leftJoinAndSelect('note.renote', 'renote')
 				.leftJoinAndSelect('reply.user', 'replyUser')
 				.leftJoinAndSelect('renote.user', 'renoteUser');
-		
+
 			if (ps.local) {
 				query.andWhere('note.userHost IS NULL');
 			}
-		
+
 			if (ps.reply !== undefined) {
 				query.andWhere(ps.reply ? 'note.replyId IS NOT NULL' : 'note.replyId IS NULL');
 			}
-		
+
 			if (ps.renote !== undefined) {
 				query.andWhere(ps.renote ? 'note.renoteId IS NOT NULL' : 'note.renoteId IS NULL');
 			}
-		
+
 			if (ps.withFiles !== undefined) {
 				query.andWhere(ps.withFiles ? 'note.fileIds != \'{}\'' : 'note.fileIds = \'{}\'');
 			}
-		
+
 			if (ps.poll !== undefined) {
 				query.andWhere(ps.poll ? 'note.hasPoll = TRUE' : 'note.hasPoll = FALSE');
 			}
-		
+
 			// TODO
 			//if (bot != undefined) {
 			//	query.isBot = bot;
 			//}
-		
+
 			const notes = await query.take(ps.limit).getMany();
-		
+
 			return await this.noteEntityService.packMany(notes);
 		});
 	}
diff --git a/packages/backend/src/server/api/endpoints/notes/search.ts b/packages/backend/src/server/api/endpoints/notes/search.ts
index f6385400c..cd0e351e4 100644
--- a/packages/backend/src/server/api/endpoints/notes/search.ts
+++ b/packages/backend/src/server/api/endpoints/notes/search.ts
@@ -58,7 +58,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
 		@Inject(DI.config)
 		private config: Config,
-	
+
 		private noteEntityService: NoteEntityService,
 		private searchService: SearchService,
 		private roleService: RoleService,
@@ -68,7 +68,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			if (!policies.canSearchNotes) {
 				throw new ApiError(meta.errors.unavailable);
 			}
-	
+
 			const notes = await this.searchService.searchNote(ps.query, me, {
 				userId: ps.userId,
 				channelId: ps.channelId,
diff --git a/packages/backend/src/server/api/endpoints/notes/translate.ts b/packages/backend/src/server/api/endpoints/notes/translate.ts
index 66655234a..b91bc7b5e 100644
--- a/packages/backend/src/server/api/endpoints/notes/translate.ts
+++ b/packages/backend/src/server/api/endpoints/notes/translate.ts
@@ -44,7 +44,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 	constructor(
 		@Inject(DI.config)
 		private config: Config,
-	
+
 		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
 
diff --git a/packages/backend/src/server/api/endpoints/roles/notes.ts b/packages/backend/src/server/api/endpoints/roles/notes.ts
index 42e36cb04..a30c31b72 100644
--- a/packages/backend/src/server/api/endpoints/roles/notes.ts
+++ b/packages/backend/src/server/api/endpoints/roles/notes.ts
@@ -71,7 +71,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			if (role == null) {
 				throw new ApiError(meta.errors.noSuchRole);
 			}
-			if (!role.isExplorable) { 
+			if (!role.isExplorable) {
 				return [];
 			}
 			const limit = ps.limit + (ps.untilId ? 1 : 0) + (ps.sinceId ? 1 : 0); // untilIdに指定したものも含まれるため+1
diff --git a/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts b/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts
index 8591e4ab9..cccffcdad 100644
--- a/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts
+++ b/packages/backend/src/server/api/endpoints/users/lists/create-from-public.ts
@@ -95,7 +95,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			if (currentCount > (await this.roleService.getUserPolicies(me.id)).userListLimit) {
 				throw new ApiError(meta.errors.tooManyUserLists);
 			}
-			
+
 			const userList = await this.userListsRepository.insert({
 				id: this.idService.genId(),
 				createdAt: new Date(),
@@ -127,7 +127,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 					userListId: userList.id,
 					userId: currentUser.id,
 				});
-	
+
 				if (exist) {
 					throw new ApiError(meta.errors.alreadyAdded);
 				}
diff --git a/packages/backend/src/server/api/endpoints/users/lists/favorite.ts b/packages/backend/src/server/api/endpoints/users/lists/favorite.ts
index 263852fde..ea1a022be 100644
--- a/packages/backend/src/server/api/endpoints/users/lists/favorite.ts
+++ b/packages/backend/src/server/api/endpoints/users/lists/favorite.ts
@@ -41,7 +41,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		private idService: IdService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			const userList = await this.userListsRepository.findOneBy({ 
+			const userList = await this.userListsRepository.findOneBy({
 				id: ps.listId,
 				isPublic: true,
 			});
diff --git a/packages/backend/src/server/api/endpoints/users/search.ts b/packages/backend/src/server/api/endpoints/users/search.ts
index d7a60f043..5ffe3e84a 100644
--- a/packages/backend/src/server/api/endpoints/users/search.ts
+++ b/packages/backend/src/server/api/endpoints/users/search.ts
@@ -78,7 +78,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 					.getMany();
 			} else {
 				const nameQuery = this.usersRepository.createQueryBuilder('user')
-					.where(new Brackets(qb => { 
+					.where(new Brackets(qb => {
 						qb.where('user.name ILIKE :query', { query: '%' + sqlLikeEscape(ps.query) + '%' });
 
 						// Also search username if it qualifies as username
diff --git a/packages/backend/src/server/api/stream/ChannelsService.ts b/packages/backend/src/server/api/stream/ChannelsService.ts
index c77ba6602..4a544fadf 100644
--- a/packages/backend/src/server/api/stream/ChannelsService.ts
+++ b/packages/backend/src/server/api/stream/ChannelsService.ts
@@ -52,7 +52,7 @@ export class ChannelsService {
 			case 'serverStats': return this.serverStatsChannelService;
 			case 'queueStats': return this.queueStatsChannelService;
 			case 'admin': return this.adminChannelService;
-		
+
 			default:
 				throw new Error(`no such channel: ${name}`);
 		}
diff --git a/packages/backend/src/server/api/stream/channels/hashtag.ts b/packages/backend/src/server/api/stream/channels/hashtag.ts
index 0268fdedd..94ebf8641 100644
--- a/packages/backend/src/server/api/stream/channels/hashtag.ts
+++ b/packages/backend/src/server/api/stream/channels/hashtag.ts
@@ -49,7 +49,7 @@ class HashtagChannel extends Channel {
 		if (isUserRelated(note, this.userIdsWhoMeMuting)) return;
 		// 流れてきたNoteがブロックされているユーザーが関わるものだったら無視する
 		if (isUserRelated(note, this.userIdsWhoBlockingMe)) return;
-		
+
 		if (note.renote && !note.text && isUserRelated(note, this.userIdsWhoMeMutingRenotes)) return;
 
 		this.connection.cacheNote(note);
diff --git a/packages/backend/src/server/api/stream/channels/home-timeline.ts b/packages/backend/src/server/api/stream/channels/home-timeline.ts
index 1755aa94c..fe0cc37b6 100644
--- a/packages/backend/src/server/api/stream/channels/home-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -26,7 +26,7 @@ class HomeTimelineChannel extends Channel {
 	@bindThis
 	public async init(params: any) {
 		this.withReplies = params.withReplies as boolean;
-	
+
 		this.subscriber.on('notesStream', this.onNote);
 	}
 
diff --git a/packages/backend/src/server/api/stream/channels/role-timeline.ts b/packages/backend/src/server/api/stream/channels/role-timeline.ts
index ab9c1aa0b..4f36832e4 100644
--- a/packages/backend/src/server/api/stream/channels/role-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/role-timeline.ts
@@ -12,7 +12,7 @@ class RoleTimelineChannel extends Channel {
 	public static shouldShare = false;
 	public static requireCredential = false;
 	private roleId: string;
-	
+
 	constructor(
 		private noteEntityService: NoteEntityService,
 		private roleservice: RoleService,
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 8802fc5ab..d97d2b8ba 100644
--- a/packages/backend/src/server/api/stream/channels/user-list.ts
+++ b/packages/backend/src/server/api/stream/channels/user-list.ts
@@ -20,7 +20,7 @@ class UserListChannel extends Channel {
 		private userListsRepository: UserListsRepository,
 		private userListJoiningsRepository: UserListJoiningsRepository,
 		private noteEntityService: NoteEntityService,
-		
+
 		id: string,
 		connection: Channel['connection'],
 	) {
diff --git a/packages/backend/src/server/web/FeedService.ts b/packages/backend/src/server/web/FeedService.ts
index 0c0e92cc0..0bd0d3c69 100644
--- a/packages/backend/src/server/web/FeedService.ts
+++ b/packages/backend/src/server/web/FeedService.ts
@@ -38,9 +38,9 @@ export class FeedService {
 			link: `${this.config.url}/@${user.username}`,
 			name: user.name ?? user.username,
 		};
-	
+
 		const profile = await this.userProfilesRepository.findOneByOrFail({ userId: user.id });
-	
+
 		const notes = await this.notesRepository.find({
 			where: {
 				userId: user.id,
@@ -50,7 +50,7 @@ export class FeedService {
 			order: { createdAt: -1 },
 			take: 20,
 		});
-	
+
 		const feed = new Feed({
 			id: author.link,
 			title: `${author.name} (@${user.username}@${this.config.host})`,
@@ -66,13 +66,13 @@ export class FeedService {
 			author,
 			copyright: user.name ?? user.username,
 		});
-	
+
 		for (const note of notes) {
 			const files = note.fileIds.length > 0 ? await this.driveFilesRepository.findBy({
 				id: In(note.fileIds),
 			}) : [];
 			const file = files.find(file => file.type.startsWith('image/'));
-	
+
 			feed.addItem({
 				title: `New note by ${author.name}`,
 				link: `${this.config.url}/notes/${note.id}`,
@@ -82,7 +82,7 @@ export class FeedService {
 				image: file ? this.driveFileEntityService.getPublicUrl(file) ?? undefined : undefined,
 			});
 		}
-	
+
 		return feed;
 	}
 }
diff --git a/packages/backend/src/server/web/bios.js b/packages/backend/src/server/web/bios.js
index c2ce5c381..51899dd3a 100644
--- a/packages/backend/src/server/web/bios.js
+++ b/packages/backend/src/server/web/bios.js
@@ -8,7 +8,7 @@ window.onload = async () => {
 		const promise = new Promise((resolve, reject) => {
 			// Append a credential
 			if (i) data.i = i;
-	
+
 			// Send request
 			window.fetch(endpoint.indexOf('://') > -1 ? endpoint : `/api/${endpoint}`, {
 				method: 'POST',
@@ -17,7 +17,7 @@ window.onload = async () => {
 				cache: 'no-cache'
 			}).then(async (res) => {
 				const body = res.status === 204 ? null : await res.json();
-	
+
 				if (res.status === 200) {
 					resolve(body);
 				} else if (res.status === 204) {
@@ -27,7 +27,7 @@ window.onload = async () => {
 				}
 			}).catch(reject);
 		});
-		
+
 		return promise;
 	};
 
diff --git a/packages/backend/src/server/web/cli.js b/packages/backend/src/server/web/cli.js
index 3467f7ac2..5bb576a27 100644
--- a/packages/backend/src/server/web/cli.js
+++ b/packages/backend/src/server/web/cli.js
@@ -8,7 +8,7 @@ window.onload = async () => {
 		const promise = new Promise((resolve, reject) => {
 			// Append a credential
 			if (i) data.i = i;
-	
+
 			// Send request
 			fetch(endpoint.indexOf('://') > -1 ? endpoint : `/api/${endpoint}`, {
 				headers: {
@@ -20,7 +20,7 @@ window.onload = async () => {
 				cache: 'no-cache'
 			}).then(async (res) => {
 				const body = res.status === 204 ? null : await res.json();
-	
+
 				if (res.status === 200) {
 					resolve(body);
 				} else if (res.status === 204) {
@@ -30,7 +30,7 @@ window.onload = async () => {
 				}
 			}).catch(reject);
 		});
-		
+
 		return promise;
 	};
 
diff --git a/packages/backend/src/server/web/views/base.pug b/packages/backend/src/server/web/views/base.pug
index d23a1d49c..69a4e3732 100644
--- a/packages/backend/src/server/web/views/base.pug
+++ b/packages/backend/src/server/web/views/base.pug
@@ -55,8 +55,8 @@ html
 		block meta
 
 		block og
-			meta(property='og:title'       content= title || 'Misskey') 
-			meta(property='og:description' content= desc || '✨🌎✨ A interplanetary communication platform ✨🚀✨') 
+			meta(property='og:title'       content= title || 'Misskey')
+			meta(property='og:description' content= desc || '✨🌎✨ A interplanetary communication platform ✨🚀✨')
 			meta(property='og:image'       content= img)
 			meta(property='twitter:card'   content='summary')
 
diff --git a/packages/backend/src/server/web/views/error.pug b/packages/backend/src/server/web/views/error.pug
index b177ae411..44ebf53cf 100644
--- a/packages/backend/src/server/web/views/error.pug
+++ b/packages/backend/src/server/web/views/error.pug
@@ -32,12 +32,12 @@ body
 		path(stroke="none", d="M0 0h24v24H0z", fill="none")
 		path(d="M12 9v2m0 4v.01")
 		path(d="M5 19h14a2 2 0 0 0 1.84 -2.75l-7.1 -12.25a2 2 0 0 0 -3.5 0l-7.1 12.25a2 2 0 0 0 1.75 2.75")
-	
+
 	h1 An error has occurred!
 
 	button.button-big(onclick="location.reload();")
 		span.button-label-big Refresh
-	
+
 	p.dont-worry Don't worry, it's (probably) not your fault.
 
 	p If reloading after a period of time does not resolve the problem, contact the server administrator with the following ERROR ID.
diff --git a/packages/backend/src/server/web/views/note.pug b/packages/backend/src/server/web/views/note.pug
index ea0917a80..98d0c9a78 100644
--- a/packages/backend/src/server/web/views/note.pug
+++ b/packages/backend/src/server/web/views/note.pug
@@ -43,7 +43,7 @@ block meta
 	meta(name='misskey:user-username' content=user.username)
 	meta(name='misskey:user-id' content=user.id)
 	meta(name='misskey:note-id' content=note.id)
-	
+
 	// todo
 	if user.twitter
 		meta(name='twitter:creator' content=`@${user.twitter.screenName}`)
diff --git a/packages/backend/test/prelude/get-api-validator.ts b/packages/backend/test/prelude/get-api-validator.ts
index 1f4a2dbc9..f09577476 100644
--- a/packages/backend/test/prelude/get-api-validator.ts
+++ b/packages/backend/test/prelude/get-api-validator.ts
@@ -5,7 +5,7 @@ export const getValidator = (paramDef: Schema) => {
     const ajv = new Ajv({
         useDefaults: true,
     });
-    ajv.addFormat('misskey:id', /^[a-zA-Z0-9]+$/);		
+    ajv.addFormat('misskey:id', /^[a-zA-Z0-9]+$/);
 
     return ajv.compile(paramDef);
 }
diff --git a/packages/backend/test/unit/DriveService.ts b/packages/backend/test/unit/DriveService.ts
index 406566557..9ee6d4bcf 100644
--- a/packages/backend/test/unit/DriveService.ts
+++ b/packages/backend/test/unit/DriveService.ts
@@ -34,7 +34,7 @@ describe('DriveService', () => {
 		test('delete a file', async () => {
 			s3Mock.on(DeleteObjectCommand)
 				.resolves({} as DeleteObjectCommandOutput);
-			
+
 			await driveService.deleteObjectStorageFile('peace of the world');
 		});
 
diff --git a/packages/backend/test/unit/FileInfoService.ts b/packages/backend/test/unit/FileInfoService.ts
index f378184c7..efb9bdacc 100644
--- a/packages/backend/test/unit/FileInfoService.ts
+++ b/packages/backend/test/unit/FileInfoService.ts
@@ -94,7 +94,7 @@ describe('FileInfoService', () => {
 				orientation: undefined,
 			});
 		});
-	
+
 		test('Generic APNG', async () => {
 			const path = `${resources}/anime.png`;
 			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
@@ -114,7 +114,7 @@ describe('FileInfoService', () => {
 				orientation: undefined,
 			});
 		});
-	
+
 		test('Generic AGIF', async () => {
 			const path = `${resources}/anime.gif`;
 			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
@@ -134,7 +134,7 @@ describe('FileInfoService', () => {
 				orientation: undefined,
 			});
 		});
-	
+
 		test('PNG with alpha', async () => {
 			const path = `${resources}/with-alpha.png`;
 			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
@@ -154,7 +154,7 @@ describe('FileInfoService', () => {
 				orientation: undefined,
 			});
 		});
-	
+
 		test('Generic SVG', async () => {
 			const path = `${resources}/image.svg`;
 			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
@@ -174,7 +174,7 @@ describe('FileInfoService', () => {
 				orientation: undefined,
 			});
 		});
-	
+
 		test('SVG with XML definition', async () => {
 			// https://github.com/misskey-dev/misskey/issues/4413
 			const path = `${resources}/with-xml-def.svg`;
@@ -195,7 +195,7 @@ describe('FileInfoService', () => {
 				orientation: undefined,
 			});
 		});
-	
+
 		test('Dimension limit', async () => {
 			const path = `${resources}/25000x25000.png`;
 			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
@@ -215,7 +215,7 @@ describe('FileInfoService', () => {
 				orientation: undefined,
 			});
 		});
-	
+
 		test('Rotate JPEG', async () => {
 			const path = `${resources}/rotate.jpg`;
 			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
@@ -257,7 +257,7 @@ describe('FileInfoService', () => {
 				},
 			});
 		});
-	
+
 		test('WAV', async () => {
 			const path = `${resources}/kick_gaba7.wav`;
 			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
@@ -277,7 +277,7 @@ describe('FileInfoService', () => {
 				},
 			});
 		});
-	
+
 		test('AAC', async () => {
 			const path = `${resources}/kick_gaba7.aac`;
 			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
@@ -297,7 +297,7 @@ describe('FileInfoService', () => {
 				},
 			});
 		});
-	
+
 		test('FLAC', async () => {
 			const path = `${resources}/kick_gaba7.flac`;
 			const info = await fileInfoService.getFileInfo(path, { skipSensitiveDetection: true }) as any;
@@ -317,7 +317,7 @@ describe('FileInfoService', () => {
 				},
 			});
 		});
-	
+
 		/*
 		 * video/webmとして検出されてしまう
 		test('WEBM AUDIO', async () => {
diff --git a/packages/backend/test/unit/RelayService.ts b/packages/backend/test/unit/RelayService.ts
index c2280142a..6bf08f509 100644
--- a/packages/backend/test/unit/RelayService.ts
+++ b/packages/backend/test/unit/RelayService.ts
@@ -61,7 +61,7 @@ describe('RelayService', () => {
 		await app.close();
 	});
 
-	test('addRelay', async () => {	
+	test('addRelay', async () => {
 		const result = await relayService.addRelay('https://example.com');
 
 		expect(result.inbox).toBe('https://example.com');
@@ -72,7 +72,7 @@ describe('RelayService', () => {
 		//expect(queueService.deliver.mock.lastCall![0].username).toBe('relay.actor');
 	});
 
-	test('listRelay', async () => {	
+	test('listRelay', async () => {
 		const result = await relayService.listRelay();
 
 		expect(result.length).toBe(1);
@@ -80,7 +80,7 @@ describe('RelayService', () => {
 		expect(result[0].status).toBe('requesting');
 	});
 
-	test('removeRelay: succ', async () => {	
+	test('removeRelay: succ', async () => {
 		await relayService.removeRelay('https://example.com');
 
 		expect(queueService.deliver).toHaveBeenCalled();
@@ -93,7 +93,7 @@ describe('RelayService', () => {
 		expect(list.length).toBe(0);
 	});
 
-	test('removeRelay: fail', async () => {	
+	test('removeRelay: fail', async () => {
 		await expect(relayService.removeRelay('https://x.example.com'))
 			.rejects.toThrow('relay not found');
 	});
diff --git a/packages/backend/test/unit/chart.ts b/packages/backend/test/unit/chart.ts
index 5ac4cc18a..40554d3a4 100644
--- a/packages/backend/test/unit/chart.ts
+++ b/packages/backend/test/unit/chart.ts
@@ -475,16 +475,16 @@ describe('Chart', () => {
 				await testIntersectionChart.addA('bob');
 				await testIntersectionChart.addB('carol');
 				await testIntersectionChart.save();
-	
+
 				const chartHours = await testIntersectionChart.getChart('hour', 3, null);
 				const chartDays = await testIntersectionChart.getChart('day', 3, null);
-	
+
 				assert.deepStrictEqual(chartHours, {
 					a: [2, 0, 0],
 					b: [1, 0, 0],
 					aAndB: [0, 0, 0],
 				});
-	
+
 				assert.deepStrictEqual(chartDays, {
 					a: [2, 0, 0],
 					b: [1, 0, 0],
@@ -498,16 +498,16 @@ describe('Chart', () => {
 				await testIntersectionChart.addB('carol');
 				await testIntersectionChart.addB('alice');
 				await testIntersectionChart.save();
-	
+
 				const chartHours = await testIntersectionChart.getChart('hour', 3, null);
 				const chartDays = await testIntersectionChart.getChart('day', 3, null);
-	
+
 				assert.deepStrictEqual(chartHours, {
 					a: [2, 0, 0],
 					b: [2, 0, 0],
 					aAndB: [1, 0, 0],
 				});
-	
+
 				assert.deepStrictEqual(chartDays, {
 					a: [2, 0, 0],
 					b: [2, 0, 0],
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index 76e8c5072..d2db5e98b 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -87,7 +87,7 @@ export async function mainBoot() {
 		const now = new Date();
 		const m = now.getMonth() + 1;
 		const d = now.getDate();
-		
+
 		if ($i.birthday) {
 			const bm = parseInt($i.birthday.split('-')[1]);
 			const bd = parseInt($i.birthday.split('-')[2]);
diff --git a/packages/frontend/src/components/MkDrive.folder.vue b/packages/frontend/src/components/MkDrive.folder.vue
index 196934240..359497872 100644
--- a/packages/frontend/src/components/MkDrive.folder.vue
+++ b/packages/frontend/src/components/MkDrive.folder.vue
@@ -93,9 +93,9 @@ function onDragover(ev: DragEvent) {
 		switch (ev.dataTransfer.effectAllowed) {
 			case 'all':
 			case 'uninitialized':
-			case 'copy': 
-			case 'copyLink': 
-			case 'copyMove': 
+			case 'copy':
+			case 'copyLink':
+			case 'copyMove':
 				ev.dataTransfer.dropEffect = 'copy';
 				break;
 			case 'linkMove':
diff --git a/packages/frontend/src/components/MkDrive.navFolder.vue b/packages/frontend/src/components/MkDrive.navFolder.vue
index 3349603d3..df4c209c2 100644
--- a/packages/frontend/src/components/MkDrive.navFolder.vue
+++ b/packages/frontend/src/components/MkDrive.navFolder.vue
@@ -61,9 +61,9 @@ function onDragover(ev: DragEvent) {
 		switch (ev.dataTransfer.effectAllowed) {
 			case 'all':
 			case 'uninitialized':
-			case 'copy': 
-			case 'copyLink': 
-			case 'copyMove': 
+			case 'copy':
+			case 'copyLink':
+			case 'copyMove':
 				ev.dataTransfer.dropEffect = 'copy';
 				break;
 			case 'linkMove':
diff --git a/packages/frontend/src/components/MkDrive.vue b/packages/frontend/src/components/MkDrive.vue
index 19508fe4d..917e78513 100644
--- a/packages/frontend/src/components/MkDrive.vue
+++ b/packages/frontend/src/components/MkDrive.vue
@@ -202,9 +202,9 @@ function onDragover(ev: DragEvent): any {
 		switch (ev.dataTransfer.effectAllowed) {
 			case 'all':
 			case 'uninitialized':
-			case 'copy': 
-			case 'copyLink': 
-			case 'copyMove': 
+			case 'copy':
+			case 'copyLink':
+			case 'copyMove':
 				ev.dataTransfer.dropEffect = 'copy';
 				break;
 			case 'linkMove':
diff --git a/packages/frontend/src/components/MkFileListForAdmin.vue b/packages/frontend/src/components/MkFileListForAdmin.vue
index 71a35ae6e..77b38b4bb 100644
--- a/packages/frontend/src/components/MkFileListForAdmin.vue
+++ b/packages/frontend/src/components/MkFileListForAdmin.vue
@@ -89,7 +89,7 @@ const props = defineProps<{
 		> .file {
 			position: relative;
 			aspect-ratio: 1;
-		
+
 			> .thumbnail {
 				width: 100%;
 				height: 100%;
diff --git a/packages/frontend/src/components/MkFlashPreview.vue b/packages/frontend/src/components/MkFlashPreview.vue
index 7c9ae155a..b5505ac8f 100644
--- a/packages/frontend/src/components/MkFlashPreview.vue
+++ b/packages/frontend/src/components/MkFlashPreview.vue
@@ -87,7 +87,7 @@ const props = defineProps<{
 
 	@media (max-width: 500px) {
 		font-size: 10px;
-		
+
 		> article {
 			padding: 8px;
 
diff --git a/packages/frontend/src/components/MkMediaVideo.vue b/packages/frontend/src/components/MkMediaVideo.vue
index 40bae90b5..dc5807b2d 100644
--- a/packages/frontend/src/components/MkMediaVideo.vue
+++ b/packages/frontend/src/components/MkMediaVideo.vue
@@ -17,8 +17,8 @@
 		controls
 		@contextmenu.stop
 	>
-		<source 
-			:src="video.url" 
+		<source
+			:src="video.url"
 			:type="video.type"
 		>
 	</video>
diff --git a/packages/frontend/src/components/MkNoteDetailed.vue b/packages/frontend/src/components/MkNoteDetailed.vue
index a65039277..1f8a36b8d 100644
--- a/packages/frontend/src/components/MkNoteDetailed.vue
+++ b/packages/frontend/src/components/MkNoteDetailed.vue
@@ -293,7 +293,7 @@ function renote(viaKeyboard = false) {
 				const y = rect.top + (el.offsetHeight / 2);
 				os.popup(MkRippleEffect, { x, y }, {}, 'end');
 			}
-				
+
 			os.api('notes/create', {
 				renoteId: appearNote.id,
 			}).then(() => {
diff --git a/packages/frontend/src/components/MkSuperMenu.vue b/packages/frontend/src/components/MkSuperMenu.vue
index 72b70416d..0bc9b0316 100644
--- a/packages/frontend/src/components/MkSuperMenu.vue
+++ b/packages/frontend/src/components/MkSuperMenu.vue
@@ -46,7 +46,7 @@ defineProps<{
 			margin: 0 0 8px 0;
 			font-size: 0.9em;
 		}
-	
+
 		> .items {
 			> .item {
 				display: flex;
diff --git a/packages/frontend/src/components/MkUserPopup.vue b/packages/frontend/src/components/MkUserPopup.vue
index c3b777a12..937e0f079 100644
--- a/packages/frontend/src/components/MkUserPopup.vue
+++ b/packages/frontend/src/components/MkUserPopup.vue
@@ -195,7 +195,7 @@ onMounted(() => {
 .mfm {
 	display: -webkit-box;
 	-webkit-line-clamp: 5;
-	-webkit-box-orient: vertical;  
+	-webkit-box-orient: vertical;
 	overflow: hidden;
 }
 
diff --git a/packages/frontend/src/components/MkUserSetupDialog.Follow.stories.impl.ts b/packages/frontend/src/components/MkUserSetupDialog.Follow.stories.impl.ts
index 7d5a65f41..67243b78f 100644
--- a/packages/frontend/src/components/MkUserSetupDialog.Follow.stories.impl.ts
+++ b/packages/frontend/src/components/MkUserSetupDialog.Follow.stories.impl.ts
@@ -26,7 +26,7 @@ export const Default = {
 		};
 	},
 	args: {
-		
+
 	},
 	parameters: {
 		layout: 'centered',
diff --git a/packages/frontend/src/components/MkUserSetupDialog.Privacy.stories.impl.ts b/packages/frontend/src/components/MkUserSetupDialog.Privacy.stories.impl.ts
index 70817d83c..072628972 100644
--- a/packages/frontend/src/components/MkUserSetupDialog.Privacy.stories.impl.ts
+++ b/packages/frontend/src/components/MkUserSetupDialog.Privacy.stories.impl.ts
@@ -23,7 +23,7 @@ export const Default = {
 		};
 	},
 	args: {
-		
+
 	},
 	parameters: {
 		layout: 'centered',
diff --git a/packages/frontend/src/components/MkUserSetupDialog.Profile.stories.impl.ts b/packages/frontend/src/components/MkUserSetupDialog.Profile.stories.impl.ts
index f4930aa26..3444605e9 100644
--- a/packages/frontend/src/components/MkUserSetupDialog.Profile.stories.impl.ts
+++ b/packages/frontend/src/components/MkUserSetupDialog.Profile.stories.impl.ts
@@ -23,7 +23,7 @@ export const Default = {
 		};
 	},
 	args: {
-		
+
 	},
 	parameters: {
 		layout: 'centered',
diff --git a/packages/frontend/src/components/MkUserSetupDialog.User.vue b/packages/frontend/src/components/MkUserSetupDialog.User.vue
index d66f34f16..b35f27c5b 100644
--- a/packages/frontend/src/components/MkUserSetupDialog.User.vue
+++ b/packages/frontend/src/components/MkUserSetupDialog.User.vue
@@ -90,7 +90,7 @@ async function follow() {
 .mfm {
 	display: -webkit-box;
 	-webkit-line-clamp: 5;
-	-webkit-box-orient: vertical;  
+	-webkit-box-orient: vertical;
 	overflow: hidden;
 }
 
diff --git a/packages/frontend/src/components/MkUserSetupDialog.stories.impl.ts b/packages/frontend/src/components/MkUserSetupDialog.stories.impl.ts
index 55790602d..f47f4c13d 100644
--- a/packages/frontend/src/components/MkUserSetupDialog.stories.impl.ts
+++ b/packages/frontend/src/components/MkUserSetupDialog.stories.impl.ts
@@ -26,7 +26,7 @@ export const Default = {
 		};
 	},
 	args: {
-		
+
 	},
 	parameters: {
 		layout: 'centered',
diff --git a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
index 2a50a3439..3e756cae9 100644
--- a/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
+++ b/packages/frontend/src/components/global/MkMisskeyFlavoredMarkdown.ts
@@ -199,7 +199,7 @@ export default function(props: {
 						}
 						const x = Math.min(parseFloat(token.props.args.x ?? '1'), 5);
 						const y = Math.min(parseFloat(token.props.args.y ?? '1'), 5);
-						style = `transform: scale(${x}, ${y});`; 
+						style = `transform: scale(${x}, ${y});`;
 						scale = scale * Math.max(x, y);
 						break;
 					}
diff --git a/packages/frontend/src/directives/adaptive-bg.ts b/packages/frontend/src/directives/adaptive-bg.ts
index 313aad799..83bcd7089 100644
--- a/packages/frontend/src/directives/adaptive-bg.ts
+++ b/packages/frontend/src/directives/adaptive-bg.ts
@@ -10,7 +10,7 @@ export default {
 				return el.parentElement ? getBgColor(el.parentElement) : 'transparent';
 			}
 		};
-	
+
 		const parentBg = getBgColor(src.parentElement);
 
 		const myBg = window.getComputedStyle(src).backgroundColor;
diff --git a/packages/frontend/src/directives/adaptive-border.ts b/packages/frontend/src/directives/adaptive-border.ts
index 619c9f0b6..5bd04024b 100644
--- a/packages/frontend/src/directives/adaptive-border.ts
+++ b/packages/frontend/src/directives/adaptive-border.ts
@@ -10,7 +10,7 @@ export default {
 				return el.parentElement ? getBgColor(el.parentElement) : 'transparent';
 			}
 		};
-	
+
 		const parentBg = getBgColor(src.parentElement);
 
 		const myBg = window.getComputedStyle(src).backgroundColor;
diff --git a/packages/frontend/src/directives/panel.ts b/packages/frontend/src/directives/panel.ts
index d31dc41ed..8727183d3 100644
--- a/packages/frontend/src/directives/panel.ts
+++ b/packages/frontend/src/directives/panel.ts
@@ -10,7 +10,7 @@ export default {
 				return el.parentElement ? getBgColor(el.parentElement) : 'transparent';
 			}
 		};
-	
+
 		const parentBg = getBgColor(src.parentElement);
 
 		const myBg = getComputedStyle(document.documentElement).getPropertyValue('--panel');
diff --git a/packages/frontend/src/filters/date.ts b/packages/frontend/src/filters/date.ts
index 706b7d60c..9bc9bfe8a 100644
--- a/packages/frontend/src/filters/date.ts
+++ b/packages/frontend/src/filters/date.ts
@@ -1,4 +1,4 @@
 import { dateTimeFormat } from '@/scripts/intl-const';
 
-export default (d: Date | number | undefined) => dateTimeFormat.format(d); 
+export default (d: Date | number | undefined) => dateTimeFormat.format(d);
 export const dateString = (d: string) => dateTimeFormat.format(new Date(d));
diff --git a/packages/frontend/src/local-storage.ts b/packages/frontend/src/local-storage.ts
index ca4f21f79..f9d04f795 100644
--- a/packages/frontend/src/local-storage.ts
+++ b/packages/frontend/src/local-storage.ts
@@ -14,7 +14,7 @@ type Keys =
 	'wallpaper' |
 	'theme' |
 	'colorScheme' |
-	'useSystemFont' | 
+	'useSystemFont' |
 	'fontSize' |
 	'ui' |
 	'ui_temp' |
diff --git a/packages/frontend/src/nirax.ts b/packages/frontend/src/nirax.ts
index 68977ed79..40348ded1 100644
--- a/packages/frontend/src/nirax.ts
+++ b/packages/frontend/src/nirax.ts
@@ -159,11 +159,11 @@ export class Router extends EventEmitter<{
 					if (route.hash != null && hash != null) {
 						props.set(route.hash, safeURIDecode(hash));
 					}
-	
+
 					if (route.query != null && queryString != null) {
 						const queryObject = [...new URLSearchParams(queryString).entries()]
 							.reduce((obj, entry) => ({ ...obj, [entry[0]]: entry[1] }), {});
-	
+
 						for (const q in route.query) {
 							const as = route.query[q];
 							if (queryObject[q]) {
@@ -171,7 +171,7 @@ export class Router extends EventEmitter<{
 							}
 						}
 					}
-	
+
 					return {
 						route,
 						props,
diff --git a/packages/frontend/src/pages/about.emojis.vue b/packages/frontend/src/pages/about.emojis.vue
index 3744bed10..cc0bf2eed 100644
--- a/packages/frontend/src/pages/about.emojis.vue
+++ b/packages/frontend/src/pages/about.emojis.vue
@@ -20,7 +20,7 @@
 			<XEmoji v-for="emoji in searchEmojis" :key="emoji.name" :emoji="emoji"/>
 		</div>
 	</MkFoldableSection>
-	
+
 	<MkFoldableSection v-for="category in customEmojiCategories" v-once :key="category">
 		<template #header>{{ category || i18n.ts.other }}</template>
 		<div :class="$style.emojis">
@@ -56,7 +56,7 @@ function search() {
 		const queryarry = q.match(/\:([a-z0-9_]*)\:/g);
 
 		if (queryarry) {
-			searchEmojis = customEmojis.value.filter(emoji => 
+			searchEmojis = customEmojis.value.filter(emoji =>
 				queryarry.includes(`:${emoji.name}:`),
 			);
 		} else {
diff --git a/packages/frontend/src/pages/admin/index.vue b/packages/frontend/src/pages/admin/index.vue
index 8b083bc89..226eb8d02 100644
--- a/packages/frontend/src/pages/admin/index.vue
+++ b/packages/frontend/src/pages/admin/index.vue
@@ -1,6 +1,6 @@
 <template>
 <div ref="el" class="hiyeyicy" :class="{ wide: !narrow }">
-	<div v-if="!narrow || currentPage?.route.name == null" class="nav">	
+	<div v-if="!narrow || currentPage?.route.name == null" class="nav">
 		<MkSpacer :contentMax="700" :marginMin="16">
 			<div class="lxpfedzu">
 				<div class="banner">
diff --git a/packages/frontend/src/pages/admin/moderation.vue b/packages/frontend/src/pages/admin/moderation.vue
index e36c9ac91..13789820a 100644
--- a/packages/frontend/src/pages/admin/moderation.vue
+++ b/packages/frontend/src/pages/admin/moderation.vue
@@ -24,7 +24,7 @@
 						<template #label>{{ i18n.ts.preservedUsernames }}</template>
 						<template #caption>{{ i18n.ts.preservedUsernamesDescription }}</template>
 					</MkTextarea>
-					
+
 					<MkTextarea v-model="sensitiveWords">
 						<template #label>{{ i18n.ts.sensitiveWords }}</template>
 						<template #caption>{{ i18n.ts.sensitiveWordsDescription }}<br>{{ i18n.ts.sensitiveWordsDescription2 }}</template>
diff --git a/packages/frontend/src/pages/admin/overview.ap-requests.vue b/packages/frontend/src/pages/admin/overview.ap-requests.vue
index ad8e62341..bde558036 100644
--- a/packages/frontend/src/pages/admin/overview.ap-requests.vue
+++ b/packages/frontend/src/pages/admin/overview.ap-requests.vue
@@ -259,7 +259,7 @@ onMounted(async () => {
 		},
 		plugins: [chartVLine(vLineColor)],
 	});
-	
+
 	fetching = false;
 });
 </script>
diff --git a/packages/frontend/src/pages/admin/overview.federation.vue b/packages/frontend/src/pages/admin/overview.federation.vue
index ab78c4c39..469d2e692 100644
--- a/packages/frontend/src/pages/admin/overview.federation.vue
+++ b/packages/frontend/src/pages/admin/overview.federation.vue
@@ -58,7 +58,7 @@ let federationSubActiveDiff = $ref<number | null>(null);
 let fetching = $ref(true);
 
 const { handler: externalTooltipHandler } = useChartTooltip();
-	
+
 onMounted(async () => {
 	const chart = await os.apiGet('charts/federation', { limit: 2, span: 'day' });
 	federationPubActive = chart.pubActive[0];
diff --git a/packages/frontend/src/pages/admin/overview.queue.vue b/packages/frontend/src/pages/admin/overview.queue.vue
index 69ca89e22..b08757aeb 100644
--- a/packages/frontend/src/pages/admin/overview.queue.vue
+++ b/packages/frontend/src/pages/admin/overview.queue.vue
@@ -122,4 +122,4 @@ onUnmounted(() => {
 		}
 	}
 }
-</style>	
+</style>
diff --git a/packages/frontend/src/pages/admin/overview.vue b/packages/frontend/src/pages/admin/overview.vue
index e8295c81b..838c197f0 100644
--- a/packages/frontend/src/pages/admin/overview.vue
+++ b/packages/frontend/src/pages/admin/overview.vue
@@ -30,7 +30,7 @@
 			<template #header>Federation</template>
 			<XFederation/>
 		</MkFoldableSection>
-		
+
 		<MkFoldableSection class="item">
 			<template #header>Instances</template>
 			<XInstances/>
diff --git a/packages/frontend/src/pages/admin/roles.editor.vue b/packages/frontend/src/pages/admin/roles.editor.vue
index a1fa9d293..02a2d4366 100644
--- a/packages/frontend/src/pages/admin/roles.editor.vue
+++ b/packages/frontend/src/pages/admin/roles.editor.vue
@@ -210,7 +210,7 @@
 					</MkRange>
 				</div>
 			</MkFolder>
-			
+
 			<MkFolder v-if="matchQuery([i18n.ts._role._options.driveCapacity, 'driveCapacityMb'])">
 				<template #label>{{ i18n.ts._role._options.driveCapacity }}</template>
 				<template #suffix>
diff --git a/packages/frontend/src/pages/channel-editor.vue b/packages/frontend/src/pages/channel-editor.vue
index 0a358a141..cacdab040 100644
--- a/packages/frontend/src/pages/channel-editor.vue
+++ b/packages/frontend/src/pages/channel-editor.vue
@@ -25,11 +25,11 @@
 
 			<MkFolder :defaultOpen="true">
 				<template #label>{{ i18n.ts.pinnedNotes }}</template>
-				
+
 				<div class="_gaps">
 					<MkButton primary rounded @click="addPinnedNote()"><i class="ti ti-plus"></i></MkButton>
 
-					<Sortable 
+					<Sortable
 						v-model="pinnedNotes"
 						itemKey="id"
 						:handle="'.' + $style.pinnedNoteHandle"
@@ -160,7 +160,7 @@ async function archive() {
 	});
 
 	if (canceled) return;
-	
+
 	os.api('channels/update', {
 		channelId: props.channelId,
 		isArchived: true,
diff --git a/packages/frontend/src/pages/clip.vue b/packages/frontend/src/pages/clip.vue
index d5313099d..b09f787b5 100644
--- a/packages/frontend/src/pages/clip.vue
+++ b/packages/frontend/src/pages/clip.vue
@@ -55,7 +55,7 @@ watch(() => props.clipId, async () => {
 	favorited = clip.isFavorited;
 }, {
 	immediate: true,
-}); 
+});
 
 provide('currentClip', $$(clip));
 
diff --git a/packages/frontend/src/pages/custom-emojis-manager.vue b/packages/frontend/src/pages/custom-emojis-manager.vue
index 901fbc1ee..dde4d67f1 100644
--- a/packages/frontend/src/pages/custom-emojis-manager.vue
+++ b/packages/frontend/src/pages/custom-emojis-manager.vue
@@ -311,13 +311,13 @@ definePageMetadata(computed(() => ({
 		.empty {
 			margin: var(--margin);
 		}
-		
+
 		.ldhfsamy {
 			display: grid;
 			grid-template-columns: repeat(auto-fill, minmax(190px, 1fr));
 			grid-gap: 12px;
 			margin: var(--margin) 0;
-	
+
 			> .emoji {
 				display: flex;
 				align-items: center;
diff --git a/packages/frontend/src/pages/follow.vue b/packages/frontend/src/pages/follow.vue
index d14b66336..2d08b6686 100644
--- a/packages/frontend/src/pages/follow.vue
+++ b/packages/frontend/src/pages/follow.vue
@@ -20,7 +20,7 @@ async function follow(user): Promise<void> {
 		window.close();
 		return;
 	}
-	
+
 	os.apiWithDialog('following/create', {
 		userId: user.id,
 	});
diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue
index 83997b255..ac765e88b 100644
--- a/packages/frontend/src/pages/instance-info.vue
+++ b/packages/frontend/src/pages/instance-info.vue
@@ -49,7 +49,7 @@
 					<template #value><MkTime v-if="instance.latestRequestReceivedAt" :time="instance.latestRequestReceivedAt"/><span v-else>N/A</span></template>
 				</MkKeyValue>
 			</FormSection>
-	
+
 			<FormSection>
 				<MkKeyValue oneline style="margin: 1em 0;">
 					<template #key>Following (Pub)</template>
diff --git a/packages/frontend/src/pages/list.vue b/packages/frontend/src/pages/list.vue
index 40934fb71..3307eef35 100644
--- a/packages/frontend/src/pages/list.vue
+++ b/packages/frontend/src/pages/list.vue
@@ -112,7 +112,7 @@ definePageMetadata(computed(() => list ? {
 	flex: 1;
 	min-width: 0;
 	margin-right: 8px;
-	
+
 	&:hover {
 		text-decoration: none;
 	}
diff --git a/packages/frontend/src/pages/registry.keys.vue b/packages/frontend/src/pages/registry.keys.vue
index b1d41fe2c..59f1f7fdb 100644
--- a/packages/frontend/src/pages/registry.keys.vue
+++ b/packages/frontend/src/pages/registry.keys.vue
@@ -13,7 +13,7 @@
 					<template #value>{{ scope.join('/') }}</template>
 				</MkKeyValue>
 			</FormSplit>
-			
+
 			<MkButton primary @click="createKey">{{ i18n.ts._registry.createKey }}</MkButton>
 
 			<FormSection v-if="keys">
diff --git a/packages/frontend/src/pages/registry.value.vue b/packages/frontend/src/pages/registry.value.vue
index 513a2f8fe..ed01381d5 100644
--- a/packages/frontend/src/pages/registry.value.vue
+++ b/packages/frontend/src/pages/registry.value.vue
@@ -20,7 +20,7 @@
 						<template #value>{{ key }}</template>
 					</MkKeyValue>
 				</FormSplit>
-				
+
 				<MkTextarea v-model="valueForEditor" tall class="_monospace">
 					<template #label>{{ i18n.ts.value }} (JSON)</template>
 				</MkTextarea>
diff --git a/packages/frontend/src/pages/reset-password.vue b/packages/frontend/src/pages/reset-password.vue
index 9d5730731..fbd109b3f 100644
--- a/packages/frontend/src/pages/reset-password.vue
+++ b/packages/frontend/src/pages/reset-password.vue
@@ -7,7 +7,7 @@
 				<template #prefix><i class="ti ti-lock"></i></template>
 				<template #label>{{ i18n.ts.newPassword }}</template>
 			</MkInput>
-		
+
 			<MkButton primary @click="save">{{ i18n.ts.save }}</MkButton>
 		</div>
 	</MkSpacer>
diff --git a/packages/frontend/src/pages/settings/drive-cleaner.vue b/packages/frontend/src/pages/settings/drive-cleaner.vue
index 8178343bb..98471e94d 100644
--- a/packages/frontend/src/pages/settings/drive-cleaner.vue
+++ b/packages/frontend/src/pages/settings/drive-cleaner.vue
@@ -80,7 +80,7 @@ watch(sortModeSelect, () => {
 			sortMode.value = '+size';
 			fetchDriveInfo();
 			break;
-		
+
 		case 'createdAtAsc':
 			sortMode.value = '-createdAt';
 			fetchDriveInfo();
diff --git a/packages/frontend/src/pages/settings/navbar.vue b/packages/frontend/src/pages/settings/navbar.vue
index 8780bfbc1..f0e9a1c3d 100644
--- a/packages/frontend/src/pages/settings/navbar.vue
+++ b/packages/frontend/src/pages/settings/navbar.vue
@@ -3,7 +3,7 @@
 	<FormSlot>
 		<template #label>{{ i18n.ts.navbar }}</template>
 		<MkContainer :showHeader="false">
-			<Sortable 
+			<Sortable
 				v-model="items"
 				itemKey="id"
 				:animation="150"
diff --git a/packages/frontend/src/pages/settings/preferences-backups.vue b/packages/frontend/src/pages/settings/preferences-backups.vue
index e34901cd1..1aa1a5f81 100644
--- a/packages/frontend/src/pages/settings/preferences-backups.vue
+++ b/packages/frontend/src/pages/settings/preferences-backups.vue
@@ -144,7 +144,7 @@ function validate(profile: unknown): void {
 
 	if (!profile.name) throw new Error('Missing required prop: name');
 	if (!profile.misskeyVersion) throw new Error('Missing required prop: misskeyVersion');
-	
+
 	// Check if createdAt and updatedAt is Date
 	// https://zenn.dev/lollipop_onl/articles/eoz-judge-js-invalid-date
 	if (!profile.createdAt || Number.isNaN(new Date(profile.createdAt).getTime())) throw new Error('createdAt is falsy or not Date');
@@ -273,7 +273,7 @@ async function applyProfile(id: string): Promise<void> {
 			defaultStore.set(key, settings.hot[key]);
 		}
 	}
-	
+
 	// coldDeviceStorage
 	for (const key of coldDeviceStorageSaveKeys) {
 		if (settings.cold[key] !== undefined) {
diff --git a/packages/frontend/src/pages/settings/privacy.vue b/packages/frontend/src/pages/settings/privacy.vue
index 7fd4d6d34..88d109c02 100644
--- a/packages/frontend/src/pages/settings/privacy.vue
+++ b/packages/frontend/src/pages/settings/privacy.vue
@@ -7,7 +7,7 @@
 		{{ i18n.ts.makeReactionsPublic }}
 		<template #caption>{{ i18n.ts.makeReactionsPublicDescription }}</template>
 	</MkSwitch>
-		
+
 	<MkSelect v-model="ffVisibility" @update:modelValue="save()">
 		<template #label>{{ i18n.ts.ffVisibility }}</template>
 		<option value="public">{{ i18n.ts._ffVisibility.public }}</option>
@@ -15,7 +15,7 @@
 		<option value="private">{{ i18n.ts._ffVisibility.private }}</option>
 		<template #caption>{{ i18n.ts.ffVisibilityDescription }}</template>
 	</MkSelect>
-		
+
 	<MkSwitch v-model="hideOnlineStatus" @update:modelValue="save()">
 		{{ i18n.ts.hideOnlineStatus }}
 		<template #caption>{{ i18n.ts.hideOnlineStatusDescription }}</template>
diff --git a/packages/frontend/src/pages/settings/roles.vue b/packages/frontend/src/pages/settings/roles.vue
index 05753c9b6..4b842f56f 100644
--- a/packages/frontend/src/pages/settings/roles.vue
+++ b/packages/frontend/src/pages/settings/roles.vue
@@ -37,7 +37,7 @@ import MkRolePreview from '@/components/MkRolePreview.vue';
 
 function save() {
 	os.apiWithDialog('i/update', {
-		
+
 	});
 }
 
diff --git a/packages/frontend/src/pages/settings/security.vue b/packages/frontend/src/pages/settings/security.vue
index 2da84763a..bd5e2e350 100644
--- a/packages/frontend/src/pages/settings/security.vue
+++ b/packages/frontend/src/pages/settings/security.vue
@@ -78,7 +78,7 @@ async function change() {
 		});
 		return;
 	}
-	
+
 	os.apiWithDialog('i/change-password', {
 		currentPassword,
 		newPassword,
diff --git a/packages/frontend/src/pizzax.ts b/packages/frontend/src/pizzax.ts
index d97bd4be6..996610602 100644
--- a/packages/frontend/src/pizzax.ts
+++ b/packages/frontend/src/pizzax.ts
@@ -70,7 +70,7 @@ export class Storage<T extends StateDef> {
 			this.state[k] = v.default;
 			this.reactiveState[k] = ref(v.default);
 		}
-	
+
 		this.ready = this.init();
 		this.loaded = this.ready.then(() => this.load());
 	}
@@ -81,7 +81,7 @@ export class Storage<T extends StateDef> {
 		const deviceState: State<T> = await get(this.deviceStateKeyName) || {};
 		const deviceAccountState = $i ? await get(this.deviceAccountStateKeyName) || {} : {};
 		const registryCache = $i ? await get(this.registryCacheKeyName) || {} : {};
-	
+
 		for (const [k, v] of Object.entries(this.def) as [keyof T, T[keyof T]['default']][]) {
 			if (v.where === 'device' && Object.prototype.hasOwnProperty.call(deviceState, k)) {
 				this.reactiveState[k].value = this.state[k] = deviceState[k];
@@ -110,7 +110,7 @@ export class Storage<T extends StateDef> {
 				if (!scope || scope.length !== 2 || scope[0] !== 'client' || scope[1] !== this.key || this.state[key] === value) return;
 
 				this.reactiveState[key].value = this.state[key] = value;
-	
+
 				this.addIdbSetJob(async () => {
 					const cache = await get(this.registryCacheKeyName);
 					if (cache[key] !== value) {
@@ -142,7 +142,7 @@ export class Storage<T extends StateDef> {
 									}
 								}
 							}
-	
+
 							return set(this.registryCacheKeyName, cache);
 						})
 						.then(() => resolve());
@@ -252,7 +252,7 @@ export class Storage<T extends StateDef> {
 	// localStorage => indexedDBのマイグレーション
 	private async migrate() {
 		const deviceState = localStorage.getItem(this.deviceStateKeyName);
-		if (deviceState) { 
+		if (deviceState) {
 			await set(this.deviceStateKeyName, JSON.parse(deviceState));
 			localStorage.removeItem(this.deviceStateKeyName);
 		}
diff --git a/packages/frontend/src/scripts/aiscript/ui.ts b/packages/frontend/src/scripts/aiscript/ui.ts
index 2ca1b164a..c26ae5a4d 100644
--- a/packages/frontend/src/scripts/aiscript/ui.ts
+++ b/packages/frontend/src/scripts/aiscript/ui.ts
@@ -510,7 +510,7 @@ export function registerAsUiLib(components: Ref<AsUiComponent>[], done: (root: R
 		// Ui:root.update({ children: [...] }) の糖衣構文
 		'Ui:render': values.FN_NATIVE(([children], opts) => {
 			utils.assertArray(children);
-		
+
 			rootComponent.value.children = children.value.map(v => {
 				utils.assertObject(v);
 				return v.value.get('id').value;
diff --git a/packages/frontend/src/scripts/get-user-menu.ts b/packages/frontend/src/scripts/get-user-menu.ts
index b055d2647..c884ed76c 100644
--- a/packages/frontend/src/scripts/get-user-menu.ts
+++ b/packages/frontend/src/scripts/get-user-menu.ts
@@ -196,7 +196,7 @@ export function getUserMenu(user: misskey.entities.UserDetailed, router: Router
 								default: 'indefinitely',
 							});
 							if (canceled) return;
-						
+
 							const expiresAt = period === 'indefinitely' ? null
 								: period === 'oneHour' ? Date.now() + (1000 * 60 * 60)
 								: period === 'oneDay' ? Date.now() + (1000 * 60 * 60 * 24)
diff --git a/packages/frontend/src/scripts/lookup.ts b/packages/frontend/src/scripts/lookup.ts
index ce5b03fc3..0b594e341 100644
--- a/packages/frontend/src/scripts/lookup.ts
+++ b/packages/frontend/src/scripts/lookup.ts
@@ -10,7 +10,7 @@ export async function lookup(router?: Router) {
 		title: i18n.ts.lookup,
 	});
 	if (canceled) return;
-	
+
 	if (query.startsWith('@') && !query.includes(' ')) {
 		_router.push(`/${query}`);
 		return;
diff --git a/packages/frontend/src/scripts/url.ts b/packages/frontend/src/scripts/url.ts
index b6a997449..07737d622 100644
--- a/packages/frontend/src/scripts/url.ts
+++ b/packages/frontend/src/scripts/url.ts
@@ -2,7 +2,7 @@
  * 1. 配列に何も入っていない時はクエリを付けない
  * 2. プロパティがundefinedの時はクエリを付けない
  * （new URLSearchParams(obj)ではそこまで丁寧なことをしてくれない）
- */ 
+ */
 export function query(obj: Record<string, any>): string {
 	const params = Object.entries(obj)
 		.filter(([, v]) => Array.isArray(v) ? v.length : v !== undefined)
diff --git a/packages/frontend/src/scripts/use-note-capture.ts b/packages/frontend/src/scripts/use-note-capture.ts
index 22a01e066..d057386b1 100644
--- a/packages/frontend/src/scripts/use-note-capture.ts
+++ b/packages/frontend/src/scripts/use-note-capture.ts
@@ -93,12 +93,12 @@ export function useNoteCapture(props: {
 	function onStreamConnected() {
 		capture(false);
 	}
-	
+
 	capture(true);
 	if (connection) {
 		connection.on('_connected_', onStreamConnected);
 	}
-	
+
 	onUnmounted(() => {
 		decapture(true);
 		if (connection) {
diff --git a/packages/frontend/src/style.scss b/packages/frontend/src/style.scss
index b376e4c42..b4b80a4bb 100644
--- a/packages/frontend/src/style.scss
+++ b/packages/frontend/src/style.scss
@@ -7,7 +7,7 @@
 
 	--margin: var(--marginFull);
 	--minBottomSpacing: 0px;
-	
+
 	@media (max-width: 500px) {
 		--margin: var(--marginHalf);
 		--minBottomSpacing: calc(72px + max(12px, env(safe-area-inset-bottom, 0px)));
@@ -19,7 +19,7 @@
 ::selection {
 	color: var(--fgOnAccent);
 	background-color: var(--accent);
-} 
+}
 
 html {
 	background-color: var(--bg);
diff --git a/packages/frontend/src/themes/l-botanical.json5 b/packages/frontend/src/themes/l-botanical.json5
index 5c9892789..17e9ca246 100644
--- a/packages/frontend/src/themes/l-botanical.json5
+++ b/packages/frontend/src/themes/l-botanical.json5
@@ -5,7 +5,7 @@
 	author: 'ThinaticSystem',
 
   base: 'light',
-	
+
 	props: {
 		accent: '#77b58c',
 		bg: 'e2deda',
diff --git a/packages/frontend/src/ui/classic.header.vue b/packages/frontend/src/ui/classic.header.vue
index 747d4edcb..2c41e7759 100644
--- a/packages/frontend/src/ui/classic.header.vue
+++ b/packages/frontend/src/ui/classic.header.vue
@@ -82,7 +82,7 @@ function openAccountMenu(ev: MouseEvent) {
 onMounted(() => {
 	window.addEventListener('resize', () => {
 		settingsWindowed = (window.innerWidth >= WINDOW_THRESHOLD);
-	}, { passive: true });	
+	}, { passive: true });
 });
 
 </script>
@@ -177,7 +177,7 @@ onMounted(() => {
 
 			> .post {
 				display: inline-block;
-			
+
 				> .button {
 					width: 40px;
 					height: 40px;
diff --git a/packages/frontend/src/ui/classic.vue b/packages/frontend/src/ui/classic.vue
index d50f2b045..2c58c2984 100644
--- a/packages/frontend/src/ui/classic.vue
+++ b/packages/frontend/src/ui/classic.vue
@@ -219,7 +219,7 @@ onMounted(() => {
 
 		&.fullView {
 			margin: 0;
-		
+
 			> .sidebar {
 				display: none;
 			}
diff --git a/packages/frontend/src/widgets/WidgetAiscriptApp.vue b/packages/frontend/src/widgets/WidgetAiscriptApp.vue
index 3b67972e4..94d2d922d 100644
--- a/packages/frontend/src/widgets/WidgetAiscriptApp.vue
+++ b/packages/frontend/src/widgets/WidgetAiscriptApp.vue
@@ -37,7 +37,7 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 
 const props = defineProps<WidgetComponentProps<WidgetProps>>();
 const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-	
+
 const { widgetProps, configure } = useWidgetPropsManager(name,
 	widgetPropsDef,
 	props,
diff --git a/packages/frontend/src/widgets/WidgetClicker.vue b/packages/frontend/src/widgets/WidgetClicker.vue
index b7be2e8c8..6a997f7da 100644
--- a/packages/frontend/src/widgets/WidgetClicker.vue
+++ b/packages/frontend/src/widgets/WidgetClicker.vue
@@ -25,7 +25,7 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 
 const props = defineProps<WidgetComponentProps<WidgetProps>>();
 const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-	
+
 const { widgetProps, configure } = useWidgetPropsManager(name,
 	widgetPropsDef,
 	props,
diff --git a/packages/frontend/src/widgets/WidgetNotifications.vue b/packages/frontend/src/widgets/WidgetNotifications.vue
index a24aa9b2e..d4f9a07cb 100644
--- a/packages/frontend/src/widgets/WidgetNotifications.vue
+++ b/packages/frontend/src/widgets/WidgetNotifications.vue
@@ -41,7 +41,7 @@ type WidgetProps = GetFormResultType<typeof widgetPropsDef>;
 
 const props = defineProps<WidgetComponentProps<WidgetProps>>();
 const emit = defineEmits<WidgetComponentEmits<WidgetProps>>();
-	
+
 const { widgetProps, configure, save } = useWidgetPropsManager(name,
 	widgetPropsDef,
 	props,
diff --git a/packages/misskey-js/src/streaming.ts b/packages/misskey-js/src/streaming.ts
index 92a220b49..c641706a4 100644
--- a/packages/misskey-js/src/streaming.ts
+++ b/packages/misskey-js/src/streaming.ts
@@ -218,7 +218,7 @@ class Pool {
 		this.dec = this.dec.bind(this);
 		this.connect = this.connect.bind(this);
 		this.disconnect = this.disconnect.bind(this);
-	
+
 		this.channel = channel;
 		this.stream = stream;
 		this.id = id;
diff --git a/packages/misskey-js/test-d/streaming.ts b/packages/misskey-js/test-d/streaming.ts
index 7ff7f9599..853f376e6 100644
--- a/packages/misskey-js/test-d/streaming.ts
+++ b/packages/misskey-js/test-d/streaming.ts
@@ -16,7 +16,7 @@ describe('Streaming', () => {
 		// {
 		//   otherparty?: User['id'] | null;
 		//   group?: UserGroup['id'] | null;
-		// } 
+		// }
 		// になっている」というテストを行いたいけどtsdでの書き方がわからない
 		const messagingChannel = stream.useChannel('messaging', { otherparty: 'aaa' });
 		messagingChannel.on('message', message => {
diff --git a/packages/misskey-js/test/api.ts b/packages/misskey-js/test/api.ts
index 84b1fc093..6f9e656fe 100644
--- a/packages/misskey-js/test/api.ts
+++ b/packages/misskey-js/test/api.ts
@@ -137,7 +137,7 @@ describe('API', () => {
 				origin: 'https://misskey.test',
 				credential: 'TOKEN',
 			});
-	
+
 			await cli.request('i', {}, null);
 		} catch (e) {
 			expect(isAPIError(e)).toEqual(true);
@@ -165,7 +165,7 @@ describe('API', () => {
 				origin: 'https://misskey.test',
 				credential: 'TOKEN',
 			});
-	
+
 			await cli.request('i');
 		} catch (e: any) {
 			expect(isAPIError(e)).toEqual(true);
@@ -182,7 +182,7 @@ describe('API', () => {
 				origin: 'https://misskey.test',
 				credential: 'TOKEN',
 			});
-	
+
 			await cli.request('i');
 		} catch (e) {
 			expect(isAPIError(e)).toEqual(false);
@@ -203,7 +203,7 @@ describe('API', () => {
 				origin: 'https://misskey.test',
 				credential: 'TOKEN',
 			});
-	
+
 			await cli.request('i');
 		} catch (e) {
 			expect(isAPIError(e)).toEqual(false);
diff --git a/packages/misskey-js/test/streaming.ts b/packages/misskey-js/test/streaming.ts
index 913db8b28..9f6615a8d 100644
--- a/packages/misskey-js/test/streaming.ts
+++ b/packages/misskey-js/test/streaming.ts
@@ -131,7 +131,7 @@ describe('Streaming', () => {
 		main.on('meUpdated', payload => {
 			mainChannelReceived.push(payload);
 		});
-		
+
 		const ws = await server.connected;
 		expect(new URLSearchParams(new URL(ws.url).search).get('i')).toEqual('TOKEN');
 

From 8daca59ca61dac8fd7f68f3135d69092c70e599f Mon Sep 17 00:00:00 2001
From: popkirby <popkirby@gmail.com>
Date: Sat, 8 Jul 2023 07:27:26 +0900
Subject: [PATCH 05/31] perf(backend): use mutex for nsfw model loading
 (#11109)

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
---
 CHANGELOG.md                           |  1 +
 packages/backend/package.json          |  1 +
 packages/backend/src/core/AiService.ts | 10 +++++++++-
 pnpm-lock.yaml                         |  9 +++++++++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 288ab0796..434420522 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 
 ### Server
 - JSON.parse の回数を削減することで、ストリーミングのパフォーマンスを向上しました
+- nsfwjs のモデルロードを排他することで、重複ロードによってメモリ使用量が増加しないように
 - 連合の配送ジョブのパフォーマンスを向上（ロック機構の見直し、Redisキャッシュの活用）
 
 ## 13.13.2
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 288a8ea7b..87f7f9ddf 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -75,6 +75,7 @@
 		"accepts": "1.3.8",
 		"ajv": "8.12.0",
 		"archiver": "5.3.1",
+		"async-mutex": "^0.4.0",
 		"autwh": "0.1.0",
 		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
diff --git a/packages/backend/src/core/AiService.ts b/packages/backend/src/core/AiService.ts
index 02501b832..c0596446d 100644
--- a/packages/backend/src/core/AiService.ts
+++ b/packages/backend/src/core/AiService.ts
@@ -4,6 +4,7 @@ import { dirname } from 'node:path';
 import { Inject, Injectable } from '@nestjs/common';
 import * as nsfw from 'nsfwjs';
 import si from 'systeminformation';
+import { Mutex } from 'async-mutex';
 import type { Config } from '@/config.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
@@ -17,6 +18,7 @@ let isSupportedCpu: undefined | boolean = undefined;
 @Injectable()
 export class AiService {
 	private model: nsfw.NSFWJS;
+	private modelLoadMutex: Mutex = new Mutex();
 
 	constructor(
 		@Inject(DI.config)
@@ -39,7 +41,13 @@ export class AiService {
 
 			const tf = await import('@tensorflow/tfjs-node');
 
-			if (this.model == null) this.model = await nsfw.load(`file://${_dirname}/../../nsfw-model/`, { size: 299 });
+			if (this.model == null) {
+				await this.modelLoadMutex.runExclusive(async () => {
+					if (this.model == null) {
+						this.model = await nsfw.load(`file://${_dirname}/../../nsfw-model/`, { size: 299 });
+					}
+				});
+			}
 
 			const buffer = await fs.promises.readFile(path);
 			const image = await tf.node.decodeImage(buffer, 3) as any;
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 69d25e807..0d99cede2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -140,6 +140,9 @@ importers:
       archiver:
         specifier: 5.3.1
         version: 5.3.1
+      async-mutex:
+        specifier: ^0.4.0
+        version: 0.4.0
       autwh:
         specifier: 0.1.0
         version: 0.1.0
@@ -9468,6 +9471,12 @@ packages:
     resolution: {integrity: sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==}
     dev: true
 
+  /async-mutex@0.4.0:
+    resolution: {integrity: sha512-eJFZ1YhRR8UN8eBLoNzcDPcy/jqjsg6I1AP+KvWQX80BqOSW1oJPJXDylPUEeMr2ZQvHgnQ//Lp6f3RQ1zI7HA==}
+    dependencies:
+      tslib: 2.6.0
+    dev: false
+
   /async-settle@1.0.0:
     resolution: {integrity: sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==}
     engines: {node: '>= 0.10'}

From 0b8e0fa91b12a4d1882438a9725d531b36fe51ec Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 7 Jul 2023 22:55:53 +0000
Subject: [PATCH 06/31] fix

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

diff --git a/packages/backend/src/core/FetchInstanceMetadataService.ts b/packages/backend/src/core/FetchInstanceMetadataService.ts
index 127c4c315..a0afaaf88 100644
--- a/packages/backend/src/core/FetchInstanceMetadataService.ts
+++ b/packages/backend/src/core/FetchInstanceMetadataService.ts
@@ -58,8 +58,6 @@ export class FetchInstanceMetadataService {
 
 	@bindThis
 	public async fetchInstanceMetadata(instance: Instance, force = false): Promise<void> {
-		try {
-
 		const host = instance.host;
 		// Acquire mutex to ensure no parallel runs
 		if (!await this.tryLock(host)) return;

From b318789354a8100fb1a2025ae70e958dc770101e Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Fri, 7 Jul 2023 23:15:04 +0000
Subject: [PATCH 07/31] =?UTF-8?q?fix(backend):=20deliverMany=E3=81=ABconte?=
 =?UTF-8?q?nt=E3=81=AEnull=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=82=92?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0=20https://github.com/MisskeyIO/misskey/pull/?=
 =?UTF-8?q?99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index 48ff00c8c..e1da0516d 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -97,6 +97,8 @@ export class QueueService {
 	 */
 	@bindThis
 	public async deliverMany(user: ThinUser, content: IActivity | null, inboxes: Map<string, boolean>) {
+		if (content == null) return null;
+
 		const opts = {
 			attempts: this.config.deliverJobMaxAttempts ?? 12,
 			backoff: {

From 588465566b274fdd2f18301dbd2f72b1e188af67 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Jul 2023 08:46:42 +0900
Subject: [PATCH 08/31] :art:

---
 locales/index.d.ts                            |  1 +
 locales/ja-JP.yml                             |  1 +
 .../src/pages/admin/other-settings.vue        | 38 ++++++++++++-------
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index dea00d783..13aa62bc5 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -1070,6 +1070,7 @@ export interface Locale {
     "branding": string;
     "enableServerMachineStats": string;
     "enableIdenticonGeneration": string;
+    "turnOffToImprovePerformance": string;
     "_initialAccountSetting": {
         "accountCreated": string;
         "letsStartAccountSetup": string;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index d9d227a0b..0b2817e1a 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1067,6 +1067,7 @@ installed: "インストール済み"
 branding: "ブランディング"
 enableServerMachineStats: "サーバーのマシン情報を公開する"
 enableIdenticonGeneration: "ユーザーごとのIdenticon生成を有効にする"
+turnOffToImprovePerformance: "オフにするとパフォーマンスが向上します。"
 
 _initialAccountSetting:
   accountCreated: "アカウントの作成が完了しました！"
diff --git a/packages/frontend/src/pages/admin/other-settings.vue b/packages/frontend/src/pages/admin/other-settings.vue
index d3e1d9efc..13e358874 100644
--- a/packages/frontend/src/pages/admin/other-settings.vue
+++ b/packages/frontend/src/pages/admin/other-settings.vue
@@ -3,22 +3,34 @@
 	<template #header><XHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
 		<FormSuspense :p="init">
-			<div class="_gaps_s">
-				<MkSwitch v-model="enableServerMachineStats">
-					<template #label>{{ i18n.ts.enableServerMachineStats }}</template>
-				</MkSwitch>
+			<div class="_gaps">
+				<div class="_panel" style="padding: 16px;">
+					<MkSwitch v-model="enableServerMachineStats">
+						<template #label>{{ i18n.ts.enableServerMachineStats }}</template>
+						<template #caption>{{ i18n.ts.turnOffToImprovePerformance }}</template>
+					</MkSwitch>
+				</div>
 
-				<MkSwitch v-model="enableIdenticonGeneration">
-					<template #label>{{ i18n.ts.enableIdenticonGeneration }}</template>
-				</MkSwitch>
+				<div class="_panel" style="padding: 16px;">
+					<MkSwitch v-model="enableIdenticonGeneration">
+						<template #label>{{ i18n.ts.enableIdenticonGeneration }}</template>
+						<template #caption>{{ i18n.ts.turnOffToImprovePerformance }}</template>
+					</MkSwitch>
+				</div>
 
-				<MkSwitch v-model="enableChartsForRemoteUser">
-					<template #label>{{ i18n.ts.enableChartsForRemoteUser }}</template>
-				</MkSwitch>
+				<div class="_panel" style="padding: 16px;">
+					<MkSwitch v-model="enableChartsForRemoteUser">
+						<template #label>{{ i18n.ts.enableChartsForRemoteUser }}</template>
+						<template #caption>{{ i18n.ts.turnOffToImprovePerformance }}</template>
+					</MkSwitch>
+				</div>
 
-				<MkSwitch v-model="enableChartsForFederatedInstances">
-					<template #label>{{ i18n.ts.enableChartsForFederatedInstances }}</template>
-				</MkSwitch>
+				<div class="_panel" style="padding: 16px;">
+					<MkSwitch v-model="enableChartsForFederatedInstances">
+						<template #label>{{ i18n.ts.enableChartsForFederatedInstances }}</template>
+						<template #caption>{{ i18n.ts.turnOffToImprovePerformance }}</template>
+					</MkSwitch>
+				</div>
 			</div>
 		</FormSuspense>
 	</MkSpacer>

From 383d6a24855177cc96a0732907255db4b45e9632 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Jul 2023 08:50:02 +0900
Subject: [PATCH 09/31] =?UTF-8?q?node=E3=81=AE=E6=8E=A8=E5=A5=A8(=E3=83=87?=
 =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88)=E3=83=90=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=83=A7=E3=83=B3=E3=81=A8=E6=9C=80=E5=B0=8F=E3=83=90?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B3=E3=82=92=E5=88=86=E9=9B=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .node-version-min                   | 1 +
 CHANGELOG.md                        | 3 ---
 packages/backend/src/boot/master.ts | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)
 create mode 100644 .node-version-min

diff --git a/.node-version-min b/.node-version-min
new file mode 100644
index 000000000..6d80269a4
--- /dev/null
+++ b/.node-version-min
@@ -0,0 +1 @@
+18.16.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 434420522..62fbb4002 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,9 +14,6 @@
 
 ## 13.x.x (unreleased)
 
-### NOTE
-- Node.js 20.4.0以上が必要になりました
-
 ### General
 - identicon生成を無効にしてパフォーマンスを向上させることができるようになりました
 - サーバーのマシン情報の公開を無効にしてパフォーマンスを向上させることができるようになりました
diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index f5d936fad..3e149864e 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -97,7 +97,7 @@ function showNodejsVersion(): void {
 
 	nodejsLogger.info(`Version ${process.version} detected.`);
 
-	const minVersion = fs.readFileSync(`${_dirname}/../../../../.node-version`, 'utf-8').trim();
+	const minVersion = fs.readFileSync(`${_dirname}/../../../../.node-version-min`, 'utf-8').trim();
 	if (semver.lt(process.version, minVersion)) {
 		nodejsLogger.error(`At least Node.js ${minVersion} required!`);
 		process.exit(1);

From 1f181536ae4c014cb203e9a9d79f2658113d29d6 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Jul 2023 08:52:51 +0900
Subject: [PATCH 10/31] use engines

---
 .node-version-min                   | 1 -
 packages/backend/package.json       | 3 +++
 packages/backend/src/boot/master.ts | 6 ------
 3 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 .node-version-min

diff --git a/.node-version-min b/.node-version-min
deleted file mode 100644
index 6d80269a4..000000000
--- a/.node-version-min
+++ /dev/null
@@ -1 +0,0 @@
-18.16.0
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 87f7f9ddf..5da710175 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -3,6 +3,9 @@
 	"main": "./index.js",
 	"private": true,
 	"type": "module",
+	"engines": {
+		"node": ">=18.16.0"
+	},
 	"scripts": {
 		"start": "node ./built/index.js",
 		"start:test": "NODE_ENV=test node ./built/index.js",
diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index 3e149864e..2a2375725 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -96,12 +96,6 @@ function showNodejsVersion(): void {
 	const nodejsLogger = bootLogger.createSubLogger('nodejs');
 
 	nodejsLogger.info(`Version ${process.version} detected.`);
-
-	const minVersion = fs.readFileSync(`${_dirname}/../../../../.node-version-min`, 'utf-8').trim();
-	if (semver.lt(process.version, minVersion)) {
-		nodejsLogger.error(`At least Node.js ${minVersion} required!`);
-		process.exit(1);
-	}
 }
 
 function loadConfigBoot(): Config {

From 3c6175d95952c6f0e2d55e7e0064cbc1cd297fdd Mon Sep 17 00:00:00 2001
From: nenohi <kimutipartylove@gmail.com>
Date: Sat, 8 Jul 2023 08:56:11 +0900
Subject: [PATCH 11/31] =?UTF-8?q?=E5=BA=83=E5=91=8A=E3=81=AE=E6=9B=9C?=
 =?UTF-8?q?=E6=97=A5=E3=82=92=E8=A8=AD=E5=AE=9A=E3=81=A7=E3=81=8D=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=20(#10095)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 曜日選択できるように

* ラベル選択でもチェックが変更されるように

* adを参照しないといけないかも

* smallint -> integer

* 異物混入だったので取りだし

* タイムゾーン指定(Date2つ使うのなんか違和感

* 未テスト

* これにすると出てこないかも

* UIチョット変更

* UI変更 fix bug

* 畳むように修正

* dayofweek->dayOfWeek

* マイグレ時にnot null,default設定してるのでnullable:falseでよさそう

* コメントの記載

* Update packages/backend/src/server/api/endpoints/meta.ts

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

---------

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
---
 locales/ja-JP.yml                             |  1 +
 .../backend/migration/1677054292210-ad4.js    |  9 +++++++++
 packages/backend/src/models/entities/Ad.ts    |  5 ++++-
 .../server/api/endpoints/admin/ad/create.ts   |  4 +++-
 .../server/api/endpoints/admin/ad/update.ts   |  4 +++-
 .../backend/src/server/api/endpoints/meta.ts  | 20 +++++++++++--------
 packages/frontend/src/pages/admin/ads.vue     | 19 ++++++++++++++++++
 7 files changed, 51 insertions(+), 11 deletions(-)
 create mode 100644 packages/backend/migration/1677054292210-ad4.js

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 0b2817e1a..51122655b 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1451,6 +1451,7 @@ _ad:
   back: "戻る"
   reduceFrequencyOfThisAd: "この広告の表示頻度を下げる"
   hide: "表示しない"
+  timezoneinfo: "曜日はサーバーのタイムゾーンを元に指定されます。"
 
 _forgotPassword:
   enterEmail: "アカウントに登録したメールアドレスを入力してください。そのアドレス宛てに、パスワードリセット用のリンクが送信されます。"
diff --git a/packages/backend/migration/1677054292210-ad4.js b/packages/backend/migration/1677054292210-ad4.js
new file mode 100644
index 000000000..48499319b
--- /dev/null
+++ b/packages/backend/migration/1677054292210-ad4.js
@@ -0,0 +1,9 @@
+export class ad1677054292210 {
+	name = 'ad1677054292210';
+	async up(queryRunner) {
+			await queryRunner.query(`ALTER TABLE "ad" ADD "dayOfWeek" integer NOT NULL Default 0`);
+	}
+	async down(queryRunner) {
+		await queryRunner.query(`ALTER TABLE "ad" DROP COLUMN "dayOfWeek"`);
+	}
+}
diff --git a/packages/backend/src/models/entities/Ad.ts b/packages/backend/src/models/entities/Ad.ts
index 56baf863c..a496a6d27 100644
--- a/packages/backend/src/models/entities/Ad.ts
+++ b/packages/backend/src/models/entities/Ad.ts
@@ -55,7 +55,10 @@ export class Ad {
 		length: 8192, nullable: false,
 	})
 	public memo: string;
-
+	@Column('integer', {
+		default: 0, nullable: false,
+	})
+	public dayOfWeek: number;
 	constructor(data: Partial<Ad>) {
 		if (data == null) return;
 
diff --git a/packages/backend/src/server/api/endpoints/admin/ad/create.ts b/packages/backend/src/server/api/endpoints/admin/ad/create.ts
index 917242db3..757030839 100644
--- a/packages/backend/src/server/api/endpoints/admin/ad/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/ad/create.ts
@@ -22,8 +22,9 @@ export const paramDef = {
 		expiresAt: { type: 'integer' },
 		startsAt: { type: 'integer' },
 		imageUrl: { type: 'string', minLength: 1 },
+		dayOfWeek: { type: 'integer' },
 	},
-	required: ['url', 'memo', 'place', 'priority', 'ratio', 'expiresAt', 'startsAt', 'imageUrl'],
+	required: ['url', 'memo', 'place', 'priority', 'ratio', 'expiresAt', 'startsAt', 'imageUrl', 'dayOfWeek'],
 } as const;
 
 // eslint-disable-next-line import/no-default-export
@@ -41,6 +42,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				createdAt: new Date(),
 				expiresAt: new Date(ps.expiresAt),
 				startsAt: new Date(ps.startsAt),
+				dayOfWeek: ps.dayOfWeek,
 				url: ps.url,
 				imageUrl: ps.imageUrl,
 				priority: ps.priority,
diff --git a/packages/backend/src/server/api/endpoints/admin/ad/update.ts b/packages/backend/src/server/api/endpoints/admin/ad/update.ts
index dbab7e9d4..70082290b 100644
--- a/packages/backend/src/server/api/endpoints/admin/ad/update.ts
+++ b/packages/backend/src/server/api/endpoints/admin/ad/update.ts
@@ -31,8 +31,9 @@ export const paramDef = {
 		ratio: { type: 'integer' },
 		expiresAt: { type: 'integer' },
 		startsAt: { type: 'integer' },
+		dayOfWeek: { type: 'integer' },
 	},
-	required: ['id', 'memo', 'url', 'imageUrl', 'place', 'priority', 'ratio', 'expiresAt', 'startsAt'],
+	required: ['id', 'memo', 'url', 'imageUrl', 'place', 'priority', 'ratio', 'expiresAt', 'startsAt', 'dayOfWeek'],
 } as const;
 
 // eslint-disable-next-line import/no-default-export
@@ -56,6 +57,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				imageUrl: ps.imageUrl,
 				expiresAt: new Date(ps.expiresAt),
 				startsAt: new Date(ps.startsAt),
+				dayOfWeek: ps.dayOfWeek,
 			});
 		});
 	}
diff --git a/packages/backend/src/server/api/endpoints/meta.ts b/packages/backend/src/server/api/endpoints/meta.ts
index 6ef5f0d5c..915a1e54f 100644
--- a/packages/backend/src/server/api/endpoints/meta.ts
+++ b/packages/backend/src/server/api/endpoints/meta.ts
@@ -1,4 +1,4 @@
-import { IsNull, LessThanOrEqual, MoreThan } from 'typeorm';
+import { IsNull, LessThanOrEqual, MoreThan, Brackets } from 'typeorm';
 import { Inject, Injectable } from '@nestjs/common';
 import JSON5 from 'json5';
 import type { AdsRepository, UsersRepository } from '@/models/index.js';
@@ -263,13 +263,16 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		super(meta, paramDef, async (ps, me) => {
 			const instance = await this.metaService.fetch(true);
 
-			const ads = await this.adsRepository.find({
-				where: {
-					expiresAt: MoreThan(new Date()),
-					startsAt: LessThanOrEqual(new Date()),
-				},
-			});
-
+			const ads = await this.adsRepository.createQueryBuilder("ads")
+				.where('ads.expiresAt > :now', { now: new Date() })
+				.andWhere('ads.startsAt <= :now', { now: new Date() })
+				.andWhere(new Brackets(qb => {
+					// 曜日のビットフラグを確認する
+					qb.where('ads.dayOfWeek & :dayOfWeek > 0', { dayOfWeek: 1 << new Date().getDay() })
+						.orWhere('ads.dayOfWeek = 0');
+				}))
+				.getMany();
+		
 			const response: any = {
 				maintainerName: instance.maintainerName,
 				maintainerEmail: instance.maintainerEmail,
@@ -311,6 +314,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 					place: ad.place,
 					ratio: ad.ratio,
 					imageUrl: ad.imageUrl,
+					dayOfWeek: ad.dayOfWeek,
 				})),
 				enableEmail: instance.enableEmail,
 				enableServiceWorker: instance.enableServiceWorker,
diff --git a/packages/frontend/src/pages/admin/ads.vue b/packages/frontend/src/pages/admin/ads.vue
index 2c9e18b0b..9a5bd88b2 100644
--- a/packages/frontend/src/pages/admin/ads.vue
+++ b/packages/frontend/src/pages/admin/ads.vue
@@ -36,6 +36,16 @@
 						<template #label>{{ i18n.ts.expiration }}</template>
 					</MkInput>
 				</FormSplit>
+				<MkFolder>
+					<template #label>{{ i18n.ts.advancedSettings }}</template>
+					<span>
+						{{ i18n.ts._ad.timezoneinfo }}
+						<div v-for="(day, index) in daysOfWeek" :key="index">
+							<input :id="`ad${ad.id}-${index}`" type="checkbox" :checked="(ad.dayOfWeek & (1 << index)) !== 0" @change="toggleDayOfWeek(ad, index)">
+							<label :for="`ad${ad.id}-${index}`">{{ day }}</label>
+						</div>
+					</span>
+				</MkFolder>
 				<MkTextarea v-model="ad.memo">
 					<template #label>{{ i18n.ts.memo }}</template>
 				</MkTextarea>
@@ -59,6 +69,7 @@ import MkButton from '@/components/MkButton.vue';
 import MkInput from '@/components/MkInput.vue';
 import MkTextarea from '@/components/MkTextarea.vue';
 import MkRadios from '@/components/MkRadios.vue';
+import MkFolder from '@/components/MkFolder.vue';
 import FormSplit from '@/components/form/split.vue';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
@@ -69,6 +80,7 @@ let ads: any[] = $ref([]);
 // ISO形式はTZがUTCになってしまうので、TZ分ずらして時間を初期化
 const localTime = new Date();
 const localTimeDiff = localTime.getTimezoneOffset() * 60 * 1000;
+const daysOfWeek: string[] = [i18n.ts._weekday.sunday, i18n.ts._weekday.monday, i18n.ts._weekday.tuesday, i18n.ts._weekday.wednesday, i18n.ts._weekday.thursday, i18n.ts._weekday.friday, i18n.ts._weekday.saturday];
 
 os.api('admin/ad/list').then(adsResponse => {
 	ads = adsResponse.map(r => {
@@ -84,6 +96,11 @@ os.api('admin/ad/list').then(adsResponse => {
 	});
 });
 
+// 選択された曜日(index)のビットフラグを操作する
+function toggleDayOfWeek(ad, index) {
+	ad.dayOfWeek ^= 1 << index;
+}
+
 function add() {
 	ads.unshift({
 		id: null,
@@ -95,6 +112,7 @@ function add() {
 		imageUrl: null,
 		expiresAt: null,
 		startsAt: null,
+		dayOfWeek: 0,
 	});
 }
 
@@ -105,6 +123,7 @@ function remove(ad) {
 	}).then(({ canceled }) => {
 		if (canceled) return;
 		ads = ads.filter(x => x !== ad);
+		if (ad.id == null) return;
 		os.apiWithDialog('admin/ad/delete', {
 			id: ad.id,
 		});

From 4f876c9e8d8e3cfb64798e84739913708cfaaef5 Mon Sep 17 00:00:00 2001
From: okayurisotto <okayurisotto@proton.me>
Date: Sat, 8 Jul 2023 08:57:13 +0900
Subject: [PATCH 12/31] refactor(backend): `core/activitypub/models` (#11067)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* cleanup(`ApImageService.ts`)

* refactor(`ApImageService.ts`)

* cleanup(`check-https.ts`)

* cleanup(`ApMentionService.ts`)

* refactor(`ApMentionService.ts`)

* cleanup(`ApNoteService.ts`): unneeded `eslint-disable-next-line`

* cleanup(`ApNoteService.ts`)

* WIP(`ApImageService.ts`): `image.url`を`getApHrefNullable()`に通すかどうか悩んでいる

* refactor(`ApNoteService.ts`): function return type

* cleanup(`ApNoteService.ts`): deadcode

* refactor(`ApNoteService.ts`): `eslint-disable-next-line`

* refactor(`ApNoteService.ts`): non-null assertion

これまでは`getApId()`の方でエラーがスローされていた。

* cleanup(`ApNoteService.ts`): unneeded await

* refactor(`ApNoteService.ts`): note.attachment

- `toArray()`を使うように
- よくわからない条件式を整理
- `as`をなくすために`promiseLimit()`でジェネリクスを使うように

* cleanup(`ApNoteService.ts`)

* refactor(`ApNoteService.ts`): よりよい型定義

`res`が`null`でないことは確認されているようだったので`null`とのunionはなくした

* refactor(`ApNoteService.ts`): 不要な条件を削除

* cleanup(`ApNoteService.ts`)

* cleanup(`ApNoteService.ts`): 重要でない`as`を削除

* refactor(`ApNoteService.ts`): `eslint-disable-next-line`

* cleanup(`ApNoteService.ts`): deadcode

* cleanup(`ApNoteService.ts`): unneeded non-null assertion

* refactor(`ApNoteService.ts`): 不要な条件を削除

* WIP(`ApNoteService.ts`): `as`をなくす

エラーメッセージを考える

* cleanup(`ApNoteService.ts`): 不要な`as`を削除

* cleanup(`ApPersonService.ts`): `no-unused-vars`

* cleanup(`ApPersonService.ts`): deadcode

* refactor(`ApPersonService.ts`): function return type

* cleanup(`ApPersonService.ts`): deadcode

* cleanup(`ApPersonService.ts`): deadcode

* WIP(`ApPersonService.ts`): `as`を調整

`null`でないか確認する処理が続いていたので型アサーションは`null`とのunionにした。
より本質的な改善の余地があるように感じるのでひとまずWIPとしてコミット。

* refactor(`ApPersonService.ts`): `eslint-disable-next-line`

* WIP(`ApPersonService.ts`): `as any`をなくした

エラーをスローするようにせざるを得なかったのでエラーメッセージを考える必要がある。

* WIP(`ApNoteService.ts`): non-null assertion

non-nullアサーションを減らすために事前に存在確認をするようにした。
エラーをスローするようにしたのでメッセージを考えなければならない。

* refactor(`ApNoteService.ts`): non-null assertion -> optional chaining

* refactor(`ApPersonService.ts`): `eslint-disable-next-line`

* refactor(`ApPersonService.ts`): `eslint-disable-next-line`

* refactor(`ApPersonService.ts`): function return type

* refactor(`ApPersonService.ts`): type guardによるnon-null assertionの削除

* WIP(`ApPersonService.ts`): `analyzeAttachments`

- Field型を事前に定義しておくように

- `attachments`が`IObject`だった場合、返り値が`{ fields: [] }`になるようだが構わないのか？
- `toArray()`を通すべきでは？

* Revert "WIP(`ApImageService.ts`): `image.url`を`getApHrefNullable()`に通すかどうか悩んでいる"

This reverts commit aeefb843a8a688f8a356794e8981c58f8a2733af.

* cleanup(`ApImageService.ts`): `import`

* refactor(`ApImageService.ts`): 冗長だった部分を短く

* cleanup(`ApMentionService.ts`): `import`

* refactor(`ApImageService.ts`): `JSON.stringify()`でのindentationを追加

* cleanup(`ApNoteService.ts`): `import`

* cleanup(`ApNoteService.ts`)

* cleanup(`ApNoteService.ts`)

* cleanup(`ApNoteService.ts`)

* cleanup(`ApNoteService.ts`): `any`に対するnon-null assertion

* refactor(`ApNoteService.ts`): 添付ファイル

* cleanup(`ApPersonService.ts`): `import`

* refactor(`ApPersonService.ts`): より実情に即した`as`に

* cleanup(`ApPersonService.ts`)

* refactor(`ApPersonService.ts`): 冗長だった部分を修正

* cleanup(`ApPersonService.ts`): deadcode

* cleanup(`ApPersonService.ts`)

* cleanup(`ApQuestionService.ts`): `import`

* refactor(`ApQuestionService.ts`): `eslint-disable-next-line`

* refactor(`ApQuestionService.ts`): `eslint-disable-next-line`

* cleanup(`ApQuestionService.ts`)

* refactor(`ApQuestionService.ts`): non-null assertionを消した

* cleanup(`ApQuestionService.ts`)

* WIP(`ApQuestionService.ts`): non-null assertionを消す

エラーメッセージを考える必要がある。

* refactor(`ApQuestionService.ts`): `any`を消す

* refactor(`ApQuestionService.ts`): function return type

* WIP(`ApPersonService.ts`): 可読性の低い三項演算子を削除しつつnon-null assertionを回避

エラーメッセージを考える必要がある。

* cleanup(`ApPersonService.ts`): 不必要な三項演算子を削除

* cleanup(`ApPersonService.ts`): 不要な`as`

* cleanup(`ApPersonService.ts`)

* refactor(`ApPersonService.ts`)

* refactor(`ApPersonService.ts`): 可読性の低い三項演算子を削除

元の実装が悪いと判断し`null`かどうかの確認をより厳密に行うようにした。

* cleanup(`ApPersonService.ts`)

* cleanup(`ApPersonService.ts`)

* refactor(`ApPersonService.ts`): 返り値を`void`に統一

この返り値を参照しているコードは見当たらなかった。
また、普通に意味がない値であるように見受けられた。

* fixup! refactor(`ApPersonService.ts`): 返り値を`void`に統一

* refactor(`ApNoteService.ts`)

* refactor(`ApPersonService.ts`)

* cleanup(`ApPersonService.ts`)

* cleanup(`ApPersonService.ts`)

* refactor(`ApPersonService.ts`): 返り値の`void`統一と条件式の調整

この返り値を参照しているコードは見当たらなかった。
また、普通に意味がない値であるように見受けられた。

* cleanup(`ApQuestionService.ts`)

* refactor(`ApQuestionService.ts`)

* refactor(`ApQuestionService.ts`)

* refactor(`tag.ts`): function return type

* fixup! enhance: account migration (#10592)

* fixup! WIP(`ApPersonService.ts`): 可読性の低い三項演算子を削除しつつnon-null assertionを回避

* fixup! cleanup(`ApPersonService.ts`): 不要な`as`

* refactor: エラーメッセージを見繕った

* Revert "cleanup(`ApImageService.ts`): `import`"

This reverts commit 1454d04c377eaf46013b0f3c3ce664a4034fd53a.

* Revert "cleanup(`ApMentionService.ts`): `import`"

This reverts commit 244f6720c134a3434e33c1caf6e3e0c2c87b58f5.

* Revert "cleanup(`ApNoteService.ts`): `import`"

This reverts commit d8f0d769733c4cb0629821b04e557a0ae6f5ff5b.

* Revert "cleanup(`ApPersonService.ts`): `import`"

This reverts commit 5190ef954caf376da46c707f52e02208d53caafd.

# Conflicts:
#	packages/backend/src/core/activitypub/models/ApPersonService.ts

* Revert "cleanup(`ApQuestionService.ts`): `import`"

This reverts commit 778585e2882477fec5f11fabf398b4b89cf26da2.

* processRemoteMoveはそのままにしてほしい

* Revert "fixup! refactor(`ApPersonService.ts`): 返り値を`void`に統一"

This reverts commit 083cd678abcd64325b9628895366c03b893e42ca.

* Revert "refactor(`ApPersonService.ts`): 返り値を`void`に統一"

This reverts commit bfa0fcd6f01a6e519ea0c68017358f9980d2ed96.

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
---
 .../core/activitypub/models/ApImageService.ts |  35 ++-
 .../activitypub/models/ApMentionService.ts    |   4 +-
 .../core/activitypub/models/ApNoteService.ts  | 137 +++++-------
 .../activitypub/models/ApPersonService.ts     | 210 ++++++++----------
 .../activitypub/models/ApQuestionService.ts   |  42 ++--
 .../src/core/activitypub/models/tag.ts        |   2 +-
 packages/backend/src/misc/check-https.ts      |   6 +-
 7 files changed, 189 insertions(+), 247 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApImageService.ts b/packages/backend/src/core/activitypub/models/ApImageService.ts
index 79c5ae958..0da312241 100644
--- a/packages/backend/src/core/activitypub/models/ApImageService.ts
+++ b/packages/backend/src/core/activitypub/models/ApImageService.ts
@@ -10,9 +10,10 @@ import { DB_MAX_IMAGE_COMMENT_LENGTH } from '@/const.js';
 import { DriveService } from '@/core/DriveService.js';
 import type Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
+import { checkHttps } from '@/misc/check-https.js';
 import { ApResolverService } from '../ApResolverService.js';
 import { ApLoggerService } from '../ApLoggerService.js';
-import { checkHttps } from '@/misc/check-https.js';
+import type { IObject } from '../type.js';
 
 @Injectable()
 export class ApImageService {
@@ -37,18 +38,22 @@ export class ApImageService {
 	 * Imageを作成します。
 	 */
 	@bindThis
-	public async createImage(actor: RemoteUser, value: any): Promise<DriveFile> {
+	public async createImage(actor: RemoteUser, value: string | IObject): Promise<DriveFile> {
 		// 投稿者が凍結されていたらスキップ
 		if (actor.isSuspended) {
 			throw new Error('actor has been suspended');
 		}
 
-		const image = await this.apResolverService.createResolver().resolve(value) as any;
+		const image = await this.apResolverService.createResolver().resolve(value);
 
 		if (image.url == null) {
 			throw new Error('invalid image: url not privided');
 		}
 
+		if (typeof image.url !== 'string') {
+			throw new Error('invalid image: unexpected type of url: ' + JSON.stringify(image.url, null, 2));
+		}
+
 		if (!checkHttps(image.url)) {
 			throw new Error('invalid image: unexpected schema of url: ' + image.url);
 		}
@@ -57,29 +62,19 @@ export class ApImageService {
 
 		const instance = await this.metaService.fetch();
 
-		let file = await this.driveService.uploadFromUrl({
+		const file = await this.driveService.uploadFromUrl({
 			url: image.url,
 			user: actor,
 			uri: image.url,
 			sensitive: image.sensitive,
 			isLink: !instance.cacheRemoteFiles,
-			comment: truncate(image.name, DB_MAX_IMAGE_COMMENT_LENGTH),
+			comment: truncate(image.name ?? undefined, DB_MAX_IMAGE_COMMENT_LENGTH),
 		});
+		if (!file.isLink || file.url === image.url) return file;
 
-		if (file.isLink) {
-			// URLが異なっている場合、同じ画像が以前に異なるURLで登録されていたということなので、
-			// URLを更新する
-			if (file.url !== image.url) {
-				await this.driveFilesRepository.update({ id: file.id }, {
-					url: image.url,
-					uri: image.url,
-				});
-
-				file = await this.driveFilesRepository.findOneByOrFail({ id: file.id });
-			}
-		}
-
-		return file;
+		// URLが異なっている場合、同じ画像が以前に異なるURLで登録されていたということなので、URLを更新する
+		await this.driveFilesRepository.update({ id: file.id }, { url: image.url, uri: image.url });
+		return await this.driveFilesRepository.findOneByOrFail({ id: file.id });
 	}
 
 	/**
@@ -89,7 +84,7 @@ export class ApImageService {
 	 * リモートサーバーからフェッチしてMisskeyに登録しそれを返します。
 	 */
 	@bindThis
-	public async resolveImage(actor: RemoteUser, value: any): Promise<DriveFile> {
+	public async resolveImage(actor: RemoteUser, value: string | IObject): Promise<DriveFile> {
 		// TODO
 
 		// リモートサーバーからフェッチしてきて登録
diff --git a/packages/backend/src/core/activitypub/models/ApMentionService.ts b/packages/backend/src/core/activitypub/models/ApMentionService.ts
index 9beefc8fc..62ae3cf93 100644
--- a/packages/backend/src/core/activitypub/models/ApMentionService.ts
+++ b/packages/backend/src/core/activitypub/models/ApMentionService.ts
@@ -22,8 +22,8 @@ export class ApMentionService {
 	}
 
 	@bindThis
-	public async extractApMentions(tags: IObject | IObject[] | null | undefined, resolver: Resolver) {
-		const hrefs = unique(this.extractApMentionObjects(tags).map(x => x.href as string));
+	public async extractApMentions(tags: IObject | IObject[] | null | undefined, resolver: Resolver): Promise<User[]> {
+		const hrefs = unique(this.extractApMentionObjects(tags).map(x => x.href));
 
 		const limit = promiseLimit<User | null>(2);
 		const mentionedUsers = (await Promise.all(
diff --git a/packages/backend/src/core/activitypub/models/ApNoteService.ts b/packages/backend/src/core/activitypub/models/ApNoteService.ts
index 60a3e5680..35865a819 100644
--- a/packages/backend/src/core/activitypub/models/ApNoteService.ts
+++ b/packages/backend/src/core/activitypub/models/ApNoteService.ts
@@ -20,7 +20,6 @@ import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
 import { checkHttps } from '@/misc/check-https.js';
 import { getOneApId, getApId, getOneApHrefNullable, validPost, isEmoji, getApType } from '../type.js';
-// eslint-disable-next-line @typescript-eslint/consistent-type-imports
 import { ApLoggerService } from '../ApLoggerService.js';
 import { ApMfmService } from '../ApMfmService.js';
 import { ApDbResolverService } from '../ApDbResolverService.js';
@@ -72,13 +71,9 @@ export class ApNoteService {
 	}
 
 	@bindThis
-	public validateNote(object: IObject, uri: string) {
+	public validateNote(object: IObject, uri: string): Error | null {
 		const expectHost = this.utilityService.extractDbHost(uri);
 
-		if (object == null) {
-			return new Error('invalid Note: object is null');
-		}
-
 		if (!validPost.includes(getApType(object))) {
 			return new Error(`invalid Note: invalid object type ${getApType(object)}`);
 		}
@@ -110,6 +105,7 @@ export class ApNoteService {
 	 */
 	@bindThis
 	public async createNote(value: string | IObject, resolver?: Resolver, silent = false): Promise<Note | null> {
+		// eslint-disable-next-line no-param-reassign
 		if (resolver == null) resolver = this.apResolverService.createResolver();
 
 		const object = await resolver.resolve(value);
@@ -117,12 +113,10 @@ export class ApNoteService {
 		const entryUri = getApId(value);
 		const err = this.validateNote(object, entryUri);
 		if (err) {
-			this.logger.error(`${err.message}`, {
-				resolver: {
-					history: resolver.getHistory(),
-				},
-				value: value,
-				object: object,
+			this.logger.error(err.message, {
+				resolver: { history: resolver.getHistory() },
+				value,
+				object,
 			});
 			throw new Error('invalid note');
 		}
@@ -144,7 +138,11 @@ export class ApNoteService {
 		this.logger.info(`Creating the Note: ${note.id}`);
 
 		// 投稿者をフェッチ
-		const actor = await this.apPersonService.resolvePerson(getOneApId(note.attributedTo!), resolver) as RemoteUser;
+		if (note.attributedTo == null) {
+			throw new Error('invalid note.attributedTo: ' + note.attributedTo);
+		}
+
+		const actor = await this.apPersonService.resolvePerson(getOneApId(note.attributedTo), resolver) as RemoteUser;
 
 		// 投稿者が凍結されていたらスキップ
 		if (actor.isSuspended) {
@@ -164,59 +162,49 @@ export class ApNoteService {
 		}
 
 		const apMentions = await this.apMentionService.extractApMentions(note.tag, resolver);
-		const apHashtags = await extractApHashtags(note.tag);
+		const apHashtags = extractApHashtags(note.tag);
 
 		// 添付ファイル
 		// TODO: attachmentは必ずしもImageではない
 		// TODO: attachmentは必ずしも配列ではない
-		// Noteがsensitiveなら添付もsensitiveにする
-		const limit = promiseLimit(2);
-
-		note.attachment = Array.isArray(note.attachment) ? note.attachment : note.attachment ? [note.attachment] : [];
-		const files = note.attachment
-			.map(attach => attach.sensitive = note.sensitive)
-			? (await Promise.all(note.attachment.map(x => limit(() => this.apImageService.resolveImage(actor, x)) as Promise<DriveFile>)))
-				.filter(image => image != null)
-			: [];
+		const limit = promiseLimit<DriveFile>(2);
+		const files = (await Promise.all(toArray(note.attachment).map(attach => (
+			limit(() => this.apImageService.resolveImage(actor, {
+				...attach,
+				sensitive: note.sensitive, // Noteがsensitiveなら添付もsensitiveにする
+			}))
+		))));
 
 		// リプライ
 		const reply: Note | null = note.inReplyTo
-			? await this.resolveNote(note.inReplyTo, resolver).then(x => {
-				if (x == null) {
-					this.logger.warn('Specified inReplyTo, but not found');
-					throw new Error('inReplyTo not found');
-				} else {
+			? await this.resolveNote(note.inReplyTo, resolver)
+				.then(x => {
+					if (x == null) {
+						this.logger.warn('Specified inReplyTo, but not found');
+						throw new Error('inReplyTo not found');
+					}
+
 					return x;
-				}
-			}).catch(async err => {
-				this.logger.warn(`Error in inReplyTo ${note.inReplyTo} - ${err.statusCode ?? err}`);
-				throw err;
-			})
+				})
+				.catch(async err => {
+					this.logger.warn(`Error in inReplyTo ${note.inReplyTo} - ${err.statusCode ?? err}`);
+					throw err;
+				})
 			: null;
 
 		// 引用
-		let quote: Note | undefined | null;
+		let quote: Note | undefined | null = null;
 
 		if (note._misskey_quote || note.quoteUrl) {
-			const tryResolveNote = async (uri: string): Promise<{
-				status: 'ok';
-				res: Note | null;
-			} | {
-				status: 'permerror' | 'temperror';
-			}> => {
-				if (typeof uri !== 'string' || !uri.match(/^https?:/)) return { status: 'permerror' };
+			const tryResolveNote = async (uri: string): Promise<
+				| { status: 'ok'; res: Note }
+				| { status: 'permerror' | 'temperror' }
+			> => {
+				if (!uri.match(/^https?:/)) return { status: 'permerror' };
 				try {
 					const res = await this.resolveNote(uri);
-					if (res) {
-						return {
-							status: 'ok',
-							res,
-						};
-					} else {
-						return {
-							status: 'permerror',
-						};
-					}
+					if (res == null) return { status: 'permerror' };
+					return { status: 'ok', res };
 				} catch (e) {
 					return {
 						status: (e instanceof StatusError && e.isClientError) ? 'permerror' : 'temperror',
@@ -225,9 +213,9 @@ export class ApNoteService {
 			};
 
 			const uris = unique([note._misskey_quote, note.quoteUrl].filter((x): x is string => typeof x === 'string'));
-			const results = await Promise.all(uris.map(uri => tryResolveNote(uri)));
+			const results = await Promise.all(uris.map(tryResolveNote));
 
-			quote = results.filter((x): x is { status: 'ok', res: Note | null } => x.status === 'ok').map(x => x.res).find(x => x);
+			quote = results.filter((x): x is { status: 'ok', res: Note } => x.status === 'ok').map(x => x.res).at(0);
 			if (!quote) {
 				if (results.some(x => x.status === 'temperror')) {
 					throw new Error('quote resolve failed');
@@ -271,7 +259,7 @@ export class ApNoteService {
 
 		const emojis = await this.extractEmojis(note.tag ?? [], actor.host).catch(e => {
 			this.logger.info(`extractEmojis: ${e}`);
-			return [] as Emoji[];
+			return [];
 		});
 
 		const apEmojis = emojis.map(emoji => emoji.name);
@@ -309,19 +297,18 @@ export class ApNoteService {
 		const uri = typeof value === 'string' ? value : value.id;
 		if (uri == null) throw new Error('missing uri');
 
-		// ブロックしてたら中断
+		// ブロックしていたら中断
 		const meta = await this.metaService.fetch();
-		if (this.utilityService.isBlockedHost(meta.blockedHosts, this.utilityService.extractDbHost(uri))) throw new StatusError('blocked host', 451);
+		if (this.utilityService.isBlockedHost(meta.blockedHosts, this.utilityService.extractDbHost(uri))) {
+			throw new StatusError('blocked host', 451);
+		}
 
 		const unlock = await this.appLockService.getApLock(uri);
 
 		try {
 			//#region このサーバーに既に登録されていたらそれを返す
 			const exist = await this.fetchNote(uri);
-
-			if (exist) {
-				return exist;
-			}
+			if (exist) return exist;
 			//#endregion
 
 			if (uri.startsWith(this.config.url)) {
@@ -339,43 +326,41 @@ export class ApNoteService {
 
 	@bindThis
 	public async extractEmojis(tags: IObject | IObject[], host: string): Promise<Emoji[]> {
+		// eslint-disable-next-line no-param-reassign
 		host = this.utilityService.toPuny(host);
 
-		if (!tags) return [];
-
 		const eomjiTags = toArray(tags).filter(isEmoji);
 
 		const existingEmojis = await this.emojisRepository.findBy({
 			host,
-			name: In(eomjiTags.map(tag => tag.name!.replaceAll(':', ''))),
+			name: In(eomjiTags.map(tag => tag.name.replaceAll(':', ''))),
 		});
 
 		return await Promise.all(eomjiTags.map(async tag => {
-			const name = tag.name!.replaceAll(':', '');
+			const name = tag.name.replaceAll(':', '');
 			tag.icon = toSingle(tag.icon);
 
 			const exists = existingEmojis.find(x => x.name === name);
 
 			if (exists) {
-				if ((tag.updated != null && exists.updatedAt == null)
+				if ((exists.updatedAt == null)
 					|| (tag.id != null && exists.uri == null)
-					|| (tag.updated != null && exists.updatedAt != null && new Date(tag.updated) > exists.updatedAt)
-					|| (tag.icon!.url !== exists.originalUrl)
+					|| (new Date(tag.updated) > exists.updatedAt)
+					|| (tag.icon.url !== exists.originalUrl)
 				) {
 					await this.emojisRepository.update({
 						host,
 						name,
 					}, {
 						uri: tag.id,
-						originalUrl: tag.icon!.url,
-						publicUrl: tag.icon!.url,
+						originalUrl: tag.icon.url,
+						publicUrl: tag.icon.url,
 						updatedAt: new Date(),
 					});
 
-					return await this.emojisRepository.findOneBy({
-						host,
-						name,
-					}) as Emoji;
+					const emoji = await this.emojisRepository.findOneBy({ host, name });
+					if (emoji == null) throw new Error('emoji update failed');
+					return emoji;
 				}
 
 				return exists;
@@ -388,11 +373,11 @@ export class ApNoteService {
 				host,
 				name,
 				uri: tag.id,
-				originalUrl: tag.icon!.url,
-				publicUrl: tag.icon!.url,
+				originalUrl: tag.icon.url,
+				publicUrl: tag.icon.url,
 				updatedAt: new Date(),
 				aliases: [],
-			} as Partial<Emoji>).then(x => this.emojisRepository.findOneByOrFail(x.identifiers[0]));
+			}).then(x => this.emojisRepository.findOneByOrFail(x.identifiers[0]));
 		}));
 	}
 }
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index afe89e5a1..e8b65b3d4 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -3,7 +3,7 @@ import promiseLimit from 'promise-limit';
 import { DataSource } from 'typeorm';
 import { ModuleRef } from '@nestjs/core';
 import { DI } from '@/di-symbols.js';
-import type { BlockingsRepository, MutingsRepository, FollowingsRepository, InstancesRepository, UserProfilesRepository, UserPublickeysRepository, UsersRepository } from '@/models/index.js';
+import type { FollowingsRepository, InstancesRepository, UserProfilesRepository, UserPublickeysRepository, UsersRepository } from '@/models/index.js';
 import type { Config } from '@/config.js';
 import type { LocalUser, RemoteUser } from '@/models/entities/User.js';
 import { User } from '@/models/entities/User.js';
@@ -15,7 +15,6 @@ import type Logger from '@/logger.js';
 import type { Note } from '@/models/entities/Note.js';
 import type { IdService } from '@/core/IdService.js';
 import type { MfmService } from '@/core/MfmService.js';
-import type { Emoji } from '@/models/entities/Emoji.js';
 import { toArray } from '@/misc/prelude/array.js';
 import type { GlobalEventService } from '@/core/GlobalEventService.js';
 import type { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
@@ -48,6 +47,8 @@ import type { IActor, IObject } from '../type.js';
 const nameLength = 128;
 const summaryLength = 2048;
 
+type Field = Record<'name' | 'value', string>;
+
 @Injectable()
 export class ApPersonService implements OnModuleInit {
 	private utilityService: UtilityService;
@@ -94,28 +95,10 @@ export class ApPersonService implements OnModuleInit {
 
 		@Inject(DI.followingsRepository)
 		private followingsRepository: FollowingsRepository,
-
-		//private utilityService: UtilityService,
-		//private userEntityService: UserEntityService,
-		//private idService: IdService,
-		//private globalEventService: GlobalEventService,
-		//private metaService: MetaService,
-		//private federatedInstanceService: FederatedInstanceService,
-		//private fetchInstanceMetadataService: FetchInstanceMetadataService,
-		//private cacheService: CacheService,
-		//private apResolverService: ApResolverService,
-		//private apNoteService: ApNoteService,
-		//private apImageService: ApImageService,
-		//private apMfmService: ApMfmService,
-		//private mfmService: MfmService,
-		//private hashtagService: HashtagService,
-		//private usersChart: UsersChart,
-		//private instanceChart: InstanceChart,
-		//private apLoggerService: ApLoggerService,
 	) {
 	}
 
-	onModuleInit() {
+	onModuleInit(): void {
 		this.utilityService = this.moduleRef.get('UtilityService');
 		this.userEntityService = this.moduleRef.get('UserEntityService');
 		this.driveFileEntityService = this.moduleRef.get('DriveFileEntityService');
@@ -153,10 +136,6 @@ export class ApPersonService implements OnModuleInit {
 	private validateActor(x: IObject, uri: string): IActor {
 		const expectHost = this.punyHost(uri);
 
-		if (x == null) {
-			throw new Error('invalid Actor: object is null');
-		}
-
 		if (!isActor(x)) {
 			throw new Error(`invalid Actor type '${x.type}'`);
 		}
@@ -218,21 +197,19 @@ export class ApPersonService implements OnModuleInit {
 	 */
 	@bindThis
 	public async fetchPerson(uri: string): Promise<LocalUser | RemoteUser | null> {
-		if (typeof uri !== 'string') throw new Error('uri is not string');
-
-		const cached = this.cacheService.uriPersonCache.get(uri) as LocalUser | RemoteUser | null;
+		const cached = this.cacheService.uriPersonCache.get(uri) as LocalUser | RemoteUser | null | undefined;
 		if (cached) return cached;
 
 		// URIがこのサーバーを指しているならデータベースからフェッチ
 		if (uri.startsWith(`${this.config.url}/`)) {
 			const id = uri.split('/').pop();
-			const u = await this.usersRepository.findOneBy({ id }) as LocalUser;
+			const u = await this.usersRepository.findOneBy({ id }) as LocalUser | null;
 			if (u) this.cacheService.uriPersonCache.set(uri, u);
 			return u;
 		}
 
 		//#region このサーバーに既に登録されていたらそれを返す
-		const exist = await this.usersRepository.findOneBy({ uri }) as LocalUser | RemoteUser;
+		const exist = await this.usersRepository.findOneBy({ uri }) as LocalUser | RemoteUser | null;
 
 		if (exist) {
 			this.cacheService.uriPersonCache.set(uri, exist);
@@ -254,9 +231,11 @@ export class ApPersonService implements OnModuleInit {
 			throw new StatusError('cannot resolve local user', 400, 'cannot resolve local user');
 		}
 
+		// eslint-disable-next-line no-param-reassign
 		if (resolver == null) resolver = this.apResolverService.createResolver();
 
-		const object = await resolver.resolve(uri) as any;
+		const object = await resolver.resolve(uri);
+		if (object.id == null) throw new Error('invalid object.id: ' + object.id);
 
 		const person = this.validateActor(object, uri);
 
@@ -264,9 +243,9 @@ export class ApPersonService implements OnModuleInit {
 
 		const host = this.punyHost(object.id);
 
-		const { fields } = this.analyzeAttachments(person.attachment ?? []);
+		const fields = this.analyzeAttachments(person.attachment ?? []);
 
-		const tags = extractApHashtags(person.tag).map(tag => normalizeForSearch(tag)).splice(0, 32);
+		const tags = extractApHashtags(person.tag).map(normalizeForSearch).splice(0, 32);
 
 		const isBot = getApType(object) === 'Service';
 
@@ -279,7 +258,7 @@ export class ApPersonService implements OnModuleInit {
 		}
 
 		// Create user
-		let user: RemoteUser;
+		let user: RemoteUser | null = null;
 		try {
 		// Start transaction
 			await this.db.transaction(async transactionalEntityManager => {
@@ -290,16 +269,16 @@ export class ApPersonService implements OnModuleInit {
 					createdAt: new Date(),
 					lastFetchedAt: new Date(),
 					name: truncate(person.name, nameLength),
-					isLocked: !!person.manuallyApprovesFollowers,
+					isLocked: person.manuallyApprovesFollowers,
 					movedToUri: person.movedTo,
 					movedAt: person.movedTo ? new Date() : null,
 					alsoKnownAs: person.alsoKnownAs,
-					isExplorable: !!person.discoverable,
+					isExplorable: person.discoverable,
 					username: person.preferredUsername,
-					usernameLower: person.preferredUsername!.toLowerCase(),
+					usernameLower: person.preferredUsername?.toLowerCase(),
 					host,
 					inbox: person.inbox,
-					sharedInbox: person.sharedInbox ?? (person.endpoints ? person.endpoints.sharedInbox : undefined),
+					sharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox,
 					followersUri: person.followers ? getApId(person.followers) : undefined,
 					featured: person.featured ? getApId(person.featured) : undefined,
 					uri: person.id,
@@ -311,9 +290,9 @@ export class ApPersonService implements OnModuleInit {
 				await transactionalEntityManager.save(new UserProfile({
 					userId: user.id,
 					description: person.summary ? this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag) : null,
-					url: url,
+					url,
 					fields,
-					birthday: bday ? bday[0] : null,
+					birthday: bday?.[0] ?? null,
 					location: person['vcard:Address'] ?? null,
 					userHost: host,
 				}));
@@ -330,21 +309,18 @@ export class ApPersonService implements OnModuleInit {
 		// duplicate key error
 			if (isDuplicateKeyValueError(e)) {
 			// /users/@a => /users/:id のように入力がaliasなときにエラーになることがあるのを対応
-				const u = await this.usersRepository.findOneBy({
-					uri: person.id,
-				});
+				const u = await this.usersRepository.findOneBy({ uri: person.id });
+				if (u == null) throw new Error('already registered');
 
-				if (u) {
-					user = u as RemoteUser;
-				} else {
-					throw new Error('already registered');
-				}
+				user = u as RemoteUser;
 			} else {
 				this.logger.error(e instanceof Error ? e : new Error(e as string));
 				throw e;
 			}
 		}
 
+		if (user == null) throw new Error('failed to create user: user is null');
+
 		// Register host
 		this.federatedInstanceService.fetch(host).then(async i => {
 			this.instancesRepository.increment({ id: i.id }, 'usersCount', 1);
@@ -354,29 +330,26 @@ export class ApPersonService implements OnModuleInit {
 			}
 		});
 
-		this.usersChart.update(user!, true);
+		this.usersChart.update(user, true);
 
 		// ハッシュタグ更新
-		this.hashtagService.updateUsertags(user!, tags);
+		this.hashtagService.updateUsertags(user, tags);
 
 		//#region アバターとヘッダー画像をフェッチ
-		const [avatar, banner] = await Promise.all([
-			person.icon,
-			person.image,
-		].map(img =>
-			img == null
-				? Promise.resolve(null)
-				: this.apImageService.resolveImage(user!, img).catch(() => null),
-		));
+		const [avatar, banner] = await Promise.all([person.icon, person.image].map(img => {
+			if (img == null) return null;
+			if (user == null) throw new Error('failed to create user: user is null');
+			return this.apImageService.resolveImage(user, img).catch(() => null);
+		}));
 
-		const avatarId = avatar ? avatar.id : null;
-		const bannerId = banner ? banner.id : null;
+		const avatarId = avatar?.id ?? null;
+		const bannerId = banner?.id ?? null;
 		const avatarUrl = avatar ? this.driveFileEntityService.getPublicUrl(avatar, 'avatar') : null;
 		const bannerUrl = banner ? this.driveFileEntityService.getPublicUrl(banner) : null;
-		const avatarBlurhash = avatar ? avatar.blurhash : null;
-		const bannerBlurhash = banner ? banner.blurhash : null;
+		const avatarBlurhash = avatar?.blurhash ?? null;
+		const bannerBlurhash = banner?.blurhash ?? null;
 
-		await this.usersRepository.update(user!.id, {
+		await this.usersRepository.update(user.id, {
 			avatarId,
 			bannerId,
 			avatarUrl,
@@ -385,30 +358,28 @@ export class ApPersonService implements OnModuleInit {
 			bannerBlurhash,
 		});
 
-		user!.avatarId = avatarId;
-		user!.bannerId = bannerId;
-		user!.avatarUrl = avatarUrl;
-		user!.bannerUrl = bannerUrl;
-		user!.avatarBlurhash = avatarBlurhash;
-		user!.bannerBlurhash = bannerBlurhash;
+		user.avatarId = avatarId;
+		user.bannerId = bannerId;
+		user.avatarUrl = avatarUrl;
+		user.bannerUrl = bannerUrl;
+		user.avatarBlurhash = avatarBlurhash;
+		user.bannerBlurhash = bannerBlurhash;
 		//#endregion
 
 		//#region カスタム絵文字取得
 		const emojis = await this.apNoteService.extractEmojis(person.tag ?? [], host).catch(err => {
 			this.logger.info(`extractEmojis: ${err}`);
-			return [] as Emoji[];
+			return [];
 		});
 
 		const emojiNames = emojis.map(emoji => emoji.name);
 
-		await this.usersRepository.update(user!.id, {
-			emojis: emojiNames,
-		});
+		await this.usersRepository.update(user.id, { emojis: emojiNames });
 		//#endregion
 
-		await this.updateFeatured(user!.id, resolver).catch(err => this.logger.error(err));
+		await this.updateFeatured(user.id, resolver).catch(err => this.logger.error(err));
 
-		return user!;
+		return user;
 	}
 
 	/**
@@ -426,18 +397,14 @@ export class ApPersonService implements OnModuleInit {
 		if (typeof uri !== 'string') throw new Error('uri is not string');
 
 		// URIがこのサーバーを指しているならスキップ
-		if (uri.startsWith(`${this.config.url}/`)) {
-			return;
-		}
+		if (uri.startsWith(`${this.config.url}/`)) return;
 
 		//#region このサーバーに既に登録されているか
 		const exist = await this.usersRepository.findOneBy({ uri }) as RemoteUser | null;
-
-		if (exist === null) {
-			return;
-		}
+		if (exist === null) return;
 		//#endregion
 
+		// eslint-disable-next-line no-param-reassign
 		if (resolver == null) resolver = this.apResolverService.createResolver();
 
 		const object = hint ?? await resolver.resolve(uri);
@@ -447,26 +414,22 @@ export class ApPersonService implements OnModuleInit {
 		this.logger.info(`Updating the Person: ${person.id}`);
 
 		// アバターとヘッダー画像をフェッチ
-		const [avatar, banner] = await Promise.all([
-			person.icon,
-			person.image,
-		].map(img =>
-			img == null
-				? Promise.resolve(null)
-				: this.apImageService.resolveImage(exist, img).catch(() => null),
-		));
+		const [avatar, banner] = await Promise.all([person.icon, person.image].map(img => {
+			if (img == null) return null;
+			return this.apImageService.resolveImage(exist, img).catch(() => null);
+		}));
 
 		// カスタム絵文字取得
 		const emojis = await this.apNoteService.extractEmojis(person.tag ?? [], exist.host).catch(e => {
 			this.logger.info(`extractEmojis: ${e}`);
-			return [] as Emoji[];
+			return [];
 		});
 
 		const emojiNames = emojis.map(emoji => emoji.name);
 
-		const { fields } = this.analyzeAttachments(person.attachment ?? []);
+		const fields = this.analyzeAttachments(person.attachment ?? []);
 
-		const tags = extractApHashtags(person.tag).map(tag => normalizeForSearch(tag)).splice(0, 32);
+		const tags = extractApHashtags(person.tag).map(normalizeForSearch).splice(0, 32);
 
 		const bday = person['vcard:bday']?.match(/^\d{4}-\d{2}-\d{2}/);
 
@@ -479,7 +442,7 @@ export class ApPersonService implements OnModuleInit {
 		const updates = {
 			lastFetchedAt: new Date(),
 			inbox: person.inbox,
-			sharedInbox: person.sharedInbox ?? (person.endpoints ? person.endpoints.sharedInbox : undefined),
+			sharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox,
 			followersUri: person.followers ? getApId(person.followers) : undefined,
 			featured: person.featured,
 			emojis: emojiNames,
@@ -487,18 +450,29 @@ export class ApPersonService implements OnModuleInit {
 			tags,
 			isBot: getApType(object) === 'Service',
 			isCat: (person as any).isCat === true,
-			isLocked: !!person.manuallyApprovesFollowers,
+			isLocked: person.manuallyApprovesFollowers,
 			movedToUri: person.movedTo ?? null,
 			alsoKnownAs: person.alsoKnownAs ?? null,
-			isExplorable: !!person.discoverable,
+			isExplorable: person.discoverable,
 		} as Partial<RemoteUser> & Pick<RemoteUser, 'isBot' | 'isCat' | 'isLocked' | 'movedToUri' | 'alsoKnownAs' | 'isExplorable'>;
 
-		const moving =
+		const moving = ((): boolean => {
 			// 移行先がない→ある
-			(!exist.movedToUri && updates.movedToUri) ||
+			if (
+				exist.movedToUri === null &&
+				updates.movedToUri
+			) return true;
+
 			// 移行先がある→別のもの
-			(exist.movedToUri !== updates.movedToUri && exist.movedToUri && updates.movedToUri);
+			if (
+				exist.movedToUri !== null &&
+				updates.movedToUri !== null &&
+				exist.movedToUri !== updates.movedToUri
+			) return true;
+
 			// 移行先がある→ない、ない→ないは無視
+			return false;
+		})();
 
 		if (moving) updates.movedAt = new Date();
 
@@ -525,10 +499,10 @@ export class ApPersonService implements OnModuleInit {
 		}
 
 		await this.userProfilesRepository.update({ userId: exist.id }, {
-			url: url,
+			url,
 			fields,
 			description: person.summary ? this.apMfmService.htmlToMfm(truncate(person.summary, summaryLength), person.tag) : null,
-			birthday: bday ? bday[0] : null,
+			birthday: bday?.[0] ?? null,
 			location: person['vcard:Address'] ?? null,
 		});
 
@@ -538,11 +512,10 @@ export class ApPersonService implements OnModuleInit {
 		this.hashtagService.updateUsertags(exist, tags);
 
 		// 該当ユーザーが既にフォロワーになっていた場合はFollowingもアップデートする
-		await this.followingsRepository.update({
-			followerId: exist.id,
-		}, {
-			followerSharedInbox: person.sharedInbox ?? (person.endpoints ? person.endpoints.sharedInbox : undefined),
-		});
+		await this.followingsRepository.update(
+			{ followerId: exist.id },
+			{ followerSharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox },
+		);
 
 		await this.updateFeatured(exist.id, resolver).catch(err => this.logger.error(err));
 
@@ -580,27 +553,22 @@ export class ApPersonService implements OnModuleInit {
 	 */
 	@bindThis
 	public async resolvePerson(uri: string, resolver?: Resolver): Promise<LocalUser | RemoteUser> {
-		if (typeof uri !== 'string') throw new Error('uri is not string');
-
 		//#region このサーバーに既に登録されていたらそれを返す
 		const exist = await this.fetchPerson(uri);
-
-		if (exist) {
-			return exist;
-		}
+		if (exist) return exist;
 		//#endregion
 
 		// リモートサーバーからフェッチしてきて登録
+		// eslint-disable-next-line no-param-reassign
 		if (resolver == null) resolver = this.apResolverService.createResolver();
 		return await this.createPerson(uri, resolver);
 	}
 
 	@bindThis
-	public analyzeAttachments(attachments: IObject | IObject[] | undefined) {
-		const fields: {
-		name: string,
-		value: string
-	}[] = [];
+	// TODO: `attachments`が`IObject`だった場合、返り値が`[]`になるようだが構わないのか？
+	public analyzeAttachments(attachments: IObject | IObject[] | undefined): Field[] {
+		const fields: Field[] = [];
+
 		if (Array.isArray(attachments)) {
 			for (const attachment of attachments.filter(isPropertyValue)) {
 				fields.push({
@@ -610,11 +578,11 @@ export class ApPersonService implements OnModuleInit {
 			}
 		}
 
-		return { fields };
+		return fields;
 	}
 
 	@bindThis
-	public async updateFeatured(userId: User['id'], resolver?: Resolver) {
+	public async updateFeatured(userId: User['id'], resolver?: Resolver): Promise<void> {
 		const user = await this.usersRepository.findOneByOrFail({ id: userId });
 		if (!this.userEntityService.isRemoteUser(user)) return;
 		if (!user.featured) return;
@@ -643,13 +611,13 @@ export class ApPersonService implements OnModuleInit {
 
 			// とりあえずidを別の時間で生成して順番を維持
 			let td = 0;
-			for (const note of featuredNotes.filter(note => note != null)) {
+			for (const note of featuredNotes.filter((note): note is Note => note != null)) {
 				td -= 1000;
 				transactionalEntityManager.insert(UserNotePining, {
 					id: this.idService.genId(new Date(Date.now() + td)),
 					createdAt: new Date(),
 					userId: user.id,
-					noteId: note!.id,
+					noteId: note.id,
 				});
 			}
 		});
diff --git a/packages/backend/src/core/activitypub/models/ApQuestionService.ts b/packages/backend/src/core/activitypub/models/ApQuestionService.ts
index 13a2f0fa5..229a44f90 100644
--- a/packages/backend/src/core/activitypub/models/ApQuestionService.ts
+++ b/packages/backend/src/core/activitypub/models/ApQuestionService.ts
@@ -4,12 +4,12 @@ import type { NotesRepository, PollsRepository } from '@/models/index.js';
 import type { Config } from '@/config.js';
 import type { IPoll } from '@/models/entities/Poll.js';
 import type Logger from '@/logger.js';
+import { bindThis } from '@/decorators.js';
 import { isQuestion } from '../type.js';
 import { ApLoggerService } from '../ApLoggerService.js';
 import { ApResolverService } from '../ApResolverService.js';
 import type { Resolver } from '../ApResolverService.js';
 import type { IObject, IQuestion } from '../type.js';
-import { bindThis } from '@/decorators.js';
 
 @Injectable()
 export class ApQuestionService {
@@ -33,33 +33,25 @@ export class ApQuestionService {
 
 	@bindThis
 	public async extractPollFromQuestion(source: string | IObject, resolver?: Resolver): Promise<IPoll> {
+		// eslint-disable-next-line no-param-reassign
 		if (resolver == null) resolver = this.apResolverService.createResolver();
 
 		const question = await resolver.resolve(source);
+		if (!isQuestion(question)) throw new Error('invalid type');
 
-		if (!isQuestion(question)) {
-			throw new Error('invalid type');
-		}
+		const multiple = question.oneOf === undefined;
+		if (multiple && question.anyOf === undefined) throw new Error('invalid question');
 
-		const multiple = !question.oneOf;
 		const expiresAt = question.endTime ? new Date(question.endTime) : question.closed ? new Date(question.closed) : null;
 
-		if (multiple && !question.anyOf) {
-			throw new Error('invalid question');
-		}
+		const choices = question[multiple ? 'anyOf' : 'oneOf']
+			?.map((x) => x.name)
+			.filter((x): x is string => typeof x === 'string')
+			?? [];
 
-		const choices = question[multiple ? 'anyOf' : 'oneOf']!
-			.map((x, i) => x.name!);
+		const votes = question[multiple ? 'anyOf' : 'oneOf']?.map((x) => x.replies?.totalItems ?? x._misskey_votes ?? 0);
 
-		const votes = question[multiple ? 'anyOf' : 'oneOf']!
-			.map((x, i) => x.replies && x.replies.totalItems || x._misskey_votes || 0);
-
-		return {
-			choices,
-			votes,
-			multiple,
-			expiresAt,
-		};
+		return { choices, votes, multiple, expiresAt };
 	}
 
 	/**
@@ -68,8 +60,9 @@ export class ApQuestionService {
 	 * @returns true if updated
 	 */
 	@bindThis
-	public async updateQuestion(value: any, resolver?: Resolver) {
+	public async updateQuestion(value: string | IObject, resolver?: Resolver): Promise<boolean> {
 		const uri = typeof value === 'string' ? value : value.id;
+		if (uri == null) throw new Error('uri is null');
 
 		// URIがこのサーバーを指しているならスキップ
 		if (uri.startsWith(this.config.url + '/')) throw new Error('uri points local');
@@ -83,6 +76,7 @@ export class ApQuestionService {
 		//#endregion
 
 		// resolve new Question object
+		// eslint-disable-next-line no-param-reassign
 		if (resolver == null) resolver = this.apResolverService.createResolver();
 		const question = await resolver.resolve(value) as IQuestion;
 		this.logger.debug(`fetched question: ${JSON.stringify(question, null, 2)}`);
@@ -90,12 +84,14 @@ export class ApQuestionService {
 		if (question.type !== 'Question') throw new Error('object is not a Question');
 
 		const apChoices = question.oneOf ?? question.anyOf;
+		if (apChoices == null) throw new Error('invalid apChoices: ' + apChoices);
 
 		let changed = false;
 
 		for (const choice of poll.choices) {
 			const oldCount = poll.votes[poll.choices.indexOf(choice)];
-			const newCount = apChoices!.filter(ap => ap.name === choice)[0].replies!.totalItems;
+			const newCount = apChoices.filter(ap => ap.name === choice).at(0)?.replies?.totalItems;
+			if (newCount == null) throw new Error('invalid newCount: ' + newCount);
 
 			if (oldCount !== newCount) {
 				changed = true;
@@ -103,9 +99,7 @@ export class ApQuestionService {
 			}
 		}
 
-		await this.pollsRepository.update({ noteId: note.id }, {
-			votes: poll.votes,
-		});
+		await this.pollsRepository.update({ noteId: note.id }, { votes: poll.votes });
 
 		return changed;
 	}
diff --git a/packages/backend/src/core/activitypub/models/tag.ts b/packages/backend/src/core/activitypub/models/tag.ts
index 803846a0b..9aeb84356 100644
--- a/packages/backend/src/core/activitypub/models/tag.ts
+++ b/packages/backend/src/core/activitypub/models/tag.ts
@@ -2,7 +2,7 @@ import { toArray } from '@/misc/prelude/array.js';
 import { isHashtag } from '../type.js';
 import type { IObject, IApHashtag } from '../type.js';
 
-export function extractApHashtags(tags: IObject | IObject[] | null | undefined) {
+export function extractApHashtags(tags: IObject | IObject[] | null | undefined): string[] {
 	if (tags == null) return [];
 
 	const hashtags = extractApHashtagObjects(tags);
diff --git a/packages/backend/src/misc/check-https.ts b/packages/backend/src/misc/check-https.ts
index b33f01997..612032fe9 100644
--- a/packages/backend/src/misc/check-https.ts
+++ b/packages/backend/src/misc/check-https.ts
@@ -1,4 +1,4 @@
-export function checkHttps(url: string) {
-    return url.startsWith('https://') ||
-        (url.startsWith('http://') && process.env.NODE_ENV !== 'production');
+export function checkHttps(url: string): boolean {
+	return url.startsWith('https://') ||
+		(url.startsWith('http://') && process.env.NODE_ENV !== 'production');
 }

From 8ec96ad1e0860b6f673de6a2bd4cad88dfaae4e2 Mon Sep 17 00:00:00 2001
From: CyberRex <hspwinx86@gmail.com>
Date: Sat, 8 Jul 2023 08:57:23 +0900
Subject: [PATCH 13/31] =?UTF-8?q?fix(backend):=20=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=96=E3=82=AD=E3=83=A5=E3=83=BC=E5=86=8D=E8=A9=A6=E8=A1=8C?=
 =?UTF-8?q?=E6=99=82=E3=81=AE=E3=82=BF=E3=82=A4=E3=83=9F=E3=83=B3=E3=82=B0?=
 =?UTF-8?q?=E3=81=9A=E3=82=8C=E3=81=AB=E3=82=88=E3=82=8B=E3=82=A8=E3=83=A9?=
 =?UTF-8?q?=E3=83=BC=E3=82=92=E6=8A=91=E5=88=B6=20(#11035)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(backend): ジョブキュー再試行時のタイミングずれによるエラーを抑制

* fix lint
---
 .../api/endpoints/admin/queue/promote.ts      | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/admin/queue/promote.ts b/packages/backend/src/server/api/endpoints/admin/queue/promote.ts
index 9140f392c..8330d6c82 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/promote.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/promote.ts
@@ -33,7 +33,17 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 					delayedQueues = await this.queueService.deliverQueue.getDelayed();
 					for (let queueIndex = 0; queueIndex < delayedQueues.length; queueIndex++) {
 						const queue = delayedQueues[queueIndex];
-						await queue.promote();
+						try {
+							await queue.promote();
+						} catch (e) {
+							if (e instanceof Error) {
+								if (e.message.indexOf('not in a delayed state') !== -1) {
+									throw e;
+								}
+							} else {
+								throw e;
+							}
+						}
 					}
 					break;
 
@@ -41,7 +51,17 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 					delayedQueues = await this.queueService.inboxQueue.getDelayed();
 					for (let queueIndex = 0; queueIndex < delayedQueues.length; queueIndex++) {
 						const queue = delayedQueues[queueIndex];
-						await queue.promote();
+						try {
+							await queue.promote();
+						} catch (e) {
+							if (e instanceof Error) {
+								if (e.message.indexOf('not in a delayed state') !== -1) {
+									throw e;
+								}
+							} else {
+								throw e;
+							}
+						}
 					}
 					break;
 			}

From bd843863d029b72b4a9c0b97ee7296e4e60ad8d6 Mon Sep 17 00:00:00 2001
From: Chocolate Pie <106949016+chocolate-pie@users.noreply.github.com>
Date: Sat, 8 Jul 2023 08:58:35 +0900
Subject: [PATCH 14/31] =?UTF-8?q?fix:=20=E9=9D=9E=E3=83=AD=E3=82=B0?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E6=99=82=E3=81=AB=E3=82=AF=E3=83=AC=E3=83=87?=
 =?UTF-8?q?=E3=83=B3=E3=82=B7=E3=83=A3=E3=83=AB=E3=81=8C=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E3=81=AA=E3=83=9A=E3=83=BC=E3=82=B8=E3=81=AB=E8=A1=8C=E3=81=8F?=
 =?UTF-8?q?=E3=81=A8=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C=E5=87=BA=E3=82=8B?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3=20(#10973)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 非ログイン時にクレデンシャルが必要なページに行くとエラーが出る問題を修正 (misskey-dev/misskey#10922)

* Update CHANGELOG.md

* fix

* Update CHANGELOG.md

* Update CHANGELOG.md
---
 CHANGELOG.md                                      |  1 +
 packages/frontend/src/components/MkPageWindow.vue |  5 +++--
 packages/frontend/src/nirax.ts                    | 14 +++++++++-----
 packages/frontend/src/pages/not-found.vue         |  9 +++++++++
 packages/frontend/src/router.ts                   |  4 ++--
 5 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 62fbb4002..9b2e54ea4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@
 
 ### Client
 - Fix: サーバーメトリクスが90度傾いている
+- Fix: 非ログイン時にクレデンシャルが必要なページに行くとエラーが出る問題を修正
 - Fix: sparkle内にリンクを入れるとクリック不能になる問題の修正
 - Fix: ZenUIでポップアップの表示位置がおかしい問題を修正
 - deck UIのカラムのメニューからアンテナとリストの編集画面を開けるように
diff --git a/packages/frontend/src/components/MkPageWindow.vue b/packages/frontend/src/components/MkPageWindow.vue
index 709b5a52d..08de5622f 100644
--- a/packages/frontend/src/components/MkPageWindow.vue
+++ b/packages/frontend/src/components/MkPageWindow.vue
@@ -30,7 +30,8 @@ import MkWindow from '@/components/MkWindow.vue';
 import { popout as _popout } from '@/scripts/popout';
 import copyToClipboard from '@/scripts/copy-to-clipboard';
 import { url } from '@/config';
-import { mainRouter, routes } from '@/router';
+import { mainRouter, routes, page } from '@/router';
+import { $i } from '@/account';
 import { Router } from '@/nirax';
 import { i18n } from '@/i18n';
 import { PageMetadata, provideMetadataReceiver } from '@/scripts/page-metadata';
@@ -45,7 +46,7 @@ defineEmits<{
 	(ev: 'closed'): void;
 }>();
 
-const router = new Router(routes, props.initialPath);
+const router = new Router(routes, props.initialPath, !!$i, page(() => import('@/pages/not-found.vue')));
 
 let pageMetadata = $ref<null | ComputedRef<PageMetadata>>();
 let windowEl = $shallowRef<InstanceType<typeof MkWindow>>();
diff --git a/packages/frontend/src/nirax.ts b/packages/frontend/src/nirax.ts
index 40348ded1..3fa6bd55e 100644
--- a/packages/frontend/src/nirax.ts
+++ b/packages/frontend/src/nirax.ts
@@ -2,7 +2,6 @@
 
 import { EventEmitter } from 'eventemitter3';
 import { Component, shallowRef, ShallowRef } from 'vue';
-import { pleaseLogin } from '@/scripts/please-login';
 import { safeURIDecode } from '@/scripts/safe-uri-decode';
 
 type RouteDef = {
@@ -23,7 +22,7 @@ type ParsedPath = (string | {
 	optional?: boolean;
 })[];
 
-export type Resolved = { route: RouteDef; props: Map<string, string>; child?: Resolved; };
+export type Resolved = { route: RouteDef; props: Map<string, string | boolean>; child?: Resolved; };
 
 function parsePath(path: string): ParsedPath {
 	const res = [] as ParsedPath;
@@ -75,15 +74,19 @@ export class Router extends EventEmitter<{
 	public currentRef: ShallowRef<Resolved> = shallowRef();
 	public currentRoute: ShallowRef<RouteDef> = shallowRef();
 	private currentPath: string;
+	private isLoggedIn: boolean;
+	private notFoundPageComponent: Component;
 	private currentKey = Date.now().toString();
 
 	public navHook: ((path: string, flag?: any) => boolean) | null = null;
 
-	constructor(routes: Router['routes'], currentPath: Router['currentPath']) {
+	constructor(routes: Router['routes'], currentPath: Router['currentPath'], isLoggedIn: boolean, notFoundPageComponent: Component) {
 		super();
 
 		this.routes = routes;
 		this.currentPath = currentPath;
+		this.isLoggedIn = isLoggedIn;
+		this.notFoundPageComponent = notFoundPageComponent;
 		this.navigate(currentPath, null, false);
 	}
 
@@ -212,8 +215,9 @@ export class Router extends EventEmitter<{
 			throw new Error('no route found for: ' + path);
 		}
 
-		if (res.route.loginRequired) {
-			pleaseLogin('/');
+		if (res.route.loginRequired && !this.isLoggedIn) {
+			res.route.component = this.notFoundPageComponent;
+			res.props.set('showLoginPopup', true);
 		}
 
 		const isSamePath = beforePath === path;
diff --git a/packages/frontend/src/pages/not-found.vue b/packages/frontend/src/pages/not-found.vue
index 43dc41e7c..d10f221b8 100644
--- a/packages/frontend/src/pages/not-found.vue
+++ b/packages/frontend/src/pages/not-found.vue
@@ -10,8 +10,17 @@
 <script lang="ts" setup>
 import { i18n } from '@/i18n';
 import { definePageMetadata } from '@/scripts/page-metadata';
+import { pleaseLogin } from '@/scripts/please-login';
 import { notFoundImageUrl } from '@/instance';
 
+const props = defineProps<{
+	showLoginPopup?: boolean;
+}>();
+
+if (props.showLoginPopup) {
+	pleaseLogin('/');
+}
+
 const headerActions = $computed(() => []);
 
 const headerTabs = $computed(() => []);
diff --git a/packages/frontend/src/router.ts b/packages/frontend/src/router.ts
index fe9bc5938..8540d4320 100644
--- a/packages/frontend/src/router.ts
+++ b/packages/frontend/src/router.ts
@@ -4,7 +4,7 @@ import { $i, iAmModerator } from '@/account';
 import MkLoading from '@/pages/_loading_.vue';
 import MkError from '@/pages/_error_.vue';
 
-const page = (loader: AsyncComponentLoader<any>) => defineAsyncComponent({
+export const page = (loader: AsyncComponentLoader<any>) => defineAsyncComponent({
 	loader: loader,
 	loadingComponent: MkLoading,
 	errorComponent: MkError,
@@ -505,7 +505,7 @@ export const routes = [{
 	component: page(() => import('./pages/not-found.vue')),
 }];
 
-export const mainRouter = new Router(routes, location.pathname + location.search + location.hash);
+export const mainRouter = new Router(routes, location.pathname + location.search + location.hash, !!$i, page(() => import('@/pages/not-found.vue')));
 
 window.history.replaceState({ key: mainRouter.getCurrentKey() }, '', location.href);
 

From c2d7008cff3027854971bfe7dfa598ca74567471 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Jul 2023 12:53:51 +0900
Subject: [PATCH 15/31] tweak localization

Resolve #11119
---
 locales/index.d.ts                            |  5 +++--
 locales/ja-JP.yml                             | 22 +++++++++----------
 .../frontend/src/components/MkDrive.file.vue  |  2 +-
 .../frontend/src/pages/settings/general.vue   |  8 +++----
 4 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 13aa62bc5..b7db5c6a7 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -316,7 +316,7 @@ export interface Locale {
     "rename": string;
     "avatar": string;
     "banner": string;
-    "nsfw": string;
+    "displayOfSensitiveMedia": string;
     "whenServerDisconnected": string;
     "disconnectedFromServer": string;
     "reload": string;
@@ -1531,6 +1531,7 @@ export interface Locale {
         "back": string;
         "reduceFrequencyOfThisAd": string;
         "hide": string;
+        "timezoneinfo": string;
     };
     "_forgotPassword": {
         "enterEmail": string;
@@ -1592,7 +1593,7 @@ export interface Locale {
         "morePatrons": string;
         "patrons": string;
     };
-    "_nsfw": {
+    "_displayOfSensitiveMedia": {
         "respect": string;
         "ignore": string;
         "force": string;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 51122655b..441707b19 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -112,7 +112,7 @@ pinnedNote: "ピン留めされたノート"
 pinned: "ピン留め"
 you: "あなた"
 clickToShow: "クリックして表示"
-sensitive: "閲覧注意"
+sensitive: "センシティブ"
 add: "追加"
 reaction: "リアクション"
 reactions: "リアクション"
@@ -120,8 +120,8 @@ reactionSetting: "ピッカーに表示するリアクション"
 reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、＋を押して追加します。"
 rememberNoteVisibility: "公開範囲を記憶する"
 attachCancel: "添付取り消し"
-markAsSensitive: "閲覧注意にする"
-unmarkAsSensitive: "閲覧注意を解除する"
+markAsSensitive: "センシティブとして設定"
+unmarkAsSensitive: "センシティブを解除する"
 enterFileName: "ファイル名を入力"
 mute: "ミュート"
 unmute: "ミュート解除"
@@ -313,7 +313,7 @@ copyUrl: "URLをコピー"
 rename: "名前を変更"
 avatar: "アイコン"
 banner: "バナー"
-nsfw: "閲覧注意"
+displayOfSensitiveMedia: "センシティブなメディアの表示"
 whenServerDisconnected: "サーバーとの接続が失われたとき"
 disconnectedFromServer: "サーバーから切断されました"
 reload: "リロード"
@@ -695,7 +695,7 @@ driveUsage: "ドライブ使用量"
 noCrawle: "クローラーによるインデックスを拒否"
 noCrawleDescription: "外部の検索エンジンにあなたのユーザーページ、ノート、Pagesなどのコンテンツを登録(インデックス)しないよう要求します。"
 lockedAccountInfo: "フォローを承認制にしても、ノートの公開範囲を「フォロワー」にしない限り、誰でもあなたのノートを見ることができます。"
-alwaysMarkSensitive: "デフォルトでメディアを閲覧注意にする"
+alwaysMarkSensitive: "デフォルトでメディアをセンシティブ設定にする"
 loadRawImages: "添付画像のサムネイルをオリジナル画質にする"
 disableShowingAnimatedImages: "アニメーション画像を再生しない"
 verificationEmailSent: "確認のメールを送信しました。メールに記載されたリンクにアクセスして、設定を完了してください。"
@@ -922,8 +922,8 @@ cannotUploadBecauseInappropriate: "不適切な内容を含む可能性がある
 cannotUploadBecauseNoFreeSpace: "ドライブの空き容量が無いためアップロードできません。"
 cannotUploadBecauseExceedsFileSizeLimit: "ファイルサイズの制限を超えているためアップロードできません。"
 beta: "ベータ"
-enableAutoSensitive: "自動NSFW判定"
-enableAutoSensitiveDescription: "利用可能な場合は、機械学習を利用して自動でメディアにNSFWフラグを設定します。この機能をオフにしても、サーバーによっては自動で設定されることがあります。"
+enableAutoSensitive: "自動センシティブ判定"
+enableAutoSensitiveDescription: "利用可能な場合は、機械学習を利用して自動でメディアにセンシティブフラグを設定します。この機能をオフにしても、サーバーによっては自動で設定されることがあります。"
 activeEmailValidationDescription: "ユーザーのメールアドレスのバリデーションを、捨てアドかどうかや実際に通信可能かどうかなどを判定しより積極的に行います。オフにすると単に文字列として正しいかどうかのみチェックされます。"
 navbar: "ナビゲーションバー"
 shuffle: "シャッフル"
@@ -1417,7 +1417,7 @@ _sensitiveMediaDetection:
   description: "機械学習を使って自動でセンシティブなメディアを検出し、モデレーションに役立てることができます。サーバーの負荷が少し増えます。"
   sensitivity: "検出感度"
   sensitivityDescription: "感度を低くすると、誤検知(偽陽性)が減ります。感度を高くすると、検知漏れ(偽陰性)が減ります。"
-  setSensitiveFlagAutomatically: "NSFWフラグを設定する"
+  setSensitiveFlagAutomatically: "センシティブフラグを設定する"
   setSensitiveFlagAutomaticallyDescription: "この設定をオフにしても内部的に判定結果は保持されます。"
   analyzeVideos: "動画の解析を有効化"
   analyzeVideosDescription: "静止画に加えて動画も解析するようにします。サーバーの負荷が少し増えます。"
@@ -1511,9 +1511,9 @@ _aboutMisskey:
   morePatrons: "他にも多くの方が支援してくれています。ありがとうございます🥰"
   patrons: "支援者"
 
-_nsfw:
-  respect: "閲覧注意のメディアは隠す"
-  ignore: "閲覧注意のメディアを隠さない"
+_displayOfSensitiveMedia:
+  respect: "センシティブ設定されたメディアを隠す"
+  ignore: "センシティブ設定されたメディアを隠さない"
   force: "常にメディアを隠す"
 
 _instanceTicker:
diff --git a/packages/frontend/src/components/MkDrive.file.vue b/packages/frontend/src/components/MkDrive.file.vue
index 3a75f8293..bb4361ef6 100644
--- a/packages/frontend/src/components/MkDrive.file.vue
+++ b/packages/frontend/src/components/MkDrive.file.vue
@@ -19,7 +19,7 @@
 		</div>
 		<div v-if="file.isSensitive" :class="[$style.label, $style.red]">
 			<img :class="$style.labelImg" src="/client-assets/label-red.svg"/>
-			<p :class="$style.labelText">{{ i18n.ts.nsfw }}</p>
+			<p :class="$style.labelText">NSFW</p>
 		</div>
 
 		<MkDriveFileThumbnail :class="$style.thumbnail" :file="file" fit="contain"/>
diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue
index 20b36f0fc..cfe5cd31e 100644
--- a/packages/frontend/src/pages/settings/general.vue
+++ b/packages/frontend/src/pages/settings/general.vue
@@ -52,10 +52,10 @@
 			</MkSelect>
 
 			<MkSelect v-model="nsfw">
-				<template #label>{{ i18n.ts.nsfw }}</template>
-				<option value="respect">{{ i18n.ts._nsfw.respect }}</option>
-				<option value="ignore">{{ i18n.ts._nsfw.ignore }}</option>
-				<option value="force">{{ i18n.ts._nsfw.force }}</option>
+				<template #label>{{ i18n.ts.displayOfSensitiveMedia }}</template>
+				<option value="respect">{{ i18n.ts._displayOfSensitiveMedia.respect }}</option>
+				<option value="ignore">{{ i18n.ts._displayOfSensitiveMedia.ignore }}</option>
+				<option value="force">{{ i18n.ts._displayOfSensitiveMedia.force }}</option>
 			</MkSelect>
 
 			<MkRadios v-model="mediaListWithOneImageAppearance">

From 644023316e85ed9d238007ef6b2177e25c98cf9a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Jul 2023 13:03:31 +0900
Subject: [PATCH 16/31] refactor: use esm

---
 package.json             |   4 +-
 packages/sw/package.json |   2 +-
 pnpm-lock.yaml           | 244 +--------------------------------------
 scripts/dev.js           |  65 -----------
 scripts/dev.mjs          |  68 +++++++++++
 5 files changed, 75 insertions(+), 308 deletions(-)
 delete mode 100644 scripts/dev.js
 create mode 100644 scripts/dev.mjs

diff --git a/package.json b/package.json
index adda59581..14b4c6831 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
 		"migrateandstart": "pnpm migrate && pnpm start",
 		"gulp": "pnpm exec gulp build",
 		"watch": "pnpm dev",
-		"dev": "node ./scripts/dev.js",
+		"dev": "node ./scripts/dev.mjs",
 		"lint": "pnpm -r lint",
 		"cy:open": "pnpm cypress open --browser --e2e --config-file=cypress.config.ts",
 		"cy:run": "pnpm cypress run",
@@ -44,7 +44,7 @@
 		"lodash": "4.17.21"
 	},
 	"dependencies": {
-		"execa": "5.1.1",
+		"execa": "7.1.1",
 		"gulp": "4.0.2",
 		"gulp-cssnano": "2.1.3",
 		"gulp-rename": "2.0.0",
diff --git a/packages/sw/package.json b/packages/sw/package.json
index 1aef3df5c..a2bead3dd 100644
--- a/packages/sw/package.json
+++ b/packages/sw/package.json
@@ -9,7 +9,7 @@
 		"lint": "pnpm typecheck && pnpm eslint"
 	},
 	"dependencies": {
-		"esbuild": "0.16.11",
+		"esbuild": "0.18.11",
 		"idb-keyval": "6.2.1",
 		"misskey-js": "workspace:*"
 	},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 0d99cede2..d4872c822 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,8 +13,8 @@ importers:
   .:
     dependencies:
       execa:
-        specifier: 5.1.1
-        version: 5.1.1
+        specifier: 7.1.1
+        version: 7.1.1
       gulp:
         specifier: 4.0.2
         version: 4.0.2
@@ -1060,8 +1060,8 @@ importers:
   packages/sw:
     dependencies:
       esbuild:
-        specifier: 0.16.11
-        version: 0.16.11
+        specifier: 0.18.11
+        version: 0.18.11
       idb-keyval:
         specifier: 6.2.1
         version: 6.2.1
@@ -4261,15 +4261,6 @@ packages:
       react: 18.2.0
     dev: true
 
-  /@esbuild/android-arm64@0.16.11:
-    resolution: {integrity: sha512-CPwhZd15PasQSlkFuZv1st37xvuBeklztfb9y2GZWLQu59zcMIDkZVSEz/TTIxzt811+eJfblg5HhP49iVVDWQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/android-arm64@0.17.18:
     resolution: {integrity: sha512-/iq0aK0eeHgSC3z55ucMAHO05OIqmQehiGay8eP5l/5l+iEr4EIbh4/MI8xD9qRFjqzgkc0JkX0LculNC9mXBw==}
     engines: {node: '>=12'}
@@ -4287,15 +4278,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/android-arm@0.16.11:
-    resolution: {integrity: sha512-j2xsG1OETgCe+OBA54DG5vLuGjmMZtQvyxt+rTw2aYK/RqjcG/F+UDdj43uoUOv8lSRC3lM4XpKLOVZfY/82yA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/android-arm@0.17.18:
     resolution: {integrity: sha512-EmwL+vUBZJ7mhFCs5lA4ZimpUH3WMAoqvOIYhVQwdIgSpHC8ImHdsRyhHAVxpDYUSm0lWvd63z0XH1IlImS2Qw==}
     engines: {node: '>=12'}
@@ -4313,15 +4295,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/android-x64@0.16.11:
-    resolution: {integrity: sha512-vbFn+0JXX6FkKq+0sNeA6aF2QhuOt9ZkBl+DSyqKIF+Ms58lUOhbqSwberKWQDm0udgOp3d/LhOFTYmpvmlZmA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/android-x64@0.17.18:
     resolution: {integrity: sha512-x+0efYNBF3NPW2Xc5bFOSFW7tTXdAcpfEg2nXmxegm4mJuVeS+i109m/7HMiOQ6M12aVGGFlqJX3RhNdYM2lWg==}
     engines: {node: '>=12'}
@@ -4339,15 +4312,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/darwin-arm64@0.16.11:
-    resolution: {integrity: sha512-1tqsIG6AySZ9njT8V2ddH1F/J01zX+0obPCpP0uD9TMIUlAA5WUF/+abFlnIsNY4jACcbN/13NUbLRWE9bayjw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/darwin-arm64@0.17.18:
     resolution: {integrity: sha512-6tY+djEAdF48M1ONWnQb1C+6LiXrKjmqjzPNPWXhu/GzOHTHX2nh8Mo2ZAmBFg0kIodHhciEgUBtcYCAIjGbjQ==}
     engines: {node: '>=12'}
@@ -4365,15 +4329,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/darwin-x64@0.16.11:
-    resolution: {integrity: sha512-Gqx2/nYqnK46dwEDPGv3SwLqgLIZQJ7m2xNoNRzO50VZPvoCWSUqDaoirrZZf7uVfl+fxHoZBcdQJx2gOdxffQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/darwin-x64@0.17.18:
     resolution: {integrity: sha512-Qq84ykvLvya3dO49wVC9FFCNUfSrQJLbxhoQk/TE1r6MjHo3sFF2tlJCwMjhkBVq3/ahUisj7+EpRSz0/+8+9A==}
     engines: {node: '>=12'}
@@ -4391,15 +4346,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/freebsd-arm64@0.16.11:
-    resolution: {integrity: sha512-58FTdlgIQ3ZxFtGphjbIBmo7kfDhQih/PlfAnKraAcCDZOYXWcRFmHJtW+EVg32IIxuEAqhLAzCgrqpm5o8Wlw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/freebsd-arm64@0.17.18:
     resolution: {integrity: sha512-fw/ZfxfAzuHfaQeMDhbzxp9mc+mHn1Y94VDHFHjGvt2Uxl10mT4CDavHm+/L9KG441t1QdABqkVYwakMUeyLRA==}
     engines: {node: '>=12'}
@@ -4417,15 +4363,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/freebsd-x64@0.16.11:
-    resolution: {integrity: sha512-L7hr6VnpqZzYEDVQeaViz1QnmfFRCRm3zVtljbYi/CU6InKs6tda1J3pAvqVsbNpbGMA9AvyiyBrgjJAFCawVg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/freebsd-x64@0.17.18:
     resolution: {integrity: sha512-FQFbRtTaEi8ZBi/A6kxOC0V0E9B/97vPdYjY9NdawyLd4Qk5VD5g2pbWN2VR1c0xhzcJm74HWpObPszWC+qTew==}
     engines: {node: '>=12'}
@@ -4443,15 +4380,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-arm64@0.16.11:
-    resolution: {integrity: sha512-OKU0ajh9Xu7Pd1MlSq8Xqj5SJEV+4yVnALydPTDrrmTyvU72P8mTRJgZMilHw7H+Jqc0utryjNOwlJ/+fOkwGw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-arm64@0.17.18:
     resolution: {integrity: sha512-R7pZvQZFOY2sxUG8P6A21eq6q+eBv7JPQYIybHVf1XkQYC+lT7nDBdC7wWKTrbvMXKRaGudp/dzZCwL/863mZQ==}
     engines: {node: '>=12'}
@@ -4469,15 +4397,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-arm@0.16.11:
-    resolution: {integrity: sha512-Mk6TZij71alyS0FGuKEKYjTZGjUw2uXi07V/AiGZW1b5grTfGx6lpsbQdystgDJqju99Osq2Ix+C7WteSnwrHg==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-arm@0.17.18:
     resolution: {integrity: sha512-jW+UCM40LzHcouIaqv3e/oRs0JM76JfhHjCavPxMUti7VAPh8CaGSlS7cmyrdpzSk7A+8f0hiedHqr/LMnfijg==}
     engines: {node: '>=12'}
@@ -4495,15 +4414,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-ia32@0.16.11:
-    resolution: {integrity: sha512-pr1/tdDfgQQ9hp2IskSKMuwkx2X4jR7iHLbqEmmj/lPLKeoa6AUulnglGY4y0OPo+0eAYd6DzWp7ve3KI4lOCA==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-ia32@0.17.18:
     resolution: {integrity: sha512-ygIMc3I7wxgXIxk6j3V00VlABIjq260i967Cp9BNAk5pOOpIXmd1RFQJQX9Io7KRsthDrQYrtcx7QCof4o3ZoQ==}
     engines: {node: '>=12'}
@@ -4521,15 +4431,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-loong64@0.16.11:
-    resolution: {integrity: sha512-2MCYdDBh9R+R1xuBFiApgkbp/tW1uV+aVeefKYqWSEk3o6MHzWo1FxEGA4dSnC+kThSBOMVpCV9z4/DPouA3bQ==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-loong64@0.17.18:
     resolution: {integrity: sha512-bvPG+MyFs5ZlwYclCG1D744oHk1Pv7j8psF5TfYx7otCVmcJsEXgFEhQkbhNW8otDHL1a2KDINW20cfCgnzgMQ==}
     engines: {node: '>=12'}
@@ -4547,15 +4448,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-mips64el@0.16.11:
-    resolution: {integrity: sha512-IyotdnRg0J8F9FKttYe3cy/M9ZJ5W/Gm6whH08sbXMxRVKs/TyyoqFIA8oT1MzR+si6GLlRpcF7JbUnOXssjPA==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-mips64el@0.17.18:
     resolution: {integrity: sha512-oVqckATOAGuiUOa6wr8TXaVPSa+6IwVJrGidmNZS1cZVx0HqkTMkqFGD2HIx9H1RvOwFeWYdaYbdY6B89KUMxA==}
     engines: {node: '>=12'}
@@ -4573,15 +4465,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-ppc64@0.16.11:
-    resolution: {integrity: sha512-NUMtxvb0j41UL8yf8VnTMNbCQxKqIPmF0Wf/N44UrxpKE8iCNmWT95Wt98Ivr2ebHdz+V3kptlgBuZNYcJLI6g==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-ppc64@0.17.18:
     resolution: {integrity: sha512-3dLlQO+b/LnQNxgH4l9rqa2/IwRJVN9u/bK63FhOPB4xqiRqlQAU0qDU3JJuf0BmaH0yytTBdoSBHrb2jqc5qQ==}
     engines: {node: '>=12'}
@@ -4599,15 +4482,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-riscv64@0.16.11:
-    resolution: {integrity: sha512-03/B26az/JezvVkgck+lhauP13t6RqzCQgnrkBCBrXXpX+2r02DfSU43BEhpErJrsrDA8GXSE/rvsfbGCX6OvA==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-riscv64@0.17.18:
     resolution: {integrity: sha512-/x7leOyDPjZV3TcsdfrSI107zItVnsX1q2nho7hbbQoKnmoeUWjs+08rKKt4AUXju7+3aRZSsKrJtaRmsdL1xA==}
     engines: {node: '>=12'}
@@ -4625,15 +4499,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-s390x@0.16.11:
-    resolution: {integrity: sha512-Xs2tRB0fgly4XfC4FMv1Fd699AMEH8BClp36mzqRuVzm/285XIJaK5cPEZ9cLLn9ukNHdvvSX/83u5uS1BCd8g==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-s390x@0.17.18:
     resolution: {integrity: sha512-cX0I8Q9xQkL/6F5zWdYmVf5JSQt+ZfZD2bJudZrWD+4mnUvoZ3TDDXtDX2mUaq6upMFv9FlfIh4Gfun0tbGzuw==}
     engines: {node: '>=12'}
@@ -4651,15 +4516,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/linux-x64@0.16.11:
-    resolution: {integrity: sha512-CiNialxsjJllrG3ggzOKzSaqQK/De/Mv4g/3r7jxLt01GLerPh0Q3TVTndFG9VfOrR1PdN7Fz5AOV3bE6Isd1Q==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/linux-x64@0.17.18:
     resolution: {integrity: sha512-66RmRsPlYy4jFl0vG80GcNRdirx4nVWAzJmXkevgphP1qf4dsLQCpSKGM3DUQCojwU1hnepI63gNZdrr02wHUA==}
     engines: {node: '>=12'}
@@ -4677,15 +4533,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/netbsd-x64@0.16.11:
-    resolution: {integrity: sha512-PiljZi6QZ3Pz0pL8rfJqPln8F/a3mEJwh2vhBb1kDYLniLufo9/7AInb/ZyhvgR7FxUQluUYyz64owPomgaLJA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/netbsd-x64@0.17.18:
     resolution: {integrity: sha512-95IRY7mI2yrkLlTLb1gpDxdC5WLC5mZDi+kA9dmM5XAGxCME0F8i4bYH4jZreaJ6lIZ0B8hTrweqG1fUyW7jbg==}
     engines: {node: '>=12'}
@@ -4703,15 +4550,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/openbsd-x64@0.16.11:
-    resolution: {integrity: sha512-Nyk8aJM+w6NoS4RGQJ0ybb516jEIbEVlLvhRIdpCssUuqKU0lr9lJPHnFY2QqyoVaJkd6VxaHOBU/v/ieuiENQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/openbsd-x64@0.17.18:
     resolution: {integrity: sha512-WevVOgcng+8hSZ4Q3BKL3n1xTv5H6Nb53cBrtzzEjDbbnOmucEVcZeGCsCOi9bAOcDYEeBZbD2SJNBxlfP3qiA==}
     engines: {node: '>=12'}
@@ -4729,15 +4567,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/sunos-x64@0.16.11:
-    resolution: {integrity: sha512-shxBLdNJecr7KxuyZQ19idBU8x7Mq7m+N5Fj8ROWMWQbDdjSjlBPxz7EZJIxSh7FUgSMKl7qSCCVaczXrta4MQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/sunos-x64@0.17.18:
     resolution: {integrity: sha512-Rzf4QfQagnwhQXVBS3BYUlxmEbcV7MY+BH5vfDZekU5eYpcffHSyjU8T0xucKVuOcdCsMo+Ur5wmgQJH2GfNrg==}
     engines: {node: '>=12'}
@@ -4755,15 +4584,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/win32-arm64@0.16.11:
-    resolution: {integrity: sha512-vyTbfoEBn7cGXK8writbsB+G2wyRoOA+EbTNQ9cu5lyLU65sfWetCaL8T7mX338AN8tTbCYl6ce5YRKTonpA3w==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/win32-arm64@0.17.18:
     resolution: {integrity: sha512-Kb3Ko/KKaWhjeAm2YoT/cNZaHaD1Yk/pa3FTsmqo9uFh1D1Rfco7BBLIPdDOozrObj2sahslFuAQGvWbgWldAg==}
     engines: {node: '>=12'}
@@ -4781,15 +4601,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/win32-ia32@0.16.11:
-    resolution: {integrity: sha512-ATGCGc52LNqakUE9i54RzFC4lm70UTcTW721AFGjQotc6uCg7sf7QeRd05wD5tLBFafHdMSZv4rsU/Nh7LT/rQ==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/win32-ia32@0.17.18:
     resolution: {integrity: sha512-0/xUMIdkVHwkvxfbd5+lfG7mHOf2FRrxNbPiKWg9C4fFrB8H0guClmaM3BFiRUYrznVoyxTIyC/Ou2B7QQSwmw==}
     engines: {node: '>=12'}
@@ -4807,15 +4618,6 @@ packages:
     requiresBuild: true
     optional: true
 
-  /@esbuild/win32-x64@0.16.11:
-    resolution: {integrity: sha512-7NcClJIctrO3iRu5CCqwdSBePm8bL2Iu1DYsuOnxuYJ+a1Kv3Wn3MzNdJIrUPLi1yADVwRliRUU/jtMC/tJnJA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: false
-    optional: true
-
   /@esbuild/win32-x64@0.17.18:
     resolution: {integrity: sha512-qU25Ma1I3NqTSHJUOKi9sAH1/Mzuvlke0ioMJRthLXKm7JiSKVwFghlGbDLOO2sARECGhja4xYfRAZNPAkooYg==}
     engines: {node: '>=12'}
@@ -11779,36 +11581,6 @@ packages:
       - supports-color
     dev: true
 
-  /esbuild@0.16.11:
-    resolution: {integrity: sha512-Al0hhRUz/cCDvDp9VZp1L500HZZQ/HLjgTnQTmnW97+PoLmw+PuvB3e19JHYZtWnrxoh3qYrN/0tiRIbrE2oVQ==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      '@esbuild/android-arm': 0.16.11
-      '@esbuild/android-arm64': 0.16.11
-      '@esbuild/android-x64': 0.16.11
-      '@esbuild/darwin-arm64': 0.16.11
-      '@esbuild/darwin-x64': 0.16.11
-      '@esbuild/freebsd-arm64': 0.16.11
-      '@esbuild/freebsd-x64': 0.16.11
-      '@esbuild/linux-arm': 0.16.11
-      '@esbuild/linux-arm64': 0.16.11
-      '@esbuild/linux-ia32': 0.16.11
-      '@esbuild/linux-loong64': 0.16.11
-      '@esbuild/linux-mips64el': 0.16.11
-      '@esbuild/linux-ppc64': 0.16.11
-      '@esbuild/linux-riscv64': 0.16.11
-      '@esbuild/linux-s390x': 0.16.11
-      '@esbuild/linux-x64': 0.16.11
-      '@esbuild/netbsd-x64': 0.16.11
-      '@esbuild/openbsd-x64': 0.16.11
-      '@esbuild/sunos-x64': 0.16.11
-      '@esbuild/win32-arm64': 0.16.11
-      '@esbuild/win32-ia32': 0.16.11
-      '@esbuild/win32-x64': 0.16.11
-    dev: false
-
   /esbuild@0.17.18:
     resolution: {integrity: sha512-z1lix43jBs6UKjcZVKOw2xx69ffE2aG0PygLL5qJ9OS/gy0Ewd1gW/PUQIOIQGXBHWNywSc0floSKoMFF8aK2w==}
     engines: {node: '>=12'}
@@ -12258,7 +12030,6 @@ packages:
       onetime: 6.0.0
       signal-exit: 3.0.7
       strip-final-newline: 3.0.0
-    dev: true
 
   /executable@4.1.1:
     resolution: {integrity: sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==}
@@ -13884,7 +13655,6 @@ packages:
   /human-signals@4.3.1:
     resolution: {integrity: sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==}
     engines: {node: '>=14.18.0'}
-    dev: true
 
   /humanize-ms@1.2.1:
     resolution: {integrity: sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==}
@@ -14452,7 +14222,6 @@ packages:
   /is-stream@3.0.0:
     resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dev: true
 
   /is-string@1.0.7:
     resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
@@ -16079,7 +15848,6 @@ packages:
   /mimic-fn@4.0.0:
     resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
     engines: {node: '>=12'}
-    dev: true
 
   /mimic-response@1.0.1:
     resolution: {integrity: sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==}
@@ -16691,7 +16459,6 @@ packages:
     engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
     dependencies:
       path-key: 4.0.0
-    dev: true
 
   /npmlog@5.0.1:
     resolution: {integrity: sha512-AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==}
@@ -16885,7 +16652,6 @@ packages:
     engines: {node: '>=12'}
     dependencies:
       mimic-fn: 4.0.0
-    dev: true
 
   /open@7.4.2:
     resolution: {integrity: sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==}
@@ -17215,7 +16981,6 @@ packages:
   /path-key@4.0.0:
     resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
     engines: {node: '>=12'}
-    dev: true
 
   /path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
@@ -19906,7 +19671,6 @@ packages:
   /strip-final-newline@3.0.0:
     resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
     engines: {node: '>=12'}
-    dev: true
 
   /strip-indent@3.0.0:
     resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
diff --git a/scripts/dev.js b/scripts/dev.js
deleted file mode 100644
index 2f20d8f07..000000000
--- a/scripts/dev.js
+++ /dev/null
@@ -1,65 +0,0 @@
-const execa = require('execa');
-const fs = require('fs');
-
-(async () => {
-	await execa('pnpm', ['clean'], {
-		cwd: __dirname + '/../',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-
-	await execa('pnpm', ['build-pre'], {
-		cwd: __dirname + '/../',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-
-	execa('pnpm', ['exec', 'gulp', 'watch'], {
-		cwd: __dirname + '/../',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-
-	execa('pnpm', ['--filter', 'backend', 'watch'], {
-		cwd: __dirname + '/../',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-
-	execa('pnpm', ['--filter', 'frontend', 'watch'], {
-		cwd: __dirname + '/../',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-
-	execa('pnpm', ['--filter', 'sw', 'watch'], {
-		cwd: __dirname + '/../',
-		stdout: process.stdout,
-		stderr: process.stderr,
-	});
-
-	const start = async () => {
-		try {
-			const stat = fs.statSync(__dirname + '/../packages/backend/built/boot/index.js');
-			if (!stat) throw new Error('not exist yet');
-			if (stat.size === 0) throw new Error('not built yet');
-
-			const subprocess = await execa('pnpm', ['start'], {
-				cwd: __dirname + '/../',
-				stdout: process.stdout,
-				stderr: process.stderr,
-			});
-
-			// なぜかworkerだけが終了してmasterが残るのでその対策
-			process.on('SIGINT', () => {
-				subprocess.kill('SIGINT');
-				process.exit(0);
-			});
-		} catch (e) {
-			await new Promise(resolve => setTimeout(resolve, 3000));
-			start();
-		}
-	};
-
-	start();
-})();
diff --git a/scripts/dev.mjs b/scripts/dev.mjs
new file mode 100644
index 000000000..0b07ae80c
--- /dev/null
+++ b/scripts/dev.mjs
@@ -0,0 +1,68 @@
+import fs from 'node:fs';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { execa } from 'execa';
+
+const _filename = fileURLToPath(import.meta.url);
+const _dirname = dirname(_filename);
+
+await execa('pnpm', ['clean'], {
+	cwd: _dirname + '/../',
+	stdout: process.stdout,
+	stderr: process.stderr,
+});
+
+await execa('pnpm', ['build-pre'], {
+	cwd: _dirname + '/../',
+	stdout: process.stdout,
+	stderr: process.stderr,
+});
+
+execa('pnpm', ['exec', 'gulp', 'watch'], {
+	cwd: _dirname + '/../',
+	stdout: process.stdout,
+	stderr: process.stderr,
+});
+
+execa('pnpm', ['--filter', 'backend', 'watch'], {
+	cwd: _dirname + '/../',
+	stdout: process.stdout,
+	stderr: process.stderr,
+});
+
+execa('pnpm', ['--filter', 'frontend', 'watch'], {
+	cwd: _dirname + '/../',
+	stdout: process.stdout,
+	stderr: process.stderr,
+});
+
+execa('pnpm', ['--filter', 'sw', 'watch'], {
+	cwd: _dirname + '/../',
+	stdout: process.stdout,
+	stderr: process.stderr,
+});
+
+const start = async () => {
+	try {
+		const stat = fs.statSync(_dirname + '/../packages/backend/built/boot/index.js');
+		if (!stat) throw new Error('not exist yet');
+		if (stat.size === 0) throw new Error('not built yet');
+
+		const subprocess = await execa('pnpm', ['start'], {
+			cwd: _dirname + '/../',
+			stdout: process.stdout,
+			stderr: process.stderr,
+		});
+
+		// なぜかworkerだけが終了してmasterが残るのでその対策
+		process.on('SIGINT', () => {
+			subprocess.kill('SIGINT');
+			process.exit(0);
+		});
+	} catch (e) {
+		await new Promise(resolve => setTimeout(resolve, 3000));
+		start();
+	}
+};
+
+start();

From 15683370f0379360c475a9ad77bb802c43f6d181 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Jul 2023 15:30:36 +0900
Subject: [PATCH 17/31] =?UTF-8?q?fix(frontend):=20=E3=83=9A=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E9=81=B7=E7=A7=BB=E3=81=A7=E3=82=B9=E3=82=AF=E3=83=AD?=
 =?UTF-8?q?=E3=83=BC=E3=83=AB=E4=BD=8D=E7=BD=AE=E3=81=8C=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #11068
---
 CHANGELOG.md                                  |  9 ++---
 .../frontend/src/components/MkPageWindow.vue  | 10 ++++--
 packages/frontend/src/nirax.ts                | 36 ++++++++++++++-----
 packages/frontend/src/router.ts               | 31 +---------------
 packages/frontend/src/ui/deck/main-column.vue | 11 ++++--
 packages/frontend/src/ui/universal.vue        |  3 ++
 6 files changed, 53 insertions(+), 47 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b2e54ea4..905c2ea2d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,15 +19,16 @@
 - サーバーのマシン情報の公開を無効にしてパフォーマンスを向上させることができるようになりました
 
 ### Client
-- Fix: サーバーメトリクスが90度傾いている
-- Fix: 非ログイン時にクレデンシャルが必要なページに行くとエラーが出る問題を修正
-- Fix: sparkle内にリンクを入れるとクリック不能になる問題の修正
-- Fix: ZenUIでポップアップの表示位置がおかしい問題を修正
 - deck UIのカラムのメニューからアンテナとリストの編集画面を開けるように
 - ドライブファイルのメニューで画像をクロップできるように
 - 画像を動画と同様に簡単に隠せるように
 - オリジナル画像を保持せずにアップロードする場合webpでアップロードされるように(Safari以外)
 - 見たことのあるRenoteを省略して表示をオンのときに自分のnoteのrenoteを省略するように
+- Fix: サーバーメトリクスが90度傾いている
+- Fix: 非ログイン時にクレデンシャルが必要なページに行くとエラーが出る問題を修正
+- Fix: sparkle内にリンクを入れるとクリック不能になる問題の修正
+- Fix: ZenUIでポップアップの表示位置がおかしい問題を修正
+- Fix: ページ遷移でスクロール位置が保持されない問題を修正
 
 ### Server
 - JSON.parse の回数を削減することで、ストリーミングのパフォーマンスを向上しました
diff --git a/packages/frontend/src/components/MkPageWindow.vue b/packages/frontend/src/components/MkPageWindow.vue
index 08de5622f..6318a9fd7 100644
--- a/packages/frontend/src/components/MkPageWindow.vue
+++ b/packages/frontend/src/components/MkPageWindow.vue
@@ -17,14 +17,14 @@
 		</template>
 	</template>
 
-	<div :class="$style.root" style="container-type: inline-size;">
+	<div ref="contents" :class="$style.root" style="container-type: inline-size;">
 		<RouterView :key="reloadCount" :router="router"/>
 	</div>
 </MkWindow>
 </template>
 
 <script lang="ts" setup>
-import { ComputedRef, onMounted, onUnmounted, provide } from 'vue';
+import { ComputedRef, onMounted, onUnmounted, provide, shallowRef } from 'vue';
 import RouterView from '@/components/global/RouterView.vue';
 import MkWindow from '@/components/MkWindow.vue';
 import { popout as _popout } from '@/scripts/popout';
@@ -32,11 +32,12 @@ import copyToClipboard from '@/scripts/copy-to-clipboard';
 import { url } from '@/config';
 import { mainRouter, routes, page } from '@/router';
 import { $i } from '@/account';
-import { Router } from '@/nirax';
+import { Router, useScrollPositionManager } from '@/nirax';
 import { i18n } from '@/i18n';
 import { PageMetadata, provideMetadataReceiver } from '@/scripts/page-metadata';
 import { openingWindowsCount } from '@/os';
 import { claimAchievement } from '@/scripts/achievements';
+import { getScrollContainer } from '@/scripts/scroll';
 
 const props = defineProps<{
 	initialPath: string;
@@ -48,6 +49,7 @@ defineEmits<{
 
 const router = new Router(routes, props.initialPath, !!$i, page(() => import('@/pages/not-found.vue')));
 
+const contents = shallowRef<HTMLElement>();
 let pageMetadata = $ref<null | ComputedRef<PageMetadata>>();
 let windowEl = $shallowRef<InstanceType<typeof MkWindow>>();
 const history = $ref<{ path: string; key: any; }[]>([{
@@ -139,6 +141,8 @@ function popout() {
 	windowEl.close();
 }
 
+useScrollPositionManager(() => getScrollContainer(contents.value), router);
+
 onMounted(() => {
 	openingWindowsCount.value++;
 	if (openingWindowsCount.value >= 3) {
diff --git a/packages/frontend/src/nirax.ts b/packages/frontend/src/nirax.ts
index 3fa6bd55e..3a03444de 100644
--- a/packages/frontend/src/nirax.ts
+++ b/packages/frontend/src/nirax.ts
@@ -1,7 +1,7 @@
 // NIRAX --- A lightweight router
 
 import { EventEmitter } from 'eventemitter3';
-import { Component, shallowRef, ShallowRef } from 'vue';
+import { Component, onMounted, shallowRef, ShallowRef } from 'vue';
 import { safeURIDecode } from '@/scripts/safe-uri-decode';
 
 type RouteDef = {
@@ -267,13 +267,33 @@ export class Router extends EventEmitter<{
 		});
 	}
 
-	public replace(path: string, key?: string | null, emitEvent = true) {
+	public replace(path: string, key?: string | null) {
 		this.navigate(path, key);
-		if (emitEvent) {
-			this.emit('replace', {
-				path,
-				key: this.currentKey,
-			});
-		}
 	}
 }
+
+export function useScrollPositionManager(getScrollContainer: () => HTMLElement, router: Router) {
+	const scrollPosStore = new Map<string, number>();
+
+	onMounted(() => {
+		const scrollContainer = getScrollContainer();
+
+		scrollContainer.addEventListener('scroll', () => {
+			scrollPosStore.set(router.getCurrentKey(), scrollContainer.scrollTop);
+		}, { passive: true });
+
+		router.addListener('change', ctx => {
+			const scrollPos = scrollPosStore.get(ctx.key) ?? 0;
+			scrollContainer.scroll({ top: scrollPos, behavior: 'instant' });
+			if (scrollPos !== 0) {
+				window.setTimeout(() => { // 遷移直後はタイミングによってはコンポーネントが復元し切ってない可能性も考えられるため少し時間を空けて再度スクロール
+					scrollContainer.scroll({ top: scrollPos, behavior: 'instant' });
+				}, 100);
+			}
+		});
+
+		router.addListener('same', () => {
+			scrollContainer.scroll({ top: 0, behavior: 'smooth' });
+		});
+	});
+}
diff --git a/packages/frontend/src/router.ts b/packages/frontend/src/router.ts
index 8540d4320..873b372e0 100644
--- a/packages/frontend/src/router.ts
+++ b/packages/frontend/src/router.ts
@@ -509,41 +509,12 @@ export const mainRouter = new Router(routes, location.pathname + location.search
 
 window.history.replaceState({ key: mainRouter.getCurrentKey() }, '', location.href);
 
-// TODO: このファイルでスクロール位置も管理する設計だとdeckに対応できないのでなんとかする
-// スクロール位置取得+スクロール位置設定関数をprovideする感じでも良いかも
-
-const scrollPosStore = new Map<string, number>();
-
-window.setInterval(() => {
-	scrollPosStore.set(window.history.state?.key, window.scrollY);
-}, 1000);
-
 mainRouter.addListener('push', ctx => {
 	window.history.pushState({ key: ctx.key }, '', ctx.path);
-	const scrollPos = scrollPosStore.get(ctx.key) ?? 0;
-	window.scroll({ top: scrollPos, behavior: 'instant' });
-	if (scrollPos !== 0) {
-		window.setTimeout(() => { // 遷移直後はタイミングによってはコンポーネントが復元し切ってない可能性も考えられるため少し時間を空けて再度スクロール
-			window.scroll({ top: scrollPos, behavior: 'instant' });
-		}, 100);
-	}
-});
-
-mainRouter.addListener('replace', ctx => {
-	window.history.replaceState({ key: ctx.key }, '', ctx.path);
-});
-
-mainRouter.addListener('same', () => {
-	window.scroll({ top: 0, behavior: 'smooth' });
 });
 
 window.addEventListener('popstate', (event) => {
-	mainRouter.replace(location.pathname + location.search + location.hash, event.state?.key, false);
-	const scrollPos = scrollPosStore.get(event.state?.key) ?? 0;
-	window.scroll({ top: scrollPos, behavior: 'instant' });
-	window.setTimeout(() => { // 遷移直後はタイミングによってはコンポーネントが復元し切ってない可能性も考えられるため少し時間を空けて再度スクロール
-		window.scroll({ top: scrollPos, behavior: 'instant' });
-	}, 100);
+	mainRouter.replace(location.pathname + location.search + location.hash, event.state?.key);
 });
 
 export function useRouter(): Router {
diff --git a/packages/frontend/src/ui/deck/main-column.vue b/packages/frontend/src/ui/deck/main-column.vue
index 169fac70a..041330795 100644
--- a/packages/frontend/src/ui/deck/main-column.vue
+++ b/packages/frontend/src/ui/deck/main-column.vue
@@ -7,24 +7,29 @@
 		</template>
 	</template>
 
-	<RouterView @contextmenu.stop="onContextmenu"/>
+	<div ref="contents">
+		<RouterView @contextmenu.stop="onContextmenu"/>
+	</div>
 </XColumn>
 </template>
 
 <script lang="ts" setup>
-import { ComputedRef, provide } from 'vue';
+import { ComputedRef, provide, shallowRef } from 'vue';
 import XColumn from './column.vue';
 import { deckStore, Column } from '@/ui/deck/deck-store';
 import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { mainRouter } from '@/router';
 import { PageMetadata, provideMetadataReceiver } from '@/scripts/page-metadata';
+import { useScrollPositionManager } from '@/nirax';
+import { getScrollContainer } from '@/scripts/scroll';
 
 defineProps<{
 	column: Column;
 	isStacked: boolean;
 }>();
 
+const contents = shallowRef<HTMLElement>();
 let pageMetadata = $ref<null | ComputedRef<PageMetadata>>();
 
 provide('router', mainRouter);
@@ -61,4 +66,6 @@ function onContextmenu(ev: MouseEvent) {
 		},
 	}], ev);
 }
+
+useScrollPositionManager(() => getScrollContainer(contents.value), mainRouter);
 </script>
diff --git a/packages/frontend/src/ui/universal.vue b/packages/frontend/src/ui/universal.vue
index 8abb20300..9ae43c39d 100644
--- a/packages/frontend/src/ui/universal.vue
+++ b/packages/frontend/src/ui/universal.vue
@@ -95,6 +95,7 @@ import { PageMetadata, provideMetadataReceiver } from '@/scripts/page-metadata';
 import { deviceKind } from '@/scripts/device-kind';
 import { miLocalStorage } from '@/local-storage';
 import { CURRENT_STICKY_BOTTOM } from '@/const';
+import { useScrollPositionManager } from '@/nirax';
 
 const XWidgets = defineAsyncComponent(() => import('./universal.widgets.vue'));
 const XSidebar = defineAsyncComponent(() => import('@/ui/_common_/navbar.vue'));
@@ -213,6 +214,8 @@ watch($$(navFooter), () => {
 }, {
 	immediate: true,
 });
+
+useScrollPositionManager(() => contents.value.rootEl, mainRouter);
 </script>
 
 <style>

From b056e8f5eb99bd5fe0bfc2f222195a37d1afd277 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Jul 2023 15:48:46 +0900
Subject: [PATCH 18/31] use node 20.3.1

Fix #11179
---
 .devcontainer/devcontainer.json | 2 +-
 .node-version                   | 2 +-
 Dockerfile                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 230249d57..0664ecd11 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -6,7 +6,7 @@
 	"features": {
 		"ghcr.io/devcontainers-contrib/features/pnpm:2": {},
 		"ghcr.io/devcontainers/features/node:1": {
-			"version": "20.4.0"
+			"version": "20.3.1"
 		}
 	},
 	"forwardPorts": [3000],
diff --git a/.node-version b/.node-version
index bd45cd74a..dd0fe95cc 100644
--- a/.node-version
+++ b/.node-version
@@ -1 +1 @@
-20.4.0
+20.3.1
diff --git a/Dockerfile b/Dockerfile
index c6ddee2ae..5431c28aa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax = docker/dockerfile:1.4
 
-ARG NODE_VERSION=20.4.0-bullseye
+ARG NODE_VERSION=20.3.1-bullseye
 
 # build assets & compile TypeScript
 

From 081a14d6f3ca3664aabdd06aaf06080dcba17c25 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Jul 2023 16:53:07 +0900
Subject: [PATCH 19/31] perf(backend): use limit() instead of take()

---
 CHANGELOG.md                                                | 1 +
 packages/backend/src/core/SearchService.ts                  | 2 +-
 packages/backend/src/server/ActivityPubServerService.ts     | 2 +-
 .../src/server/api/endpoints/admin/abuse-user-reports.ts    | 2 +-
 packages/backend/src/server/api/endpoints/admin/ad/list.ts  | 2 +-
 .../src/server/api/endpoints/admin/announcements/list.ts    | 2 +-
 .../backend/src/server/api/endpoints/admin/drive/files.ts   | 2 +-
 .../src/server/api/endpoints/admin/emoji/list-remote.ts     | 2 +-
 .../backend/src/server/api/endpoints/admin/emoji/list.ts    | 4 ++--
 .../backend/src/server/api/endpoints/admin/roles/users.ts   | 2 +-
 .../src/server/api/endpoints/admin/show-moderation-logs.ts  | 2 +-
 .../backend/src/server/api/endpoints/admin/show-users.ts    | 2 +-
 packages/backend/src/server/api/endpoints/announcements.ts  | 2 +-
 packages/backend/src/server/api/endpoints/blocking/list.ts  | 2 +-
 .../backend/src/server/api/endpoints/channels/featured.ts   | 2 +-
 .../backend/src/server/api/endpoints/channels/followed.ts   | 2 +-
 packages/backend/src/server/api/endpoints/channels/owned.ts | 2 +-
 .../backend/src/server/api/endpoints/channels/search.ts     | 2 +-
 .../backend/src/server/api/endpoints/channels/timeline.ts   | 2 +-
 packages/backend/src/server/api/endpoints/clips/notes.ts    | 2 +-
 packages/backend/src/server/api/endpoints/drive/files.ts    | 2 +-
 packages/backend/src/server/api/endpoints/drive/folders.ts  | 2 +-
 packages/backend/src/server/api/endpoints/drive/stream.ts   | 2 +-
 .../src/server/api/endpoints/federation/followers.ts        | 2 +-
 .../src/server/api/endpoints/federation/following.ts        | 2 +-
 .../src/server/api/endpoints/federation/instances.ts        | 2 +-
 .../backend/src/server/api/endpoints/federation/users.ts    | 2 +-
 packages/backend/src/server/api/endpoints/flash/featured.ts | 2 +-
 packages/backend/src/server/api/endpoints/flash/my-likes.ts | 2 +-
 packages/backend/src/server/api/endpoints/flash/my.ts       | 2 +-
 .../src/server/api/endpoints/following/requests/list.ts     | 2 +-
 .../backend/src/server/api/endpoints/gallery/featured.ts    | 2 +-
 .../backend/src/server/api/endpoints/gallery/popular.ts     | 2 +-
 packages/backend/src/server/api/endpoints/gallery/posts.ts  | 2 +-
 packages/backend/src/server/api/endpoints/hashtags/list.ts  | 2 +-
 .../backend/src/server/api/endpoints/hashtags/search.ts     | 2 +-
 packages/backend/src/server/api/endpoints/hashtags/users.ts | 2 +-
 packages/backend/src/server/api/endpoints/i/favorites.ts    | 2 +-
 .../backend/src/server/api/endpoints/i/gallery/likes.ts     | 2 +-
 .../backend/src/server/api/endpoints/i/gallery/posts.ts     | 2 +-
 packages/backend/src/server/api/endpoints/i/page-likes.ts   | 2 +-
 packages/backend/src/server/api/endpoints/i/pages.ts        | 2 +-
 .../backend/src/server/api/endpoints/i/signin-history.ts    | 2 +-
 packages/backend/src/server/api/endpoints/mute/list.ts      | 2 +-
 packages/backend/src/server/api/endpoints/notes.ts          | 2 +-
 packages/backend/src/server/api/endpoints/notes/children.ts | 2 +-
 packages/backend/src/server/api/endpoints/notes/featured.ts | 2 +-
 .../src/server/api/endpoints/notes/global-timeline.ts       | 2 +-
 .../src/server/api/endpoints/notes/hybrid-timeline.ts       | 2 +-
 .../src/server/api/endpoints/notes/local-timeline.ts        | 2 +-
 packages/backend/src/server/api/endpoints/notes/mentions.ts | 2 +-
 .../src/server/api/endpoints/notes/polls/recommendation.ts  | 2 +-
 packages/backend/src/server/api/endpoints/notes/renotes.ts  | 2 +-
 packages/backend/src/server/api/endpoints/notes/replies.ts  | 2 +-
 .../backend/src/server/api/endpoints/notes/search-by-tag.ts | 2 +-
 packages/backend/src/server/api/endpoints/notes/timeline.ts | 2 +-
 .../src/server/api/endpoints/notes/user-list-timeline.ts    | 2 +-
 packages/backend/src/server/api/endpoints/pages/featured.ts | 2 +-
 .../backend/src/server/api/endpoints/renote-mute/list.ts    | 2 +-
 packages/backend/src/server/api/endpoints/roles/users.ts    | 2 +-
 packages/backend/src/server/api/endpoints/users.ts          | 2 +-
 packages/backend/src/server/api/endpoints/users/clips.ts    | 2 +-
 .../backend/src/server/api/endpoints/users/followers.ts     | 2 +-
 .../backend/src/server/api/endpoints/users/following.ts     | 2 +-
 .../backend/src/server/api/endpoints/users/gallery/posts.ts | 2 +-
 packages/backend/src/server/api/endpoints/users/notes.ts    | 2 +-
 packages/backend/src/server/api/endpoints/users/pages.ts    | 2 +-
 .../backend/src/server/api/endpoints/users/reactions.ts     | 2 +-
 .../src/server/api/endpoints/users/recommendation.ts        | 2 +-
 .../api/endpoints/users/search-by-username-and-host.ts      | 6 +++---
 packages/backend/src/server/api/endpoints/users/search.ts   | 6 +++---
 71 files changed, 76 insertions(+), 75 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 905c2ea2d..a27190215 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 - JSON.parse の回数を削減することで、ストリーミングのパフォーマンスを向上しました
 - nsfwjs のモデルロードを排他することで、重複ロードによってメモリ使用量が増加しないように
 - 連合の配送ジョブのパフォーマンスを向上（ロック機構の見直し、Redisキャッシュの活用）
+- 全体的なDBクエリのパフォーマンスを向上
 
 ## 13.13.2
 
diff --git a/packages/backend/src/core/SearchService.ts b/packages/backend/src/core/SearchService.ts
index 9502afcc9..956c4cc09 100644
--- a/packages/backend/src/core/SearchService.ts
+++ b/packages/backend/src/core/SearchService.ts
@@ -174,7 +174,7 @@ export class SearchService {
 			if (me) this.queryService.generateMutedUserQuery(query, me);
 			if (me) this.queryService.generateBlockedUserQuery(query, me);
 
-			return await query.take(pagination.limit).getMany();
+			return await query.limit(pagination.limit).getMany();
 		}
 	}
 }
diff --git a/packages/backend/src/server/ActivityPubServerService.ts b/packages/backend/src/server/ActivityPubServerService.ts
index 455acd1e4..f53351d99 100644
--- a/packages/backend/src/server/ActivityPubServerService.ts
+++ b/packages/backend/src/server/ActivityPubServerService.ts
@@ -369,7 +369,7 @@ export class ActivityPubServerService {
 				}))
 				.andWhere('note.localOnly = FALSE');
 
-			const notes = await query.take(limit).getMany();
+			const notes = await query.limit(limit).getMany();
 
 			if (sinceId) notes.reverse();
 
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 9bba16166..b8ea74b7c 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
@@ -115,7 +115,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				case 'remote': query.andWhere('report.targetUserHost IS NOT NULL'); break;
 			}
 
-			const reports = await query.take(ps.limit).getMany();
+			const reports = await query.limit(ps.limit).getMany();
 
 			return await this.abuseUserReportEntityService.packMany(reports);
 		});
diff --git a/packages/backend/src/server/api/endpoints/admin/ad/list.ts b/packages/backend/src/server/api/endpoints/admin/ad/list.ts
index 0b6d00605..725ddb58b 100644
--- a/packages/backend/src/server/api/endpoints/admin/ad/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/ad/list.ts
@@ -32,7 +32,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 	) {
 		super(meta, paramDef, async (ps, me) => {
 			const query = this.queryService.makePaginationQuery(this.adsRepository.createQueryBuilder('ad'), ps.sinceId, ps.untilId);
-			const ads = await query.take(ps.limit).getMany();
+			const ads = await query.limit(ps.limit).getMany();
 
 			return ads;
 		});
diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
index 9b2049412..11231f6e0 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/list.ts
@@ -80,7 +80,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		super(meta, paramDef, async (ps, me) => {
 			const query = this.queryService.makePaginationQuery(this.announcementsRepository.createQueryBuilder('announcement'), ps.sinceId, ps.untilId);
 
-			const announcements = await query.take(ps.limit).getMany();
+			const announcements = await query.limit(ps.limit).getMany();
 
 			const reads = new Map<Announcement, number>();
 
diff --git a/packages/backend/src/server/api/endpoints/admin/drive/files.ts b/packages/backend/src/server/api/endpoints/admin/drive/files.ts
index 8a4498d5f..2901fdb77 100644
--- a/packages/backend/src/server/api/endpoints/admin/drive/files.ts
+++ b/packages/backend/src/server/api/endpoints/admin/drive/files.ts
@@ -76,7 +76,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				}
 			}
 
-			const files = await query.take(ps.limit).getMany();
+			const files = await query.limit(ps.limit).getMany();
 
 			return await this.driveFileEntityService.packMany(files, { detail: true, withUser: true, self: 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 df3c28def..8d50413e9 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
@@ -98,7 +98,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 			const emojis = await q
 				.orderBy('emoji.id', 'DESC')
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return this.emojiEntityService.packDetailedMany(emojis);
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 1a6a36168..80acdd191 100644
--- a/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
+++ b/packages/backend/src/server/api/endpoints/admin/emoji/list.ts
@@ -84,7 +84,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 			if (ps.query) {
 				//q.andWhere('emoji.name ILIKE :q', { q: `%${ sqlLikeEscape(ps.query) }%` });
-				//const emojis = await q.take(ps.limit).getMany();
+				//const emojis = await q.limit(ps.limit).getMany();
 
 				emojis = await q.getMany();
 				const queryarry = ps.query.match(/\:([a-z0-9_]*)\:/g);
@@ -101,7 +101,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				}
 				emojis.splice(ps.limit + 1);
 			} else {
-				emojis = await q.take(ps.limit).getMany();
+				emojis = await q.limit(ps.limit).getMany();
 			}
 
 			return this.emojiEntityService.packDetailedMany(emojis);
diff --git a/packages/backend/src/server/api/endpoints/admin/roles/users.ts b/packages/backend/src/server/api/endpoints/admin/roles/users.ts
index 35edca546..63650bb2b 100644
--- a/packages/backend/src/server/api/endpoints/admin/roles/users.ts
+++ b/packages/backend/src/server/api/endpoints/admin/roles/users.ts
@@ -64,7 +64,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.innerJoinAndSelect('assign.user', 'user');
 
 			const assigns = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await Promise.all(assigns.map(async assign => ({
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 24335a21c..69c95ef19 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
@@ -74,7 +74,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		super(meta, paramDef, async (ps, me) => {
 			const query = this.queryService.makePaginationQuery(this.moderationLogsRepository.createQueryBuilder('report'), ps.sinceId, ps.untilId);
 
-			const reports = await query.take(ps.limit).getMany();
+			const reports = await query.limit(ps.limit).getMany();
 
 			return await this.moderationLogEntityService.packMany(reports);
 		});
diff --git a/packages/backend/src/server/api/endpoints/admin/show-users.ts b/packages/backend/src/server/api/endpoints/admin/show-users.ts
index 426973f28..0a150d1df 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-users.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-users.ts
@@ -104,7 +104,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				default: query.orderBy('user.id', 'ASC'); break;
 			}
 
-			query.take(ps.limit);
+			query.limit(ps.limit);
 			query.skip(ps.offset);
 
 			const users = await query.getMany();
diff --git a/packages/backend/src/server/api/endpoints/announcements.ts b/packages/backend/src/server/api/endpoints/announcements.ts
index 79788be4e..735af51ee 100644
--- a/packages/backend/src/server/api/endpoints/announcements.ts
+++ b/packages/backend/src/server/api/endpoints/announcements.ts
@@ -79,7 +79,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		super(meta, paramDef, async (ps, me) => {
 			const query = this.queryService.makePaginationQuery(this.announcementsRepository.createQueryBuilder('announcement'), ps.sinceId, ps.untilId);
 
-			const announcements = await query.take(ps.limit).getMany();
+			const announcements = await query.limit(ps.limit).getMany();
 
 			if (me) {
 				const reads = (await this.announcementReadsRepository.findBy({
diff --git a/packages/backend/src/server/api/endpoints/blocking/list.ts b/packages/backend/src/server/api/endpoints/blocking/list.ts
index 969aae06f..d61bb0d21 100644
--- a/packages/backend/src/server/api/endpoints/blocking/list.ts
+++ b/packages/backend/src/server/api/endpoints/blocking/list.ts
@@ -48,7 +48,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('blocking.blockerId = :meId', { meId: me.id });
 
 			const blockings = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.blockingEntityService.packMany(blockings, me);
diff --git a/packages/backend/src/server/api/endpoints/channels/featured.ts b/packages/backend/src/server/api/endpoints/channels/featured.ts
index 1a8d1164c..953f027aa 100644
--- a/packages/backend/src/server/api/endpoints/channels/featured.ts
+++ b/packages/backend/src/server/api/endpoints/channels/featured.ts
@@ -41,7 +41,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('channel.isArchived = FALSE')
 				.orderBy('channel.lastNotedAt', 'DESC');
 
-			const channels = await query.take(10).getMany();
+			const channels = await query.limit(10).getMany();
 
 			return await Promise.all(channels.map(x => this.channelEntityService.pack(x, me)));
 		});
diff --git a/packages/backend/src/server/api/endpoints/channels/followed.ts b/packages/backend/src/server/api/endpoints/channels/followed.ts
index f49f3105d..a1656903a 100644
--- a/packages/backend/src/server/api/endpoints/channels/followed.ts
+++ b/packages/backend/src/server/api/endpoints/channels/followed.ts
@@ -48,7 +48,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere({ followerId: me.id });
 
 			const followings = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await Promise.all(followings.map(x => this.channelEntityService.pack(x.followeeId, me)));
diff --git a/packages/backend/src/server/api/endpoints/channels/owned.ts b/packages/backend/src/server/api/endpoints/channels/owned.ts
index 8fae972cb..4561bb2e9 100644
--- a/packages/backend/src/server/api/endpoints/channels/owned.ts
+++ b/packages/backend/src/server/api/endpoints/channels/owned.ts
@@ -49,7 +49,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere({ userId: me.id });
 
 			const channels = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await Promise.all(channels.map(x => this.channelEntityService.pack(x, me)));
diff --git a/packages/backend/src/server/api/endpoints/channels/search.ts b/packages/backend/src/server/api/endpoints/channels/search.ts
index a3b40b0bb..dfb693796 100644
--- a/packages/backend/src/server/api/endpoints/channels/search.ts
+++ b/packages/backend/src/server/api/endpoints/channels/search.ts
@@ -61,7 +61,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			}
 
 			const channels = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await Promise.all(channels.map(x => this.channelEntityService.pack(x, me)));
diff --git a/packages/backend/src/server/api/endpoints/channels/timeline.ts b/packages/backend/src/server/api/endpoints/channels/timeline.ts
index 833bd63c1..e3119cc40 100644
--- a/packages/backend/src/server/api/endpoints/channels/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/channels/timeline.ts
@@ -105,7 +105,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				}
 				//#endregion
 
-				timeline = await query.take(ps.limit).getMany();
+				timeline = await query.limit(ps.limit).getMany();
 			} else {
 				const noteIds = noteIdsRes.map(x => x[1][1]).filter(x => x !== ps.untilId);
 
diff --git a/packages/backend/src/server/api/endpoints/clips/notes.ts b/packages/backend/src/server/api/endpoints/clips/notes.ts
index dcb415b75..49607babe 100644
--- a/packages/backend/src/server/api/endpoints/clips/notes.ts
+++ b/packages/backend/src/server/api/endpoints/clips/notes.ts
@@ -88,7 +88,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			}
 
 			const notes = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.noteEntityService.packMany(notes, me);
diff --git a/packages/backend/src/server/api/endpoints/drive/files.ts b/packages/backend/src/server/api/endpoints/drive/files.ts
index 460930777..f4343248b 100644
--- a/packages/backend/src/server/api/endpoints/drive/files.ts
+++ b/packages/backend/src/server/api/endpoints/drive/files.ts
@@ -73,7 +73,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				case '-size': query.orderBy('file.size', 'ASC'); break;
 			}
 
-			const files = await query.take(ps.limit).getMany();
+			const files = await query.limit(ps.limit).getMany();
 
 			return await this.driveFileEntityService.packMany(files, { detail: false, self: true });
 		});
diff --git a/packages/backend/src/server/api/endpoints/drive/folders.ts b/packages/backend/src/server/api/endpoints/drive/folders.ts
index b41eaf446..eb674f3e1 100644
--- a/packages/backend/src/server/api/endpoints/drive/folders.ts
+++ b/packages/backend/src/server/api/endpoints/drive/folders.ts
@@ -54,7 +54,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				query.andWhere('folder.parentId IS NULL');
 			}
 
-			const folders = await query.take(ps.limit).getMany();
+			const folders = await query.limit(ps.limit).getMany();
 
 			return await Promise.all(folders.map(folder => this.driveFolderEntityService.pack(folder)));
 		});
diff --git a/packages/backend/src/server/api/endpoints/drive/stream.ts b/packages/backend/src/server/api/endpoints/drive/stream.ts
index 61bcfea0c..a1c14a8e3 100644
--- a/packages/backend/src/server/api/endpoints/drive/stream.ts
+++ b/packages/backend/src/server/api/endpoints/drive/stream.ts
@@ -56,7 +56,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				}
 			}
 
-			const files = await query.take(ps.limit).getMany();
+			const files = await query.limit(ps.limit).getMany();
 
 			return await this.driveFileEntityService.packMany(files, { detail: false, self: true });
 		});
diff --git a/packages/backend/src/server/api/endpoints/federation/followers.ts b/packages/backend/src/server/api/endpoints/federation/followers.ts
index be1d6c8e5..1b2f9446f 100644
--- a/packages/backend/src/server/api/endpoints/federation/followers.ts
+++ b/packages/backend/src/server/api/endpoints/federation/followers.ts
@@ -47,7 +47,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('following.followeeHost = :host', { host: ps.host });
 
 			const followings = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.followingEntityService.packMany(followings, me, { populateFollowee: true });
diff --git a/packages/backend/src/server/api/endpoints/federation/following.ts b/packages/backend/src/server/api/endpoints/federation/following.ts
index 74656ce86..c5aa1ec60 100644
--- a/packages/backend/src/server/api/endpoints/federation/following.ts
+++ b/packages/backend/src/server/api/endpoints/federation/following.ts
@@ -47,7 +47,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('following.followerHost = :host', { host: ps.host });
 
 			const followings = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.followingEntityService.packMany(followings, me, { populateFollowee: true });
diff --git a/packages/backend/src/server/api/endpoints/federation/instances.ts b/packages/backend/src/server/api/endpoints/federation/instances.ts
index 061c6eb5b..ddf1a178b 100644
--- a/packages/backend/src/server/api/endpoints/federation/instances.ts
+++ b/packages/backend/src/server/api/endpoints/federation/instances.ts
@@ -126,7 +126,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				query.andWhere('instance.host like :host', { host: '%' + sqlLikeEscape(ps.host.toLowerCase()) + '%' });
 			}
 
-			const instances = await query.take(ps.limit).skip(ps.offset).getMany();
+			const instances = await query.limit(ps.limit).skip(ps.offset).getMany();
 
 			return await this.instanceEntityService.packMany(instances);
 		});
diff --git a/packages/backend/src/server/api/endpoints/federation/users.ts b/packages/backend/src/server/api/endpoints/federation/users.ts
index a028930f2..06f252005 100644
--- a/packages/backend/src/server/api/endpoints/federation/users.ts
+++ b/packages/backend/src/server/api/endpoints/federation/users.ts
@@ -47,7 +47,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('user.host = :host', { host: ps.host });
 
 			const users = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.userEntityService.packMany(users, me, { detail: true });
diff --git a/packages/backend/src/server/api/endpoints/flash/featured.ts b/packages/backend/src/server/api/endpoints/flash/featured.ts
index 570aef96d..99c8763b1 100644
--- a/packages/backend/src/server/api/endpoints/flash/featured.ts
+++ b/packages/backend/src/server/api/endpoints/flash/featured.ts
@@ -40,7 +40,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('flash.likedCount > 0')
 				.orderBy('flash.likedCount', 'DESC');
 
-			const flashs = await query.take(10).getMany();
+			const flashs = await query.limit(10).getMany();
 
 			return await this.flashEntityService.packMany(flashs, me);
 		});
diff --git a/packages/backend/src/server/api/endpoints/flash/my-likes.ts b/packages/backend/src/server/api/endpoints/flash/my-likes.ts
index f7716ea74..7d1149ada 100644
--- a/packages/backend/src/server/api/endpoints/flash/my-likes.ts
+++ b/packages/backend/src/server/api/endpoints/flash/my-likes.ts
@@ -59,7 +59,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.leftJoinAndSelect('like.flash', 'flash');
 
 			const likes = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return this.flashLikeEntityService.packMany(likes, me);
diff --git a/packages/backend/src/server/api/endpoints/flash/my.ts b/packages/backend/src/server/api/endpoints/flash/my.ts
index baed7f000..45a3b50e0 100644
--- a/packages/backend/src/server/api/endpoints/flash/my.ts
+++ b/packages/backend/src/server/api/endpoints/flash/my.ts
@@ -48,7 +48,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('flash.userId = :meId', { meId: me.id });
 
 			const flashs = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.flashEntityService.packMany(flashs);
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 d68248fab..29588e873 100644
--- a/packages/backend/src/server/api/endpoints/following/requests/list.ts
+++ b/packages/backend/src/server/api/endpoints/following/requests/list.ts
@@ -64,7 +64,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('request.followeeId = :meId', { meId: me.id });
 
 			const requests = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await Promise.all(requests.map(req => this.followRequestEntityService.pack(req)));
diff --git a/packages/backend/src/server/api/endpoints/gallery/featured.ts b/packages/backend/src/server/api/endpoints/gallery/featured.ts
index 9994ce90d..46347247f 100644
--- a/packages/backend/src/server/api/endpoints/gallery/featured.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/featured.ts
@@ -41,7 +41,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('post.likedCount > 0')
 				.orderBy('post.likedCount', 'DESC');
 
-			const posts = await query.take(10).getMany();
+			const posts = await query.limit(10).getMany();
 
 			return await this.galleryPostEntityService.packMany(posts, me);
 		});
diff --git a/packages/backend/src/server/api/endpoints/gallery/popular.ts b/packages/backend/src/server/api/endpoints/gallery/popular.ts
index 55d3dabfb..4ee3d68a9 100644
--- a/packages/backend/src/server/api/endpoints/gallery/popular.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/popular.ts
@@ -40,7 +40,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('post.likedCount > 0')
 				.orderBy('post.likedCount', 'DESC');
 
-			const posts = await query.take(10).getMany();
+			const posts = await query.limit(10).getMany();
 
 			return await this.galleryPostEntityService.packMany(posts, me);
 		});
diff --git a/packages/backend/src/server/api/endpoints/gallery/posts.ts b/packages/backend/src/server/api/endpoints/gallery/posts.ts
index e94003eb7..b9aac3fb3 100644
--- a/packages/backend/src/server/api/endpoints/gallery/posts.ts
+++ b/packages/backend/src/server/api/endpoints/gallery/posts.ts
@@ -43,7 +43,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			const query = this.queryService.makePaginationQuery(this.galleryPostsRepository.createQueryBuilder('post'), ps.sinceId, ps.untilId)
 				.innerJoinAndSelect('post.user', 'user');
 
-			const posts = await query.take(ps.limit).getMany();
+			const posts = await query.limit(ps.limit).getMany();
 
 			return await this.galleryPostEntityService.packMany(posts, me);
 		});
diff --git a/packages/backend/src/server/api/endpoints/hashtags/list.ts b/packages/backend/src/server/api/endpoints/hashtags/list.ts
index 226a11de0..693d938bf 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/list.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/list.ts
@@ -73,7 +73,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				'tag.attachedRemoteUsersCount',
 			]);
 
-			const tags = await query.take(ps.limit).getMany();
+			const tags = await query.limit(ps.limit).getMany();
 
 			return this.hashtagEntityService.packMany(tags);
 		});
diff --git a/packages/backend/src/server/api/endpoints/hashtags/search.ts b/packages/backend/src/server/api/endpoints/hashtags/search.ts
index 4f5f97976..e2e00def7 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/search.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/search.ts
@@ -41,7 +41,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.where('tag.name like :q', { q: sqlLikeEscape(ps.query.toLowerCase()) + '%' })
 				.orderBy('tag.count', 'DESC')
 				.groupBy('tag.id')
-				.take(ps.limit)
+				.limit(ps.limit)
 				.skip(ps.offset)
 				.getMany();
 
diff --git a/packages/backend/src/server/api/endpoints/hashtags/users.ts b/packages/backend/src/server/api/endpoints/hashtags/users.ts
index a86faf41a..b00b005ad 100644
--- a/packages/backend/src/server/api/endpoints/hashtags/users.ts
+++ b/packages/backend/src/server/api/endpoints/hashtags/users.ts
@@ -68,7 +68,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				case '-updatedAt': query.orderBy('user.updatedAt', 'ASC'); break;
 			}
 
-			const users = await query.take(ps.limit).getMany();
+			const users = await query.limit(ps.limit).getMany();
 
 			return await this.userEntityService.packMany(users, me, { detail: true });
 		});
diff --git a/packages/backend/src/server/api/endpoints/i/favorites.ts b/packages/backend/src/server/api/endpoints/i/favorites.ts
index ce8ab4962..bdfb63974 100644
--- a/packages/backend/src/server/api/endpoints/i/favorites.ts
+++ b/packages/backend/src/server/api/endpoints/i/favorites.ts
@@ -49,7 +49,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.leftJoinAndSelect('favorite.note', 'note');
 
 			const favorites = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.noteFavoriteEntityService.packMany(favorites, me);
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 d1b04cb65..915639e5f 100644
--- a/packages/backend/src/server/api/endpoints/i/gallery/likes.ts
+++ b/packages/backend/src/server/api/endpoints/i/gallery/likes.ts
@@ -60,7 +60,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.leftJoinAndSelect('like.post', 'post');
 
 			const likes = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.galleryLikeEntityService.packMany(likes, me);
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 32d14293f..5ba9afd4a 100644
--- a/packages/backend/src/server/api/endpoints/i/gallery/posts.ts
+++ b/packages/backend/src/server/api/endpoints/i/gallery/posts.ts
@@ -48,7 +48,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('post.userId = :meId', { meId: me.id });
 
 			const posts = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.galleryPostEntityService.packMany(posts, me);
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 70e6e0a6a..9f073ba59 100644
--- a/packages/backend/src/server/api/endpoints/i/page-likes.ts
+++ b/packages/backend/src/server/api/endpoints/i/page-likes.ts
@@ -59,7 +59,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.leftJoinAndSelect('like.page', 'page');
 
 			const likes = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return this.pageLikeEntityService.packMany(likes, me);
diff --git a/packages/backend/src/server/api/endpoints/i/pages.ts b/packages/backend/src/server/api/endpoints/i/pages.ts
index 285aa34e9..772486bef 100644
--- a/packages/backend/src/server/api/endpoints/i/pages.ts
+++ b/packages/backend/src/server/api/endpoints/i/pages.ts
@@ -48,7 +48,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('page.userId = :meId', { meId: me.id });
 
 			const pages = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.pageEntityService.packMany(pages);
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 9b30a2433..aa8cb5cf4 100644
--- a/packages/backend/src/server/api/endpoints/i/signin-history.ts
+++ b/packages/backend/src/server/api/endpoints/i/signin-history.ts
@@ -35,7 +35,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			const query = this.queryService.makePaginationQuery(this.signinsRepository.createQueryBuilder('signin'), ps.sinceId, ps.untilId)
 				.andWhere('signin.userId = :meId', { meId: me.id });
 
-			const history = await query.take(ps.limit).getMany();
+			const history = await query.limit(ps.limit).getMany();
 
 			return await Promise.all(history.map(record => this.signinEntityService.pack(record)));
 		});
diff --git a/packages/backend/src/server/api/endpoints/mute/list.ts b/packages/backend/src/server/api/endpoints/mute/list.ts
index 9ec6d1727..4711e86d6 100644
--- a/packages/backend/src/server/api/endpoints/mute/list.ts
+++ b/packages/backend/src/server/api/endpoints/mute/list.ts
@@ -48,7 +48,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('muting.muterId = :meId', { meId: me.id });
 
 			const mutings = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.mutingEntityService.packMany(mutings, me);
diff --git a/packages/backend/src/server/api/endpoints/notes.ts b/packages/backend/src/server/api/endpoints/notes.ts
index a6e9707d3..9013b300e 100644
--- a/packages/backend/src/server/api/endpoints/notes.ts
+++ b/packages/backend/src/server/api/endpoints/notes.ts
@@ -79,7 +79,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			//	query.isBot = bot;
 			//}
 
-			const notes = await query.take(ps.limit).getMany();
+			const notes = await query.limit(ps.limit).getMany();
 
 			return await this.noteEntityService.packMany(notes);
 		});
diff --git a/packages/backend/src/server/api/endpoints/notes/children.ts b/packages/backend/src/server/api/endpoints/notes/children.ts
index 26f2d6772..5f03fd4b7 100644
--- a/packages/backend/src/server/api/endpoints/notes/children.ts
+++ b/packages/backend/src/server/api/endpoints/notes/children.ts
@@ -68,7 +68,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				this.queryService.generateBlockedUserQuery(query, me);
 			}
 
-			const notes = await query.take(ps.limit).getMany();
+			const notes = await query.limit(ps.limit).getMany();
 
 			return await this.noteEntityService.packMany(notes, me);
 		});
diff --git a/packages/backend/src/server/api/endpoints/notes/featured.ts b/packages/backend/src/server/api/endpoints/notes/featured.ts
index bdb06498b..3a3cb0739 100644
--- a/packages/backend/src/server/api/endpoints/notes/featured.ts
+++ b/packages/backend/src/server/api/endpoints/notes/featured.ts
@@ -65,7 +65,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 			let notes = await query
 				.orderBy('note.score', 'DESC')
-				.take(100)
+				.limit(100)
 				.getMany();
 
 			notes.sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime());
diff --git a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
index 88c1ca7f5..4ce2fdaec 100644
--- a/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/global-timeline.ts
@@ -88,7 +88,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			}
 			//#endregion
 
-			const timeline = await query.take(ps.limit).getMany();
+			const timeline = await query.limit(ps.limit).getMany();
 
 			process.nextTick(() => {
 				if (me) {
diff --git a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
index 7a3581e6e..af94cf608 100644
--- a/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/hybrid-timeline.ts
@@ -137,7 +137,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			}
 			//#endregion
 
-			const timeline = await query.take(ps.limit).getMany();
+			const timeline = await query.limit(ps.limit).getMany();
 
 			process.nextTick(() => {
 				this.activeUsersChart.read(me);
diff --git a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
index 2ee549232..fe7407f48 100644
--- a/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/local-timeline.ts
@@ -110,7 +110,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			}
 			//#endregion
 
-			const timeline = await query.take(ps.limit).getMany();
+			const timeline = await query.limit(ps.limit).getMany();
 
 			process.nextTick(() => {
 				if (me) {
diff --git a/packages/backend/src/server/api/endpoints/notes/mentions.ts b/packages/backend/src/server/api/endpoints/notes/mentions.ts
index 4e9f604d8..6ee9de1e2 100644
--- a/packages/backend/src/server/api/endpoints/notes/mentions.ts
+++ b/packages/backend/src/server/api/endpoints/notes/mentions.ts
@@ -79,7 +79,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				query.setParameters(followingQuery.getParameters());
 			}
 
-			const mentions = await query.take(ps.limit).getMany();
+			const mentions = await query.limit(ps.limit).getMany();
 
 			this.noteReadService.read(me.id, mentions);
 
diff --git a/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts b/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts
index 6cdc9b902..0b4ccdcf2 100644
--- a/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts
+++ b/packages/backend/src/server/api/endpoints/notes/polls/recommendation.ts
@@ -82,7 +82,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 			const polls = await query
 				.orderBy('poll.noteId', 'DESC')
-				.take(ps.limit)
+				.limit(ps.limit)
 				.skip(ps.offset)
 				.getMany();
 
diff --git a/packages/backend/src/server/api/endpoints/notes/renotes.ts b/packages/backend/src/server/api/endpoints/notes/renotes.ts
index d40685566..4ee12b335 100644
--- a/packages/backend/src/server/api/endpoints/notes/renotes.ts
+++ b/packages/backend/src/server/api/endpoints/notes/renotes.ts
@@ -71,7 +71,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			if (me) this.queryService.generateMutedUserQuery(query, me);
 			if (me) this.queryService.generateBlockedUserQuery(query, me);
 
-			const renotes = await query.take(ps.limit).getMany();
+			const renotes = await query.limit(ps.limit).getMany();
 
 			return await this.noteEntityService.packMany(renotes, me);
 		});
diff --git a/packages/backend/src/server/api/endpoints/notes/replies.ts b/packages/backend/src/server/api/endpoints/notes/replies.ts
index f2af71d55..900c40d32 100644
--- a/packages/backend/src/server/api/endpoints/notes/replies.ts
+++ b/packages/backend/src/server/api/endpoints/notes/replies.ts
@@ -55,7 +55,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			if (me) this.queryService.generateMutedUserQuery(query, me);
 			if (me) this.queryService.generateBlockedUserQuery(query, me);
 
-			const timeline = await query.take(ps.limit).getMany();
+			const timeline = await query.limit(ps.limit).getMany();
 
 			return await this.noteEntityService.packMany(timeline, me);
 		});
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 742df0ca9..dc0a5dcee 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
@@ -130,7 +130,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			}
 
 			// Search notes
-			const notes = await query.take(ps.limit).getMany();
+			const notes = await query.limit(ps.limit).getMany();
 
 			return await this.noteEntityService.packMany(notes, me);
 		});
diff --git a/packages/backend/src/server/api/endpoints/notes/timeline.ts b/packages/backend/src/server/api/endpoints/notes/timeline.ts
index e1f286439..7e9bf85d8 100644
--- a/packages/backend/src/server/api/endpoints/notes/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/timeline.ts
@@ -123,7 +123,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			}
 			//#endregion
 
-			const timeline = await query.take(ps.limit).getMany();
+			const timeline = await query.limit(ps.limit).getMany();
 
 			process.nextTick(() => {
 				this.activeUsersChart.read(me);
diff --git a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
index afc9bc421..4c19e1a55 100644
--- a/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
+++ b/packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
@@ -127,7 +127,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			}
 			//#endregion
 
-			const timeline = await query.take(ps.limit).getMany();
+			const timeline = await query.limit(ps.limit).getMany();
 
 			this.activeUsersChart.read(me);
 
diff --git a/packages/backend/src/server/api/endpoints/pages/featured.ts b/packages/backend/src/server/api/endpoints/pages/featured.ts
index 31844165e..b1c056124 100644
--- a/packages/backend/src/server/api/endpoints/pages/featured.ts
+++ b/packages/backend/src/server/api/endpoints/pages/featured.ts
@@ -41,7 +41,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('page.likedCount > 0')
 				.orderBy('page.likedCount', 'DESC');
 
-			const pages = await query.take(10).getMany();
+			const pages = await query.limit(10).getMany();
 
 			return await this.pageEntityService.packMany(pages, me);
 		});
diff --git a/packages/backend/src/server/api/endpoints/renote-mute/list.ts b/packages/backend/src/server/api/endpoints/renote-mute/list.ts
index b2d7addb6..cb4e1feba 100644
--- a/packages/backend/src/server/api/endpoints/renote-mute/list.ts
+++ b/packages/backend/src/server/api/endpoints/renote-mute/list.ts
@@ -48,7 +48,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('muting.muterId = :meId', { meId: me.id });
 
 			const mutings = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.renoteMutingEntityService.packMany(mutings, me);
diff --git a/packages/backend/src/server/api/endpoints/roles/users.ts b/packages/backend/src/server/api/endpoints/roles/users.ts
index b2cb8b42a..cc2720188 100644
--- a/packages/backend/src/server/api/endpoints/roles/users.ts
+++ b/packages/backend/src/server/api/endpoints/roles/users.ts
@@ -65,7 +65,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.innerJoinAndSelect('assign.user', 'user');
 
 			const assigns = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await Promise.all(assigns.map(async assign => ({
diff --git a/packages/backend/src/server/api/endpoints/users.ts b/packages/backend/src/server/api/endpoints/users.ts
index 28cd9f6ce..2582932e3 100644
--- a/packages/backend/src/server/api/endpoints/users.ts
+++ b/packages/backend/src/server/api/endpoints/users.ts
@@ -80,7 +80,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			if (me) this.queryService.generateMutedUserQueryForUsers(query, me);
 			if (me) this.queryService.generateBlockQueryForUsers(query, me);
 
-			query.take(ps.limit);
+			query.limit(ps.limit);
 			query.skip(ps.offset);
 
 			const users = await query.getMany();
diff --git a/packages/backend/src/server/api/endpoints/users/clips.ts b/packages/backend/src/server/api/endpoints/users/clips.ts
index c5aa93baa..c2ad420cb 100644
--- a/packages/backend/src/server/api/endpoints/users/clips.ts
+++ b/packages/backend/src/server/api/endpoints/users/clips.ts
@@ -48,7 +48,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('clip.isPublic = true');
 
 			const clips = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.clipEntityService.packMany(clips, me);
diff --git a/packages/backend/src/server/api/endpoints/users/followers.ts b/packages/backend/src/server/api/endpoints/users/followers.ts
index 97f1310c3..c6f71474b 100644
--- a/packages/backend/src/server/api/endpoints/users/followers.ts
+++ b/packages/backend/src/server/api/endpoints/users/followers.ts
@@ -112,7 +112,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.innerJoinAndSelect('following.follower', 'follower');
 
 			const followings = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.followingEntityService.packMany(followings, me, { populateFollower: true });
diff --git a/packages/backend/src/server/api/endpoints/users/following.ts b/packages/backend/src/server/api/endpoints/users/following.ts
index d406594a2..b072c9662 100644
--- a/packages/backend/src/server/api/endpoints/users/following.ts
+++ b/packages/backend/src/server/api/endpoints/users/following.ts
@@ -112,7 +112,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.innerJoinAndSelect('following.followee', 'followee');
 
 			const followings = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.followingEntityService.packMany(followings, me, { populateFollowee: true });
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 6e57eee5f..3ee01953d 100644
--- a/packages/backend/src/server/api/endpoints/users/gallery/posts.ts
+++ b/packages/backend/src/server/api/endpoints/users/gallery/posts.ts
@@ -47,7 +47,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('post.userId = :userId', { userId: ps.userId });
 
 			const posts = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.galleryPostEntityService.packMany(posts, me);
diff --git a/packages/backend/src/server/api/endpoints/users/notes.ts b/packages/backend/src/server/api/endpoints/users/notes.ts
index aaf94734a..f42f84e6a 100644
--- a/packages/backend/src/server/api/endpoints/users/notes.ts
+++ b/packages/backend/src/server/api/endpoints/users/notes.ts
@@ -120,7 +120,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 			//#endregion
 
-			const timeline = await query.take(ps.limit).getMany();
+			const timeline = await query.limit(ps.limit).getMany();
 
 			return await this.noteEntityService.packMany(timeline, me);
 		});
diff --git a/packages/backend/src/server/api/endpoints/users/pages.ts b/packages/backend/src/server/api/endpoints/users/pages.ts
index a105103f1..e9d13ba00 100644
--- a/packages/backend/src/server/api/endpoints/users/pages.ts
+++ b/packages/backend/src/server/api/endpoints/users/pages.ts
@@ -48,7 +48,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				.andWhere('page.visibility = \'public\'');
 
 			const pages = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await this.pageEntityService.packMany(pages);
diff --git a/packages/backend/src/server/api/endpoints/users/reactions.ts b/packages/backend/src/server/api/endpoints/users/reactions.ts
index ac401a60e..37fc854c3 100644
--- a/packages/backend/src/server/api/endpoints/users/reactions.ts
+++ b/packages/backend/src/server/api/endpoints/users/reactions.ts
@@ -73,7 +73,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			this.queryService.generateVisibilityQuery(query, me);
 
 			const reactions = await query
-				.take(ps.limit)
+				.limit(ps.limit)
 				.getMany();
 
 			return await Promise.all(reactions.map(reaction => this.noteReactionEntityService.pack(reaction, me, { withNote: true })));
diff --git a/packages/backend/src/server/api/endpoints/users/recommendation.ts b/packages/backend/src/server/api/endpoints/users/recommendation.ts
index 6fcc04e2c..d39657059 100644
--- a/packages/backend/src/server/api/endpoints/users/recommendation.ts
+++ b/packages/backend/src/server/api/endpoints/users/recommendation.ts
@@ -70,7 +70,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 			query.setParameters(followingQuery.getParameters());
 
-			const users = await query.take(ps.limit).skip(ps.offset).getMany();
+			const users = await query.limit(ps.limit).skip(ps.offset).getMany();
 
 			return await this.userEntityService.packMany(users, me, { detail: true });
 		});
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 b001159ee..1d0c7d0c1 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
@@ -97,7 +97,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 				users = await query
 					.orderBy('user.usernameLower', 'ASC')
-					.take(ps.limit)
+					.limit(ps.limit)
 					.getMany();
 
 				if (users.length < ps.limit) {
@@ -110,7 +110,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 					const otherUsers = await otherQuery
 						.orderBy('user.updatedAt', 'DESC')
-						.take(ps.limit - users.length)
+						.limit(ps.limit - users.length)
 						.getMany();
 
 					users = users.concat(otherUsers);
@@ -122,7 +122,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 				users = await query
 					.orderBy('user.updatedAt', 'DESC')
-					.take(ps.limit - users.length)
+					.limit(ps.limit - users.length)
 					.getMany();
 			}
 
diff --git a/packages/backend/src/server/api/endpoints/users/search.ts b/packages/backend/src/server/api/endpoints/users/search.ts
index 5ffe3e84a..177441bc7 100644
--- a/packages/backend/src/server/api/endpoints/users/search.ts
+++ b/packages/backend/src/server/api/endpoints/users/search.ts
@@ -73,7 +73,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 				users = await usernameQuery
 					.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
-					.take(ps.limit)
+					.limit(ps.limit)
 					.skip(ps.offset)
 					.getMany();
 			} else {
@@ -100,7 +100,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 				users = await nameQuery
 					.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
-					.take(ps.limit)
+					.limit(ps.limit)
 					.skip(ps.offset)
 					.getMany();
 
@@ -126,7 +126,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 					users = users.concat(await query
 						.orderBy('user.updatedAt', 'DESC', 'NULLS LAST')
-						.take(ps.limit)
+						.limit(ps.limit)
 						.skip(ps.offset)
 						.getMany(),
 					);

From 0fbb46c9815a4386696a0e9874cd792616df5c97 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Jul 2023 16:53:46 +0900
Subject: [PATCH 20/31] 13.14.0-beta.1

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

diff --git a/package.json b/package.json
index 14b4c6831..d7a2376a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.13.2",
+	"version": "13.14.0-beta.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From e40a0b98e4b1ac1c897b0b30f9b9408e473791e0 Mon Sep 17 00:00:00 2001
From: nomad <benkang666@gmail.com>
Date: Sat, 8 Jul 2023 16:41:52 +0800
Subject: [PATCH 21/31] fix(frontend): search user with trailing space (#11184)

* fix(frontend): search user with trailing space

* fix(backend): search user with trailing space

* Update search.ts

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 packages/backend/src/server/api/endpoints/users/search.ts | 1 +
 packages/backend/src/server/api/endpoints/users/show.ts   | 1 +
 packages/frontend/src/pages/search.user.vue               | 2 +-
 packages/frontend/src/scripts/lookup.ts                   | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/users/search.ts b/packages/backend/src/server/api/endpoints/users/search.ts
index 177441bc7..1180de361 100644
--- a/packages/backend/src/server/api/endpoints/users/search.ts
+++ b/packages/backend/src/server/api/endpoints/users/search.ts
@@ -52,6 +52,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		super(meta, paramDef, async (ps, me) => {
 			const activeThreshold = new Date(Date.now() - (1000 * 60 * 60 * 24 * 30)); // 30日
 
+			ps.query = ps.query.trim();
 			const isUsername = ps.query.startsWith('@');
 
 			let users: User[] = [];
diff --git a/packages/backend/src/server/api/endpoints/users/show.ts b/packages/backend/src/server/api/endpoints/users/show.ts
index ba432c273..8e25af64f 100644
--- a/packages/backend/src/server/api/endpoints/users/show.ts
+++ b/packages/backend/src/server/api/endpoints/users/show.ts
@@ -91,6 +91,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 			let user;
 
 			const isModerator = await this.roleService.isModerator(me);
+			ps.username = ps.username?.trim();
 
 			if (ps.userIds) {
 				if (ps.userIds.length === 0) {
diff --git a/packages/frontend/src/pages/search.user.vue b/packages/frontend/src/pages/search.user.vue
index bd1389ffe..8e4a4a78c 100644
--- a/packages/frontend/src/pages/search.user.vue
+++ b/packages/frontend/src/pages/search.user.vue
@@ -67,7 +67,7 @@ async function search() {
 		endpoint: 'users/search',
 		limit: 10,
 		params: {
-			query: searchQuery,
+			query: query,
 			origin: searchOrigin,
 		},
 	};
diff --git a/packages/frontend/src/scripts/lookup.ts b/packages/frontend/src/scripts/lookup.ts
index 0b594e341..a55868368 100644
--- a/packages/frontend/src/scripts/lookup.ts
+++ b/packages/frontend/src/scripts/lookup.ts
@@ -6,9 +6,10 @@ import { Router } from '@/nirax';
 export async function lookup(router?: Router) {
 	const _router = router ?? mainRouter;
 
-	const { canceled, result: query } = await os.inputText({
+	const { canceled, result: temp } = await os.inputText({
 		title: i18n.ts.lookup,
 	});
+	const query = temp ? temp.trim() : '';
 	if (canceled) return;
 
 	if (query.startsWith('@') && !query.includes(' ')) {

From 36d5deeb611153ba3624384b6aca947784cc1e64 Mon Sep 17 00:00:00 2001
From: yupix <yupi0982@outlook.jp>
Date: Sat, 8 Jul 2023 17:48:10 +0900
Subject: [PATCH 22/31] =?UTF-8?q?fix:=20=E3=83=95=E3=82=A9=E3=83=AB?=
 =?UTF-8?q?=E3=83=80=E3=83=BC=E3=81=AE=E3=83=9A=E3=83=BC=E3=82=B8=E3=83=8D?=
 =?UTF-8?q?=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=8C=E6=A9=9F=E8=83=BD?=
 =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=20(#11187)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: フォルダーのページネーションが機能しない close #11180

* Update MkDrive.vue

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 CHANGELOG.md                                 |  1 +
 packages/frontend/src/components/MkDrive.vue | 24 +++++++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a27190215..0a58750aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 - Fix: sparkle内にリンクを入れるとクリック不能になる問題の修正
 - Fix: ZenUIでポップアップの表示位置がおかしい問題を修正
 - Fix: ページ遷移でスクロール位置が保持されない問題を修正
+- Fix: フォルダーのページネーションが機能しない #11180
 
 ### Server
 - JSON.parse の回数を削減することで、ストリーミングのパフォーマンスを向上しました
diff --git a/packages/frontend/src/components/MkDrive.vue b/packages/frontend/src/components/MkDrive.vue
index 917e78513..201a6ccdc 100644
--- a/packages/frontend/src/components/MkDrive.vue
+++ b/packages/frontend/src/components/MkDrive.vue
@@ -56,7 +56,7 @@
 				/>
 				<!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid -->
 				<div v-for="(n, i) in 16" :key="i" :class="$style.padding"></div>
-				<MkButton v-if="moreFolders" ref="moreFolders">{{ i18n.ts.loadMore }}</MkButton>
+				<MkButton v-if="moreFolders" ref="moreFolders" @click="fetchMoreFolders">{{ i18n.ts.loadMore }}</MkButton>
 			</div>
 			<div v-show="files.length > 0" ref="filesContainer" :class="$style.files">
 				<XFile
@@ -560,6 +560,28 @@ async function fetch() {
 	fetching.value = false;
 }
 
+function fetchMoreFolders() {
+	fetching.value = true;
+
+	const max = 30;
+
+	os.api('drive/folders', {
+		folderId: folder.value ? folder.value.id : null,
+		type: props.type,
+		untilId: folders.value[folders.value.length - 1].id,
+		limit: max + 1,
+	}).then(folders => {
+		if (folders.length === max + 1) {
+			moreFolders.value = true;
+			folders.pop();
+		} else {
+			moreFolders.value = false;
+		}
+		for (const x of folders) appendFolder(x);
+		fetching.value = false;
+	});
+}
+
 function fetchMoreFiles() {
 	fetching.value = true;
 

From 3796da683658f527ecc83bf09bfe620512e03115 Mon Sep 17 00:00:00 2001
From: yupix <yupi0982@outlook.jp>
Date: Sat, 8 Jul 2023 18:45:41 +0900
Subject: [PATCH 23/31] =?UTF-8?q?feat:=20=E3=83=95=E3=82=A9=E3=83=AB?=
 =?UTF-8?q?=E3=83=80=E3=83=BC=E3=82=84=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?=
 =?UTF-8?q?=E3=81=A7=E3=82=82ID=E3=82=92=E3=82=B3=E3=83=94=E3=83=BC?=
 =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#1118?=
 =?UTF-8?q?9)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: フォルダーやファイルでもIDをコピーできるように close #11188

* docs: update CHANGELOG.md
---
 CHANGELOG.md                                     |  1 +
 locales/index.d.ts                               |  2 ++
 locales/ja-JP.yml                                |  2 ++
 .../frontend/src/components/MkDrive.folder.vue   | 16 ++++++++++++++--
 .../frontend/src/scripts/get-drive-file-menu.ts  | 16 +++++++++++++++-
 5 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a58750aa..2183598d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - 画像を動画と同様に簡単に隠せるように
 - オリジナル画像を保持せずにアップロードする場合webpでアップロードされるように(Safari以外)
 - 見たことのあるRenoteを省略して表示をオンのときに自分のnoteのrenoteを省略するように
+- フォルダーやファイルに対しても開発者モード使用時、IDをコピーできるように
 - Fix: サーバーメトリクスが90度傾いている
 - Fix: 非ログイン時にクレデンシャルが必要なページに行くとエラーが出る問題を修正
 - Fix: sparkle内にリンクを入れるとクリック不能になる問題の修正
diff --git a/locales/index.d.ts b/locales/index.d.ts
index b7db5c6a7..dacab0cca 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -57,6 +57,8 @@ export interface Locale {
     "copyUsername": string;
     "copyUserId": string;
     "copyNoteId": string;
+    "copyFileId": string;
+    "copyFolderId": string;
     "searchUser": string;
     "reply": string;
     "loadMore": string;
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 441707b19..29f157b84 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -54,6 +54,8 @@ copyRSS: "RSSをコピー"
 copyUsername: "ユーザー名をコピー"
 copyUserId: "ユーザーIDをコピー"
 copyNoteId: "ノートIDをコピー"
+copyFileId: "ファイルIDをコピー"
+copyFolderId: "フォルダーIDをコピー"
 searchUser: "ユーザーを検索"
 reply: "返信"
 loadMore: "もっと見る"
diff --git a/packages/frontend/src/components/MkDrive.folder.vue b/packages/frontend/src/components/MkDrive.folder.vue
index 359497872..13f32ff7a 100644
--- a/packages/frontend/src/components/MkDrive.folder.vue
+++ b/packages/frontend/src/components/MkDrive.folder.vue
@@ -33,6 +33,7 @@ import * as os from '@/os';
 import { i18n } from '@/i18n';
 import { defaultStore } from '@/store';
 import { claimAchievement } from '@/scripts/achievements';
+import copyToClipboard from '@/scripts/copy-to-clipboard';
 
 const props = withDefaults(defineProps<{
 	folder: Misskey.entities.DriveFolder;
@@ -244,7 +245,8 @@ function setAsUploadFolder() {
 }
 
 function onContextmenu(ev: MouseEvent) {
-	os.contextMenu([{
+	let menu;
+	menu = [{
 		text: i18n.ts.openInWindow,
 		icon: 'ti ti-app-window',
 		action: () => {
@@ -262,7 +264,17 @@ function onContextmenu(ev: MouseEvent) {
 		icon: 'ti ti-trash',
 		danger: true,
 		action: deleteFolder,
-	}], ev);
+	}];
+	if (defaultStore.state.devMode) {
+		menu = menu.concat([null, {
+			icon: 'ti ti-id',
+			text: i18n.ts.copyFolderId,
+			action: () => {
+				copyToClipboard(props.folder.id);
+			},
+		}]);
+	}
+	os.contextMenu(menu, ev);
 }
 </script>
 
diff --git a/packages/frontend/src/scripts/get-drive-file-menu.ts b/packages/frontend/src/scripts/get-drive-file-menu.ts
index ef0990b32..9b488087e 100644
--- a/packages/frontend/src/scripts/get-drive-file-menu.ts
+++ b/packages/frontend/src/scripts/get-drive-file-menu.ts
@@ -4,6 +4,7 @@ import { i18n } from '@/i18n';
 import copyToClipboard from '@/scripts/copy-to-clipboard';
 import * as os from '@/os';
 import { MenuItem } from '@/types/menu';
+import { defaultStore } from '@/store';
 
 function rename(file: Misskey.entities.DriveFile) {
 	os.inputText({
@@ -69,7 +70,8 @@ async function deleteFile(file: Misskey.entities.DriveFile) {
 
 export function getDriveFileMenu(file: Misskey.entities.DriveFile, folder?: Misskey.entities.DriveFolder | null): MenuItem[] {
 	const isImage = file.type.startsWith('image/');
-	return [{
+	let menu;
+	menu = [{
 		text: i18n.ts.rename,
 		icon: 'ti ti-forms',
 		action: () => rename(file),
@@ -111,4 +113,16 @@ export function getDriveFileMenu(file: Misskey.entities.DriveFile, folder?: Miss
 		danger: true,
 		action: () => deleteFile(file),
 	}];
+
+	if (defaultStore.state.devMode) {
+		menu = menu.concat([null, {
+			icon: 'ti ti-id',
+			text: i18n.ts.copyFileId,
+			action: () => {
+				copyToClipboard(file.id);
+			},
+		}]);
+	}
+
+	return menu;
 }

From 6a015341efc5f268ab86d11ba75b44a46cfbd33d Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Jul 2023 18:55:02 +0900
Subject: [PATCH 24/31] =?UTF-8?q?fix(frontend):=20=E9=95=B7=E3=81=84?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E3=82=92=E6=8A=95=E7=A8=BF=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E9=9A=9B=E3=80=81=E3=83=97=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E3=81=8C=E7=94=BB=E9=9D=A2=E3=81=8B=E3=82=89=E3=81=AF=E3=81=BF?=
 =?UTF-8?q?=E5=87=BA=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #11186
---
 CHANGELOG.md                                          | 1 +
 packages/frontend/src/components/MkPostForm.vue       | 2 ++
 packages/frontend/src/components/MkPostFormDialog.vue | 9 ++++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2183598d9..5629d3644 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,6 +31,7 @@
 - Fix: ZenUIでポップアップの表示位置がおかしい問題を修正
 - Fix: ページ遷移でスクロール位置が保持されない問題を修正
 - Fix: フォルダーのページネーションが機能しない #11180
+- Fix: 長い文章を投稿する際、プレビューが画面からはみ出る問題を修正
 
 ### Server
 - JSON.parse の回数を削減することで、ストリーミングのパフォーマンスを向上しました
diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue
index 5b37a117d..b269feb07 100644
--- a/packages/frontend/src/components/MkPostForm.vue
+++ b/packages/frontend/src/components/MkPostForm.vue
@@ -1019,6 +1019,8 @@ defineExpose({
 
 .preview {
 	padding: 16px 20px 0 20px;
+	max-height: 150px;
+	overflow: auto;
 }
 
 .targetNote {
diff --git a/packages/frontend/src/components/MkPostFormDialog.vue b/packages/frontend/src/components/MkPostFormDialog.vue
index 98af92c6f..989c138e8 100644
--- a/packages/frontend/src/components/MkPostFormDialog.vue
+++ b/packages/frontend/src/components/MkPostFormDialog.vue
@@ -1,6 +1,6 @@
 <template>
 <MkModal ref="modal" :preferType="'dialog'" @click="modal.close()" @closed="onModalClosed()">
-	<MkPostForm ref="form" style="margin: 0 auto auto auto;" v-bind="props" autofocus freezeAfterPosted @posted="onPosted" @cancel="modal.close()" @esc="modal.close()"/>
+	<MkPostForm ref="form" :class="$style.form" v-bind="props" autofocus freezeAfterPosted @posted="onPosted" @cancel="modal.close()" @esc="modal.close()"/>
 </MkModal>
 </template>
 
@@ -44,3 +44,10 @@ function onModalClosed() {
 	emit('closed');
 }
 </script>
+
+<style lang="scss" module>
+.form {
+	max-height: 100%;
+	margin: 0 auto auto auto;
+}
+</style>

From ac6d6fdeb813e9c99e0d843a24cce81a99fd91da Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Jul 2023 19:01:47 +0900
Subject: [PATCH 25/31] =?UTF-8?q?enhance(frontend):=20=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E5=AF=BE=E8=B1=A1=E3=82=92=E3=80=8C=E3=82=82=E3=81=A3=E3=81=A8?=
 =?UTF-8?q?=E8=A6=8B=E3=82=8B=E3=80=8D=E3=81=A7=E5=B1=95=E9=96=8B=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=E5=A0=B4=E5=90=88=E3=80=81=E3=80=8C=E9=96=89=E3=81=98?=
 =?UTF-8?q?=E3=82=8B=E3=80=8D=E3=81=A7=E7=95=B3=E3=82=81=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resolve #11185
---
 CHANGELOG.md                                  |  1 +
 .../src/components/MkSubNoteContent.vue       | 27 ++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5629d3644..35162f6b0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@
 - オリジナル画像を保持せずにアップロードする場合webpでアップロードされるように(Safari以外)
 - 見たことのあるRenoteを省略して表示をオンのときに自分のnoteのrenoteを省略するように
 - フォルダーやファイルに対しても開発者モード使用時、IDをコピーできるように
+- 引用対象を「もっと見る」で展開した場合、「閉じる」で畳めるように
 - Fix: サーバーメトリクスが90度傾いている
 - Fix: 非ログイン時にクレデンシャルが必要なページに行くとエラーが出る問題を修正
 - Fix: sparkle内にリンクを入れるとクリック不能になる問題の修正
diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue
index 3a050889c..c76ce7315 100644
--- a/packages/frontend/src/components/MkSubNoteContent.vue
+++ b/packages/frontend/src/components/MkSubNoteContent.vue
@@ -15,9 +15,12 @@
 		<summary>{{ i18n.ts.poll }}</summary>
 		<MkPoll :note="note"/>
 	</details>
-	<button v-if="collapsed" :class="$style.fade" class="_button" @click="collapsed = false">
+	<button v-if="isLong && collapsed" :class="$style.fade" class="_button" @click="collapsed = false">
 		<span :class="$style.fadeLabel">{{ i18n.ts.showMore }}</span>
 	</button>
+	<button v-else-if="isLong && !collapsed" :class="$style.showLess" class="_button" @click="collapsed = true">
+		<span :class="$style.showLessLabel">{{ i18n.ts.showLess }}</span>
+	</button>
 </div>
 </template>
 
@@ -33,11 +36,13 @@ const props = defineProps<{
 	note: misskey.entities.Note;
 }>();
 
-const collapsed = $ref(
+const isLong =
 	props.note.cw == null && props.note.text != null && (
 		(props.note.text.split('\n').length > 9) ||
 		(props.note.text.length > 500)
-	));
+	);
+
+const collapsed = $ref(isLong);
 </script>
 
 <style lang="scss" module>
@@ -86,4 +91,20 @@ const collapsed = $ref(
 	font-style: oblique;
 	color: var(--renote);
 }
+
+.showLess {
+	width: 100%;
+	margin-top: 14px;
+	position: sticky;
+	bottom: calc(var(--stickyBottom, 0px) + 14px);
+}
+
+.showLessLabel {
+	display: inline-block;
+	background: var(--popup);
+	padding: 6px 10px;
+	font-size: 0.8em;
+	border-radius: 999px;
+	box-shadow: 0 2px 6px rgb(0 0 0 / 20%);
+}
 </style>

From d2764944cffffe04ed321ce8795f5bab90de3059 Mon Sep 17 00:00:00 2001
From: Yuriha <121590760+yuriha-chan@users.noreply.github.com>
Date: Sat, 8 Jul 2023 19:34:19 +0900
Subject: [PATCH 26/31] Add unit test for FetchInstanceMetadataService (#11173)

---
 .../test/unit/FetchInstanceMetadataService.ts | 109 ++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 packages/backend/test/unit/FetchInstanceMetadataService.ts

diff --git a/packages/backend/test/unit/FetchInstanceMetadataService.ts b/packages/backend/test/unit/FetchInstanceMetadataService.ts
new file mode 100644
index 000000000..1ee293982
--- /dev/null
+++ b/packages/backend/test/unit/FetchInstanceMetadataService.ts
@@ -0,0 +1,109 @@
+process.env.NODE_ENV = 'test';
+
+import { jest } from '@jest/globals';
+import { ModuleMocker } from 'jest-mock';
+import { Test } from '@nestjs/testing';
+import { GlobalModule } from '@/GlobalModule.js';
+import { FetchInstanceMetadataService } from '@/core/FetchInstanceMetadataService.js';
+import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
+import { HttpRequestService } from '@/core/HttpRequestService.js';
+import { LoggerService } from '@/core/LoggerService.js';
+import { UtilityService } from '@/core/UtilityService.js';
+import { IdService } from '@/core/IdService.js';
+import { DI } from '@/di-symbols.js';
+import type { TestingModule } from '@nestjs/testing';
+import type { MockFunctionMetadata } from 'jest-mock';
+import { Redis } from 'ioredis'
+
+function mockRedis() {
+	const hash = {};
+	const set = jest.fn((key, value) => {
+			const ret = hash[key];
+			hash[key] = value;
+			return ret;
+		});
+	return set;
+}
+
+describe('FetchInstanceMetadataService', () => {
+	let app: TestingModule;
+	let fetchInstanceMetadataService: jest.Mocked<FetchInstanceMetadataService>;
+	let federatedInstanceService: jest.Mocked<FederatedInstanceService>;
+	let httpRequestService: jest.Mocked<HttpRequestService>;
+	let redisClient: jest.Mocked<Redis.Redis>;
+
+	beforeAll(async () => {
+		app = await Test
+			.createTestingModule({
+				imports: [
+					GlobalModule,
+				],
+				providers: [
+					FetchInstanceMetadataService,
+					LoggerService,
+					UtilityService,
+					IdService,
+				],
+			})
+			.useMocker((token) => {
+				if (token === HttpRequestService) {
+					return { getJson: jest.fn(), getHtml: jest.fn(), send: jest.fn(), };
+				} else if (token === FederatedInstanceService) {
+					return { fetch: jest.fn() };
+				} else if (token === DI.redis) {
+					return mockRedis;
+				}})
+			.compile();
+
+		app.enableShutdownHooks();
+
+		fetchInstanceMetadataService = app.get<FetchInstanceMetadataService>(FetchInstanceMetadataService);
+		federatedInstanceService = app.get<FederatedInstanceService>(FederatedInstanceService) as jest.Mocked<FederatedInstanceService>;
+		redisClient = app.get<Redis.Redis>(DI.redis) as jest.Mocked<Redis.Redis>;
+		httpRequestService = app.get<HttpRequestService>(HttpRequestService) as jest.Mocked<HttpRequestService>;
+	});
+
+	afterAll(async () => {
+		await app.close();
+	});
+
+	test('Lock and update', async () => {
+		redisClient.set = mockRedis();
+		const now = Date.now();
+		federatedInstanceService.fetch.mockReturnValue({ infoUpdatedAt: { getTime: () => { return now - 10 * 1000 * 60 * 60 * 24; } } });
+		httpRequestService.getJson.mockImplementation(() => { throw Error(); });
+		const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
+		const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
+		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: "example.com" });
+		expect(tryLockSpy).toHaveBeenCalledTimes(1);
+		expect(unlockSpy).toHaveBeenCalledTimes(1);
+		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1);
+		expect(httpRequestService.getJson).toHaveBeenCalled();
+	});
+	test("Lock and don't update", async () => {
+		redisClient.set = mockRedis();
+		const now = Date.now();
+		federatedInstanceService.fetch.mockReturnValue({ infoUpdatedAt: { getTime: () => now } });
+		httpRequestService.getJson.mockImplementation(() => { throw Error(); });
+		const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
+		const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
+		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: "example.com" });
+		expect(tryLockSpy).toHaveBeenCalledTimes(1);
+		expect(unlockSpy).toHaveBeenCalledTimes(1);
+		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(1);
+		expect(httpRequestService.getJson).toHaveBeenCalledTimes(0);
+	});
+	test('Do nothing when lock not acquired', async () => {
+		redisClient.set = mockRedis();
+		federatedInstanceService.fetch.mockReturnValue({ infoUpdatedAt: { getTime: () => now - 10 * 1000 * 60 * 60 * 24 } });
+		httpRequestService.getJson.mockImplementation(() => { throw Error(); });
+		const tryLockSpy = jest.spyOn(fetchInstanceMetadataService, 'tryLock');
+		const unlockSpy = jest.spyOn(fetchInstanceMetadataService, 'unlock');
+		await fetchInstanceMetadataService.tryLock("example.com");
+		await fetchInstanceMetadataService.fetchInstanceMetadata({ host: "example.com" });
+		expect(tryLockSpy).toHaveBeenCalledTimes(2);
+		expect(unlockSpy).toHaveBeenCalledTimes(0);
+		expect(federatedInstanceService.fetch).toHaveBeenCalledTimes(0);
+		expect(httpRequestService.getJson).toHaveBeenCalledTimes(0);
+	});
+});

From 246d167c81ef65001ec92e34f4878970a973f52f Mon Sep 17 00:00:00 2001
From: SASAGAWA Kiyoshi <sasagawa@kent-and-co.com>
Date: Sat, 8 Jul 2023 21:10:52 +0900
Subject: [PATCH 27/31] fix: add suuport Japanese message of errors. (#11159)

* fix: add suuport Japanese message of errors.

* fix: change catching function.

* lint

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 packages/backend/src/misc/is-duplicate-key-value-error.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/backend/src/misc/is-duplicate-key-value-error.ts b/packages/backend/src/misc/is-duplicate-key-value-error.ts
index 04ff191e4..f5343d187 100644
--- a/packages/backend/src/misc/is-duplicate-key-value-error.ts
+++ b/packages/backend/src/misc/is-duplicate-key-value-error.ts
@@ -1,3 +1,5 @@
+import { QueryFailedError } from 'typeorm';
+
 export function isDuplicateKeyValueError(e: unknown | Error): boolean {
-	return (e as any).message && (e as Error).message.startsWith('duplicate key value');
+	return e instanceof QueryFailedError && e.driverError.code === '23505';
 }

From 51df3de66d2a3b683b95a2059df738f0c1194960 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Jul 2023 21:13:08 +0900
Subject: [PATCH 28/31] New Crowdin updates (#10993)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Swedish)

* New translations ja-JP.yml (Swedish)

* New translations ja-JP.yml (Swedish)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Swedish)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (Swedish)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Swedish)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (Chinese Simplified)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Japanese, Kansai)

* New translations ja-JP.yml (Romanian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Catalan)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Dutch)

* New translations ja-JP.yml (Polish)

* New translations ja-JP.yml (Portuguese)

* New translations ja-JP.yml (Slovak)

* New translations ja-JP.yml (Swedish)

* New translations ja-JP.yml (Ukrainian)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Vietnamese)

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (Bengali)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Lao)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Swedish)

* New translations ja-JP.yml (Chinese Traditional)

* New translations ja-JP.yml (English)
---
 locales/ar-SA.yml | 133 ++++++++++++-
 locales/bn-BD.yml |   5 -
 locales/ca-ES.yml |   1 -
 locales/cs-CZ.yml |   1 -
 locales/de-DE.yml |  36 ++--
 locales/en-US.yml |  36 ++--
 locales/es-ES.yml |  89 ++++++---
 locales/fr-FR.yml |   5 -
 locales/id-ID.yml | 377 ++++++++++++++++++++++++++++---------
 locales/it-IT.yml | 111 +++++++++--
 locales/ja-KS.yml |  14 +-
 locales/ko-KR.yml |  14 +-
 locales/lo-LA.yml |   1 -
 locales/nl-NL.yml |   1 -
 locales/pl-PL.yml |   5 -
 locales/pt-PT.yml |   1 -
 locales/ro-RO.yml |   1 -
 locales/ru-RU.yml |   8 +-
 locales/sk-SK.yml |   5 -
 locales/sv-SE.yml |  88 ++++++++-
 locales/th-TH.yml |  94 +++++++---
 locales/uk-UA.yml |   5 -
 locales/vi-VN.yml |   5 -
 locales/zh-CN.yml | 470 +++++++++++++++++++++++-----------------------
 locales/zh-TW.yml |  38 ++--
 25 files changed, 1043 insertions(+), 501 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index 5d0fd201b..4dc3f743f 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -52,6 +52,8 @@ addToList: "أضفه إلى قائمة"
 sendMessage: "أرسل رسالة"
 copyRSS: "انسخ رابط RSS"
 copyUsername: "انسخ اسم المستخدم"
+copyUserId: "انسخ معرف المستخدم"
+copyNoteId: "انسخ معرف الملاحظة"
 searchUser: "ابحث عن مستخدمين"
 reply: "رد"
 loadMore: "عرض المزيد"
@@ -305,7 +307,6 @@ copyUrl: "انسخ الرابط"
 rename: "إعادة التسمية"
 avatar: "الصورة الرمزية"
 banner: "الصورة الرأسية"
-nsfw: "محتوى حساس"
 whenServerDisconnected: "عند فقدان الاتصال بالخادم"
 disconnectedFromServer: "قُطِع الإتصال بالخادم"
 reload: "انعش"
@@ -398,6 +399,7 @@ totp: "تطبيق استيثاق"
 moderator: "مشرِف"
 moderation: "الإشراف"
 nUsersMentioned: "{n} مستخدمين أُشير إليهم"
+securityKeyAndPasskey: "الأمن ومفاتيح الأمان"
 securityKey: "مفتاح الأمان"
 lastUsed: "آخر استخدام"
 lastUsedAt: "آخر استخدام: {t}"
@@ -452,6 +454,7 @@ language: "اللغة"
 uiLanguage: "لغة واجهة المستخدم"
 aboutX: "عن {x}"
 emojiStyle: "نمط الوجوه التعبيرية"
+showNoteActionsOnlyHover: "أظهر الإجراءات عند التمرير فوق الملاحظة"
 noHistory: "السجل فارغ"
 signinHistory: "تاريخ تسجيل الدخول"
 doing: "انتظر لحظة"
@@ -484,10 +487,12 @@ objectStoragePrefix: "البادئة"
 objectStoragePrefixDesc: "ستُحفظ الملفات في مجلدات تحوي اسماءها هذه البادئة."
 objectStorageEndpoint: "نقطة النهاية"
 objectStorageRegion: "المنطقة"
+objectStorageRegionDesc: "حدد منطقة مثل \"xx-east-1\". إذا كانت خدمتك لا تميز بين المناطق استخدم \"us-east-1\" أو اتركها فارغة إذا كنت تستخدم متغيرات البيئة أو ملفات ضبط AWS."
 objectStorageUseSSL: "استخدم SSL"
 objectStorageUseSSLDesc: "عطل هذا الخيار إذا لم ترد استخدام API عبر HTTPS"
 objectStorageUseProxy: "اتصل عبر وكيل"
 objectStorageUseProxyDesc: "عطل هذا الخيار إذا لم ترد استخدام API عبر وكيل"
+objectStorageSetPublicRead: "عينها ك\"علنية\" عند الرفع"
 serverLogs: "سجلات الخادم"
 deleteAll: "حذف الكل"
 showFixedPostForm: "أظهر نموذج الكتابة في أعلى الصفحة"
@@ -531,6 +536,7 @@ accountDeletedDescription: "حُذف هذا الحساب."
 menu: "القائمة"
 divider: "فاصل"
 addItem: "إضافة عنصر"
+rearrange: "أعد الترتيب"
 relays: "المُرَحلات"
 addRelay: "إضافة مُرحّل"
 inboxUrl: "رابط صندوق الوارد"
@@ -554,6 +560,7 @@ leaveConfirm: "لديك تغييرات غير محفوظة. أتريد المت
 manage: "إدارة "
 plugins: "الإضافات"
 preferencesBackups: "النُسخ الاحتياطية للإعدادات"
+useBlurEffectForModal: "استخدم تأثير الطمس في المشروط"
 useFullReactionPicker: "استخدم الحجم الكامل لمنتقي التفاعلات"
 width: "العرض"
 height: "الإرتفاع"
@@ -629,6 +636,7 @@ clip: "مِشبك"
 createNew: "أنشِئ جديد"
 optional: "اختياري"
 createNewClip: "أنشئ مِشبكَا جديدًا"
+confirmToUnclipAlreadyClippedNote: "هذه الملاحظة تنتمي للمشبك {name} سلفًا، أتريد حذفها منه⸮"
 public: "علني"
 i18nInfo: "يترجم متطوعون ميسكي إلى عدة لغات، يمكنك المساعدة عبر {link}"
 manageAccessTokens: "إدارة رموز الوصول"
@@ -650,6 +658,7 @@ driveFilesCount: "عدد الملفات في قرص التخزين"
 driveUsage: "المستغل من قرص التخزين"
 noCrawle: "ارفض فهرسة زاحف الويب"
 noCrawleDescription: "يطلب من محركات البحث ألّا يُفهرسوا ملفك الشخصي وملاحظات وصفحاتك وما شابه."
+lockedAccountInfo: "ستكون هذه الملاحظة مرئية للجميع مالم تحدد مرئتيها إلى \"للمتابعين فقط\""
 alwaysMarkSensitive: "علّم افتراضيًا جميع ملاحظاتي كذات محتوى حساس"
 loadRawImages: "حمّل الصور الأصلية بدلًا من المصغرات"
 disableShowingAnimatedImages: "لا تشغّل الصور المتحركة"
@@ -668,6 +677,8 @@ developer: "المطور"
 makeExplorable: "أظهر الحساب في صفحة \"استكشاف\""
 makeExplorableDescription: "بتعطيل هذا الخيار لن يظهر حسابك في صفحة \"استكشاف\""
 showGapBetweenNotesInTimeline: "أظهر فجوات بين المشاركات في الخيط الزمني"
+left: "يسار"
+center: "وسط"
 wide: "عريض"
 narrow: "رفيع"
 reloadToApplySetting: "سيُطبق هذا الإعداد بعد إعادة تحميل الصفحة، أتريد إعادة تحميلها الآن؟"
@@ -705,6 +716,7 @@ editCode: "حرر الشفرة"
 apply: "تطبيق"
 receiveAnnouncementFromInstance: "استلم إشعارات من هذا المثيل"
 emailNotification: "إشعارات البريد الكتروني"
+publish: "علني"
 inChannelSearch: "ابحث عن قناة"
 useReactionPickerForContextMenu: "افتح منتقي التفاعلات عند النقر بالزر الأيمن"
 typingUsers: "{users} يكتب(ون)..."
@@ -744,6 +756,7 @@ noMaintainerInformationWarning: "لم تُضبط معلومات المدير"
 noBotProtectionWarning: "لم تضبط الحماية من الحسابات الآلية"
 configure: "اضبط"
 postToGallery: "انشر في المعرض"
+postToHashtag: "انشر بهذا الوسم"
 gallery: "المعرض"
 recentPosts: "المشاركات الحديثة"
 popularPosts: "المشاركات المتداولة"
@@ -776,6 +789,7 @@ translate: "ترجم"
 translatedFrom: "تُرجم من {x}"
 accountDeletionInProgress: "حذف الحساب جارٍ"
 usernameInfo: "الاسم الذي يميزك عن بافي مستخدمي هذا الخادم، يمكنك استخدام الحروف اللاتينية (a~z, A~Z) والأرقام (0~9) والشرطة السفلية (_). لا يمكنك تغييره بعد تسجيله."
+devMode: "وضع المُطوّر"
 keepCw: "أبقِ على تحذيرات المحتوى"
 lastCommunication: "آخر تواصل"
 resolved: "عولج"
@@ -784,6 +798,7 @@ breakFollow: "إلغاء الاشتراك"
 breakFollowConfirm: "أمتأكد من إزالة المتابِع ؟"
 itsOn: "مفعّل"
 itsOff: "معطّل"
+on: "مفعل"
 emailRequiredForSignup: "عنوان البريد الإلكتروني إلزامي للتسجيل"
 unread: "غير مقروءة"
 filter: "رشّح"
@@ -840,6 +855,7 @@ statusbar: "شريط الحالة"
 pleaseSelect: "حدد خيارًا"
 reverse: "اقلب"
 colored: "ملوّن"
+refreshInterval: "مهلة التحديث"
 label: "التسمية"
 type: "نوع"
 speed: "سرعة"
@@ -852,6 +868,9 @@ cannotUploadBecauseInappropriate: "تعذر رفع الملف لوجود محت
 cannotUploadBecauseNoFreeSpace: "تعذر رفع الملف لنقص مساحة التخزين."
 cannotUploadBecauseExceedsFileSizeLimit: "تعذر رفع الملف بسبب تجاوز حجمه للحد المسموح"
 beta: "بيتا"
+enableAutoSensitive: "تعيين تلقائي كمحتوى حساس NSFW"
+enableAutoSensitiveDescription: "عند الاستطاعة يسمح باكتشاف المحتوى حساس NSFW تلقائيًا في الوسائط باستخدام تعلم الآلة ووسمها تبعًا لذلك. قد يكون هذا الخيار مفعلا من جهة الخادم وسيعمل حتى وان عُطل."
+activeEmailValidationDescription: "يتحقق من صحة عنوان البريد الإلكتروني بشكل أكثر حزمًا وذلك عبر تحديد ما إذا كان عنوان بريد إلكتروني مؤقت وإمكانية التواصل معه. إذا لم يحدد هذا الخيار فسيتحقق من نسق عنوان البريد الإلكتروني."
 navbar: "شريط التنقل"
 shuffle: "خلط"
 account: "الحسابات"
@@ -863,21 +882,30 @@ pushNotificationAlreadySubscribed: "إرسال الإشعارات مفعل سل
 pushNotificationNotSupported: "متصفحك لا يدعم إرسال الإشعارات أو المثيل لا يدعمها."
 sendPushNotificationReadMessage: "احذف الإشعارات فور قراءتها"
 sendPushNotificationReadMessageCaption: "هذا قد يزيد من معدل استهلاك الطاقة لجهازك."
+windowRestore: "استرجاع"
 caption: "التعليق التوضيحي"
+loggedInAsBot: "والج كآلي"
 tools: "أدوات"
 cannotLoad: "تعذر التحميل"
+numberOfProfileView: "مشاهدات الملف الشخصي"
 like: "أعجبني"
 unlike: "ألغِ الإعجاب"
+numberOfLikes: "الإعجابات"
 show: "المظهر"
 neverShow: "لا تظهره مجددًا"
+remindMeLater: "ربما لاحقا"
 didYouLikeMisskey: "هل أعجبك ميسكي؟"
+pleaseDonate: "يستخدم {host} البرمجية الحرة ميسكي. نتمنى أن تتبرعوا للمشروع مما سيسمح لنا متابعة تطويره!"
 roles: "الأدوار"
 role: "الدور"
 noRole: "لم يُعثر على دور"
 normalUser: "مستخدم عادي"
 undefined: "غير معرّف"
+assign: "أسند"
+unassign: "ألغ الإسناد"
 color: "اللون"
 manageCustomEmojis: "إدارة الإيموجي المخصصة"
+youCannotCreateAnymore: "وصلت لسقف الإنشاء."
 cannotPerformTemporary: "غير متاح مؤقتاً"
 permissionDeniedError: "رُفضة العملية"
 preset: "إعدادات مسبقة"
@@ -900,6 +928,8 @@ cannotBeChangedLater: "لا يمكن تغييره لاحقًا."
 reactionAcceptance: "قبول التفاعلات"
 rolesAssignedToMe: "الأدوار المسندة إلي"
 resetPasswordConfirm: "هل تريد إعادة تعيين كلمة السر؟"
+license: "الرخصة"
+unfavoriteConfirm: "أتريد إزالتها من المفضلة؟"
 noteIdOrUrl: "معرف الملاحظة أو رابطها"
 video: "فيديو"
 videos: "فيديوهات"
@@ -908,6 +938,11 @@ accountMoved: "نقل هذا المستخدم حسابه:"
 accountMovedShort: "رُحل هذا الحساب."
 operationForbidden: "عملية ممنوعة"
 forceShowAds: "أظهر الإعلانات التجارية دائما"
+leftTop: "أعلى اليسار"
+rightTop: "أعلى اليمين"
+leftBottom: "أسفل اليسار"
+rightBottom: "أسفل اليمين"
+stackAxis: "اتجاه التكديس"
 vertical: "عمودي"
 horizontal: "جانبي"
 position: "الموضع"
@@ -917,9 +952,101 @@ pleaseAgreeAllToContinue: "للمتابعة وافق على الحقول أعل
 continue: "متابعة"
 preservedUsernames: "أسماء المستخدمين المحجوزة"
 preservedUsernamesDescription: "قائمة بأسماء المستخدمين المحجوزة كلٌ في سطر. لن يُقبل التسجيل بهذه الأسماء وستبقى محصورة على التسجيل اليدوي بواسطة المديرين. لن يتأثر المستخدمون الذين يملكون هذه الأسماء سلفًا."
+createNoteFromTheFile: "أنشئ ملاحظة من هذا الملف"
 archive: "الأرشيف"
+channelArchiveConfirmTitle: "أتريد أرشفت {name}؟"
+channelArchiveConfirmDescription: "لن يمكنك نشر ملاحظات في القناة المأرشفة ولن تظهر في قائمة القنوات ولا في نتائج البحث."
+thisChannelArchived: "أُرشفت هذه القناة."
+displayOfNote: "عرض الملاحظة"
+initialAccountSetting: "إعداد الملف الشخصي"
 youFollowing: "متابَع"
 options: "خيارات"
+specifyUser: "مستخدم محدد"
+failedToPreviewUrl: "تتعذر المعاينة"
+update: "حدِّث"
+rolesThatCanBeUsedThisEmojiAsReaction: "الأدوار التي يُسمح لأصحابها استخدام هذا اإيموجي في اللتفاعل"
+rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription: "إذا لم تحدد دورًا يمكن للجميع استخدام هذا الإيموجي في التفاعل."
+rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn: "يجب أن تكون الأدوار علنية."
+cancelReactionConfirm: "أتريد حذف تفاعلك؟"
+changeReactionConfirm: "أتريد تعديل تفاعلك؟"
+later: "لاحقاً"
+goToMisskey: "لميسكي"
+additionalEmojiDictionary: "قواميس إيموجي إضافية"
+installed: "مُثبت"
+_initialAccountSetting:
+  accountCreated: "نجح إنشاء حسابك!"
+  letsStartAccountSetup: "إذا كنت جديدًا لنعدّ حسابك الشخصي."
+  letsFillYourProfile: "أولًا لنعد ملفك الشخصي."
+  profileSetting: "إعدادات الملف الشخصي"
+  privacySetting: "إعدادات الخصوصية"
+  theseSettingsCanEditLater: "يمكنك تغيير هذه الإعدادات لاحقًا."
+_accountMigration:
+  moveFrom: "انقل حسابًا آخر لهذا الحساب"
+  moveFromLabel: "الحساب الأصلي #{n}"
+  moveTo: "انقل هذا الحساب لحساب آخر"
+  moveToLabel: "الحساب الوجهة:"
+  moveCannotBeUndone: "لا يمكن التراجع عن نقل الحساب."
+  movedTo: "الحساب الوجهة:"
+_achievements:
+  _types:
+    _notes1:
+      description: "انشر ملاحظتك الأولى"
+      flavor: "تمتع باستخدام ميسكي!"
+    _notes10:
+      title: "بعض الملاحظات"
+      description: "انشر 10 ملاحظات"
+    _notes100:
+      title: "كثير من الملاحظات"
+      description: "انشر 100 ملاحظة"
+    _notes500:
+      description: "انشر 500 ملاحظة"
+    _notes1000:
+      title: "جبل ملاحظات"
+      description: "انشر 1000 ملاحظة"
+    _notes5000:
+      description: "انشر 5000 ملاحظة"
+    _notes10000:
+      description: "انشر 10000 ملاحظة"
+    _notes20000:
+      title: "أريد...ملاحظات...أكثر"
+      description: "انشر 20000 ملاحظة"
+    _notes30000:
+      title: "ملاحظات وملاحظات وملاحظات"
+      description: "انشر 30000 ملاحظة"
+    _notes40000:
+      title: "مصنع ملاحظات"
+      description: "انشر 40000 ملاحظة"
+    _notes50000:
+      title: "كوكب ملاحظات"
+      description: "انشر 50000 ملاحظة"
+    _notes60000:
+      title: "نجم ملاحظات"
+      description: "انشر 60000 ملاحظة"
+    _notes70000:
+      title: "ثقب أسود للملاحظات"
+      description: "انشر 70000 ملاحظة"
+    _notes80000:
+      title: "مجرة ملاحظات"
+      description: "انشر 80000 ملاحظة"
+    _notes90000:
+      title: "كوْن ملاحظات"
+      description: "انشر 90000 ملاحظة"
+    _notes100000:
+      title: "كل ملاحظاتك لنا"
+      description: "انشر 100000 ملاحظة"
+      flavor: "حقًا لديك الكثير من القصص"
+    _login3:
+      title: "مبتدأ I"
+    _noteFavorited1:
+      description: "فضًِل ملاحظتك الأولى"
+    _myNoteFavorited1:
+      title: "ساعٍ للنجوم"
+      description: "أعجب شخص آخر بإحدى ملاحظاتك"
+    _profileFilled:
+      title: "مستعد"
+      description: "أعدّ حسابك"
+    _markedAsCat:
+      title: "أنا قط"
 _role:
   new: "دور جديد"
   edit: "حرر الأدوار"
@@ -996,10 +1123,6 @@ _aboutMisskey:
   donate: "تبرع لميسكي"
   morePatrons: "نحن نقدر الدعم الذي قدمه العديد من الأشخاص الذين لم نذكرهم. شكرًا لكم 🥰"
   patrons: "الداعمون"
-_nsfw:
-  respect: "اخف الوسائط ذات المحتوى الحساس"
-  ignore: "اعرض الوسائط ذات المحتوى الحساس"
-  force: "اخف كل الوسائط"
 _instanceTicker:
   none: "لا تظهره بتاتًا"
   remote: "أظهر للمستخدمين البِعاد"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index 4b1a9cb75..78dbd77eb 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -294,7 +294,6 @@ copyUrl: "URL কপি করুন"
 rename: "পুনঃনামকরণ"
 avatar: "প্রোফাইল ছবি"
 banner: "ব্যানার"
-nsfw: "সংবেদনশীল বিষয়বস্তু"
 whenServerDisconnected: "সার্ভারের সাথে সংযোগ বিচ্ছিন্ন হয়ে গেলে"
 disconnectedFromServer: "সার্ভার থেকে সংযোগ বিচ্ছিন্ন হয়েছে"
 reload: "আবার লোড করুন"
@@ -902,10 +901,6 @@ _aboutMisskey:
   donate: "Misskey তে দান করুন"
   morePatrons: "আরও অনেকে আমাদের সাহায্য করছেন। তাদের সবাইকে ধন্যবাদ 🥰"
   patrons: "সমর্থনকারী"
-_nsfw:
-  respect: "স্পর্শকাতর মিডিয়া লুকান"
-  ignore: "স্পর্শকাতর মিডিয়া লুকাবেন না"
-  force: "সকল মিডিয়া লুকান"
 _instanceTicker:
   none: "দেখাবেন না"
   remote: "রিমোট ব্যাবহারকারীদের জন্য দেখান"
diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 588a07fd8..e3a6ec11b 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -263,7 +263,6 @@ emptyFolder: "La carpeta està buida"
 unableToDelete: "No es pot eliminar"
 copyUrl: "Copia l'URL"
 rename: "Canvia el nom"
-nsfw: "NSFW"
 reload: "Actualitza"
 doNothing: "Ignora"
 accept: "Accepta"
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index d055fde38..ceab50075 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -276,7 +276,6 @@ copyUrl: "Kopírovat URL"
 rename: "Přejmenovat"
 avatar: "Avatar"
 banner: "Baner"
-nsfw: "NSFW"
 disconnectedFromServer: "Spojení bylo přerušeno"
 reload: "Aktualizovat"
 doNothing: "Ignorovat"
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 9b52a5069..e33ceb0f0 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -54,6 +54,8 @@ copyRSS: "RSS kopieren"
 copyUsername: "Benutzernamen kopieren"
 copyUserId: "Benutzer-ID kopieren"
 copyNoteId: "Notiz-ID kopieren"
+copyFileId: "Datei-ID kopieren"
+copyFolderId: "Ordner-ID kopieren"
 searchUser: "Nach einem Benutzer suchen"
 reply: "Antworten"
 loadMore: "Mehr laden"
@@ -112,7 +114,7 @@ pinnedNote: "Angeheftete Notiz"
 pinned: "Angeheftet"
 you: "Du"
 clickToShow: "Zum Anzeigen anklicken"
-sensitive: "NSFW"
+sensitive: "Sensibel"
 add: "Hinzufügen"
 reaction: "Reaktionen"
 reactions: "Reaktionen"
@@ -120,8 +122,8 @@ reactionSetting: "In der Reaktionsauswahl anzuzeigende Reaktionen"
 reactionSettingDescription2: "Ziehe um Anzuordnen, klicke um zu löschen, drücke „+“ um hinzuzufügen"
 rememberNoteVisibility: "Notizsichtbarkeit merken"
 attachCancel: "Anhang entfernen"
-markAsSensitive: "Als NSFW markieren"
-unmarkAsSensitive: "Als nicht NSFW markieren"
+markAsSensitive: "Als sensibel markieren"
+unmarkAsSensitive: "Als nicht sensibel markieren"
 enterFileName: "Dateinamen eingeben"
 mute: "Stummschalten"
 unmute: "Stummschaltung aufheben"
@@ -136,8 +138,10 @@ unblockConfirm: "Möchtest du diese Blockierung wirklich aufheben?"
 suspendConfirm: "Möchtest du diesen Benutzer wirklich sperren?"
 unsuspendConfirm: "Möchtest du diesen Benutzer wirklich entsperren?"
 selectList: "Liste auswählen"
+editList: "Liste bearbeiten"
 selectChannel: "Kanal auswählen"
 selectAntenna: "Antenne auswählen"
+editAntenna: "Antenne bearbeiten"
 selectWidget: "Widget auswählen"
 editWidgets: "Widgets bearbeiten"
 editWidgetsExit: "Fertig"
@@ -311,7 +315,7 @@ copyUrl: "URL kopieren"
 rename: "Umbenennen"
 avatar: "Profilbild"
 banner: "Banner"
-nsfw: "NSFW"
+displayOfSensitiveMedia: "Anzeige von sensiblen Medien"
 whenServerDisconnected: "Bei Verbindungsverlust zum Server"
 disconnectedFromServer: "Die Verbindung zum Server wurde getrennt"
 reload: "Aktualisieren"
@@ -693,7 +697,7 @@ driveUsage: "Drive-Auslastung"
 noCrawle: "Crawler-Indexierung ablehnen"
 noCrawleDescription: "Suchmaschinen bitten, die eigene Profilseite, Notizen, Seiten usw. nicht zu indexieren."
 lockedAccountInfo: "Auch wenn du Follow-Anfragen auf manuelle Bestätigung setzt, wird jede deiner Notizen öffentlich sichtbar sein, sofern du ihre Notizsichtbarkeit nicht auf \"Nur Follower\" setzt."
-alwaysMarkSensitive: "Medien standardmäßig als NSFW markieren"
+alwaysMarkSensitive: "Medien standardmäßig als sensibel markieren"
 loadRawImages: "Anstatt Vorschaubilder immer Originalbilder anzeigen"
 disableShowingAnimatedImages: "Animierte Bilder nicht abspielen"
 verificationEmailSent: "Eine Bestätigungsmail wurde an deine Email-Adresse versendet. Besuche den dort enthaltenen Link, um die Verifizierung abzuschließen."
@@ -912,16 +916,16 @@ type: "Art"
 speed: "Geschwindigkeit"
 slow: "Langsam"
 fast: "Schnell"
-sensitiveMediaDetection: "Erkennung von NSFW-Medien"
+sensitiveMediaDetection: "Erkennung von sensiblen Medien"
 localOnly: "Nur Lokal"
 remoteOnly: "Nur für fremde Instanzen"
 failedToUpload: "Hochladen fehlgeschlagen"
-cannotUploadBecauseInappropriate: "Diese Datei kann nicht hochgeladen werden, da Anteile der Datei als möglicherweise NSFW festgestellt wurden."
+cannotUploadBecauseInappropriate: "Diese Datei kann nicht hochgeladen werden, da Anteile der Datei als möglicherweise unangebracht festgestellt wurden."
 cannotUploadBecauseNoFreeSpace: "Die Datei konnte nicht hochgeladen werden, da dein Drive-Speicherplatz aufgebraucht ist."
 cannotUploadBecauseExceedsFileSizeLimit: "Diese Datei kann wegen Überschreitung der Maximalgröße nicht hochgeladen werden."
 beta: "Beta"
-enableAutoSensitive: "NSFW-Automarkierung"
-enableAutoSensitiveDescription: "Setzt soweit möglich durch Verwendung von Machine Learning automatisch NSFW-Markierungen für Medien, die NSFW-Anteile beinhalten. Auch wenn du diese Option deaktiviert hast, ist sie möglicherweise auf Instanzebene aktiviert."
+enableAutoSensitive: "Automarkierung sensibler Medien"
+enableAutoSensitiveDescription: "Setzt soweit möglich durch Verwendung von Machine Learning automatisch Markierungen für sensible Medien. Auch wenn du diese Option deaktiviert hast, ist sie möglicherweise auf Instanzebene aktiviert."
 activeEmailValidationDescription: "Aktivert strengere Überprüfung von E-Mail-Adressen, d.h. Testen auf Wegwerfadressen und darauf, ob mit der Adresse tatsächlich kommuniziert werden kann. Ist dies deaktiviert, so wird nur das Format der E-Mail überprüft."
 navbar: "Navigationsleiste"
 shuffle: "Mischen"
@@ -1063,6 +1067,9 @@ goToMisskey: "Zu Misskey"
 additionalEmojiDictionary: "Zusätzliche Emoji-Wörterbücher"
 installed: "Installiert"
 branding: "Branding"
+enableServerMachineStats: "Hardwareinformationen des Servers veröffentlichen"
+enableIdenticonGeneration: "Generierung von Benutzer-Identicons aktivieren"
+turnOffToImprovePerformance: "Deaktivierung kann zu höherer Leistung führen."
 _initialAccountSetting:
   accountCreated: "Dein Konto wurde erfolgreich erstellt!"
   letsStartAccountSetup: "Lass uns nun dein Konto einrichten."
@@ -1403,10 +1410,10 @@ _role:
     or: "ODER-Bedingung"
     not: "NICHT-Bedingung"
 _sensitiveMediaDetection:
-  description: "Ermöglicht eine Erleichterung der Servermoderation durch die automatische Erkennungen von NSFW-Medien unter Verwendung von Machine Learning. Hierdurch wird die Serverlast etwas erhöht."
+  description: "Ermöglicht eine Erleichterung der Servermoderation durch die automatische Erkennungen von sensiblen Medien unter Verwendung von Machine Learning. Hierdurch wird die Serverlast etwas erhöht."
   sensitivity: "Erkennungssensitivität"
   sensitivityDescription: "Durch das Senken der Sensitivität kann die Anzahl an Fehlerkennungen (sog. false positives) reduziert werden. Durch ein Erhöhen dieser kann die Anzahl an verpassten Erkennungen (sog. false negatives) reduziert werden."
-  setSensitiveFlagAutomatically: "Als NSFW markieren"
+  setSensitiveFlagAutomatically: "Als sensibel markieren"
   setSensitiveFlagAutomaticallyDescription: "Die Resultate der internen Erkennung werden beibehalten, auch wenn diese Option deaktiviert ist."
   analyzeVideos: "Videoanalyse aktivieren"
   analyzeVideosDescription: "Analysiert zusätzlich zu Bildern auch Videos. Die Last des Servers wird hierdurch etwas erhöht."
@@ -1435,6 +1442,7 @@ _ad:
   back: "Zurück"
   reduceFrequencyOfThisAd: "Diese Werbung weniger anzeigen"
   hide: "Ausblenden"
+  timezoneinfo: "Der Wochentag wird durch die Serverzeitzone bestimmt."
 _forgotPassword:
   enterEmail: "Gib die Email-Adresse ein, mit der du dich registriert hast. An diese wird ein Link gesendet, mit dem du dein Passwort zurücksetzen kannst."
   ifNoEmail: "Solltest du bei der Registrierung keine Email-Adresse angegeben haben, wende dich bitte an den Administrator."
@@ -1486,9 +1494,9 @@ _aboutMisskey:
   donate: "An Misskey spenden"
   morePatrons: "Wir schätzen ebenso die Unterstützung vieler anderer hier nicht gelisteter Personen sehr. Danke! 🥰"
   patrons: "UnterstützerInnen"
-_nsfw:
-  respect: "Als NSFW markierte Bilder verbergen"
-  ignore: "Als NSFW markierte Bilder nicht verbergen"
+_displayOfSensitiveMedia:
+  respect: "Sensible Medien verbergen"
+  ignore: "Sensible Medien anzeigen"
   force: "Alle Medien verbergen"
 _instanceTicker:
   none: "Nie anzeigen"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 893820857..02c15e541 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -54,6 +54,8 @@ copyRSS: "Copy RSS"
 copyUsername: "Copy username"
 copyUserId: "Copy user ID"
 copyNoteId: "Copy note ID"
+copyFileId: "Copy file ID"
+copyFolderId: "Copy folder ID"
 searchUser: "Search for a user"
 reply: "Reply"
 loadMore: "Load more"
@@ -112,7 +114,7 @@ pinnedNote: "Pinned note"
 pinned: "Pin to profile"
 you: "You"
 clickToShow: "Click to show"
-sensitive: "NSFW"
+sensitive: "Sensitive"
 add: "Add"
 reaction: "Reactions"
 reactions: "Reactions"
@@ -120,8 +122,8 @@ reactionSetting: "Reactions to show in the reaction picker"
 reactionSettingDescription2: "Drag to reorder, click to delete, press \"+\" to add."
 rememberNoteVisibility: "Remember note visibility settings"
 attachCancel: "Remove attachment"
-markAsSensitive: "Mark as NSFW"
-unmarkAsSensitive: "Unmark as NSFW"
+markAsSensitive: "Mark as sensitive"
+unmarkAsSensitive: "Unmark as sensitive"
 enterFileName: "Enter filename"
 mute: "Mute"
 unmute: "Unmute"
@@ -136,8 +138,10 @@ unblockConfirm: "Are you sure that you want to unblock this account?"
 suspendConfirm: "Are you sure that you want to suspend this account?"
 unsuspendConfirm: "Are you sure that you want to unsuspend this account?"
 selectList: "Select a list"
+editList: "Edit list"
 selectChannel: "Select a channel"
 selectAntenna: "Select an antenna"
+editAntenna: "Edit antenna"
 selectWidget: "Select a widget"
 editWidgets: "Edit widgets"
 editWidgetsExit: "Done"
@@ -311,7 +315,7 @@ copyUrl: "Copy URL"
 rename: "Rename"
 avatar: "Avatar"
 banner: "Banner"
-nsfw: "NSFW"
+displayOfSensitiveMedia: "Display of sensitive media"
 whenServerDisconnected: "When losing connection to the server"
 disconnectedFromServer: "Connection to server has been lost"
 reload: "Refresh"
@@ -693,7 +697,7 @@ driveUsage: "Drive space usage"
 noCrawle: "Reject crawler indexing"
 noCrawleDescription: "Ask search engines to not index your profile page, notes, Pages, etc."
 lockedAccountInfo: "Unless you set your note visiblity to \"Followers only\", your notes will be visible to anyone, even if you require followers to be manually approved."
-alwaysMarkSensitive: "Mark as NSFW by default"
+alwaysMarkSensitive: "Mark as sensitive by default"
 loadRawImages: "Load original images instead of showing thumbnails"
 disableShowingAnimatedImages: "Don't play animated images"
 verificationEmailSent: "A verification email has been sent. Please follow the included link to complete verification."
@@ -912,16 +916,16 @@ type: "Type"
 speed: "Speed"
 slow: "Slow"
 fast: "Fast"
-sensitiveMediaDetection: "Detection of NSFW media"
+sensitiveMediaDetection: "Detection of sensitive media"
 localOnly: "Local only"
 remoteOnly: "Remote only"
 failedToUpload: "Upload failed"
-cannotUploadBecauseInappropriate: "This file could not be uploaded because parts of it have been detected as potentially NSFW."
+cannotUploadBecauseInappropriate: "This file could not be uploaded because parts of it have been detected as potentially inappropriate."
 cannotUploadBecauseNoFreeSpace: "Upload failed due to lack of Drive capacity."
 cannotUploadBecauseExceedsFileSizeLimit: "This file cannot be uploaded as it exceeds the file size limit."
 beta: "Beta"
-enableAutoSensitive: "Automatic NSFW-Marking"
-enableAutoSensitiveDescription: "Allows automatic detection and marking of NSFW media through Machine Learning where possible. Even if this option is disabled, it may be enabled instance-wide."
+enableAutoSensitive: "Automatic marking as sensitive"
+enableAutoSensitiveDescription: "Allows automatic detection and marking of sensitive media through Machine Learning where possible. Even if this option is disabled, it may be enabled instance-wide."
 activeEmailValidationDescription: "Enables stricter validation of email addresses, which includes checking for disposable addresses and by whether it can actually be communicated with. When unchecked, only the format of the email is validated."
 navbar: "Navigation bar"
 shuffle: "Shuffle"
@@ -1063,6 +1067,9 @@ goToMisskey: "To Misskey"
 additionalEmojiDictionary: "Additional emoji dictionaries"
 installed: "Installed"
 branding: "Branding"
+enableServerMachineStats: "Publish server hardware stats"
+enableIdenticonGeneration: "Enable user identicon generation"
+turnOffToImprovePerformance: "Turning this off can increase performance."
 _initialAccountSetting:
   accountCreated: "Your account was successfully created!"
   letsStartAccountSetup: "For starters, let's set up your profile."
@@ -1403,10 +1410,10 @@ _role:
     or: "OR-Condition"
     not: "NOT-Condition"
 _sensitiveMediaDetection:
-  description: "Reduces the effort of server moderation through automatically recognizing NSFW media via Machine Learning. This will slightly increase the load on the server."
+  description: "Reduces the effort of server moderation through automatically recognizing sensitive media via Machine Learning. This will slightly increase the load on the server."
   sensitivity: "Detection sensitivity"
   sensitivityDescription: "Reducing the sensitivity will lead to fewer misdetections (false positives) whereas increasing it will lead to fewer missed detections (false negatives)."
-  setSensitiveFlagAutomatically: "Mark as NSFW"
+  setSensitiveFlagAutomatically: "Mark as sensitive"
   setSensitiveFlagAutomaticallyDescription: "The results of the internal detection will be retained even if this option is turned off."
   analyzeVideos: "Enable analysis of videos"
   analyzeVideosDescription: "Analyzes videos in addition to images. This will slightly increase the load on the server."
@@ -1435,6 +1442,7 @@ _ad:
   back: "Back"
   reduceFrequencyOfThisAd: "Show this ad less"
   hide: "Hide"
+  timezoneinfo: "The day of the week is determined from the server's timezone."
 _forgotPassword:
   enterEmail: "Enter the email address you used to register. A link with which you can reset your password will then be sent to it."
   ifNoEmail: "If you did not use an email during registration, please contact the instance administrator instead."
@@ -1486,9 +1494,9 @@ _aboutMisskey:
   donate: "Donate to Misskey"
   morePatrons: "We also appreciate the support of many other helpers not listed here. Thank you! 🥰"
   patrons: "Patrons"
-_nsfw:
-  respect: "Hide NSFW media"
-  ignore: "Don't hide NSFW media"
+_displayOfSensitiveMedia:
+  respect: "Hide media marked as sensitive"
+  ignore: "Display media marked as sensitive"
   force: "Hide all media"
 _instanceTicker:
   none: "Never show"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index a5dd18e3f..6f6433982 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -52,6 +52,8 @@ addToList: "Agregar a lista"
 sendMessage: "Enviar un mensaje"
 copyRSS: "Copiar RSS"
 copyUsername: "Copiar nombre de usuario"
+copyUserId: "Copiar ID del usuario"
+copyNoteId: "Copiar ID de la nota"
 searchUser: "Buscar un usuario"
 reply: "Responder"
 loadMore: "Ver más"
@@ -134,8 +136,10 @@ unblockConfirm: "¿Quiere dejar de bloquear esta cuenta?"
 suspendConfirm: "¿Quiere suspender esta cuenta?"
 unsuspendConfirm: "¿Quiere dejar de suspender esta cuenta?"
 selectList: "Seleccione una lista"
+editList: "Editar lista"
 selectChannel: "Seleccionar canal"
 selectAntenna: "Seleccionar antena"
+editAntenna: "Editar antena"
 selectWidget: "Seleccionar widget"
 editWidgets: "Editar widgets"
 editWidgetsExit: "Terminar edición"
@@ -229,10 +233,10 @@ instanceFollowers: "Seguidores de la instancia"
 instanceUsers: "Usuarios de la instancia"
 changePassword: "Cambiar contraseña"
 security: "Seguridad"
-retypedNotMatch: "No hay coincidencia"
+retypedNotMatch: "La información no coincide."
 currentPassword: "Contraseña actual"
 newPassword: "Contraseña nueva"
-newPasswordRetype: "Contraseña nueva (repetir)"
+newPasswordRetype: "Reescribe contraseña nueva"
 attachFile: "Añadir archivo"
 more: "¡Más!"
 featured: "Destacados"
@@ -309,7 +313,6 @@ copyUrl: "Copiar URL"
 rename: "Renombrar"
 avatar: "Avatar"
 banner: "Banner"
-nsfw: "Marcado como sensible"
 whenServerDisconnected: "Cuando se pierda la conexión con el servidor"
 disconnectedFromServer: "Desconectado del servidor"
 reload: "Recargar"
@@ -433,7 +436,7 @@ title: "Título"
 text: "Texto"
 enable: "Activar"
 next: "Siguiente"
-retype: "Intentar de nuevo"
+retype: "Ingrese de nuevo"
 noteOf: "Notas de {user}"
 quoteAttached: "Cita añadida"
 quoteQuestion: "¿Quiere añadir una cita?"
@@ -453,7 +456,7 @@ weakPassword: "Contraseña débil"
 normalPassword: "Buena contraseña"
 strongPassword: "Muy buena contraseña"
 passwordMatched: "Correcto"
-passwordNotMatched: "Las contraseñas no son las mismas"
+passwordNotMatched: "Las contraseñas no coinciden"
 signinWith: "Inicie sesión con {x}"
 signinFailed: "Autenticación fallida. Asegúrate de haber usado el nombre de usuario y contraseña correctos."
 or: "O"
@@ -790,8 +793,9 @@ noMaintainerInformationWarning: "No se ha establecido la información del admini
 noBotProtectionWarning: "La protección contra los bots no está configurada"
 configure: "Configurar"
 postToGallery: "Crear una nueva publicación en la galería"
+postToHashtag: "Publicar a este hashtag"
 gallery: "Galería"
-recentPosts: "Posts recientes"
+recentPosts: "Publicaciones recientes"
 popularPosts: "Más vistos"
 shareWithNote: "Compartir con una nota"
 ads: "Anuncios"
@@ -823,6 +827,7 @@ translatedFrom: "Traducido de {x}"
 accountDeletionInProgress: "La eliminación de la cuenta está en curso"
 usernameInfo: "Un nombre que identifique su cuenta de otras en este servidor.  Puede utilizar el alfabeto (a~z, A~Z), dígitos (0~9) o guiones bajos (_). Los nombres de usuario no se pueden cambiar posteriormente."
 aiChanMode: "Modo Ai"
+devMode: "Modo de desarrollador"
 keepCw: "Mantener la advertencia de contenido"
 pubSub: "Cuentas Pub/Sub"
 lastCommunication: "Última comunicación"
@@ -832,9 +837,11 @@ breakFollow: "Dejar de seguir"
 breakFollowConfirm: "¿Quieres dejar de seguir?"
 itsOn: "¡Está encendido!"
 itsOff: "¡Está apagado!"
-emailRequiredForSignup: "Se requere una dirección de correo electrónico para el registro de la cuenta"
+on: "Activado"
+off: "Desactivado"
+emailRequiredForSignup: "Se requiere una dirección de correo electrónico para el registro de la cuenta"
 unread: "No leído"
-filter: "Filtro"
+filter: "Filtrar"
 controlPanel: "Panel de control"
 manageAccounts: "Administrar cuenta"
 makeReactionsPublic: "Hacer el historial de reacciones público"
@@ -912,6 +919,7 @@ remoteOnly: "Sólo remoto"
 failedToUpload: "La subida falló"
 cannotUploadBecauseInappropriate: "Este archivo no se puede subir debido a que algunas partes han sido detectadas comoNSFW."
 cannotUploadBecauseNoFreeSpace: "La subida falló debido a falta de espacio libre en la unidad del usuario."
+cannotUploadBecauseExceedsFileSizeLimit: "Este archivo supera el peso máximo y no puede ser subido."
 beta: "Beta"
 enableAutoSensitive: "Marcar automáticamente contenido NSFW"
 enableAutoSensitiveDescription: "Permite la detección y marcado automático de contenido NSFW usando 'Machine Learning' cuando sea posible. Incluso si esta opción está desactivada, puede ser activado para toda la instancia."
@@ -942,18 +950,23 @@ show: "Apariencia"
 neverShow: "No mostrar de nuevo"
 remindMeLater: "Recordar después"
 didYouLikeMisskey: "¿Te gusta Misskey?"
-pleaseDonate: "Misskey es software libre, y es usado por {host} . Por favor, ¡considera donar al proyecto principal para que podamos continuar!"
+pleaseDonate: "{host} usa el software gratuito Misskey. Por favor ¡Considera donar al proyecto principal para que podamos continuar!"
 roles: "Roles"
-role: "Roles"
+role: "Rol"
+noRole: "Rol no encontrado"
 normalUser: "Usuario normal"
 undefined: "Indefinido"
 assign: "Asignar"
 unassign: "Quitar"
 color: "Color"
 manageCustomEmojis: "Administrar emojis personalizados"
-youCannotCreateAnymore: "Se alcanzó el límite de creación"
-cannotPerformTemporary: "Indisponible temporalmente"
+youCannotCreateAnymore: "Has llegado al límite de creaciones."
+cannotPerformTemporary: "Temporalmente no disponible"
 cannotPerformTemporaryDescription: "Esta acción no se puede realizar porque se excedió el límite de ejecución. Espera un poco y prueba de nuevo."
+invalidParamError: "Parámetros inválidos"
+invalidParamErrorDescription: "Los parámetros de la solicitud son inválidos. Normalmente se trata de un error, pero también puede haberse excedido algún límite o similares."
+permissionDeniedError: "Operación denegada"
+permissionDeniedErrorDescription: "Esta cuenta no tiene permisos para hacer esa acción."
 preset: "Predefinido"
 selectFromPresets: "Escoger desde predefinidos"
 achievements: "Logros"
@@ -969,7 +982,7 @@ internalServerErrorDescription: "El servidor tuvo un error inesperado."
 copyErrorInfo: "Copiar detalles del error"
 joinThisServer: "Registrarse en esta instancia"
 exploreOtherServers: "Buscar otra instancia"
-letsLookAtTimeline: "Mirar la línea de tiempo local"
+letsLookAtTimeline: "Mira la línea de tiempo"
 disableFederationConfirm: "¿Estas seguro que quieres desactivar la federación?"
 disableFederationConfirmWarn: "Aunque no exista federación los posts no serán marcados como privados. En la mayoría de los casos, no es necesario hacer los posts no federar."
 disableFederationOk: "Desactivar."
@@ -980,6 +993,7 @@ cannotBeChangedLater: "Esto no podrá ser cambiado después."
 reactionAcceptance: "Aceptación de reacciones"
 likeOnly: "Sólo 'me gusta'"
 likeOnlyForRemote: "Sólo reacciones de instancias remotas"
+nonSensitiveOnly: "Solo no sensible"
 rolesAssignedToMe: "Roles asignados a mí"
 resetPasswordConfirm: "¿Realmente quieres cambiar la contraseña?"
 sensitiveWords: "Palabras sensibles"
@@ -997,14 +1011,40 @@ enableChartsForFederatedInstances: "Generar gráficos de servidores remotos"
 showClipButtonInNoteFooter: "Añadir \"Clip\" al menú de notas"
 largeNoteReactions: "Agrandar las reacciones de las notas"
 noteIdOrUrl: "ID o URL de la nota"
+video: "Video"
+videos: "Video"
+dataSaver: "Ahorro de datos"
 accountMigration: "Migración de cuenta"
-accountMoved: "Este usuario se ha mudado a una nueva cuenta:"
+accountMoved: "Este usuario se movió a una nueva cuenta:"
 accountMovedShort: "Esta cuenta ha sido migrada."
+addMemo: "Añadir nota"
+editMemo: "Editar nota"
+reactionsList: "Lista de reacciones"
+renotesList: "Renotas"
+stackAxis: "Dirección de apilado"
 horizontal: "Horizontal"
+position: "Posición"
+serverRules: "Reglas del servidor"
+continue: "Continuar"
+preservedUsernames: "Nombre de usuario reservado"
+archive: "Archivo"
+channelArchiveConfirmTitle: "¿Seguro de archivar {name}?"
 youFollowing: "Siguiendo"
 options: "Opción"
+update: "Actualizar"
+installed: "Instalado"
+branding: "Marca"
+enableServerMachineStats: "Publicar estadísticas de hardware del servidor"
+enableIdenticonGeneration: "Activar generación de identicon por usuario"
 _initialAccountSetting:
   accountCreated: "¡La cuenta ha sido creada!"
+  letsStartAccountSetup: "Para empezar, creemos tu perfil."
+  letsFillYourProfile: "Primero, creemos tu perfil."
+  profileSetting: "Configuración del perfil"
+  privacySetting: "Configuración de privacidad"
+  theseSettingsCanEditLater: "Puedes cambiar estos ajustes más tarde."
+  youCanEditMoreSettingsInSettingsPageLater: "Desde la pestaña de \"Configuración\" puedes modificar más ajustes. Asegúrate de visitarla después."
+  followUsers: "Comienza a seguir a usuarios que te interesen para construir tu línea de tiempo."
 _accountMigration:
   moveFrom: "Trasladar de otra cuenta a ésta"
   moveFromLabel: "Cuenta desde la que se realiza el traslado:"
@@ -1290,7 +1330,7 @@ _role:
     canPublicNote: "Permitir la publicación"
     canInvite: "Puede crear códigos de invitación"
     canManageCustomEmojis: "Administrar emojis personalizados"
-    driveCapacity: "Capacidad de almacenamiento"
+    driveCapacity: "Capacidad del drive"
     pinMax: "Máximo de notas fijadas"
     antennaMax: "Máximo de antenas"
     wordMuteMax: "Máximo de caracteres en palabras silenciadas"
@@ -1401,10 +1441,6 @@ _aboutMisskey:
   donate: "Donar a Misskey"
   morePatrons: "Muchas más personas nos apoyan. Muchas gracias🥰"
   patrons: "Patrocinadores"
-_nsfw:
-  respect: "Ocultar medios NSFW"
-  ignore: "No esconder medios NSFW "
-  force: "Ocultar todos los medios"
 _instanceTicker:
   none: "No mostrar"
   remote: "Mostrar a usuarios remotos"
@@ -1526,7 +1562,7 @@ _sfx:
   channel: "Notificaciones del canal"
 _ago:
   future: "Futuro"
-  justNow: "Recién ahora"
+  justNow: "Justo ahora"
   secondsAgo: "Hace {n} segundos"
   minutesAgo: "Hace {n} minutos"
   hoursAgo: "Hace {n} horas"
@@ -1540,6 +1576,9 @@ _time:
   minute: "Minutos"
   hour: "Horas"
   day: "Días"
+_timelineTutorial:
+  step4_1: "También puedes añadir \"Reacciones\" a notas."
+  step4_2: "Para añadir una reacción selecciona el botón \"+\" en la nota y escoge el emoji que quieras para reaccionar."
 _2fa:
   alreadyRegistered: "Ya has completado la configuración."
   registerTOTP: "Registrar aplicación autenticadora"
@@ -1685,14 +1724,14 @@ _visibility:
   homeDescription: "Visible sólo en la linea de tiempo de inicio"
   followers: "Seguidores"
   followersDescription: "Visible sólo para tus seguidores"
-  specified: "Mensaje directo"
+  specified: "Nota directa"
   specifiedDescription: "Visible sólo para los usuarios elegidos"
   disableFederation: "No federado"
   disableFederationDescription: "No enviar a otras instancias"
 _postForm:
   replyPlaceholder: "Responder a esta nota"
   quotePlaceholder: "Citar esta nota"
-  channelPlaceholder: "Postear en el canal"
+  channelPlaceholder: "Publicar en el canal"
   _placeholders:
     a: "¿Qué haces?"
     b: "¿Te pasó algo?"
@@ -1876,7 +1915,7 @@ _deck:
     list: "Listas"
     channel: "Canal"
     mentions: "Menciones"
-    direct: "Mensaje directo"
+    direct: "Notas directas"
 _dialog:
   charactersExceeded: "¡Has excedido el límite de caracteres! Actualmente {current} de {max}."
   charactersBelow: "¡Estás por debajo del límite de caracteres! Actualmente {current} de {min}."
@@ -1884,8 +1923,8 @@ _disabledTimeline:
   title: "Línea de tiempo deshabilitada"
   description: "No puedes usar esta línea de tiempo con tus roles actuales."
 _drivecleaner:
-  orderBySizeDesc: "Más grandes"
-  orderByCreatedAtAsc: "Más antiguos"
+  orderBySizeDesc: "Tamaño descendiente"
+  orderByCreatedAtAsc: "Fecha ascendente"
 _webhookSettings:
   createWebhook: "Crear Webhook"
   name: "Nombre"
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index 173380805..5d7a773f8 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -302,7 +302,6 @@ copyUrl: "Copier l’URL"
 rename: "Renommer"
 avatar: "Avatar"
 banner: "Bannière"
-nsfw: "Contenu sensible"
 whenServerDisconnected: "Lorsque la connexion au serveur est perdue"
 disconnectedFromServer: "Déconnecté·e du serveur"
 reload: "Rafraîchir"
@@ -1085,10 +1084,6 @@ _aboutMisskey:
   donate: "Soutenir Misskey"
   morePatrons: "Nous apprécions vraiment le soutien de nombreuses autres personnes non mentionnées ici. Merci à toutes et à tous ! 🥰"
   patrons: "Contributeurs"
-_nsfw:
-  respect: "Cacher les médias marqués comme contenu sensible"
-  ignore: "Afficher les médias sensibles"
-  force: "Cacher tous les médias"
 _instanceTicker:
   none: "Cacher "
   remote: "Montrer pour les utilisateur·ice·s distant·e·s"
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index 70217caa2..34c995b05 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -5,7 +5,7 @@ introMisskey: "Selamat datang! Misskey adalah perangkat mikroblog tercatu bersif
 poweredByMisskeyDescription: "{name} adalah sebuah layanan (instance) yang menggunakan platform sumber terbuka <b>Misskey</b>."
 monthAndDay: "{day} {month}"
 search: "Penelusuran"
-notifications: "Pemberitahuan"
+notifications: "Notifikasi"
 username: "Nama Pengguna"
 password: "Kata sandi"
 forgotPassword: "Lupa Kata Sandi"
@@ -17,7 +17,7 @@ noThankYou: "Tidak sekarang."
 enterUsername: "Masukkan nama pengguna"
 renotedBy: "direnote oleh {user}"
 noNotes: "Tidak ada catatan"
-noNotifications: "Tidak ada pemberitahuan"
+noNotifications: "Tidak ada notifikasi"
 instance: "Instansi"
 settings: "Pengaturan"
 notificationSettings: "Atur Notifikasi"
@@ -25,7 +25,7 @@ basicSettings: "Pengaturan umum"
 otherSettings: "Pengaturan lainnya"
 openInWindow: "Buka di jendela"
 profile: "Profil"
-timeline: "Linimasa"
+timeline: "Lini masa"
 noAccountDescription: "Pengguna ini belum menulis bio"
 login: "Masuk"
 loggingIn: "Sedang masuk"
@@ -52,6 +52,8 @@ addToList: "Tambahkan ke daftar"
 sendMessage: "Kirim pesan"
 copyRSS: "Salin RSS"
 copyUsername: "Salin nama pengguna"
+copyUserId: "Salin ID pengguna"
+copyNoteId: "Salin ID catatan"
 searchUser: "Cari pengguna"
 reply: "Balas"
 loadMore: "Selebihnya"
@@ -90,7 +92,7 @@ serverIsDead: "Tidak ada respon dari peladen. Mohon tunggu dan coba beberapa saa
 youShouldUpgradeClient: "Untuk melihat halaman ini, mohon muat ulang untuk memutakhirkan klienmu."
 enterListName: "Masukkan nama daftar"
 privacy: "Privasi"
-makeFollowManuallyApprove: "Permintaan mengikuti membutuhkan persetujuan"
+makeFollowManuallyApprove: "Permintaan mengikuti butuh persetujuan"
 defaultNoteVisibility: "Privasi bawaan catatan"
 follow: "Ikuti"
 followRequest: "Permintaan mengikuti"
@@ -115,7 +117,7 @@ add: "Tambahkan"
 reaction: "Reaksi"
 reactions: "Reaksi"
 reactionSetting: "Reaksi untuk dimunculkan di bilah reaksi"
-reactionSettingDescription2: "Geser untuk memindah urutkan, klik untuk menghapus, tekan \"+\" untuk menambahkan"
+reactionSettingDescription2: "Geser untuk memindah urutan emoji, klik untuk menghapus, tekan \"+\" untuk menambahkan"
 rememberNoteVisibility: "Ingat pengaturan visibilitas catatan"
 attachCancel: "Hapus lampiran"
 markAsSensitive: "Tandai sebagai konten sensitif"
@@ -134,8 +136,10 @@ unblockConfirm: "Apakah kamu yakin ingin membuka blokir akun ini?"
 suspendConfirm: "Apakah kamu yakin ingin membekukan akun ini?"
 unsuspendConfirm: "Apakah kamu yakin ingin membuka pembekuan akun ini?"
 selectList: "Pilih daftar"
+editList: "Sunting daftar"
 selectChannel: "Pilih kanal"
 selectAntenna: "Pilih Antena"
+editAntenna: "Sunting antena"
 selectWidget: "Pilih gawit"
 editWidgets: "Sunting gawit"
 editWidgetsExit: "Selesai"
@@ -146,16 +150,17 @@ emojiName: "Nama emoji"
 emojiUrl: "URL Emoji"
 addEmoji: "Tambahkan emoji"
 settingGuide: "Pengaturan rekomendasi"
-cacheRemoteFiles: "Tembolokkan berkas remote"
-cacheRemoteFilesDescription: "Ketika pengaturan ini dinonaktifkan, berkas luar akan dimuat langsung dari instansi luar. Menonaktifkan ini akan mengurangi penggunaan penyimpanan, namun dapat menyebabkan meningkatkan lalu lintas bandwidth, karena thumbnail tidak dihasilkan."
+cacheRemoteFiles: "Tembolokkan berkas dari instansi luar"
+cacheRemoteFilesDescription: "Ketika pengaturan ini dinonaktifkan, berkas dari instansi luar akan dimuat langsung. Menonaktifkan ini akan mengurangi penggunaan penyimpanan peladen, namun dapat menyebabkan peningkatan lalu lintas bandwidth, karena keluku tidak dihasilkan."
 flagAsBot: "Atur akun ini sebagai Bot"
 flagAsBotDescription: "Jika akun ini dikendalikan oleh program, tetapkanlah opsi ini. Jika diaktifkan, ini akan berfungsi sebagai tanda bagi pengembang lain untuk mencegah interaksi berantai dengan bot lain dan menyesuaikan sistem internal Misskey untuk memperlakukan akun ini sebagai bot."
 flagAsCat: "Atur akun ini sebagai kucing"
 flagAsCatDescription: "Nyalakan tanda ini untuk menandai akun ini sebagai kucing."
-flagShowTimelineReplies: "Tampilkan balasan di linimasa"
-flagShowTimelineRepliesDescription: "Menampilkan balasan pengguna dari note pengguna lain di linimasa apabila dinyalakan."
+flagShowTimelineReplies: "Tampilkan balasan di lini masa"
+flagShowTimelineRepliesDescription: "Menampilkan balasan pengguna dari catatan pengguna lain di lini masa apabila dinyalakan."
 autoAcceptFollowed: "Setujui otomatis permintaan mengikuti dari pengguna yang kamu ikuti"
 addAccount: "Tambahkan akun"
+reloadAccountsList: "Muat ulang daftar akun"
 loginFailed: "Gagal untuk masuk"
 showOnRemote: "Lihat profil asli"
 general: "Umum"
@@ -166,7 +171,7 @@ searchWith: "Cari: {q}"
 youHaveNoLists: "Kamu tidak memiliki daftar apapun"
 followConfirm: "Apakah kamu yakin ingin mengikuti {name}?"
 proxyAccount: "Akun proksi"
-proxyAccountDescription: "Akun proksi merupakan sebuah akun yang bertindak sebagai pengikut luar untuk pengguna dalam kondisi tertentu. Sebagai contoh, ketika pengguna menambahkan seorang pengguna luar ke dalam daftar, aktivitas dari pengguna luar tidak akan disampaikan ke instansi apabila tidak ada pengguna lokal yang mengikuti pengguna tersebut, dengan begitu akun proksilah yang akan mengikutinya."
+proxyAccountDescription: "Akun proksi merupakan sebuah akun yang bertindak sebagai pengikut instansi luar untuk pengguna dalam kondisi tertentu. Sebagai contoh, ketika pengguna menambahkan seorang pengguna instansi luar ke dalam daftar, aktivitas dari pengguna instansi luar tidak akan disampaikan ke instansi apabila tidak ada pengguna lokal yang mengikuti pengguna tersebut, dengan begitu akun proksilah yang akan mengikutinya."
 host: "Host"
 selectUser: "Pilih pengguna"
 recipient: "Penerima"
@@ -198,7 +203,7 @@ clearQueue: "Bersihkan antrian"
 clearQueueConfirmTitle: "Apakah kamu yakin ingin membersihkan antrian?"
 clearQueueConfirmText: "Seluruh sisa catatan yang tidak tersampaikan di dalam antrian tidak akan difederasi. Biasanya operasi ini TIDAK dibutuhkan."
 clearCachedFiles: "Hapus tembolok"
-clearCachedFilesConfirm: "Apakah kamu yakin ingin menghapus seluruh tembolok berkas remote?"
+clearCachedFilesConfirm: "Apakah kamu yakin ingin menghapus seluruh tembolok berkas instansi luar?"
 blockedInstances: "Instansi terblokir"
 blockedInstancesDescription: "Daftar nama host dari instansi yang diperlukan untuk diblokir. Instansi yang didaftarkan tidak akan dapat berkomunikasi dengan instansi ini."
 muteAndBlock: "Bisukan / Blokir"
@@ -223,9 +228,9 @@ all: "Semua"
 subscribing: "Berlangganan"
 publishing: "Sedang menyiarkan langsung"
 notResponding: "Tidak ada respon"
-instanceFollowing: "Mengikuti instance"
-instanceFollowers: "Pengikut instance"
-instanceUsers: "Pengguna pada instance ini"
+instanceFollowing: "Mengikuti instansi"
+instanceFollowers: "Pengikut instansi"
+instanceUsers: "Pengguna pada instansi ini"
 changePassword: "Ubah kata sandi"
 security: "Keamanan"
 retypedNotMatch: "Input tidak sama"
@@ -233,11 +238,11 @@ currentPassword: "Kata sandi saat ini"
 newPassword: "Kata sandi baru"
 newPasswordRetype: "Ulangi kata sandi baru"
 attachFile: "Lampirkan berkas"
-more: "Lagi !"
+more: "Lainnya"
 featured: "Sorotan"
 usernameOrUserId: "Nama pengguna atau User ID"
 noSuchUser: "Pengguna tidak ditemukan"
-lookup: "Mencari"
+lookup: "Cari"
 announcements: "Pengumuman"
 imageUrl: "URL Gambar"
 remove: "Hapus"
@@ -268,7 +273,7 @@ basicNotesBeforeCreateAccount: "Catatan penting"
 termsOfService: "Syarat dan ketentuan"
 start: "Mulai"
 home: "Beranda"
-remoteUserCaution: "Informasi ini mungkin tidak mutakhir, karena pengguna ini berasal dari instansi luar."
+remoteUserCaution: "Informasi ini mungkin tidak mutakhir, karena pengguna ini berasal dari peladen instansi luar."
 activity: "Aktivitas"
 images: "Gambar"
 image: "Gambar"
@@ -308,19 +313,18 @@ copyUrl: "Salin tautan"
 rename: "Ubah nama"
 avatar: "Avatar"
 banner: "Banner"
-nsfw: "Konten sensitif"
 whenServerDisconnected: "Ketika kehilangan koneksi dengan peladen"
 disconnectedFromServer: "Terputus koneksi dari peladen"
 reload: "Muat ulang"
 doNothing: "Abaikan"
-reloadConfirm: "Apakah kamu ingin memuat ulang linimasa?"
+reloadConfirm: "Apakah kamu ingin memuat ulang lini masa?"
 watch: "Tonton"
 unwatch: "Batal tonton"
 accept: "Terima"
 reject: "Tolak"
 normal: "Normal"
-instanceName: "Nama instance"
-instanceDescription: "Tentang instance"
+instanceName: "Nama instansi"
+instanceDescription: "Tentang instansi"
 maintainerName: "Pengelola"
 maintainerEmail: "Surel pengelola"
 tosUrl: "URL Syarat dan Ketentuan"
@@ -334,9 +338,9 @@ pages: "Halaman"
 integration: "Integrasi"
 connectService: "Sambungkan"
 disconnectService: "Putuskan"
-enableLocalTimeline: "Nyalakan linimasa lokal"
-enableGlobalTimeline: "Nyalakan linimasa global"
-disablingTimelinesInfo: "Admin dan Moderator akan selalu memiliki akses ke semua linimasa meskipun linimasa tersebut tidak diaktifkan."
+enableLocalTimeline: "Nyalakan lini masa lokal"
+enableGlobalTimeline: "Nyalakan lini masa global"
+disablingTimelinesInfo: "Admin dan Moderator akan selalu memiliki akses ke semua lini masa meskipun lini masa tersebut tidak diaktifkan."
 registration: "Pendaftaran"
 enableRegistration: "Nyalakan pendaftaran pengguna baru"
 invite: "Undang"
@@ -379,7 +383,7 @@ enableServiceworker: "Aktifkan ServiceWorker"
 antennaUsersDescription: "Tuliskan satu nama pengguna per baris"
 caseSensitive: "Peka huruf besar dan huruf kecil"
 withReplies: "Termasuk balasan"
-connectedTo: "Akun yang mengikuti telah terhubung"
+connectedTo: "Akun berikut terhubung"
 notesAndReplies: "Catatan dan balasan"
 withFiles: "Media"
 silence: "Bungkam"
@@ -398,6 +402,7 @@ about: "Informasi"
 aboutMisskey: "Tentang Misskey"
 administrator: "Admin"
 token: "Token"
+2fa: "Autentikasi 2-faktor"
 totp: "Aplikasi autentikator"
 totpDescription: "Gunakan aplikasi autentikator untuk mendapatkan kata sandi sekali pakai"
 moderator: "Moderator"
@@ -409,6 +414,7 @@ lastUsed: "Terakhir digunakan"
 lastUsedAt: "Penggunaan terakhir: {t}"
 unregister: "Batalkan pendaftaran"
 passwordLessLogin: "Setel login tanpa kata sandi"
+passwordLessLoginDescription: "Bolehkan masuk tanpa kata sandi dengan menggunakan hanya security-key atau passkey"
 resetPassword: "Atur ulang kata sandi"
 newPasswordIs: "Kata sandi baru adalah \"{password}\""
 reduceUiAnimation: "Kurangi animasi antarmuka"
@@ -417,7 +423,7 @@ notFound: "Tidak dapat ditemukan"
 notFoundDescription: "Tidak ada halaman sesuai dengan URL yang ditentukan."
 uploadFolder: "Lokasi unggah folder bawaan"
 cacheClear: "Bersihkan tembolok"
-markAsReadAllNotifications: "Tandai semua pemberitahuan telah dibaca"
+markAsReadAllNotifications: "Tandai semua notifikasi telah dibaca"
 markAsReadAllUnreadNotes: "Tandai semua catatan telah dibaca"
 markAsReadAllTalkMessages: "Tandai semua pesan telah dibaca"
 help: "Bantuan"
@@ -460,6 +466,7 @@ aboutX: "Tentang {x}"
 emojiStyle: "Gaya emoji"
 native: "Native"
 disableDrawer: "Jangan gunakan menu bergaya laci"
+showNoteActionsOnlyHover: "Hanya tampilkan aksi catatan saat ditunjuk"
 noHistory: "Tidak ada riwayat"
 signinHistory: "Riwayat masuk"
 enableAdvancedMfm: "Nyalakan MFM tingkat lanjut"
@@ -472,6 +479,8 @@ createAccount: "Buat akun"
 existingAccount: "Akun yang ada"
 regenerate: "Buat ulang"
 fontSize: "Ukuran huruf"
+mediaListWithOneImageAppearance: "Tinggi daftar media dengan satu gambar saja"
+limitTo: "Batasi pada {x}"
 noFollowRequests: "Kamu tidak memiliki permintaan mengikuti yang menunggu"
 openImageInNewTab: "Buka gambar di tab baru"
 dashboard: "Dasbor"
@@ -487,7 +496,7 @@ promotion: "Promosi"
 promote: "Promosikan"
 numberOfDays: "Jumlah hari"
 hideThisNote: "Sembunyikan catatan ini"
-showFeaturedNotesInTimeline: "Tampilkan catatan yang diunggulkan di linimasa"
+showFeaturedNotesInTimeline: "Tampilkan catatan yang diunggulkan di lini masa"
 objectStorage: "Object Storage"
 useObjectStorage: "Gunakan object storage"
 objectStorageBaseUrl: "Base URL"
@@ -505,9 +514,11 @@ objectStorageUseSSLDesc: "Matikan ini jika kamu tidak akan menggunakan HTTPS unt
 objectStorageUseProxy: "Hubungkan melalui Proxy"
 objectStorageUseProxyDesc: "Matikan ini jika kamu tidak akan menggunakan Proxy untuk koneksi ObjectStorage"
 objectStorageSetPublicRead: "Setel \"public-read\" disaat mengunggah"
+s3ForcePathStyleDesc: "Jika s3ForcePathStyle dinyalakan, nama bucket harus dimasukkan dalam path URL dan bukan URL nama host tersebut. Kamu perlu menyalakan pengaturan ini jika menggunakan layanan seperti instansi Minio yang self-hosted."
 serverLogs: "Log Peladen"
 deleteAll: "Hapus semua"
-showFixedPostForm: "Tampilkan form posting di atas linimasa."
+showFixedPostForm: "Tampilkan form posting di atas lini masa."
+showFixedPostFormInChannel: "Tampilkan form posting di atas lini masa (Kanal)"
 newNoteRecived: "Kamu mendapat catatan baru"
 sounds: "Bunyi"
 sound: "Bunyi"
@@ -536,23 +547,28 @@ scratchpadDescription: "Scratchpad menyediakan lingkungan eksperimen untuk AiScr
 output: "Keluaran"
 script: "Script"
 disablePagesScript: "Nonaktifkan script pada halaman"
-updateRemoteUser: "Perbaharui informasi pengguna luar"
+updateRemoteUser: "Perbaharui informasi pengguna instansi luar"
 deleteAllFiles: "Hapus semua berkas"
 deleteAllFilesConfirm: "Apakah kamu yakin ingin menghapus semua berkas?"
-removeAllFollowing: "Tahan semua mengikuti"
+removeAllFollowing: "Batalkan mengikuti semua pengguna"
 removeAllFollowingDescription: "Batal mengikuti semua akun dari {host}. Mohon jalankan ini ketika instansi sudah tidak ada lagi."
 userSuspended: "Pengguna ini telah dibekukan."
 userSilenced: "Pengguna ini telah dibungkam."
 yourAccountSuspendedTitle: "Akun ini dibekukan"
 yourAccountSuspendedDescription: "Akun ini dibekukan karena melanggar ketentuan penggunaan layanan peladen atau semacamnya. Hubungi admin apabila ingin tahu alasan lebih lanjut. Mohon untuk tidak membuat akun baru."
+tokenRevoked: "Token tidak valid"
+tokenRevokedDescription: "Token ini telah kedaluwarsa. Mohon masuk lagi."
+accountDeleted: "Akun telah dihapus"
+accountDeletedDescription: "Akun ini telah dihapus."
 menu: "Menu"
 divider: "Pembagi"
 addItem: "Tambahkan item"
+rearrange: "Tata ulang"
 relays: "Relay"
 addRelay: "Tambahkan relay"
 inboxUrl: "URL Kotak masuk"
 addedRelays: "Relay yang ditambahkan"
-serviceworkerInfo: "Harus diaktifkan untuk pemberitahuan push."
+serviceworkerInfo: "Harus diaktifkan untuk notifikasi dorong."
 deletedNote: "Catatan yang dihapus"
 invisibleNote: "Catatan yang disembunyikan"
 enableInfiniteScroll: "Aktifkan gulir tak terbatas"
@@ -580,13 +596,13 @@ height: "Tinggi"
 large: "Besar"
 medium: "Sedang"
 small: "Kecil"
-generateAccessToken: "Buat access token"
+generateAccessToken: "Buat token akses"
 permission: "Izin"
 enableAll: "Aktifkan semua"
 disableAll: "Nonaktifkan semua"
 tokenRequested: "Berikan ijin akses ke akun"
 pluginTokenRequestedDescription: "Plugin ini dapat menggunakan setelan ijin disini."
-notificationType: "Jenis pemberitahuan"
+notificationType: "Jenis notifikasi"
 edit: "Sunting"
 emailServer: "Peladen surel"
 enableEmail: "Nyalakan distribusi surel"
@@ -617,10 +633,10 @@ delayed: "Terlambat"
 database: "Basis data"
 channel: "Kanal"
 create: "Buat"
-notificationSetting: "Pengaturan Pemberitahuan"
-notificationSettingDesc: "Pilih tipe pemberitahuan untuk ditampilkan"
+notificationSetting: "Pengaturan Notifikasi"
+notificationSettingDesc: "Pilih tipe notifikasi untuk ditampilkan"
 useGlobalSetting: "Gunakan setelan global"
-useGlobalSettingDesc: "Jika dinyalakan, setelan pemberitahuan akun kamu akan digunakan. Jika dimatikan, konfigurasi secara individu dapat dibuat."
+useGlobalSettingDesc: "Jika dinyalakan, setelan notifikasi akun kamu akan digunakan. Jika dimatikan, pengaturan secara individu dapat dibuat."
 other: "Lainnya"
 regenerateLoginToken: "Perbarui token login"
 regenerateLoginTokenDescription: "Perbarui token yang digunakan secara internal saat login. Normalnya aksi ini tidak diperlukan. Jika diperbarui, semua perangkat akan dilogout."
@@ -657,8 +673,8 @@ createNewClip: "Buat klip baru"
 unclip: "Batalkan klip"
 confirmToUnclipAlreadyClippedNote: "Catatan ini sudah disertakan di klip \"{name}\". Yakin ingin membatalkan catatan dari klip ini?"
 public: "Publik"
-i18nInfo: "Misskey diterjemahkan ke dalam banyak bahasa oleh sukarelawan. Kamu dapat ikut membantu di {link}."
-manageAccessTokens: "Kelola access token"
+i18nInfo: "Misskey diterjemahkan ke dalam banyak bahasa oleh sukarelawan. Kamu juga dapat ikut membantu menerjemahkannya di {link}."
+manageAccessTokens: "Kelola token akses"
 accountInfo: "Informasi akun"
 notesCount: "Jumlah catatan"
 repliesCount: "Jumlah balasan terkirim"
@@ -675,7 +691,7 @@ yes: "Iya"
 no: "Tidak"
 driveFilesCount: "Jumlah berkas drive"
 driveUsage: "Penggunaan ruang penyimpanan drive"
-noCrawle: "Tolak pengindeksan crawler"
+noCrawle: "Tolak pengindeksan perayap web"
 noCrawleDescription: "Meminta mesin pencari untuk tidak mengindeks halaman profil kamu, catatan, Halaman, dll."
 lockedAccountInfo: "Kecuali kamu menyetel visibilitas catatan milikmu ke \"Hanya pengikut\", catatan milikmu akan dapat dilihat oleh siapa saja, bahkan jika kamu memerlukan pengikut untuk disetujui secara manual."
 alwaysMarkSensitive: "Tandai media dalam catatan sebagai media sensitif"
@@ -691,10 +707,12 @@ contact: "Kontak"
 useSystemFont: "Gunakan font bawaan sistem operasi"
 clips: "Klip"
 experimentalFeatures: "Fitur eksperimental"
+experimental: "Eksperimental"
+thisIsExperimentalFeature: "Fitur ini eksperimental. Fungsionalitas dari fitur ini dapat berubah sewaktu-waktu dan mungkin tidak bekerja sesuai semestinya."
 developer: "Pengembang"
 makeExplorable: "Buat akun tampil di \"Jelajahi\""
-makeExplorableDescription: "Jika kamu mematikan ini, akun kamu tidak akan muncul di bagian \"Jelajahi:"
-showGapBetweenNotesInTimeline: "Tampilkan jarak diantara catatan pada linimasa"
+makeExplorableDescription: "Jika kamu mematikan ini, akun kamu tidak akan muncul di menu \"Jelajahi\""
+showGapBetweenNotesInTimeline: "Tampilkan jarak diantara catatan pada lini masa"
 duplicate: "Duplikat"
 left: "Kiri"
 center: "Tengah"
@@ -733,14 +751,14 @@ capacity: "Kapasitas"
 inUse: "Digunakan"
 editCode: "Sunting kode"
 apply: "Terapkan"
-receiveAnnouncementFromInstance: "Terima pemberitahuan surel dari instansi ini"
-emailNotification: "Pemberitahuan surel"
+receiveAnnouncementFromInstance: "Terima pengumuman dari instansi ini"
+emailNotification: "Notifikasi surel"
 publish: "Terbitkan"
 inChannelSearch: "Cari di kanal"
 useReactionPickerForContextMenu: "Buka pemilih reaksi dengan klik-kanan"
 typingUsers: "{users} sedang mengetik..."
 jumpToSpecifiedDate: "Loncat ke tanggal spesifik"
-showingPastTimeline: "Sedang menampilkan linimasa lama"
+showingPastTimeline: "Sedang menampilkan lini masa lama"
 clear: "Bersihkan"
 markAllAsRead: "Tandai semua telah dibaca"
 goBack: "Kembali"
@@ -755,7 +773,7 @@ userInfo: "Informasi pengguna"
 unknown: "Tidak diketahui"
 onlineStatus: "Status daring"
 hideOnlineStatus: "Sembunyikan status daring"
-hideOnlineStatusDescription: "Menyembunyikan status daring kamu umengurangi kenyamanan untuk beberapa fungsi seperti contohnya pencarian."
+hideOnlineStatusDescription: "Menyembunyikan status daring kamu akan mengurangi kenyamanan untuk beberapa fungsi, seperti contohnya pencarian."
 online: "Daring"
 active: "Aktif"
 offline: "Luring"
@@ -775,12 +793,14 @@ noMaintainerInformationWarning: "Informasi pengelola belum disetel."
 noBotProtectionWarning: "Proteksi bot belum disetel."
 configure: "Setel"
 postToGallery: "Posting ke galeri"
+postToHashtag: "Catat ke tagar ini"
 gallery: "Galeri"
 recentPosts: "Postingan terbaru"
 popularPosts: "Postingan populer"
 shareWithNote: "Bagikan dengan catatan"
 ads: "Iklan"
 expiration: "Batas akhir"
+startingperiod: "Mulai"
 memo: "Memo"
 priority: "Prioritas"
 high: "Tinggi"
@@ -807,14 +827,18 @@ translatedFrom: "Terjemahkan dari {x}"
 accountDeletionInProgress: "Penghapusan akun sedang dalam proses"
 usernameInfo: "Nama yang mengidentifikasikan akun kamu dari yang lain pada peladen ini. Kamu dapat menggunakan alfabet (a~z, A~Z), digit (0~9) atau garis bawah (_). Username tidak dapat diubah setelahnya."
 aiChanMode: "Mode Ai"
-keepCw: "Biarkan Peringatan Konten"
+devMode: "Mode pengembang"
+keepCw: "Biarkan peringatan konten"
 pubSub: "Akun Pub/Sub"
 lastCommunication: "Komunikasi terakhir"
 resolved: "Selesai"
 unresolved: "Belum selesai"
-breakFollow: "Batalkan mengikuti"
+breakFollow: "Hapus pengikut"
+breakFollowConfirm: "Yakin untuk menghapus pengikut ini?"
 itsOn: "Aktif"
 itsOff: "Nonaktif"
+on: "Nyala"
+off: "Mati"
 emailRequiredForSignup: "Membutuhkan alamat surel untuk mendaftar"
 unread: "Belum dibaca"
 filter: "Saring"
@@ -891,25 +915,26 @@ slow: "Lambat"
 fast: "Cepat"
 sensitiveMediaDetection: "Deteksi media NSFW"
 localOnly: "Hanya lokal"
-remoteOnly: "Hanya remot"
+remoteOnly: "Hanya luar instansi"
 failedToUpload: "Gagal mengunggah"
 cannotUploadBecauseInappropriate: "Berkas ini tidak dapat diunggah karena sebagian dari berkas terdeteksi berpotensi NSFW."
 cannotUploadBecauseNoFreeSpace: "Gagal mengunggah karena kekurangan kapasitas Drive."
+cannotUploadBecauseExceedsFileSizeLimit: "Berkas ini tidak dapat diunggah karena melebihi batas ukuran berkas."
 beta: "Beta"
 enableAutoSensitive: "Penandaan NSFW otomatis"
-enableAutoSensitiveDescription: "Mendeteksi otomatis dan menandai media NSFW menggunakan Machine Learning jika memungkinkan. Meskipun opsi ini dimatikan, ada kemungkinan dinyalakan secara menyeluruh pada instansi peladen."
+enableAutoSensitiveDescription: "Mendeteksi otomatis dan menandai media NSFW menggunakan Pembelajaran Mesin jika memungkinkan. Meskipun opsi ini dimatikan, ada kemungkinan dinyalakan secara menyeluruh pada instansi peladen."
 activeEmailValidationDescription: "Membolehkan validasi alamat surel ketat dengan mengecek apakah alamat surel tersebut temporer dan bisa berkomunikasi dengan surel tersebut. Ketidak tidak dicentang, hanya format surel yang divalidasi."
 navbar: "Bilah navigasi"
 shuffle: "Acak"
 account: "Akun"
 move: "Pindah"
-pushNotification: "Pemberitahuan push"
-subscribePushNotification: "Nyalakan pemberitahuan push"
-unsubscribePushNotification: "Matikan pemberitahuan push"
-pushNotificationAlreadySubscribed: "Pemberitahuan push telah dinyalakan"
-pushNotificationNotSupported: "Browser atau instansi kamu tidak mendukung pemberitahuan push"
-sendPushNotificationReadMessage: "Hapus pemberitahuan push ketika pemberitahuan relevan atau pesan telah dibaca"
-sendPushNotificationReadMessageCaption: "Pemberitahuan berisi teks「{emptyPushNotificationMessage}」akan ditampilkan dalam waktu pendek. Ini mungkin dapat menambah pemakaian baterai pada perangkat kamu."
+pushNotification: "Notifikasi dorong"
+subscribePushNotification: "Nyalakan notifikasi dorong"
+unsubscribePushNotification: "Matikan notifikasi dorong"
+pushNotificationAlreadySubscribed: "Notifikasi dorong telah dinyalakan"
+pushNotificationNotSupported: "Browser atau instansi kamu tidak mendukung notifikasi dorong"
+sendPushNotificationReadMessage: "Hapus notifikasi dorong ketika notifikasi relevan atau pesan telah dibaca"
+sendPushNotificationReadMessageCaption: "Notifikasi berisi teks「{emptyPushNotificationMessage}」akan ditampilkan dalam waktu pendek. Ini mungkin dapat menambah pemakaian baterai pada perangkat kamu."
 windowMaximize: "Maksimalkan"
 windowMinimize: "Minimalkan"
 windowRestore: "Kembalikan"
@@ -928,6 +953,7 @@ didYouLikeMisskey: "Apakah kamu mulai menyukai Misskey?"
 pleaseDonate: "{host} menggunakan perangkat lunak bebas yaitu Misskey. Kami sangat mengapresiasi sekali donasi dari kamu agar pengembangan Misskey tetap dapat berlanjut!"
 roles: "Peran"
 role: "Peran"
+noRole: "Peran tidak temukan"
 normalUser: "Pengguna umum"
 undefined: "Tak terdefinisi"
 assign: "Tetapkan\n"
@@ -937,28 +963,141 @@ manageCustomEmojis: "Kelola Emoji Kustom"
 youCannotCreateAnymore: "Kamu melewati batas pembuatan."
 cannotPerformTemporary: "Sementara Tidak Tersedia"
 cannotPerformTemporaryDescription: "Aksi ini tidak dapat dilakukan sementara karena melewati batas eksekusi. Mohon tunggu sejenak dan coba lagi."
+invalidParamError: "Parameter tidak valid"
+invalidParamErrorDescription: "Parameter permintaan tidak valid. Hal ini biasanya disebabkan oleh bug, namun juga dapat terjadi karena input melebihi batas ukuran atau semacamnya."
+permissionDeniedError: "Operasi ditolak"
+permissionDeniedErrorDescription: "Akun ini tidak memiliki izin untuk melakukan aksi ini."
 preset: "Prasetel"
 selectFromPresets: "Pilih dari prasetel"
 achievements: "Pencapaian"
 gotInvalidResponseError: "Respon peladen tidak valid"
 gotInvalidResponseErrorDescription: "Peladen tidak dapat dijangkau atau sedang dalam perawatan. Mohon coba lagi nanti."
 thisPostMayBeAnnoying: "Catatan ini mungkin dapat mengganggu orang lain."
-thisPostMayBeAnnoyingHome: "Catat ke linimasa beranda"
+thisPostMayBeAnnoyingHome: "Catat ke lini masa beranda"
 thisPostMayBeAnnoyingCancel: "Batalkan"
 thisPostMayBeAnnoyingIgnore: "Tetap catat"
 collapseRenotes: "Tutup renote yang sudah kamu lihat"
 internalServerError: "Kesalahan internal peladen"
 internalServerErrorDescription: "Peladen sedang mengalami galat tak terduga"
 copyErrorInfo: "Salin detil galat"
-joinThisServer: "Gabung server ini"
-exploreOtherServers: "Cari server lain"
+joinThisServer: "Gabung peladen ini"
+exploreOtherServers: "Cari peladen lain"
 letsLookAtTimeline: "LIhat timeline"
 disableFederationConfirm: "Matikan federasi?"
 disableFederationConfirmWarn: "Mematikan federasi tidak membuat kiriman menjadi privat. Umumnya, mematikan federasi tidak diperlukan."
 disableFederationOk: "Matikan federasi"
+invitationRequiredToRegister: "Instansi ini dalam mode undangan-saja. Kamu harus memasukkan kode undangan yang valid untuk mendaftar."
+emailNotSupported: "Instansi ini tidak mendukung mengirim surel"
+postToTheChannel: "Catat ke kanal"
+cannotBeChangedLater: "Hal ini nantinya tidak dapat diubah lagi."
+reactionAcceptance: "Penerimaan reaksi"
+likeOnly: "Hanya suka"
+likeOnlyForRemote: "Semua (Hanya suka dari instansi luar)"
+nonSensitiveOnly: "Hanya non-sensitif"
+nonSensitiveOnlyForLocalLikeOnlyForRemote: "Hanya non-sensitif (Hanya suka dari instansi luar)"
+rolesAssignedToMe: "Peran yang ditugaskan ke saya"
+resetPasswordConfirm: "Yakin untuk mereset kata sandimu?"
+sensitiveWords: "Kata sensitif"
+sensitiveWordsDescription: "Visibilitas dari semua catatan mengandung kata yang telah diatur akan dijadikan \"Beranda\" secara otomatis. Kamu dapat mendaftarkan kata tersebut lebih dari satu dengan menuliskannya di baris baru."
+sensitiveWordsDescription2: "Menggunakan spasi akan membuat ekspresi AND dan kata kunci disekitarnya dengan garis miring akan mengubahnya menjadi ekspresi reguler."
+notesSearchNotAvailable: "Pencarian catatan tidak tersedia."
+license: "Lisensi"
+unfavoriteConfirm: "Yakin ingin menghapusnya dari favorit?"
+myClips: "Klip saya"
+drivecleaner: "Pembersih Drive"
+retryAllQueuesNow: "Coba jalankan lagi semua antrian"
+retryAllQueuesConfirmTitle: "Yakin ingin mencoba lagi semuanya?"
+retryAllQueuesConfirmText: "Hal ini akan meningkatkan beban sementara ke peladen."
+enableChartsForRemoteUser: "Buat bagan data pengguna instansi luar"
+enableChartsForFederatedInstances: "Buat bagan data peladen instansi luar"
+showClipButtonInNoteFooter: "Tambahkan \"Klip\" ke menu aksi catatan"
+largeNoteReactions: "Besarkan reaksi yang ditampilkan"
+noteIdOrUrl: "ID catatan atau URL"
+video: "Video"
+videos: "Video"
+dataSaver: "Penghemat data"
+accountMigration: "Pemindahan akun"
+accountMoved: "Pengguna ini telah berpindah ke akun baru:"
+accountMovedShort: "Akun ini telah dipindahkan."
+operationForbidden: "Operasi dilarang"
+forceShowAds: "Selalu tampilkan iklan"
+addMemo: "Tambahkan memo"
+editMemo: "Sunting memo"
+reactionsList: "Reaksi"
+renotesList: "Renote"
+notificationDisplay: "Notifikasi"
+leftTop: "Kiri atas"
+rightTop: "Kanan atas"
+leftBottom: "Kiri bawah"
+rightBottom: "Kanan bawah"
+stackAxis: "Arah tumpukan"
+vertical: "Vertikal"
 horizontal: "Horisontal"
+position: "Posisi"
+serverRules: "Aturan peladen"
+pleaseConfirmBelowBeforeSignup: "Mohon konfirmasi di bawah ini sebelum mendaftar."
+pleaseAgreeAllToContinue: "Kamu harus menyetujui semua kolom di atas untuk melanjutkan."
+continue: "Lanjutkan"
+preservedUsernames: "Nama pengguna tercadangkan"
+preservedUsernamesDescription: "Daftar nama pengguna yang dicadangkan dipisah dengan baris baru. Nama pengguna berikut akan tidak dapat dipakai pada pembuatan akun normal, namun dapat digunakan oleh admin untuk membuat akun baru. Akun yang sudah ada dengan menggunakan nama pengguna ini tidak akan terpengaruh."
+createNoteFromTheFile: "Buat catatan dari berkas ini"
+archive: "Arsipkan"
+channelArchiveConfirmTitle: "Yakin untuk mengarsipkan {name}?"
+channelArchiveConfirmDescription: "Kanal yang diarsipkan tidak akan muncul pada daftar kanal atau hasil pencarian. Postingan baru juga tidak dapat ditambahkan lagi."
+thisChannelArchived: "Kanal ini telah diarsipkan."
+displayOfNote: "Tampilan catatan"
+initialAccountSetting: "Atur profil"
 youFollowing: "Mengikuti"
+preventAiLearning: "Tolak penggunaan Pembelajaran Mesin (AI Generatif)"
+preventAiLearningDescription: "Minta perayap web untuk tidak menggunakan materi teks atau gambar yang telah diposting ke dalam set data Pembelajaran Mesin (Prediktif / Generatif). Hal ini dicapai dengan menambahkan flag HTML-Response \"noai\" ke masing-masing konten. Pencegahan penuh mungkin tidak dapat dicapai dengan flag ini, karena juga dapat diabaikan begitu saja."
 options: "Opsi peran"
+specifyUser: "Pengguna spesifik"
+failedToPreviewUrl: "Tidak dapat dipratinjau"
+update: "Perbarui"
+rolesThatCanBeUsedThisEmojiAsReaction: "Peran yang dapat menggunakan emoji ini sebagai reaksi"
+rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription: "Jika peran tidak ditentukan, semua pengguna dapat menggunakan emoji ini sebagai reaksi."
+rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn: "Peran ini harus publik."
+cancelReactionConfirm: "Yakin untuk menghapus reaksimu?"
+changeReactionConfirm: "Yakin untuk mengganti reaksimu?"
+later: "Nanti saja"
+goToMisskey: "Ke Misskey"
+additionalEmojiDictionary: "Kamus emoji tambahan"
+installed: "Terpasang"
+branding: "Merek"
+enableServerMachineStats: "Tampilkan informasi mesin peladen menjadi publik"
+enableIdenticonGeneration: "Nyalakan pembuatan Identicon per pengguna"
+_initialAccountSetting:
+  accountCreated: "Akun kamu telah sukses dibuat!"
+  letsStartAccountSetup: "Untuk pemula, ayo atur profilmu dulu."
+  letsFillYourProfile: "Pertama, ayo atur profilmu dulu."
+  profileSetting: "Pengaturan profil"
+  privacySetting: "Pengaturan privasi"
+  theseSettingsCanEditLater: "Kamu selalu bisa mengganti pengaturan ini lain kali."
+  youCanEditMoreSettingsInSettingsPageLater: "Ada banyak pengaturan yang dapat kamu atur dari halaman \"Pengaturan\". Pastikan untuk mengunjungi halaman tersebut nanti."
+  followUsers: "Coba ikuti beberapa pengguna yang menarik bagimu untuk membangun lini masa akunmu."
+  pushNotificationDescription: "Menyalakan notifikasi dorong akan membuatmu menerima notifikasi dari {name} secara langsung ke perangkatmu."
+  initialAccountSettingCompleted: "Pengaturan profil selesai!"
+  haveFun: "Selamat menikmati, {name}!"
+  ifYouNeedLearnMore: "Kalau kamu ingin mempelajari lebih lanjut bagaimana cara menggunakan {name} (Misskey), silahkan kunjungi {link}."
+  skipAreYouSure: "Yakin melewati atur profil?"
+  laterAreYouSure: "Yakin banget untuk atur profil nanti?"
+_serverRules:
+  description: "Daftar peraturan akan ditampilkan sebelum pendaftaran. Mengatur ringkasan dari Syarat dan Ketentuan sangat direkomendasikan."
+_accountMigration:
+  moveFrom: "Pindahkan akun lain ke akun ini"
+  moveFromSub: "Buat alias ke akun lain"
+  moveFromLabel: "Akun asli #{n}"
+  moveFromDescription: "Kamu harus membuat alias untuk akun asal kamu berpindah ke akun ini\nMasukkan alias akun asal kamu berpindah ke dalam format berikut: @namapengguna@nama.server.com\nUntuk menghapus alias, kosongkan kolom ini (tidak direkomendasikan)."
+  moveTo: "Pindahkan akun ini ke akun lain"
+  moveToLabel: "Akun tujuan pindah:"
+  moveCannotBeUndone: "Pemindahan akun tidak dapat diurungkan."
+  moveAccountDescription: "Hal ini akan memindahkan akun kamu ke akun lain.\n　・Pengikut dari akun ini akan secara otomatis dipindahkan ke akun baru\n　・Akun ini akan berhenti mengikuti dari semua pengguna yang sedang kamu ikuti\n　・Kamu akan tidak dapat membuat catatan baru dan lain-lain pada akun ini\n\nMeskipun pemindahan pengikut dilakukan secara otomatis, kamu harus mempersiapkan beberapa langkah secara manual untuk memindahkan daftar pengguna yang sedang kamu ikuti. Untuk melakukan tersebut, lakukan ekspor daftar ikuti yang nantinya dapat kamu impor pada menu pengaturan di akun baru kamu. Prosedur yang sama juga dapat diterapkan pada daftar seperti pengguna yang kamu bisukan atau blokir.\n\n(Penjelasan ini hanya berlaku pada Misskey versi 13.12.0 dan setelahnya. Perangkat lunak ActivityPub lainnya seperti Mastodon berkemungkinan befungsi berbeda.)"
+  moveAccountHowTo: "Untuk pindah, pertama buat alias untuk akun ini pada akun tujuan kamu berpindah.\nSetelah kamu membuat alias, masukkan akun tujuan kamu berpindah ke dalam format berikut:\n@namapengguna@nama.server.com"
+  startMigration: "Pindahkan"
+  migrationConfirm: "Yakin untuk memindahkan akun ini ke {account}? Sekali dimulai, proses ini tidak dapat dihentikan atau ditarik kembali, dan kamu tidak dapat menggunakan akun ini lagi dalam keadaan asli semula."
+  movedAndCannotBeUndone: "\nAkun ini telah dipindahkan.\nPemindahan tidak dapat diurungkan."
+  postMigrationNote: "24 jam setelah pemindahan akun selesai, akun ini akan berhenti mengikuti semua akun yang sedang diikuti. Angka mengikut dan pengikut akan menjadi nol. Untuk menghindari pengikut kamu tidak dapat melihat postingan hanya pengikut saja dalam postingan ini, mereka akan tetap mengikuti akun ini."
+  movedTo: "Akun baru tujuan pindah:"
 _achievements:
   earnedAt: "Terbuka pada"
   _types:
@@ -1130,6 +1269,9 @@ _achievements:
     _client30min:
       title: "Istirahat pendek"
       description: "Habiskan waktu 30 menit di Misskey"
+    _client60min:
+      title: "Tidak ada \"Miss\" dalam Misskey"
+      description: "Biarkan Misskey tetap terbuka setidaknya selama 60 menit"
     _noteDeletedWithin1min:
       title: "Eh, salah coy!"
       description: "Hapus catatan kurang dari semenit kamu catat"
@@ -1145,8 +1287,8 @@ _achievements:
       title: "Rujukan mandiri"
       description: "Kutip catatanmu sendiri"
     _htl20npm:
-      title: "Linimasa mengalir"
-      description: "Memiliki linimasa beranda dengan kecepatan melebihi 20 cpm (catatan per menit)"
+      title: "Lini masa mengalir"
+      description: "Memiliki lini masa beranda dengan kecepatan melebihi 20 cpm (catatan per menit)"
     _viewInstanceChart:
       title: "Analis"
       description: "Lihat bagan instansimu"
@@ -1218,6 +1360,10 @@ _role:
   iconUrl: "URL ikon"
   asBadge: "Tampilkan sebagai lencana"
   descriptionOfAsBadge: "Ikon peran ini akan ditampilkan bersebelahan dengan username pengguna yang memiliki peran ini jika dinyalakan."
+  isExplorable: "Buat peran dapat terjelajahi"
+  descriptionOfIsExplorable: "Lini masa peran ini dan daftar pengguna dengan peran ini akan dibuat publik apabila dinyalakan."
+  displayOrder: "Urutan"
+  descriptionOfDisplayOrder: "Semakin tinggi angka, semakin tinggi posisi antarmukanya."
   canEditMembersByModerator: "Perbolehkan moderator untuk menyunting daftar anggota untuk peran ini"
   descriptionOfCanEditMembersByModerator: "Ketika dinyalakan, moderator beserta administrator dapat menugaskan ataupun mencabut pengguna ke peran ini. Ketika dimatikan, hanya administrator saja yang dapat menugaskan pengguna ke peran ini."
   priority: "Prioritas"
@@ -1226,12 +1372,13 @@ _role:
     middle: "Sedang"
     high: "Tinggi"
   _options:
-    gtlAvailable: "Dapat melihat linimasa global"
-    ltlAvailable: "Dapat melihat linimasa lokal"
+    gtlAvailable: "Dapat melihat lini masa global"
+    ltlAvailable: "Dapat melihat lini masa lokal"
     canPublicNote: "Dapat mengirim catatan publik"
     canInvite: "Dapat membuat kode undangan instansi"
     canManageCustomEmojis: "Dapat mengelola Emoji kustom"
     driveCapacity: "Kapasitas Drive"
+    alwaysMarkNsfw: "Selalu tandai berkas sebagai NSFW"
     pinMax: "Jumlah maksimal catatan yang disematkan"
     antennaMax: "Jumlah maksimum antena"
     wordMuteMax: "Jumlah maksimum karakter yang diperbolehkan dalam membisukan kata"
@@ -1243,6 +1390,7 @@ _role:
     rateLimitFactor: "Batas kecepatan"
     descriptionOfRateLimitFactor: "Batas kecepatan yang rendah tidak begitu membatasi, batas kecepatan tinggi lebih membatasi. "
     canHideAds: "Dapat menyembunyikan iklan"
+    canSearchNotes: "Penggunaan pencarian catatan"
   _condition:
     isLocal: "Pengguna lokal"
     isRemote: "Pengguna remote"
@@ -1252,11 +1400,13 @@ _role:
     followersMoreThanOrEq: "Memiliki pengikut X atau lebih dari tersebut"
     followingLessThanOrEq: "Mengikuti X pengguna atau kurang dari itu"
     followingMoreThanOrEq: "Mengikuti X pengguna atau lebih dari itu"
+    notesLessThanOrEq: "Jumlah postingan kurang dari sama dengan"
+    notesMoreThanOrEq: "Jumlah postingan lebih dari sama dengan"
     and: "Kondisi-AND"
     or: "Kondisi-OR"
     not: "Kondisi-NOT"
 _sensitiveMediaDetection:
-  description: "Mengurangi usaha moderasi server dengan mengenali media NSFW srcara otomatis menggunakan Machine Learning. Fungsi ini akan sedikit menaikkan beban peladen."
+  description: "Mengurangi usaha moderasi peladen dengan mengenali media NSFW secara otomatis menggunakan Pembelajaran Mesin. Fungsi ini akan sedikit menaikkan beban peladen."
   sensitivity: "Sensitivitas deteksi"
   sensitivityDescription: "Mengurangi sensitivitas akan mengurangi misdeteksi (false positive) sedangkan meningkatkannya akan menambah misdeteksi (false positive)."
   setSensitiveFlagAutomatically: "Tandai sebagai NSFW"
@@ -1339,21 +1489,17 @@ _aboutMisskey:
   donate: "Donasi ke Misskey"
   morePatrons: "Kami sangat mengapresiasi dukungan dari banyak penolong lain yang tidak tercantum disini. Terima kasih! 🥰"
   patrons: "Pendukung"
-_nsfw:
-  respect: "Sembunyikan media NSFW"
-  ignore: "Jangan sembunyikan media NSFW"
-  force: "Sembunyikan semua media"
 _instanceTicker:
   none: "Jangan tampilkan"
-  remote: "Tampilkan untuk pengguna luar"
+  remote: "Tampilkan untuk pengguna instansi luar"
   always: "Selalu tampilkan"
 _serverDisconnectedBehavior:
   reload: "Muat ulang otomatis"
   dialog: "Tampilkan dialog peringatan"
   quiet: "Tampilkan peringatan tidak mengganggu"
 _channel:
-  create: "Buat saluran"
-  edit: "Sunting saluran"
+  create: "Buat Kanal"
+  edit: "Sunting Kanal"
   setBanner: "Setel banner"
   removeBanner: "Hapus banner"
   featured: "Tren"
@@ -1361,6 +1507,8 @@ _channel:
   following: "Mengikuti"
   usersCount: "{n} Partisipan"
   notesCount: "terdapat {n} catatan"
+  nameAndDescription: "Nama dan deskripsi"
+  nameOnly: "Hanya nama"
 _menuDisplay:
   sideFull: "Horisontal"
   sideIcon: "Horisontal (Ikon)"
@@ -1369,9 +1517,9 @@ _menuDisplay:
 _wordMute:
   muteWords: "Kata yang dibisukan"
   muteWordsDescription: "Pisahkan dengan spasi untuk kondisi AND. Pisahkan dengan baris baru untuk kondisi OR."
-  muteWordsDescription2: "Kurung kata kunci dengan garis miring untuk menggunakan regular expressions."
-  softDescription: "Sembunyikan catatan yang memenuhi aturan kondisi dari linimasa."
-  hardDescription: "Cegah catatan memenuhi aturan kondisi dari ditambahkan ke linimasa. Dengan tambahan, catatan berikut tidak akan ditambahkan ke linimasa meskipun jika kondisi tersebut diubah."
+  muteWordsDescription2: "Kurung kata kunci dengan garis miring untuk menggunakan ekspresi reguler."
+  softDescription: "Sembunyikan catatan yang memenuhi aturan kondisi dari lini masa."
+  hardDescription: "Cegah catatan memenuhi aturan kondisi dari ditambahkan ke lini masa. Dengan tambahan, catatan berikut tidak akan ditambahkan ke lini masa meskipun jika kondisi tersebut diubah."
   soft: "Lembut"
   hard: "Keras"
   mutedNotes: "Catatan yang dibisukan"
@@ -1441,8 +1589,8 @@ _theme:
     cwBg: "Latar belakang tombol Sembunyikan Konten"
     cwFg: "Teks tombol Sembunyikan Konten"
     cwHoverBg: "Latar belakang tombol Sembunyikan Konten (Mengambang)"
-    toastBg: "Latar belakang pemberitahuan"
-    toastFg: "Teks pemberitahuan"
+    toastBg: "Latar belakang notifikasi"
+    toastFg: "Teks notifikasi"
     buttonBg: "Latar belakang tombol"
     buttonHoverBg: "Latar belakang tombol (Mengambang)"
     inputBorder: "Batas bidang masukan"
@@ -1457,11 +1605,11 @@ _theme:
 _sfx:
   note: "Catatan"
   noteMy: "Catatan (Saya)"
-  notification: "Pemberitahuan"
+  notification: "Notifikasi"
   chat: "Pesan"
   chatBg: "Obrolan (Latar Belakang)"
   antenna: "Penerimaan Antenna"
-  channel: "Pemberitahuan saluran"
+  channel: "Notifikasi Kanal"
 _ago:
   future: "Masa depan"
   justNow: "Baru saja"
@@ -1478,15 +1626,40 @@ _time:
   minute: "menit"
   hour: "jam"
   day: "hari"
+_timelineTutorial:
+  title: "Bagaimana cara menggunakan Misskey"
+  step1_1: "Ini adalah \"lini masa\". Semua \"catatan\" yang dikirimkan oleh {name} akan dimunculkan secara kronologis di sini."
+  step1_2: "Ada beberapa lini masa yang berbeda. Seperti contoh, \"Lini masa Beranda\" berisi catatan dari pengguna yang kamu ikuti, dan \"Lini masa lokal\" berisi catatan dari semua pengguna dari {name}."
+  step2_1: "Selanjutnya, mari kita coba memposting sebuah catatan. Kamu dapat melakukanya dengan menekan tombol dengan ikon pensil."
+  step2_2: "Bagaimana dengan menuliskan sedikit perkenalan diri, atau hanya \"Hello {name}\" kalau kamu lagi ngga feeling?"
+  step3_1: "Udah selesai memposting catatan pertamamu?"
+  step3_2: "Catatan pertamamu seharusnya sekarang sudah tampil di lini masa kamu."
+  step4_1: "Kamu dapat menyisipkan \"Reaksi\" ke dalam catatan."
+  step4_2: "Untuk menyisipkan reaksi, tekan tanda \"+\" dalam catatan dan pilih emoji yang kamu suka untuk mereaksi catatan tersebut."
 _2fa:
   alreadyRegistered: "Kamu telah mendaftarkan perangkat otentikasi dua faktor."
+  registerTOTP: "Daftarkan aplikasi autentikator"
+  passwordToTOTP: "Masukkan kata sandimu"
   step1: "Pertama, pasang aplikasi otentikasi (seperti {a} atau {b}) di perangkat kamu."
   step2: "Lalu, pindai kode QR yang ada di layar."
+  step2Click: "Mengeklik kode QR ini akan membolehkanmu untuk mendaftarkan 2FA ke security-key atau aplikasi autentikator ponsel."
   step2Url: "Di aplikasi desktop, masukkan URL berikut:"
+  step3Title: "Masukkan kode autentikasi"
   step3: "Masukkan token yang telah disediakan oleh aplikasimu untuk menyelesaikan pemasangan."
   step4: "Mulai sekarang, upaya login apapun akan meminta token login dari aplikasi otentikasi kamu."
+  securityKeyNotSupported: "Peramban kamu tidak mendukung security key."
+  registerTOTPBeforeKey: "Mohon atur aplikasi autentikator untuk mendaftarkan security key atau passkey."
   securityKeyInfo: "Kamu dapat memasang otentikasi WebAuthN untuk mengamankan proses login lebih lanjut dengan tidak hanya perangkat keras kunci keamanan yang mendukung FIDO2, namun juga sidik jari atau otentikasi PIN pada perangkatmu."
+  chromePasskeyNotSupported: "Passkey Chrome saat ini tidak didukung."
+  registerSecurityKey: "Daftarkan security key atau passkey."
+  securityKeyName: "Masukkan nama key."
+  tapSecurityKey: "Mohon ikuti peramban kamu untuk mendaftarkan security key atau passkey"
+  removeKey: "Hapus security key"
   removeKeyConfirm: "Hapus cadangan {name}?"
+  whyTOTPOnlyRenew: "Aplikasi autentikator tidak dapat dihapus selama security key masih terdaftar."
+  renewTOTP: "Atur ulang aplikasi autentikator"
+  renewTOTPConfirm: "Hal ini akan menyebabkan kode verifikasi dari aplikasi autentikator sebelumnya berhenti bekerja"
+  renewTOTPOk: "Atur ulang"
   renewTOTPCancel: "Tidak sekarang."
 _permissions:
   "read:account": "Lihat informasi akun"
@@ -1504,8 +1677,8 @@ _permissions:
   "read:mutes": "Lihat daftar orang yang dibisukan"
   "write:mutes": "Sunting daftar orang yang dibisukan"
   "write:notes": "Buat atau hapus catatan"
-  "read:notifications": "Lihat pemberitahuan"
-  "write:notifications": "Sunting pemberitahuan"
+  "read:notifications": "Lihat notifikasi"
+  "write:notifications": "Sunting notifikasi"
   "read:reactions": "Lihat reaksi"
   "write:reactions": "Sunting reaksi"
   "write:votes": "Beri suara"
@@ -1515,8 +1688,8 @@ _permissions:
   "write:page-likes": "Sunting suka pada Halaman"
   "read:user-groups": "Lihat grup pengguna"
   "write:user-groups": "Sunting atau hapus grup pengguna"
-  "read:channels": "Lihat saluran"
-  "write:channels": "Sunting saluran"
+  "read:channels": "Lihat Kanal"
+  "write:channels": "Sunting Kanal"
   "read:gallery": "Lihat galeri"
   "write:gallery": "Sunting galeri"
   "read:gallery-likes": "Lihat daftar postingan galeri yang disukai"
@@ -1548,8 +1721,8 @@ _widgets:
   profile: "Profil"
   instanceInfo: "Informasi Instansi"
   memo: "Catatan memo"
-  notifications: "Pemberitahuan"
-  timeline: "Linimasa"
+  notifications: "Notifikasi"
+  timeline: "Lini masa"
   calendar: "Kalender"
   trends: "Tren"
   clock: "Jam"
@@ -1603,13 +1776,15 @@ _poll:
   remainingSeconds: "Berakhir dalam {s} detik"
 _visibility:
   public: "Publik"
-  publicDescription: "Catat ke linimasa global"
+  publicDescription: "Catat ke lini masa global"
   home: "Beranda"
-  homeDescription: "Catat ke linimasa beranda saja"
+  homeDescription: "Catat ke lini masa beranda saja"
   followers: "Pengikut"
   followersDescription: "Catat ke pengikut saja"
   specified: "Langsung"
   specifiedDescription: "Catat ke pengguna yang ditentukan saja"
+  disableFederation: "Matikan federasi"
+  disableFederationDescription: "Jangan kirimkan ke instansi lain"
 _postForm:
   replyPlaceholder: "Balas ke catatan ini..."
   quotePlaceholder: "Kutip catatan ini..."
@@ -1650,7 +1825,7 @@ _charts:
   activeUsers: "Pengguna aktif"
   notesIncDec: "Perbedaan # dalam catatan"
   localNotesIncDec: "Perbedaan # dalam catatan lokal"
-  remoteNotesIncDec: "Perbedaan # dalam catatan luar"
+  remoteNotesIncDec: "Perbedaan # dalam catatan instansi luar"
   notesTotal: "Total # catatan"
   filesIncDec: "Perbedaan # dalam berkas"
   filesTotal: "Jumlah # berkas"
@@ -1765,7 +1940,8 @@ _notification:
     pollEnded: "Jajak pendapat berakhir"
     receiveFollowRequest: "Permintaan mengikuti diterima"
     followRequestAccepted: "Permintaan mengikuti disetujui"
-    app: "Pemberitahuan dari aplikasi"
+    achievementEarned: "Pencapaian didapatkan"
+    app: "Notifikasi dari aplikasi tertaut"
   _actions:
     followBack: "Ikuti Kembali"
     reply: "Balas"
@@ -1790,13 +1966,34 @@ _deck:
   _columns:
     main: "Utama"
     widgets: "Widget"
-    notifications: "Pemberitahuan"
-    tl: "Linimasa"
+    notifications: "Notifikasi"
+    tl: "Lini masa"
     antenna: "Antena"
     list: "Daftar"
     channel: "Kanal"
     mentions: "Sebutan"
     direct: "Langsung"
+    roleTimeline: "Lini masa peran"
+_dialog:
+  charactersExceeded: "Kamu telah melebihi batas karakter maksimum! Saat ini pada {current} dari {max}."
+  charactersBelow: "Kamu berada di bawah batas minimum karakter! Saat ini pada {current} dari {min}."
+_disabledTimeline:
+  title: "Lini masa dinonaktifkan"
+  description: "Saat ini kamu tidak dapat menggunakan lini masa ini karena peran kamu saat ini."
+_drivecleaner:
+  orderBySizeDesc: "Ukuran berkas (Turun)"
+  orderByCreatedAtAsc: "Tanggal (Naik)"
 _webhookSettings:
+  createWebhook: "Buat Webhook"
   name: "Nama"
+  secret: "Secret"
+  events: "Webhook Events"
   active: "Aktif"
+  _events:
+    follow: "Ketika mengikuti pengguna"
+    followed: "Ketika diikuti pengguna"
+    note: "Ketika memposting catatan"
+    reply: "Ketika menerima balasan"
+    renote: "Ketika direnote"
+    reaction: "Ketika menerima reaksi"
+    mention: "Ketika sedang disebut"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 3c1a26e85..51c8e28d6 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -26,15 +26,15 @@ otherSettings: "Altre impostazioni"
 openInWindow: "Apri in una finestra"
 profile: "Profilo"
 timeline: "Timeline"
-noAccountDescription: "L'utente non ha ancora scritto niente nella biografia di profilo."
+noAccountDescription: "La persona non ha ancora scritto alcuna autobiografia."
 login: "Accedi"
 loggingIn: "Accesso in corso..."
 logout: "Uscita"
 signup: "Iscriviti"
 uploading: "Caricamento..."
 save: "Salva"
-users: "Utente"
-addUser: "Aggiungi utente"
+users: "Profili"
+addUser: "Aggiungi profilo"
 favorite: "Preferiti"
 favorites: "Preferiti"
 unfavorite: "Rimuovi nota dai preferiti"
@@ -52,7 +52,9 @@ addToList: "Aggiungi alla lista"
 sendMessage: "Invia messaggio"
 copyRSS: "Copia RSS"
 copyUsername: "Copia nome utente"
-searchUser: "Cerca utente"
+copyUserId: "Copia ID del profilo"
+copyNoteId: "Copia ID della Nota"
+searchUser: "Cerca profilo"
 reply: "Rispondi"
 loadMore: "Mostra di più"
 showMore: "Espandi"
@@ -153,7 +155,7 @@ flagAsBotDescription: "Attiva questo campo se il profilo esegue principalmente o
 flagAsCat: "Sono un gatto"
 flagAsCatDescription: "La modalità \"sono un gatto\" aggiunge le orecchie al tuo profilo"
 flagShowTimelineReplies: "Mostra le risposte alle note sulla timeline."
-flagShowTimelineRepliesDescription: "Se è attiva, la timeline mostra le risposte alle altre note dell'utente oltre a quelle dell'utente stesso."
+flagShowTimelineRepliesDescription: "Attivando, la timeline mostra le Note del profilo ed anche le risposte ad altre Note"
 autoAcceptFollowed: "Accetta automaticamente le richieste di follow da utenti che già segui"
 addAccount: "Aggiungi profilo"
 reloadAccountsList: "Ricarica l'elenco dei profili"
@@ -205,7 +207,7 @@ blockedInstancesDescription: "Elenca le istanze che vuoi bloccare, una per riga.
 muteAndBlock: "Silenziati / Bloccati"
 mutedUsers: "Profili silenziati"
 blockedUsers: "Profili bloccati"
-noUsers: "Nessun utente trovato"
+noUsers: "Non ci sono profili"
 editProfile: "Modifica profilo"
 noteDeleteConfirm: "Vuoi davvero eliminare questa Nota?"
 pinLimitExceeded: "Non puoi fissare altre note "
@@ -236,8 +238,8 @@ newPasswordRetype: "Conferma password"
 attachFile: "Allega file"
 more: "Di più!"
 featured: "Tendenze"
-usernameOrUserId: "Nome utente o ID utente"
-noSuchUser: "Nessun utente trovato"
+usernameOrUserId: "Nome utente o ID"
+noSuchUser: "Profilo non trovato"
 lookup: "Ricerca remota"
 announcements: "Annunci"
 imageUrl: "URL dell'immagine"
@@ -269,7 +271,7 @@ basicNotesBeforeCreateAccount: "Note importanti"
 termsOfService: "Informativa Privacy"
 start: "Inizia!"
 home: "Home"
-remoteUserCaution: "Può darsi che le informazioni siano incomplete perché questo è un utente remoto."
+remoteUserCaution: "Le informazioni potrebbero essere incomplete poiché questo profilo remoto potrebbe non essere completamente federato."
 activity: "Attività"
 images: "Immagini"
 image: "Immagini"
@@ -309,7 +311,6 @@ copyUrl: "Copia URL"
 rename: "Modifica nome"
 avatar: "Foto del profilo"
 banner: "Intestazione"
-nsfw: "Contenuti sensibili"
 whenServerDisconnected: "Quando la connessione col server è persa"
 disconnectedFromServer: "Il server si è disconnesso"
 reload: "Ricarica"
@@ -444,7 +445,7 @@ signinRequired: "Occorre avere un profilo registrato su questa istanza"
 invitations: "Invita"
 invitationCode: "Codice di invito"
 checking: "Confermando"
-available: "Consigliati"
+available: "Disponibile"
 unavailable: "Il nome utente è già in uso"
 usernameInvalidFormat: "Il nome utente può contenere solo lettere, numeri e '_'"
 tooShort: "Troppo breve"
@@ -560,6 +561,7 @@ accountDeletedDescription: "Questo profilo è stato eliminato."
 menu: "Menù"
 divider: "Linea di separazione"
 addItem: "Aggiungi elemento"
+rearrange: "Riordina"
 relays: "Ripetitori"
 addRelay: "Aggiungi ripetitore"
 inboxUrl: "Inbox URL"
@@ -660,7 +662,7 @@ instanceTicker: "Informazioni sull'istanza da cui vengono le note"
 waitingFor: "Aspettando {x}"
 random: "Casuale"
 system: "Sistema"
-switchUi: "Cambiare interfaccia"
+switchUi: "Cambia interfaccia grafica"
 desktop: "Desktop"
 clip: "Clip"
 createNew: "Crea"
@@ -703,6 +705,8 @@ contact: "Contatti"
 useSystemFont: "Usa il carattere predefinito del sistema"
 clips: "Clip"
 experimentalFeatures: "Funzioni sperimentali"
+experimental: "Sperimentale"
+thisIsExperimentalFeature: "Questa è una funzionalità sperimentale. Potrebbe essere malfunzionante o cambiare in futuro."
 developer: "Sviluppatore"
 makeExplorable: "Profilo visibile pubblicamente nella pagina \"Esplora\""
 makeExplorableDescription: "Disabilitando questa opzione, il tuo profilo non verrà elencato nella pagina \"Esplora\"."
@@ -779,7 +783,7 @@ switchAccount: "Cambia profilo"
 enabled: "Attivo"
 disabled: "Inattivo"
 quickAction: "Azioni rapide"
-user: "Utente"
+user: "Profilo"
 administration: "Gestione"
 accounts: "Profilo"
 switch: "Cambia"
@@ -787,6 +791,7 @@ noMaintainerInformationWarning: "Le informazioni amministratore non sono imposta
 noBotProtectionWarning: "Nessuna protezione impostata contro i bot."
 configure: "Imposta"
 postToGallery: "Pubblicare nella galleria"
+postToHashtag: "Pubblica a questo hashtag"
 gallery: "Galleria"
 recentPosts: "Le più recenti"
 popularPosts: "Le più visualizzate"
@@ -811,7 +816,7 @@ received: "Ricevuto"
 searchResult: "Risultati della Ricerca"
 hashtags: "Hashtag"
 troubleshooting: "Risoluzione problemi"
-useBlurEffect: "Utilizza effetto sfocatura nell'interfaccia"
+useBlurEffect: "Utilizza effetto sfocatura"
 learnMore: "Più dettagli"
 misskeyUpdated: "Misskey è stato aggiornato!"
 whatIsNew: "Visualizza le informazioni sull'aggiornamento"
@@ -820,6 +825,7 @@ translatedFrom: "Tradotto da {x}"
 accountDeletionInProgress: "È in corso l'eliminazione del profilo"
 usernameInfo: "Un nome per identificare univocamente il tuo profilo sull'istanza. Puoi utilizzare caratteri alfanumerici maiuscoli, minuscoli e il trattino basso (_). Non potrai cambiare nome utente in seguito."
 aiChanMode: "Modalità Ai"
+devMode: "Modalità sviluppatori"
 keepCw: "Mantieni il Content Warning"
 pubSub: "Publish/Subscribe del profilo"
 lastCommunication: "La comunicazione più recente"
@@ -829,6 +835,8 @@ breakFollow: "Non seguire"
 breakFollowConfirm: "Vuoi davvero togliere follower?"
 itsOn: "Abilitato"
 itsOff: "Disabilitato"
+on: "Acceso"
+off: "Spento"
 emailRequiredForSignup: "L'ndirizzo e-mail è obbligatorio per registrarsi"
 unread: "Non lette"
 filter: "Filtri"
@@ -848,7 +856,7 @@ voteConfirm: "Votare per「{choice}」?"
 hide: "Nascondere"
 useDrawerReactionPickerForMobile: "Mostra sul drawer da dispositivo mobile"
 welcomeBackWithName: "Ciao, {name}! Eccoti di nuovo!"
-clickToFinishEmailVerification: "Fai click su [{ok}] per completare la verifica dell'indirizzo email."
+clickToFinishEmailVerification: "Premi il bottone \"{ok}\" per completare la verifica dell'indirizzo email."
 overridedDeviceKind: "Tipo di dispositivo"
 smartphone: "Smartphone"
 tablet: "Tablet"
@@ -909,6 +917,7 @@ remoteOnly: "Solo remoto"
 failedToUpload: "errore di caricamento"
 cannotUploadBecauseInappropriate: "Non è possibile caricarlo perché è stato stabilito che potrebbe contenere contenuti inappropriati."
 cannotUploadBecauseNoFreeSpace: "Impossibile caricare a causa della mancanza di spazio libero sul drive."
+cannotUploadBecauseExceedsFileSizeLimit: "Il file non può essere caricato perché eccede le dimensioni consentite."
 beta: "Versione beta"
 enableAutoSensitive: "Determinazione automatica del NSFW"
 enableAutoSensitiveDescription: "Se disponibile, il flag NSFW viene impostato automaticamente sui media utilizzando l'apprendimento automatico. Anche se questa funzione è disattivata, in alcuni casi può essere impostata automaticamente."
@@ -942,6 +951,7 @@ didYouLikeMisskey: "Ti piace Misskey?"
 pleaseDonate: "Misskey è il software libero utilizzato su {host}. Offrendo una donazione è più facile continuare a svilupparlo!"
 roles: "Ruoli"
 role: "Ruolo"
+noRole: "Ruolo non trovato"
 normalUser: "Profilo standard"
 undefined: "Indefinito"
 assign: "Assegna"
@@ -981,10 +991,13 @@ cannotBeChangedLater: "Non sarà più modificabile"
 reactionAcceptance: "Reazioni consentite"
 likeOnly: "Solo i Like"
 likeOnlyForRemote: "Solo Like remoti"
+nonSensitiveOnly: "Solamente non sensibili"
+nonSensitiveOnlyForLocalLikeOnlyForRemote: "Solamente non sensibili (solo Mi piace remoti)"
 rolesAssignedToMe: "I miei ruoli"
 resetPasswordConfirm: "Vuoi davvero ripristinare la password?"
 sensitiveWords: "Parole sensibili"
 sensitiveWordsDescription: "Imposta automaticamente \"Home\" alla visibilità delle Note che contengono una qualsiasi parola tra queste configurate. Puoi separarle per riga."
+sensitiveWordsDescription2: "Gli spazi creano la relazione \"E\" tra parole (questo E quello). Racchiudere una parola nelle slash \"/\" la trasforma in Espressione Regolare."
 notesSearchNotAvailable: "Non è possibile cercare tra le Note."
 license: "Licenza"
 unfavoriteConfirm: "Vuoi davvero rimuovere la preferenza?"
@@ -1003,9 +1016,13 @@ videos: "Video"
 dataSaver: "Risparmia dati"
 accountMigration: "Migrazione del profilo"
 accountMoved: "Questo profilo ha migrato altrove:"
+accountMovedShort: "Questo profilo è stato migrato"
+operationForbidden: "Operazione non consentita"
 forceShowAds: "Mostra sempre i banner"
 addMemo: "Aggiungi Memo"
 editMemo: "Modifica Memo"
+reactionsList: "Elenco delle reazioni"
+renotesList: "Elenco di Rinota"
 notificationDisplay: "Stile delle notifiche"
 leftTop: "In alto a sinistra"
 rightTop: "In alto a destra"
@@ -1019,18 +1036,65 @@ serverRules: "Regolamento"
 pleaseConfirmBelowBeforeSignup: "Ai sensi del regolamento EU 679/2016 GDPR, autorizzo il trattamento dati personali come descritto nella informativa Privacy."
 pleaseAgreeAllToContinue: "Per continuare, occorre selezionare ed essere d'accordo su tutto."
 continue: "Continua"
+preservedUsernames: "Nomi utente riservati"
+preservedUsernamesDescription: "Elenca, uno per linea, i nomi utente che non possono essere registrati durante la creazione del profilo. La restrizione non si applica agli amministratori. Inoltre, i profili già registrati sono esenti."
+createNoteFromTheFile: "Crea Nota da questo file"
+archive: "Archivio"
+channelArchiveConfirmTitle: "Vuoi davvero archiviare {name}?"
+channelArchiveConfirmDescription: "Un canale archiviato non compare nell'elenco canali, nemmeno nei risultati di ricerca. Non può ricevere nemmeno nuove Note."
+thisChannelArchived: "Questo canale è stato archiviato."
+displayOfNote: "Visualizzazione delle Note"
+initialAccountSetting: "Impostazioni iniziali del profilo"
 youFollowing: "Seguiti"
+preventAiLearning: "Impedisci l'apprendimento della IA"
+preventAiLearningDescription: "Aggiungendo il campo \"noai\" alla risposta HTML, si indica ai Robot esterni di non usare testi e allegati per addestrare sistemi di Machine Learning (IA predittiva/generativa). Anche se è impossibile sapere se la richiesta venga onorata o semplicemente ignorata."
 options: "Opzioni del ruolo"
+specifyUser: "Profilo specifico"
+failedToPreviewUrl: "Anteprima non disponibile"
+update: "Aggiorna"
+rolesThatCanBeUsedThisEmojiAsReaction: "Ruoli che possono usare questa emoji come reazione"
+rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription: "Se non viene specificato alcun ruolo, chiunque può reagire con questa emoji."
+rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn: "Questi ruoli devono essere pubblici"
+cancelReactionConfirm: "Vuoi annullare la tua reazione?"
+changeReactionConfirm: "Vuoi cambiare la tua reazione?"
+later: "Non ora"
+goToMisskey: "Vai a Misskey"
+additionalEmojiDictionary: "Dizionario aggiuntivo emoji"
+installed: "Installazione avvenuta"
+branding: "Branding"
+enableServerMachineStats: "Pubblicare le informazioni sul server"
+enableIdenticonGeneration: "Generazione automatica delle Identicon"
+_initialAccountSetting:
+  accountCreated: "Il tuo profilo è stato creato!"
+  letsStartAccountSetup: "Per iniziare, impostiamo il tuo profilo."
+  letsFillYourProfile: "Innanzitutto, compila il tuo profilo."
+  profileSetting: "Impostazioni del profilo"
+  privacySetting: "Impostazioni sulla privacy"
+  theseSettingsCanEditLater: "In seguito, potrai cambiare la tua scelta."
+  youCanEditMoreSettingsInSettingsPageLater: "Nella pagina \"Impostazioni\", è possibile personalizzare di più il tuo profilo. Dacci un'occhiata dopo!"
+  followUsers: "Per comporre la tua Timeline Home (personale) segui i profili delle persone che ti interessano."
+  pushNotificationDescription: "Attivare le notifiche push ti permettera di ricevere informazioni sulla attività di {name} direttamente sul tuo dispositivo."
+  initialAccountSettingCompleted: "Hai completato la configurazione iniziale!"
+  haveFun: "Divertiti con {name}!"
+  ifYouNeedLearnMore: "Per saperne di più su come usare {name} (Misskey), visita la pagina {link}"
+  skipAreYouSure: "Vuoi davvero saltare la configurazione iniziale?"
+  laterAreYouSure: "Vuoi davvero rimandare la configurazione iniziale?"
 _serverRules:
   description: "In Europa è necessario mostrare l'informativa sul trattamento dei dati personali, prima della registrazione al servizio."
 _accountMigration:
   moveFrom: "Migra un altro profilo dentro a questo"
+  moveFromSub: "Crea un alias verso un altro profilo remoto"
   moveFromLabel: "Profilo da cui migrare:"
   moveFromDescription: "Se desideri spostare i profili follower da un altro profilo a questo, devi prima creare un alias qui. Assicurati averlo creato PRIMA di eseguire l'attività! Inserisci l'indirizzo del profilo mittente in questo modo: @persona@istanza.it"
   moveTo: "Migrare questo profilo verso un un altro"
   moveToLabel: "Profilo verso cui migrare"
+  moveCannotBeUndone: "La migrazione è irreversibile, non può essere interrotta o annullata."
   moveAccountDescription: "Questa attività è irreversibile! Innanzitutto, assicurati di aver creato, nella istanza di destinazione, un alias con l'indirizzo di questo profilo. Successivamente, indica qui il profilo di destinazione in questo modo: @persona@istanza.it"
+  moveAccountHowTo: "Per migrare su un profilo remoto, crea prima un alias di questo profilo, sulla istanza di destinazione.\nDopo aver creato l'alias, inserisci l'indirizzo di destinazione, indicando ad esempio: @profilo@altra.istanza"
+  startMigration: "Avvia la migrazione"
   migrationConfirm: "Vuoi davvero migrare questo profilo su {account}? L'azione è irreversibile e non potrai più utilizzare questo profilo nel suo stato originale.\nInoltre, assicurati di aver già creato un alias sull'account a cui ti stai trasferendo."
+  movedAndCannotBeUndone: "Il tuo profilo è stato migrato.\nLa migrazione non può essere annullata."
+  postMigrationNote: "Questo profilo smetterà di seguire gli altri profili remoti a 24 ore dal termine della migrazione.\nSia i Follow che i Follower scenderanno a zero. I tuoi follower saranno comunque in grado di vedere le Note per soli follower, poiché non smetteranno di seguirti."
   movedTo: "Profilo verso cui migrare"
 _achievements:
   earnedAt: "Data di conseguimento"
@@ -1312,6 +1376,7 @@ _role:
     canInvite: "Genera codici di invito all'istanza"
     canManageCustomEmojis: "Gestire le emoji personalizzate"
     driveCapacity: "Capienza del Drive"
+    alwaysMarkNsfw: "Imposta sempre come NSFW"
     pinMax: "Quantità massima di Note in primo piano"
     antennaMax: "Quantità massima di Antenne"
     wordMuteMax: "Lunghezza massima del filtro parole"
@@ -1422,10 +1487,6 @@ _aboutMisskey:
   donate: "Sostieni Misskey"
   morePatrons: "Apprezziamo sinceramente il supporto di tante altre persone. Grazie mille! 🥰"
   patrons: "Sostenitori"
-_nsfw:
-  respect: "Nascondere i media segnati come sensibli"
-  ignore: "Visualizzare i media segnati come sensibili"
-  force: "Nascondere tutti i media"
 _instanceTicker:
   none: "Nascondi"
   remote: "Mostra solo per i profili remoti"
@@ -1563,6 +1624,16 @@ _time:
   minute: "min"
   hour: "ore"
   day: "giorni"
+_timelineTutorial:
+  title: "Come usare Misskey"
+  step1_1: "Questa è la \"Timeline\". tutte le \"Note\" pubblicate su {name} vengono elencate in ordine cronologico."
+  step1_2: "Le Timeline sono diverse, ad esempio, la \"Home\" elenca le Note dei profili che segui. Quella \"Locale\" elenca quelle di tutti i profili attivi su {name}."
+  step2_1: "Prova a pubblicare una Nota. Semplicemente premendo il bottone con l'icona di una matita."
+  step2_2: "Potresti scrivere la tua presentazione, oppure semplicemente \"Ciao da {name}!\""
+  step3_1: "Hai pubblicato qualcosa?"
+  step3_2: "In tal caso, dovrebbe comparire subito nella tua \"Home\""
+  step4_1: "Puoi reagire con un emoji alle Note."
+  step4_2: "To attach a reaction, press the \"+\" mark on a note and choose an emoji you'd like to react with.\nPer reagire con una emoji, premi il bottone \"+\" (più) visibile vicino ad ogni Nota e scegli dall'elenco la emoji che rappresenta la tua reazione."
 _2fa:
   alreadyRegistered: "La configurazione è stata già completata."
   registerTOTP: "Registra un'app di autenticazione"
@@ -1710,7 +1781,7 @@ _visibility:
   followersDescription: "Visibile solo ai tuoi follower"
   specified: "Nota diretta"
   specifiedDescription: "Visibile solo ai profili menzionati"
-  disableFederation: "Federazione disabilitata"
+  disableFederation: "Non federare"
   disableFederationDescription: "Non spedire attività alle altre istanze remote"
 _postForm:
   replyPlaceholder: "Rispondi a questa nota..."
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index aa0f31fcd..ec1aeb31e 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -1,7 +1,7 @@
 ---
 _lang_: "日本語 (関西弁)"
 headlineMisskey: "ノートでつながるネットワーク"
-introMisskey: "ようお越し！Misskeyは、オープンソースの分散型マイクロブログサービスやねん。\n「ノート」を作って、いま起こっとることを共有したり、あんたについて皆に発信しよう📡\n「ツッコミ」機能で、皆のノートに素早く反応を追加したりもできるで✌\nほな新しい世界を探検しよか🚀"
+introMisskey: "ようお越し！Misskeyは、オープンソースの分散型マイクロブログサービスやねん。\n「ノート」を作って、いま起こっとることを共有したり、あんたについて皆に発信しよう📡\n「ツッコミ」機能で、皆のノートに素早く反応を追加したりもできるで✌\nほな、新しい世界を探検しよか🚀"
 poweredByMisskeyDescription: "{name}は、オープンソースのプラットフォーム<b>Misskey</b>のサーバーのひとつなんやで。"
 monthAndDay: "{month}月 {day}日"
 search: "探す"
@@ -136,8 +136,10 @@ unblockConfirm: "ブロックやめたるってほんまか？"
 suspendConfirm: "凍結してしもうてええか？"
 unsuspendConfirm: "解凍するけどええか？"
 selectList: "リストを選ぶ"
+editList: "リスト直すで"
 selectChannel: "チャンネルを選ぶ"
 selectAntenna: "アンテナを選ぶ"
+editAntenna: "アンテナを編集"
 selectWidget: "ウィジェットを選ぶ"
 editWidgets: "ウィジェットをいじる"
 editWidgetsExit: "編集終ったで"
@@ -311,7 +313,6 @@ copyUrl: "URLをコピー"
 rename: "名前を変えるで"
 avatar: "アイコン"
 banner: "バナー"
-nsfw: "見るんは気いつけてな"
 whenServerDisconnected: "サーバーとの接続が失くなってしもうたとき"
 disconnectedFromServer: "サーバーが機嫌悪いねん"
 reload: "リロード"
@@ -1062,6 +1063,9 @@ later: "あとで"
 goToMisskey: "Misskeyへ"
 additionalEmojiDictionary: "絵文字の追加辞書"
 installed: "インストール済み"
+branding: "あ"
+enableServerMachineStats: "サーバーのマシン情報見せびらかすで"
+enableIdenticonGeneration: "ユーザーごとのIdenticon生成を有効にする"
 _initialAccountSetting:
   accountCreated: "アカウント作り終わったで。"
   letsStartAccountSetup: "アカウントの初期設定をしよか。"
@@ -1485,10 +1489,6 @@ _aboutMisskey:
   donate: "Misskeyに寄付"
   morePatrons: "他にもぎょうさんの人からサポートしてもろてんねん。ほんまおおきに🥰"
   patrons: "支援者"
-_nsfw:
-  respect: "閲覧注意のメディアは隠すで"
-  ignore: "閲覧注意のメディアは隠さへんで"
-  force: "常にメディアを隠すで"
 _instanceTicker:
   none: "表示せん"
   remote: "リモートユーザーに表示"
@@ -1635,7 +1635,7 @@ _timelineTutorial:
   step3_1: "投稿できた？"
   step3_2: "あんたのノートがタイムラインに出てきたら成功や。"
   step4_1: "ノートには、「ツッコミ」を付けれるで。"
-  step4_2: "ツッコむんやったら、ノートの「+」マークを押して、好きな絵文字を選ぶで。"
+  step4_2: "ツッコむんやったら、ノートの「+」マークを押して、好きな絵文字を選ぶんやで。"
 _2fa:
   alreadyRegistered: "もう設定終わっとるわ。"
   registerTOTP: "認証アプリの設定はじめる"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index fd46eef1f..faad1175c 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -136,8 +136,10 @@ unblockConfirm: "이 계정의 차단을 해제하시겠습니까?"
 suspendConfirm: "이 계정을 정지하시겠습니까?"
 unsuspendConfirm: "이 계정의 정지를 해제하시겠습니까?"
 selectList: "리스트 선택"
+editList: "리스트 편집"
 selectChannel: "채널 선택"
 selectAntenna: "안테나 선택"
+editAntenna: "안테나 편집"
 selectWidget: "위젯 선택"
 editWidgets: "위젯 편집"
 editWidgetsExit: "편집 종료"
@@ -311,7 +313,6 @@ copyUrl: "URL 복사"
 rename: "이름 변경"
 avatar: "아바타"
 banner: "배너"
-nsfw: "열람주의"
 whenServerDisconnected: "서버와의 접속이 끊겼을 때"
 disconnectedFromServer: "서버와의 연결이 끊어졌습니다"
 reload: "새로고침"
@@ -992,8 +993,8 @@ cannotBeChangedLater: "나중에 변경할 수 없습니다."
 reactionAcceptance: "리액션 수신"
 likeOnly: "좋아요만 받기"
 likeOnlyForRemote: "리모트에서는 좋아요만 받기"
-nonSensitiveOnly: "열람 주의로 설정되지 않았을 때만 받기"
-nonSensitiveOnlyForLocalLikeOnlyForRemote: "열람 주의로 설정되지 않았을 때만 받기 (리모트에서는 좋아요만 받기)"
+nonSensitiveOnly: "민감한 이모지를 제외하고 받기"
+nonSensitiveOnlyForLocalLikeOnlyForRemote: "민감한 이모지를 제외하고 받기 (리모트에서는 좋아요만 받기)"
 rolesAssignedToMe: "나에게 할당된 역할"
 resetPasswordConfirm: "비밀번호를 재설정하시겠습니까?"
 sensitiveWords: "민감한 단어"
@@ -1062,6 +1063,9 @@ later: "나중에"
 goToMisskey: "Misskey로"
 additionalEmojiDictionary: "이모지 추가 사전"
 installed: "설치됨"
+branding: "브랜딩"
+enableServerMachineStats: "서버의 머신 사양을 공개하기"
+enableIdenticonGeneration: "유저마다의 Identicon 생성 유효화"
 _initialAccountSetting:
   accountCreated: "계정 생성이 완료되었습니다!"
   letsStartAccountSetup: "계정의 초기 설정을 진행합니다."
@@ -1485,10 +1489,6 @@ _aboutMisskey:
   donate: "Misskey에 기부하기"
   morePatrons: "이 외에도 다른 많은 분들이 도움을 주시고 계십니다. 감사합니다🥰"
   patrons: "후원자"
-_nsfw:
-  respect: "열람주의로 설정된 미디어 숨기기"
-  ignore: "열람 주의 미디어 항상 표시"
-  force: "미디어 항상 숨기기"
 _instanceTicker:
   none: "보이지 않음"
   remote: "리모트 유저에게만 보이기"
diff --git a/locales/lo-LA.yml b/locales/lo-LA.yml
index f686b0425..cee139f50 100644
--- a/locales/lo-LA.yml
+++ b/locales/lo-LA.yml
@@ -248,7 +248,6 @@ inputNewDescription: "ໃສ່ຄຳບັນຍາຍໃໝ່"
 inputNewFolderName: "ໃສ່ຊື່ໂຟນເດີໃໝ່"
 circularReferenceFolder: "ໂຟນເດີປາຍທາງແມ່ນໂຟນເດີຍ່ອຍຂອງໂຟນເດີທີ່ທ່ານຕ້ອງການຍ້າຍ"
 rename: "ປ່ຽນຊື່"
-nsfw: "NSFW"
 watch: "ເບິ່ງ"
 unwatch: "ຢຸດເບິ່ງ"
 accept: "ອະນຸຍາດ"
diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index 6bca484f1..c22b978f3 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -296,7 +296,6 @@ copyUrl: "URL kopiëren"
 rename: "Hernoemen"
 avatar: "Avatar"
 banner: "Banner"
-nsfw: "NSFW"
 whenServerDisconnected: "Wanneer de verbinding met de server wordt onderbroken"
 disconnectedFromServer: "Verbinding met de server onderbroken."
 reload: "Verversen"
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index 24eee60ba..8b6b4be7d 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -299,7 +299,6 @@ copyUrl: "Skopiuj adres URL"
 rename: "Zmień nazwę"
 avatar: "Awatar"
 banner: "Baner"
-nsfw: "NSFW"
 whenServerDisconnected: "Po utracie połączenia z serwerem"
 disconnectedFromServer: "Utracono połączenie z serwerem."
 reload: "Odśwież"
@@ -955,10 +954,6 @@ _aboutMisskey:
   donate: "Przekaż darowiznę na Misskey"
   morePatrons: "Naprawdę doceniam wsparcie ze strony wielu niewymienionych tu osób. Dziękuję! 🥰"
   patrons: "Wspierający"
-_nsfw:
-  respect: "Ukrywaj media NSFW"
-  ignore: "Nie ukrywaj mediów NSFW"
-  force: "Ukrywaj wszystkie media"
 _instanceTicker:
   none: "Nigdy nie pokazuj"
   remote: "Pokaż dla zdalnych użytkowników"
diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml
index e7b43f638..29d7de19c 100644
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -294,7 +294,6 @@ copyUrl: "Copiar URL"
 rename: "Renomear"
 avatar: "Avatar"
 banner: "Capa"
-nsfw: "Conteúdo sensível"
 whenServerDisconnected: "Quando a conexão com o servidor é perdida"
 disconnectedFromServer: "Desconectado do servidor"
 reload: "Recarregar"
diff --git a/locales/ro-RO.yml b/locales/ro-RO.yml
index 6ad45d063..2d3099858 100644
--- a/locales/ro-RO.yml
+++ b/locales/ro-RO.yml
@@ -294,7 +294,6 @@ copyUrl: "Copiază URL"
 rename: "Redenumește"
 avatar: "Avatar"
 banner: "Banner"
-nsfw: "NSFW"
 whenServerDisconnected: "Când pierzi conexiunea cu serverul"
 disconnectedFromServer: "Conecțiunea cu serverul a fost pierdută"
 reload: "Reîncarcă"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index e92449fdb..9100753b4 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -52,6 +52,8 @@ addToList: "Добавить в список"
 sendMessage: "Отправить сообщение"
 copyRSS: "Скопировать RSS"
 copyUsername: "Скопировать имя пользователя"
+copyUserId: "Скопировать ID пользователя"
+copyNoteId: "Скопировать ID заметки"
 searchUser: "Поиск людей"
 reply: "Ответить"
 loadMore: "Показать еще"
@@ -309,7 +311,6 @@ copyUrl: "Копировать ссылку"
 rename: "Переименовать"
 avatar: "Аватар"
 banner: "Шапка"
-nsfw: "Содержимое не для всех"
 whenServerDisconnected: "Когда соединение с сервером потеряно"
 disconnectedFromServer: "Разорвано соединение с сервером"
 reload: "Перезагрузить"
@@ -790,6 +791,7 @@ noMaintainerInformationWarning: "Не заполнены сведения об 
 noBotProtectionWarning: "Ботозащита не настроена"
 configure: "Настроить"
 postToGallery: "Опубликовать в галерею"
+postToHashtag: "Опубликовать пост с этим хештегом"
 gallery: "Галерея"
 recentPosts: "Недавние публикации"
 popularPosts: "Популярные публикации"
@@ -1395,10 +1397,6 @@ _aboutMisskey:
   donate: "Пожертвование на Misskey"
   morePatrons: "Большое спасибо и многим другим, кто принял участие в этом проекте! 🥰"
   patrons: "Материальная поддержка"
-_nsfw:
-  respect: "Скрывать содержимое не для всех"
-  ignore: "Показывать содержимое не для всех"
-  force: "Скрывать вообще все файлы"
 _instanceTicker:
   none: "Не показывать"
   remote: "Только для других сайтов"
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index 3e9611938..f4c598ac8 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -303,7 +303,6 @@ copyUrl: "Kopírovať URL"
 rename: "Premenovať"
 avatar: "Avatar"
 banner: "BAnner"
-nsfw: "NSFW"
 whenServerDisconnected: "Keď sa stratí spojenie so serverom"
 disconnectedFromServer: "Spojenie so serverom bolo prerušené"
 reload: "Obnoviť"
@@ -1009,10 +1008,6 @@ _aboutMisskey:
   donate: "Podporiť Misskey"
   morePatrons: "Takisto oceňujeme podporu mnoých ďalších, ktorí tu nie sú uvedení. Ďakujeme! 🥰"
   patrons: "Prispievatelia"
-_nsfw:
-  respect: "Skryť NSFW médiá"
-  ignore: "Neskrývať NSFW médiá"
-  force: "Skryť všetky médiá"
 _instanceTicker:
   none: "Nikdy nezobrazovať"
   remote: "Zobraziť pre vzdialených používateľov"
diff --git a/locales/sv-SE.yml b/locales/sv-SE.yml
index 7a00e3fce..5526708f0 100644
--- a/locales/sv-SE.yml
+++ b/locales/sv-SE.yml
@@ -51,6 +51,8 @@ addToList: "Lägg till i lista"
 sendMessage: "Skicka ett meddelande"
 copyRSS: "Kopiera RSS"
 copyUsername: "Kopiera användarnamn"
+copyUserId: "Kopiera användar-ID"
+copyNoteId: "Kopiera noter-ID"
 searchUser: "Sök användare"
 reply: "Svara"
 loadMore: "Ladda mer"
@@ -103,6 +105,7 @@ renoted: "Omnoterad."
 cantRenote: "Inlägget kunde inte bli omnoterat."
 cantReRenote: "En omnotering kan inte bli omnoterad."
 quote: "Citat"
+inChannelRenote: "Omnotera inom kanalen"
 pinnedNote: "Fästad not"
 pinned: "Fäst till profil"
 you: "Du"
@@ -129,7 +132,10 @@ unblockConfirm: "Är du säkert att du vill avblockera kontot?"
 suspendConfirm: "Är du säker att du vill suspendera detta konto?"
 unsuspendConfirm: "Är du säker att du vill avsuspendera detta konto?"
 selectList: "Välj lista"
+editList: "Redigera lista"
+selectChannel: "Välj en kanal"
 selectAntenna: "Välj en antenn"
+editAntenna: "Redigera en antenn"
 selectWidget: "Välj en widget"
 editWidgets: "Redigera widgets"
 editWidgetsExit: "Avsluta redigering"
@@ -256,6 +262,9 @@ noMoreHistory: "Det finns ingen mer historik"
 startMessaging: "Starta en chatt"
 nUsersRead: "läst av {n}"
 agreeTo: "Jag accepterar {0}"
+agree: "Överens"
+termsOfService: "Användarvillkor"
+start: "Kom igång"
 home: "Hem"
 remoteUserCaution: "Då denna användaren kommer från en fjärrinstans, kan informationen visad vara ofullständig."
 activity: "Aktivitet"
@@ -297,7 +306,6 @@ copyUrl: "Kopiera URL"
 rename: "Byt namn"
 avatar: "Profilbild"
 banner: "Banner"
-nsfw: "Känsligt innehåll"
 reload: "Ladda om"
 doNothing: "Ignorera"
 reloadConfirm: "Vill du ladda om tidslinjen?"
@@ -320,16 +328,22 @@ connectService: "Anslut"
 disconnectService: "Koppla från"
 enableLocalTimeline: "Aktivera lokal tidslinje"
 enableGlobalTimeline: "Aktivera global tidslinje"
+registration: "Registrera"
 enableRegistration: "Aktivera registrering av nya användare"
+invite: "Inbjudan"
 inMb: "I megabyte"
 iconUrl: "URL till profilbilden"
 bannerUrl: "URL till banner-bilden"
 pinnedNotes: "Fästad not"
+hcaptcha: "hCaptcha"
 enableHcaptcha: "Aktivera hCaptcha"
+hcaptchaSiteKey: "Webbplatsnyckel"
+recaptcha: "reCAPTCHA"
 enableRecaptcha: "Aktivera reCAPTCHA"
 enableTurnstile: "Aktivera Turnstile"
 antennas: "Antenner"
 manageAntennas: "Hantera Antenner"
+name: "Namn"
 antennaSource: "Antennkälla"
 antennaKeywords: "Nyckelord att lyssna efter"
 antennaExcludeKeywords: "Nyckelord att exkludera"
@@ -338,9 +352,14 @@ notifyAntenna: "Notifiera om nya noter"
 withFileAntenna: "Endast noter med filer"
 enableServiceworker: "Aktivera pushnotiser i denna webbläsaren"
 antennaUsersDescription: "Ange ett användarnamn per linje"
+notesAndReplies: "Inlägg och svar"
+silence: "Tystnad"
 recentlyUpdatedUsers: "Nyligen aktiva användare"
 recentlyRegisteredUsers: "Nyligen registrerade användare"
+exploreFediverse: "Utforska Fediverse"
+popularTags: "Populära taggar"
 userList: "Listor"
+about: "Om"
 aboutMisskey: "Om Misskey"
 administrator: "Administratör"
 passwordLessLogin: "Lösenordsfri inloggning"
@@ -348,29 +367,90 @@ passwordLessLoginDescription: "Tillåter lösenordsfri inloggning med endast en
 resetPassword: "Återställ Lösenord"
 newPasswordIs: "Det nya lösenordet är \"{password}\""
 share: "Dela"
+help: "Hjälp"
+close: "Stäng"
+invites: "Inbjudan"
+members: "Medlemmar"
+text: "Text"
 enable: "Aktivera"
+next: "Nästa"
+invitations: "Inbjudan"
 weakPassword: "Svagt Lösenord"
 normalPassword: "Medel Lösenord"
 strongPassword: "Starkt Lösenord"
 signinFailed: "Kan inte logga in. Det angivna användarnamnet eller lösenordet är felaktigt."
+or: "eller"
+language: "Språk"
+aboutX: "Om {x}"
+category: "Kategori"
+tags: "Taggar"
+createAccount: "Skapa ett konto"
+existingAccount: "Existerande konto"
+regenerate: "Regenerera"
+fontSize: "Textstorlek"
+openImageInNewTab: "Öppna bild i ny flik"
+clientSettings: "Klientinställningar"
+accountSettings: "Kontoinställningar"
+numberOfDays: "Antal dagar"
+deleteAll: "Radera alla"
+sounds: "Ljud"
+sound: "Ljud"
+listen: "Lyssna"
+none: "Ingen"
+volume: "Volym"
+chooseEmoji: "Välj en emoji"
+recentUsed: "Senast använd"
+install: "Installera"
+uninstall: "Avinstallera"
+menu: "Meny"
 serviceworkerInfo: "Måste vara aktiverad för pushnotiser."
 enableInfiniteScroll: "Ladda mer automatiskt"
 enablePlayer: "Öppna videospelare"
+permission: "Behörigheter"
 enableAll: "Aktivera alla"
+edit: "Ändra"
 enableEmail: "Aktivera epost-utskick"
+email: "E-post"
 smtpHost: "Värd"
 smtpUser: "Användarnamn"
 smtpPass: "Lösenord"
 emptyToDisableSmtpAuth: "Lämna användarnamn och lösenord tomt för att avaktivera SMTP verifiering"
+logs: "Logg"
+channel: "kanal"
+create: "Skapa"
+other: "Mer"
+send: "Skicka"
+openInNewTab: "Öppna i ny flik"
+createNew: "Skapa ny"
+i18nInfo: "Misskey översätts till många olika språk av volontärer. Du kan hjälpa till med översättningen på {link}."
+accountInfo: "Kontoinformation"
+clips: "Klipp"
+duplicate: "Duplicera"
+reloadToApplySetting: "Inställningen tillämpas efter sidan laddas om. Vill du göra det nu?"
 clearCache: "Rensa cache"
 onlineUsersCount: "{n} användare är online"
+nNotes: "{n} Noter"
+backgroundColor: "Bakgrundsbild"
+textColor: "Text"
+youAreRunningUpToDateClient: "Klienten du använder är uppdaterat."
+newVersionOfClientAvailable: "Ny version av klienten är tillgänglig."
+publish: "Publicera"
+typingUsers: "{users} skriver"
+info: "Om"
 enabled: "Aktiverad"
 user: "Användare"
+customCssWarn: "Den här inställningen borde bara ändrats av en som har rätta kunskaper. Om du ställer in det här fel så kan klienten sluta fungera rätt."
 global: "Global"
 squareAvatars: "Visa fyrkantiga profilbilder"
+sent: "Skicka"
+misskeyUpdated: "Misskey har uppdaterats!"
 incorrectPassword: "Fel lösenord."
+welcomeBackWithName: "Välkommen tillbaka, {name}"
+clickToFinishEmailVerification: "Tryck på [{ok}] för att slutföra bekräftelsen på e-postadressen."
 searchByGoogle: "Sök"
 file: "Filer"
+cannotUploadBecauseNoFreeSpace: "Kan inte ladda upp filen för att det finns inget lagringsutrymme kvar."
+cannotUploadBecauseExceedsFileSizeLimit: "Kan inte ladda upp filen för att den är större än filstorleksgränsen."
 enableAutoSensitive: "Automatisk NSFW markering"
 enableAutoSensitiveDescription: "Tillåter automatiskt detektering och marketing av NSFW media genom Maskininlärning när möjligt. Även om denna inställningen är avaktiverad, kan det vara aktiverat på hela instansen."
 pushNotification: "Pushnotiser"
@@ -381,12 +461,15 @@ pushNotificationNotSupported: "Din webbläsare eller instans har inte stöd för
 windowMaximize: "Maximera"
 windowMinimize: "Minimera"
 windowRestore: "Återställ"
+pleaseDonate: "Misskey är en gratis programvara som används på {host}. Donera gärna för att göra utvecklingen ständigt, tack!"
 resetPasswordConfirm: "Återställ verkligen ditt lösenord?"
 _achievements:
   _types:
     _open3windows:
       title: "Flera Fönster"
       description: "Ha minst 3 fönster öppna samtidigt"
+_ffVisibility:
+  public: "Publicera"
 _email:
   _follow:
     title: "följde dig"
@@ -426,6 +509,7 @@ _visibility:
   home: "Hem"
   followers: "Följare"
 _profile:
+  name: "Namn"
   username: "Användarnamn"
   changeAvatar: "Ändra profilbild"
   changeBanner: "Ändra banner"
@@ -461,6 +545,8 @@ _deck:
     tl: "Tidslinje"
     antenna: "Antenner"
     list: "Listor"
+    channel: "kanal"
     mentions: "Omnämningar"
 _webhookSettings:
+  name: "Namn"
   active: "Aktiverad"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index d8e68202d..387f4b9d6 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -52,6 +52,8 @@ addToList: "เพิ่มในลิสต์"
 sendMessage: "ส่งข้อความ"
 copyRSS: "คัดลอก RSS"
 copyUsername: "คัดลอกชื่อผู้ใช้"
+copyUserId: "คัดลอก ID ผู้ใช้"
+copyNoteId: "คัดลอก ID โน้ต "
 searchUser: "ค้นหาผู้ใช้งาน"
 reply: "ตอบกลับ"
 loadMore: "โหลดเพิ่มเติม"
@@ -73,8 +75,8 @@ unfollowConfirm: "นายแน่ใจแล้วหรอว่าต้
 exportRequested: "เมื่อคุณได้ร้องขอการส่งออก อาจจะต้องใช้เวลาสักครู่ และจะถูกเพิ่มในไดรฟ์ของคุณเมื่อเสร็จสิ้นแล้ว"
 importRequested: "เมื่อคุณได้ร้องขอการนำเข้า อาจจะต้องใช้เวลาสักครู่นะ"
 lists: "รายการ"
-noLists: "คุณไม่มีลิสต์ใดๆนะ"
-note: "ตัวโน้ต"
+noLists: "คุณไม่มีลิสต์ใด ๆ"
+note: " โน้ต"
 notes: "ตัวโน้ต"
 following: "กำลังติดตาม"
 followers: "ผู้ติดตาม"
@@ -100,7 +102,7 @@ followRequestPending: "กำลังรอดำเนินการร้อ
 enterEmoji: "ใส่อีโมจิ"
 renote: "รีโน้ต"
 unrenote: "เลิกรีโน้ต"
-renoted: "รีโน้ตแล้วนะ"
+renoted: "รีโน้ตแล้ว"
 cantRenote: "โพสต์นี้ไม่สามารถรีโน้ตไว้ใหม่ได้นะ"
 cantReRenote: "ไม่สามารถรีโน้ตเอาไว้ใหม่ได้นะ"
 quote: "อ้างคำพูด"
@@ -108,7 +110,7 @@ inChannelRenote: "รีโน้ตช่องแชลแนลเท่า
 inChannelQuote: "อ้างช่องเท่านั้น"
 pinnedNote: "โน้ตที่ปักหมุดเอาไว้"
 pinned: "ปักหมุดไปยังโปรไฟล์"
-you: "ตัวเอง"
+you: "คุณ"
 clickToShow: "คลิกเพื่อแสดง"
 sensitive: "เนื้อหาที่ละเอียดอ่อน NSFW"
 add: "เพิ่ม"
@@ -134,8 +136,10 @@ unblockConfirm: "คุณแน่ใจแล้วเหรอ? ว่าต
 suspendConfirm: "นายแน่ใจแล้วเหรอว่าต้องการระงับบัญชีนี้อ่ะ?"
 unsuspendConfirm: "นายแน่ใจแล้วหรอ? ว่าต้องการยกเลิกการระงับบัญชีนี้"
 selectList: "เลือกรายการ"
+editList: "แก้ไขรายการ"
 selectChannel: "เลือกแชนแนล"
 selectAntenna: "เลือกเสาอากาศ"
+editAntenna: "แก้ไขเสาอากาศ"
 selectWidget: "เลือกวิดเจ็ต"
 editWidgets: "แก้ไขวิดเจ็ต"
 editWidgetsExit: "เรียบร้อย"
@@ -164,7 +168,7 @@ wallpaper: "วอลล์เปเปอร์"
 setWallpaper: "ตั้งวอลเปเปอร์"
 removeWallpaper: "นำวอลเปเปอร์ออก"
 searchWith: "ค้นหา: {q}"
-youHaveNoLists: "รายการนี้ว่างเปล่า"
+youHaveNoLists: "คุณไม่มีลิสต์ใด ๆ "
 followConfirm: "คุณแน่ใจแล้วหรอว่าต้องการที่จะติดตาม {name}?"
 proxyAccount: "บัญชี พร็อกซี่"
 proxyAccountDescription: "บัญชีพร็อกซี่ คือ บัญชีที่จะทำหน้าที่เป็นผู้ติดตามระยะไกลสำหรับผู้ใช้งานที่อยู่ภายใต้ด้วยเงื่อนไขบางอย่าง ยกตัวอย่าง เช่น เมื่อมีผู้ใช้งานนั้นได้เพิ่มผู้ใช้งานจากระยะไกลลงในรายการ แต่กิจกรรมของผู้ใช้ในระยะไกลนั้นจะไม่ถูกส่งไปยังอินสแตนซ์หากไม่มีผู้ใช้งานในพื้นที่ติดตามผู้ใช้รายนั้น ดังนั้นบัญชีพร็อกซีนี้จะติดตามแทน"
@@ -186,7 +190,7 @@ blockThisInstance: "บล็อกอินสแตนซ์นี้"
 operations: "ดำเนินการ"
 software: "ซอฟต์แวร์"
 version: "เวอร์ชั่น"
-metadata: "ข้อมูลเมตา"
+metadata: "Metadata"
 withNFiles: "{n} ไฟล์(s)"
 monitor: "มอนิเตอร์"
 jobQueue: "คิวงาน"
@@ -213,7 +217,7 @@ intro: "การติดตั้ง Misskey เสร็จสิ้นแล
 done: "เสร็จสิ้น"
 processing: "กำลังประมวลผล..."
 preview: "แสดงตัวอย่าง"
-default: "ค่าตั้งต้น"
+default: "ค่าเริ่มต้น"
 defaultValueIs: "ค่าเริ่มต้น: {value}"
 noCustomEmojis: "ไม่มีอีโมจิ"
 noJobs: "ไม่มีชิ้นงาน"
@@ -234,10 +238,10 @@ currentPassword: "รหัสผ่านปัจจุบัน"
 newPassword: "รหัสผ่านใหม่"
 newPasswordRetype: "ใส่รหัสผ่านใหม่อีกครั้ง"
 attachFile: "แนบไฟล์"
-more: "เพิ่มเติม!"
+more: "เพิ่มเติม"
 featured: "ไฮไลท์"
 usernameOrUserId: "ชื่อผู้ใช้หรือรหัสผู้ใช้งาน"
-noSuchUser: "ไม่มีผู้ใช้นี้อยู่ในระบบ"
+noSuchUser: "ไม่พบผู้ใช้"
 lookup: "การค้นหา"
 announcements: "ประกาศ"
 imageUrl: "url รูปภาพ"
@@ -282,7 +286,7 @@ themeForLightMode: "ธีมที่จะใช้ในโหมดแสง
 themeForDarkMode: "ธีมที่จะใช้ในโหมดมืด"
 light: "สว่าง"
 dark: "มืด"
-lightThemes: "ธีมสีสว่าง"
+lightThemes: "ธีมสว่าง"
 darkThemes: "ธีมมืด"
 syncDeviceDarkMode: "ซิงค์โหมดมืดด้วยการตั้งค่ากับอุปกรณ์"
 drive: "ไดรฟ์"
@@ -309,7 +313,6 @@ copyUrl: "คัดลอก URL"
 rename: "เปลี่ยนชื่อ"
 avatar: "ไอคอน"
 banner: "แบนเนอร์"
-nsfw: "เนื้อหาที่ละเอียดอ่อน NSFW"
 whenServerDisconnected: "สูญเสียการเชื่อมต่อกับเซิร์ฟเวอร์"
 disconnectedFromServer: "ถูกตัดการเชื่อมต่อออกจากเซิร์ฟเวอร์"
 reload: "รีโหลด"
@@ -319,7 +322,7 @@ watch: "ดู"
 unwatch: "หยุดดู"
 accept: "ยอมรับ"
 reject: "ปฏิเสธ"
-normal: "โหมดปกติ"
+normal: "ปกติ"
 instanceName: "ชื่อ อินสแตนซ์"
 instanceDescription: "คำอธิบายอินสแตนซ์"
 maintainerName: "ผู้ดูแล"
@@ -790,6 +793,7 @@ noMaintainerInformationWarning: "ข้อมูลผู้ดูแลไม
 noBotProtectionWarning: "ไม่ได้กำหนดค่าการป้องกันบอทนะ"
 configure: "กำหนดค่า"
 postToGallery: "สร้างโพสต์แกลเลอรี่ใหม่"
+postToHashtag: "โพสต์ไปที่แฮชแท็กนี้"
 gallery: "แกลเลอรี่"
 recentPosts: "โพสต์ล่าสุด"
 popularPosts: "โพสต์ติดอันดับ"
@@ -823,6 +827,7 @@ translatedFrom: "แปลมาจาก {x}"
 accountDeletionInProgress: "กำลังดำเนินการลบบัญชีอยู่"
 usernameInfo: "ชื่อที่ระบุบัญชีของคุณจากผู้อื่นในเซิร์ฟเวอร์นี้ คุณสามารถใช้ตัวอักษร (a~z, A~Z), ตัวเลข (0~9) หรือขีดล่าง (_) ชื่อผู้ใช้ไม่สามารถเปลี่ยนแปลงได้ในภายหลัง"
 aiChanMode: "โหมด Ai "
+devMode: "โหมดนักพัฒนา"
 keepCw: "เก็บคำเตือนเนื้อหา"
 pubSub: "บัญชีผับ/ย่อย"
 lastCommunication: "การสื่อสารครั้งสุดท้ายล่าสุด"
@@ -832,6 +837,8 @@ breakFollow: "ลบผู้ติดตาม"
 breakFollowConfirm: "ลบผู้ติดตามนี้ออกจริงหรอ?"
 itsOn: "เปิดใช้งาน"
 itsOff: "ปิดใช้งาน"
+on: "เปิด"
+off: "ปิด"
 emailRequiredForSignup: "จำเป็นต้องการใช้ที่อยู่อีเมลสำหรับการสมัคร"
 unread: "ไม่ได้อ่าน"
 filter: "กรอง"
@@ -850,7 +857,7 @@ incorrectPassword: "รหัสผ่านไม่ถูกต้อง"
 voteConfirm: "ยืนยันการโหวต \"{choice}\" มั้ย?"
 hide: "ซ่อน"
 useDrawerReactionPickerForMobile: "แสดงผล ตัวเลือกปฏิกิริยาเป็นลิ้นชักบนมือถือ"
-welcomeBackWithName: "ยินดีต้อนรับการกลับมานะค่ะ, {name}"
+welcomeBackWithName: "ยินดีต้อนรับการกลับมานะคะ, {name}"
 clickToFinishEmailVerification: "กรุณาคลิก [{ok}] เพื่อดำเนินการยืนยันอีเมลให้เสร็จสมบูรณ์นะ"
 overridedDeviceKind: "ประเภทอุปกรณ์"
 smartphone: "สมาร์ทโฟน"
@@ -955,7 +962,7 @@ color: "สี"
 manageCustomEmojis: "จัดการอีโมจิแบบกำหนดเอง"
 youCannotCreateAnymore: "คุณถึงขีดจํากัดการสร้างแล้วนะ"
 cannotPerformTemporary: "ไม่สามารถใช้การได้ชั่วคราว"
-cannotPerformTemporaryDescription: "การดําเนินการนี้ไม่สามารถดําเนินการได้ชั่วคราว เนื่องจากเกินขีดจํากัดการดําเนินการ กรุณารอสักครู่แล้วลองใหม่อีกครั้งนะค่ะ"
+cannotPerformTemporaryDescription: "ไม่สามารถดําเนินการได้ชั่วคราว เนื่องจากเกินขีดจํากัดการดําเนินการ กรุณารอสักครู่แล้วลองใหม่อีกครั้ง"
 invalidParamError: "ข้อผิดพลาดพารามิเตอร์"
 invalidParamErrorDescription: "คำขอพารามิเตอร์ไม่ถูกต้อง สิ่งนี้มักจะเกิดจากข้อผิดพลาด แต่อาจเกิดจากอินพุตเกินขีดจำกัดของขนาดหรือที่คล้ายกัน"
 permissionDeniedError: "การดำเนินถูกปฏิเสธ"
@@ -977,20 +984,23 @@ joinThisServer: "ลงชื่อสมัครใช้ในอินสแ
 exploreOtherServers: "มองหาอินสแตนซ์อื่น"
 letsLookAtTimeline: "ลองดูที่ไทม์ไลน์"
 disableFederationConfirm: "ปิดใช้งานสหพันธ์จริงๆหรอแน่ใจแล้วนะ?"
-disableFederationConfirmWarn: "แม้ว่าจะถูกยกเลิกเอาไว้โพสต์ดังกล่าวนั้นจะยังคงเป็นสาธารณะต่อไป เว้นแต่ว่า...จะตั้งค่าเป็นอย่างอื่น โดยปกติคุณไม่จำเป็นต้องทำตรงนี้หรอกนะค่ะ"
+disableFederationConfirmWarn: "โพสต์จะยังคงเป็นสาธารณะต่อไป เว้นแต่จะตั้งค่าเป็นอย่างอื่น"
 disableFederationOk: "ปิดการใช้งาน"
-invitationRequiredToRegister: "อินสแตนซ์นี้เป็นแบบรับเชิญเท่านั้น คุณต้องป้อนรหัสเชิญที่ถูกต้องถึงจะลงทะเบียนได้นะค่ะ"
-emailNotSupported: "อินสแตนซ์นี้ไม่รองรับการส่งอีเมลนะค่ะ"
+invitationRequiredToRegister: "อินสแตนซ์นี้เป็นแบบรับเชิญเท่านั้น คุณต้องป้อนรหัสเชิญ เพื่องลงทะเบียนเข้าใช้งาน"
+emailNotSupported: "อินสแตนซ์นี้ไม่รองรับการส่งอีเมล"
 postToTheChannel: "โพสต์ลงช่อง"
 cannotBeChangedLater: "สิ่งนี้ไม่สามารถเปลี่ยนแปลงได้ในภายหลังนะ"
 reactionAcceptance: "การยอมรับรีแอคชั่น"
 likeOnly: "ที่ชอบเท่านั้น"
 likeOnlyForRemote: "ไลค์สำหรับอินสแตนซ์ระยะไกลเท่านั้น"
+nonSensitiveOnly: "ไม่มีความอ่อนไหวเท่านั้น"
+nonSensitiveOnlyForLocalLikeOnlyForRemote: "ไม่มีความอ่อนไหวเท่านั้น (เฉพาะไลค์จากระยะไกลเท่านั้น)"
 rolesAssignedToMe: "บทบาทที่ได้รับมอบหมายให้ฉัน"
 resetPasswordConfirm: "รีเซ็ตรหัสผ่านของคุณจริงๆหรอ?"
 sensitiveWords: "คำที่ละเอียดอ่อน"
 sensitiveWordsDescription: "การเปิดเผยโน้ตทั้งหมดที่มีคำที่กำหนดค่าไว้จะถูกตั้งค่าเป็น \"หน้าแรก\" โดยอัตโนมัติ คุณยังสามารถแสดงหลายรายการได้โดยแยกรายการโดยใช้ตัวแบ่งบรรทัดได้นะ"
-notesSearchNotAvailable: "การค้นหาโน้ตไม่พร้อมใช้งานนะค่ะ"
+sensitiveWordsDescription2: "การใช้ช่องว่างนั้นอาจจะสร้างนิพจน์ AND และคำหลักที่มีเครื่องหมายทับล้อมรอบจะเปลี่ยนเป็นนิพจน์ทั่วไปนะ"
+notesSearchNotAvailable: "การค้นหาโน้ตไม่พร้อมใช้งาน"
 license: "ใบอนุญาต"
 unfavoriteConfirm: "ลบออกจากรายการโปรดแน่ใจหรอ?"
 myClips: "คลิปของฉัน"
@@ -1025,29 +1035,60 @@ vertical: "แนวตั้ง"
 horizontal: "ด้านข้าง"
 position: "ตำแหน่ง"
 serverRules: "กฎของเซิฟเวอร์"
-pleaseConfirmBelowBeforeSignup: "โปรดยืนยันด้านล่างก่อนกำลังลงชื่อสมัครนะค่ะ"
+pleaseConfirmBelowBeforeSignup: "โปรดยืนยันที่ด้านล่างก่อนสมัครใช้งาน"
 pleaseAgreeAllToContinue: "คุณต้องยอมรับทุกช่องตรงด้านบนเพื่อดำเนินการต่อค่ะ"
 continue: "ดำเนินการต่อ"
 preservedUsernames: "ชื่อผู้ใช้ที่สงวนไว้"
 preservedUsernamesDescription: "ลิสต์ชื่อผู้ใช้ที่จะสำรองโดยคั่นด้วยการแบ่งบรรทัดนั้น เพราะสิ่งเหล่านี้จะไม่สามารถทำได้ในระหว่างการสร้างบัญชีตามปกติ บัญชีที่มีอยู่แล้วนั้นโดยใช้ชื่อผู้ใช้เหล่านี้จะไม่ได้รับผลกระทบอะไร"
 createNoteFromTheFile: "เรียบเรียงโน้ตจากไฟล์นี้"
 archive: "เก็บถาวร"
+channelArchiveConfirmTitle: "เก็บถาวรจริงๆ {name} มั้ย?"
+thisChannelArchived: "ช่องนี้ถูกเก็บถาวรแล้วนะ"
+displayOfNote: "การแสดงโน้ต"
+initialAccountSetting: "ตั้งค่าโปรไฟล์"
 youFollowing: "ติดตามแล้ว"
+preventAiLearning: "ปฏิเสธการใช้งาน ในการเรียนรู้ของเครื่อง (Generative AI)"
 options: "ตัวเลือกบทบาท"
+specifyUser: "ผู้ใช้เฉพาะ"
+failedToPreviewUrl: "ไม่สามารถดูตัวอย่างได้"
+update: "อัปเดต"
+rolesThatCanBeUsedThisEmojiAsReaction: "บทบาทที่สามารถใช้อิโมจินี้เป็นรีแอคชั่นได้"
+rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn: "บทบาทเหล่านี้ต้องเป็นสาธารณะ"
+cancelReactionConfirm: "ต้องการลบรีแอคชั่นของคุณจริงๆหรอ?"
+changeReactionConfirm: "ต้องการเปลี่ยนรีแอคชั่นของคุณจริงๆหรอ?"
+later: "ไว้ทีหลัง"
+goToMisskey: "ถึง Misskey"
+additionalEmojiDictionary: "พจนานุกรมอีโมจิเพิ่มเติม"
+installed: "ติดตั้งแล้ว"
+branding: "แบรนดิ้ง"
+enableServerMachineStats: "เผยแพร่สถานะฮาร์ดแวร์ของเซิร์ฟเวอร์"
+enableIdenticonGeneration: "เปิดใช้งานผู้ใช้สร้างตัวระบุ"
+turnOffToImprovePerformance: "การปิดส่วนนี้สามารถเพิ่มประสิทธิภาพได้"
+_initialAccountSetting:
+  accountCreated: "คุณได้สร้างบัญชีของคุณสำเร็จเรียบร้อยแล้ว!"
+  letsStartAccountSetup: "สำหรับผู้เริ่มต้นมาตั้งค่าโปรไฟล์ของคุณกันเถอะ"
+  letsFillYourProfile: "ก่อนอื่นมาตั้งค่าโปรไฟล์ของคุณ"
+  profileSetting: "ตั้งค่าโปรไฟล์"
+  privacySetting: "ตั้งค่าความเป็นส่วนตัว"
+  theseSettingsCanEditLater: "คุณสามารถเปลี่ยนการตั้งค่าเหล่านี้ได้ในภายหลังได้ตลอดเวลานะ"
+  initialAccountSettingCompleted: "ตั้งค่าโปรไฟล์เสร็จสมบูรณ์แล้ว!"
+  haveFun: "สนุกกับ {name}!"
+  skipAreYouSure: "ต้องการข้ามการตั้งค่าโปรไฟล์จริงๆแบบนั้นหรอ?"
+  laterAreYouSure: "ต้องการตั้งค่าโปรไฟล์ในภายหลังจริงๆอย่างงั้นหรอ?"
 _serverRules:
   description: "ชุดของกฎที่จะแสดงก่อนการลงทะเบียนเราขอแนะนำให้ตั้งค่าสรุปข้อกำหนดในการให้บริการ"
 _accountMigration:
   moveFrom: "ย้ายข้อมูลบัญชีอื่นไปยังอีกบัญชีนี้หนึ่ง"
   moveFromSub: "สร้างนามแฝงไปยังบัญชีอื่น"
   moveFromLabel: "บัญชีที่จะย้ายจาก:"
-  moveFromDescription: "สร้างนามแฝงสำหรับบัญชีที่จะย้ายจากบัญชีนี้ ถ้าหากคุณต้องการโอนผู้ติดตาม สิ่งนี้ต้องทำก่อนโอนก่อนนะค่ะ! หลังจากนั้น ป้อนบัญชีที่จะย้ายไปในรูปแบบต่อไปนี้: @person@instance.com"
+  moveFromDescription: "ถ้าหากคุณต้องการโอนข้อมูล คุณจำเป็นต้องสร้างบัญชีสำรองสำหรับการย้ายบัญชี  หลังจากนั้นป้อนบัญชีที่จะย้ายไปในรูปแบบต่อไปนี้: @person@instance.com"
   moveTo: "ย้ายข้อมูลบัญชีนี้ไปยังบัญชีอีกหนึ่ง"
   moveToLabel: "บัญชีที่จะย้ายไปที่:"
   moveCannotBeUndone: "ไม่สามารถยกเลิกการโอนย้ายบัญชีได้"
   moveAccountDescription: "การกระทำนี้ไม่สามารถย้อนกลับได้นะ ขั้นตอนแรก ต้องสร้างนามแฝงสำหรับบัญชีนี้ในบัญชีที่คุณต้องการย้ายไป หลังจากนั้นแล้ว ป้อนบัญชีที่จะย้ายไปในรูปแบบดังต่อไปนี้: @person@instance.com"
   moveAccountHowTo: "หากต้องการย้ายข้อมูลก่อนอื่นให้สร้างชื่อแทนสำหรับบัญชีนี้ ในบัญชีที่จะต้องการย้ายไป\nหลังจากที่คุณสร้างนามแฝงนั้นแล้ว ให้ป้อนบัญชีที่ต้องการจะย้ายไปในรูปแบบดังต่อไปนี้: @username@server.example.com"
   startMigration: "โอนย้าย"
-  migrationConfirm: "ย้ายข้อมูลบัญชีนี้ไปที่ {account} จริงๆนะ เมื่อมีการเริ่มต้นแล้ว กระบวนการนี้จะไม่สามารถหยุดหรือนำกลับคืนมาได้ และคุณจะไม่สามารถใช้บัญชีนี้ในสถานะดั้งเดิมได้อีกต่อไป\n\nนอกจากนี้ เพื่อให้แน่ใจยืนยันว่าคุณได้สร้างนามแฝงในบัญชีที่จะย้ายข้อมูลนะค่ะ"
+  migrationConfirm: "ยืนยันการย้ายข้อมูลบัญชีนี้ไปที่ {account} เมื่อเริ่มแล้วจะไม่สามารถหยุดหรือนำกลับคืนมาได้ และคุณจะไม่สามารถใช้บัญชีนี้ในสถานะดั้งเดิมได้อีกต่อไป\n\nนอกจากนี้ คุณจำเป็นต้องสร้างบัญชีสำรองสำหรับการย้ายบัญชี"
   movedAndCannotBeUndone: "\nบัญชีนี้ถูกโอนย้ายไปแล้ว\nไม่สามารถย้อนกลับโอนย้ายข้อมูลได้"
   postMigrationNote: "บัญชีนี้จะถูกเลิกติดตามบัญชีทั้งหมดที่กำลังติดตามภายใน 24 ชั่วโมงหลังจากการย้ายข้อมูลนั้นเสร็จสิ้น ทั้งจำนวนผู้ติดตามและผู้ติดตามนั้นจะกลายเป็นศูนย์ เพื่อหลีกเลี่ยงป้องกันไม่ให้ผู้ติดตามของคุณนั้นไม่สามารถเห็นโพสต์เฉพาะผู้ติดตามของบัญชีนี้ได้ แต่อย่างไรก็ตามแล้วพวกเขาจะยังคงติดตามบัญชีนี้ต่อไป"
   movedTo: "บัญชีที่จะย้ายไปที่:"
@@ -1223,7 +1264,7 @@ _achievements:
       title: "พักผ่อนสักหน่อย"
       description: "ใช้เวลา 30 นาทีบน Misskey"
     _client60min:
-      title: "ไม่มี \"Miss\" ใน Misskey นะค่ะ !"
+      title: "ไม่พบ \"Miss\" ใน Misskey "
       description: "เปิด Misskey ค้างไว้แล้วอย่างน้อย 60 นาที"
     _noteDeletedWithin1min:
       title: "ไม่เป็นไร"
@@ -1391,6 +1432,7 @@ _ad:
   back: "ย้อนกลับ"
   reduceFrequencyOfThisAd: "แสดงโฆษณานี้ให้น้อยลง"
   hide: "ไม่ต้องแสดง"
+  timezoneinfo: "วันในสัปดาห์นี้จะถูกกำหนดจากโซนเวลาของเซิร์ฟเวอร์"
 _forgotPassword:
   enterEmail: "ป้อนที่อยู่อีเมลที่คุณเคยใช้ในการลงทะเบียนไว้ ลิงก์ที่คุณสามารถรีเซ็ตรหัสผ่านได้นั้นจะถูกส่งไปนะ"
   ifNoEmail: "ถ้าหากคุณไม่ได้ใช้อีเมลระหว่างการลงทะเบียน กรุณาติดต่อผู้ดูแลระบบอินสแตนซ์แทนนะ"
@@ -1442,10 +1484,6 @@ _aboutMisskey:
   donate: "บริจาคให้กับ Misskey"
   morePatrons: "เราขอขอบคุณสำหรับความช่วยเหลือจากผู้ช่วยอื่นๆ ที่ไม่ได้ระบุไว้ที่นี่นะ ขอขอบคุณ! 🥰"
   patrons: "สมาชิกพันธมิตร"
-_nsfw:
-  respect: "ซ่อนสื่อ NSFW"
-  ignore: "อย่าซ่อนสื่อ NSFW"
-  force: "ซ่อนสื่อทั้งหมด"
 _instanceTicker:
   none: "ไม่ต้องแสดง"
   remote: "แสดงสำหรับผู้ใช้ระยะไกล"
@@ -1585,9 +1623,11 @@ _time:
   day: "วัน"
 _timelineTutorial:
   title: "วิธีใช้งาน Misskey"
+  step2_1: "มาลองโพสต์โน้ตต่อไปกัน คุณสามารถทำได้โดยการกดปุ่มที่มีไอคอนดินสอ"
+  step2_2: "ยังไงไหนลองเขียนแนะนำตัวเองหรือแค่ \"สวัสดี {name}!\" ถ้าคุณไม่รู้สึกเหมือนมัน?"
   step3_1: "เสร็จสิ้นการโพสต์โน้ตย่อแรกของคุณแล้วอย่างงั้นหรอ?"
   step3_2: "ไชโย! ตอนนี้โน้ตย่อแรกของคุณได้ปรากฏบนไทม์ไลน์ของคุณแล้วนะ"
-  step4_1: "คุณยังสามารถแนบ \"ปฏิกิริยา\" ไปกับโน้ตได้อีกด้วยนะค่ะ"
+  step4_1: "คุณสามารถเพิ่ม \"การตอบสนอง\" ในโน้ตได้"
   step4_2: "หากต้องการแนบการแสดงความรู้สึก ให้กดเครื่องหมาย \"+\" บนโน้ตแล้วเลือกอิโมจิที่คุณต้องการแสดงความรู้สึกที่ตนเองชอบได้เลย"
 _2fa:
   alreadyRegistered: "คุณได้ลงทะเบียนอุปกรณ์ยืนยันตัวตนแบบ 2 ชั้นแล้ว"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index 4f215bc98..1ac07ff9b 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -300,7 +300,6 @@ copyUrl: "Копіювати URL"
 rename: "Перейменувати"
 avatar: "Аватар"
 banner: "Банер"
-nsfw: "NSFW"
 whenServerDisconnected: "Коли зв’язок із сервером втрачено"
 disconnectedFromServer: "Зв’язок із сервером було перервано"
 reload: "Оновити"
@@ -1200,10 +1199,6 @@ _aboutMisskey:
   donate: "Пожертвувати Misskey"
   morePatrons: "Ми дуже цінуємо підтримку багатьох інших помічників, не перелічених тут. Дякуємо! 🥰"
   patrons: "Підтримали"
-_nsfw:
-  respect: "Приховувати NSFW медіа"
-  ignore: "Не приховувати NSFW медіа"
-  force: "Приховувати всі медіа файли"
 _instanceTicker:
   none: "Не відображати"
   remote: "Відображати для віддалених користувачів"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index d620d99d8..898c478bf 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -303,7 +303,6 @@ copyUrl: "Sao chép URL"
 rename: "Đổi tên"
 avatar: "Ảnh đại diện"
 banner: "Ảnh bìa"
-nsfw: "Nhạy cảm"
 whenServerDisconnected: "Khi mất kết nối tới máy chủ"
 disconnectedFromServer: "Mất kết nối tới máy chủ"
 reload: "Tải lại"
@@ -1212,10 +1211,6 @@ _aboutMisskey:
   donate: "Ủng hộ Misskey"
   morePatrons: "Chúng tôi cũng trân trọng sự hỗ trợ của nhiều người đóng góp khác không được liệt kê ở đây. Cảm ơn! 🥰"
   patrons: "Người ủng hộ"
-_nsfw:
-  respect: "Ẩn nội dung NSFW"
-  ignore: "Hiện nội dung NSFW"
-  force: "Ẩn mọi media"
 _instanceTicker:
   none: "Không hiển thị"
   remote: "Hiện cho người dùng từ máy chủ khác"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 313c254c7..7cf450213 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -52,8 +52,8 @@ addToList: "添加至列表"
 sendMessage: "发送"
 copyRSS: "复制RSS"
 copyUsername: "复制用户名"
-copyUserId: "复制用户ID"
-copyNoteId: "复制帖子ID"
+copyUserId: "复制用户 ID"
+copyNoteId: "复制帖子 ID"
 searchUser: "搜索用户"
 reply: "回复"
 loadMore: "查看更多"
@@ -71,7 +71,7 @@ export: "导出"
 files: "文件"
 download: "下载"
 driveFileDeleteConfirm: "要删除「{name}」文件吗？附加此文件的帖子也会被删除。"
-unfollowConfirm: "要取消对{name}的关注吗？"
+unfollowConfirm: "要取消对 {name} 的关注吗？"
 exportRequested: "导出请求已提交，这可能需要花一些时间，导出的文件将保存到网盘中。"
 importRequested: "导入请求已提交，这可能需要花一点时间。"
 lists: "列表"
@@ -136,8 +136,10 @@ unblockConfirm: "确定要解除拉黑吗？"
 suspendConfirm: "要冻结吗？"
 unsuspendConfirm: "要解除冻结吗？"
 selectList: "选择列表"
+editList: "编辑列表"
 selectChannel: "选择频道"
 selectAntenna: "选择天线"
+editAntenna: "编辑天线"
 selectWidget: "选择小工具"
 editWidgets: "编辑部件"
 editWidgetsExit: "完成编辑"
@@ -151,7 +153,7 @@ settingGuide: "推荐配置"
 cacheRemoteFiles: "缓存远程文件"
 cacheRemoteFilesDescription: "当禁用此设定时远程文件将直接从远程服务器载入。禁用后会减小储存空间需求，但是会增加流量，因为缩略图不会被生成。"
 flagAsBot: "这是一个机器人账号"
-flagAsBotDescription: "如果此账户由程序控制，请启用此项。启用后，此标志可以帮助其他开发人员防止机器人之间产生无限互动的行为，并让Misskey的内部系统将此账户识别为机器人。"
+flagAsBotDescription: "如果此账户由程序控制，请启用此项。启用后，此标志可以帮助其他开发人员防止机器人之间产生无限互动的行为，并让 Misskey 的内部系统将此账户识别为机器人。"
 flagAsCat: "将这个账户设定为一只猫"
 flagAsCatDescription: "如果您想表明此帐户是一只猫，请打开此标志。\n开启后，会在您的头像上出现猫耳朵，并将你的帖子中的「na」替换为「nya」，日文同理。"
 flagShowTimelineReplies: "在时间线上显示帖子的回复"
@@ -167,7 +169,7 @@ setWallpaper: "设置壁纸"
 removeWallpaper: "移除壁纸"
 searchWith: "搜索:{q}"
 youHaveNoLists: "列表为空"
-followConfirm: "你确定要关注{name}吗？"
+followConfirm: "你确定要关注 {name} 吗？"
 proxyAccount: "代理账户"
 proxyAccountDescription: "代理账户是在某些情况下充当用户的远程关注者的账户。 例如，当一个用户列出一个远程用户时，如果没有人跟随该列出的用户，则该活动将不会传递到该服务器，因此将代之以代理账户。"
 host: "主机名"
@@ -189,7 +191,7 @@ operations: "操作"
 software: "软件"
 version: "版本"
 metadata: "元数据"
-withNFiles: "{n}个文件"
+withNFiles: "{n} 个文件"
 monitor: "服务器状态"
 jobQueue: "作业队列"
 cpuAndMemory: "CPU和内存"
@@ -199,11 +201,11 @@ instanceInfo: "服务器信息"
 statistics: "统计"
 clearQueue: "清除队列"
 clearQueueConfirmTitle: "确定清除队列？"
-clearQueueConfirmText: "未送达的帖子将不会送达。 通常，您不需要这样做。"
+clearQueueConfirmText: "未送达的帖子将不会投递。 通常，您不需要这样做。"
 clearCachedFiles: "清除缓存"
 clearCachedFilesConfirm: "确定要清除缓存文件？"
-blockedInstances: "被阻拦的服务器"
-blockedInstancesDescription: "设定要阻拦的服务器，以换行来进行分割。被阻拦的服务器将无法与本服务器进行交换通讯。"
+blockedInstances: "被封锁的服务器"
+blockedInstancesDescription: "设定要封锁的服务器，以换行来进行分割。被封锁的服务器将无法与本服务器进行交换通讯。"
 muteAndBlock: "屏蔽/拉黑"
 mutedUsers: "已屏蔽用户"
 blockedUsers: "已拉黑的用户"
@@ -211,7 +213,7 @@ noUsers: "无用户"
 editProfile: "编辑资料"
 noteDeleteConfirm: "要删除该帖子吗？"
 pinLimitExceeded: "无法置顶更多了"
-intro: "Misskey的部署结束啦！填写管理员账号吧！"
+intro: "Misskey 的部署结束啦！创建管理员账号吧！"
 done: "完成"
 processing: "正在处理"
 preview: "预览"
@@ -238,11 +240,11 @@ newPasswordRetype: "重新输入密码："
 attachFile: "插入附件"
 more: "更多！"
 featured: "热门"
-usernameOrUserId: "用户名或用户ID"
+usernameOrUserId: "用户名或用户 ID"
 noSuchUser: "用户不存在"
 lookup: "查询"
 announcements: "公告"
-imageUrl: "图片URL"
+imageUrl: "图片 URL"
 remove: "删除"
 removed: "已删除"
 removeAreYouSure: "要删掉「{x}」吗？"
@@ -256,15 +258,15 @@ keepOriginalUploadingDescription: "上传图片时保留原始图片。关闭时
 fromDrive: "从网盘中"
 fromUrl: "从 URL"
 uploadFromUrl: "从网址上传"
-uploadFromUrlDescription: "输入文件的URL"
+uploadFromUrlDescription: "输入文件的 URL"
 uploadFromUrlRequested: "请求上传"
 uploadFromUrlMayTakeTime: "上传可能需要一些时间完成。"
 explore: "发现"
 messageRead: "已读"
 noMoreHistory: "没有更多的历史记录"
 startMessaging: "添加聊天"
-nUsersRead: "{n}人已读"
-agreeTo: "勾选则表示已阅读并同意{0}"
+nUsersRead: "{n} 人已读"
+agreeTo: "勾选则表示已阅读并同意 {0}"
 agree: "同意"
 agreeBelow: "同意以下内容"
 basicNotesBeforeCreateAccount: "基本注意事项"
@@ -305,13 +307,12 @@ unableToDelete: "无法删除"
 inputNewFileName: "请输入新文件名"
 inputNewDescription: "请输入新标题"
 inputNewFolderName: "请输入新文件夹名"
-circularReferenceFolder: "目标文件夹是您要移动的文件夹的子文件夹。"
+circularReferenceFolder: "目标文件夹是要移动的文件夹的子文件夹。"
 hasChildFilesOrFolders: "此文件夹中有文件，无法删除。"
 copyUrl: "复制链接"
 rename: "重命名"
 avatar: "头像"
 banner: "横幅"
-nsfw: "敏感内容"
 whenServerDisconnected: "与服务器连接中断时"
 disconnectedFromServer: "已和服务器断开连接"
 reload: "重新加载"
@@ -326,7 +327,7 @@ instanceName: "服务器名称"
 instanceDescription: "服务器简介"
 maintainerName: "管理员名称"
 maintainerEmail: "管理员电子邮箱"
-tosUrl: "服务条款URL"
+tosUrl: "服务条款 URL"
 thisYear: "今年"
 thisMonth: "本月"
 today: "今天"
@@ -337,49 +338,49 @@ pages: "页面"
 integration: "关联"
 connectService: "连接"
 disconnectService: "断开连接"
-enableLocalTimeline: "启用本地时间线功能"
+enableLocalTimeline: "启用本地时间线"
 enableGlobalTimeline: "启用全局时间线"
-disablingTimelinesInfo: "即使时间线功能被禁用，出于方便，管理员和数据图表也可以继续使用。"
+disablingTimelinesInfo: "即使时间线功能被禁用，出于方便，管理员和协作者也可以继续使用。"
 registration: "注册"
 enableRegistration: "允许任何人注册"
 invite: "邀请"
-driveCapacityPerLocalAccount: "每个用户的网盘空间"
+driveCapacityPerLocalAccount: "每个用户的网盘容量"
 driveCapacityPerRemoteAccount: "每个远程用户的网盘容量"
 inMb: "以兆字节(MegaByte)为单位"
-iconUrl: "图标URL"
-bannerUrl: "横幅URL"
-backgroundImageUrl: "背景图URL"
+iconUrl: "图标 URL"
+bannerUrl: "横幅 URL"
+backgroundImageUrl: "背景图 URL"
 basicInfo: "基本信息"
 pinnedUsers: "置顶用户"
-pinnedUsersDescription: "在「发现」页面中使用换行标记想要置顶的用户。"
+pinnedUsersDescription: "输入您想要固定到“发现”页面的用户，一行一个。"
 pinnedPages: "固定页面"
-pinnedPagesDescription: "输入您要固定到服务器首页的页面路径，以换行符分隔。"
-pinnedClipId: "置顶的便签ID"
+pinnedPagesDescription: "输入您要固定到服务器首页的页面路径，一行一个。"
+pinnedClipId: "置顶的便签 ID"
 pinnedNotes: "已置顶的帖子"
 hcaptcha: "hCaptcha"
 enableHcaptcha: "启用 hCaptcha"
 hcaptchaSiteKey: "网站密钥"
-hcaptchaSecretKey: "密钥"
+hcaptchaSecretKey: "hCaptcha 密钥(SecretKey)"
 recaptcha: "reCAPTCHA"
 enableRecaptcha: "启用 reCAPTCHA\n(请注意, 此功能在中国大陆不可用. 如果启用, 可能导致无法正常使用登录或注册等功能)"
 recaptchaSiteKey: "网站密钥"
 recaptchaSecretKey: "reCAPTCHA 密钥(SecretKey)"
 turnstile: "Turnstile"
-enableTurnstile: "启用Turnstile"
+enableTurnstile: "启用 Turnstile"
 turnstileSiteKey: "网站密钥"
 turnstileSecretKey: "Turnstile 密钥(SecretKey)"
-avoidMultiCaptchaConfirm: "使用多种验证方式可能会造成干扰，您要禁用其他验证方式吗？您可以按“取消”按钮，仍然保持启用多种验证方式。"
+avoidMultiCaptchaConfirm: "使用多种验证方式可能会造成干扰，您要禁用其他验证方式吗？您可以按“取消”按钮，继续保持启用多种验证方式。"
 antennas: "天线"
 manageAntennas: "天线管理"
 name: "名称"
 antennaSource: "接收来源"
 antennaKeywords: "包含关键字"
 antennaExcludeKeywords: "排除关键字"
-antennaKeywordsDescription: "使用空格分隔会产生AND规范，并且使用换行符分隔会产生OR规范"
+antennaKeywordsDescription: "AND 条件用空格分隔，OR 条件用换行符分隔。"
 notifyAntenna: "开启通知"
 withFileAntenna: "仅带有附件的帖子"
-enableServiceworker: "启用ServiceWorker"
-antennaUsersDescription: "指定用户名，用换行符分隔"
+enableServiceworker: "启用 ServiceWorker"
+antennaUsersDescription: "指定用户名，一行一个"
 caseSensitive: "区分大小写"
 withReplies: "包括回复"
 connectedTo: "您的账号已连到接以下第三方账号"
@@ -393,7 +394,7 @@ popularUsers: "热门用户"
 recentlyUpdatedUsers: "最近投稿的用户"
 recentlyRegisteredUsers: "最近登录的用户"
 recentlyDiscoveredUsers: "最近发现的用户"
-exploreUsersCount: "有{count}个用户"
+exploreUsersCount: "有 {count} 个用户"
 exploreFediverse: "探索联邦宇宙"
 popularTags: "热门标签"
 userList: "列表"
@@ -413,13 +414,13 @@ lastUsed: "最后使用："
 lastUsedAt: "最后使用: {t}"
 unregister: "删除账户"
 passwordLessLogin: "无密码登录"
-passwordLessLoginDescription: "不使用密码，仅使用安全密钥或Passkey登录"
+passwordLessLoginDescription: "不使用密码，仅使用安全密钥或 Passkey 登录"
 resetPassword: "重置密码"
 newPasswordIs: "新的密码是「{password}」"
 reduceUiAnimation: "减少UI动画"
 share: "分享"
 notFound: "未找到"
-notFoundDescription: "没有与指定URL对应的页面。"
+notFoundDescription: "没有与指定 URL 对应的页面。"
 uploadFolder: "默认上传文件夹"
 cacheClear: "清空缓存"
 markAsReadAllNotifications: "将所有通知标为已读"
@@ -436,7 +437,7 @@ text: "文本"
 enable: "启用"
 next: "下一个"
 retype: "重新输入"
-noteOf: "{user}的帖子"
+noteOf: "{user} 的帖子"
 quoteAttached: "已引用"
 quoteQuestion: "是否引用此链接内容？"
 noMessagesYet: "现在没有新的聊天"
@@ -468,8 +469,8 @@ disableDrawer: "不显示抽屉菜单"
 showNoteActionsOnlyHover: "仅在悬停时显示帖子操作"
 noHistory: "没有历史记录"
 signinHistory: "登录历史"
-enableAdvancedMfm: "启用扩展MFM"
-enableAnimatedMfm: "启用MFM动画"
+enableAdvancedMfm: "启用扩展 MFM"
+enableAnimatedMfm: "启用 MFM 动画"
 doing: "正在进行"
 category: "类别"
 tags: "标签"
@@ -479,7 +480,7 @@ existingAccount: "现有的账户"
 regenerate: "重新生成"
 fontSize: "字体大小"
 mediaListWithOneImageAppearance: "仅一张图片的媒体列表高度"
-limitTo: "上限为{x}"
+limitTo: "上限为 {x}"
 noFollowRequests: "没有关注申请"
 openImageInNewTab: "在新标签页中打开图片"
 dashboard: "管理面板"
@@ -499,20 +500,20 @@ showFeaturedNotesInTimeline: "在时间线上显示热门推荐"
 objectStorage: "对象存储"
 useObjectStorage: "使用对象存储"
 objectStorageBaseUrl: "Base URL"
-objectStorageBaseUrlDesc: "这里是用于参考的URL，如果您正在使用CDN或反向代理，请指定其URL，例如S3：“https://<bucket>.s3.amazonaws.com”，GCS：“https://storage.googleapis.com/<bucket>”"
+objectStorageBaseUrlDesc: "这里是用于引用的 URL，如果您正在使用 CDN 或反向代理，请指定其 URL，例如S3：“https://<bucket>.s3.amazonaws.com”，GCS：“https://storage.googleapis.com/<bucket>”"
 objectStorageBucket: "存储桶"
 objectStorageBucketDesc: "请指定使用的对象存储服务的存储桶名称。"
 objectStoragePrefix: "前缀"
 objectStoragePrefixDesc: "文件将存储在此前缀的目录下。"
-objectStorageEndpoint: "端点"
-objectStorageEndpointDesc: "如果你使用AWS S3请留空。否则请根据你使用的服务商的说明来进行设置，指定端点形式为“<host>”或“<host>:<port>”。"
+objectStorageEndpoint: "Endpoint"
+objectStorageEndpointDesc: "如果你使用 AWS S3 请留空。否则请根据你使用的服务商的说明来进行设置，指定 Endpoint 形式为“<host>”或“<host>:<port>”。"
 objectStorageRegion: "可用区"
-objectStorageRegionDesc: "指定一个可用区，例如“xx-east-1”。 如果您的对象存储服务没有可用区概念，请将其留空或填写“us-east-1”。"
-objectStorageUseSSL: "使用SSL"
-objectStorageUseSSLDesc: "如果不使用https进行API连接，请关闭。"
+objectStorageRegionDesc: "指定一个可用区，例如“xx-east-1”。 如果您的对象存储服务没有可用区概念，请将其留空或填写“us-east-1”。如果引用 AWS 的配置文件或环境变量，则留空。"
+objectStorageUseSSL: "使用 SSL"
+objectStorageUseSSLDesc: "如果不使用 https 进行 API 连接，请关闭。"
 objectStorageUseProxy: "使用代理"
-objectStorageUseProxyDesc: "如果您不使用代理进行API连接，请将其关闭。"
-objectStorageSetPublicRead: "上传时设置为public-read"
+objectStorageUseProxyDesc: "如果您不使用代理进行 API 连接，请将其关闭。"
+objectStorageSetPublicRead: "上传时设置为 public-read"
 s3ForcePathStyleDesc: "启用 s3ForcePathStyle 会强制将存储桶名称指定为 URL 中路径的一部分，而不是主机名。使用自托管 Minio 等时可能需要启用。"
 serverLogs: "服务器日志"
 deleteAll: "全部删除"
@@ -541,8 +542,8 @@ state: "状态"
 sort: "排序"
 ascendingOrder: "升序"
 descendingOrder: "降序"
-scratchpad: "AiScript控制台"
-scratchpadDescription: "AiScript控制台为AiScript提供了实验环境。您可以编写代码以与Misskey交互，运行它并查看结果。"
+scratchpad: "AiScript 控制台"
+scratchpadDescription: "AiScript 控制台为 AiScript 提供了实验环境。您可以编写代码与 Misskey 交互，运行并查看结果。"
 output: "输出"
 script: "脚本"
 disablePagesScript: "禁用页面脚本"
@@ -550,7 +551,7 @@ updateRemoteUser: "更新远程用户信息"
 deleteAllFiles: "删除所有文件"
 deleteAllFilesConfirm: "要删除所有文件吗？"
 removeAllFollowing: "取消所有关注"
-removeAllFollowingDescription: "取消{host}的所有关注者。当服务器不再存在时执行。"
+removeAllFollowingDescription: "取消 {host} 的所有关注者。当服务器不再存在时执行。"
 userSuspended: "该用户已被冻结。"
 userSilenced: "该用户已被禁言。"
 yourAccountSuspendedTitle: "账户已被冻结"
@@ -587,7 +588,7 @@ manage: "管理"
 plugins: "插件"
 preferencesBackups: "备份设置"
 deck: "Deck"
-undeck: "取消Deck"
+undeck: "取消 Deck"
 useBlurEffectForModal: "对话框使用模糊效果"
 useFullReactionPicker: "使用全功能的回应工具栏"
 width: "宽度"
@@ -600,7 +601,7 @@ permission: "权限"
 enableAll: "启用全部"
 disableAll: "禁用全部"
 tokenRequested: "允许访问账户"
-pluginTokenRequestedDescription: "此插件将能够拥有此处设置的权限"
+pluginTokenRequestedDescription: "此插件将能够拥有这里设置的权限"
 notificationType: "通知类型"
 edit: "编辑"
 emailServer: "邮件服务器"
@@ -608,20 +609,20 @@ enableEmail: "启用发送邮件功能"
 emailConfigInfo: "用于确认电子邮件和密码重置"
 email: "邮箱"
 emailAddress: "电子邮件地址"
-smtpConfig: "SMTP服务器设置"
+smtpConfig: "SMTP 服务器设置"
 smtpHost: "主机名"
 smtpPort: "端口"
 smtpUser: "用户名"
 smtpPass: "密码"
-emptyToDisableSmtpAuth: "用户名和密码留空可以禁用SMTP验证"
+emptyToDisableSmtpAuth: "用户名和密码留空可以禁用 SMTP 验证"
 smtpSecure: "在 SMTP 连接中使用隐式 SSL / TLS"
-smtpSecureInfo: "使用STARTTLS时关闭。"
+smtpSecureInfo: "使用 STARTTLS 时关闭。"
 testEmail: "邮件发送测试"
 wordMute: "文字屏蔽"
 regexpError: "正则表达式错误"
 regexpErrorDescription: "{tab} 屏蔽文字的第 {line} 行的正则表达式有错误："
 instanceMute: "被屏蔽的服务器"
-userSaysSomething: "{name}说了什么,但是被屏蔽词过滤了"
+userSaysSomething: "{name} 说了什么,但是被屏蔽词过滤了"
 makeActive: "启用"
 display: "显示"
 copy: "复制"
@@ -640,19 +641,19 @@ other: "其他"
 regenerateLoginToken: "重新生成登录令牌"
 regenerateLoginTokenDescription: "重新生成用于登录的内部令牌。通常您不需要这样做。重新生成后，您将在所有设备上登出。"
 setMultipleBySeparatingWithSpace: "您可以使用空格分隔多个项目。"
-fileIdOrUrl: "文件ID或者URL"
+fileIdOrUrl: "文件 ID 或者 URL"
 behavior: "行为"
 sample: "示例"
 abuseReports: "举报"
 reportAbuse: "举报"
-reportAbuseOf: "举报{name}"
-fillAbuseReportDescription: "请填写举报的详细原因。如果有对方发的帖子，请同时填写URL地址。"
+reportAbuseOf: "举报 {name}"
+fillAbuseReportDescription: "请填写举报的详细原因。如果有对方发的帖子，请同时填写 URL 地址。"
 abuseReported: "内容已发送。感谢您提交信息。"
 reporter: "举报者"
 reporteeOrigin: "举报来源"
 reporterOrigin: "举报者来源"
 forwardReport: "将该举报信息转发给远程服务器"
-forwardReportIsAnonymous: "勾选则在远程服务器上显示的举报者是匿名的系统账号，而不是您的账号。"
+forwardReportIsAnonymous: "在远程实例上显示的报告者是匿名的系统账号，而不是您的账号。"
 send: "发送"
 abuseMarkAsResolved: "处理完毕"
 openInNewTab: "在新标签页中打开"
@@ -660,7 +661,7 @@ openInSideView: "在侧边栏中打开"
 defaultNavigationBehaviour: "默认导航"
 editTheseSettingsMayBreakAccount: "编辑这些设置可以会损坏您的账号"
 instanceTicker: "帖子的服务器来源"
-waitingFor: "等待{x}"
+waitingFor: "等待 {x}"
 random: "随机"
 system: "系统"
 switchUi: "切换界面"
@@ -670,9 +671,9 @@ createNew: "新建"
 optional: "可选"
 createNewClip: "新建便签"
 unclip: "移除便签"
-confirmToUnclipAlreadyClippedNote: "本帖已包含在便签\"{name}\"里。您想要将本帖从该便签中移除吗？"
+confirmToUnclipAlreadyClippedNote: "本帖已包含在便签 \"{name}\" 里。您想要将本帖从该便签中移除吗？"
 public: "公开"
-i18nInfo: "Misskey已经被志愿者们翻译成了各种语言。如果你也有兴趣，可以通过{link}帮助翻译。"
+i18nInfo: "Misskey 已经被志愿者们翻译成了各种语言。如果你也有兴趣，可以通过 {link} 帮助翻译。"
 manageAccessTokens: "管理 Access Tokens"
 accountInfo: "账户信息"
 notesCount: "帖子数量"
@@ -718,14 +719,14 @@ center: "中央"
 wide: "宽"
 narrow: "窄"
 reloadToApplySetting: "页面刷新后设置才会生效。是否现在刷新页面？"
-needReloadToApply: "重启后应用才会生效。"
+needReloadToApply: "重新载入后应用才会生效。"
 showTitlebar: "显示标题栏"
 clearCache: "清除缓存"
-onlineUsersCount: "{n}人在线"
-nUsers: "{n}用户"
-nNotes: "{n}帖子"
+onlineUsersCount: "{n} 人在线"
+nUsers: "{n} 用户"
+nNotes: "{n}  帖子"
 sendErrorReports: "发送错误报告"
-sendErrorReportsDescription: "启用后，如果出现问题，可以与Misskey共享详细的错误信息，从而帮助提高软件的质量。"
+sendErrorReportsDescription: "启用后，如果出现问题，可以与 Misskey 共享详细的错误信息，从而帮助提高软件的质量。错误信息包括操作系统版本、浏览器类型、行为历史记录等。"
 myTheme: "我的主题"
 backgroundColor: "背景"
 accentColor: "强调色"
@@ -755,7 +756,7 @@ emailNotification: "邮件通知"
 publish: "发布"
 inChannelSearch: "频道内搜索"
 useReactionPickerForContextMenu: "单击右键打开回应工具栏"
-typingUsers: "{users}正在输入"
+typingUsers: "{users} 正在输入"
 jumpToSpecifiedDate: "跳转到特定日期"
 showingPastTimeline: "显示过去的时间线"
 clear: "清除"
@@ -789,7 +790,7 @@ administration: "管理"
 accounts: "账户"
 switch: "切换"
 noMaintainerInformationWarning: "管理人员信息未设置。"
-noBotProtectionWarning: "Bot保护未设置。"
+noBotProtectionWarning: "Bot 防御未设置。"
 configure: "设置"
 postToGallery: "发送到图库"
 postToHashtag: "投稿到这个标签"
@@ -817,9 +818,9 @@ received: "收取"
 searchResult: "搜索结果"
 hashtags: "话题标签"
 troubleshooting: "故障排除"
-useBlurEffect: "在UI上使用模糊效果"
+useBlurEffect: "在 UI 上使用模糊效果"
 learnMore: "更多信息"
-misskeyUpdated: "Misskey更新完成！"
+misskeyUpdated: "Misskey 更新完成！"
 whatIsNew: "显示更新信息"
 translate: "翻译"
 translatedFrom: "从 {x} 翻译"
@@ -828,7 +829,7 @@ usernameInfo: "在服务器上唯一标识您的帐户的名称。您可以使
 aiChanMode: "小蓝模式"
 devMode: "开发者模式"
 keepCw: "回复时维持隐藏内容"
-pubSub: "Pub/Sub账户"
+pubSub: "Pub/Sub 账户"
 lastCommunication: "最近通信"
 resolved: "已解决"
 unresolved: "未解决"
@@ -853,7 +854,7 @@ ffVisibilityDescription: "您可以设置您的关注/关注者信息的公开
 continueThread: "查看更多帖子"
 deleteAccountConfirm: "将要删除账户。是否确认？"
 incorrectPassword: "密码错误"
-voteConfirm: "确定投给“{choice}” ？"
+voteConfirm: "确定投给 “{choice}” ？"
 hide: "隐藏"
 useDrawerReactionPickerForMobile: "在移动设备上使用抽屉显示"
 welcomeBackWithName: "欢迎回来，{name}"
@@ -868,30 +869,30 @@ numberOfColumn: "列数"
 searchByGoogle: "Google"
 instanceDefaultLightTheme: "服务器默认浅色主题"
 instanceDefaultDarkTheme: "服务器默认深色主题"
-instanceDefaultThemeDescription: "以对象格式键入主题代码"
+instanceDefaultThemeDescription: "以对象格式输入主题代码"
 mutePeriod: "屏蔽期限"
 period: "截止时间"
 indefinitely: "永久"
-tenMinutes: "10分钟"
-oneHour: "1小时"
-oneDay: "1天"
-oneWeek: "1周"
+tenMinutes: "10 分钟"
+oneHour: "1 小时"
+oneDay: "1 天"
+oneWeek: "1 周"
 oneMonth: "1 个月"
 reflectMayTakeTime: "可能需要一些时间才能体现出效果。"
 failedToFetchAccountInformation: "获取账户信息失败"
-rateLimitExceeded: "已超過速率限制"
-cropImage: "剪裁图像"
+rateLimitExceeded: "已超过速率限制"
+cropImage: "裁剪图像"
 cropImageAsk: "是否要裁剪图像？"
 cropYes: "去裁剪"
 cropNo: "就这样吧！"
 file: "文件"
-recentNHours: "最近{n}小时"
-recentNDays: "最近{n}天"
+recentNHours: "最近 {n} 小时"
+recentNDays: "最近 {n} 天"
 noEmailServerWarning: "电子邮件服务器未设置。"
 thereIsUnresolvedAbuseReportWarning: "有未解决的报告"
 recommended: "推荐"
 check: "检查"
-driveCapOverrideLabel: "變更此用戶的雲端硬碟容量上限"
+driveCapOverrideLabel: "更改此用户的网盘容量上限"
 driveCapOverrideCaption: "设定为 0 以下则会解除此限制。"
 requireAdminForView: "需要使用管理员账户登录才能查看。"
 isSystemAccount: "该账号由系统自动创建和管理。"
@@ -899,7 +900,7 @@ typeToConfirm: "输入 {x} 以确认操作。"
 deleteAccount: "删除账户"
 document: "文档"
 numberOfPageCache: "缓存页数"
-numberOfPageCacheDescription: "设置较高的值会更方便用户，但服务器负载和内存使用量会增加。"
+numberOfPageCacheDescription: "设置较高的值会更方便用户，但设备的负载和内存使用量会增加。"
 logoutConfirm: "是否确认登出？"
 lastActiveDate: "最后活跃时间"
 statusbar: "状态栏"
@@ -921,7 +922,7 @@ cannotUploadBecauseNoFreeSpace: "因为已无可用空间，无法上传。"
 cannotUploadBecauseExceedsFileSizeLimit: "无法上传文件，超过文件大小限制。"
 beta: "测试"
 enableAutoSensitive: "自动 NSFW 识别"
-enableAutoSensitiveDescription: "如果可用，请使用机器学习在媒体上自动设置 NSFW 标志。即使关闭此功能，也可能会根据服务器自动设置。"
+enableAutoSensitiveDescription: "使用机器学习在可用时自动使用 NSFW 标记来标记媒体。即使您关闭此功能，根据服务器的不同，它仍然可能会自动设置。"
 activeEmailValidationDescription: "开启用户的电子邮件地址验证，判断它是一次性的电子邮件地址，还是可以实际通信的地址。关闭时，则只检查字符串是否正确。"
 navbar: "导航栏"
 shuffle: "随机"
@@ -938,7 +939,7 @@ windowMaximize: "最大化"
 windowMinimize: "最小化"
 windowRestore: "还原"
 caption: "标题"
-loggedInAsBot: "以Bot账户登录"
+loggedInAsBot: "以 Bot 账户登录"
 tools: "工具"
 cannotLoad: "无法加载"
 numberOfProfileView: "个人资料展示次数"
@@ -948,8 +949,8 @@ numberOfLikes: "点赞数"
 show: "显示"
 neverShow: "不再显示"
 remindMeLater: "稍后提醒我"
-didYouLikeMisskey: "您喜欢Misskey吗？"
-pleaseDonate: "Misskey是{host}所使用的免费软件。为了今后也能够维持Misskey的开发，请在有余力的情况下进行捐助！"
+didYouLikeMisskey: "您喜欢 Misskey 吗？"
+pleaseDonate: "Misskey 是 {host} 所使用的免费软件。为了今后也能够维持 Misskey 的开发，请在有余力的情况下进行捐助！"
 roles: "角色"
 role: "角色"
 noRole: "角色不存在"
@@ -963,11 +964,11 @@ youCannotCreateAnymore: "抱歉，您无法再创建更多了。"
 cannotPerformTemporary: "暂时不可用"
 cannotPerformTemporaryDescription: "因操作过于频繁，暂时不可用，请稍后再试。"
 invalidParamError: "参数错误"
-invalidParamErrorDescription: "请求参数出现问题。通常是因为bug造成的，但也可能是输入文字数量过多之类的原因。"
+invalidParamErrorDescription: "请求参数出现问题。通常是因为 bug 造成的，但也可能是输入文字数量过多之类的原因。"
 permissionDeniedError: "操作被拒绝"
 permissionDeniedErrorDescription: "本账户没有执行该操作的权限。"
-preset: "預設值"
-selectFromPresets: "從預設值中選擇"
+preset: "预设值"
+selectFromPresets: "从预设值中选择"
 achievements: "成就"
 gotInvalidResponseError: "服务器无应答"
 gotInvalidResponseErrorDescription: "您的网络连接可能出现了问题, 或是远程服务器暂时不可用. 请稍后重试。"
@@ -998,7 +999,7 @@ rolesAssignedToMe: "指派给自己的角色"
 resetPasswordConfirm: "确定重置密码？"
 sensitiveWords: "敏感词"
 sensitiveWordsDescription: "将包含设置词的帖子的可见范围设置为首页。可以通过用换行符分隔来设置多个。"
-sensitiveWordsDescription2: "用空格分割关键词作为AND格式，用斜线包裹关键字来构成正则表达式。"
+sensitiveWordsDescription2: "AND 条件用空格分隔，正则表达式用斜线包裹。"
 notesSearchNotAvailable: "帖子检索不可用"
 license: "许可信息"
 unfavoriteConfirm: "确定要取消收藏吗？"
@@ -1011,7 +1012,7 @@ enableChartsForRemoteUser: "生成远程用户的图表"
 enableChartsForFederatedInstances: "生成远程服务器的图表"
 showClipButtonInNoteFooter: "在贴文下方显示便签按钮"
 largeNoteReactions: "使用大图标来显示回应"
-noteIdOrUrl: "帖子ID或URL"
+noteIdOrUrl: "帖子 ID 或 URL"
 video: "视频"
 videos: "视频"
 dataSaver: "省流量模式"
@@ -1041,14 +1042,14 @@ preservedUsernames: "保留的用户名"
 preservedUsernamesDescription: "列出需要保留的用户名，使用换行来作为分割。被指定的用户名在建立账户时无法使用，但由管理员所创建的账户不受该限制。此外，现有的账户也不会受到影响。"
 createNoteFromTheFile: "从文件创建帖子"
 archive: "归档"
-channelArchiveConfirmTitle: "要将{name}归档吗？"
+channelArchiveConfirmTitle: "要将 {name} 归档吗？"
 channelArchiveConfirmDescription: "归档后，在频道列表与搜索结果中不会显示，也无法发布新的贴文。"
 thisChannelArchived: "该频道已被归档。"
 displayOfNote: "显示帖子"
 initialAccountSetting: "初始设置"
 youFollowing: "正在关注"
-preventAiLearning: "拒绝接受生成式AI的学习"
-preventAiLearningDescription: "要求文章生成AI或图像生成AI不能够以发布的帖子和图像等内容作为学习对象。这是通过在HTML响应中包含noai标志来实现的，这不能完全阻止AI学习你的发布内容，并不是所有AI都会遵守这类请求。"
+preventAiLearning: "拒绝接受生成式 AI 的学习"
+preventAiLearningDescription: "要求文章生成 AI 或图像生成 AI 不能够以发布的帖子和图像等内容作为学习对象。这是通过在 HTML 响应中包含 noai 标志来实现的，这不能完全阻止 AI 学习你的发布内容，并不是所有 AI 都会遵守这类请求。"
 options: "选项"
 specifyUser: "用户指定"
 failedToPreviewUrl: "无法预览"
@@ -1059,9 +1060,12 @@ rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn: "角色必须是公开的
 cancelReactionConfirm: "要取消回应吗？"
 changeReactionConfirm: "要更改回应吗？"
 later: "一会再说"
-goToMisskey: "去往Misskey"
+goToMisskey: "去往 Misskey"
 additionalEmojiDictionary: "表情符号追加字典"
 installed: "已安装"
+branding: "品牌"
+enableServerMachineStats: "公开服务器硬件统计信息"
+enableIdenticonGeneration: "启用生成用户 Identicon"
 _initialAccountSetting:
   accountCreated: "账户创建完成了！"
   letsStartAccountSetup: "来进行帐户的初始设置吧。"
@@ -1071,10 +1075,10 @@ _initialAccountSetting:
   theseSettingsCanEditLater: "也可以在稍后修改这里的设置。"
   youCanEditMoreSettingsInSettingsPageLater: "还可以在「设置」页面进行其它各种设置，稍后就来确认一下看看吧。"
   followUsers: "为了建立属于你自己的时间线，试着去关注你感兴趣的用户吧。"
-  pushNotificationDescription: "启用推送通知的话，就可以在设备上受到来自{name}的通知了。"
+  pushNotificationDescription: "启用推送通知的话，就可以在设备上接收来自 {name} 的通知了。"
   initialAccountSettingCompleted: "初始设定已经完成了！"
-  haveFun: "希望{name}在这里玩得开心！"
-  ifYouNeedLearnMore: "关于{name}(Misskey)的使用方法，详见{link}。"
+  haveFun: "希望 {name} 在这里玩得开心！"
+  ifYouNeedLearnMore: "关于 {name}(Misskey) 的使用方法，详见 {link}。"
   skipAreYouSure: "要跳过初始设置吗？"
   laterAreYouSure: "要稍后再进行初始设定吗？"
 _serverRules:
@@ -1083,16 +1087,16 @@ _accountMigration:
   moveFrom: "从别的账号迁移到此账户"
   moveFromSub: "为另一个账户建立别名"
   moveFromLabel: "迁移前的账户"
-  moveFromDescription: "如果迁移时需要继承其他账户的关注者，请在此创造别名。此操作需要在实行迁移之前完成！请如已下输入需要迁移的账户：@person@instance.com"
+  moveFromDescription: "如果迁移时需要继承其他账户的关注者，你需要创建一个别名。此操作需要在迁移前完成！\n请像这样输入要迁移的账户：@username@server.example.com\n如果要删除，请将输入字段留空，并保存（不推荐）。"
   moveTo: "把这个账户迁移到新的账户"
   moveToLabel: "迁移后的账户"
   moveCannotBeUndone: "一旦迁移账户，就无法撤销。"
-  moveAccountDescription: "此操作无法取消。请先确认您已在迁移后的账户上，为此账户创造了别名。创造别名后，请如以下输入您的迁移后的账户：@person@instance.com"
+  moveAccountDescription: "\n迁移到新帐户。\n　・现有的关注者自动关注新帐户\n　・此帐户的所有关注者都将被删除\n　・您将无法再使用此帐户发帖。\n关注者迁移是自动的，但关注中迁移必须手动完成。请在迁移前在此帐户上导出关注列表，并在迁移后立即在目标帐户上执行导入。\n屏蔽列表也是如此，因此您必须手动迁移它。\n（此描述适用于该服务器（Misskey v13.12.0 或更高版本）。其他 ActivityPub 软件（例如 Mastodon）的行为可能有所不同。）"
   moveAccountHowTo: "要进行账户迁移，请现在目标账户中为此账户建立一个别名。\n建立别名后，请像这样输入目标账户：@username@server.example.com"
   startMigration: "迁移"
-  migrationConfirm: "确定要把此账户迁移到{account}吗？一旦确定后，此操作无法取消，此账户也无法以原来的状态使用。\n同时，请确认迁移后的账户，已创造别名。"
+  migrationConfirm: "确定要把此账户迁移到 {account} 吗？一旦确定后，此操作无法取消，此账户也无法以原来的状态使用。\n同时，请确认迁移后的账户，已创造别名。"
   movedAndCannotBeUndone: "该账户已被迁移。\n迁移操作无法撤销。"
-  postMigrationNote: "这个账户的关注会在迁移操作后的24小时后解除。该账户的「关注中」和「关注者」皆会变为0。由于不会解除关注关系，你的关注者仍然可以继续查看该账户发补给关注者的帖子。"
+  postMigrationNote: "这个账户的关注会在迁移操作后的 24 小时后解除。该账户的「关注中」和「关注者」皆会变为 0。由于不会解除关注关系，你的关注者仍然可以继续查看该账户发补给关注者的帖子。"
   movedTo: "迁移后的账户"
 _achievements:
   earnedAt: "达成时间"
@@ -1100,103 +1104,103 @@ _achievements:
     _notes1:
       title: "初来乍到"
       description: "第一次发帖"
-      flavor: "祝您在Misskey玩的愉快～"
+      flavor: "祝您在 Misskey 玩的愉快～"
     _notes10:
       title: "一些帖子"
-      description: "发布了10篇帖子"
+      description: "发布了 10 篇帖子"
     _notes100:
       title: "很多帖子"
-      description: "发布了100篇帖子"
+      description: "发布了 100 篇帖子"
     _notes500:
       title: "满是帖子"
-      description: "发布了500篇帖子"
+      description: "发布了 500 篇帖子"
     _notes1000:
       title: "积帖成山"
-      description: "发布了1,000篇帖子"
+      description: "发布了 1,000 篇帖子"
     _notes5000:
       title: "帖如泉涌"
-      description: "发布了5,000篇帖子"
+      description: "发布了 5,000 篇帖子"
     _notes10000:
       title: "超级帖"
-      description: "发布了10,000篇帖子"
+      description: "发布了 10,000 篇帖子"
     _notes20000:
       title: "还想要更多帖子"
-      description: "发布了20,000篇帖子"
+      description: "发布了 20,000 篇帖子"
     _notes30000:
       title: "帖子帖子帖子"
-      description: "发布了30,000篇帖子"
+      description: "发布了 30,000 篇帖子"
     _notes40000:
       title: "帖子工厂"
-      description: "发布了40,000篇帖子"
+      description: "发布了 40,000 篇帖子"
     _notes50000:
       title: "帖子星球"
-      description: "发布了50,000篇帖子"
+      description: "发布了 50,000 篇帖子"
     _notes60000:
       title: "帖子类星体"
-      description: "发布了60,000篇帖子"
+      description: "发布了 60,000 篇帖子"
     _notes70000:
       title: "帖子黑洞"
-      description: "发布了70,000篇帖子"
+      description: "发布了 70,000 篇帖子"
     _notes80000:
       title: "帖子星系"
-      description: "发布了80,000篇帖子"
+      description: "发布了 80,000 篇帖子"
     _notes90000:
       title: "帖子起源"
-      description: "发布了90,000篇帖子"
+      description: "发布了 90,000 篇帖子"
     _notes100000:
       title: "ALL YOUR NOTE ARE BELONG TO US"
-      description: "发布了100,000篇帖子"
+      description: "发布了 100,000 篇帖子"
       flavor: "真的有那么多可以写的东西吗？"
     _login3:
       title: "初学者 I"
-      description: "连续登录3天"
-      flavor: "今天开始我就是Misskist！"
+      description: "连续登录 3 天"
+      flavor: "今天开始我就是 Misskist！"
     _login7:
       title: "初学者 II"
-      description: "连续登录7天"
+      description: "连续登录 7 天"
       flavor: "您开始习惯了吗？"
     _login15:
       title: "初学者 III"
-      description: "连续登录15天"
+      description: "连续登录 15 天"
     _login30:
       title: "Misskist Ⅰ"
-      description: "连续登录30天"
+      description: "连续登录 30 天"
     _login60:
       title: "Misskist Ⅱ"
-      description: "连续登录60天"
+      description: "连续登录 60 天"
     _login100:
       title: "Misskist Ⅲ"
-      description: "总登入100天"
-      flavor: "那个用户，是Misskist喔"
+      description: "总登入 100 天"
+      flavor: "那个用户，是 Misskist 喔"
     _login200:
       title: "定期联系Ⅰ"
-      description: "总登录天数200天"
+      description: "总登录天数 200 天"
     _login300:
       title: "定期联系Ⅱ"
-      description: "总登录天数300天"
+      description: "总登录天数 300 天"
     _login400:
       title: "定期联系Ⅲ"
-      description: "总登录天数400天"
+      description: "总登录天数 400 天"
     _login500:
       title: "老熟人Ⅰ"
-      description: "总登录天数500天"
+      description: "总登录天数 500 天"
       flavor: "诸君，我喜欢贴文"
     _login600:
       title: "老熟人Ⅱ"
-      description: "总登录天数600天"
+      description: "总登录天数 600 天"
     _login700:
       title: "老熟人Ⅲ"
-      description: "总登录天数700天"
+      description: "总登录天数 700 天"
     _login800:
-      title: "帖子大师Ⅰ"
-      description: "总登录天数800天"
+      title: "帖子大师 Ⅰ"
+      description: "总登录天数 800 天"
     _login900:
-      title: "帖子大师Ⅱ"
-      description: "总登录天数900天"
+      title: "帖子大师 Ⅱ"
+      description: "总登录天数 900 天"
     _login1000:
-      title: "帖子大师Ⅲ"
-      description: "总登录天数1000天"
-      flavor: "感谢您使用Misskey！"
+      title: "帖子大师 Ⅲ"
+      description: "总登录天数 1000 天"
+      flavor: "感谢您使用 Misskey！"
     _noteClipped1:
       title: "忍不住要收藏到便签"
       description: "第一次将贴文贴进便签"
@@ -1218,56 +1222,56 @@ _achievements:
       description: "第一次关注别人"
     _following10:
       title: "关注，跟随"
-      description: "关注超过10人"
+      description: "关注超过 10 人"
     _following50:
       title: "我的朋友很多"
-      description: "关注超过50人"
+      description: "关注超过 50 人"
     _following100:
-      title: "我的朋友很多"
-      description: "关注超过100人"
+      title: "胜友如云"
+      description: "关注超过 100 人"
     _following300:
       title: "朋友成群"
-      description: "关注数超过300"
+      description: "关注数超过 300"
     _followers1:
       title: "最初的关注者"
       description: "第一次被关注"
     _followers10:
       title: "关注我吧！"
-      description: "拥有超过10名关注者"
+      description: "拥有超过 10 名关注者"
     _followers50:
       title: "三五成群"
-      description: "拥有超过50名关注者"
+      description: "拥有超过 50 名关注者"
     _followers100:
       title: "胜友如云"
-      description: "拥有超过100名关注者"
+      description: "拥有超过 100 名关注者"
     _followers300:
       title: "排列成行"
-      description: "拥有超过300名关注者"
+      description: "拥有超过 300 名关注者"
     _followers500:
       title: "信号塔"
-      description: "拥有超过500名关注者"
+      description: "拥有超过 500 名关注者"
     _followers1000:
       title: "大影响家"
-      description: "拥有超过1000名关注者"
+      description: "拥有超过 1000 名关注者"
     _collectAchievements30:
       title: "成就收藏家"
-      description: "获得超过30个成就"
+      description: "获得超过 30 个成就"
     _viewAchievements3min:
       title: "成就爱好者"
       description: "盯着成就看三分钟"
     _iLoveMisskey:
       title: "I Love Misskey"
-      description: "发布\"I ❤ #Misskey\"帖子"
+      description: "发布 \"I ❤ #Misskey\" 帖子"
       flavor: "感谢您使用 Misskey ！ by 开发团队"
     _foundTreasure:
       title: "寻宝"
       description: "发现了隐藏的宝藏"
     _client30min:
       title: "休息一下！"
-      description: "启动客户端超过30分钟"
+      description: "启动客户端超过 30 分钟"
     _client60min:
-      title: "Misskey重度依赖"
-      description: "启动客户端超过60分钟"
+      title: "Misskey 重度依赖"
+      description: "启动客户端超过 60 分钟"
     _noteDeletedWithin1min:
       title: "欲言又止"
       description: "发帖后一分钟内就将其删除"
@@ -1277,20 +1281,20 @@ _achievements:
       flavor: "差不多该去睡了喔。"
     _postedAt0min0sec:
       title: "报时"
-      description: "在0点发布一篇帖子"
+      description: "在 0 点发布一篇帖子"
       flavor: "嘣 嘣 嘣 Biu——！"
     _selfQuote:
       title: "自我引用"
       description: "引用了自己的帖子"
     _htl20npm:
       title: "流动的时间线"
-      description: "在首页时间线的流速超过20npm"
+      description: "在首页时间线的流速超过 20npm"
     _viewInstanceChart:
       title: "分析师"
       description: "查看了服务器信息中的图表"
     _outputHelloWorldOnScratchpad:
       title: "Hello, world!"
-      description: "在AiScript控制台中输出 hello world"
+      description: "在 AiScript 控制台中输出 hello world"
     _open3windows:
       title: "多窗口"
       description: "打开了三个或更多的窗口"
@@ -1299,25 +1303,25 @@ _achievements:
       description: "试图对网盘中的文件夹进行循环嵌套"
     _reactWithoutRead:
       title: "有好好读过吗？"
-      description: "在含有100字以上的帖子被发出三秒内做出回应"
+      description: "在含有 100 字以上的帖子被发出三秒内做出回应"
     _clickedClickHere:
       title: "点这里"
       description: "点了这里"
     _justPlainLucky:
       title: "超高校级的幸运"
-      description: "每10秒有0.01的概率自动获得"
+      description: "每 10 秒有 0.01 的概率自动获得"
     _setNameToSyuilo:
       title: "像神一样呐"
-      description: "将名称设定为syuilo"
+      description: "将名称设定为 syuilo"
     _passedSinceAccountCreated1:
       title: "一周年"
-      description: "账户创建时间超过1年"
+      description: "账户创建时间超过 1 年"
     _passedSinceAccountCreated2:
       title: "二周年"
-      description: "账户创建时间超过2年"
+      description: "账户创建时间超过 2 年"
     _passedSinceAccountCreated3:
       title: "三周年"
-      description: "账户创建时间超过3年"
+      description: "账户创建时间超过 3 年"
     _loggedInOnBirthday:
       title: "生日快乐"
       description: "在生日当天登录"
@@ -1331,7 +1335,7 @@ _achievements:
       flavor: "是不是软件有问题？"
     _brainDiver:
       title: "Brain Diver"
-      description: "发布了包含Brain Diver链接的帖子"
+      description: "发布了包含 Brain Diver 链接的帖子"
       flavor: "Misskey-Misskey La-Tu-Ma"
 _role:
   new: "创建角色"
@@ -1353,7 +1357,7 @@ _role:
   baseRole: "基本角色"
   useBaseValue: "使用基本角色的值"
   chooseRoleToAssign: "选择要分配的角色"
-  iconUrl: "图标URL"
+  iconUrl: "图标 URL"
   asBadge: "作为徽章显示"
   descriptionOfAsBadge: "开启后，用户名旁边将会出现角色图标。"
   isExplorable: "公开角色时间线"
@@ -1374,7 +1378,7 @@ _role:
     canInvite: "发放服务器邀请码"
     canManageCustomEmojis: "管理自定义表情符号"
     driveCapacity: "网盘容量"
-    alwaysMarkNsfw: "总是将文件标记为NSFW"
+    alwaysMarkNsfw: "总是将文件标记为 NSFW"
     pinMax: "帖子置顶数量限制"
     antennaMax: "可创建的最大天线数量"
     wordMuteMax: "屏蔽词的字数限制"
@@ -1402,7 +1406,7 @@ _role:
     or: "符合以下任一条件"
     not: "不符合以下任何条件"
 _sensitiveMediaDetection:
-  description: "可以使用机器学习技术自动检测敏感媒体，以便进行审核。服务器负载将略微增加。"
+  description: "使用机器学习技术自动检测敏感媒体，以便进行审核。服务器负载将略微增加。"
   sensitivity: "检测敏感度"
   sensitivityDescription: "敏感度较低，则误检（假阳性）会减少；敏感度较高，则漏检（假阴性）会减少。"
   setSensitiveFlagAutomatically: "自动设置 NSFW 标签"
@@ -1435,8 +1439,8 @@ _ad:
   reduceFrequencyOfThisAd: "减少此广告的频率"
   hide: "不显示"
 _forgotPassword:
-  enterEmail: "请输入您验证账号时用的电子邮箱地址，密码重置链接将发送至该邮箱上。"
-  ifNoEmail: "如果您没有使用电子邮件地址进行验证，请联系管理员。"
+  enterEmail: "请输入您设置的电子邮箱地址，密码重置链接将发送至该邮箱上。"
+  ifNoEmail: "如果您没有设置电子邮件地址，请联系管理员。"
   contactAdmin: "该服务器不支持发送电子邮件。如果您想重设密码，请联系管理员。"
 _gallery:
   my: "我的图库"
@@ -1460,8 +1464,8 @@ _preferencesBackups:
   save: "覆盖存档"
   inputName: "请输入备份的名称"
   cannotSave: "无法保存"
-  nameAlreadyExists: "备份名称\"{name}\"已经存在，请指定其他名称。"
-  applyConfirm: "您是否要将备份\"{name}\"应用到当前设备上？当前设备现有配置将被丢弃。"
+  nameAlreadyExists: "备份名称 \"{name}\" 已经存在，请指定其他名称。"
+  applyConfirm: "您是否要将备份 \"{name}\" 应用到当前设备上？当前设备现有配置将被丢弃。"
   saveConfirm: "您确定要覆盖保存 {name} 吗？"
   deleteConfirm: "您确定要删除 {name} 吗？"
   renameConfirm: "您确定要把“{old}”改为“{new}”吗？"
@@ -1477,18 +1481,14 @@ _registry:
   domain: "域"
   createKey: "创建键"
 _aboutMisskey:
-  about: "Misskey是由syuilo于2014年开发的开源软件。"
+  about: "Misskey 是由 syuilo 于 2014 年开发的开源软件。"
   contributors: "主要贡献者"
   allContributors: "全体贡献者"
   source: "源代码"
-  translation: "翻译Misskey"
-  donate: "赞助Misskey"
-  morePatrons: "还有很多其他的人也在支持我们，非常感谢🥰"
+  translation: "翻译 Misskey"
+  donate: "赞助 Misskey"
+  morePatrons: "还有很多其它的人也在支持我们，非常感谢🥰"
   patrons: "支持者"
-_nsfw:
-  respect: "隐藏敏感内容"
-  ignore: "不隐藏敏感内容"
-  force: "总是隐藏内容"
 _instanceTicker:
   none: "不显示"
   remote: "仅远程用户"
@@ -1505,8 +1505,8 @@ _channel:
   featured: "热点"
   owned: "管理中"
   following: "正在关注"
-  usersCount: "有{n}人参与"
-  notesCount: "有{n}个帖子"
+  usersCount: "有 {n} 人参与"
+  notesCount: "有 {n} 个帖子"
   nameAndDescription: "名称与描述"
   nameOnly: "仅名称"
 _menuDisplay:
@@ -1516,16 +1516,16 @@ _menuDisplay:
   hide: "隐藏"
 _wordMute:
   muteWords: "禁用词"
-  muteWordsDescription: "使用空格分隔表示AND逻辑，使用换行符分隔表示OR逻辑。"
-  muteWordsDescription2: "将关键字用斜线括起来表示正则表达式。"
+  muteWordsDescription: "AND 条件用空格分隔，OR 条件用换行符分隔。"
+  muteWordsDescription2: "正则表达式用斜线包裹"
   softDescription: "隐藏时间线中指定条件的帖子。"
   hardDescription: "防止将具有指定条件的帖子添加到时间线。 即使您更改条件，未添加的帖文也会被排除在外。"
   soft: "软屏蔽"
   hard: "硬屏蔽"
   mutedNotes: "被屏蔽的帖子"
 _instanceMute:
-  instanceMuteDescription: "屏蔽配置服务器中的所有帖子和转帖，包括这些服务器上的用户回复。"
-  instanceMuteDescription2: "设置时用换行符来分隔"
+  instanceMuteDescription: "屏蔽服务器中的所有帖子和转帖，包括这些服务器上的用户回复。"
+  instanceMuteDescription2: "一行一个"
   title: "隐藏服务器已设置的帖子。"
   heading: "屏蔽服务器"
 _theme:
@@ -1557,7 +1557,7 @@ _theme:
   lighten: "浅色"
   inputConstantName: "请输入常量名称"
   importInfo: "您可以在此处粘贴主题代码，将其导入到编辑器中"
-  deleteConstantConfirm: "确定要删除常量{const}吗?"
+  deleteConstantConfirm: "确定要删除常量 {const} 吗?"
   keys:
     accent: "强调色"
     bg: "背景"
@@ -1589,8 +1589,8 @@ _theme:
     cwBg: "隐藏内容按钮背景"
     cwFg: "隐藏内容按钮文本"
     cwHoverBg: "隐藏内容按钮背景（悬停）"
-    toastBg: "Toast通知背景"
-    toastFg: "Toast通知文本"
+    toastBg: "Toast 通知背景"
+    toastFg: "Toast 通知文本"
     buttonBg: "按钮背景"
     buttonHoverBg: "按钮背景（悬停）"
     inputBorder: "输入框边框"
@@ -1613,13 +1613,13 @@ _sfx:
 _ago:
   future: "未来"
   justNow: "最近"
-  secondsAgo: "{n}秒前"
-  minutesAgo: "{n}分前"
-  hoursAgo: "{n}小时前"
-  daysAgo: "{n}日前"
-  weeksAgo: "{n}周前"
-  monthsAgo: "{n}月前"
-  yearsAgo: "{n}年前"
+  secondsAgo: "{n} 秒前"
+  minutesAgo: "{n} 分前"
+  hoursAgo: "{n} 小时前"
+  daysAgo: "{n} 日前"
+  weeksAgo: "{n} 周前"
+  monthsAgo: "{n} 月前"
+  yearsAgo: "{n} 年前"
   invalid: "没有"
 _time:
   second: "秒"
@@ -1627,7 +1627,7 @@ _time:
   hour: "小时"
   day: "日"
 _timelineTutorial:
-  title: "Misskey的使用方法"
+  title: "Misskey 的使用方法"
   step1_1: "这个画面是「时间线」。{name}的投稿会按照帖子的发布时间顺序来显示。"
   step1_2: "时间线有许多种类，比如在「首页时间线」中展现的是你关注的人的贴文；而在「本地时间线」中展现的是{name}里全部用户的贴文。"
   step2_1: "那么接下来，试着写一些什么东西来发布吧！你可以通过点击屏幕上的铅笔图标来打开投稿页面。"
@@ -1640,20 +1640,20 @@ _2fa:
   alreadyRegistered: "此设备已被注册"
   registerTOTP: "开始设置认证应用"
   passwordToTOTP: "请输入您的密码"
-  step1: "首先，在您的设备上安装验证应用，例如{a}或{b}。"
+  step1: "首先，在您的设备上安装验证应用，例如 {a} 或 {b}。"
   step2: "然后，扫描屏幕上显示的二维码。"
-  step2Click: "通过点击QR码，您可以使用设备上安装的身份验证器应用程序或密钥环进行注册"
-  step2Url: "在桌面应用程序中输入以下URL："
+  step2Click: "通过点击二维码，您可以使用设备上安装的身份验证器应用程序或密钥环进行注册"
+  step2Url: "在桌面应用程序中输入以下 URL："
   step3Title: "输入验证码"
   step3: "输入您的应用提供的动态口令以完成设置。"
   step4: "从现在开始，任何登录操作都将要求您提供动态口令。"
   securityKeyNotSupported: "您的浏览器不支持安全密钥。"
-  registerTOTPBeforeKey: "要注册安全密钥或Passkey，请先设置验证器应用程序。"
+  registerTOTPBeforeKey: "要注册安全密钥或 Passkey，请先设置验证器应用程序。"
   securityKeyInfo: "注册兼容 WebAuthn 的密钥，例如支持 FIDO2 的硬件安全密钥、设备上的生物识别功能、PIN 码以及 Passkey 等。"
-  chromePasskeyNotSupported: "目前不支持 Chrome 的Passkey。"
-  registerSecurityKey: "注册安全密钥或Passkey"
+  chromePasskeyNotSupported: "目前不支持 Chrome 的 Passkey。"
+  registerSecurityKey: "注册安全密钥或 Passkey"
   securityKeyName: "输入密钥名称"
-  tapSecurityKey: "请按照浏览器说明操作来注册安全密钥或Passkey。"
+  tapSecurityKey: "请按照浏览器说明操作来注册安全密钥或 Passkey。"
   removeKey: "删除安全密钥"
   removeKeyConfirm: "您确定要删除 {name} 吗？"
   whyTOTPOnlyRenew: "如果注册了安全密钥，则无法取消验证器应用程序上的设置。"
@@ -1696,9 +1696,9 @@ _permissions:
   "write:gallery-likes": "操作喜欢的图片"
 _auth:
   shareAccessTitle: "应用程序授权许可"
-  shareAccess: "您要授权允许“{name}”访问您的帐户吗？"
+  shareAccess: "您要授权允许 “{name}” 访问您的帐户吗？"
   shareAccessAsk: "您确定要授权此应用程序访问您的帐户吗？"
-  permission: "{name}需要以下权限"
+  permission: "{name} 需要以下权限"
   permissionAsk: "这个应用程序需要以下权限"
   pleaseGoBack: "请返回到应用程序"
   callback: "回到应用程序"
@@ -1726,12 +1726,12 @@ _widgets:
   calendar: "日历"
   trends: "趋势"
   clock: "时钟"
-  rss: "RSS阅读器"
+  rss: "RSS 阅读器"
   rssTicker: "RSS Ticker"
   activity: "活动"
   photos: "照片"
   digitalClock: "数字时钟"
-  unixClock: "UNIX时钟"
+  unixClock: "UNIX 时钟"
   federation: "联合"
   instanceCloud: "服务器云"
   postForm: "投稿窗口"
@@ -1740,7 +1740,7 @@ _widgets:
   onlineUsers: "在线用户"
   jobQueue: "作业队列"
   serverMetric: "服务器指标"
-  aiscript: "AiScript控制台"
+  aiscript: "AiScript 控制台"
   aiscriptApp: "AiScript App"
   aichan: "小蓝"
   userList: "用户列表"
@@ -1750,11 +1750,11 @@ _widgets:
 _cw:
   hide: "隐藏"
   show: "查看更多"
-  chars: "{count}个字符"
+  chars: "{count} 个字符"
   files: "{count} 个文件"
 _poll:
   noOnlyOneChoice: "需要至少两个选项"
-  choiceN: "选择{n}"
+  choiceN: "选择 {n}"
   noMore: "无法再添加更多了"
   canMultipleVote: "允许多个投票"
   expiration: "截止时间"
@@ -1764,16 +1764,16 @@ _poll:
   deadlineDate: "截止日期"
   deadlineTime: "小时"
   duration: "时长"
-  votesCount: "{n}票"
-  totalVotes: "总票数{n}"
+  votesCount: "{n} 票"
+  totalVotes: "总票数 {n}"
   vote: "投票"
   showResult: "显示结果"
   voted: "已投票"
   closed: "已截止"
-  remainingDays: "{d}天{h}小时后截止"
-  remainingHours: "{h}小时{m}分后截止"
-  remainingMinutes: "{m}分{s}秒后截止"
-  remainingSeconds: "{s}秒后截止"
+  remainingDays: "{d} 天 {h} 小时后截止"
+  remainingHours: "{h} 小时 {m} 分后截止"
+  remainingMinutes: "{m} 分 {s} 秒后截止"
+  remainingSeconds: "{s} 秒后截止"
 _visibility:
   public: "公开"
   publicDescription: "您的帖子将出现在全局时间线上"
@@ -1849,16 +1849,16 @@ _timelines:
   social: "社交"
   global: "全局"
 _play:
-  new: "创建Play"
-  edit: "编辑Play"
-  created: "创建了一个Play"
-  updated: "更新了Play"
-  deleted: "删除了Play"
-  pageSetting: "Play设置"
-  editThisPage: "编辑此Play"
+  new: "创建 Play"
+  edit: "编辑 Play"
+  created: "创建了一个 Play"
+  updated: "更新了 Play"
+  deleted: "删除了 Play"
+  pageSetting: "Play 设置"
+  editThisPage: "编辑此 Play"
   viewSource: "查看源代码"
-  my: "我的Play"
-  liked: "点赞的Play"
+  my: "我的 Play"
+  liked: "点赞的 Play"
   featured: "热门"
   title: "标题"
   script: "脚本"
@@ -1871,8 +1871,8 @@ _pages:
   updated: "页面已更新"
   deleted: "该页面已被删除"
   pageSetting: "页面设置"
-  nameAlreadyExists: "该页面URL已存在"
-  invalidNameTitle: "无效的页面URL"
+  nameAlreadyExists: "该页面 URL 已存在"
+  invalidNameTitle: "无效的页面 URL"
   invalidNameText: "请确认该项不为空"
   editThisPage: "编辑此页面"
   viewSource: "查看源代码"
@@ -1887,7 +1887,7 @@ _pages:
   content: "页面内容"
   variables: "变量"
   title: "标题"
-  url: "页面URL"
+  url: "页面 URL"
   summary: "页面摘要"
   alignCenter: "居中"
   hideTitleWhenPinned: "置顶时隐藏标题"
@@ -1909,7 +1909,7 @@ _pages:
     button: "按钮"
     note: "嵌入的帖子"
     _note:
-      id: "帖子ID"
+      id: "帖子 ID"
       idDescription: "您也可以通过粘贴帖子的URL来进行设置。"
       detailed: "显示详细信息"
 _relayStatus:
@@ -1987,7 +1987,7 @@ _webhookSettings:
   createWebhook: "创建 Webhook"
   name: "名称"
   secret: "密钥"
-  events: "何时运行Webhook"
+  events: "何时运行 Webhook"
   active: "已启用"
   _events:
     follow: "关注时"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 801701850..2a8dc42b9 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -54,6 +54,8 @@ copyRSS: "複製RSS"
 copyUsername: "複製使用者名稱"
 copyUserId: "複製使用者ID"
 copyNoteId: "複製貼文ID"
+copyFileId: "複製檔案ID"
+copyFolderId: "複製資料夾ID"
 searchUser: "搜尋使用者"
 reply: "回覆"
 loadMore: "載入更多"
@@ -136,8 +138,10 @@ unblockConfirm: "確定解除封鎖此用戶？"
 suspendConfirm: "確定凍結此帳戶？"
 unsuspendConfirm: "確定解凍此帳戶？"
 selectList: "選擇清單"
+editList: "編輯清單"
 selectChannel: "選擇頻道"
 selectAntenna: "選擇天線"
+editAntenna: "編輯天線"
 selectWidget: "選擇小工具"
 editWidgets: "編輯小工具"
 editWidgetsExit: "完成"
@@ -311,7 +315,7 @@ copyUrl: "複製URL"
 rename: "重新命名"
 avatar: "大頭貼"
 banner: "橫幅"
-nsfw: "敏感內容"
+displayOfSensitiveMedia: "敏感性媒體的顯示"
 whenServerDisconnected: "與伺服器的連接中斷時"
 disconnectedFromServer: "與伺服器中斷連線"
 reload: "重新整理"
@@ -752,7 +756,7 @@ editCode: "編輯代碼"
 apply: "套用"
 receiveAnnouncementFromInstance: "接收由本實例發出的電郵通知"
 emailNotification: "郵件通知"
-publish: "發佈"
+publish: "發布"
 inChannelSearch: "頻道内搜尋"
 useReactionPickerForContextMenu: "點擊右鍵開啟反應工具欄"
 typingUsers: "{users}輸入中..."
@@ -810,7 +814,7 @@ ratio: "%"
 previewNoteText: "預覽文本"
 customCss: "自定義 CSS"
 customCssWarn: "這個設定必須由具備相關知識的人員操作，不當的設定可能导致客戶端無法正常使用。"
-global: "公開"
+global: "全域"
 squareAvatars: "頭像以方形顯示"
 sent: "發送"
 received: "收取"
@@ -848,7 +852,7 @@ makeReactionsPublicDescription: "將您做過的反應設為公開可見。"
 classic: "經典"
 muteThread: "將貼文串設為靜音"
 unmuteThread: "將貼文串的靜音解除"
-ffVisibility: "連接的公開範圍"
+ffVisibility: "連繫的可見性"
 ffVisibilityDescription: "您可以設定您的關注/關注者資訊的公開範圍"
 continueThread: "查看更多貼文"
 deleteAccountConfirm: "將要刪除帳戶。是否確定？"
@@ -1053,8 +1057,8 @@ options: "選項"
 specifyUser: "指定使用者"
 failedToPreviewUrl: "無法預覽"
 update: "更新"
-rolesThatCanBeUsedThisEmojiAsReaction: "可以當成反應使用的角色"
-rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription: "如果是未指定角色的情況，則任何人都可以被當成反應來使用。"
+rolesThatCanBeUsedThisEmojiAsReaction: "可以用這個做為反應的角色"
+rolesThatCanBeUsedThisEmojiAsReactionEmptyDescription: "未指定角色的情況，則任何人都可以將它用做反應。"
 rolesThatCanBeUsedThisEmojiAsReactionPublicRoleWarn: "角色必須是公開的角色。"
 cancelReactionConfirm: "要取消做出的反應嗎？"
 changeReactionConfirm: "要變更做出的反應嗎？"
@@ -1063,6 +1067,9 @@ goToMisskey: "往Misskey"
 additionalEmojiDictionary: "表情符號的附加辭典"
 installed: "已安裝"
 branding: "品牌宣傳"
+enableServerMachineStats: "公布伺服器的機器資訊"
+enableIdenticonGeneration: "啟用每個使用者的Identicon"
+turnOffToImprovePerformance: "關閉時會提高性能。"
 _initialAccountSetting:
   accountCreated: "帳戶已建立完成！"
   letsStartAccountSetup: "來進行帳戶的初始設定吧。"
@@ -1357,7 +1364,7 @@ _role:
   iconUrl: "圖示的URL"
   asBadge: "顯示為徽章"
   descriptionOfAsBadge: "開啟的話，角色圖示會顯示在用戶名旁邊。"
-  isExplorable: "公開角色時間軸"
+  isExplorable: "讓使用者更容易找到您"
   descriptionOfIsExplorable: "若開啟則公開角色時間軸。若角色不是公開的，則無法公開時間軸。"
   displayOrder: "顯示順序"
   descriptionOfDisplayOrder: "數字越大，顯示在UI上的越上面。"
@@ -1417,7 +1424,7 @@ _emailUnavailable:
   mx: "郵件伺服器不正確"
   smtp: "郵件伺服器沒有應答"
 _ffVisibility:
-  public: "發佈"
+  public: "公開"
   followers: "只有關注你的用戶能看到"
   private: "私密"
 _signup:
@@ -1435,6 +1442,7 @@ _ad:
   back: "返回"
   reduceFrequencyOfThisAd: "降低此廣告的頻率 "
   hide: "隱藏"
+  timezoneinfo: "星期幾是由伺服器的時區指定的。"
 _forgotPassword:
   enterEmail: "請輸入您的帳戶註冊的電子郵件地址。 密碼重置連結將被發送到該電子郵件地址。"
   ifNoEmail: "如果您還沒有註冊您的電子郵件地址，請聯繫管理員。 "
@@ -1486,10 +1494,10 @@ _aboutMisskey:
   donate: "贊助Misskey"
   morePatrons: "還有許許多多幫助我們的其他人，非常感謝你們。 🥰"
   patrons: "贊助者"
-_nsfw:
-  respect: "隱藏敏感內容"
-  ignore: "不隱藏敏感內容"
-  force: "隱藏所有內容"
+_displayOfSensitiveMedia:
+  respect: "隱藏設定為敏感的媒體"
+  ignore: "不隱藏設定為敏感的媒體"
+  force: "隱藏所有媒體"
 _instanceTicker:
   none: "隱藏"
   remote: "向遠端使用者顯示"
@@ -1779,11 +1787,11 @@ _visibility:
   public: "公開"
   publicDescription: "發布給所有用戶 "
   home: "首頁"
-  homeDescription: "僅發送至首頁的時間軸"
+  homeDescription: "僅發布至首頁的時間軸"
   followers: "追隨者"
-  followersDescription: "僅發送至關注者"
+  followersDescription: "僅發布至關注者"
   specified: "指定使用者"
-  specifiedDescription: "僅發送至指定使用者"
+  specifiedDescription: "僅發布至指定使用者"
   disableFederation: "停用聯邦"
   disableFederationDescription: "不要傳遞給其他實例"
 _postForm:

From 5b8fa25a12ee73121b99f575170e67f4e55262cd Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Jul 2023 21:13:35 +0900
Subject: [PATCH 29/31] 13.14.0-beta.2

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

diff --git a/package.json b/package.json
index d7a2376a3..822278940 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.14.0-beta.1",
+	"version": "13.14.0-beta.2",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 7ec07d5fd2e28d523c85d160944916b2a5ee04a1 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sat, 8 Jul 2023 21:18:16 +0900
Subject: [PATCH 30/31] perf(backend): Reduce memory usage of MemoryKVCache
 (#11076)

* perf(backend): Reduce memory usage of MemoryKVCache

* fix
---
 packages/backend/src/core/CacheService.ts | 47 +++++++++++++++++++----
 packages/backend/src/misc/cache.ts        | 34 +++++++++++-----
 2 files changed, 64 insertions(+), 17 deletions(-)

diff --git a/packages/backend/src/core/CacheService.ts b/packages/backend/src/core/CacheService.ts
index 2b7f9a48d..cd6b68e72 100644
--- a/packages/backend/src/core/CacheService.ts
+++ b/packages/backend/src/core/CacheService.ts
@@ -11,10 +11,10 @@ import type { OnApplicationShutdown } from '@nestjs/common';
 
 @Injectable()
 export class CacheService implements OnApplicationShutdown {
-	public userByIdCache: MemoryKVCache<User>;
-	public localUserByNativeTokenCache: MemoryKVCache<LocalUser | null>;
+	public userByIdCache: MemoryKVCache<User, User | string>;
+	public localUserByNativeTokenCache: MemoryKVCache<LocalUser | null, string | null>;
 	public localUserByIdCache: MemoryKVCache<LocalUser>;
-	public uriPersonCache: MemoryKVCache<User | null>;
+	public uriPersonCache: MemoryKVCache<User | null, string | null>;
 	public userProfileCache: RedisKVCache<UserProfile>;
 	public userMutingsCache: RedisKVCache<Set<string>>;
 	public userBlockingCache: RedisKVCache<Set<string>>;
@@ -55,10 +55,41 @@ export class CacheService implements OnApplicationShutdown {
 	) {
 		//this.onMessage = this.onMessage.bind(this);
 
-		this.userByIdCache = new MemoryKVCache<User>(Infinity);
-		this.localUserByNativeTokenCache = new MemoryKVCache<LocalUser | null>(Infinity);
-		this.localUserByIdCache = new MemoryKVCache<LocalUser>(Infinity);
-		this.uriPersonCache = new MemoryKVCache<User | null>(Infinity);
+		const localUserByIdCache = new MemoryKVCache<LocalUser>(1000 * 60 * 60 * 6 /* 6h */);
+		this.localUserByIdCache	= localUserByIdCache;
+
+		// ローカルユーザーならlocalUserByIdCacheにデータを追加し、こちらにはid(文字列)だけを追加する
+		const userByIdCache = new MemoryKVCache<User, User | string>(1000 * 60 * 60 * 6 /* 6h */, {
+			toMapConverter: user => {
+				if (user.host === null) {
+					localUserByIdCache.set(user.id, user as LocalUser);
+					return user.id;
+				}
+
+				return user;
+			},
+			fromMapConverter: userOrId => typeof userOrId === 'string' ? localUserByIdCache.get(userOrId) : userOrId,
+		});
+		this.userByIdCache = userByIdCache;
+
+		this.localUserByNativeTokenCache = new MemoryKVCache<LocalUser | null, string | null>(Infinity, {
+			toMapConverter: user => {
+				if (user === null) return null;
+
+				localUserByIdCache.set(user.id, user);
+				return user.id;
+			},
+			fromMapConverter: id => id === null ? null : localUserByIdCache.get(id),
+		});
+		this.uriPersonCache = new MemoryKVCache<User | null, string | null>(Infinity, {
+			toMapConverter: user => {
+				if (user === null) return null;
+
+				userByIdCache.set(user.id, user);
+				return user.id;
+			},
+			fromMapConverter: id => id === null ? null : userByIdCache.get(id),
+		});
 
 		this.userProfileCache = new RedisKVCache<UserProfile>(this.redisClient, 'userProfile', {
 			lifetime: 1000 * 60 * 30, // 30m
@@ -131,7 +162,7 @@ export class CacheService implements OnApplicationShutdown {
 					const user = await this.usersRepository.findOneByOrFail({ id: body.id });
 					this.userByIdCache.set(user.id, user);
 					for (const [k, v] of this.uriPersonCache.cache.entries()) {
-						if (v.value?.id === user.id) {
+						if (v.value === user.id) {
 							this.uriPersonCache.set(k, user);
 						}
 					}
diff --git a/packages/backend/src/misc/cache.ts b/packages/backend/src/misc/cache.ts
index f130a7db8..e825d5137 100644
--- a/packages/backend/src/misc/cache.ts
+++ b/packages/backend/src/misc/cache.ts
@@ -181,14 +181,28 @@ export class RedisSingleCache<T> {
 
 // TODO: メモリ節約のためあまり参照されないキーを定期的に削除できるようにする？
 
-export class MemoryKVCache<T> {
-	public cache: Map<string, { date: number; value: T; }>;
+function nothingToDo<T, V = T>(value: T): V {
+	return value as unknown as V;
+}
+
+export class MemoryKVCache<T, V = T> {
+	public cache: Map<string, { date: number; value: V; }>;
 	private lifetime: number;
 	private gcIntervalHandle: NodeJS.Timer;
+	private toMapConverter: (value: T) => V;
+	private fromMapConverter: (cached: V) => T | undefined;
 
-	constructor(lifetime: MemoryKVCache<never>['lifetime']) {
+	constructor(lifetime: MemoryKVCache<never>['lifetime'], options: {
+		toMapConverter: (value: T) => V;
+		fromMapConverter: (cached: V) => T | undefined;
+	} = {
+		toMapConverter: nothingToDo,
+		fromMapConverter: nothingToDo,
+	}) {
 		this.cache = new Map();
 		this.lifetime = lifetime;
+		this.toMapConverter = options.toMapConverter;
+		this.fromMapConverter = options.fromMapConverter;
 
 		this.gcIntervalHandle = setInterval(() => {
 			this.gc();
@@ -199,7 +213,7 @@ export class MemoryKVCache<T> {
 	public set(key: string, value: T): void {
 		this.cache.set(key, {
 			date: Date.now(),
-			value,
+			value: this.toMapConverter(value),
 		});
 	}
 
@@ -211,7 +225,7 @@ export class MemoryKVCache<T> {
 			this.cache.delete(key);
 			return undefined;
 		}
-		return cached.value;
+		return this.fromMapConverter(cached.value);
 	}
 
 	@bindThis
@@ -222,9 +236,10 @@ export class MemoryKVCache<T> {
 	/**
 	 * キャッシュがあればそれを返し、無ければfetcherを呼び出して結果をキャッシュ&返します
 	 * optional: キャッシュが存在してもvalidatorでfalseを返すとキャッシュ無効扱いにします
+	 * fetcherの引数はcacheに保存されている値があれば渡されます
 	 */
 	@bindThis
-	public async fetch(key: string, fetcher: () => Promise<T>, validator?: (cachedValue: T) => boolean): Promise<T> {
+	public async fetch(key: string, fetcher: (value: V | undefined) => Promise<T>, validator?: (cachedValue: T) => boolean): Promise<T> {
 		const cachedValue = this.get(key);
 		if (cachedValue !== undefined) {
 			if (validator) {
@@ -239,7 +254,7 @@ export class MemoryKVCache<T> {
 		}
 
 		// Cache MISS
-		const value = await fetcher();
+		const value = await fetcher(this.cache.get(key)?.value);
 		this.set(key, value);
 		return value;
 	}
@@ -247,9 +262,10 @@ export class MemoryKVCache<T> {
 	/**
 	 * キャッシュがあればそれを返し、無ければfetcherを呼び出して結果をキャッシュ&返します
 	 * optional: キャッシュが存在してもvalidatorでfalseを返すとキャッシュ無効扱いにします
+	 * fetcherの引数はcacheに保存されている値があれば渡されます
 	 */
 	@bindThis
-	public async fetchMaybe(key: string, fetcher: () => Promise<T | undefined>, validator?: (cachedValue: T) => boolean): Promise<T | undefined> {
+	public async fetchMaybe(key: string, fetcher: (value: V | undefined) => Promise<T | undefined>, validator?: (cachedValue: T) => boolean): Promise<T | undefined> {
 		const cachedValue = this.get(key);
 		if (cachedValue !== undefined) {
 			if (validator) {
@@ -264,7 +280,7 @@ export class MemoryKVCache<T> {
 		}
 
 		// Cache MISS
-		const value = await fetcher();
+		const value = await fetcher(this.cache.get(key)?.value);
 		if (value !== undefined) {
 			this.set(key, value);
 		}

From 60366a45585654115d5178486cc747cf0ee9450a Mon Sep 17 00:00:00 2001
From: Caipira <caipira@libnare.net>
Date: Sat, 8 Jul 2023 21:31:38 +0900
Subject: [PATCH 31/31] fix(backend): Remove Meilisearch index when notes are
 deleted (#10988)

* fix(backend): Include feature to delete Meilisearch index notes

* Update variable name
`cascadingNotesFilter` -> `federatedLocalCascadingNotes`

* tweak

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 packages/backend/src/core/NoteDeleteService.ts     | 14 +++++++++++---
 packages/backend/src/core/SearchService.ts         |  9 +++++++++
 .../processors/DeleteAccountProcessorService.ts    |  6 ++++++
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts
index 10381c7e6..f77ea8aab 100644
--- a/packages/backend/src/core/NoteDeleteService.ts
+++ b/packages/backend/src/core/NoteDeleteService.ts
@@ -17,6 +17,7 @@ import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import { bindThis } from '@/decorators.js';
 import { MetaService } from '@/core/MetaService.js';
+import { SearchService } from '@/core/SearchService.js';
 
 @Injectable()
 export class NoteDeleteService {
@@ -41,6 +42,7 @@ export class NoteDeleteService {
 		private apRendererService: ApRendererService,
 		private apDeliverManagerService: ApDeliverManagerService,
 		private metaService: MetaService,
+		private searchService: SearchService,
 		private notesChart: NotesChart,
 		private perUserNotesChart: PerUserNotesChart,
 		private instanceChart: InstanceChart,
@@ -53,6 +55,7 @@ export class NoteDeleteService {
 	 */
 	async delete(user: { id: User['id']; uri: User['uri']; host: User['host']; isBot: User['isBot']; }, note: Note, quiet = false) {
 		const deletedAt = new Date();
+		const cascadingNotes = await this.findCascadingNotes(note);
 
 		// この投稿を除く指定したユーザーによる指定したノートのリノートが存在しないとき
 		if (note.renoteId && (await this.noteEntityService.countSameRenotes(user.id, note.renoteId, note.id)) === 0) {
@@ -88,8 +91,8 @@ export class NoteDeleteService {
 			}
 
 			// also deliever delete activity to cascaded notes
-			const cascadingNotes = (await this.findCascadingNotes(note)).filter(note => !note.localOnly); // filter out local-only notes
-			for (const cascadingNote of cascadingNotes) {
+			const federatedLocalCascadingNotes = (cascadingNotes).filter(note => !note.localOnly && note.userHost == null); // filter out local-only notes
+			for (const cascadingNote of federatedLocalCascadingNotes) {
 				if (!cascadingNote.user) continue;
 				if (!this.userEntityService.isLocalUser(cascadingNote.user)) continue;
 				const content = this.apRendererService.addContext(this.apRendererService.renderDelete(this.apRendererService.renderTombstone(`${this.config.url}/notes/${cascadingNote.id}`), cascadingNote.user));
@@ -114,6 +117,11 @@ export class NoteDeleteService {
 			}
 		}
 
+		for (const cascadingNote of cascadingNotes) {
+			this.searchService.unindexNote(cascadingNote);
+		}
+		this.searchService.unindexNote(note);
+
 		await this.notesRepository.delete({
 			id: note.id,
 			userId: user.id,
@@ -140,7 +148,7 @@ export class NoteDeleteService {
 
 		const cascadingNotes: Note[] = await recursive(note.id);
 
-		return cascadingNotes.filter(note => note.userHost === null); // filter out non-local users
+		return cascadingNotes;
 	}
 
 	@bindThis
diff --git a/packages/backend/src/core/SearchService.ts b/packages/backend/src/core/SearchService.ts
index 956c4cc09..28b8ee807 100644
--- a/packages/backend/src/core/SearchService.ts
+++ b/packages/backend/src/core/SearchService.ts
@@ -115,6 +115,15 @@ export class SearchService {
 		}
 	}
 
+	@bindThis
+	public async unindexNote(note: Note): Promise<void> {
+		if (!['home', 'public'].includes(note.visibility)) return;
+
+		if (this.meilisearch) {
+			this.meilisearchNoteIndex!.deleteDocument(note.id);
+		}
+	}
+
 	@bindThis
 	public async searchNote(q: string, me: User | null, opts: {
 		userId?: Note['userId'] | null;
diff --git a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
index 39dd801af..65ded170b 100644
--- a/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
+++ b/packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
@@ -12,6 +12,7 @@ import { bindThis } from '@/decorators.js';
 import { QueueLoggerService } from '../QueueLoggerService.js';
 import type * as Bull from 'bullmq';
 import type { DbUserDeleteJobData } from '../types.js';
+import { SearchService } from "@/core/SearchService.js";
 
 @Injectable()
 export class DeleteAccountProcessorService {
@@ -36,6 +37,7 @@ export class DeleteAccountProcessorService {
 		private driveService: DriveService,
 		private emailService: EmailService,
 		private queueLoggerService: QueueLoggerService,
+		private searchService: SearchService,
 	) {
 		this.logger = this.queueLoggerService.logger.createSubLogger('delete-account');
 	}
@@ -71,6 +73,10 @@ export class DeleteAccountProcessorService {
 				cursor = notes[notes.length - 1].id;
 
 				await this.notesRepository.delete(notes.map(note => note.id));
+
+				for (const note of notes) {
+					await this.searchService.unindexNote(note);
+				}
 			}
 
 			this.logger.succ('All of notes deleted');