From 459449864c1cc3bc28d2d38cb686d85e967fe20b Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 16 Nov 2024 10:16:11 +0900
Subject: [PATCH 01/20] =?UTF-8?q?=F0=9F=8E=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/follow-requests.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/pages/follow-requests.vue b/packages/frontend/src/pages/follow-requests.vue
index 8688863c2c..5d819e7993 100644
--- a/packages/frontend/src/pages/follow-requests.vue
+++ b/packages/frontend/src/pages/follow-requests.vue
@@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</div>
 					</template>
 					<template #default="{items}">
-						<div class="mk-follow-requests">
+						<div class="mk-follow-requests _gaps">
 							<div v-for="req in items" :key="req.id" class="user _panel">
 								<MkAvatar class="avatar" :user="displayUser(req)" indicator link preview/>
 								<div class="body">
@@ -94,11 +94,11 @@ const headerTabs = computed(() => [
 	{
 		key: 'list',
 		title: i18n.ts._followRequest.recieved,
-		icon: 'ti ti-mail',
+		icon: 'ti ti-download',
 	}, {
 		key: 'sent',
 		title: i18n.ts._followRequest.sent,
-		icon: 'ti ti-send',
+		icon: 'ti ti-upload',
 	},
 ]);
 
-- 
2.45.2


From 2e0f3936a88797e66a9be86de1b5f34d6b9b1c91 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 16 Nov 2024 15:32:51 +0900
Subject: [PATCH 02/20] Update .gitignore

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

diff --git a/.gitignore b/.gitignore
index 5b8a798ba6..ac7502f384 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,6 +68,8 @@ misskey-assets
 # Vite temporary files
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
+vite.config.local-dev.js.timestamp-*
+vite.config.local-dev.ts.timestamp-*
 
 # blender backups
 *.blend1
-- 
2.45.2


From cf1b7c7064f62fea3e9a264516e704279cd659fc Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 16 Nov 2024 17:22:34 +0900
Subject: [PATCH 03/20] add warning for open registration (#14963)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* wip

* wip

* Update ja-JP.yml

* Update index.d.ts

* ✌️
---
 locales/index.d.ts                            | 16 ++++++++++----
 locales/ja-JP.yml                             |  4 +++-
 .../frontend/src/pages/admin/moderation.vue   | 21 +++++++++++++++----
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 18fbfd15f0..24613419ce 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -1546,10 +1546,6 @@ export interface Locale extends ILocale {
      * 登録
      */
     "registration": string;
-    /**
-     * 誰でも新規登録できるようにする
-     */
-    "enableRegistration": string;
     /**
      * 招待
      */
@@ -5218,6 +5214,10 @@ export interface Locale extends ILocale {
      * 利用可能なロール
      */
     "availableRoles": string;
+    /**
+     * 注意事項を理解した上でオンにします。
+     */
+    "acknowledgeNotesAndEnable": string;
     "_accountSettings": {
         /**
          * コンテンツの表示にログインを必須にする
@@ -5794,6 +5794,14 @@ export interface Locale extends ILocale {
          * サーバー運営者へのお問い合わせフォームのURLや、運営者の連絡先等が記載されたWebページのURLを指定します。
          */
         "inquiryUrlDescription": string;
+        /**
+         * アカウントの作成をオープンにする
+         */
+        "openRegistration": string;
+        /**
+         * 登録を開放することはリスクが伴います。サーバーを常に監視し、トラブルが発生した際にすぐに対応できる体制がある場合のみオンにすることを推奨します。
+         */
+        "openRegistrationWarning": string;
         /**
          * 一定期間モデレーターのアクティビティが検出されなかった場合、スパム防止のためこの設定は自動でオフになります。
          */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 439ae708c5..9f32969a79 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -382,7 +382,6 @@ enableLocalTimeline: "ローカルタイムラインを有効にする"
 enableGlobalTimeline: "グローバルタイムラインを有効にする"
 disablingTimelinesInfo: "これらのタイムラインを無効化しても、利便性のため管理者およびモデレーターは引き続き利用することができます。"
 registration: "登録"
-enableRegistration: "誰でも新規登録できるようにする"
 invite: "招待"
 driveCapacityPerLocalAccount: "ローカルユーザーひとりあたりのドライブ容量"
 driveCapacityPerRemoteAccount: "リモートユーザーひとりあたりのドライブ容量"
@@ -1300,6 +1299,7 @@ thisContentsAreMarkedAsSigninRequiredByAuthor: "投稿者により、表示に
 lockdown: "ロックダウン"
 pleaseSelectAccount: "アカウントを選択してください"
 availableRoles: "利用可能なロール"
+acknowledgeNotesAndEnable: "注意事項を理解した上でオンにします。"
 
 _accountSettings:
   requireSigninToViewContents: "コンテンツの表示にログインを必須にする"
@@ -1466,6 +1466,8 @@ _serverSettings:
   reactionsBufferingDescription: "有効にすると、リアクション作成時のパフォーマンスが大幅に向上し、データベースへの負荷を軽減することが可能です。ただし、Redisのメモリ使用量は増加します。"
   inquiryUrl: "問い合わせ先URL"
   inquiryUrlDescription: "サーバー運営者へのお問い合わせフォームのURLや、運営者の連絡先等が記載されたWebページのURLを指定します。"
+  openRegistration: "アカウントの作成をオープンにする"
+  openRegistrationWarning: "登録を開放することはリスクが伴います。サーバーを常に監視し、トラブルが発生した際にすぐに対応できる体制がある場合のみオンにすることを推奨します。"
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "一定期間モデレーターのアクティビティが検出されなかった場合、スパム防止のためこの設定は自動でオフになります。"
 
 _accountMigration:
diff --git a/packages/frontend/src/pages/admin/moderation.vue b/packages/frontend/src/pages/admin/moderation.vue
index 5d8a581b2e..ac1fe7783c 100644
--- a/packages/frontend/src/pages/admin/moderation.vue
+++ b/packages/frontend/src/pages/admin/moderation.vue
@@ -10,9 +10,12 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<MkSpacer :contentMax="700" :marginMin="16" :marginMax="32">
 			<FormSuspense :p="init">
 				<div class="_gaps_m">
-					<MkSwitch v-model="enableRegistration" @change="onChange_enableRegistration">
-						<template #label>{{ i18n.ts.enableRegistration }}</template>
-						<template #caption>{{ i18n.ts._serverSettings.thisSettingWillAutomaticallyOffWhenModeratorsInactive }}</template>
+					<MkSwitch :modelValue="enableRegistration" @update:modelValue="onChange_enableRegistration">
+						<template #label>{{ i18n.ts._serverSettings.openRegistration }}</template>
+						<template #caption>
+							<div>{{ i18n.ts._serverSettings.thisSettingWillAutomaticallyOffWhenModeratorsInactive }}</div>
+							<div><i class="ti ti-alert-triangle" style="color: var(--MI_THEME-warn);"></i> {{ i18n.ts._serverSettings.openRegistrationWarning }}</div>
+						</template>
 					</MkSwitch>
 
 					<MkSwitch v-model="emailRequiredForSignup" @change="onChange_emailRequiredForSignup">
@@ -164,7 +167,17 @@ async function init() {
 	mediaSilencedHosts.value = meta.mediaSilencedHosts.join('\n');
 }
 
-function onChange_enableRegistration(value: boolean) {
+async function onChange_enableRegistration(value: boolean) {
+	if (value) {
+		const { canceled } = await os.confirm({
+			type: 'warning',
+			text: i18n.ts.acknowledgeNotesAndEnable,
+		});
+		if (canceled) return;
+	}
+
+	enableRegistration.value = value;
+
 	os.apiWithDialog('admin/update-meta', {
 		disableRegistration: !value,
 	}).then(() => {
-- 
2.45.2


From b3c2de2b2643d777d360de0171ae573f39411c02 Mon Sep 17 00:00:00 2001
From: CDN <cardinal@codeword.info>
Date: Sat, 16 Nov 2024 17:53:28 +0800
Subject: [PATCH 04/20] fix(backend): fallback sharedInbox to null in
 ApPersonService (#14970)

---
 .../backend/src/core/activitypub/models/ApPersonService.ts  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index c9de67b3a0..8c4e40c561 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -355,7 +355,7 @@ export class ApPersonService implements OnModuleInit {
 					usernameLower: person.preferredUsername?.toLowerCase(),
 					host,
 					inbox: person.inbox,
-					sharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox,
+					sharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox ?? null,
 					followersUri: person.followers ? getApId(person.followers) : undefined,
 					featured: person.featured ? getApId(person.featured) : undefined,
 					uri: person.id,
@@ -521,7 +521,7 @@ export class ApPersonService implements OnModuleInit {
 		const updates = {
 			lastFetchedAt: new Date(),
 			inbox: person.inbox,
-			sharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox,
+			sharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox ?? null,
 			followersUri: person.followers ? getApId(person.followers) : undefined,
 			featured: person.featured,
 			emojis: emojiNames,
@@ -593,7 +593,7 @@ export class ApPersonService implements OnModuleInit {
 		// 該当ユーザーが既にフォロワーになっていた場合はFollowingもアップデートする
 		await this.followingsRepository.update(
 			{ followerId: exist.id },
-			{ followerSharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox },
+			{ followerSharedInbox: person.sharedInbox ?? person.endpoints?.sharedInbox ?? null },
 		);
 
 		await this.updateFeatured(exist.id, resolver).catch(err => this.logger.error(err));
-- 
2.45.2


From 9614f74bf842c9522c877f0592a1e0de0ca51140 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 16 Nov 2024 20:24:31 +0900
Subject: [PATCH 05/20] =?UTF-8?q?=F0=9F=8E=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/settings/privacy.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/settings/privacy.vue b/packages/frontend/src/pages/settings/privacy.vue
index da3d36b31a..40d9be0f60 100644
--- a/packages/frontend/src/pages/settings/privacy.vue
+++ b/packages/frontend/src/pages/settings/privacy.vue
@@ -48,7 +48,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<template #label>{{ i18n.ts.lockdown }}<span class="_beta">{{ i18n.ts.beta }}</span></template>
 
 		<div class="_gaps_m">
-			<MkSwitch v-model="requireSigninToViewContents" @update:modelValue="save()">
+			<MkSwitch :modelValue="requireSigninToViewContents" @update:modelValue="update_requireSigninToViewContents">
 				{{ i18n.ts._accountSettings.requireSigninToViewContents }}
 				<template #caption>
 					<div>{{ i18n.ts._accountSettings.requireSigninToViewContentsDescription1 }}</div>
@@ -172,6 +172,7 @@ import { definePageMetadata } from '@/scripts/page-metadata.js';
 import FormSlot from '@/components/form/slot.vue';
 import { formatDateTimeString } from '@/scripts/format-time-string.js';
 import MkInput from '@/components/MkInput.vue';
+import * as os from '@/os.js';
 
 const $i = signinRequired();
 
@@ -217,6 +218,19 @@ watch([makeNotesFollowersOnlyBefore, makeNotesHiddenBefore], () => {
 	save();
 });
 
+async function update_requireSigninToViewContents(value: boolean) {
+	if (value) {
+		const { canceled } = await os.confirm({
+			type: 'warning',
+			text: i18n.ts.acknowledgeNotesAndEnable,
+		});
+		if (canceled) return;
+	}
+
+	requireSigninToViewContents.value = value;
+	save();
+}
+
 function save() {
 	misskeyApi('i/update', {
 		isLocked: !!isLocked.value,
-- 
2.45.2


From a730045bdde20409ff01d95afcf3b7571e371aa5 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 17 Nov 2024 12:44:44 +0900
Subject: [PATCH 06/20] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 232d52d7e1..65ff53eff1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,8 @@
   (Based on https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/588)  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/715)
 - Enhance: リモートユーザーの照会をオリジナルにリダイレクトするように
+- Fix: sharedInboxが無いActorに紐づくリモートユーザーを照会できない
+- Fix: Aproving request from GtS appears with some delay
 - Fix: フォロワーへのメッセージの絵文字をemojisに含めるように
 - Fix: Nested proxy requestsを検出した際にブロックするように
   [ghsa-gq5q-c77c-v236](https://github.com/misskey-dev/misskey/security/advisories/ghsa-gq5q-c77c-v236)
-- 
2.45.2


From 9aebf0c168405910118c25d34686e8eed9a459c0 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 17 Nov 2024 14:15:38 +0900
Subject: [PATCH 07/20] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65ff53eff1..aabd9f000c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ### Note
 - Node.js 20.xは非推奨になりました。Node.js 22.x (LTS)の利用を推奨します。
+  - なお、Node.js 23.xは対応していません。
 - DockerのNode.jsが22.11.0に更新されました
 
 ### General
-- 
2.45.2


From 00b8d0c0720406e5003bf193b8046ee9d11ee1df Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 17 Nov 2024 17:32:28 +0900
Subject: [PATCH 08/20] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f8af6b3df0..fcce19405b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -101,6 +101,20 @@ Be willing to comment on the good points and not just the things you want fixed
 	- Are there any omissions or gaps?
 	- Does it check for anomalies?
 
+## Security Advisory
+### For reporter
+Thank you for your reporting!
+
+If you can also create a patch to fix the vulnerability, please create a PR on the private fork.
+
+> ![note]
+> There is a GitHub bug that prevents merging if a PR not following the develop branch of upstream, so please follow the develop branch.
+
+### For misskey-dev member
+修正PRがdevelopに追従されていないとマージできないので、マージできなかったら
+> Could you merge or rebase onto upstream develop branch?
+などと伝える。
+
 ## Deploy
 The `/deploy` command by issue comment can be used to deploy the contents of a PR to the preview environment.
 ```
-- 
2.45.2


From 032dfc782d14d33544559ca9249b396fbd0df41b Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 17 Nov 2024 17:33:12 +0900
Subject: [PATCH 09/20] Update CONTRIBUTING.md

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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index fcce19405b..53d3e57efb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -107,7 +107,7 @@ Thank you for your reporting!
 
 If you can also create a patch to fix the vulnerability, please create a PR on the private fork.
 
-> ![note]
+> [!note]
 > There is a GitHub bug that prevents merging if a PR not following the develop branch of upstream, so please follow the develop branch.
 
 ### For misskey-dev member
-- 
2.45.2


From 42f9586fc69c5d394a87c94cc89ab152b23f9f8f Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 17 Nov 2024 17:33:50 +0900
Subject: [PATCH 10/20] Update CONTRIBUTING.md

---
 CONTRIBUTING.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 53d3e57efb..1c777259d2 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -108,11 +108,13 @@ Thank you for your reporting!
 If you can also create a patch to fix the vulnerability, please create a PR on the private fork.
 
 > [!note]
-> There is a GitHub bug that prevents merging if a PR not following the develop branch of upstream, so please follow the develop branch.
+> There is a GitHub bug that prevents merging if a PR not following the develop branch of upstream, so please keep follow the develop branch.
 
 ### For misskey-dev member
 修正PRがdevelopに追従されていないとマージできないので、マージできなかったら
+
 > Could you merge or rebase onto upstream develop branch?
+
 などと伝える。
 
 ## Deploy
-- 
2.45.2


From eed45c7915b3b03832d4831263b6b3140a1584be Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 17 Nov 2024 17:35:27 +0900
Subject: [PATCH 11/20] Update SECURITY.md

---
 SECURITY.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/SECURITY.md b/SECURITY.md
index fc5dec5de4..04567baf07 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,3 +6,10 @@ This will allow us to assess the risk, and make a fix available before we add a
 bug report to the GitHub repository.
 
 Thanks for helping make Misskey safe for everyone.
+
+## When create a patch
+
+If you can also create a patch to fix the vulnerability, please create a PR on the private fork.
+
+> [!note]
+> There is a GitHub bug that prevents merging if a PR not following the develop branch of upstream, so please keep follow the develop branch.
-- 
2.45.2


From 0df6c7917217adb49697049e074934d798139509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?=
 <46447427+samunohito@users.noreply.github.com>
Date: Mon, 18 Nov 2024 10:36:51 +0900
Subject: [PATCH 12/20] =?UTF-8?q?enhance(frontend):=20=E3=83=87=E3=83=83?=
 =?UTF-8?q?=E3=82=AD=E8=A1=A8=E7=A4=BA=E6=99=82=E3=81=AB=E3=82=B5=E3=82=A4?=
 =?UTF-8?q?=E3=83=89=E3=83=90=E3=83=BC=E3=82=92=E5=B1=95=E9=96=8B=E3=83=BB?=
 =?UTF-8?q?=E6=8A=98=E3=82=8A=E3=81=9F=E3=81=9F=E3=81=BF=E3=81=A7=E3=81=8D?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#14983)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance(frontend): デッキ表示時にサイドバーを展開・折りたたみできるように

* wip

* wip

* Update navbar.vue

* ✌️

* Update CHANGELOG.md

* 🎨

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 CHANGELOG.md                                  |  1 +
 .../frontend/src/pages/settings/navbar.vue    |  4 --
 packages/frontend/src/ui/_common_/navbar.vue  | 67 ++++++++++++++++++-
 3 files changed, 65 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aabd9f000c..53cb13d273 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
 - Enhance: ノート詳細画面にロールのバッジを表示
 - Enhance: 過去に送信したフォローリクエストを確認できるように  
   (Based on https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/663)
+- Enhance: サイドバーを簡単に展開・折りたたみできるように ( #14981 )
 - Fix: 通知の範囲指定の設定項目が必要ない通知設定でも範囲指定の設定がでている問題を修正
 - Fix: Turnstileが失敗・期限切れした際にも成功扱いとなってしまう問題を修正  
   (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/768)
diff --git a/packages/frontend/src/pages/settings/navbar.vue b/packages/frontend/src/pages/settings/navbar.vue
index b189db0f8f..c38cdc4fc2 100644
--- a/packages/frontend/src/pages/settings/navbar.vue
+++ b/packages/frontend/src/pages/settings/navbar.vue
@@ -100,10 +100,6 @@ function reset() {
 	}));
 }
 
-watch(menuDisplay, async () => {
-	await reloadAsk({ reason: i18n.ts.reloadToApplySetting, unison: true });
-});
-
 const headerActions = computed(() => []);
 
 const headerTabs = computed(() => []);
diff --git a/packages/frontend/src/ui/_common_/navbar.vue b/packages/frontend/src/ui/_common_/navbar.vue
index 8ae11efa2c..8fc76741e3 100644
--- a/packages/frontend/src/ui/_common_/navbar.vue
+++ b/packages/frontend/src/ui/_common_/navbar.vue
@@ -56,6 +56,21 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</button>
 		</div>
 	</div>
+	<button v-if="!forceIconOnly" class="_button" :class="$style.toggleButton" @click="toggleIconOnly">
+		<!--
+		<svg viewBox="0 0 16 48" :class="$style.toggleButtonShape">
+			<g transform="matrix(0.333333,0,0,0.222222,0.000895785,13.3333)">
+				<path d="M23.935,-24C37.223,-24 47.995,-7.842 47.995,12.09C47.995,34.077 47.995,62.07 47.995,84.034C47.995,93.573 45.469,102.721 40.972,109.466C36.475,116.211 30.377,120 24.018,120L23.997,120C10.743,120 -0.003,136.118 -0.003,156C-0.003,156 -0.003,156 -0.003,156L-0.003,-60L-0.003,-59.901C-0.003,-50.379 2.519,-41.248 7.007,-34.515C11.496,-27.782 17.584,-24 23.931,-24C23.932,-24 23.934,-24 23.935,-24Z" style="fill:var(--MI_THEME-navBg);"/>
+			</g>
+		</svg>
+		-->
+		<svg viewBox="0 0 16 64" :class="$style.toggleButtonShape">
+			<g transform="matrix(0.333333,0,0,0.222222,0.000895785,21.3333)">
+				<path d="M47.488,7.995C47.79,10.11 47.943,12.266 47.943,14.429C47.997,26.989 47.997,84 47.997,84C47.997,84 44.018,118.246 23.997,133.5C-0.374,152.07 -0.003,192 -0.003,192L-0.003,-96C-0.003,-96 0.151,-56.216 23.997,-37.5C40.861,-24.265 46.043,-1.243 47.488,7.995Z" style="fill:var(--MI_THEME-navBg);"/>
+			</g>
+		</svg>
+		<i :class="'ti ' + `ti-chevron-${ iconOnly ? 'right' : 'left' }`" style="font-size: 12px; margin-left: -8px;"></i>
+	</button>
 </div>
 </template>
 
@@ -80,9 +95,11 @@ const otherMenuItemIndicated = computed(() => {
 	return false;
 });
 
-const calcViewState = () => {
-	iconOnly.value = (window.innerWidth <= 1279) || (defaultStore.state.menuDisplay === 'sideIcon');
-};
+const forceIconOnly = window.innerWidth <= 1279;
+
+function calcViewState() {
+	iconOnly.value = forceIconOnly || (defaultStore.state.menuDisplay === 'sideIcon');
+}
 
 calcViewState();
 
@@ -92,6 +109,10 @@ watch(defaultStore.reactiveState.menuDisplay, () => {
 	calcViewState();
 });
 
+function toggleIconOnly() {
+	defaultStore.set('menuDisplay', iconOnly.value ? 'sideFull' : 'sideIcon');
+}
+
 function openAccountMenu(ev: MouseEvent) {
 	openAccountMenu_({
 		withExtraOperation: true,
@@ -133,6 +154,38 @@ function more(ev: MouseEvent) {
 	contain: strict;
 	display: flex;
 	flex-direction: column;
+	direction: rtl; // スクロールバーを左に表示したいため
+}
+
+.top {
+	direction: ltr;
+}
+
+.middle {
+	direction: ltr;
+}
+
+.bottom {
+	direction: ltr;
+}
+
+.toggleButton {
+	position: fixed;
+	bottom: 20px;
+	left: var(--nav-width);
+	z-index: 1001;
+	width: 16px;
+	height: 64px;
+	box-sizing: border-box;
+}
+
+.toggleButtonShape {
+	position: absolute;
+	z-index: -1;
+	top: 0;
+	left: 0;
+	width: 16px;
+	height: 64px;
 }
 
 .root:not(.iconOnly) {
@@ -363,6 +416,10 @@ function more(ev: MouseEvent) {
 		position: relative;
 		font-size: 0.9em;
 	}
+
+	.toggleButton {
+		left: var(--nav-width);
+	}
 }
 
 .root.iconOnly {
@@ -563,5 +620,9 @@ function more(ev: MouseEvent) {
 			font-size: 10px;
 		}
 	}
+
+	.toggleButton {
+		left: var(--nav-icon-only-width);
+	}
 }
 </style>
-- 
2.45.2


From 81348f1277f598c442c425292597c53c183570d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Tue, 19 Nov 2024 10:22:47 +0900
Subject: [PATCH 13/20] =?UTF-8?q?fix(frontend):=20TypeScript=E3=81=AE?=
 =?UTF-8?q?=E5=9E=8B=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E5=AF=BE=E8=B1=A1?=
 =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E9=99=90=E5=AE=9A?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E9=AB=98=E9=80=9F=E5=8C=96=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=20(#14994)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix frontend tsconfig includes

* fix frontend-embed tsconfig includes

* fix eslint in frontend / frontend-embed

* Update Changelog

---------

Co-authored-by: Hazelnoot <acomputerdog@gmail.com>
---
 CHANGELOG.md                          | 2 ++
 packages/frontend-embed/tsconfig.json | 7 ++++---
 packages/frontend/tsconfig.json       | 7 +++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53cb13d273..9bafcebfa5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,8 @@
 - Fix: メールアドレス登録有効化時の「完了」ダイアログボックスの表示条件を修正
 - Fix: 画面幅が狭い環境でデザインが崩れる問題を修正  
 	(Cherry-picked from https://github.com/MisskeyIO/misskey/pull/815)
+- Fix: TypeScriptの型チェック対象ファイルを限定してビルドを高速化するように  
+	(Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/725)
 
 ### Server
 - Enhance: DockerのNode.jsを22.11.0に更新
diff --git a/packages/frontend-embed/tsconfig.json b/packages/frontend-embed/tsconfig.json
index 3701343623..45f933dc28 100644
--- a/packages/frontend-embed/tsconfig.json
+++ b/packages/frontend-embed/tsconfig.json
@@ -33,7 +33,7 @@
 			"./node_modules"
 		],
 		"types": [
-			"vite/client",
+			"vite/client"
 		],
 		"lib": [
 			"esnext",
@@ -44,8 +44,9 @@
 	},
 	"compileOnSave": false,
 	"include": [
-		"./**/*.ts",
-		"./**/*.vue"
+		"./src/**/*.ts",
+		"./src/**/*.vue",
+		"./@types/**/*.ts"
 	],
 	"exclude": [
 		".storybook/**/*"
diff --git a/packages/frontend/tsconfig.json b/packages/frontend/tsconfig.json
index b88773b598..4e5ca7f559 100644
--- a/packages/frontend/tsconfig.json
+++ b/packages/frontend/tsconfig.json
@@ -45,8 +45,11 @@
 	},
 	"compileOnSave": false,
 	"include": [
-		"./**/*.ts",
-		"./**/*.vue"
+		"./src/**/*.ts",
+		"./src/**/*.vue",
+		"./test/**/*.ts",
+		"./test/**/*.vue",
+		"./@types/**/*.ts"
 	],
 	"exclude": [
 		".storybook/**/*"
-- 
2.45.2


From e800c0f85ad968dc1505463cc5e4cf0c8ea862fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A5=BA=E5=AD=90w=20=28Yumechi=29?=
 <35571479+eternal-flame-AD@users.noreply.github.com>
Date: Mon, 18 Nov 2024 19:29:42 -0600
Subject: [PATCH 14/20] =?UTF-8?q?fix(backend):=20=E3=81=8A=E7=9F=A5?=
 =?UTF-8?q?=E3=82=89=E3=81=9B=E4=BD=9C=E6=88=90=E6=99=82=E3=81=AB=E7=94=BB?=
 =?UTF-8?q?=E5=83=8FURL=E5=85=A5=E5=8A=9B=E6=AC=84=E3=82=92=E7=A9=BA?=
 =?UTF-8?q?=E6=AC=84=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=A7=E3=81=8D=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20=20(#14990)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(backend): アナウンスメントを作成ときに画像URLを後悔できないのを修正

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>

* Update CHANGELOG.md

Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>

---------

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
Co-authored-by: おさむのひと <46447427+samunohito@users.noreply.github.com>
---
 CHANGELOG.md                                                 | 1 +
 packages/backend/src/core/AnnouncementService.ts             | 2 +-
 .../src/server/api/endpoints/admin/announcements/create.ts   | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9bafcebfa5..fe132a2098 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@
 ### General
 - Feat: コンテンツの表示にログインを必須にできるように
 - Feat: 過去のノートを非公開化/フォロワーのみ表示可能にできるように
+- Fix: お知らせ作成時に画像URL入力欄を空欄に変更できないのを修正 ( #14976 )
 - Enhance: 依存関係の更新
 - Enhance: l10nの更新
 
diff --git a/packages/backend/src/core/AnnouncementService.ts b/packages/backend/src/core/AnnouncementService.ts
index d4fcf19439..a9f6731977 100644
--- a/packages/backend/src/core/AnnouncementService.ts
+++ b/packages/backend/src/core/AnnouncementService.ts
@@ -72,7 +72,7 @@ export class AnnouncementService {
 			updatedAt: null,
 			title: values.title,
 			text: values.text,
-			imageUrl: values.imageUrl,
+			imageUrl: values.imageUrl || null,
 			icon: values.icon,
 			display: values.display,
 			forExistingUsers: values.forExistingUsers,
diff --git a/packages/backend/src/server/api/endpoints/admin/announcements/create.ts b/packages/backend/src/server/api/endpoints/admin/announcements/create.ts
index 2dae1df87d..b8bfda73a4 100644
--- a/packages/backend/src/server/api/endpoints/admin/announcements/create.ts
+++ b/packages/backend/src/server/api/endpoints/admin/announcements/create.ts
@@ -55,7 +55,7 @@ export const paramDef = {
 	properties: {
 		title: { type: 'string', minLength: 1 },
 		text: { type: 'string', minLength: 1 },
-		imageUrl: { type: 'string', nullable: true, minLength: 1 },
+		imageUrl: { type: 'string', nullable: true, minLength: 0 },
 		icon: { type: 'string', enum: ['info', 'warning', 'error', 'success'], default: 'info' },
 		display: { type: 'string', enum: ['normal', 'banner', 'dialog'], default: 'normal' },
 		forExistingUsers: { type: 'boolean', default: false },
@@ -76,7 +76,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				updatedAt: null,
 				title: ps.title,
 				text: ps.text,
-				imageUrl: ps.imageUrl,
+				/* eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- 空の文字列の場合、nullを渡すようにするため */
+				imageUrl: ps.imageUrl || null,
 				icon: ps.icon,
 				display: ps.display,
 				forExistingUsers: ps.forExistingUsers,
-- 
2.45.2


From c271534abafe3a05783eab49ba21707ae2dcd531 Mon Sep 17 00:00:00 2001
From: FineArchs <133759614+FineArchs@users.noreply.github.com>
Date: Tue, 19 Nov 2024 10:34:33 +0900
Subject: [PATCH 15/20] =?UTF-8?q?=E3=83=AA=E3=83=8E=E3=83=BC=E3=83=88?=
 =?UTF-8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=81=AB=E3=80=8C=E3=83=AA?=
 =?UTF-8?q?=E3=83=8E=E3=83=BC=E3=83=88=E3=81=AE=E8=A9=B3=E7=B4=B0=E3=80=8D?=
 =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=20(#14985)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add renote-detail menu

* changelog

* Apply suggestions from code review

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>

* Update CHANGELOG.md

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
---
 CHANGELOG.md                                |  1 +
 locales/index.d.ts                          |  4 ++++
 locales/ja-JP.yml                           |  1 +
 packages/frontend/src/components/MkNote.vue | 10 ++++++++++
 4 files changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe132a2098..058e41c486 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 - Enhance: 過去に送信したフォローリクエストを確認できるように  
   (Based on https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/663)
 - Enhance: サイドバーを簡単に展開・折りたたみできるように ( #14981 )
+- Enhance: リノートメニューに「リノートの詳細」を追加
 - Fix: 通知の範囲指定の設定項目が必要ない通知設定でも範囲指定の設定がでている問題を修正
 - Fix: Turnstileが失敗・期限切れした際にも成功扱いとなってしまう問題を修正  
   (Cherry-picked from https://github.com/MisskeyIO/misskey/pull/768)
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 24613419ce..0ae188f1f7 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -2362,6 +2362,10 @@ export interface Locale extends ILocale {
      * 詳細
      */
     "details": string;
+    /**
+     * リノートの詳細
+     */
+    "renoteDetails": string;
     /**
      * 絵文字を選択
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 9f32969a79..1b59708d85 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -586,6 +586,7 @@ masterVolume: "マスター音量"
 notUseSound: "サウンドを出力しない"
 useSoundOnlyWhenActive: "Misskeyがアクティブな時のみサウンドを出力する"
 details: "詳細"
+renoteDetails: "リノートの詳細"
 chooseEmoji: "絵文字を選択"
 unableToProcess: "操作を完了できません"
 recentUsed: "最近使用"
diff --git a/packages/frontend/src/components/MkNote.vue b/packages/frontend/src/components/MkNote.vue
index cf0d0787b1..1a8814b7cb 100644
--- a/packages/frontend/src/components/MkNote.vue
+++ b/packages/frontend/src/components/MkNote.vue
@@ -187,6 +187,7 @@ import MkUrlPreview from '@/components/MkUrlPreview.vue';
 import MkInstanceTicker from '@/components/MkInstanceTicker.vue';
 import { pleaseLogin, type OpenOnRemoteOptions } from '@/scripts/please-login.js';
 import { checkWordMute } from '@/scripts/check-word-mute.js';
+import { notePage } from '@/filters/note.js';
 import { userPage } from '@/filters/user.js';
 import number from '@/filters/number.js';
 import * as os from '@/os.js';
@@ -566,15 +567,24 @@ function showRenoteMenu(): void {
 		};
 	}
 
+	const renoteDetailsMenu: MenuItem = {
+		type: 'link',
+		text: i18n.ts.renoteDetails,
+		icon: 'ti ti-info-circle',
+		to: notePage(note.value),
+	};
+
 	if (isMyRenote) {
 		pleaseLogin({ openOnRemote: pleaseLoginContext.value });
 		os.popupMenu([
+			renoteDetailsMenu,
 			getCopyNoteLinkMenu(note.value, i18n.ts.copyLinkRenote),
 			{ type: 'divider' },
 			getUnrenote(),
 		], renoteTime.value);
 	} else {
 		os.popupMenu([
+			renoteDetailsMenu,
 			getCopyNoteLinkMenu(note.value, i18n.ts.copyLinkRenote),
 			{ type: 'divider' },
 			getAbuseNoteMenu(note.value, i18n.ts.reportAbuseRenote),
-- 
2.45.2


From 7b9c884a5d550b126c627fac18064fc3a8ca177a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8A=E3=81=95=E3=82=80=E3=81=AE=E3=81=B2=E3=81=A8?=
 <46447427+samunohito@users.noreply.github.com>
Date: Tue, 19 Nov 2024 10:41:39 +0900
Subject: [PATCH 16/20] =?UTF-8?q?refactor(backend):=20SystemWebhook?=
 =?UTF-8?q?=E3=81=A7=E9=80=81=E4=BF=A1=E3=81=95=E3=82=8C=E3=82=8B=E3=83=9A?=
 =?UTF-8?q?=E3=82=A4=E3=83=AD=E3=83=BC=E3=83=89=E3=81=AE=E5=9E=8B=E3=82=92?=
 =?UTF-8?q?=E8=BF=BD=E5=8A=A0=20(#14980)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/AbuseReportNotificationService.ts    |  6 ++--
 packages/backend/src/core/QueueService.ts     | 13 +++----
 .../backend/src/core/SystemWebhookService.ts  | 33 ++++++++++++++++-
 .../backend/src/core/WebhookTestService.ts    | 36 +++++++++----------
 .../backend/src/models/AbuseUserReport.ts     |  4 ++-
 5 files changed, 63 insertions(+), 29 deletions(-)

diff --git a/packages/backend/src/core/AbuseReportNotificationService.ts b/packages/backend/src/core/AbuseReportNotificationService.ts
index 25e265f2b1..742e2621fd 100644
--- a/packages/backend/src/core/AbuseReportNotificationService.ts
+++ b/packages/backend/src/core/AbuseReportNotificationService.ts
@@ -154,9 +154,9 @@ export class AbuseReportNotificationService implements OnApplicationShutdown {
 		const convertedReports = abuseReports.map(it => {
 			return {
 				...it,
-				reporter: usersMap.get(it.reporterId),
-				targetUser: usersMap.get(it.targetUserId),
-				assignee: it.assigneeId ? usersMap.get(it.assigneeId) : null,
+				reporter: usersMap.get(it.reporterId) ?? null,
+				targetUser: usersMap.get(it.targetUserId) ?? null,
+				assignee: it.assigneeId ? (usersMap.get(it.assigneeId) ?? null) : null,
 			};
 		});
 
diff --git a/packages/backend/src/core/QueueService.ts b/packages/backend/src/core/QueueService.ts
index 50f08da241..da76dd1284 100644
--- a/packages/backend/src/core/QueueService.ts
+++ b/packages/backend/src/core/QueueService.ts
@@ -7,13 +7,15 @@ import { randomUUID } from 'node:crypto';
 import { Inject, Injectable } from '@nestjs/common';
 import type { IActivity } from '@/core/activitypub/type.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
-import type { MiWebhook, WebhookEventTypes, webhookEventTypes } from '@/models/Webhook.js';
+import type { MiWebhook, WebhookEventTypes } from '@/models/Webhook.js';
 import type { MiSystemWebhook, SystemWebhookEventType } from '@/models/SystemWebhook.js';
 import type { Config } from '@/config.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import type { Antenna } from '@/server/api/endpoints/i/import-antennas.js';
 import { ApRequestCreator } from '@/core/activitypub/ApRequestService.js';
+import { type SystemWebhookPayload } from '@/core/SystemWebhookService.js';
+import { type UserWebhookPayload } from './UserWebhookService.js';
 import type {
 	DbJobData,
 	DeliverJobData,
@@ -30,12 +32,11 @@ import type {
 	ObjectStorageQueue,
 	RelationshipQueue,
 	SystemQueue,
-	UserWebhookDeliverQueue,
 	SystemWebhookDeliverQueue,
+	UserWebhookDeliverQueue,
 } from './QueueModule.js';
 import type httpSignature from '@peertube/http-signature';
 import type * as Bull from 'bullmq';
-import { type UserWebhookPayload } from './UserWebhookService.js';
 
 @Injectable()
 export class QueueService {
@@ -501,10 +502,10 @@ export class QueueService {
 	 * @see SystemWebhookDeliverProcessorService
 	 */
 	@bindThis
-	public systemWebhookDeliver(
+	public systemWebhookDeliver<T extends SystemWebhookEventType>(
 		webhook: MiSystemWebhook,
-		type: SystemWebhookEventType,
-		content: unknown,
+		type: T,
+		content: SystemWebhookPayload<T>,
 		opts?: { attempts?: number },
 	) {
 		const data: SystemWebhookDeliverJobData = {
diff --git a/packages/backend/src/core/SystemWebhookService.ts b/packages/backend/src/core/SystemWebhookService.ts
index db6407dcb3..de00169612 100644
--- a/packages/backend/src/core/SystemWebhookService.ts
+++ b/packages/backend/src/core/SystemWebhookService.ts
@@ -15,8 +15,39 @@ import { QueueService } from '@/core/QueueService.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import Logger from '@/logger.js';
+import { Packed } from '@/misc/json-schema.js';
+import { AbuseReportResolveType } from '@/models/AbuseUserReport.js';
+import { ModeratorInactivityRemainingTime } from '@/queue/processors/CheckModeratorsActivityProcessorService.js';
 import type { OnApplicationShutdown } from '@nestjs/common';
 
+export type AbuseReportPayload = {
+	id: string;
+	targetUserId: string;
+	targetUser: Packed<'UserLite'> | null;
+	targetUserHost: string | null;
+	reporterId: string;
+	reporter: Packed<'UserLite'> | null;
+	reporterHost: string | null;
+	assigneeId: string | null;
+	assignee: Packed<'UserLite'> | null;
+	resolved: boolean;
+	forwarded: boolean;
+	comment: string;
+	moderationNote: string;
+	resolvedAs: AbuseReportResolveType | null;
+};
+
+export type InactiveModeratorsWarningPayload = {
+	remainingTime: ModeratorInactivityRemainingTime;
+};
+
+export type SystemWebhookPayload<T extends SystemWebhookEventType> =
+	T extends 'abuseReport' | 'abuseReportResolved' ? AbuseReportPayload :
+	T extends 'userCreated' ? Packed<'UserLite'> :
+	T extends 'inactiveModeratorsWarning' ? InactiveModeratorsWarningPayload :
+	T extends 'inactiveModeratorsInvitationOnlyChanged' ? Record<string, never> :
+		never;
+
 @Injectable()
 export class SystemWebhookService implements OnApplicationShutdown {
 	private logger: Logger;
@@ -168,7 +199,7 @@ export class SystemWebhookService implements OnApplicationShutdown {
 	public async enqueueSystemWebhook<T extends SystemWebhookEventType>(
 		webhook: MiSystemWebhook | MiSystemWebhook['id'],
 		type: T,
-		content: unknown,
+		content: SystemWebhookPayload<T>,
 	) {
 		const webhookEntity = typeof webhook === 'string'
 			? (await this.fetchActiveSystemWebhooks()).find(a => a.id === webhook)
diff --git a/packages/backend/src/core/WebhookTestService.ts b/packages/backend/src/core/WebhookTestService.ts
index b1ea7974fb..555a39f71c 100644
--- a/packages/backend/src/core/WebhookTestService.ts
+++ b/packages/backend/src/core/WebhookTestService.ts
@@ -7,7 +7,7 @@ import { Injectable } from '@nestjs/common';
 import { MiAbuseUserReport, MiNote, MiUser, MiWebhook } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
 import { MiSystemWebhook, type SystemWebhookEventType } from '@/models/SystemWebhook.js';
-import { SystemWebhookService } from '@/core/SystemWebhookService.js';
+import { AbuseReportPayload, SystemWebhookPayload, SystemWebhookService } from '@/core/SystemWebhookService.js';
 import { Packed } from '@/misc/json-schema.js';
 import { type WebhookEventTypes } from '@/models/Webhook.js';
 import { type UserWebhookPayload, UserWebhookService } from '@/core/UserWebhookService.js';
@@ -16,13 +16,7 @@ import { ModeratorInactivityRemainingTime } from '@/queue/processors/CheckModera
 
 const oneDayMillis = 24 * 60 * 60 * 1000;
 
-type AbuseUserReportDto = Omit<MiAbuseUserReport, 'targetUser' | 'reporter' | 'assignee'> & {
-	targetUser: Packed<'UserLite'> | null,
-	reporter: Packed<'UserLite'> | null,
-	assignee: Packed<'UserLite'> | null,
-};
-
-function generateAbuseReport(override?: Partial<MiAbuseUserReport>): AbuseUserReportDto {
+function generateAbuseReport(override?: Partial<MiAbuseUserReport>): AbuseReportPayload {
 	const result: MiAbuseUserReport = {
 		id: 'dummy-abuse-report1',
 		targetUserId: 'dummy-target-user',
@@ -389,7 +383,8 @@ export class WebhookTestService {
 				break;
 			}
 			// まだ実装されていない (#9485)
-			case 'reaction': return;
+			case 'reaction':
+				return;
 			default: {
 				// eslint-disable-next-line @typescript-eslint/no-unused-vars
 				const _exhaustiveAssertion: never = params.type;
@@ -407,10 +402,10 @@ export class WebhookTestService {
 	 * - 送信対象イベント（on）に関する設定
 	 */
 	@bindThis
-	public async testSystemWebhook(
+	public async testSystemWebhook<T extends SystemWebhookEventType>(
 		params: {
 			webhookId: MiSystemWebhook['id'],
-			type: SystemWebhookEventType,
+			type: T,
 			override?: Partial<Omit<MiSystemWebhook, 'id'>>,
 		},
 	) {
@@ -420,7 +415,7 @@ export class WebhookTestService {
 		}
 
 		const webhook = webhooks[0];
-		const send = (contents: unknown) => {
+		const send = <U extends SystemWebhookEventType>(type: U, contents: SystemWebhookPayload<U>) => {
 			const merged = {
 				...webhook,
 				...params.override,
@@ -428,12 +423,12 @@ export class WebhookTestService {
 
 			// テスト目的なのでSystemWebhookServiceの機能を経由せず直接キューに追加する（チェック処理などをスキップする意図）.
 			// また、Jobの試行回数も1回だけ.
-			this.queueService.systemWebhookDeliver(merged, params.type, contents, { attempts: 1 });
+			this.queueService.systemWebhookDeliver(merged, type, contents, { attempts: 1 });
 		};
 
 		switch (params.type) {
 			case 'abuseReport': {
-				send(generateAbuseReport({
+				send('abuseReport', generateAbuseReport({
 					targetUserId: dummyUser1.id,
 					targetUser: dummyUser1,
 					reporterId: dummyUser2.id,
@@ -442,7 +437,7 @@ export class WebhookTestService {
 				break;
 			}
 			case 'abuseReportResolved': {
-				send(generateAbuseReport({
+				send('abuseReportResolved', generateAbuseReport({
 					targetUserId: dummyUser1.id,
 					targetUser: dummyUser1,
 					reporterId: dummyUser2.id,
@@ -454,7 +449,7 @@ export class WebhookTestService {
 				break;
 			}
 			case 'userCreated': {
-				send(toPackedUserLite(dummyUser1));
+				send('userCreated', toPackedUserLite(dummyUser1));
 				break;
 			}
 			case 'inactiveModeratorsWarning': {
@@ -464,15 +459,20 @@ export class WebhookTestService {
 					asHours: 24,
 				};
 
-				send({
+				send('inactiveModeratorsWarning', {
 					remainingTime: dummyTime,
 				});
 				break;
 			}
 			case 'inactiveModeratorsInvitationOnlyChanged': {
-				send({});
+				send('inactiveModeratorsInvitationOnlyChanged', {});
 				break;
 			}
+			default: {
+				// eslint-disable-next-line @typescript-eslint/no-unused-vars
+				const _exhaustiveAssertion: never = params.type;
+				return;
+			}
 		}
 	}
 }
diff --git a/packages/backend/src/models/AbuseUserReport.ts b/packages/backend/src/models/AbuseUserReport.ts
index cb5672e4ac..d43ebf9342 100644
--- a/packages/backend/src/models/AbuseUserReport.ts
+++ b/packages/backend/src/models/AbuseUserReport.ts
@@ -7,6 +7,8 @@ import { PrimaryColumn, Entity, Index, JoinColumn, Column, ManyToOne } from 'typ
 import { id } from './util/id.js';
 import { MiUser } from './User.js';
 
+export type AbuseReportResolveType = 'accept' | 'reject';
+
 @Entity('abuse_user_report')
 export class MiAbuseUserReport {
 	@PrimaryColumn(id())
@@ -76,7 +78,7 @@ export class MiAbuseUserReport {
 	@Column('varchar', {
 		length: 128, nullable: true,
 	})
-	public resolvedAs: 'accept' | 'reject' | null;
+	public resolvedAs: AbuseReportResolveType | null;
 
 	//#region Denormalized fields
 	@Index()
-- 
2.45.2


From 968f5956060bb15bfcbd5bd79075ea7c8a775d3e Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 19 Nov 2024 12:50:04 +0900
Subject: [PATCH 17/20] New Crowdin updates (#14965)

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

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

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Swedish)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Catalan)

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

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Swedish)

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

* New translations ja-jp.yml (Romanian)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Arabic)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Dutch)

* New translations ja-jp.yml (Norwegian)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Slovak)

* New translations ja-jp.yml (Turkish)

* New translations ja-jp.yml (Ukrainian)

* 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 (Uzbek)

* New translations ja-jp.yml (Lao)

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

* New translations ja-jp.yml (Korean (Gyeongsang))

* 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 Simplified)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Polish)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Swedish)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Swedish)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Chinese Simplified)
---
 locales/ar-SA.yml |   1 -
 locales/bn-BD.yml |   1 -
 locales/ca-ES.yml |   7 +-
 locales/cs-CZ.yml |   1 -
 locales/de-DE.yml | 146 ++++++++++++++++++++++++++++++++-
 locales/en-US.yml |   3 +-
 locales/es-ES.yml |   1 -
 locales/fr-FR.yml | 201 ++++++++++++++++++++++++++++++++++++++++++++--
 locales/id-ID.yml |   1 -
 locales/it-IT.yml |   1 -
 locales/ja-KS.yml |   1 -
 locales/ko-GS.yml |   1 -
 locales/ko-KR.yml |   3 +-
 locales/lo-LA.yml |   1 -
 locales/nl-NL.yml |   1 -
 locales/no-NO.yml |   1 -
 locales/pl-PL.yml |  27 ++++++-
 locales/pt-PT.yml |   1 -
 locales/ro-RO.yml |   1 -
 locales/ru-RU.yml |   1 -
 locales/sk-SK.yml |   1 -
 locales/sv-SE.yml |  19 ++++-
 locales/th-TH.yml |   1 -
 locales/tr-TR.yml |   1 -
 locales/uk-UA.yml |   1 -
 locales/uz-UZ.yml |   1 -
 locales/vi-VN.yml |   1 -
 locales/zh-CN.yml |   8 +-
 locales/zh-TW.yml |   9 ++-
 29 files changed, 404 insertions(+), 39 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index de24ad4bb9..2f1b391b53 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -343,7 +343,6 @@ enableLocalTimeline: "تفعيل الخيط المحلي"
 enableGlobalTimeline: "تفعيل الخيط الزمني الشامل"
 disablingTimelinesInfo: "سيتمكن المديرون والمشرفون من الوصول إلى كل الخيوط الزمنية حتى وإن لم تفعّل."
 registration: "إنشاء حساب"
-enableRegistration: "تفعيل إنشاء الحسابات الجديدة"
 invite: "دعوة"
 driveCapacityPerLocalAccount: "حصة التخزين لكل مستخدم محلي"
 driveCapacityPerRemoteAccount: "حصة التخزين لكل مستخدم بعيد"
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index 0e761b0743..6cd577b4a9 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -339,7 +339,6 @@ enableLocalTimeline: "স্থানীয় টাইমলাইন চাল
 enableGlobalTimeline: "গ্লোবাল টাইমলাইন চালু করুন"
 disablingTimelinesInfo: "আপনি এই টাইমলাইনগুলি বন্ধ করলেও প্রশাসক এবং মডারেটররা এই টাইমলাইনগুলি ব্যাবহার করতে পারবে"
 registration: "নিবন্ধন"
-enableRegistration: "নতুন ব্যাবহারকারী নিবন্ধন চালু করুন"
 invite: "আমন্ত্রণ"
 driveCapacityPerLocalAccount: "প্রত্যেক স্থানীয় ব্যাবহারকারীর জন্য ড্রাইভের জায়গা"
 driveCapacityPerRemoteAccount: "প্রত্যেক রিমোট ব্যাবহারকারীর জন্য ড্রাইভের জায়গা"
diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 048abfd781..b301780972 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -382,7 +382,6 @@ enableLocalTimeline: "Activa la línia de temps local"
 enableGlobalTimeline: "Activa la línia de temps global"
 disablingTimelinesInfo: "Fins i tot si aquestes línies de temps són desactivades, els administradors i els moderadors poden continuar visualitzant per conveniència."
 registration: "Registre"
-enableRegistration: "Permet el registre de nous usuaris"
 invite: "Convida"
 driveCapacityPerLocalAccount: "Capacitat del disc per usuaris locals"
 driveCapacityPerRemoteAccount: "Capacitat del disc per usuaris remots"
@@ -1300,6 +1299,7 @@ thisContentsAreMarkedAsSigninRequiredByAuthor: "L'autor requereix l'inici de ses
 lockdown: "Bloquejat"
 pleaseSelectAccount: "Seleccionar un compte"
 availableRoles: "Roles disponibles "
+acknowledgeNotesAndEnable: "Activa'l després de comprendre els possibles perills."
 _accountSettings:
   requireSigninToViewContents: "És obligatori l'inici de sessió per poder veure el contingut"
   requireSigninToViewContentsDescription1: "Es requereix l'inici de sessió per poder veure totes les notes i el contingut que has creat. Amb això esperem evitar que els rastrejadors recopilin informació."
@@ -1456,6 +1456,8 @@ _serverSettings:
   reactionsBufferingDescription: "Quan s'activa aquesta opció millora bastant el rendiment en recuperar les línies de temps reduint la càrrega de la base. Com a contrapunt, augmentarà  l'ús de memòria de Redís. Desactiva aquesta opció en cas de tenir un servidor amb poca memòria o si tens problemes d'inestabilitat."
   inquiryUrl: "URL de consulta "
   inquiryUrlDescription: "Escriu adreça URL per al formulari de consulta per al mantenidor del servidor o una pàgina web amb el contacte d'informació."
+  openRegistration: "Registres oberts"
+  openRegistrationWarning: "Obrir els registres és arriscat. Es recomana obrir-los només si el servidor és monitorat constantment i per respondre immediatament davant qualsevol problema."
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "Si no es detecta activitat per part del moderador durant un període de temps, aquesta opció es desactiva automàticament per evitar el correu brossa."
 _accountMigration:
   moveFrom: "Migrar un altre compte a aquest"
@@ -2738,3 +2740,6 @@ _selfXssPrevention:
   description1: "Si posa alguna cosa al seu compte, un usuari malintencionat podria segrestar-la o robar-li les dades."
   description2: "Si no entens que estàs fent %cpara ara mateix i tanca la finestra."
   description3: "Per obtenir més informació. {link}"
+_followRequest:
+  recieved: "Sol·licituds rebudes"
+  sent: "Sol·licituds enviades"
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index caf6d6e163..504ba1f8c8 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -348,7 +348,6 @@ enableLocalTimeline: "Povolit lokální čas"
 enableGlobalTimeline: "Povolit globální čas"
 disablingTimelinesInfo: "Administrátoři a Moderátoři budou mít stálý přístup ke všem časovým osám i přes to že nejsou zapnuté."
 registration: "Registrace"
-enableRegistration: "Povolit registraci novým uživatelům"
 invite: "Pozvat"
 driveCapacityPerLocalAccount: "Kapacita disku na lokálního uživatele"
 driveCapacityPerRemoteAccount: "Kapacita disku na vzdáleného uživatele"
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 1aacbabbba..1b3925ef38 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -10,6 +10,7 @@ username: "Benutzername"
 password: "Passwort"
 initialPasswordForSetup: "Initiales Passwort für die Einrichtung"
 initialPasswordIsIncorrect: "Das initiale Passwort für die Einrichtung ist falsch"
+initialPasswordForSetupDescription: "Verwende das in der Konfigurationsdatei angegebene Passwort, wenn du Misskey selbst installiert hast.\nWenn du einen Misskey-Hostingdienst o.ä. nutzt, verwende das dort angegebene Kennwort.\nWenn du kein Passwort festgelegt hast, lasse es leer, um fortzufahren."
 forgotPassword: "Passwort vergessen"
 fetchingAsApObject: "Wird aus dem Fediverse angefragt …"
 ok: "OK"
@@ -111,11 +112,14 @@ enterEmoji: "Gib ein Emoji ein"
 renote: "Renote"
 unrenote: "Renote zurücknehmen"
 renoted: "Renote getätigt."
+renotedToX: "Renoted zu {name}."
 cantRenote: "Renote dieses Beitrags nicht möglich."
 cantReRenote: "Renote einer Renote nicht möglich."
 quote: "Zitieren"
 inChannelRenote: "Kanal-interner Renote"
 inChannelQuote: "Kanal-internes Zitat"
+renoteToChannel: "Renote zu Kanal"
+renoteToOtherChannel: "Renote zu anderem Kanal"
 pinnedNote: "Angeheftete Notiz"
 pinned: "Angeheftet"
 you: "Du"
@@ -127,12 +131,13 @@ reactions: "Reaktionen"
 emojiPicker: "Emoji auswählen"
 pinnedEmojisForReactionSettingDescription: "Lege Emojis fest, die angepinnt werden sollen, um sie beim Reagieren als Erstes anzuzeigen."
 pinnedEmojisSettingDescription: "Lege Emojis fest, die angepinnt werden sollen, um sie in der Emoji-Auswahl als Erstes anzuzeigen"
+emojiPickerDisplay: "Anzeige der Emoji-Auswahl"
 overwriteFromPinnedEmojisForReaction: "Überschreiben mit den Reaktions-Einstellungen"
 overwriteFromPinnedEmojis: "Überschreiben mit den allgemeinen Einstellungen"
 reactionSettingDescription2: "Ziehe um Anzuordnen, klicke um zu löschen, drücke „+“ um hinzuzufügen"
 rememberNoteVisibility: "Notizsichtbarkeit merken"
 attachCancel: "Anhang entfernen"
-deleteFile: "Datei gelöscht"
+deleteFile: "Datei löschen"
 markAsSensitive: "Als sensibel markieren"
 unmarkAsSensitive: "Als nicht sensibel markieren"
 enterFileName: "Dateinamen eingeben"
@@ -180,6 +185,8 @@ addAccount: "Benutzerkonto hinzufügen"
 reloadAccountsList: "Benutzerkontoliste aktualisieren"
 loginFailed: "Anmeldung fehlgeschlagen"
 showOnRemote: "Auf Ursprungsinstanz ansehen"
+chooseServerOnMisskeyHub: "Wähle einen Server aus dem Misskey Hub"
+inputHostName: "Gib die Domain an"
 general: "Allgemein"
 wallpaper: "Hintergrund"
 setWallpaper: "Hintergrund festlegen"
@@ -206,6 +213,7 @@ perDay: "Pro Tag"
 stopActivityDelivery: "Senden von Aktivitäten einstellen"
 blockThisInstance: "Diese Instanz blockieren"
 silenceThisInstance: "Instanz stummschalten"
+mediaSilenceThisInstance: "Medien dieses Servers stummschalten"
 operations: "Aktionen"
 software: "Software"
 version: "Version"
@@ -227,6 +235,8 @@ blockedInstances: "Blockierte Instanzen"
 blockedInstancesDescription: "Gib die Hostnamen der Instanzen, welche blockiert werden sollen, durch Zeilenumbrüche getrennt an. Blockierte Instanzen können mit dieser instanz nicht mehr kommunizieren."
 silencedInstances: "Stummgeschaltete Instanzen"
 silencedInstancesDescription: "Gib die Hostnamen der Instanzen, welche stummgeschaltet werden sollen, durch Zeilenumbrüche getrennt an. Alle Konten dieser Instanzen werden als stummgeschaltet behandelt, können nur noch Follow-Anfragen stellen und wenn nicht gefolgt keine lokalen Konten erwähnen. Blockierte Instanzen sind davon nicht betroffen."
+mediaSilencedInstances: "Medien-stummgeschaltete Server"
+mediaSilencedInstancesDescription: "Gib pro Zeile die Hostnamen der Server ein, dessen Medien du stummschalten möchtest. Alle Benutzerkonten der aufgeführten Server werden als sensibel behandelt und können keine benutzerdefinierten Emojis verwenden. Gesperrte Server sind davon nicht betroffen."
 muteAndBlock: "Stummschaltungen und Blockierungen"
 mutedUsers: "Stummgeschaltete Benutzer"
 blockedUsers: "Blockierte Benutzer"
@@ -325,6 +335,7 @@ renameFolder: "Ordner umbenennen"
 deleteFolder: "Ordner löschen"
 folder: "Ordner"
 addFile: "Datei hinzufügen"
+showFile: "Datei anzeigen"
 emptyDrive: "Deine Drive ist leer"
 emptyFolder: "Dieser Ordner ist leer"
 unableToDelete: "Nicht löschbar"
@@ -367,7 +378,6 @@ enableLocalTimeline: "Lokale Chronik aktivieren"
 enableGlobalTimeline: "Globale Chronik aktivieren"
 disablingTimelinesInfo: "Administratoren und Moderatoren haben immer Zugriff auf alle Chroniken, auch wenn diese deaktiviert sind."
 registration: "Registrieren"
-enableRegistration: "Registrierung neuer Benutzer erlauben"
 invite: "Einladen"
 driveCapacityPerLocalAccount: "Drive-Kapazität pro lokalem Benutzerkonto"
 driveCapacityPerRemoteAccount: "Drive-Kapazität pro Benutzer fremder Instanzen"
@@ -473,6 +483,7 @@ retype: "Erneut eingeben"
 noteOf: "Notiz von {user}"
 quoteAttached: "Zitat"
 quoteQuestion: "Als Zitat anhängen?"
+attachAsFileQuestion: "Der Text in der Zwischenablage ist lang. Möchtest du ihn als Textdatei anhängen?"
 noMessagesYet: "Noch keine Nachrichten vorhanden"
 newMessageExists: "Du hast eine neue Nachricht"
 onlyOneFileCanBeAttached: "Es kann pro Nachricht nur eine Datei angehängt werden"
@@ -498,7 +509,11 @@ uiLanguage: "Sprache der Benutzeroberfläche"
 aboutX: "Über {x}"
 emojiStyle: "Emoji-Stil"
 native: "Nativ"
+menuStyle: "Menü Stil"
+style: "Stil"
+popup: "Pop-up"
 showNoteActionsOnlyHover: "Notizmenü nur bei Mouseover anzeigen"
+showReactionsCount: "Zeige die Anzahl der Reaktionen auf Notizen an"
 noHistory: "Kein Verlauf gefunden"
 signinHistory: "Anmeldungsverlauf"
 enableAdvancedMfm: "Erweitertes MFM aktivieren"
@@ -579,6 +594,7 @@ ascendingOrder: "Aufsteigende Reihenfolge"
 descendingOrder: "Absteigende Reihenfolge"
 scratchpad: "Testumgebung"
 scratchpadDescription: "Die Testumgebung bietet einen Bereich für AiScript-Experimente. Dort kannst du AiScript schreiben, ausführen sowie dessen Auswirkungen auf Misskey überprüfen."
+uiInspector: "UI-Inspektor"
 output: "Ausgabe"
 script: "Skript"
 disablePagesScript: "AiScript auf Seiten deaktivieren"
@@ -659,6 +675,7 @@ smtpSecure: "Für SMTP-Verbindungen implizit SSL/TLS verwenden"
 smtpSecureInfo: "Schalte dies aus, falls du STARTTLS verwendest."
 testEmail: "Emailversand testen"
 wordMute: "Wortstummschaltung"
+hardWordMute: "Harte Wort-Stummschaltung"
 regexpError: "Fehler in einem regulären Ausdruck"
 regexpErrorDescription: "Im regulären Ausdruck deiner in Zeile {line} von {tab}en Wortstummschaltungen ist ein Fehler aufgetreten:"
 instanceMute: "Instanzstummschaltungen"
@@ -680,6 +697,7 @@ useGlobalSettingDesc: "Ist diese Option aktiviert, werden die Benachrichtigungse
 other: "Anderes"
 regenerateLoginToken: "Anmeldetoken regenerieren"
 regenerateLoginTokenDescription: "Den zur Anmeldung intern verwendeten Token regenerieren. Normalerweise wird dies nicht benötigt. Bei Regeneration werden alle Geräte ausgeloggt."
+theKeywordWhenSearchingForCustomEmoji: "Das ist das Schlagwort beim Suchen von benutzerdefinierten Emojis."
 setMultipleBySeparatingWithSpace: "Trenne Elemente durch ein Leerzeichen um mehrere Einstellungen zu kofigurieren."
 fileIdOrUrl: "Datei-ID oder URL"
 behavior: "Verhalten"
@@ -889,6 +907,8 @@ makeReactionsPublicDescription: "Jeder wird die Liste deiner gesendeten Reaktion
 classic: "Classic"
 muteThread: "Thread stummschalten"
 unmuteThread: "Threadstummschaltung aufheben"
+followingVisibility: "Sichtbarkeit der Gefolgten"
+followersVisibility: "Sichtbarkeit der Folgenden"
 continueThread: "Weiteren Threadverlauf anzeigen"
 deleteAccountConfirm: "Dein Benutzerkonto wird unwiderruflich gelöscht. Trotzdem fortfahren?"
 incorrectPassword: "Falsches Passwort."
@@ -1021,6 +1041,7 @@ thisPostMayBeAnnoyingHome: "Zur Startseite schicken"
 thisPostMayBeAnnoyingCancel: "Abbrechen"
 thisPostMayBeAnnoyingIgnore: "Trotzdem schicken"
 collapseRenotes: "Bereits gesehene Renotes verkürzt anzeigen"
+collapseRenotesDescription: "Klappe Notizen ein, auf die du bereits reagiert oder die du renoted hast."
 internalServerError: "Serverinterner Fehler"
 internalServerErrorDescription: "Im Server ist ein unerwarteter Fehler aufgetreten."
 copyErrorInfo: "Fehlerdetails kopieren"
@@ -1045,6 +1066,7 @@ sensitiveWords: "Sensible Wörter"
 sensitiveWordsDescription: "Die Notizsichtbarkeit aller Notizen, die diese Wörter enthalten, wird automatisch auf \"Startseite\" gesetzt. Durch Zeilenumbrüche können mehrere konfiguriert werden."
 sensitiveWordsDescription2: "Durch die Verwendung von Leerzeichen können AND-Verknüpfungen angegeben werden und durch das Umgeben von Schrägstrichen können reguläre Ausdrücke verwendet werden."
 prohibitedWords: "Verbotene Wörter"
+prohibitedWordsDescription: "Aktiviert eine Fehlermeldung, wenn versucht wird, eine Notiz zu veröffentlichen, die das/die eingestellte(n) Wort(e) enthält. Mehrere Begriffe können durch Zeilenumbrüche getrennt festgelegt werden."
 prohibitedWordsDescription2: "Durch die Verwendung von Leerzeichen können AND-Verknüpfungen angegeben werden und durch das Umgeben von Schrägstrichen können reguläre Ausdrücke verwendet werden."
 hiddenTags: "Ausgeblendete Hashtags"
 hiddenTagsDescription: "Die hier eingestellten Tags werden nicht mehr in den Trends angezeigt. Mit der Umschalttaste können mehrere ausgewählt werden."
@@ -1170,6 +1192,9 @@ confirmShowRepliesAll: "Dies ist eine unwiderrufliche Aktion. Wirklich Antworten
 confirmHideRepliesAll: "Dies ist eine unwiderrufliche Aktion. Wirklich Antworten von allen momentan gefolgten Benutzern nicht in der Chronik anzeigen?"
 externalServices: "Externe Dienste"
 sourceCode: "Quellcode"
+sourceCodeIsNotYetProvided: "Der Quellcode ist noch nicht verfügbar. Kontaktiere den Administrator, um das Problem zu lösen."
+repositoryUrl: "Repository URL"
+repositoryUrlOrTarballRequired: "Wenn du kein Repository veröffentlicht hast, musst du stattdessen einen Tarball bereitstellen. Siehe .config/example.yml für weitere Informationen."
 impressum: "Impressum"
 impressumUrl: "Impressums-URL"
 impressumDescription: "In manchen Ländern, wie Deutschland und dessen Umgebung, ist die Angabe von Betreiberinformationen (ein Impressum) bei kommerziellem Betrieb zwingend."
@@ -1192,34 +1217,76 @@ cwNotationRequired: "Ist \"Inhaltswarnung verwenden\" aktiviert, muss eine Besch
 doReaction: "Reagieren"
 code: "Code"
 remainingN: "Verbleibend: {n}"
+overwriteContentConfirm: "Bist du sicher, dass du den aktuellen Inhalt überschreiben willst?"
+seasonalScreenEffect: "Saisonaler Bildschirmeffekt"
 decorate: "Dekorieren"
 addMfmFunction: "MFM hinzufügen"
+enableQuickAddMfmFunction: "Erweiterte MFM-Auswahl anzeigen"
 sfx: "Soundeffekte"
+soundWillBePlayed: "Es wird Ton wiedergegeben"
 showReplay: "Wiederholung anzeigen"
+ranking: "Rangliste"
 lastNDays: "Letzten {n} Tage"
+backToTitle: "Zurück zum Startbildschirm"
+enableHorizontalSwipe: "Wischen, um zwischen Tabs zu wechseln"
+loading: "Laden"
 surrender: "Abbrechen"
+gameRetry: "Erneut versuchen"
+notUsePleaseLeaveBlank: "Leer lassen, wenn nicht verwendet"
+useTotp: "Gib das Einmalpasswort ein"
+useBackupCode: "Verwende die Backup-Codes"
+launchApp: "Starte die App"
+useNativeUIForVideoAudioPlayer: "Browser-Benutzeroberfläche für die Video- und Audiowiedergabe verwenden"
 keepOriginalFilename: "Ursprünglichen Dateinamen beibehalten"
+keepOriginalFilenameDescription: "Wenn diese Einstellung deaktiviert ist, wird der Dateiname beim Hochladen automatisch durch eine zufällige Zeichenfolge ersetzt."
+noDescription: "Keine Beschreibung vorhanden"
 tryAgain: "Bitte später erneut versuchen"
 confirmWhenRevealingSensitiveMedia: "Das Anzeigen von sensiblen Medien bestätigen"
 createdLists: "Erstellte Listen"
 createdAntennas: "Erstellte Antennen"
+fromX: "Von {x}"
 genEmbedCode: "Einbettungscode generieren"
 noteOfThisUser: "Notizen dieses Benutzers"
 clipNoteLimitExceeded: "Zu diesem Clip können keine weiteren Notizen hinzugefügt werden."
 discard: "Verwerfen"
+thereAreNChanges: "Es gibt {n} Änderung(en)"
 signinWithPasskey: "Mit Passkey anmelden"
 passkeyVerificationFailed: "Die Passkey-Verifizierung ist fehlgeschlagen."
 passkeyVerificationSucceededButPasswordlessLoginDisabled: "Die Verifizierung des Passkeys war erfolgreich, aber die passwortlose Anmeldung ist deaktiviert."
+prohibitedWordsForNameOfUser: "Verbotene Begriffe für Benutzernamen"
+prohibitedWordsForNameOfUserDescription: "Wenn eine Zeichenfolge aus dieser Liste im Namen eines Benutzers enthalten ist, wird der Benutzername abgelehnt. Benutzer mit Moderatorenrechten sind von dieser Einschränkung nicht betroffen."
+yourNameContainsProhibitedWords: "Dein Name enthält einen verbotenen Begriff"
+yourNameContainsProhibitedWordsDescription: "Der Name enthält eine verbotene Zeichenfolge. Wende dich an deinen Serveradministrator, wenn du diesen Namen verwenden möchtest."
 pleaseSelectAccount: "Bitte Konto auswählen"
 availableRoles: "Verfügbare Rollen"
+_accountSettings:
+  requireSigninToViewContents: "Anmeldung erfordern, um Inhalte anzuzeigen"
+  requireSigninToViewContentsDescription1: "Erfordere eine Anmeldung, um alle Notizen und andere Inhalte anzuzeigen, die du erstellt hast. Dadurch wird verhindert, dass Crawler deine Informationen sammeln."
+  requireSigninToViewContentsDescription3: "Diese Einschränkungen gelten möglicherweise nicht für föderierte Inhalte von anderen Servern."
+  makeNotesFollowersOnlyBefore: "Macht frühere Notizen nur für Follower sichtbar"
+  mayNotEffectForFederatedNotes: "Dies hat möglicherweise keine Auswirkungen auf Notizen, die an andere Server föderiert werden."
 _abuseUserReport:
   forward: "Weiterleiten"
+  forwardDescription: "Leite die Meldung an einen entfernten Server als anonymes Systemkonto weiter."
+  accept: "Akzeptieren"
+  reject: "Ablehnen"
 _delivery:
   stop: "Gesperrt"
   _type:
     none: "Wird veröffentlicht"
 _bubbleGame:
   howToPlay: "Wie man spielt"
+  hold: "Halten"
+  _score:
+    score: "Spielstand"
+    scoreYen: "Verdienter Geldbetrag"
+    highScore: "Höchstpunktzahl"
+    maxChain: "Maximale Anzahl an Verkettungen"
+    yen: "{yen} Yen"
+  _howToPlay:
+    section1: "Passe die Position an und lasse das Objekt in das Spielfeld fallen."
+    section2: "Wenn sich zwei Objekte der gleichen Art berühren, verwandeln sie sich in ein anderes Objekt und du bekommst Punkte."
+    section3: "Das Spiel ist vorbei, wenn die Objekte aus dem Spielfeld herausragen. Versuche eine hohe Punktzahl zu erreichen, indem du die Objekte miteinander verschmelzt, ohne dass das Spielfeld überläuft!"
 _announcement:
   forExistingUsers: "Nur für existierende Nutzer"
   forExistingUsersDescription: "Ist diese Option aktiviert, wird diese Ankündigung nur Nutzern angezeigt, die zum Zeitpunkt der Ankündigung bereits registriert sind. Ist sie deaktiviert, wird sie auch Nutzern, die sich nach dessen Veröffentlichung registrieren, angezeigt."
@@ -1263,8 +1330,18 @@ _initialTutorial:
     reply: "Klicke auf diesen Button, um auf eine Nachricht zu antworten. Es ist auch möglich, auf Antworten zu antworten und die Unterhaltung wie einen Thread fortzusetzen."
   _reaction:
     title: "Was sind Reaktionen?"
+    description: "Auf Notizen kann mit verschiedenen Emojis reagiert werden. Reaktionen ermöglichen es dir, Nuancen auszudrücken, die mit einem einfachen „Gefällt mir“ vielleicht nicht ausgedrückt werden können."
+    letsTryReacting: "Reaktionen können durch Klicken auf die Schaltfläche „+“ in der Notiz hinzugefügt werden. Versuche, auf diese Beispielnotiz zu reagieren!"
     reactToContinue: "Füge eine Reaktion hinzu, um fortzufahren."
     reactNotification: "Du erhältst Echtzeit-Benachrichtigungen, wenn jemand auf deine Notiz reagiert."
+    reactDone: "Du kannst eine Reaktion zurücknehmen, indem du auf den '-' Button drückst."
+  _timeline:
+    title: "So funktionieren die Chroniken"
+    home: "Du kannst Beiträge von den Konten sehen, denen du folgst."
+    local: "Du kannst Beiträge aller Benutzer auf diesem Server sehen."
+    social: "Notizen von der Startseite und der lokalen Chronik werden angezeigt."
+    global: "Du kannst Notizen von allen föderierten Servern sehen."
+    description2: "Du kannst jederzeit am oberen Rand des Bildschirms zwischen den jeweiligen Chroniken wechseln."
   _postNote:
     _visibility:
       description: "Du kannst einschränken, wer deine Notiz sehen kann."
@@ -1272,8 +1349,16 @@ _initialTutorial:
       doNotSendConfidencialOnDirect1: "Sei vorsichtig, wenn du sensible Informationen verschickst!"
     _cw:
       title: "Inhaltswarnung"
+      _exampleNote:
+        note: "Ich hatte gerade einen Donut mit Schokoladenüberzug 🍩😋"
+  _howToMakeAttachmentsSensitive:
+    tryThisFile: "Versuche, das angehängte Bild als sensibel zu markieren!"
+    method: "Um einen Anhang als sensibel zu kennzeichnen, klicke auf das Vorschaubild der Datei, um das Menü zu öffnen, und klicke auf „Als sensibel markieren“."
+    sensitiveSucceeded: "Wenn du Dateien anhängst, stelle bitte die Sensibilität entsprechend der Serverrichtlinien ein."
+    doItToContinue: "Markiere die angehängte Datei als sensibel, um fortzufahren."
   _done:
     title: "Du hast das Tutorial abgeschlossen! 🎉"
+    description: "Die hier beschriebenen Funktionen sind nur ein kleiner Teil dessen, was Misskey zu bieten hat; um mehr darüber zu erfahren, wie du Misskey benutzen kannst, besuche bitte {link}."
 _timelineDescription:
   local: "In der lokalen Chronik siehst du Notizen von allen Benutzern auf diesem Server."
   global: "In der globalen Chronik siehst du Notizen von allen föderierten Servern."
@@ -1291,6 +1376,7 @@ _serverSettings:
   fanoutTimelineDescription: "Ist diese Option aktiviert, kann eine erhebliche Verbesserung im Abrufen von Chroniken und eine Reduzierung der Datenbankbelastung erzielt werden, im Gegenzug zu einer Steigerung in der Speichernutzung von Redis. Bei geringem Serverspeicher oder Serverinstabilität kann diese Option deaktiviert werden."
   fanoutTimelineDbFallback: "Auf die Datenbank zurückfallen"
   fanoutTimelineDbFallbackDescription: "Ist diese Option aktiviert, wird die Chronik auf zusätzliche Abfragen in der Datenbank zurückgreifen, wenn sich die Chronik nicht im Cache befindet. Eine Deaktivierung führt zu geringerer Serverlast, aber schränkt den Zeitraum der abrufbaren Chronik ein. "
+  thisSettingWillAutomaticallyOffWhenModeratorsInactive: "Wenn über einen bestimmten Zeitraum keine Moderatorenaktivität festgestellt wird, wird diese Einstellung automatisch deaktiviert, um Spam zu verhindern."
 _accountMigration:
   moveFrom: "Von einem anderen Konto zu diesem migrieren"
   moveFromSub: "Alias für ein anderes Konto erstellen"
@@ -1549,6 +1635,7 @@ _achievements:
       title: "Testüberfluss"
       description: "Betätige den Benachrichtigungstest mehrfach innerhalb einer extrem kurzen Zeitspanne"
     _tutorialCompleted:
+      title: "Misskey Grundkurs-Diplom"
       description: "Tutorial abgeschlossen"
     _bubbleGameExplodingHead:
       title: "🤯"
@@ -1594,6 +1681,7 @@ _role:
     gtlAvailable: "Kann auf die globale Chronik zugreifen"
     ltlAvailable: "Kann auf die lokale Chronik zugreifen"
     canPublicNote: "Kann öffentliche Notizen erstellen"
+    mentionMax: "Maximale Anzahl von Erwähnungen in einer Notiz"
     canInvite: "Erstellung von Einladungscodes für diese Instanz"
     inviteLimit: "Maximalanzahl an Einladungen"
     inviteLimitCycle: "Zyklus des Einladungslimits"
@@ -1616,9 +1704,12 @@ _role:
     canSearchNotes: "Nutzung der Notizsuchfunktion"
     canUseTranslator: "Verwendung des Übersetzers"
     avatarDecorationLimit: "Maximale Anzahl an Profilbilddekorationen, die angebracht werden können"
+    canImportAntennas: "Importieren von Antennen erlauben"
   _condition:
     isLocal: "Lokaler Benutzer"
     isRemote: "Benutzer fremder Instanz"
+    isCat: "Katzen-Benutzer"
+    isBot: "Bot-Benutzer"
     createdLessThan: "Kontoerstellung liegt weniger als X zurück"
     createdMoreThan: "Kontoerstellung liegt mehr als X zurück"
     followersLessThanOrEq: "Hat X oder weniger Follower"
@@ -1834,6 +1925,12 @@ _sfx:
   note: "Notizen"
   noteMy: "Meine Notizen"
   notification: "Benachrichtigungen"
+_soundSettings:
+  driveFile: "Audiodatei aus dem Drive verwenden"
+  driveFileWarn: "Wähle eine Audiodatei aus dem Drive"
+  driveFileTypeWarn: "Diese Datei wird nicht unterstützt"
+  driveFileTypeWarnDescription: "Bitte wähle eine Audiodatei"
+  driveFileDurationWarn: "Audio zu lang."
 _ago:
   future: "Zukunft"
   justNow: "Gerade eben"
@@ -1915,6 +2012,23 @@ _permissions:
   "write:flash": "Deine Plays bearbeiten oder löschen"
   "read:flash-likes": "Liste der Plays, die mir gefallen, lesen"
   "write:flash-likes": "Liste der Plays, die mir gefallen, bearbeiten"
+  "write:admin:delete-account": "Benutzerkonto löschen"
+  "write:admin:delete-all-files-of-a-user": "Alle Dateien eines Benutzers löschen"
+  "read:admin:index-stats": "Statistiken zu Datenbankindizes einsehen"
+  "read:admin:table-stats": "Statistiken zu Datenbanktabellen einsehen"
+  "read:admin:user-ips": "IP-Adressen von Benutzern anzeigen"
+  "read:admin:meta": "Metadaten der Instanz einsehen"
+  "write:admin:reset-password": "Benutzerpasswort zurücksetzen"
+  "write:admin:send-email": "E-Mail versenden"
+  "read:admin:server-info": "Serverinformationen anzeigen"
+  "read:admin:show-moderation-log": "Moderationsprotokoll einsehen"
+  "read:admin:show-user": "Private Benutzerinformationen einsehen"
+  "write:admin:invite-codes": "Einladungscodes verwalten"
+  "read:admin:invite-codes": "Einladungscodes anzeigen"
+  "write:admin:announcements": "Ankündigungen verwalten"
+  "read:admin:announcements": "Ankündigungen einsehen"
+  "write:admin:avatar-decorations": "Kann Avatar-Dekorationen verwalten"
+  "read:admin:avatar-decorations": "Avatar-Dekorationen ansehen"
 _auth:
   shareAccessTitle: "Verteilung von App-Berechtigungen"
   shareAccess: "Möchtest du „{name}“ authorisieren, auf dieses Benutzerkonto zugreifen zu können?"
@@ -2329,3 +2443,31 @@ _reversi:
   black: "Schwarz"
   white: "Weiß"
   total: "Gesamt"
+_offlineScreen:
+  header: "Verbindung zum Server nicht möglich"
+_urlPreviewSetting:
+  title: "Einstellungen der URL-Vorschau"
+  enable: "URL-Vorschau aktivieren"
+  timeout: "Zeitüberschreitung beim Abrufen der Vorschau (ms)"
+  maximumContentLength: "Maximale Content-Length (Bytes)"
+_mediaControls:
+  playbackRate: "Wiedergabegeschwindigkeit"
+_contextMenu:
+  title: "Kontextmenü"
+  app: "Anwendung"
+_embedCodeGen:
+  title: "Einbettungscode anpassen"
+  header: "Kopfzeile anzeigen"
+  autoload: "Automatisch mehr laden (veraltet)"
+  maxHeight: "Maximale Höhe"
+  maxHeightDescription: "Der Wert 0 deaktiviert die Einstellung der maximalen Höhe. Gib einen Wert an, um zu verhindern, dass das Widget weiterhin vertikal vergrößert wird."
+  maxHeightWarn: "Die Begrenzung der maximalen Höhe ist deaktiviert (0). Wenn dies nicht beabsichtigt war, setze die maximale Höhe auf einen Wert fest."
+  applyToPreview: "Auf die Vorschau anwenden"
+  generateCode: "Einbettungscode generieren"
+  codeGenerated: "Der Code wurde generiert"
+  codeGeneratedDescription: "Füge den generierten Code in deine Website ein, um den Inhalt einzubetten."
+_selfXssPrevention:
+  warning: "WARNUNG"
+  title: "„Füge in diesen Bereich etwas ein“ ist eine Betrugsmasche."
+  description1: "Wenn du hier etwas einfügst, könnte ein böswilliger Benutzer dein Konto übernehmen oder deine persönlichen Daten stehlen."
+  description3: "Weitere Informationen findest du hier. {link}"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 6703d1cf3a..658914d3bc 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -382,7 +382,6 @@ enableLocalTimeline: "Enable local timeline"
 enableGlobalTimeline: "Enable global timeline"
 disablingTimelinesInfo: "Adminstrators and Moderators will always have access to all timelines, even if they are not enabled."
 registration: "Register"
-enableRegistration: "Enable new user registration"
 invite: "Invite"
 driveCapacityPerLocalAccount: "Drive capacity per local user"
 driveCapacityPerRemoteAccount: "Drive capacity per remote user"
@@ -1309,7 +1308,7 @@ _accountSettings:
   makeNotesFollowersOnlyBeforeDescription: "While this feature is enabled, only followers can see notes past the set date and time or have been visible for a set time. When it is deactivated, the note publication status will also be restored."
   makeNotesHiddenBefore: "Make past notes private"
   makeNotesHiddenBeforeDescription: "While this feature is enabled, notes that are past the set date and time or have been visible only to you. When it is deactivated, the note publication status will also be restored."
-  mayNotEffectForFederatedNotes: "Notes federated to a remote server may not be effective."
+  mayNotEffectForFederatedNotes: "Notes federated to a remote server may not be affected."
   notesHavePassedSpecifiedPeriod: "Note that the specified time has passed"
   notesOlderThanSpecifiedDateAndTime: "Notes before the specified date and time"
 _abuseUserReport:
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 7731598152..a4ec114b15 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -373,7 +373,6 @@ enableLocalTimeline: "Habilitar linea de tiempo local"
 enableGlobalTimeline: "Habilitar linea de tiempo global"
 disablingTimelinesInfo: "Aunque se desactiven estas lineas de tiempo, por conveniencia el administrador y los moderadores pueden seguir usándolos"
 registration: "Registro"
-enableRegistration: "Permitir nuevos registros"
 invite: "Invitar"
 driveCapacityPerLocalAccount: "Capacidad del drive por usuario local"
 driveCapacityPerRemoteAccount: "Capacidad del drive por usuario remoto"
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index a7060c06fc..b105a86b5e 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -8,6 +8,9 @@ search: "Rechercher"
 notifications: "Notifications"
 username: "Nom d’utilisateur·rice"
 password: "Mot de passe"
+initialPasswordForSetup: "Mot de passe initial pour la configuration"
+initialPasswordIsIncorrect: "Mot de passe initial pour la configuration est incorrecte"
+initialPasswordForSetupDescription: "Utilisez le mot de passe que vous avez entré pour le fichier de configuration si vous avez installé Misskey vous-même.\nSi vous utilisez un service d'hébergement Misskey, utilisez le mot de passe fourni.\nSi vous n'avez pas défini de mot de passe, laissez le champ vide pour continuer."
 forgotPassword: "Mot de passe oublié"
 fetchingAsApObject: "Récupération depuis le fédiverse …"
 ok: "OK"
@@ -60,6 +63,7 @@ copyFileId: "Copier l'identifiant du fichier"
 copyFolderId: "Copier l'identifiant du dossier"
 copyProfileUrl: "Copier l'URL du profil"
 searchUser: "Chercher un·e utilisateur·rice"
+searchThisUsersNotes: "Cherchez les notes de cet·te utilisateur·rice"
 reply: "Répondre"
 loadMore: "Afficher plus …"
 showMore: "Voir plus"
@@ -108,6 +112,7 @@ enterEmoji: "Insérer un émoji"
 renote: "Renoter"
 unrenote: "Annuler la Renote"
 renoted: "Renoté !"
+renotedToX: "Renoté en {name}"
 cantRenote: "Ce message ne peut pas être renoté."
 cantReRenote: "Impossible de renoter une Renote."
 quote: "Citer"
@@ -151,6 +156,7 @@ editList: "Modifier la liste"
 selectChannel: "Sélectionner un canal"
 selectAntenna: "Sélectionner une antenne"
 editAntenna: "Modifier l'antenne"
+createAntenna: "Créer une antenne"
 selectWidget: "Sélectionner un widget"
 editWidgets: "Modifier les widgets"
 editWidgetsExit: "Valider les modifications"
@@ -177,6 +183,7 @@ addAccount: "Ajouter un compte"
 reloadAccountsList: "Rafraichir la liste des comptes"
 loginFailed: "Échec de la connexion"
 showOnRemote: "Voir sur l’instance distante"
+continueOnRemote: "Continuer sur l'instance distante"
 general: "Général"
 wallpaper: "Fond d’écran"
 setWallpaper: "Définir le fond d’écran"
@@ -187,6 +194,7 @@ followConfirm: "Êtes-vous sûr·e de vouloir suivre {name} ?"
 proxyAccount: "Compte proxy"
 proxyAccountDescription: "Un compte proxy se comporte, dans certaines conditions, comme un·e abonné·e distant·e pour les utilisateurs d'autres instances. Par exemple, quand un·e utilisateur·rice ajoute un·e utilisateur·rice distant·e à une liste, ses notes ne seront pas visibles sur l'instance si personne ne suit cet·te utilisateur·rice. Le compte proxy va donc suivre cet·te utilisateur·rice pour que ses notes soient acheminées."
 host: "Serveur distant"
+selectSelf: "Sélectionner manuellement"
 selectUser: "Sélectionner un·e utilisateur·rice"
 recipient: "Destinataire"
 annotation: "Commentaires"
@@ -320,6 +328,7 @@ renameFolder: "Renommer le dossier"
 deleteFolder: "Supprimer le dossier"
 folder: "Dossier"
 addFile: "Ajouter un fichier"
+showFile: "Voir les fichiers"
 emptyDrive: "Le Disque est vide"
 emptyFolder: "Le dossier est vide"
 unableToDelete: "Suppression impossible"
@@ -362,7 +371,6 @@ enableLocalTimeline: "Activer le fil local"
 enableGlobalTimeline: "Activer le fil global"
 disablingTimelinesInfo: "Même si vous désactivez ces fils, les administrateur·rice·s et les modérateur·rice·s pourront toujours y accéder."
 registration: "S’inscrire"
-enableRegistration: "Autoriser les nouvelles inscriptions"
 invite: "Inviter"
 driveCapacityPerLocalAccount: "Capacité de stockage du Disque par utilisateur local"
 driveCapacityPerRemoteAccount: "Capacité de stockage du Disque par utilisateur distant"
@@ -430,10 +438,11 @@ token: "Jeton"
 2fa: "Authentification à deux facteurs"
 setupOf2fa: "Configuration de l’authentification à deux facteurs"
 totp: "Application d'authentification"
-totpDescription: "Entrez un mot de passe à usage unique à l'aide d'une application d'authentification"
+totpDescription: "Entrer un mot de passe à usage unique à l'aide d'une application d'authentification"
 moderator: "Modérateur·rice·s"
 moderation: "Modérations"
 moderationNote: "Note de modération"
+moderationNoteDescription: "Vous pouvez remplir des notes qui seront partagés seulement entre modérateurs."
 addModerationNote: "Ajouter une note de modération"
 moderationLogs: "Journal de modération"
 nUsersMentioned: "{n} utilisateur·rice·s mentionné·e·s"
@@ -493,6 +502,10 @@ uiLanguage: "Langue d’affichage de l’interface"
 aboutX: "À propos de {x}"
 emojiStyle: "Style des émojis"
 native: "Natif"
+menuStyle: "Style du menu"
+style: "Style"
+drawer: "Sélecteur"
+popup: "Pop-up"
 showNoteActionsOnlyHover: "Afficher les actions de note uniquement au survol"
 showReactionsCount: "Afficher le nombre de réactions des notes"
 noHistory: "Pas d'historique"
@@ -575,6 +588,7 @@ ascendingOrder: "Ascendant"
 descendingOrder: "Descendant"
 scratchpad: "ScratchPad"
 scratchpadDescription: "ScratchPad fournit un environnement expérimental pour AiScript. Vous pouvez vérifier la rédaction de votre code, sa bonne exécution et le résultat de son interaction avec Misskey."
+uiInspector: "Inspecteur UI"
 output: "Sortie"
 script: "Script"
 disablePagesScript: "Désactiver AiScript sur les Pages"
@@ -618,7 +632,7 @@ description: "Description"
 describeFile: "Ajouter une description d'image"
 enterFileDescription: "Saisissez une description"
 author: "Auteur·rice"
-leaveConfirm: "Vous avez des modifications non-sauvegardées. Voulez-vous les ignorer ?"
+leaveConfirm: "Vous avez des modifications non sauvegardées. Voulez-vous les ignorer ?"
 manage: "Gestion"
 plugins: "Extensions"
 preferencesBackups: "Sauvegarder les paramètres"
@@ -828,6 +842,7 @@ administration: "Gestion"
 accounts: "Comptes"
 switch: "Remplacer"
 noMaintainerInformationWarning: "Informations administrateur non configurées."
+noInquiryUrlWarning: "L'URL demandé n'est pas définie"
 noBotProtectionWarning: "La protection contre les bots n'est pas configurée."
 configure: "Configurer"
 postToGallery: "Publier dans la galerie"
@@ -892,6 +907,7 @@ followersVisibility: "Visibilité des abonnés"
 continueThread: "Afficher la suite du fil"
 deleteAccountConfirm: "Votre compte sera supprimé. Êtes vous certain ?"
 incorrectPassword: "Le mot de passe est incorrect."
+incorrectTotp: "Le mot de passe à usage unique est incorrect ou a expiré."
 voteConfirm: "Confirmez-vous votre vote pour « {choice} » ?"
 hide: "Masquer"
 useDrawerReactionPickerForMobile: "Afficher le sélecteur de réactions en tant que panneau sur mobile"
@@ -916,6 +932,9 @@ oneHour: "1 heure"
 oneDay: "1 jour"
 oneWeek: "1 semaine"
 oneMonth: "Un mois"
+threeMonths: "3 mois"
+oneYear: "1 an"
+threeDays: "3 jours"
 reflectMayTakeTime: "Cela peut prendre un certain temps avant que cela ne se termine."
 failedToFetchAccountInformation: "Impossible de récupérer les informations du compte."
 rateLimitExceeded: "Limite de taux dépassée"
@@ -923,7 +942,7 @@ cropImage: "Recadrer l'image"
 cropImageAsk: "Voulez-vous recadrer cette image ?"
 cropYes: "Rogner"
 cropNo: "Utiliser en l'état"
-file: "Fichiers"
+file: "Fichier"
 recentNHours: "Dernières {n} heures"
 recentNDays: "Derniers {n} jours"
 noEmailServerWarning: "Serveur de courrier non configuré."
@@ -1055,6 +1074,7 @@ retryAllQueuesConfirmTitle: "Vraiment réessayer ?"
 retryAllQueuesConfirmText: "Cela peut augmenter temporairement la charge du serveur."
 enableChartsForRemoteUser: "Générer les graphiques pour les utilisateurs distants"
 enableChartsForFederatedInstances: "Générer les graphiques pour les instances distantes"
+enableStatsForFederatedInstances: "Recevoir les statistiques des instances distantes"
 showClipButtonInNoteFooter: "Ajouter « Clip » au menu d'action de la note"
 reactionsDisplaySize: "Taille de l'affichage des réactions"
 limitWidthOfReaction: "Limiter la largeur maximale des réactions et les afficher en taille réduite"
@@ -1102,6 +1122,8 @@ preventAiLearning: "Refuser l'usage dans l'apprentissage automatique d'IA géné
 preventAiLearningDescription: "Demander aux robots d'indexation de ne pas utiliser le contenu publié, tel que les notes et les images, dans l'apprentissage automatique d'IA générative. Cela est réalisé en incluant le drapeau « noai » dans la réponse HTML. Une prévention complète n'est toutefois pas possible, car il est au robot d'indexation de respecter cette demande."
 options: "Options"
 specifyUser: "Spécifier l'utilisateur·rice"
+openTagPageConfirm: "Ouvrir une page d'hashtags ?"
+specifyHost: "Spécifier un serveur distant"
 failedToPreviewUrl: "Aperçu d'URL échoué"
 update: "Mettre à jour"
 rolesThatCanBeUsedThisEmojiAsReaction: "Rôles qui peuvent utiliser cet émoji comme réaction"
@@ -1222,13 +1244,55 @@ enableHorizontalSwipe: "Glisser pour changer d'onglet"
 loading: "Chargement en cours"
 surrender: "Annuler"
 gameRetry: "Réessayer"
+notUsePleaseLeaveBlank: "Laisser vide si non utilisé"
+useTotp: "Entrer un mot de passe à usage unique"
+useBackupCode: "Utiliser le codes de secours"
 launchApp: "Lancer l'app"
+useNativeUIForVideoAudioPlayer: "Lire les vidéos et audios en utilisant l'UI du navigateur"
+keepOriginalFilename: "Garder le nom original du fichier"
+keepOriginalFilenameDescription: "Si vous désactivez ce paramètre, les noms de fichiers seront automatiquement remplacés par des noms aléatoires lorsque vous téléchargerez des fichiers."
+noDescription: "Il n'y a pas de description"
+alwaysConfirmFollow: "Confirmer lors d'un abonnement"
 inquiry: "Contact"
+tryAgain: "Veuillez réessayer plus tard"
+confirmWhenRevealingSensitiveMedia: "Confirmer pour révéler du contenu sensible"
+sensitiveMediaRevealConfirm: "Ceci pourrait être du contenu sensible. Voulez-vous l'afficher ?"
+createdLists: "Listes créées"
+createdAntennas: "Antennes créées"
+fromX: "De {x}"
+genEmbedCode: "Générer le code d'intégration"
+noteOfThisUser: "Notes de cet·te utilisateur·rice"
+clipNoteLimitExceeded: "Aucune note supplémentaire ne peut être ajoutée à ce clip."
+performance: "Performance"
+modified: "Modifié"
+discard: "Annuler"
+thereAreNChanges: "Il y a {n} modification(s)"
+signinWithPasskey: "Se connecter avec une clé d'accès"
+unknownWebAuthnKey: "Clé d'accès inconnue."
+passkeyVerificationFailed: "La vérification de la clé d'accès a échoué."
+passkeyVerificationSucceededButPasswordlessLoginDisabled: "La vérification de la clé d'accès a réussi, mais la connexion sans mot de passe est désactivée."
+messageToFollower: "Message aux abonné·es"
+target: "Destinataire"
+prohibitedWordsForNameOfUser: "Mots interdits pour les noms d'utilisateur·rices"
+lockdown: "Verrouiller"
+pleaseSelectAccount: "Sélectionner un compte"
+availableRoles: "Rôles disponibles"
+_abuseUserReport:
+  forward: "Transférer"
+  forwardDescription: "Transférer le signalement vers une instance distante en tant qu'anonyme."
+  resolve: "Résoudre"
+  accept: "Accepter"
+  reject: "Rejeter"
+  resolveTutorial: "Si le signalement est légitime dans son contenu, sélectionnez « Accepter » pour marquer le cas comme résolu par l'affirmative.\nSi le contenu du rapport n'est pas légitime, sélectionnez « Rejeter » pour marquer le cas comme résolu par la négative."
 _delivery:
   status: "Statut de la diffusion"
   stop: "Suspendu·e"
+  resume: "Reprendre"
   _type:
     none: "Publié"
+    manuallySuspended: "Suspendre manuellement"
+    goneSuspended: "L'instance est suspendue en raison de la suppression de ce dernier"
+    autoSuspendedForNotResponding: "L'instance est suspendue car elle ne répond pas"
 _bubbleGame:
   howToPlay: "Comment jouer"
   hold: "Réserver"
@@ -1239,6 +1303,7 @@ _bubbleGame:
     maxChain: "Nombre maximum de chaînes"
     yen: "{yen} yens"
     estimatedQty: "{qty} pièces"
+    scoreSweets: "{onigiriQtyWithUnit} Onigiri(s)"
 _announcement:
   forExistingUsers: "Pour les utilisateurs existants seulement"
   needConfirmationToRead: "Exiger la confirmation de la lecture"
@@ -1258,6 +1323,7 @@ _initialAccountSetting:
   profileSetting: "Paramètres du profil"
   privacySetting: "Paramètres de confidentialité"
   initialAccountSettingCompleted: "Configuration du profil terminée avec succès !"
+  haveFun: "Profitez de {name} !"
   youCanContinueTutorial: "Vous pouvez procéder au tutoriel sur l'utilisation de {name}(Misskey) ou vous arrêter ici et commencer à l'utiliser immédiatement."
   startTutorial: "Démarrer le tutoriel"
   skipAreYouSure: "Désirez-vous ignorer la configuration du profil ?"
@@ -1351,18 +1417,60 @@ _achievements:
       flavor: "Passez un bon moment avec Misskey !"
     _notes10:
       title: "Quelques notes"
+      description: "Poster 10 notes"
     _notes100:
       title: "Beaucoup de notes"
+      description: "Poster 100 notes"
+    _notes500:
+      title: "Couvert de notes"
+      description: "Poster 500 notes"
+    _notes1000:
+      title: "Une montagne de notes"
+      description: "Poster 1000 notes"
+    _notes5000:
+      title: "Débordement de notes"
+      description: "Poster 5 000 notes"
+    _notes10000:
+      title: "Super note"
+      description: "Poster 10 000 notes"
+    _notes20000:
+      title: "Encore... plus... de... notes..."
+      description: "Poster 20 000 notes"
+    _notes30000:
+      title: "Notes notes notes !"
+      description: "Poster 30 000 notes"
+    _notes40000:
+      title: "Usine de notes"
+      description: "Poster 40 000 notes"
+    _notes50000:
+      title: "Planète des notes"
+      description: "Poster 50 000 notes"
+    _notes60000:
+      title: "Quasar de note"
+      description: "Poster 50 000 notes"
+    _notes70000:
+      title: "Trou noir de notes"
+      description: "Poster 70 000 notes"
+    _notes80000:
+      title: "Galaxie de notes"
+      description: "Poster 80 000 notes"
+    _notes90000:
+      title: "Univers de notes"
+      description: "Poster 90 000 notes"
     _notes100000:
       title: "ALL YOUR NOTE ARE BELONG TO US"
+      description: "Poster 100 000 notes"
+      flavor: "Avez-vous tant de choses à dire ?"
     _login3:
-      title: "Débutant Ⅰ"
+      title: "Débutant I"
       description: "Se connecter pour un total de 3 jours"
+      flavor: "Dès maintenant, appelez-moi Misskeynaute"
     _login7:
-      title: "Débutant Ⅱ"
+      title: "Débutant II"
       description: "Se connecter pour un total de 7 jours"
+      flavor: "On s'habitue ?"
     _login15:
-      title: "Débutant Ⅲ"
+      title: "Débutant III"
       description: "Se connecter pour un total de 15 jours"
     _login30:
       title: "Misskeynaute I"
@@ -1386,6 +1494,7 @@ _achievements:
     _login500:
       title: "Expert I"
       description: "Se connecter pour un total de 500 jours"
+      flavor: "Non, mes amis, j'aime les notes"
     _login600:
       title: "Expert II"
       description: "Se connecter pour un total de 600 jours"
@@ -1393,11 +1502,18 @@ _achievements:
       title: "Expert III"
       description: "Se connecter pour un total de 700 jours"
     _login800:
+      title: "Maître des notes I"
       description: "Se connecter pour un total de 800 jours"
     _login900:
+      title: "Maître des notes II"
       description: "Se connecter pour un total de 900 jours"
     _login1000:
+      title: "Maître des notes III"
+      description: "Se connecter pour un total de 1 000 jours"
       flavor: "Merci d'utiliser Misskey !"
+    _noteClipped1:
+      title: "Je... dois... clip..."
+      description: "Ajouter sa première note aux clips"
     _profileFilled:
       title: "Bien préparé"
       description: "Configuration de votre profil"
@@ -1456,21 +1572,31 @@ _achievements:
     _driveFolderCircularReference:
       title: "Référence circulaire"
     _setNameToSyuilo:
+      title: "Complexe de dieu"
       description: "Vous avez spécifié « syuilo » comme nom"
     _passedSinceAccountCreated1:
       title: "Premier anniversaire"
+      description: "Un an est passé depuis la création du compte"
     _passedSinceAccountCreated2:
       title: "Second anniversaire"
+      description: "Deux ans sont passés depuis la création du compte"
     _passedSinceAccountCreated3:
       title: "3ème anniversaire"
+      description: "Trois ans sont passés depuis la création du compte"
     _loggedInOnBirthday:
       title: "Joyeux Anniversaire !"
       description: "Vous vous êtes connecté à la date de votre anniversaire"
     _loggedInOnNewYearsDay:
       title: "Bonne année !"
+      description: "Vous vous êtes connecté le premier jour de l'année"
+      flavor: "Merci pour le soutient continue sur cette instance."
     _cookieClicked:
+      title: "Jeu de clic sur des cookies"
+      description: "Cliqué sur un cookie"
       flavor: "Attendez une minute, vous êtes sur le mauvais site web ?"
     _brainDiver:
+      title: "Brain Diver"
+      description: "Poster le lien sur Brain Diver"
       flavor: "Misskey-Misskey La-Tu-Ma"
     _smashTestNotificationButton:
       title: "Débordement de tests"
@@ -1478,6 +1604,11 @@ _achievements:
     _tutorialCompleted:
       title: "Diplôme de la course élémentaire de Misskey"
       description: "Terminer le tutoriel"
+    _bubbleGameExplodingHead:
+      title: "🤯"
+      description: "Le plus gros objet du jeu de bulles"
+    _bubbleGameDoubleExplodingHead:
+      title: "Double🤯"
 _role:
   new: "Nouveau rôle"
   edit: "Modifier le rôle"
@@ -1508,9 +1639,11 @@ _role:
     canManageCustomEmojis: "Gestion des émojis personnalisés"
     canManageAvatarDecorations: "Gestion des décorations d'avatar"
     driveCapacity: "Capacité de stockage du Disque"
+    antennaMax: "Nombre maximum d'antennes"
     wordMuteMax: "Nombre maximal de caractères dans le filtre de mots"
     canUseTranslator: "Usage de la fonctionnalité de traduction"
     avatarDecorationLimit: "Nombre maximal de décorations d'avatar"
+    canImportAntennas: "Autoriser l'importation d'antennes"
 _sensitiveMediaDetection:
   description: "L'apprentissage automatique peut être utilisé pour détecter automatiquement les médias sensibles à modérer. La sollicitation des serveurs augmente légèrement."
   sensitivity: "Sensibilité de la détection"
@@ -1793,6 +1926,29 @@ _permissions:
   "write:gallery": "Éditer la galerie"
   "read:gallery-likes": "Voir les mentions « J'aime » dans la galerie"
   "write:gallery-likes": "Gérer les mentions « J'aime » dans la galerie"
+  "read:flash": "Voir le Play"
+  "write:flash": "Modifier le Play"
+  "read:flash-likes": "Lire vos mentions j'aime des Play"
+  "write:flash-likes": "Modifier vos mentions j'aime des Play"
+  "read:admin:abuse-user-reports": "Voir les utilisateurs signalés"
+  "write:admin:delete-account": "Supprimer le compte d'utilisateur"
+  "write:admin:delete-all-files-of-a-user": "Supprimer tous les fichiers d'un utilisateur"
+  "read:admin:index-stats": "Voir les statistiques sur les index de base de données"
+  "read:admin:table-stats": "Voir les statistiques sur les index de base de données"
+  "read:admin:user-ips": "Voir l'adresse IP de l'utilisateur"
+  "read:admin:meta": "Voir les métadonnées de l'instance"
+  "write:admin:reset-password": "Réinitialiser le mot de passe de l'utilisateur"
+  "write:admin:resolve-abuse-user-report": "Résoudre le signalement d'un utilisateur"
+  "write:admin:send-email": "Envoyer un mail"
+  "read:admin:server-info": "Voir les informations de l'instance"
+  "read:admin:show-moderation-log": "Voir les logs de modération"
+  "read:admin:show-user": "Voir les informations privées de l'utilisateur"
+  "write:admin:suspend-user": "Suspendre l'utilisateur"
+  "write:admin:unset-user-avatar": "Retirer l'avatar de l'utilisateur"
+  "write:admin:unset-user-banner": "Retirer la bannière de l'utilisateur"
+  "write:admin:unsuspend-user": "Lever la suspension d'un utilisateur"
+  "write:admin:meta": "Gérer les métadonnées de l'instance"
+  "write:admin:roles": "Gérer les rôles"
 _auth:
   shareAccess: "Autoriser \"{name}\" à accéder à votre compte ?"
   shareAccessAsk: "Voulez-vous vraiment autoriser cette application à accéder à votre compte?"
@@ -1944,7 +2100,16 @@ _timelines:
   social: "Social"
   global: "Global"
 _play:
+  new: "Créer un Play"
+  edit: "Modifier un Play"
+  created: "Play créé"
+  updated: "Play édité"
+  deleted: "Play supprimé"
+  pageSetting: "Configuration du Play"
+  editThisPage: "Modifier ce Play"
   viewSource: "Afficher la source"
+  my: "Mes Play"
+  liked: "Play aimés"
   featured: "Populaire"
   title: "Titre"
   script: "Script"
@@ -2018,10 +2183,13 @@ _notification:
   achievementEarned: "Accomplissement déverrouillé"
   testNotification: "Tester la notification"
   reactedBySomeUsers: "{n} utilisateur·rice·s ont réagi"
+  likedBySomeUsers: "{n} utilisateurs ont aimé votre note"
   renotedBySomeUsers: "{n} utilisateur·rice·s ont renoté"
   followedBySomeUsers: "{n} utilisateur·rice·s se sont abonné·e·s à vous"
+  login: "Quelqu'un s'est connecté"
   _types:
     all: "Toutes"
+    note: "Nouvelles notes"
     follow: "Nouvel·le abonné·e"
     mention: "Mentions"
     reply: "Réponses"
@@ -2071,11 +2239,14 @@ _drivecleaner:
   orderByCreatedAtAsc: "Date d'ajout ascendante"
 _webhookSettings:
   name: "Nom"
+  secret: "Secret"
+  trigger: "Activateur"
   active: "Activé"
 _abuseReport:
   _notificationRecipient:
     _recipientType:
       mail: "E-mail "
+    keywords: "Mots clés "
 _moderationLogTypes:
   createRole: "Rôle créé"
   deleteRole: "Rôle supprimé"
@@ -2112,6 +2283,7 @@ _moderationLogTypes:
   deleteAvatarDecoration: "Décoration d'avatar supprimée"
   unsetUserAvatar: "Supprimer l'avatar de l'utilisateur·rice"
   unsetUserBanner: "Supprimer la bannière de l'utilisateur·rice"
+  deleteFlash: "Supprimer le Play"
 _fileViewer:
   title: "Détails du fichier"
   type: "Type du fichier"
@@ -2175,5 +2347,20 @@ _dataSaver:
     title: "Mise en évidence du code"
     description: "Si la notation de mise en évidence du code est utilisée, par exemple dans la MFM, elle ne sera pas chargée tant qu'elle n'aura pas été tapée. La mise en évidence du code nécessite le chargement du fichier de définition de chaque langue à mettre en évidence, mais comme ces fichiers ne sont plus chargés automatiquement, on peut s'attendre à une réduction du trafic de données."
 _reversi:
+  reversi: "Reversi"
+  blackIs: "{name} joue les noirs"
+  rules: "Règles"
   waitingBoth: "Préparez-vous"
+  myTurn: "C’est votre tour"
+  turnOf: "C'est le tour de {name}"
+  pastTurnOf: "Tour de {name}"
+  surrender: "Se rendre"
+  surrendered: "Par abandon"
   total: "Total"
+  playing: "En cours"
+  lookingForPlayer: "Recherche d'adversaire"
+_mediaControls:
+  playbackRate: "Vitesse de lecture"
+_embedCodeGen:
+  title: "Personnaliser le code d'intégration"
+  generateCode: "Générer le code d'intégration"
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index 5d51d2dc78..fe3f207618 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -375,7 +375,6 @@ 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"
 driveCapacityPerLocalAccount: "Kapasitas drive per pengguna lokal"
 driveCapacityPerRemoteAccount: "Kapasitas drive per pengguna remote"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 8fb6dcd6f2..66ca935b1b 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -382,7 +382,6 @@ enableLocalTimeline: "Abilita la timeline locale"
 enableGlobalTimeline: "Abilita la timeline federata"
 disablingTimelinesInfo: "Anche disabilitandole, gli Amministratori e i Moderatori potranno comunque accedervi."
 registration: "Iscriviti"
-enableRegistration: "Consenti a chiunque di registrarsi"
 invite: "Invita"
 driveCapacityPerLocalAccount: "Capienza del Drive per profilo locale"
 driveCapacityPerRemoteAccount: "Capienza del Drive per profilo remoto"
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index 50132c0645..c3e0096926 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -382,7 +382,6 @@ enableLocalTimeline: "ローカルタイムラインを使えるようにする
 enableGlobalTimeline: "グローバルタイムラインを使えるようにするわ"
 disablingTimelinesInfo: "ここらへんのタイムラインを使えんようにしてしもても、管理者とモデレーターは使えるままになってるで、そうやなかったら不便やからな。"
 registration: "登録"
-enableRegistration: "一見さんでも誰でもいらっしゃ～い"
 invite: "来てや"
 driveCapacityPerLocalAccount: "ローカルユーザーはんひとりあたりのドライブ容量"
 driveCapacityPerRemoteAccount: "リモートユーザーはんひとりあたりのドライブ容量"
diff --git a/locales/ko-GS.yml b/locales/ko-GS.yml
index 1f7faba23a..60b82d5db9 100644
--- a/locales/ko-GS.yml
+++ b/locales/ko-GS.yml
@@ -356,7 +356,6 @@ enableLocalTimeline: "로컬 타임라인 키기"
 enableGlobalTimeline: "글로벌 타임라인 키기"
 disablingTimelinesInfo: "요 타임라인얼 꺼도 간리자하고 중재자넌 고대로 설 수 잇십니다."
 registration: "맨걸기"
-enableRegistration: "누라도 새로 맨걸 수 잇거로 하기"
 invite: "초대하기"
 driveCapacityPerLocalAccount: "로컬 사용자 하나마중 드라이브 커기"
 driveCapacityPerRemoteAccount: "웬겍 사용자 하나마중 드라이브 커기"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 5d07ebe244..d20a9754b1 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -382,7 +382,6 @@ enableLocalTimeline: "로컬 타임라인 활성화"
 enableGlobalTimeline: "글로벌 타임라인 활성화"
 disablingTimelinesInfo: "특정 타임라인을 비활성화하더라도 관리자 및 모더레이터는 계속 사용할 수 있습니다."
 registration: "등록"
-enableRegistration: "신규 회원가입을 활성화"
 invite: "초대"
 driveCapacityPerLocalAccount: "로컬 유저 한 명당 드라이브 용량"
 driveCapacityPerRemoteAccount: "원격 사용자별 드라이브 용량"
@@ -1257,7 +1256,7 @@ lastNDays: "최근 {n}일"
 backToTitle: "타이틀로 가기"
 hemisphere: "거주 지역"
 withSensitive: "민감한 파일이 포함된 노트 보기"
-userSaysSomethingSensitive: "{name} 같은 민감한 파일이 포함된 글"
+userSaysSomethingSensitive: "{name}의 민감한 파일이 포함된 게시물"
 enableHorizontalSwipe: "스와이프하여 탭 전환"
 loading: "불러오는 중"
 surrender: "그만두기"
diff --git a/locales/lo-LA.yml b/locales/lo-LA.yml
index b100d0300f..38965119fe 100644
--- a/locales/lo-LA.yml
+++ b/locales/lo-LA.yml
@@ -299,7 +299,6 @@ enableLocalTimeline: "ເປີດໃຊ້ທາມລາຍທ້ອງຖິ
 enableGlobalTimeline: "ເປີດໃຊ້ທາມລາຍທົ່ວໂລກ"
 disablingTimelinesInfo: "ຜູ້ດູແລລະບບແລະຜູ້ຄວບຄຸມຈະສາມາດເຂົ້າເຖີງໄທມ໌ໄລນ໌ທັ້ງເບີດ ເຖີງວ່າຈະບໍ່ໄດ້ເປີດໃຊ້ງານກໍ່ຕາມ"
 registration: "ລົງທະບຽນ"
-enableRegistration: "ເປີດໃຊ້ການລົງທະບຽນຜູ້ໃຊ້ໃໝ່"
 invite: "ເຊີນ"
 driveCapacityPerLocalAccount: "ຄວາມຈຸຂອງ drive ຕໍ່ຜູ້ໃຊ້ທ້ອງຖິ່ນ"
 driveCapacityPerRemoteAccount: "ຄວາມຈຸຂອງ drive ຕໍ່ຜູ້ໃຊ້ໄລຍະໄກ"
diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index dde3035357..7e5e9cbbfb 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -333,7 +333,6 @@ enableLocalTimeline: "Inschakelen lokale tijdlijn"
 enableGlobalTimeline: "Inschakelen globale tijdlijn "
 disablingTimelinesInfo: "Beheerders en moderators hebben altijd toegang tot alle tijdlijnen, ook als ze niet actief zijn."
 registration: "Registreren"
-enableRegistration: "Inschakelen registratie nieuwe gebruikers "
 invite: "Uitnodigen"
 driveCapacityPerLocalAccount: "Opslagruimte per lokale gebruiker"
 driveCapacityPerRemoteAccount: "Opslagruimte per externe gebruiker"
diff --git a/locales/no-NO.yml b/locales/no-NO.yml
index c5f61db745..87ea01764d 100644
--- a/locales/no-NO.yml
+++ b/locales/no-NO.yml
@@ -260,7 +260,6 @@ enableLocalTimeline: "Aktiver lokal tidslinje"
 enableGlobalTimeline: "Aktiver global tidslinje"
 disablingTimelinesInfo: "Administratorer og Moderatorer vil alltid ha tilgang til alle tidslinjer, selv om de ikke er aktivert."
 registration: "Registrer"
-enableRegistration: "Aktiver registrering av nye brukere"
 invite: "Inviter"
 basicInfo: "Grunnleggende informasjon"
 pinnedUsers: "Festede brukrere"
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index d7afd57760..203f44b334 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -362,7 +362,6 @@ enableLocalTimeline: "Włącz lokalną oś czasu"
 enableGlobalTimeline: "Włącz globalną oś czasu"
 disablingTimelinesInfo: "Administratorzy i moderatorzy będą zawsze mieć dostęp do wszystkich osi czasu, nawet gdy są one wyłączone."
 registration: "Zarejestruj się"
-enableRegistration: "Włącz rejestrację nowych użytkowników"
 invite: "Zaproś"
 driveCapacityPerLocalAccount: "Powierzchnia dyskowa na lokalnego użytkownika"
 driveCapacityPerRemoteAccount: "Powierzchnia dyskowa na zdalnego użytkownika"
@@ -492,6 +491,10 @@ uiLanguage: "Język wyświetlania UI"
 aboutX: "O {x}"
 emojiStyle: "Styl emoji"
 native: "Natywny"
+menuStyle: "Styl Menu"
+style: "Styl"
+drawer: "Schowek"
+popup: "Wyskakujące okienka"
 showNoteActionsOnlyHover: "Pokazuj akcje notatek tylko po najechaniu myszką"
 showReactionsCount: "Wyświetl liczbę reakcji na notatkę"
 noHistory: "Brak historii"
@@ -574,6 +577,7 @@ ascendingOrder: "Rosnąco"
 descendingOrder: "Malejąco"
 scratchpad: "Brudnopis"
 scratchpadDescription: "Brudnopis zawiera eksperymentalne środowisko dla AiScript. Możesz pisać, wykonywać i sprawdzać wyniki w interakcji z Misskey."
+uiInspector: "Inspektor UI"
 output: "Wyjście"
 script: "Skrypt"
 disablePagesScript: "Wyłącz AiScript na Stronach"
@@ -654,6 +658,7 @@ smtpSecure: "Użyj niejawnego SSL/TLS dla połączeń SMTP"
 smtpSecureInfo: "Wyłącz, jeżeli używasz STARTTLS"
 testEmail: "Przetestuj dostarczanie wiadomości e-mail"
 wordMute: "Wyciszenie słowa"
+hardWordMute: "Wyciszaj przekleństwa"
 regexpError: "Błąd wyrażenia regularnego"
 regexpErrorDescription: "Wystąpił błąd w wyrażeniu regularnym w linii {line} twoich {tab} wyciszeń:"
 instanceMute: "Wyciszone instancje"
@@ -826,6 +831,7 @@ administration: "Zarządzanie"
 accounts: "Konta"
 switch: "Przełącz"
 noMaintainerInformationWarning: "Informacje o administratorze nie są skonfigurowane."
+noInquiryUrlWarning: "Adres URL zapytania nie został ustawiony"
 noBotProtectionWarning: "Zabezpieczenie przed botami nie jest skonfigurowane."
 configure: "Skonfiguruj"
 postToGallery: "Opublikuj w galerii"
@@ -890,6 +896,7 @@ followersVisibility: "Widoczność obserwujących"
 continueThread: "Pokaż kontynuację wątku"
 deleteAccountConfirm: "Spowoduje to nieodwracalne usunięcie Twojego konta. Kontynuować?"
 incorrectPassword: "Nieprawidłowe hasło."
+incorrectTotp: "Hasło pojedynczego użytku jest nie poprawne, lub straciło ważność"
 voteConfirm: "Potwierdzić swój głos na \"{choice}\"?"
 hide: "Ukryj"
 useDrawerReactionPickerForMobile: "Wyświetlaj wybornik reakcji jako szufladę na urządzeniach mobilnych"
@@ -914,6 +921,10 @@ oneHour: "1 godzina"
 oneDay: "1 dzień"
 oneWeek: "1 tydzień"
 oneMonth: "jeden miesiąc"
+threeMonths: "3 miesiące"
+oneYear: "Rok"
+threeDays: "3 dni"
+reflectMayTakeTime: "Może minąć trochę czasu, zanim będzie to uwzględnione"
 failedToFetchAccountInformation: "Nie udało się uzyskać informacji o koncie"
 rateLimitExceeded: "Limit szybkości przekroczony"
 cropImage: "Przytnij obraz"
@@ -924,9 +935,11 @@ file: "Pliki"
 recentNHours: "W ciągu ostatnich {n} godzin"
 recentNDays: "W ciągu ostatnich {n} dni"
 noEmailServerWarning: "Serwer Email nie jest skonfigurowany"
+thereIsUnresolvedAbuseReportWarning: "Istnieją niewyjaśnione raporty"
 recommended: "Zalecane"
 check: "Zweryfikuj"
 driveCapOverrideLabel: "Zmień limit pojemności dysku użytkownika"
+driveCapOverrideCaption: "Resetuje pojemność do wartości domyślnej, przez wpisanie wartości 0 lub niższej"
 requireAdminForView: "Aby to zobaczyć, musisz być administratorem"
 isSystemAccount: "To jest konto stworzone i zarządzane przez system"
 typeToConfirm: "Wprowadź {x}, aby potwierdzić"
@@ -995,17 +1008,29 @@ unassign: "Cofnij przydzielenie"
 color: "Kolor"
 manageCustomEmojis: "Zarządzaj niestandardowymi Emoji"
 manageAvatarDecorations: "Zarządzaj dekoracjami awatara"
+youCannotCreateAnymore: "Limit kreacji został przekroczony"
+cannotPerformTemporary: "Opcja tymczasowo niedostępna"
+cannotPerformTemporaryDescription: "Ta akcja nie może zostać wykonana, z powodu przekroczenia limitu wykonań. Prosimy poczekać chwilę i spróbować ponownie"
 invalidParamError: "Błąd parametrów"
+invalidParamErrorDescription: "Wartości, które zostały podane są niepoprawne. Zwykle jest to spowodowane bugiem, lecz również może być to spowodowane przekroczeniem limitu wartości, lub podobnym problemem"
 permissionDeniedError: "Odrzucono operacje"
 permissionDeniedErrorDescription: "Konto nie posiada uprawnień"
 preset: "Konfiguracja"
 selectFromPresets: "Wybierz konfiguracje"
 achievements: "Osiągnięcia"
+gotInvalidResponseError: "Niepoprawna odpowiedź serwera"
+gotInvalidResponseErrorDescription: "Wystąpił problem z Twoim połączeniem z Internetem, lub z serwerem. {Spróbuj ponownie} wkrótce."
+thisPostMayBeAnnoying: "Ten wpis może obrażać pozostałych użytkowników"
+thisPostMayBeAnnoyingHome: "Opublikuj na domowej osi czasu"
 thisPostMayBeAnnoyingCancel: "Odrzuć"
+thisPostMayBeAnnoyingIgnore: "Zignoruj i wyślij"
+collapseRenotes: "Zwiń wpisy, które już zobaczyłeś"
+collapseRenotesDescription: "Zwiń wpisy, na które już zareagowałeś lub udostępniłeś"
 internalServerError: "Wewnętrzny błąd serwera"
 internalServerErrorDescription: "Niespodziewany błąd po stronie serwera"
 copyErrorInfo: "Kopiuj informacje o błędzie"
 joinThisServer: "Dołącz do chaty"
+exploreOtherServers: "Szukaj innej instancji"
 disableFederationOk: "Wyłącz federacje"
 invitationRequiredToRegister: "Ten serwer wymaga zaproszenia. Tylko osoby z zaproszeniem mogą się zarejestrować"
 emailNotSupported: "Wysyłanie wiadomości E-mail nie jest obsługiwane na tym serwerze"
diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml
index 9039fd2141..7ef9e3a946 100644
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -376,7 +376,6 @@ enableLocalTimeline: "Ativar linha do tempo local"
 enableGlobalTimeline: "Ativar linha do tempo global"
 disablingTimelinesInfo: "Se você desabilitar essas linhas do tempo, administradores e moderadores ainda poderão usá-las por conveniência."
 registration: "Registar"
-enableRegistration: "Permitir que qualquer pessoa se registre"
 invite: "Convidar"
 driveCapacityPerLocalAccount: "Capacidade do drive por usuário local"
 driveCapacityPerRemoteAccount: "Capacidade do drive por usuário remoto"
diff --git a/locales/ro-RO.yml b/locales/ro-RO.yml
index 3cc09aa5c2..71dc1dc94c 100644
--- a/locales/ro-RO.yml
+++ b/locales/ro-RO.yml
@@ -341,7 +341,6 @@ enableLocalTimeline: "Activează cronologia locală"
 enableGlobalTimeline: "Activeaza cronologia globală"
 disablingTimelinesInfo: "Administratorii și Moderatorii vor avea mereu access la toate cronologiile, chiar dacă nu sunt activate."
 registration: "Inregistrare"
-enableRegistration: "Activează înregistrările pentru utilizatori noi"
 invite: "Invită"
 driveCapacityPerLocalAccount: "Capacitatea Drive-ului per utilizator local"
 driveCapacityPerRemoteAccount: "Capacitatea Drive-ului per utilizator extern"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 8174675880..537e99036c 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -377,7 +377,6 @@ enableLocalTimeline: "Включить локальную ленту"
 enableGlobalTimeline: "Включить глобальную ленту"
 disablingTimelinesInfo: "У администраторов и модераторов есть доступ ко всем лентам, даже если они отключены."
 registration: "Регистрация"
-enableRegistration: "Разрешить регистрацию"
 invite: "Пригласить"
 driveCapacityPerLocalAccount: "Объём Диска на одного локального пользователя"
 driveCapacityPerRemoteAccount: "Объём Диска на одного пользователя с другого экземпляра"
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index 60ce45a6b9..f3f43ee6a6 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -331,7 +331,6 @@ enableLocalTimeline: "Povoliť lokálnu časovú os"
 enableGlobalTimeline: "Povoliť globálnu časovú os"
 disablingTimelinesInfo: "Administrátori a moderátori majú vždy prístup ku všetkým časovým osiam, aj keď sú vypnuté."
 registration: "Registrácia"
-enableRegistration: "Povoliť registráciu nových používateľov"
 invite: "Pozvať"
 driveCapacityPerLocalAccount: "Kapacita disku pre používateľa"
 driveCapacityPerRemoteAccount: "Kapacita disku pre vzdialeného používateľa"
diff --git a/locales/sv-SE.yml b/locales/sv-SE.yml
index 4945e0f677..5961605645 100644
--- a/locales/sv-SE.yml
+++ b/locales/sv-SE.yml
@@ -333,7 +333,6 @@ 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"
 bannerUrl: "URL till banner-bilden"
@@ -481,6 +480,7 @@ nNotes: "{n} Noter"
 backgroundColor: "Bakgrundsbild"
 textColor: "Text"
 saveAs: "Spara som..."
+saveConfirm: "Spara ändringar?"
 youAreRunningUpToDateClient: "Klienten du använder är uppdaterat."
 newVersionOfClientAvailable: "Ny version av klienten är tillgänglig."
 editCode: "Redigera kod"
@@ -523,6 +523,7 @@ threeMonths: "3 månader"
 oneYear: "1 år"
 threeDays: "3 dagar"
 file: "Filer"
+deleteAccount: "Radera konto"
 label: "Etikett"
 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."
@@ -575,9 +576,13 @@ _achievements:
     _open3windows:
       title: "Flera Fönster"
       description: "Ha minst 3 fönster öppna samtidigt"
+_role:
+  edit: "Redigera roll"
 _ffVisibility:
   public: "Publicera"
   private: "Privat"
+_accountDelete:
+  accountDelete: "Radera konto"
 _ad:
   back: "Tillbaka"
 _gallery:
@@ -587,6 +592,7 @@ _email:
     title: "följde dig"
 _aboutMisskey:
   source: "Källkod"
+  projectMembers: "Projektmedlemmar"
 _channel:
   setBanner: "Välj banner"
   removeBanner: "Ta bort banner"
@@ -602,8 +608,17 @@ _theme:
 _sfx:
   note: "Noter"
   notification: "Notifikationer"
+_ago:
+  justNow: "Just nu"
 _2fa:
+  step3Title: "Ange en autentiseringskod"
   renewTOTPCancel: "Nej tack"
+_permissions:
+  "read:reactions": "Visa dina reaktioner"
+  "write:reactions": "Redigera dina reaktioner"
+  "write:admin:delete-account": "Radera användarkonto"
+  "write:admin:roles": "Hantera roller"
+  "read:admin:roles": "Visa roller"
 _antennaSources:
   all: "Alla noter"
   homeTimeline: "Noter från följda användare"
@@ -666,6 +681,8 @@ _notification:
     reply: "Svara"
     renote: "Omnotera"
 _deck:
+  addColumn: "Lägg till kolumn"
+  deleteProfile: "Radera profil"
   _columns:
     notifications: "Notifikationer"
     tl: "Tidslinje"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index 58cf8f068c..c725282d50 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -382,7 +382,6 @@ enableLocalTimeline: "เปิดใช้งานไทม์ไลน์ท
 enableGlobalTimeline: "เปิดใช้งานไทม์ไลน์ทั่วโลก"
 disablingTimelinesInfo: "ผู้ดูแลระบบและผู้ควบคุมจะสามารถเข้าถึงไทม์ไลน์ทั้งหมด ถึงแม้ว่าจะไม่ได้เปิดใช้งานก็ตาม"
 registration: "ลงทะเบียน"
-enableRegistration: "เปิดใช้งานการลงทะเบียนผู้ใช้ใหม่"
 invite: "คำเชิญ"
 driveCapacityPerLocalAccount: "ความจุของไดรฟ์ต่อผู้ใช้ท้องถิ่น"
 driveCapacityPerRemoteAccount: "ความจุของไดรฟ์ต่อผู้ใช้ระยะไกล"
diff --git a/locales/tr-TR.yml b/locales/tr-TR.yml
index fe2f158ff6..69892fedc8 100644
--- a/locales/tr-TR.yml
+++ b/locales/tr-TR.yml
@@ -344,7 +344,6 @@ today: "Bugün"
 monthX: "{month} ay"
 pages: "Sayfalar"
 integration: "Entegrasyon"
-enableRegistration: "Kayıtlara izin ver"
 basicInfo: "Temel bilgiler"
 pinnedUsers: "Sabitlenmiş kullanıcılar"
 pinnedNotes: "Sabitlenen"
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index f2262cd71f..1b21854650 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -334,7 +334,6 @@ enableLocalTimeline: "Увімкнути локальну стрічку"
 enableGlobalTimeline: "Увімкнути глобальну стрічку"
 disablingTimelinesInfo: "Адміністратори та модератори завжди мають доступ до всіх стрічок, навіть якщо вони вимкнуті."
 registration: "Реєстрація"
-enableRegistration: "Дозволити реєстрацію"
 invite: "Запросити"
 driveCapacityPerLocalAccount: "Об'єм диска на одного локального користувача"
 driveCapacityPerRemoteAccount: "Об'єм диска на одного віддаленого користувача"
diff --git a/locales/uz-UZ.yml b/locales/uz-UZ.yml
index 37a550008a..051a4ae6c5 100644
--- a/locales/uz-UZ.yml
+++ b/locales/uz-UZ.yml
@@ -349,7 +349,6 @@ enableLocalTimeline: "Mahalliy vaqt mintaqasini yoqing"
 enableGlobalTimeline: "Global vaqt mintaqasini yoqing"
 disablingTimelinesInfo: "Administratorlar va Moderatorlar har doim barcha vaqt jadvallariga kirish huquqiga ega bo'ladilar, hatto ular yoqilmagan bo'lsa ham."
 registration: "Ro'yxatdan o'tish"
-enableRegistration: "Ro'yxatdan o'tishni yoqing"
 invite: "Taklif qilish"
 driveCapacityPerLocalAccount: "Har bir mahalliy foydalanuvchi uchun disk maydoni"
 driveCapacityPerRemoteAccount: "Har bir masofaviy foydalanuvchi uchun disk maydoni"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index fb8e898bf1..24faa4b94c 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -357,7 +357,6 @@ enableLocalTimeline: "Bật bảng tin máy chủ"
 enableGlobalTimeline: "Bật bảng tin liên hợp"
 disablingTimelinesInfo: "Quản trị viên và Kiểm duyệt viên luôn có quyền truy cập mọi bảng tin, kể cả khi chúng không được bật."
 registration: "Đăng ký"
-enableRegistration: "Cho phép đăng ký mới"
 invite: "Mời"
 driveCapacityPerLocalAccount: "Dung lượng ổ đĩa tối đa cho mỗi người dùng"
 driveCapacityPerRemoteAccount: "Dung lượng ổ đĩa tối đa cho mỗi người dùng từ xa"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 7a11f247ca..c5a581035d 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -382,7 +382,6 @@ enableLocalTimeline: "启用本地时间线"
 enableGlobalTimeline: "启用全局时间线"
 disablingTimelinesInfo: "即使时间线功能被禁用，出于方便，管理员和监察员也可以继续使用。"
 registration: "注册"
-enableRegistration: "允许任何人注册"
 invite: "邀请"
 driveCapacityPerLocalAccount: "每个用户的网盘容量"
 driveCapacityPerRemoteAccount: "每个远程用户的网盘容量"
@@ -587,6 +586,7 @@ masterVolume: "主音量"
 notUseSound: "静音"
 useSoundOnlyWhenActive: "仅在 Misskey 活跃时输出声音"
 details: "详情"
+renoteDetails: "转帖详情"
 chooseEmoji: "选择表情符号"
 unableToProcess: "操作无法完成"
 recentUsed: "最近使用"
@@ -1300,6 +1300,7 @@ thisContentsAreMarkedAsSigninRequiredByAuthor: "根据发帖者的设定，需
 lockdown: "锁定"
 pleaseSelectAccount: "请选择帐户"
 availableRoles: "可用角色"
+acknowledgeNotesAndEnable: "理解注意事项后再开启。"
 _accountSettings:
   requireSigninToViewContents: "需要登录才能显示内容"
   requireSigninToViewContentsDescription1: "您发布的所有帖子将变成需要登入后才会显示。有望防止爬虫收集各种信息。"
@@ -1456,6 +1457,8 @@ _serverSettings:
   reactionsBufferingDescription: "开启时可显著提高发送回应时的性能，及减轻数据库负荷。但 Redis 的内存用量会相应增加。"
   inquiryUrl: "联络地址"
   inquiryUrlDescription: "用来指定诸如向服务运营商咨询的论坛地址，或记载了运营商联系方式之类的网页地址。"
+  openRegistration: "开放注册"
+  openRegistrationWarning: "开放注册有风险。建议仅当能够持续监控服务器并在出现问题时能够立即响应时才打开它。"
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "若在一段时间内没有检测到管理活动，为防止垃圾信息，此设定将自动关闭。"
 _accountMigration:
   moveFrom: "从别的账号迁移到此账户"
@@ -2738,3 +2741,6 @@ _selfXssPrevention:
   description1: "如果在此处粘贴了什么，恶意用户可能会接管账户或者盗取个人资料。"
   description2: "如果不能完全理解将要粘贴的内容，%c 请立即停止操作并关闭这个窗口。"
   description3: "详情请看这里。{link}"
+_followRequest:
+  recieved: "已收到申请"
+  sent: "已发送申请"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index b7c9def26f..1e8e27c7bd 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -382,7 +382,6 @@ enableLocalTimeline: "啟用本地時間軸"
 enableGlobalTimeline: "啟用全域時間軸"
 disablingTimelinesInfo: "為了方便，即使您關閉了時間軸功能，管理員和審查員仍可以繼續使用。"
 registration: "註冊"
-enableRegistration: "開放新使用者註冊"
 invite: "邀請"
 driveCapacityPerLocalAccount: "每個本地使用者的雲端硬碟容量"
 driveCapacityPerRemoteAccount: "每個非本地用戶的雲端空間大小"
@@ -1119,7 +1118,7 @@ vertical: "直向"
 horizontal: "橫向"
 position: "位置"
 serverRules: "伺服器規則"
-pleaseConfirmBelowBeforeSignup: "在本伺服器註冊之前，請確認下列事項。"
+pleaseConfirmBelowBeforeSignup: "在本伺服器註冊之前，必須確認並同意以下內容。"
 pleaseAgreeAllToContinue: "必須全部勾選「同意」才能繼續。"
 continue: "繼續"
 preservedUsernames: "保留的使用者名稱"
@@ -1300,6 +1299,7 @@ thisContentsAreMarkedAsSigninRequiredByAuthor: "作者將其設定為需要登
 lockdown: "鎖定"
 pleaseSelectAccount: "請選擇帳戶"
 availableRoles: "可用角色"
+acknowledgeNotesAndEnable: "了解注意事項後再開啟。"
 _accountSettings:
   requireSigninToViewContents: "須登入以顯示內容"
   requireSigninToViewContentsDescription1: "必須登入才會顯示您建立的貼文等內容。可望有效防止資訊被爬蟲蒐集。"
@@ -1456,6 +1456,8 @@ _serverSettings:
   reactionsBufferingDescription: "啟用時，可以顯著提高建立反應時的效能並減少資料庫的負載。 但是，Redis 記憶體使用量會增加。"
   inquiryUrl: "聯絡表單網址"
   inquiryUrlDescription: "指定伺服器運營者的聯絡表單網址，或包含運營者聯絡資訊網頁的網址。"
+  openRegistration: "允許建立帳戶"
+  openRegistrationWarning: "開放註冊伴隨著風險。 建議只有在伺服器受到持續監控，並準備好在出現問題時能立即處理的情況下才開放註冊。"
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "為了防止 spam，如果一段期間內沒有偵測到審查員的活動，此設定將自動關閉。"
 _accountMigration:
   moveFrom: "從其他帳戶遷移到這個帳戶"
@@ -2738,3 +2740,6 @@ _selfXssPrevention:
   description1: "如果您在此處貼上任何內容，惡意使用者可能會接管您的帳戶或竊取您的個人資訊。"
   description2: "如果您不確切知道要貼上的內容，%c 請立即停止工作並關閉此視窗。"
   description3: "細節請看這裡。{link}"
+_followRequest:
+  recieved: "收到的請求"
+  sent: "送出的請求"
-- 
2.45.2


From 6c5d3113c679988d54a00ac9c5b0c77bf1e7e93e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 19 Nov 2024 03:56:50 +0000
Subject: [PATCH 18/20] Bump version to 2024.11.0-alpha.2

---
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 63043d62e0..4dd411c10f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.11.0-alpha.1",
+	"version": "2024.11.0-alpha.2",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 8166dcedad..f57656db0b 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.11.0-alpha.1",
+	"version": "2024.11.0-alpha.2",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",
-- 
2.45.2


From ccf81b9398803e029cdad0b613425d26a19790b5 Mon Sep 17 00:00:00 2001
From: eternal-flame-AD <yume@yumechi.jp>
Date: Tue, 19 Nov 2024 01:18:31 -0600
Subject: [PATCH 19/20] filter out duplicate events

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
---
 yume-mods/nyuukyou/Cargo.lock  | 533 ++++++++++++++++++++++++++-------
 yume-mods/nyuukyou/Cargo.toml  |   3 +-
 yume-mods/nyuukyou/src/main.rs |  96 +++++-
 3 files changed, 505 insertions(+), 127 deletions(-)

diff --git a/yume-mods/nyuukyou/Cargo.lock b/yume-mods/nyuukyou/Cargo.lock
index 1143c2528e..7db6517a56 100644
--- a/yume-mods/nyuukyou/Cargo.lock
+++ b/yume-mods/nyuukyou/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -43,9 +43,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.15"
+version = "0.6.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
+checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -58,36 +58,36 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.8"
+version = "1.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.5"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
+checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.1"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
+checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.4"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
+checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -115,9 +115,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "axum"
-version = "0.7.7"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae"
+checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
 dependencies = [
  "async-trait",
  "axum-core",
@@ -221,16 +221,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
-name = "bytes"
-version = "1.7.2"
+name = "byteorder"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da"
 
 [[package]]
 name = "cc"
-version = "1.1.30"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16803a61b81d9eabb7eae2588776c4c1e584b738ede45fdbb4c972cec1e9945"
+checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47"
 dependencies = [
  "shlex",
 ]
@@ -258,9 +264,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.20"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
+checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -268,9 +274,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.20"
+version = "4.5.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
+checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
 dependencies = [
  "anstream",
  "anstyle",
@@ -292,15 +298,15 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
+checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.2"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
+checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
 
 [[package]]
 name = "core-foundation"
@@ -348,10 +354,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "encoding_rs"
-version = "0.8.34"
+name = "displaydoc"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
 dependencies = [
  "cfg-if",
 ]
@@ -397,14 +414,14 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.1.1"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"
 
 [[package]]
 name = "fedivet"
 version = "0.1.0"
-source = "git+https://forge.yumechi.jp/yume/fedivet?tag=testing-audit+relay#b0266202cfe72479774689db8879c3200190ea5f"
+source = "git+https://forge.yumechi.jp/yume/fedivet?tag=testing-audit%2Brelay%2Bfilter#b1b051dc2f1319a3948d7afcecfd3ac8f92a07de"
 dependencies = [
  "async-trait",
  "axum",
@@ -425,9 +442,9 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.34"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
+checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -596,9 +613,9 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "hashbrown"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3"
 
 [[package]]
 name = "heck"
@@ -720,9 +737,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.9"
+version = "0.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
+checksum = "df2dcfbe0677734ab2f3ffa7fa7bfd4706bfdc1ef393f2ee30184aed67e631b4"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -761,13 +778,142 @@ dependencies = [
 ]
 
 [[package]]
-name = "idna"
-version = "0.5.0"
+name = "icu_collections"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
 ]
 
 [[package]]
@@ -777,7 +923,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.0",
+ "hashbrown 0.15.1",
 ]
 
 [[package]]
@@ -809,9 +955,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.160"
+version = "0.2.164"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0b21006cd1874ae9e650973c565615676dc4a274c965bb0a73796dac838ce4f"
+checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
 
 [[package]]
 name = "linux-raw-sys"
@@ -819,6 +965,12 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -908,6 +1060,7 @@ dependencies = [
  "clap",
  "env_logger",
  "fedivet",
+ "rand",
  "serde",
  "tokio",
 ]
@@ -992,18 +1145,18 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project"
-version = "1.1.6"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec"
+checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.6"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8"
+checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1012,9 +1165,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
+checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff"
 
 [[package]]
 name = "pin-utils"
@@ -1029,10 +1182,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
-name = "proc-macro2"
-version = "1.0.88"
+name = "ppv-lite86"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e"
 dependencies = [
  "unicode-ident",
 ]
@@ -1046,6 +1208,36 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.7"
@@ -1057,9 +1249,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1069,9 +1261,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.8"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -1086,9 +1278,9 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
-version = "0.12.8"
+version = "0.12.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f713147fbe92361e52392c73b8c9e48c04c6625bce969ef54dc901e58e042a7b"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
 dependencies = [
  "base64",
  "bytes",
@@ -1152,9 +1344,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustix"
-version = "0.38.37"
+version = "0.38.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
+checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
 dependencies = [
  "bitflags",
  "errno",
@@ -1165,9 +1357,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.15"
+version = "0.23.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fbb44d7acc4e873d613422379f69f237a1b141928c02f6bc6ccfddddc2d7993"
+checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e"
 dependencies = [
  "once_cell",
  "rustls-pki-types",
@@ -1244,9 +1436,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.12.0"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
+checksum = "fa39c7303dc58b5543c94d22c1766b0d31f2ee58306363ea622b10bbc075eaa2"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -1254,18 +1446,18 @@ dependencies = [
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1274,9 +1466,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
  "itoa",
  "memchr",
@@ -1352,6 +1544,12 @@ version = "0.9.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -1366,9 +1564,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.79"
+version = "2.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1390,6 +1588,17 @@ dependencies = [
  "futures-core",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "system-configuration"
 version = "0.6.1"
@@ -1413,9 +1622,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
+checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c"
 dependencies = [
  "cfg-if",
  "fastrand",
@@ -1426,18 +1635,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.64"
+version = "2.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
+checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.64"
+version = "2.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
+checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1445,25 +1654,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "tinyvec"
-version = "1.8.0"
+name = "tinystr"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
- "tinyvec_macros",
+ "displaydoc",
+ "zerovec",
 ]
 
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
 [[package]]
 name = "tokio"
-version = "1.40.0"
+version = "1.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
 dependencies = [
  "backtrace",
  "bytes",
@@ -1554,9 +1758,9 @@ dependencies = [
 
 [[package]]
 name = "tower-http"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8437150ab6bbc8c5f0f519e3d5ed4aa883a83dd4cdd3d1b21f9482936046cb97"
+checksum = "403fa3b783d4b626a8ad51d766ab03cb6d2dbfc46b1c5d4448395e6628dc9697"
 dependencies = [
  "bitflags",
  "bytes",
@@ -1608,27 +1812,12 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
-[[package]]
-name = "unicode-bidi"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
-[[package]]
-name = "unicode-normalization"
-version = "0.1.24"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
-dependencies = [
- "tinyvec",
-]
-
 [[package]]
 name = "untrusted"
 version = "0.9.0"
@@ -1637,9 +1826,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada"
 dependencies = [
  "form_urlencoded",
  "idna",
@@ -1647,6 +1836,18 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -1743,9 +1944,9 @@ checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d"
 
 [[package]]
 name = "wasm-streams"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
 dependencies = [
  "futures-util",
  "js-sys",
@@ -1885,8 +2086,108 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+dependencies = [
+ "byteorder",
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
 [[package]]
 name = "zeroize"
 version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerovec"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/yume-mods/nyuukyou/Cargo.toml b/yume-mods/nyuukyou/Cargo.toml
index c954bbc9d8..13ccafaa61 100644
--- a/yume-mods/nyuukyou/Cargo.toml
+++ b/yume-mods/nyuukyou/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 axum = "0.7"
 clap = { version = "4.5.20", features = ["derive"] }
 env_logger = "0.11.5"
-fedivet = { git = "https://forge.yumechi.jp/yume/fedivet", tag = "testing-audit+relay" }
+fedivet = { git = "https://forge.yumechi.jp/yume/fedivet", tag = "testing-audit+relay+filter" }
+rand = "0.8.5"
 serde = { version = "1.0.210", features = ["derive"] }
 tokio = { version = "1" }
diff --git a/yume-mods/nyuukyou/src/main.rs b/yume-mods/nyuukyou/src/main.rs
index 4b17b61628..b137fba4ac 100644
--- a/yume-mods/nyuukyou/src/main.rs
+++ b/yume-mods/nyuukyou/src/main.rs
@@ -1,16 +1,22 @@
-
+use std::collections::HashMap;
+use std::hash::DefaultHasher;
+use std::hash::Hash;
+use std::hash::Hasher;
 use std::path::PathBuf;
 use std::sync::Arc;
+use std::sync::RwLock;
+use std::time::Instant;
 
-use axum::response::IntoResponse;
+use axum::http::StatusCode;
 use clap::Parser;
 use fedivet::evaluate::chain::audit::AuditOptions;
+use fedivet::evaluate::Disposition;
 use fedivet::evaluate::Evaluator;
 use fedivet::model::error::MisskeyError;
 use fedivet::serve;
 use fedivet::BaseAppState;
 use fedivet::HasAppState;
-use serde::Serialize;
+use rand::random;
 
 #[derive(Parser)]
 pub struct Args {
@@ -24,14 +30,84 @@ pub struct Args {
     pub tls_key: Option<String>,
 }
 
+struct LastSeenEntry {
+    ts: Instant,
+    count: u64,
+}
+
+const ERR_DEDUP: MisskeyError = MisskeyError::new_const(
+    StatusCode::OK,
+    "TOO_MANY_DUPLICATES",
+    "02fe81b0-c1ef-4d4e-bd5c-288ae379bff7",
+    "Too many duplicates, further duplicates will be ignored.",
+);
+
 #[allow(clippy::unused_async)]
-async fn build_state<E: IntoResponse + Clone + Serialize + Send + Sync + 'static>(
-    base: Arc<BaseAppState<E>>,
+async fn build_state(
+    base: Arc<BaseAppState<MisskeyError>>,
     _args: &Args,
-) -> impl HasAppState<E> + Evaluator<E> {
-    base
-    .extract_meta()
-    .audited(AuditOptions::new(PathBuf::from("/store/log/audit/incoming")))
+) -> impl HasAppState<MisskeyError> + Evaluator<MisskeyError> {
+    let dedup_last_seen = Arc::new(RwLock::new(HashMap::<_, LastSeenEntry>::new()));
+
+    let dedup_last_seen_clone = dedup_last_seen.clone();
+    let dedup_last_seen_clone2 = dedup_last_seen.clone();
+
+    tokio::spawn(async move {
+        let mut ticker = tokio::time::interval(tokio::time::Duration::from_secs(60 * 60));
+        loop {
+            ticker.tick().await;
+            let mut dedup_last_seen = dedup_last_seen_clone.write().unwrap();
+            dedup_last_seen.retain(|_, entry| entry.ts.elapsed().as_secs() < 60 * 5);
+        }
+    });
+
+    base.extract_meta()
+        .filter(
+            move |event| match event.activity.as_ref() {
+                Err(_) => Disposition::Next,
+                Ok(activity) => {
+                    let dedup_last_seen = dedup_last_seen.read().unwrap();
+
+                    let mut hash = DefaultHasher::new();
+                    activity.meta_obj.ty_.hash(&mut hash);
+                    activity.meta_obj.id.hash(&mut hash);
+
+                    let count = dedup_last_seen
+                        .get(&hash.finish())
+                        .map(|entry| entry.count)
+                        .unwrap_or(0);
+                    if count > 5 {
+                        Disposition::Intercept(ERR_DEDUP)
+                    } else {
+                        Disposition::Next
+                    }
+                }
+            },
+            move |_resp, info| match info.activity.as_ref() {
+                Err(_) => {}
+                Ok(activity) => {
+                    let mut hash = DefaultHasher::new();
+                    activity.meta_obj.ty_.hash(&mut hash);
+                    activity.meta_obj.id.hash(&mut hash);
+
+                    let mut dedup_last_seen = dedup_last_seen_clone2.write().unwrap();
+                    dedup_last_seen
+                        .entry(hash.finish())
+                        .or_insert(LastSeenEntry {
+                            ts: Instant::now(),
+                            count: 1,
+                        });
+                    if dedup_last_seen.len() * std::mem::size_of::<(u64, LastSeenEntry)>()
+                        > 64 << 20
+                    {
+                        dedup_last_seen.retain(|_, _| random::<bool>());
+                    }
+                }
+            },
+        )
+        .audited(AuditOptions::new(PathBuf::from(
+            "/store/log/audit/incoming",
+        )))
 }
 
 #[tokio::main]
@@ -43,7 +119,7 @@ async fn main() {
 
     let args = Args::parse();
 
-    let state = build_state::<MisskeyError>(
+    let state = build_state(
         Arc::new(
             BaseAppState::new(args.backend.parse().expect("Invalid backend URL")).with_empty_ctx(),
         ),
-- 
2.45.2


From 8a26ab9fb589dfdec5a7d12a0433064ea5f4e8ad Mon Sep 17 00:00:00 2001
From: eternal-flame-AD <yume@yumechi.jp>
Date: Tue, 19 Nov 2024 01:41:59 -0600
Subject: [PATCH 20/20] 2024.11.0-yumechinokuni.5

Signed-off-by: eternal-flame-AD <yume@yumechi.jp>
---
 CHANGELOG.md                     | 8 ++++++++
 package.json                     | 2 +-
 packages/misskey-js/package.json | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0a91c2fe83..db8d6704fc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 2024.11.0-yumechinokuni.5
+
+- Upstream: 2024.11.0-alpha.2 タッグをマージする
+- Reliability: Activitypub event deduplication
+- DevOps: Prometheus サーバーメトリクス
+- Enhance: ハッシュタグランギングを改善
+- Enhance: PgroongaのCWサーチ + パフォーマンス改善
+
 ## 2024.11.0-yumechinokuni.4
 
 - Upstream: 2024.11.0-alpha.1 タッグをマージする
diff --git a/package.json b/package.json
index 135d42e262..6e61cd1a55 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2024.11.0-yumechinokuni.4p1",
+	"version": "2024.11.0-yumechinokuni.5",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 38137a0532..0749978fa9 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2024.11.0-yumechinokuni.3",
+	"version": "2024.11.0-yumechinokuni.5",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",
-- 
2.45.2