From c1ff6feeda35c3d5ff86daced8f4fe409e0dc8b0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 29 May 2025 04:24:41 +0000
Subject: [PATCH 01/31] Bump version to 2025.5.1-beta.4

---
 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 b6c12ed752..efc50f0e7d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.5.1-beta.3",
+	"version": "2025.5.1-beta.4",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 746de3fb6a..b017236ef5 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.5.1-beta.3",
+	"version": "2025.5.1-beta.4",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 85c28d5cb72244d08f94681d1211dafb7dbe4bed Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 29 May 2025 13:53:33 +0900
Subject: [PATCH 02/31] =?UTF-8?q?enhance(backend):=20=E5=A4=96=E9=83=A8?=
 =?UTF-8?q?=E3=82=B5=E3=82=A4=E3=83=88=E3=81=AEOGP=E3=81=AE=E3=82=AD?=
 =?UTF-8?q?=E3=83=A3=E3=83=83=E3=82=B7=E3=83=A5=E6=9C=9F=E9=96=93=E3=82=92?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                         | 1 +
 packages/backend/src/server/web/UrlPreviewService.ts | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10b19dacf8..a12d8af83f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,7 @@
 - Enhance: ノートのレスポンスにアンケートが添付されているかどうかを示すフラグ`hasPoll`を追加
 - Enhance: チャットルームのレスポンスに招待されているかどうかを示すフラグ`invitationExists`を追加
 - Enhance: レートリミットの計算方法を調整 (#13997)
+- Enhance: 外部サイトのOGPのキャッシュ期間を調整
 - Fix: チャットルームが削除された場合・チャットルームから抜けた場合に、未読状態が残り続けることがあるのを修正
 - Fix: ユーザ除外アンテナをインポートできない問題を修正
 - Fix: アンテナのセンシティブなチャンネルのノートを含むかどうかの情報がエクスポートされない問題を修正
diff --git a/packages/backend/src/server/web/UrlPreviewService.ts b/packages/backend/src/server/web/UrlPreviewService.ts
index 16763b2c3e..b9a4015031 100644
--- a/packages/backend/src/server/web/UrlPreviewService.ts
+++ b/packages/backend/src/server/web/UrlPreviewService.ts
@@ -94,8 +94,8 @@ export class UrlPreviewService {
 			summary.icon = this.wrap(summary.icon);
 			summary.thumbnail = this.wrap(summary.thumbnail);
 
-			// Cache 7days
-			reply.header('Cache-Control', 'max-age=604800, immutable');
+			// Cache 1day
+			reply.header('Cache-Control', 'max-age=86400, immutable');
 
 			return summary;
 		} catch (err) {

From 75dcebc3412526cfd657ed8251448df0acc23b11 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 29 May 2025 17:32:10 +0900
Subject: [PATCH 03/31] =?UTF-8?q?enhance(frontend):=20=E3=83=87=E3=83=90?=
 =?UTF-8?q?=E3=82=A4=E3=82=B9=E3=81=AE=E3=83=80=E3=83=BC=E3=82=AF=E3=83=A2?=
 =?UTF-8?q?=E3=83=BC=E3=83=89=E3=81=A8=E5=90=8C=E6=9C=9F=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=8C=E6=9C=89?=
 =?UTF-8?q?=E5=8A=B9=E3=81=AA=E3=81=A8=E3=81=8D=E3=81=AB=E3=83=86=E3=83=BC?=
 =?UTF-8?q?=E3=83=9E=E3=82=92=E6=89=8B=E5=8B=95=E3=81=A7=E5=88=87=E3=82=8A?=
 =?UTF-8?q?=E6=9B=BF=E3=81=88=E3=82=88=E3=81=86=E3=81=A8=E3=81=97=E3=81=9F?=
 =?UTF-8?q?=E9=9A=9B=E3=81=AE=E8=AD=A6=E5=91=8A=E3=82=92=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/index.d.ts                            |   4 +
 locales/ja-JP.yml                             |   1 +
 .../frontend/src/pages/settings/theme.vue     | 146 +++++++++---------
 3 files changed, 79 insertions(+), 72 deletions(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index cecda4d44e..21da0c171a 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -1326,6 +1326,10 @@ export interface Locale extends ILocale {
      * デバイスのダークモードと同期する
      */
     "syncDeviceDarkMode": string;
+    /**
+     * 「{x}」がオンになっています。同期をオフにして手動でモードを切り替えますか？
+     */
+    "switchDarkModeManuallyWhenSyncEnabledConfirm": ParameterizedString<"x">;
     /**
      * ドライブ
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index e059fc99ee..b81529790f 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -327,6 +327,7 @@ dark: "ダーク"
 lightThemes: "明るいテーマ"
 darkThemes: "暗いテーマ"
 syncDeviceDarkMode: "デバイスのダークモードと同期する"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "「{x}」がオンになっています。同期をオフにして手動でモードを切り替えますか？"
 drive: "ドライブ"
 fileName: "ファイル名"
 selectFile: "ファイルを選択"
diff --git a/packages/frontend/src/pages/settings/theme.vue b/packages/frontend/src/pages/settings/theme.vue
index 45b97e19c4..f3a6458109 100644
--- a/packages/frontend/src/pages/settings/theme.vue
+++ b/packages/frontend/src/pages/settings/theme.vue
@@ -9,8 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<div v-adaptive-border class="rfqxtzch _panel">
 			<div class="toggle">
 				<div class="toggleWrapper">
-					<input id="dn" v-model="darkMode" type="checkbox" class="dn"/>
-					<label for="dn" class="toggle">
+					<div class="toggle" :class="store.r.darkMode.value ? 'checked' : null" @click="toggleDarkMode()">
 						<span class="before">{{ i18n.ts.light }}</span>
 						<span class="after">{{ i18n.ts.dark }}</span>
 						<span class="toggle__handler">
@@ -24,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						<span class="star star--4"></span>
 						<span class="star star--5"></span>
 						<span class="star star--6"></span>
-					</label>
+					</div>
 				</div>
 			</div>
 			<div class="sync">
@@ -37,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</div>
 
 		<div class="_gaps">
-			<template v-if="!darkMode">
+			<template v-if="!store.r.darkMode.value">
 				<SearchMarker :keywords="['light', 'theme']">
 					<MkFolder :defaultOpen="true" :max-height="500">
 						<template #icon><i class="ti ti-sun"></i></template>
@@ -205,6 +204,7 @@ import JSON5 from 'json5';
 import defaultLightTheme from '@@/themes/l-light.json5';
 import defaultDarkTheme from '@@/themes/d-green-lime.json5';
 import type { Theme } from '@/theme.js';
+import * as os from '@/os.js';
 import MkSwitch from '@/components/MkSwitch.vue';
 import FormSection from '@/components/form/section.vue';
 import FormLink from '@/components/form/link.vue';
@@ -257,7 +257,6 @@ const lightThemeId = computed({
 	},
 });
 
-const darkMode = computed(store.makeGetterSetter('darkMode'));
 const syncDeviceDarkMode = prefer.model('syncDeviceDarkMode');
 const themesCount = installedThemes.value.length;
 
@@ -267,6 +266,21 @@ watch(syncDeviceDarkMode, () => {
 	}
 });
 
+async function toggleDarkMode() {
+	const value = !store.r.darkMode.value;
+	if (syncDeviceDarkMode.value) {
+		const { canceled } = await os.confirm({
+			text: i18n.tsx.switchDarkModeManuallyWhenSyncEnabledConfirm({ x: i18n.ts.syncDeviceDarkMode }),
+		});
+		if (canceled) return;
+
+		syncDeviceDarkMode.value = false;
+		store.set('darkMode', value);
+	} else {
+		store.set('darkMode', value);
+	}
+}
+
 const themesSyncEnabled = ref(prefer.isSyncEnabled('themes'));
 
 function changeThemesSyncEnabled(value: boolean) {
@@ -365,16 +379,6 @@ definePage(() => ({
 			overflow: clip;
 			padding: 0 100px;
 			vertical-align: bottom;
-
-			input {
-				position: absolute;
-				left: -99em;
-			}
-		}
-
-		.dn:focus-visible ~ .toggle {
-			outline: 2px solid var(--MI_THEME-focus);
-			outline-offset: 2px;
 		}
 
 		.toggle {
@@ -403,6 +407,61 @@ definePage(() => ({
 				right: -68px;
 				color: var(--MI_THEME-fg);
 			}
+
+			&.checked {
+				background-color: #749DD6;
+
+				> .before {
+					color: var(--MI_THEME-fg);
+				}
+
+				> .after {
+					color: var(--MI_THEME-accent);
+				}
+
+				.toggle__handler {
+					background-color: #FFE5B5;
+					transform: translate3d(40px, 0, 0) rotate(0);
+
+					.crater { opacity: 1; }
+				}
+
+				.star--1 {
+					width: 2px;
+					height: 2px;
+				}
+
+				.star--2 {
+					width: 4px;
+					height: 4px;
+					transform: translate3d(-5px, 0, 0);
+				}
+
+				.star--3 {
+					width: 2px;
+					height: 2px;
+					transform: translate3d(-7px, 0, 0);
+				}
+
+				.star--4,
+				.star--5,
+				.star--6 {
+					opacity: 1;
+					transform: translate3d(0,0,0);
+				}
+
+				.star--4 {
+					transition: all 300ms 200ms cubic-bezier(0.445, 0.05, 0.55, 0.95) !important;
+				}
+
+				.star--5 {
+					transition: all 300ms 300ms cubic-bezier(0.445, 0.05, 0.55, 0.95) !important;
+				}
+
+				.star--6 {
+					transition: all 300ms 400ms cubic-bezier(0.445, 0.05, 0.55, 0.95) !important;
+				}
+			}
 		}
 
 		.toggle__handler {
@@ -513,63 +572,6 @@ definePage(() => ({
 			height: 2px;
 			transform: translate3d(3px,0,0);
 		}
-
-		input:checked {
-			+ .toggle {
-				background-color: #749DD6;
-
-				> .before {
-					color: var(--MI_THEME-fg);
-				}
-
-				> .after {
-					color: var(--MI_THEME-accent);
-				}
-
-				.toggle__handler {
-					background-color: #FFE5B5;
-					transform: translate3d(40px, 0, 0) rotate(0);
-
-					.crater { opacity: 1; }
-				}
-
-				.star--1 {
-					width: 2px;
-					height: 2px;
-				}
-
-				.star--2 {
-					width: 4px;
-					height: 4px;
-					transform: translate3d(-5px, 0, 0);
-				}
-
-				.star--3 {
-					width: 2px;
-					height: 2px;
-					transform: translate3d(-7px, 0, 0);
-				}
-
-				.star--4,
-				.star--5,
-				.star--6 {
-					opacity: 1;
-					transform: translate3d(0,0,0);
-				}
-
-				.star--4 {
-					transition: all 300ms 200ms cubic-bezier(0.445, 0.05, 0.55, 0.95) !important;
-				}
-
-				.star--5 {
-					transition: all 300ms 300ms cubic-bezier(0.445, 0.05, 0.55, 0.95) !important;
-				}
-
-				.star--6 {
-					transition: all 300ms 400ms cubic-bezier(0.445, 0.05, 0.55, 0.95) !important;
-				}
-			}
-		}
 	}
 
 	> .sync {

From 0f6b28f97062783265b0751b31a6560473e10972 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 29 May 2025 17:35:10 +0900
Subject: [PATCH 04/31] enhance(backend): tweak default maxFileSizeMb value

ref: #15988
---
 packages/backend/src/core/RoleService.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/src/core/RoleService.ts b/packages/backend/src/core/RoleService.ts
index 2669104f7e..76dafeb255 100644
--- a/packages/backend/src/core/RoleService.ts
+++ b/packages/backend/src/core/RoleService.ts
@@ -83,7 +83,7 @@ export const DEFAULT_POLICIES: RolePolicies = {
 	canUseTranslator: true,
 	canHideAds: false,
 	driveCapacityMb: 100,
-	maxFileSizeMb: 10,
+	maxFileSizeMb: 30,
 	alwaysMarkNsfw: false,
 	canUpdateBioMedia: true,
 	pinLimit: 5,

From 85d339ee913503ec4833e3249d834790867fd2b7 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 29 May 2025 17:44:30 +0900
Subject: [PATCH 05/31] =?UTF-8?q?fix(frontend):=20=E3=83=81=E3=83=A3?=
 =?UTF-8?q?=E3=83=83=E3=83=88=E3=81=AB=E5=8B=95=E7=94=BB=E3=83=95=E3=82=A1?=
 =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=82=92=E9=80=81=E4=BB=98=E3=81=99=E3=82=8B?=
 =?UTF-8?q?=E3=81=A8=E3=80=81=E5=8B=95=E7=94=BB=E3=81=AE=E8=A1=A8=E7=A4=BA?=
 =?UTF-8?q?=E3=81=8C=E5=B4=A9=E3=82=8C=E3=81=A6=E3=81=97=E3=81=BE=E3=81=84?=
 =?UTF-8?q?=E8=A6=96=E8=81=B4=E5=87=BA=E6=9D=A5=E3=81=AA=E3=81=84=E5=95=8F?=
 =?UTF-8?q?=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #15854
---
 CHANGELOG.md                                     |  1 +
 packages/frontend/src/components/MkFukidashi.vue | 14 +++++++++++++-
 packages/frontend/src/pages/chat/XMessage.vue    |  8 ++++++--
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a12d8af83f..4544e5acba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -52,6 +52,7 @@
 - Enhance: シンタックスハイライトのエンジンをJavaScriptベースのものに変更
   - フロントエンドの読み込みサイズを軽量化しました
 	- ほとんどの言語のハイライトは問題なく行えますが、互換性の問題により一部の言語が正常にハイライトできなくなる可能性があります。詳しくは https://shiki.style/references/engine-js-compat をご覧ください。
+- Fix: チャットに動画ファイルを送付すると、動画の表示が崩れてしまい視聴出来ない問題を修正
 - Fix: "時計"ウィジェット(Clock)において、Transparent設定が有効でも、その背景が透過されない問題を修正
 - Fix: 一定時間操作がなかったら動画プレイヤーのコントロールを隠すように
 - Fix: Twitchのクリップがプレイヤーで再生できない問題を修正
diff --git a/packages/frontend/src/components/MkFukidashi.vue b/packages/frontend/src/components/MkFukidashi.vue
index fba5dc854c..fc3de2845e 100644
--- a/packages/frontend/src/components/MkFukidashi.vue
+++ b/packages/frontend/src/components/MkFukidashi.vue
@@ -10,7 +10,8 @@ SPDX-License-Identifier: AGPL-3.0-only
 		tail === 'left' ? $style.left : $style.right,
 		negativeMargin === true && $style.negativeMargin,
 		shadow === true && $style.shadow,
-		accented === true && $style.accented
+		accented === true && $style.accented,
+		fullWidth === true && $style.fullWidth,
 	]"
 >
 	<div :class="$style.bg">
@@ -32,11 +33,13 @@ withDefaults(defineProps<{
 	negativeMargin?: boolean;
 	shadow?: boolean;
 	accented?: boolean;
+	fullWidth?: boolean;
 }>(), {
 	tail: 'right',
 	negativeMargin: false,
 	shadow: false,
 	accented: false,
+	fullWidth: false,
 });
 </script>
 
@@ -73,6 +76,14 @@ withDefaults(defineProps<{
 			margin-right: calc(calc(var(--fukidashi-radius) * .13) * -1);
 		}
 	}
+
+	&.fullWidth {
+		width: 100%;
+
+		&.content {
+			width: 100%;
+		}
+	}
 }
 
 .bg {
@@ -85,6 +96,7 @@ withDefaults(defineProps<{
 .content {
 	position: relative;
 	padding: 10px 14px;
+	box-sizing: border-box;
 }
 
 @container (max-width: 450px) {
diff --git a/packages/frontend/src/pages/chat/XMessage.vue b/packages/frontend/src/pages/chat/XMessage.vue
index def6ec7d14..95f6d870dc 100644
--- a/packages/frontend/src/pages/chat/XMessage.vue
+++ b/packages/frontend/src/pages/chat/XMessage.vue
@@ -6,9 +6,9 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <div :class="[$style.root, { [$style.isMe]: isMe }]">
 	<MkAvatar :class="$style.avatar" :user="message.fromUser!" :link="!isMe" :preview="false"/>
-	<div :class="$style.body" @contextmenu.stop="onContextmenu">
+	<div :class="[$style.body, message.file != null ? $style.fullWidth : null]" @contextmenu.stop="onContextmenu">
 		<div :class="$style.header"><MkUserName v-if="!isMe && prefer.s['chat.showSenderName'] && message.fromUser != null" :user="message.fromUser"/></div>
-		<MkFukidashi :class="$style.fukidashi" :tail="isMe ? 'right' : 'left'" :accented="isMe">
+		<MkFukidashi :class="$style.fukidashi" :tail="isMe ? 'right' : 'left'" :fullWidth="message.file != null" :accented="isMe">
 			<Mfm
 				v-if="message.text"
 				ref="text"
@@ -259,6 +259,10 @@ function showMenu(ev: MouseEvent, contextmenu = false) {
 
 .body {
 	margin: 0 12px;
+
+	&.fullWidth {
+		width: 100%;
+	}
 }
 
 .header {

From 4c77f3e597a05bdb9bfaca45b98f21e771e1a6e3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 29 May 2025 08:49:19 +0000
Subject: [PATCH 06/31] Bump version to 2025.5.1-beta.5

---
 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 efc50f0e7d..ae61dc13a8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.5.1-beta.4",
+	"version": "2025.5.1-beta.5",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index b017236ef5..d274f43ab4 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.5.1-beta.4",
+	"version": "2025.5.1-beta.5",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 9f196bbf75ff6a5fd1e69f0abccc10ee4ab68631 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Fri, 30 May 2025 16:28:49 +0900
Subject: [PATCH 07/31] New Crowdin updates (#16116)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Chinese Simplified)
---
 locales/ca-ES.yml |  1 +
 locales/en-US.yml |  1 +
 locales/es-ES.yml | 68 +++++++++++++++++++++++++++++++++++++++++++++++
 locales/zh-CN.yml | 11 ++++++++
 4 files changed, 81 insertions(+)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 06bd9d3977..64af3b1a03 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -327,6 +327,7 @@ dark: "Fosc"
 lightThemes: "Temes clars"
 darkThemes: "Temes foscos"
 syncDeviceDarkMode: "Sincronitza el mode fosc amb la configuració del dispositiu"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "\"{x}\" es troba activat. Vols desactivar la sincronització i canviar de mode manualment?"
 drive: "Disc"
 fileName: "Nom del Fitxer"
 selectFile: "Selecciona un fitxer"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index bb7c8f994c..1718d6711a 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -327,6 +327,7 @@ dark: "Dark"
 lightThemes: "Light themes"
 darkThemes: "Dark themes"
 syncDeviceDarkMode: "Sync Dark Mode with your device settings"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "\"{x}\" is turned on, Would you like to turn off synchronization and switch modes manually?"
 drive: "Drive"
 fileName: "Filename"
 selectFile: "Select a file"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 5576400064..487785b706 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -298,6 +298,7 @@ uploadFromUrl: "Subir desde una URL"
 uploadFromUrlDescription: "URL del fichero que quieres subir"
 uploadFromUrlRequested: "Subida solicitada"
 uploadFromUrlMayTakeTime: "Subir el fichero puede tardar un tiempo."
+uploadNFiles: "Subir {n} archivos"
 explore: "Explorar"
 messageRead: "Ya leído"
 noMoreHistory: "El historial se ha acabado"
@@ -326,6 +327,7 @@ dark: "Oscuro"
 lightThemes: "Tema claro"
 darkThemes: "Tema oscuro"
 syncDeviceDarkMode: "Sincronice el Modo Oscuro con la configuración de su dispositivo"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "{x} está activado ¿Te gustaría desactivar la sincronización y cambiar al modo manual?"
 drive: "Drive"
 fileName: "Nombre de archivo"
 selectFile: "Elegir archivo"
@@ -578,6 +580,7 @@ newNoteRecived: "Tienes una nota nueva"
 newNote: "Nueva nota"
 sounds: "Sonidos"
 sound: "Sonidos"
+notificationSoundSettings: "Configuración del sonido de las notificaciones"
 listen: "Escuchar"
 none: "Ninguna"
 showInPage: "Mostrar en la página"
@@ -999,6 +1002,7 @@ failedToUpload: "La subida falló"
 cannotUploadBecauseInappropriate: "Este archivo no se puede subir debido a que algunas partes han sido detectadas comoNSFW."
 cannotUploadBecauseNoFreeSpace: "La subida falló debido a falta de espacio libre en la unidad del usuario."
 cannotUploadBecauseExceedsFileSizeLimit: "Este archivo supera el peso máximo y no puede ser subido."
+cannotUploadBecauseUnallowedFileType: "Incapaz de subir el archivo debido a que es un tipo de archivo no autorizado."
 beta: "Beta"
 enableAutoSensitive: "Marcar automáticamente contenido NSFW"
 enableAutoSensitiveDescription: "Permite la detección y marcado automático de contenido NSFW usando 'Machine Learning' cuando sea posible. Incluso si esta opción está desactivada, puede ser activado para toda la instancia."
@@ -1356,6 +1360,10 @@ emojiMute: "Silenciar emojis"
 emojiUnmute: "No Silenciar emojis"
 muteX: "Silenciar {x}"
 unmuteX: "Dejar de silenciar {x}"
+abort: "Abortar"
+tip: "Consejos y trucos"
+redisplayAllTips: "Volver a mostrar todos \"Trucos y consejos\""
+hideAllTips: "Ocultar todos los \"Trucos y consejos\""
 _chat:
   noMessagesYet: "Aún no hay mensajes"
   newMessage: "Mensajes nuevos"
@@ -1421,15 +1429,28 @@ _settings:
   accountDataBanner: "Exportación e importación para gestionar los datos de la cuenta."
   muteAndBlockBanner: "Puedes configurar y gestionar ajustes para ocultar contenidos y restringir acciones a usuarios específicos."
   accessibilityBanner: "Puedes personalizar los visuales y el comportamiento del cliente, y configurar los ajustes para optimizar el uso."
+  privacyBanner: "Puedes configurar opciones relacionadas con la privacidad de la cuenta, como la visibilidad del contenido, la posibilidad de descubrir la cuenta y la aprobación de seguimiento."
+  securityBanner: "Puedes configurar opciones relacionadas con la seguridad de la cuenta, como la contraseña, los métodos de inicio de sesión, las aplicaciones de autenticación y Passkeys."
+  preferencesBanner: "Puedes configurar el comportamiento general del cliente según tus preferencias."
+  appearanceBanner: "Puedes configurar el aspecto y la visualización del cliente según tus preferencias."
+  soundsBanner: "Puedes configurar los ajustes de sonido para la reproducción en el cliente."
   timelineAndNote: "Líneas del tiempo y notas"
+  makeEveryTextElementsSelectable: "Hacer que todos los elementos de texto sean seleccionables"
   makeEveryTextElementsSelectable_description: "Activar esta opción puede reducir la usabilidad en algunas situaciones."
   useStickyIcons: "Hacer que los iconos te sigan cuando desplaces"
+  enableHighQualityImagePlaceholders: "Mostrar marcadores de posición para imágenes de alta calidad"
+  uiAnimations: "Animaciones de la interfaz de usuario"
   showNavbarSubButtons: "Mostrar los sub-botones en la barra de navegación."
   ifOn: "Si está activado"
   ifOff: "Si está desactivado"
   enableSyncThemesBetweenDevices: "Sincronizar los temas instalados entre dispositivos."
   enablePullToRefresh: "Tirar para actualizar"
   enablePullToRefresh_description: "Si utiliza un ratón, arrastre mientras pulsa la rueda de desplazamiento."
+  realtimeMode_description: "Establece una conexión con el servidor y actualiza el contenido en tiempo real. Esto puede aumentar el tráfico y el consumo de memoria."
+  contentsUpdateFrequency: "Frecuencia de adquisición del contenido."
+  contentsUpdateFrequency_description: "Cuanto mayor sea el valor, más se actualiza el contenido, pero disminuye el rendimiento y aumenta el tráfico y el consumo de memoria."
+  contentsUpdateFrequency_description2: "Cuando el modo en tiempo real está activado, el contenido se actualiza en tiempo real independientemente de esta configuración."
+  showUrlPreview: "Mostrar la vista previa de la URL"
   _chat:
     showSenderName: "Mostrar el nombre del remitente"
     sendOnEnter: "Intro para enviar"
@@ -1437,20 +1458,46 @@ _preferencesProfile:
   profileName: "Nombre de perfil"
   profileNameDescription: "Establece un nombre que identifique al dispositivo"
   profileNameDescription2: "Por ejemplo: \"PC Principal\",\"Teléfono\""
+  manageProfiles: "Administrar perfiles"
 _preferencesBackup:
   autoBackup: "Respaldo automático"
   restoreFromBackup: "Restaurar desde copia de seguridad"
   noBackupsFoundTitle: "No se encontró una copia de seguridad"
+  noBackupsFoundDescription: "No se han encontrado copias de seguridad creadas automáticamente, pero si has guardado manualmente un archivo de copia de seguridad, puedes importarlo y restaurarlo."
+  selectBackupToRestore: "Selecciona una copia de seguridad para restaurar"
+  youNeedToNameYourProfileToEnableAutoBackup: "Se debe establecer un nombre de perfil para activar la copia de seguridad automática."
+  autoPreferencesBackupIsNotEnabledForThisDevice: "La copia de seguridad automática de los ajustes no está activada en este dispositivo."
+  backupFound: "Copia de seguridad de los ajustes encontrada "
 _accountSettings:
   requireSigninToViewContents: "Se requiere iniciar sesión para ver el contenido"
   requireSigninToViewContentsDescription1: "Requiere iniciar sesión para ver todas las notas y otros contenidos que hayas creado. Se espera que esto evite que los rastreadores recopilen información."
+  requireSigninToViewContentsDescription2: "El contenido no se mostrará en vistas previas de URL (OGP), incrustado en páginas web o en servidores que no admitan citas de notas."
+  requireSigninToViewContentsDescription3: "Estas restricciones pueden no aplicarse a los contenidos federados de otros servidores remotos."
+  makeNotesFollowersOnlyBefore: "Hacer que las notas antiguas sólo se muestren a los seguidores"
+  makeNotesFollowersOnlyBeforeDescription: "Mientras esta función esté activada, sólo los seguidores podrán ver las notas que hayan superado la fecha y hora establecidas o que hayan estado visibles durante un tiempo determinado. Cuando se desactive, también se restablecerá el estado de publicación de la nota."
+  makeNotesHiddenBefore: "Hacer privadas las notas antiguas "
+  makeNotesHiddenBeforeDescription: "Mientras esta función esté activada, las notas que hayan pasado la fecha y hora fijadas o hayan transcurrido el tiempo establecido sólo serán visibles para ti (se harán privadas). Si la desactivas, también se restablecerá el estado público de las notas."
+  mayNotEffectForFederatedNotes: "Notas federadas por un servidor remoto pueden no verse afectadas."
+  mayNotEffectSomeSituations: "Estas restricciones son simplificadas. Pueden no aplicarse en algunas situaciones, como cuando se visualiza en un servidor remoto o durante la moderación."
+  notesHavePassedSpecifiedPeriod: "Ten en cuenta que el tiempo especificado ha pasado"
+  notesOlderThanSpecifiedDateAndTime: "Notas antes de la fecha y hora especificadas"
 _abuseUserReport:
+  forward: "Reenviar"
+  forwardDescription: "Reenvía el informe a un servidor/instancia remoto como cuenta anónima del sistema."
+  resolve: "Resuelto"
   accept: "Acepte"
   reject: "repudio"
+  resolveTutorial: "Si el contenido del informe es legítimo, selecciona \"Aceptar\" para marcarlo como resuelto.\nSi el contenido del informe es ilegítimo, selecciona \"Rechazar\" para ignorarlo."
 _delivery:
+  status: "Estado de la entrega"
   stop: "Suspendido"
+  resume: "Resumen de entrega"
   _type:
     none: "Publicando"
+    manuallySuspended: "Suspendido manualmente"
+    goneSuspended: "El servidor se ha suspendido debido a la eliminación del servidor"
+    autoSuspendedForNotResponding: "El servidor se suspende debido a que el servidor no responde."
+    softwareSuspended: "Suspendido porque este software ya no se distribuye a"
 _bubbleGame:
   howToPlay: "Cómo jugar"
   hold: "Mantener"
@@ -1576,6 +1623,9 @@ _serverSettings:
   fanoutTimelineDescription: "Incrementa el rendimiento de forma significativa cuando se obtienen las líneas de tiempo y reduce la carga en la base de datos. A cambio, el uso de la memoria en Redis incrementará. Considera desactivar esta opción en caso de que tu servidor tenga poca memoria o detectes inestabilidad."
   fanoutTimelineDbFallback: "Cargar desde la base de datos"
   fanoutTimelineDbFallbackDescription: "Cuando esta opción está habilitada, la carga de peticiones adicionales de la línea de tiempo se hará desde la base de datos cuando éstas no se encuentren en la caché. Al deshabilitar esta opción se reduce la carga del servidor, pero limita el número de líneas de tiempo que pueden obtenerse."
+  reactionsBufferingDescription: "Cuando se activa, el rendimiento durante la creación de reacciones mejorará considerablemente, reduciendo la carga de la base de datos. Sin embargo, aumentará el uso de memoria de Redis."
+  inquiryUrl: "URL de consulta "
+  inquiryUrlDescription: "Especifica una URL para el formulario de consulta al responsable del servidor o una página web para la información de contacto."
 _accountMigration:
   moveFrom: "Trasladar de otra cuenta a ésta"
   moveFromSub: "Crear un alias para otra cuenta."
@@ -2526,6 +2576,7 @@ _notification:
   reactedBySomeUsers: "{n} usuarios han reaccionado"
   renotedBySomeUsers: "{n} usuarios han renotado"
   followedBySomeUsers: "Seguido por {n} usuarios"
+  createTokenDescription: "Si no tienes ni idea, elimina el token de acceso a través de \"{text}\"."
   _types:
     all: "Todo"
     note: "Nuevas notas"
@@ -2539,8 +2590,11 @@ _notification:
     receiveFollowRequest: "Recibió una solicitud de seguimiento"
     followRequestAccepted: "El seguimiento fue aceptado"
     roleAssigned: "Rol asignado"
+    chatRoomInvitationReceived: "Invitado a la sala de chat."
     achievementEarned: "Logro desbloqueado"
+    exportCompleted: "La exportación se ha completado"
     login: "Iniciar sesión"
+    createToken: "Crear tokens de acceso"
     test: "Pruebas de nofiticaciones"
     app: "Notificaciones desde aplicaciones"
   _actions:
@@ -2550,7 +2604,11 @@ _notification:
 _deck:
   alwaysShowMainColumn: "Siempre mostrar la columna principal"
   columnAlign: "Alinear columnas"
+  columnGap: "Margen entre columnas"
+  deckMenuPosition: "Posición del menú Deck"
+  navbarPosition: "Posición de la barra de navegación"
   addColumn: "Agregar columna"
+  newNoteNotificationSettings: "Configuración de las notificaciones para notas nuevas"
   configureColumn: "Ajustes de columna"
   swapLeft: "Mover a la izquierda"
   swapRight: "Mover a la derecha"
@@ -2567,6 +2625,7 @@ _deck:
   useSimpleUiForNonRootPages: "Mostrar páginas no pertenecientes a la raíz con la interfaz simple"
   usedAsMinWidthWhenFlexible: "Se usará el ancho mínimo cuando la opción \"Autoajustar ancho\" esté habilitada"
   flexible: "Autoajustar ancho"
+  enableSyncBetweenDevicesForProfiles: "Activar la sincronización de la información de perfiles entre dispositivos."
   _columns:
     main: "Principal"
     widgets: "Widgets"
@@ -2590,8 +2649,10 @@ _drivecleaner:
   orderByCreatedAtAsc: "Fecha ascendente"
 _webhookSettings:
   createWebhook: "Crear Webhook"
+  modifyWebhook: "Editar webhook"
   name: "Nombre"
   secret: "Secreto"
+  trigger: "Disparador"
   active: "Activado"
   _events:
     follow: "Cuando se sigue a alguien"
@@ -2602,9 +2663,16 @@ _webhookSettings:
     reaction: "Cuando se recibe una reacción"
     mention: "Cuando hay una mención"
   _systemEvents:
+    abuseReport: "Cuando se recibe un nuevo informe de moderación"
+    abuseReportResolved: "Cuando se resuelve un informe de moderación"
     userCreated: "Cuando se crea el usuario."
+    inactiveModeratorsWarning: "Cuando un moderador ha estado inactivo por un tiempo"
+    inactiveModeratorsInvitationOnlyChanged: "Cuando un moderador ha estado inactivo durante un tiempo, y el servidor se cambia a sólo por invitación"
+  deleteConfirm: "¿Estás seguro de querer eliminar el Webhook?"
+  testRemarks: "Haz clic en el botón de la derecha del switch para mandar una prueba Webhook con datos ficticios"
 _abuseReport:
   _notificationRecipient:
+    createRecipient: "Añadir destinatario a los informes"
     _recipientType:
       mail: "Correo"
       webhook: "Webhook"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 512148ab31..e915168bc7 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -327,6 +327,7 @@ dark: "深色"
 lightThemes: "浅色主题"
 darkThemes: "深色主题"
 syncDeviceDarkMode: "将深色模式与设备设置同步"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "「{x}」已开启。要关闭同步并手动切换模式吗？"
 drive: "网盘"
 fileName: "文件名称"
 selectFile: "选择文件"
@@ -1360,6 +1361,9 @@ emojiUnmute: "解除隐藏表情符号"
 muteX: "隐藏{x}"
 unmuteX: "解除隐藏{x}"
 abort: "中止"
+tip: "提示和技巧"
+redisplayAllTips: "重新显示所有的提示和技巧"
+hideAllTips: "隐藏所有的提示和技巧"
 _chat:
   noMessagesYet: "还没有消息"
   newMessage: "新消息"
@@ -2900,6 +2904,8 @@ _offlineScreen:
 _urlPreviewSetting:
   title: "设置 URL 预览"
   enable: "启用 URL 预览"
+  allowRedirect: "允许预览目标的重定向"
+  allowRedirectDescription: "如果输入的 URL 被重定向，可设置是否跟随重定向目标并显示预览。禁用此选项将节省服务器资源，但重定向目标的内容将不会显示。"
   timeout: "超时阈值（ms）"
   timeoutDescription: "如果获取预览所用时间超过这个值，则不生成预览。"
   maximumContentLength: "Content-Length 的最大值（byte）"
@@ -3097,6 +3103,7 @@ _uploader:
   doneConfirm: "还有未上传的文件，要完成吗？"
   maxFileSizeIsX: "可上传最大 {x} 的文件。"
   allowedTypes: "可上传的文件类型"
+  tip: "文件还没有被上传。可在此对话框中进行上传前确认、重命名、压缩、裁剪等操作。准备完成后，点击「上传」即可开始上传。"
 _clientPerformanceIssueTip:
   title: "如果觉得电池耗电过高"
   makeSureDisabledAdBlocker: "请关闭广告拦截器"
@@ -3105,3 +3112,7 @@ _clientPerformanceIssueTip:
   makeSureDisabledCustomCss_description: "覆盖样式可能会影响性能。请确保没有启用任何自定义 CSS 或覆盖样式的扩展。"
   makeSureDisabledAddons: "请关闭扩展"
   makeSureDisabledAddons_description: "某些扩展可能会干扰客户端的运行并影响性能。尝试禁用浏览器扩展并查看是否有改善。"
+_clip:
+  tip: "便签功能可以将帖子合并在一起。"
+_userLists:
+  tip: "可创建包含任意用户的列表。已创建的列表可作为时间线查看。"

From 0254570fbf94ae99f492a781e07863dc694a12cf Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 31 May 2025 12:49:10 +0900
Subject: [PATCH 08/31] =?UTF-8?q?enhance(frontend):=20=E8=A8=AD=E5=AE=9A?=
 =?UTF-8?q?=E3=81=AE=E5=90=8C=E6=9C=9F=E3=82=92=E3=82=AA=E3=83=B3=E3=81=AB?=
 =?UTF-8?q?=E3=81=99=E3=82=8B=E3=81=A8=E3=81=8D=E3=81=AB=E7=AB=B6=E5=90=88?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E3=81=A8=E3=81=8D=E3=81=AB=E5=80=A4=E3=82=92?=
 =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=B8=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 locales/index.d.ts                            | 10 ++--
 locales/ja-JP.yml                             |  7 +--
 .../frontend/src/pages/settings/navbar.vue    |  3 +-
 .../frontend/src/pages/settings/sounds.vue    |  3 +-
 packages/frontend/src/preferences/def.ts      | 33 +++++++++---
 packages/frontend/src/preferences/manager.ts  | 52 ++++++++++++++-----
 packages/frontend/src/utility/sound.ts        |  4 +-
 8 files changed, 85 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4544e5acba..5c11e6e07e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -39,6 +39,7 @@
 - Feat: 絵文字をミュート可能にする機能
   - 絵文字（ユニコードの絵文字・カスタム絵文字）毎にミュートし、不可視化することができるようになりました
 - Feat: モバイルデバイスで折りたたまれたUIの展開表示に全画面ページを使用できるように(実験的)
+- Enhance: 設定の同期をオンにするときに競合したときに値をマージできるように
 - Enhance: メモリ使用量を軽減しました
 - Enhance: 画像の高品質なプレースホルダを無効化してパフォーマンスを向上させるオプションを追加
 - Enhance: 招待されているが参加していないルームを開いたときに、招待を承認するかどうか尋ねるように
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 21da0c171a..73bcb2f1c8 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5335,15 +5335,19 @@ export interface Locale extends ILocale {
      */
     "preferenceSyncConflictTitle": string;
     /**
-     * 同期が有効にされた設定項目は設定値をサーバーに保存しますが、この設定項目のサーバーに保存された設定値が見つかりました。どちらの設定値で上書きしますか？
+     * 同期が有効にされた設定項目は設定値をサーバーに保存しますが、この設定項目のサーバーに保存された設定値が見つかりました。どうしますか？
      */
     "preferenceSyncConflictText": string;
     /**
-     * サーバーの設定値
+     * 統合する
+     */
+    "preferenceSyncConflictChoiceMerge": string;
+    /**
+     * サーバーの設定値で上書き
      */
     "preferenceSyncConflictChoiceServer": string;
     /**
-     * デバイスの設定値
+     * デバイスの設定値で上書き
      */
     "preferenceSyncConflictChoiceDevice": string;
     /**
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index b81529790f..c7971507aa 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1329,9 +1329,10 @@ skip: "スキップ"
 restore: "復元"
 syncBetweenDevices: "デバイス間で同期"
 preferenceSyncConflictTitle: "サーバーに設定値が存在します"
-preferenceSyncConflictText: "同期が有効にされた設定項目は設定値をサーバーに保存しますが、この設定項目のサーバーに保存された設定値が見つかりました。どちらの設定値で上書きしますか？"
-preferenceSyncConflictChoiceServer: "サーバーの設定値"
-preferenceSyncConflictChoiceDevice: "デバイスの設定値"
+preferenceSyncConflictText: "同期が有効にされた設定項目は設定値をサーバーに保存しますが、この設定項目のサーバーに保存された設定値が見つかりました。どうしますか？"
+preferenceSyncConflictChoiceMerge: "統合する"
+preferenceSyncConflictChoiceServer: "サーバーの設定値で上書き"
+preferenceSyncConflictChoiceDevice: "デバイスの設定値で上書き"
 preferenceSyncConflictChoiceCancel: "同期の有効化をキャンセル"
 paste: "ペースト"
 emojiPalette: "絵文字パレット"
diff --git a/packages/frontend/src/pages/settings/navbar.vue b/packages/frontend/src/pages/settings/navbar.vue
index b322b03a21..ef698fcd6e 100644
--- a/packages/frontend/src/pages/settings/navbar.vue
+++ b/packages/frontend/src/pages/settings/navbar.vue
@@ -69,6 +69,7 @@ import { i18n } from '@/i18n.js';
 import { definePage } from '@/page.js';
 import { prefer } from '@/preferences.js';
 import { PREF_DEF } from '@/preferences/def.js';
+import { getInitialPrefValue } from '@/preferences/manager.js';
 
 const Sortable = defineAsyncComponent(() => import('vuedraggable').then(x => x.default));
 
@@ -106,7 +107,7 @@ async function save() {
 }
 
 function reset() {
-	items.value = PREF_DEF.menu.default.map(x => ({
+	items.value = getInitialPrefValue('menu').map(x => ({
 		id: Math.random().toString(),
 		type: x,
 	}));
diff --git a/packages/frontend/src/pages/settings/sounds.vue b/packages/frontend/src/pages/settings/sounds.vue
index 4461ee1ab1..590db19bca 100644
--- a/packages/frontend/src/pages/settings/sounds.vue
+++ b/packages/frontend/src/pages/settings/sounds.vue
@@ -75,6 +75,7 @@ import MkSwitch from '@/components/MkSwitch.vue';
 import MkPreferenceContainer from '@/components/MkPreferenceContainer.vue';
 import { PREF_DEF } from '@/preferences/def.js';
 import MkFeatureBanner from '@/components/MkFeatureBanner.vue';
+import { getInitialPrefValue } from '@/preferences/manager.js';
 
 const notUseSound = prefer.model('sound.notUseSound');
 const useSoundOnlyWhenActive = prefer.model('sound.useSoundOnlyWhenActive');
@@ -113,7 +114,7 @@ async function updated(type: keyof typeof sounds.value, sound) {
 
 function reset() {
 	for (const sound of Object.keys(sounds.value) as Array<keyof typeof sounds.value>) {
-		const v = PREF_DEF[`sound.on.${sound}`].default;
+		const v = getInitialPrefValue(`sound.on.${sound}`);
 		prefer.commit(`sound.on.${sound}`, v);
 		sounds.value[sound] = v;
 	}
diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts
index 8a2cfa23b1..b8a5a84279 100644
--- a/packages/frontend/src/preferences/def.ts
+++ b/packages/frontend/src/preferences/def.ts
@@ -5,6 +5,7 @@
 
 import * as Misskey from 'misskey-js';
 import { hemisphere } from '@@/js/intl-const.js';
+import { v4 as uuid } from 'uuid';
 import type { Theme } from '@/theme.js';
 import type { SoundType } from '@/utility/sound.js';
 import type { Plugin } from '@/plugin.js';
@@ -49,15 +50,15 @@ export const PREF_DEF = {
 	},
 	widgets: {
 		accountDependent: true,
-		default: [{
+		default: () => [{
 			name: 'calendar',
-			id: 'a', place: 'right', data: {},
+			id: uuid(), place: 'right', data: {},
 		}, {
 			name: 'notifications',
-			id: 'b', place: 'right', data: {},
+			id: uuid(), place: 'right', data: {},
 		}, {
 			name: 'trends',
-			id: 'c', place: 'right', data: {},
+			id: uuid(), place: 'right', data: {},
 		}] as {
 			name: string;
 			id: string;
@@ -76,8 +77,8 @@ export const PREF_DEF = {
 
 	emojiPalettes: {
 		serverDependent: true,
-		default: [{
-			id: 'a',
+		default: () => [{
+			id: uuid(),
 			name: '',
 			emojis: ['👍', '❤️', '😆', '🤔', '😮', '🎉', '💢', '😥', '😇', '🍮'],
 		}] as {
@@ -85,6 +86,11 @@ export const PREF_DEF = {
 			name: string;
 			emojis: string[];
 		}[],
+		mergeStrategy: (a, b) => {
+			const sameIdExists = a.some(x => b.some(y => x.id === y.id));
+			if (sameIdExists) throw new Error();
+			return a.concat(b);
+		},
 	},
 	emojiPaletteForReaction: {
 		serverDependent: true,
@@ -100,6 +106,11 @@ export const PREF_DEF = {
 	},
 	themes: {
 		default: [] as Theme[],
+		mergeStrategy: (a, b) => {
+			const sameIdExists = a.some(x => b.some(y => x.id === y.id));
+			if (sameIdExists) throw new Error();
+			return a.concat(b);
+		},
 	},
 	lightTheme: {
 		default: null as Theme | null,
@@ -345,9 +356,19 @@ export const PREF_DEF = {
 	},
 	plugins: {
 		default: [] as Plugin[],
+		mergeStrategy: (a, b) => {
+			const sameIdExists = a.some(x => b.some(y => x.installId === y.installId));
+			if (sameIdExists) throw new Error();
+			const sameNameExists = a.some(x => b.some(y => x.name === y.name));
+			if (sameNameExists) throw new Error();
+			return a.concat(b);
+		},
 	},
 	mutingEmojis: {
 		default: [] as string[],
+		mergeStrategy: (a, b) => {
+			return [...new Set(a.concat(b))];
+		},
 	},
 
 	'sound.masterVolume': {
diff --git a/packages/frontend/src/preferences/manager.ts b/packages/frontend/src/preferences/manager.ts
index cac659f1fe..016e1ad85b 100644
--- a/packages/frontend/src/preferences/manager.ts
+++ b/packages/frontend/src/preferences/manager.ts
@@ -22,7 +22,10 @@ import { deepEqual } from '@/utility/deep-equal.js';
 //};
 
 type PREF = typeof PREF_DEF;
-type ValueOf<K extends keyof PREF> = PREF[K]['default'];
+type DefaultValues = {
+	[K in keyof PREF]: PREF[K]['default'] extends (...args: any) => infer R ? R : PREF[K]['default'];
+};
+type ValueOf<K extends keyof PREF> = DefaultValues[K];
 
 type Scope = Partial<{
 	server: string | null; // host
@@ -84,11 +87,22 @@ export type StorageProvider = {
 	cloudSet: <K extends keyof PREF>(ctx: { key: K; scope: Scope; value: ValueOf<K>; }) => Promise<void>;
 };
 
-export type PreferencesDefinition = Record<string, {
-	default: any;
+type PreferencesDefinitionRecord<Default, T = Default extends (...args: any) => infer R ? R : Default> = {
+	default: Default;
 	accountDependent?: boolean;
 	serverDependent?: boolean;
-}>;
+	mergeStrategy?: (a: T, b: T) => T;
+};
+
+export type PreferencesDefinition = Record<string, PreferencesDefinitionRecord<any>>;
+
+export function getInitialPrefValue<K extends keyof PREF>(k: K): ValueOf<K> {
+	if (typeof PREF_DEF[k].default === 'function') { // factory
+		return PREF_DEF[k].default();
+	} else {
+		return PREF_DEF[k].default;
+	}
+}
 
 export class PreferencesManager {
 	private storageProvider: StorageProvider;
@@ -262,7 +276,7 @@ export class PreferencesManager {
 	public static newProfile(): PreferencesProfile {
 		const data = {} as PreferencesProfile['preferences'];
 		for (const key in PREF_DEF) {
-			data[key] = [[makeScope({}), PREF_DEF[key].default, {}]];
+			data[key] = [[makeScope({}), getInitialPrefValue(key as keyof typeof PREF_DEF), {}]];
 		}
 		return {
 			id: uuid(),
@@ -279,7 +293,7 @@ export class PreferencesManager {
 		for (const key in PREF_DEF) {
 			const records = profileLike.preferences[key];
 			if (records == null || records.length === 0) {
-				data[key] = [[makeScope({}), PREF_DEF[key].default, {}]];
+				data[key] = [[makeScope({}), getInitialPrefValue(key as keyof typeof PREF_DEF), {}]];
 				continue;
 			} else {
 				data[key] = records;
@@ -367,10 +381,20 @@ export class PreferencesManager {
 
 		const existing = await this.storageProvider.cloudGet({ key, scope: record[0] });
 		if (existing != null && !deepEqual(existing.value, record[1])) {
-			const { canceled, result } = await os.select({
+			const merge = (PREF_DEF as PreferencesDefinition)[key].mergeStrategy;
+			let mergedValue: ValueOf<K> | undefined = undefined; // null と区別したいため
+			try {
+				if (merge != null) mergedValue = merge(record[1], existing.value);
+			} catch (err) {
+				// nop
+			}
+			const { canceled, result: choice } = await os.select({
 				title: i18n.ts.preferenceSyncConflictTitle,
 				text: i18n.ts.preferenceSyncConflictText,
-				items: [{
+				items: [...(mergedValue !== undefined ? [{
+					text: i18n.ts.preferenceSyncConflictChoiceMerge,
+					value: 'merge',
+				}] : []), {
 					text: i18n.ts.preferenceSyncConflictChoiceServer,
 					value: 'remote',
 				}, {
@@ -380,14 +404,16 @@ export class PreferencesManager {
 					text: i18n.ts.preferenceSyncConflictChoiceCancel,
 					value: null,
 				}],
-				default: 'remote',
+				default: mergedValue !== undefined ? 'merge' : 'remote',
 			});
-			if (canceled || result == null) return { enabled: false };
+			if (canceled || choice == null) return { enabled: false };
 
-			if (result === 'remote') {
+			if (choice === 'remote') {
 				this.commit(key, existing.value);
-			} else if (result === 'local') {
+			} else if (choice === 'local') {
 				// nop
+			} else if (choice === 'merge') {
+				this.commit(key, mergedValue!);
 			}
 		}
 
@@ -457,7 +483,7 @@ export class PreferencesManager {
 			text: i18n.ts.resetToDefaultValue,
 			danger: true,
 			action: () => {
-				this.commit(key, PREF_DEF[key].default);
+				this.commit(key, getInitialPrefValue(key));
 			},
 		}, {
 			type: 'divider',
diff --git a/packages/frontend/src/utility/sound.ts b/packages/frontend/src/utility/sound.ts
index 217da9c8b2..8e79841647 100644
--- a/packages/frontend/src/utility/sound.ts
+++ b/packages/frontend/src/utility/sound.ts
@@ -6,6 +6,7 @@
 import type { SoundStore } from '@/preferences/def.js';
 import { prefer } from '@/preferences.js';
 import { PREF_DEF } from '@/preferences/def.js';
+import { getInitialPrefValue } from '@/preferences/manager.js';
 
 let ctx: AudioContext;
 const cache = new Map<string, AudioBuffer>();
@@ -133,7 +134,8 @@ export function playMisskeySfx(operationType: OperationType) {
 	playMisskeySfxFile(sound).then((succeed) => {
 		if (!succeed && sound.type === '_driveFile_') {
 			// ドライブファイルが存在しない場合はデフォルトのサウンドを再生する
-			const soundName = PREF_DEF[`sound.on.${operationType}`].default.type as Exclude<SoundType, '_driveFile_'>;
+			const default_ = getInitialPrefValue(`sound.on.${operationType}`);
+			const soundName = default_.type as Exclude<SoundType, '_driveFile_'>;
 			if (_DEV_) console.log(`Failed to play sound: ${sound.fileUrl}, so play default sound: ${soundName}`);
 			playMisskeySfxFileInternal({
 				type: soundName,

From 743995e4695af1ade073172f87fc91f1c9b37ba8 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 31 May 2025 14:15:40 +0900
Subject: [PATCH 09/31] enhance(frontend): make pref sync more smart

---
 packages/frontend/src/os.ts                  | 24 +++++++---
 packages/frontend/src/pref-migrate.ts        |  2 +-
 packages/frontend/src/preferences/def.ts     | 35 +++++++++++---
 packages/frontend/src/preferences/manager.ts | 50 +++++++++++++++-----
 4 files changed, 86 insertions(+), 25 deletions(-)

diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index a513ae4902..08291a5595 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -547,14 +547,28 @@ export function success(): Promise<void> {
 	});
 }
 
-export function waiting(text?: string | null): () => void {
+export function waiting(options: { text?: string } = {}) {
 	window.document.body.setAttribute('inert', 'true');
 
 	const showing = ref(true);
+	const isSuccess = ref(false);
+
+	function done(doneOptions: { success?: boolean } = {}) {
+		if (doneOptions.success) {
+			isSuccess.value = true;
+			window.setTimeout(() => {
+				showing.value = false;
+			}, 1000);
+		} else {
+			showing.value = false;
+		}
+	}
+
+	// NOTE: dynamic importすると挙動がおかしくなる(showingの変更が伝播しない)
 	const { dispose } = popup(MkWaitingDialog, {
-		success: false,
+		success: isSuccess,
 		showing: showing,
-		text,
+		text: options.text,
 	}, {
 		closed: () => {
 			window.document.body.removeAttribute('inert');
@@ -562,9 +576,7 @@ export function waiting(text?: string | null): () => void {
 		},
 	});
 
-	return () => {
-		showing.value = false;
-	};
+	return done;
 }
 
 export function form<F extends Form>(title: string, f: F): Promise<{ canceled: true, result?: undefined } | { canceled?: false, result: GetFormResultType<F> }> {
diff --git a/packages/frontend/src/pref-migrate.ts b/packages/frontend/src/pref-migrate.ts
index 13ca07cdcc..648349c6fe 100644
--- a/packages/frontend/src/pref-migrate.ts
+++ b/packages/frontend/src/pref-migrate.ts
@@ -15,7 +15,7 @@ import { i18n } from '@/i18n.js';
 
 // TODO: そのうち消す
 export function migrateOldSettings() {
-	os.waiting(i18n.ts.settingsMigrating);
+	os.waiting({ text: i18n.ts.settingsMigrating });
 
 	store.loaded.then(async () => {
 		misskeyApi('i/registry/get', { scope: ['client'], key: 'themes' }).catch(() => []).then((themes: any) => {
diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts
index b8a5a84279..86d5c8af98 100644
--- a/packages/frontend/src/preferences/def.ts
+++ b/packages/frontend/src/preferences/def.ts
@@ -13,6 +13,7 @@ import type { DeviceKind } from '@/utility/device-kind.js';
 import type { DeckProfile } from '@/deck.js';
 import type { PreferencesDefinition } from './manager.js';
 import { DEFAULT_DEVICE_KIND } from '@/utility/device-kind.js';
+import { deepEqual } from '@/utility/deep-equal.js';
 
 /** サウンド設定 */
 export type SoundStore = {
@@ -87,9 +88,20 @@ export const PREF_DEF = {
 			emojis: string[];
 		}[],
 		mergeStrategy: (a, b) => {
-			const sameIdExists = a.some(x => b.some(y => x.id === y.id));
-			if (sameIdExists) throw new Error();
-			return a.concat(b);
+			const mergedItems = [] as (typeof a)[];
+			for (const x of a.concat(b)) {
+				const sameIdItem = mergedItems.find(y => y.id === x.id);
+				if (sameIdItem != null) {
+					if (deepEqual(x, sameIdItem)) { // 完全な重複は無視
+						continue;
+					} else { // IDは同じなのに内容が違う場合はマージ不可とする
+						throw new Error();
+					}
+				} else {
+					mergedItems.push(x);
+				}
+			}
+			return mergedItems;
 		},
 	},
 	emojiPaletteForReaction: {
@@ -107,9 +119,20 @@ export const PREF_DEF = {
 	themes: {
 		default: [] as Theme[],
 		mergeStrategy: (a, b) => {
-			const sameIdExists = a.some(x => b.some(y => x.id === y.id));
-			if (sameIdExists) throw new Error();
-			return a.concat(b);
+			const mergedItems = [] as (typeof a)[];
+			for (const x of a.concat(b)) {
+				const sameIdItem = mergedItems.find(y => y.id === x.id);
+				if (sameIdItem != null) {
+					if (deepEqual(x, sameIdItem)) { // 完全な重複は無視
+						continue;
+					} else { // IDは同じなのに内容が違う場合はマージ不可とする
+						throw new Error();
+					}
+				} else {
+					mergedItems.push(x);
+				}
+			}
+			return mergedItems;
 		},
 	},
 	lightTheme: {
diff --git a/packages/frontend/src/preferences/manager.ts b/packages/frontend/src/preferences/manager.ts
index 016e1ad85b..ccb8ea0372 100644
--- a/packages/frontend/src/preferences/manager.ts
+++ b/packages/frontend/src/preferences/manager.ts
@@ -377,14 +377,12 @@ export class PreferencesManager {
 	public async enableSync<K extends keyof PREF>(key: K): Promise<{ enabled: boolean; } | null> {
 		if (this.isSyncEnabled(key)) return Promise.resolve(null);
 
-		const record = this.getMatchedRecordOf(key);
-
-		const existing = await this.storageProvider.cloudGet({ key, scope: record[0] });
-		if (existing != null && !deepEqual(existing.value, record[1])) {
+		// undefined ... cancel
+		async function resolveConflict(local: ValueOf<K>, remote: ValueOf<K>): Promise<ValueOf<K> | undefined> {
 			const merge = (PREF_DEF as PreferencesDefinition)[key].mergeStrategy;
 			let mergedValue: ValueOf<K> | undefined = undefined; // null と区別したいため
 			try {
-				if (merge != null) mergedValue = merge(record[1], existing.value);
+				if (merge != null) mergedValue = merge(local, remote);
 			} catch (err) {
 				// nop
 			}
@@ -406,23 +404,51 @@ export class PreferencesManager {
 				}],
 				default: mergedValue !== undefined ? 'merge' : 'remote',
 			});
-			if (canceled || choice == null) return { enabled: false };
+			if (canceled || choice == null) return undefined;
 
 			if (choice === 'remote') {
-				this.commit(key, existing.value);
+				return remote;
 			} else if (choice === 'local') {
-				// nop
+				return local;
 			} else if (choice === 'merge') {
-				this.commit(key, mergedValue!);
+				return mergedValue!;
 			}
 		}
 
+		const record = this.getMatchedRecordOf(key);
+
+		let newValue = record[1];
+
+		const existing = await this.storageProvider.cloudGet({ key, scope: record[0] });
+		if (existing != null && !deepEqual(record[1], existing.value)) {
+			const resolvedValue = await resolveConflict(record[1], existing.value);
+			if (resolvedValue === undefined) return { enabled: false }; // canceled
+			newValue = resolvedValue;
+		}
+
+		this.commit(key, newValue);
+
+		const done = os.waiting();
+
+		try {
+			await this.storageProvider.cloudSet({ key, scope: record[0], value: newValue });
+		} catch (err) {
+			done();
+
+			os.alert({
+				type: 'error',
+				title: i18n.ts.somethingHappened,
+				text: err,
+			});
+
+			return { enabled: false };
+		}
+
+		done({ success: true });
+
 		record[2].sync = true;
 		this.save();
 
-		// awaitの必要性は無い
-		this.storageProvider.cloudSet({ key, scope: record[0], value: this.s[key] });
-
 		return { enabled: true };
 	}
 

From aa4c7a1313a9f3e31df6190d66e8665e8d736574 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 31 May 2025 16:33:03 +0900
Subject: [PATCH 10/31] =?UTF-8?q?fix(frontend):=20=E3=82=A2=E3=82=AB?=
 =?UTF-8?q?=E3=82=A6=E3=83=B3=E3=83=88=E4=BE=9D=E5=AD=98=E3=81=8B=E3=81=A4?=
 =?UTF-8?q?=E5=88=9D=E6=9C=9F=E7=8A=B6=E6=85=8B=E3=81=A7=E3=81=82=E3=82=8B?=
 =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E5=80=A4=E3=82=92=E3=82=B5=E3=83=BC=E3=83=90?=
 =?UTF-8?q?=E3=83=BC=E5=90=8C=E6=9C=9F=E3=81=97=E3=82=88=E3=81=86=E3=81=A8?=
 =?UTF-8?q?=E3=81=97=E3=81=9F=E9=9A=9B=E3=81=AB=E6=AD=A3=E3=81=97=E3=81=8F?=
 =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=95=E3=83=AA=E3=82=AF=E3=83=88=E6=A4=9C?=
 =?UTF-8?q?=E5=87=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                 |  1 +
 packages/frontend/src/preferences/manager.ts | 64 +++++++++++++++-----
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c11e6e07e..2cebe29d9c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@
   - フロントエンドの読み込みサイズを軽量化しました
 	- ほとんどの言語のハイライトは問題なく行えますが、互換性の問題により一部の言語が正常にハイライトできなくなる可能性があります。詳しくは https://shiki.style/references/engine-js-compat をご覧ください。
 - Fix: チャットに動画ファイルを送付すると、動画の表示が崩れてしまい視聴出来ない問題を修正
+- Fix: アカウント依存かつ初期状態である設定値をサーバー同期しようとした際に正しくコンフリクト検出されない問題を修正
 - Fix: "時計"ウィジェット(Clock)において、Transparent設定が有効でも、その背景が透過されない問題を修正
 - Fix: 一定時間操作がなかったら動画プレイヤーのコントロールを隠すように
 - Fix: Twitchのクリップがプレイヤーで再生できない問題を修正
diff --git a/packages/frontend/src/preferences/manager.ts b/packages/frontend/src/preferences/manager.ts
index ccb8ea0372..cede145e74 100644
--- a/packages/frontend/src/preferences/manager.ts
+++ b/packages/frontend/src/preferences/manager.ts
@@ -104,6 +104,8 @@ export function getInitialPrefValue<K extends keyof PREF>(k: K): ValueOf<K> {
 	}
 }
 
+// TODO: PreferencesManagerForGuest のような非ログイン専用のクラスを分離すれば$iのnullチェックやaccountがnullであるスコープのレコード挿入などが不要になり綺麗になるかもしれない
+// NOTE: accountDependentな設定は初期状態であってもアカウントごとのスコープでレコードを作成しておかないと、サーバー同期する際に正しく動作しなくなる
 export class PreferencesManager {
 	private storageProvider: StorageProvider;
 	public profile: PreferencesProfile;
@@ -139,11 +141,11 @@ export class PreferencesManager {
 		// TODO: 定期的にクラウドの値をフェッチ
 	}
 
-	private isAccountDependentKey<K extends keyof PREF>(key: K): boolean {
+	private static isAccountDependentKey<K extends keyof PREF>(key: K): boolean {
 		return (PREF_DEF as PreferencesDefinition)[key].accountDependent === true;
 	}
 
-	private isServerDependentKey<K extends keyof PREF>(key: K): boolean {
+	private static isServerDependentKey<K extends keyof PREF>(key: K): boolean {
 		return (PREF_DEF as PreferencesDefinition)[key].serverDependent === true;
 	}
 
@@ -166,7 +168,7 @@ export class PreferencesManager {
 
 		const record = this.getMatchedRecordOf(key);
 
-		if (parseScope(record[0]).account == null && this.isAccountDependentKey(key)) {
+		if (parseScope(record[0]).account == null && PreferencesManager.isAccountDependentKey(key)) {
 			this.profile.preferences[key].push([makeScope({
 				server: host,
 				account: $i!.id,
@@ -175,7 +177,7 @@ export class PreferencesManager {
 			return;
 		}
 
-		if (parseScope(record[0]).server == null && this.isServerDependentKey(key)) {
+		if (parseScope(record[0]).server == null && PreferencesManager.isServerDependentKey(key)) {
 			this.profile.preferences[key].push([makeScope({
 				server: host,
 			}), v, {}]);
@@ -276,7 +278,19 @@ export class PreferencesManager {
 	public static newProfile(): PreferencesProfile {
 		const data = {} as PreferencesProfile['preferences'];
 		for (const key in PREF_DEF) {
-			data[key] = [[makeScope({}), getInitialPrefValue(key as keyof typeof PREF_DEF), {}]];
+			const v = getInitialPrefValue(key as keyof typeof PREF_DEF);
+			if (PreferencesManager.isAccountDependentKey(key as keyof typeof PREF_DEF)) {
+				data[key] = $i ? [[makeScope({}), v, {}], [makeScope({
+					server: host,
+					account: $i.id,
+				}), v, {}]] : [[makeScope({}), v, {}]];
+			} else if (PreferencesManager.isServerDependentKey(key as keyof typeof PREF_DEF)) {
+				data[key] = [[makeScope({
+					server: host,
+				}), v, {}]];
+			} else {
+				data[key] = [[makeScope({}), v, {}]];
+			}
 		}
 		return {
 			id: uuid(),
@@ -293,18 +307,36 @@ export class PreferencesManager {
 		for (const key in PREF_DEF) {
 			const records = profileLike.preferences[key];
 			if (records == null || records.length === 0) {
-				data[key] = [[makeScope({}), getInitialPrefValue(key as keyof typeof PREF_DEF), {}]];
+				const v = getInitialPrefValue(key as keyof typeof PREF_DEF);
+				if (PreferencesManager.isAccountDependentKey(key as keyof typeof PREF_DEF)) {
+					data[key] = $i ? [[makeScope({}), v, {}], [makeScope({
+						server: host,
+						account: $i.id,
+					}), v, {}]] : [[makeScope({}), v, {}]];
+				} else if (PreferencesManager.isServerDependentKey(key as keyof typeof PREF_DEF)) {
+					data[key] = [[makeScope({
+						server: host,
+					}), v, {}]];
+				} else {
+					data[key] = [[makeScope({}), v, {}]];
+				}
 				continue;
 			} else {
-				data[key] = records;
-
-				// alpha段階ではmetaが無かったのでマイグレート
-				// TODO: そのうち消す
-				for (const record of data[key] as any[][]) {
-					if (record.length === 2) {
-						record.push({});
-					}
+				if ($i && PreferencesManager.isAccountDependentKey(key as keyof typeof PREF_DEF) && !records.some(([scope]) => parseScope(scope).server === host && parseScope(scope).account === $i!.id)) {
+					data[key] = records.concat([[makeScope({
+						server: host,
+						account: $i.id,
+					}), getInitialPrefValue(key as keyof typeof PREF_DEF), {}]]);
+					continue;
 				}
+				if ($i && PreferencesManager.isServerDependentKey(key as keyof typeof PREF_DEF) && !records.some(([scope]) => parseScope(scope).server === host)) {
+					data[key] = records.concat([[makeScope({
+						server: host,
+					}), getInitialPrefValue(key as keyof typeof PREF_DEF), {}]]);
+					continue;
+				}
+
+				data[key] = records;
 			}
 		}
 
@@ -342,7 +374,7 @@ export class PreferencesManager {
 
 	public setAccountOverride<K extends keyof PREF>(key: K) {
 		if ($i == null) return;
-		if (this.isAccountDependentKey(key)) throw new Error('already account-dependent');
+		if (PreferencesManager.isAccountDependentKey(key)) throw new Error('already account-dependent');
 		if (this.isAccountOverrided(key)) return;
 
 		const records = this.profile.preferences[key];
@@ -356,7 +388,7 @@ export class PreferencesManager {
 
 	public clearAccountOverride<K extends keyof PREF>(key: K) {
 		if ($i == null) return;
-		if (this.isAccountDependentKey(key)) throw new Error('cannot clear override for this account-dependent property');
+		if (PreferencesManager.isAccountDependentKey(key)) throw new Error('cannot clear override for this account-dependent property');
 
 		const records = this.profile.preferences[key];
 

From 0c2d799acd1be72fff7b41e7400019de3cf8ee66 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: Sat, 31 May 2025 16:34:25 +0900
Subject: [PATCH 11/31] =?UTF-8?q?fix(backend):=20=E3=82=B8=E3=83=A7?=
 =?UTF-8?q?=E3=83=96=E3=82=AD=E3=83=A5=E3=83=BC=E7=94=BB=E9=9D=A2=E3=81=AE?=
 =?UTF-8?q?Paused=E3=82=BF=E3=83=96=E3=82=92=E3=82=A2=E3=82=AF=E3=83=86?=
 =?UTF-8?q?=E3=82=A3=E3=83=96=E3=81=AB=E3=81=99=E3=82=8B=E3=81=A8400?=
 =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=8C=E8=BF=94=E3=81=A3=E3=81=A6?=
 =?UTF-8?q?=E3=81=8F=E3=82=8B=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20(#1612?=
 =?UTF-8?q?4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(backend): ジョブキュー画面のPausedタブをアクティブにすると400エラーが返ってくるのを修正

* fix CHANGELOG.md
---
 CHANGELOG.md                                                  | 2 +-
 packages/backend/src/server/api/endpoints/admin/queue/jobs.ts | 2 +-
 packages/misskey-js/src/autogen/types.ts                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cebe29d9c..edca4339cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -72,7 +72,7 @@
 - Fix: ミュート対象ユーザーが引用されているノートがRNされたときにミュートを貫通してしまう問題を修正 #16009
 - Fix: 連合モードが「なし」の場合に、生成されるHTML内のactivity jsonへのリンクタグを省略するように
 - Fix: コントロールパネルから招待コードを作成すると作成者の情報が記録されない問題を修正
-
+- Fix: コントロールパネルのジョブキューページからPausedなジョブ一覧を閲覧できない問題を修正
 
 ## 2025.5.0
 
diff --git a/packages/backend/src/server/api/endpoints/admin/queue/jobs.ts b/packages/backend/src/server/api/endpoints/admin/queue/jobs.ts
index 155f2c4000..a68e95bf3f 100644
--- a/packages/backend/src/server/api/endpoints/admin/queue/jobs.ts
+++ b/packages/backend/src/server/api/endpoints/admin/queue/jobs.ts
@@ -28,7 +28,7 @@ export const paramDef = {
 	type: 'object',
 	properties: {
 		queue: { type: 'string', enum: QUEUE_TYPES },
-		state: { type: 'array', items: { type: 'string', enum: ['active', 'wait', 'delayed', 'completed', 'failed'] } },
+		state: { type: 'array', items: { type: 'string', enum: ['active', 'wait', 'delayed', 'completed', 'failed', 'paused'] } },
 		search: { type: 'string' },
 	},
 	required: ['queue', 'state'],
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 8960639443..e87bcb4f83 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -9074,7 +9074,7 @@ export type operations = {
         'application/json': {
           /** @enum {string} */
           queue: 'system' | 'endedPollNotification' | 'deliver' | 'inbox' | 'db' | 'relationship' | 'objectStorage' | 'userWebhookDeliver' | 'systemWebhookDeliver';
-          state: ('active' | 'wait' | 'delayed' | 'completed' | 'failed')[];
+          state: ('active' | 'wait' | 'delayed' | 'completed' | 'failed' | 'paused')[];
           search?: string;
         };
       };

From 62e333191d55b5b17e937ac49492d0bbae12c4d8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 31 May 2025 07:38:56 +0000
Subject: [PATCH 12/31] Bump version to 2025.5.1-beta.6

---
 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 ae61dc13a8..8b843619eb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.5.1-beta.5",
+	"version": "2025.5.1-beta.6",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index d274f43ab4..9465b00622 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.5.1-beta.5",
+	"version": "2025.5.1-beta.6",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 14cbc78031513122995a207858b910b6c3d9a0d7 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 31 May 2025 17:41:04 +0900
Subject: [PATCH 13/31] Update
 packages/frontend/src/pages/admin/custom-emojis-manager.register.vue

Co-authored-by: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
---
 .../frontend/src/pages/admin/custom-emojis-manager.register.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/admin/custom-emojis-manager.register.vue b/packages/frontend/src/pages/admin/custom-emojis-manager.register.vue
index e1dabe549f..621ec8a6a8 100644
--- a/packages/frontend/src/pages/admin/custom-emojis-manager.register.vue
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager.register.vue
@@ -36,7 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		</MkFolder>
 
 		<div class="_buttonsCenter">
-			<MkButton primary rounded @click="onFileSelectClicked">{{ i18n.ts.uplaod }}</MkButton>
+			<MkButton primary rounded @click="onFileSelectClicked">{{ i18n.ts.upload }}</MkButton>
 			<MkButton primary rounded @click="onDriveSelectClicked">{{ i18n.ts.fromDrive }}</MkButton>
 		</div>
 

From f14787bd106de241db8ab3b00d8fcbb9fbd4cd2e Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 31 May 2025 18:04:00 +0900
Subject: [PATCH 14/31] =?UTF-8?q?fix(frontend):=20=E3=83=99=E3=83=BC?=
 =?UTF-8?q?=E3=82=B9=E3=83=AD=E3=83=BC=E3=83=AB=E3=81=AE=E3=80=81=E3=80=8C?=
 =?UTF-8?q?=E3=82=A2=E3=83=83=E3=83=97=E3=83=AD=E3=83=BC=E3=83=89=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E3=81=AA=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E7=A8=AE?=
 =?UTF-8?q?=E5=88=A5=E3=80=8D=E3=82=92=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=A6?=
 =?UTF-8?q?=E3=82=82=E6=AD=A3=E3=81=97=E3=81=8F=E4=BF=9D=E5=AD=98=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=81=AA=E3=81=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #16128
---
 packages/frontend/src/pages/admin/roles.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/admin/roles.vue b/packages/frontend/src/pages/admin/roles.vue
index ef6e25685d..70e8153544 100644
--- a/packages/frontend/src/pages/admin/roles.vue
+++ b/packages/frontend/src/pages/admin/roles.vue
@@ -149,7 +149,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 					<MkFolder v-if="matchQuery([i18n.ts._role._options.uploadableFileTypes, 'uploadableFileTypes'])">
 						<template #label>{{ i18n.ts._role._options.uploadableFileTypes }}</template>
 						<template #suffix>...</template>
-						<MkTextarea :modelValue="policies.uploadableFileTypes.join('\n')">
+						<MkTextarea :modelValue="policies.uploadableFileTypes.join('\n')" @update:modelValue="v => policies.uploadableFileTypes = v.split('\n')">
 							<template #caption>
 								<div>{{ i18n.ts._role._options.uploadableFileTypes_caption }}</div>
 								<div><i class="ti ti-alert-triangle" style="color: var(--MI_THEME-warn);"></i> {{ i18n.tsx._role._options.uploadableFileTypes_caption2({ x: 'application/octet-stream' }) }}</div>

From 4254f52cedeee629ac4913f9190d9d75b78d2f77 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 31 May 2025 18:06:59 +0900
Subject: [PATCH 15/31] New Crowdin updates (#16126)

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

* New translations ja-jp.yml (Catalan)

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

* New translations ja-jp.yml (English)
---
 locales/ca-ES.yml | 1 +
 locales/en-US.yml | 1 +
 locales/zh-TW.yml | 2 ++
 3 files changed, 4 insertions(+)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 64af3b1a03..c887397301 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1330,6 +1330,7 @@ restore: "Restaurar "
 syncBetweenDevices: "Sincronització entre dispositius"
 preferenceSyncConflictTitle: "Els valors de la configuració ja existeixen al dispositiu"
 preferenceSyncConflictText: "Un element de la configuració amb sincronització activada desa els seus valors al servidor, però s'ha trobat un valor a la configuració desat al servidor per aquest element de la configuració. Quin valor us sobreescriure?"
+preferenceSyncConflictChoiceMerge: "Integració "
 preferenceSyncConflictChoiceServer: "Valors de configuració del servidor"
 preferenceSyncConflictChoiceDevice: "Punts d'ajustos del dispositiu "
 preferenceSyncConflictChoiceCancel: "Cancel·lar l'activació de la sincronització "
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 1718d6711a..492a9f2887 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1330,6 +1330,7 @@ restore: "Restore"
 syncBetweenDevices: "Sync between devices"
 preferenceSyncConflictTitle: "The configured value exists on the server."
 preferenceSyncConflictText: "The sync enabled settings will save their values to the server. However, there are existing values on the server. Which set of values would you like to overwrite?"
+preferenceSyncConflictChoiceMerge: "Merge"
 preferenceSyncConflictChoiceServer: "Configured value on server"
 preferenceSyncConflictChoiceDevice: "Configured value on device"
 preferenceSyncConflictChoiceCancel: "Cancel enabling sync"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 70219df019..e4d7d69e46 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -327,6 +327,7 @@ dark: "深色"
 lightThemes: "淺色佈景主題"
 darkThemes: "深色佈景主題"
 syncDeviceDarkMode: "與裝置的深色模式同步"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "「{x}」已開啟。要關閉同步並手動切換模式嗎？\n"
 drive: "雲端硬碟"
 fileName: "檔案名稱"
 selectFile: "選擇檔案"
@@ -1329,6 +1330,7 @@ restore: "還原"
 syncBetweenDevices: "裝置之間的同步化"
 preferenceSyncConflictTitle: "伺服器上存在設定值"
 preferenceSyncConflictText: "已啟用同步的設定項目會將設定值儲存至伺服器，並已找到該設定項目在伺服器上儲存的設定值。請選擇要使用哪個設定值進行覆寫。"
+preferenceSyncConflictChoiceMerge: "合併至"
 preferenceSyncConflictChoiceServer: "伺服器設定值"
 preferenceSyncConflictChoiceDevice: "裝置的設定值"
 preferenceSyncConflictChoiceCancel: "取消啟用同步"

From 21344f76952211c558c0b95d466d69f47f1dadbe Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 31 May 2025 12:37:02 +0000
Subject: [PATCH 16/31] Release: 2025.5.1

---
 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 8b843619eb..4ad351a382 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.5.1-beta.6",
+	"version": "2025.5.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 9465b00622..151ffca622 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.5.1-beta.6",
+	"version": "2025.5.1",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 777ca150838b5b03e53f0b712829a109d6c65374 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sat, 31 May 2025 12:37:08 +0000
Subject: [PATCH 17/31] [skip ci] Update CHANGELOG.md (prepend template)

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index edca4339cb..dae488a735 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## Unreleased
+
+### General
+-
+
+### Client
+-
+
+### Server
+-
+
+
 ## 2025.5.1
 
 ### Note

From c5d33661b22da423d82d5c5ce20a1a5a056c8116 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 1 Jun 2025 07:57:18 +0900
Subject: [PATCH 18/31] chore(frontend): improve type def

---
 packages/frontend/src/preferences/def.ts     | 10 +++++-----
 packages/frontend/src/preferences/manager.ts |  8 ++++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/preferences/def.ts b/packages/frontend/src/preferences/def.ts
index 86d5c8af98..2cbeea2883 100644
--- a/packages/frontend/src/preferences/def.ts
+++ b/packages/frontend/src/preferences/def.ts
@@ -6,12 +6,12 @@
 import * as Misskey from 'misskey-js';
 import { hemisphere } from '@@/js/intl-const.js';
 import { v4 as uuid } from 'uuid';
+import { definePreferences } from './manager.js';
 import type { Theme } from '@/theme.js';
 import type { SoundType } from '@/utility/sound.js';
 import type { Plugin } from '@/plugin.js';
 import type { DeviceKind } from '@/utility/device-kind.js';
 import type { DeckProfile } from '@/deck.js';
-import type { PreferencesDefinition } from './manager.js';
 import { DEFAULT_DEVICE_KIND } from '@/utility/device-kind.js';
 import { deepEqual } from '@/utility/deep-equal.js';
 
@@ -33,7 +33,7 @@ export type SoundStore = {
 
 // NOTE: デフォルト値は他の設定の状態に依存してはならない(依存していた場合、ユーザーがその設定項目単体で「初期値にリセット」した場合不具合の原因になる)
 
-export const PREF_DEF = {
+export const PREF_DEF = definePreferences({
 	accounts: {
 		default: [] as [host: string, user: {
 			id: string;
@@ -88,7 +88,7 @@ export const PREF_DEF = {
 			emojis: string[];
 		}[],
 		mergeStrategy: (a, b) => {
-			const mergedItems = [] as (typeof a)[];
+			const mergedItems = [] as typeof a;
 			for (const x of a.concat(b)) {
 				const sameIdItem = mergedItems.find(y => y.id === x.id);
 				if (sameIdItem != null) {
@@ -119,7 +119,7 @@ export const PREF_DEF = {
 	themes: {
 		default: [] as Theme[],
 		mergeStrategy: (a, b) => {
-			const mergedItems = [] as (typeof a)[];
+			const mergedItems = [] as typeof a;
 			for (const x of a.concat(b)) {
 				const sameIdItem = mergedItems.find(y => y.id === x.id);
 				if (sameIdItem != null) {
@@ -464,4 +464,4 @@ export const PREF_DEF = {
 	'experimental.enableFolderPageView': {
 		default: false,
 	},
-} satisfies PreferencesDefinition;
+});
diff --git a/packages/frontend/src/preferences/manager.ts b/packages/frontend/src/preferences/manager.ts
index cede145e74..603aac851c 100644
--- a/packages/frontend/src/preferences/manager.ts
+++ b/packages/frontend/src/preferences/manager.ts
@@ -96,6 +96,14 @@ type PreferencesDefinitionRecord<Default, T = Default extends (...args: any) =>
 
 export type PreferencesDefinition = Record<string, PreferencesDefinitionRecord<any>>;
 
+export function definePreferences<T extends Record<string, unknown>>(x: {
+	[K in keyof T]: PreferencesDefinitionRecord<T[K]>
+}): {
+		[K in keyof T]: PreferencesDefinitionRecord<T[K]>
+	} {
+	return x;
+}
+
 export function getInitialPrefValue<K extends keyof PREF>(k: K): ValueOf<K> {
 	if (typeof PREF_DEF[k].default === 'function') { // factory
 		return PREF_DEF[k].default();

From 070a4516fce4c6fc1dfc72345807d8b3f600a57b Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 1 Jun 2025 07:57:22 +0900
Subject: [PATCH 19/31] =?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/preferences.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/pages/settings/preferences.vue b/packages/frontend/src/pages/settings/preferences.vue
index 18dfc2250c..05e491ae37 100644
--- a/packages/frontend/src/pages/settings/preferences.vue
+++ b/packages/frontend/src/pages/settings/preferences.vue
@@ -604,7 +604,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 						<MkInfo>
 							<div class="_gaps_s">
-								<div>{{ i18n.ts._clientPerformanceIssueTip.title }}</div>
+								<div>{{ i18n.ts._clientPerformanceIssueTip.title }}:</div>
 								<div>
 									<div><b>{{ i18n.ts._clientPerformanceIssueTip.makeSureDisabledAdBlocker }}</b></div>
 									<div>{{ i18n.ts._clientPerformanceIssueTip.makeSureDisabledAdBlocker_description }}</div>

From 5bdbff19ae4feaa39b0d3241c233236bfcd3179e Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 1 Jun 2025 08:10:49 +0900
Subject: [PATCH 20/31] =?UTF-8?q?fix(frontend):=20=E3=83=AA=E3=82=A2?=
 =?UTF-8?q?=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE=E4=B8=80=E9=83=A8?=
 =?UTF-8?q?=E3=81=AE=E7=B5=B5=E6=96=87=E5=AD=97=E3=81=8C=E9=87=8D=E8=A4=87?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=82=8B?=
 =?UTF-8?q?=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #16130
---
 CHANGELOG.md                                        |  2 +-
 .../frontend/src/composables/use-note-capture.ts    | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dae488a735..d3a0e3195f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,7 @@
 -
 
 ### Client
--
+- Fix: リアクションの一部の絵文字が重複して表示されることがある問題を修正
 
 ### Server
 -
diff --git a/packages/frontend/src/composables/use-note-capture.ts b/packages/frontend/src/composables/use-note-capture.ts
index 90a5922b3e..2aeb9074e5 100644
--- a/packages/frontend/src/composables/use-note-capture.ts
+++ b/packages/frontend/src/composables/use-note-capture.ts
@@ -194,9 +194,9 @@ export function useNoteCapture(props: {
 	parentNote: Misskey.entities.Note | null;
 	mock?: boolean;
 }): {
-	$note: Reactive<ReactiveNoteData>;
-	subscribe: () => void;
-} {
+		$note: Reactive<ReactiveNoteData>;
+		subscribe: () => void;
+	} {
 	const { note, parentNote, mock } = props;
 
 	const $note = reactive<ReactiveNoteData>({
@@ -225,8 +225,8 @@ export function useNoteCapture(props: {
 	let latestPollVotedKey: string | null = null;
 
 	function onReacted(ctx: { userId: Misskey.entities.User['id']; reaction: string; emoji?: { name: string; url: string; }; }): void {
-		const normalizedName = ctx.reaction.replace(/^:(\w+):$/, ':$1@.:');
-
+		let normalizedName = ctx.reaction.replace(/^:(\w+):$/, ':$1@.:');
+		normalizedName = normalizedName.match('\u200d') ? normalizedName : normalizedName.replace(/\ufe0f/g, '');
 		if (reactionUserMap.has(ctx.userId) && reactionUserMap.get(ctx.userId) === normalizedName) return;
 		reactionUserMap.set(ctx.userId, normalizedName);
 
@@ -245,7 +245,8 @@ export function useNoteCapture(props: {
 	}
 
 	function onUnreacted(ctx: { userId: Misskey.entities.User['id']; reaction: string; emoji?: { name: string; url: string; }; }): void {
-		const normalizedName = ctx.reaction.replace(/^:(\w+):$/, ':$1@.:');
+		let normalizedName = ctx.reaction.replace(/^:(\w+):$/, ':$1@.:');
+		normalizedName = normalizedName.match('\u200d') ? normalizedName : normalizedName.replace(/\ufe0f/g, '');
 
 		// 確実に一度リアクションされて取り消されている場合のみ処理をとめる（APIで初回読み込み→Streamでアップデート等の場合、reactionUserMapに情報がないため）
 		if (reactionUserMap.has(ctx.userId) && reactionUserMap.get(ctx.userId) === noReaction) return;

From 021c332097f31c78c5a27ae29c69273c9ac2f380 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 1 Jun 2025 00:22:01 +0000
Subject: [PATCH 21/31] Bump version to 2025.6.0-alpha.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3a0e3195f..7baf724315 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## Unreleased
+## 2025.6.0
 
 ### General
 -
diff --git a/package.json b/package.json
index 4ad351a382..3e192a8ddf 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.5.1",
+	"version": "2025.6.0-alpha.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 151ffca622..31458a227f 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.5.1",
+	"version": "2025.6.0-alpha.0",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 6b1fbf6819cf0a6209faf00760adbe2dbc62b229 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 1 Jun 2025 09:24:49 +0900
Subject: [PATCH 22/31] Update about-misskey.vue

---
 packages/frontend/src/pages/about-misskey.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index 7916cc7834..9812f24982 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -391,6 +391,7 @@ const patrons = [
 	'asata',
 	'ruru',
 	'みりめい',
+	'東雲 琥珀',
 ];
 
 const thereIsTreasure = ref($i && !claimedAchievements.includes('foundTreasure'));

From bd17b465c31d5102a6e56839d405042721d5d7cf Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 1 Jun 2025 09:34:08 +0900
Subject: [PATCH 23/31] New Crowdin updates (#16129)

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

* New translations ja-jp.yml (Korean)
---
 locales/ko-KR.yml | 9 +++++++++
 locales/zh-CN.yml | 1 +
 2 files changed, 10 insertions(+)

diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index d31c3bdf8e..7396bbf574 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -3001,3 +3001,12 @@ _search:
   pleaseEnterServerHost: "서버의 호스트를 입력해 주세요."
   pleaseSelectUser: "유저를 선택해주세요"
   serverHostPlaceholder: "예: misskey.example.com"
+_clientPerformanceIssueTip:
+  makeSureDisabledCustomCss: "커스텀 CSS를 무효로 해주십시오."
+  makeSureDisabledCustomCss_description: "스타일을 덮어쓰기하면 성능에 영향을 미칠 수 있습니다. 커스텀 CSS나 스타일을 덮어쓰기하는 확장 기능이 유효로 돼있는지 확인해주십시오."
+  makeSureDisabledAddons: "확장 기능을 무효로 해주십시오."
+  makeSureDisabledAddons_description: "일부 확장 기능은 클라이언트의 동작에 간섭해 성능에 영향을 미칠 수 있습니다. 브라우저의 확장 기능을 무효로 해 개선할지 확인해주십시오."
+_clip:
+  tip: "클립은 노트를 정리할 수 있는 기능입니다."
+_userLists:
+  tip: "임의의 유저가 포함된 리스트를 작성할 수 있습니다. 작성한 리스트는 타임라인으로 표시가 가능합니다."
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index e915168bc7..f9e910c070 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1330,6 +1330,7 @@ restore: "恢复"
 syncBetweenDevices: "设备间同步"
 preferenceSyncConflictTitle: "服务器上已存在设定值"
 preferenceSyncConflictText: "服务器上已有此设置的设定值。要覆盖哪个设定值？"
+preferenceSyncConflictChoiceMerge: "合并"
 preferenceSyncConflictChoiceServer: "服务器上的设定值"
 preferenceSyncConflictChoiceDevice: "设备上的设定值"
 preferenceSyncConflictChoiceCancel: "取消同步"

From 63db879bcc7930a46223eaaf84ad5ba135192b79 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 1 Jun 2025 10:22:32 +0900
Subject: [PATCH 24/31] fix(frontend): remove unused text

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

diff --git a/packages/frontend/src/components/MkDrive.vue b/packages/frontend/src/components/MkDrive.vue
index 7e955f1529..4daba779d4 100644
--- a/packages/frontend/src/components/MkDrive.vue
+++ b/packages/frontend/src/components/MkDrive.vue
@@ -113,7 +113,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 			<div v-if="filesPaginator.items.value.length == 0 && foldersPaginator.items.value.length == 0 && !fetching" :class="$style.empty">
 				<div v-if="draghover">{{ i18n.ts['empty-draghover'] }}</div>
-				<div v-if="!draghover && folder == null"><strong>{{ i18n.ts.emptyDrive }}</strong><br/>{{ i18n.ts['empty-drive-description'] }}</div>
+				<div v-if="!draghover && folder == null"><strong>{{ i18n.ts.emptyDrive }}</strong></div>
 				<div v-if="!draghover && folder != null">{{ i18n.ts.emptyFolder }}</div>
 			</div>
 		</div>

From f4167ae7f1df7c2cd4cf264fc4d79d51b8c51133 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sun, 1 Jun 2025 10:44:45 +0900
Subject: [PATCH 25/31] =?UTF-8?q?enhance(frontend):=20=E9=9D=9E=E5=90=8C?=
 =?UTF-8?q?=E6=9C=9F=E7=9A=84=E3=81=AA=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC?=
 =?UTF-8?q?=E3=83=8D=E3=83=B3=E3=83=88=E3=81=AE=E8=AA=AD=E3=81=BF=E8=BE=BC?=
 =?UTF-8?q?=E3=81=BF=E6=99=82=E3=81=AE=E3=83=8F=E3=83=B3=E3=83=89=E3=83=AA?=
 =?UTF-8?q?=E3=83=B3=E3=82=B0=E3=82=92=E5=BC=B7=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  |  1 +
 .../src/components/MkDrive.folder.vue         |  4 +-
 .../src/components/MkPostFormAttaches.vue     |  8 +--
 .../src/components/MkUserSetupDialog.vue      |  4 +-
 .../src/components/global/MkCustomEmoji.vue   |  2 +-
 packages/frontend/src/os.ts                   | 50 ++++++++++++++++++-
 packages/frontend/src/pages/admin-user.vue    |  8 +--
 .../custom-emojis-manager.local.list.vue      |  8 +--
 .../frontend/src/pages/avatar-decorations.vue |  6 +--
 packages/frontend/src/pages/chat/XMessage.vue |  4 +-
 .../src/pages/custom-emojis-manager.vue       |  6 +--
 .../frontend/src/pages/drive.file.info.vue    |  4 +-
 packages/frontend/src/pages/emojis.emoji.vue  |  2 +-
 packages/frontend/src/pages/flash/flash.vue   |  4 +-
 packages/frontend/src/pages/gallery/post.vue  |  4 +-
 packages/frontend/src/pages/page.vue          |  4 +-
 .../frontend/src/pages/reset-password.vue     |  4 +-
 packages/frontend/src/pages/settings/2fa.vue  |  2 +-
 .../src/pages/settings/avatar-decoration.vue  |  4 +-
 .../frontend/src/pages/settings/connect.vue   |  4 +-
 packages/frontend/src/plugin.ts               |  4 +-
 packages/frontend/src/ui/_common_/common.ts   |  6 +--
 .../frontend/src/ui/_common_/navbar-h.vue     |  4 +-
 packages/frontend/src/ui/_common_/navbar.vue  |  4 +-
 .../frontend/src/ui/deck/antenna-column.vue   |  2 +-
 .../src/ui/deck/notifications-column.vue      |  4 +-
 packages/frontend/src/utility/drive.ts        |  8 +--
 .../src/utility/get-drive-file-menu.ts        |  4 +-
 .../frontend/src/utility/get-embed-code.ts    |  4 +-
 .../frontend/src/utility/get-note-menu.ts     |  4 +-
 .../frontend/src/utility/get-user-menu.ts     |  4 +-
 packages/frontend/src/utility/please-login.ts |  7 ++-
 .../src/widgets/WidgetNotifications.vue       |  4 +-
 33 files changed, 120 insertions(+), 72 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7baf724315..68a05a67e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 -
 
 ### Client
+- Enhance: 非同期的なコンポーネントの読み込み時のハンドリングを強化
 - Fix: リアクションの一部の絵文字が重複して表示されることがある問題を修正
 
 ### Server
diff --git a/packages/frontend/src/components/MkDrive.folder.vue b/packages/frontend/src/components/MkDrive.folder.vue
index 8ba7520f35..d7dd12408c 100644
--- a/packages/frontend/src/components/MkDrive.folder.vue
+++ b/packages/frontend/src/components/MkDrive.folder.vue
@@ -282,8 +282,8 @@ function onContextmenu(ev: MouseEvent) {
 	menu = [{
 		text: i18n.ts.openInWindow,
 		icon: 'ti ti-app-window',
-		action: () => {
-			const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkDriveWindow.vue')), {
+		action: async () => {
+			const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkDriveWindow.vue').then(x => x.default), {
 				initialFolder: props.folder,
 			}, {
 				closed: () => dispose(),
diff --git a/packages/frontend/src/components/MkPostFormAttaches.vue b/packages/frontend/src/components/MkPostFormAttaches.vue
index dd594ef7f1..f429db94df 100644
--- a/packages/frontend/src/components/MkPostFormAttaches.vue
+++ b/packages/frontend/src/components/MkPostFormAttaches.vue
@@ -126,7 +126,7 @@ async function rename(file) {
 async function describe(file: Misskey.entities.DriveFile) {
 	if (mock) return;
 
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkFileCaptionEditWindow.vue')), {
+	const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkFileCaptionEditWindow.vue').then(x => x.default), {
 		default: file.comment !== null ? file.comment : '',
 		file: file,
 	}, {
@@ -168,9 +168,11 @@ function showFileMenu(file: Misskey.entities.DriveFile, ev: MouseEvent | Keyboar
 		menuItems.push({
 			text: i18n.ts.preview,
 			icon: 'ti ti-photo-search',
-			action: () => {
-				os.popup(defineAsyncComponent(() => import('@/components/MkImgPreviewDialog.vue')), {
+			action: async () => {
+				const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkImgPreviewDialog.vue').then(x => x.default), {
 					file: file,
+				}, {
+					closed: () => dispose(),
 				});
 			},
 		});
diff --git a/packages/frontend/src/components/MkUserSetupDialog.vue b/packages/frontend/src/components/MkUserSetupDialog.vue
index 82214ed5a5..b4ef35c221 100644
--- a/packages/frontend/src/components/MkUserSetupDialog.vue
+++ b/packages/frontend/src/components/MkUserSetupDialog.vue
@@ -174,8 +174,8 @@ function setupComplete() {
 
 function launchTutorial() {
 	setupComplete();
-	nextTick(() => {
-		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkTutorialDialog.vue')), {
+	nextTick(async () => {
+		const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkTutorialDialog.vue').then(x => x.default), {
 			initialPage: 1,
 		}, {
 			closed: () => dispose(),
diff --git a/packages/frontend/src/components/global/MkCustomEmoji.vue b/packages/frontend/src/components/global/MkCustomEmoji.vue
index ed114d8d31..31c358eee7 100644
--- a/packages/frontend/src/components/global/MkCustomEmoji.vue
+++ b/packages/frontend/src/components/global/MkCustomEmoji.vue
@@ -185,7 +185,7 @@ async function edit(name: string) {
 	const emoji = await misskeyApi('emoji', {
 		name: name,
 	});
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/pages/emoji-edit-dialog.vue')), {
+	const { dispose } = await os.popupAsyncWithDialog(import('@/pages/emoji-edit-dialog.vue').then(x => x.default), {
 		emoji: emoji,
 	}, {
 		closed: () => dispose(),
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index 08291a5595..d50f50cf20 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -206,6 +206,52 @@ export function popup<T extends Component>(
 	};
 }
 
+export async function popupAsyncWithDialog<T extends Component>(
+	componentFetching: Promise<T>,
+	props: ComponentProps<T>,
+	events: Partial<ComponentEmit<T>> = {},
+): Promise<{ dispose: () => void }> {
+	const closeWaiting = waiting();
+
+	let component: T;
+
+	try {
+		component = await componentFetching;
+	} catch (err) {
+		closeWaiting();
+		alert({
+			type: 'error',
+			title: i18n.ts.somethingHappened,
+			text: 'CODE: ASYNC_COMP_LOAD_FAIL',
+		});
+		throw err;
+	}
+
+	closeWaiting();
+
+	markRaw(component);
+
+	const id = ++popupIdCount;
+	const dispose = () => {
+		// このsetTimeoutが無いと挙動がおかしくなる(autocompleteが閉じなくなる)。Vueのバグ？
+		window.setTimeout(() => {
+			popups.value = popups.value.filter(p => p.id !== id);
+		}, 0);
+	};
+	const state = {
+		component,
+		props,
+		events,
+		id,
+	};
+
+	popups.value.push(state);
+
+	return {
+		dispose,
+	};
+}
+
 export function pageWindow(path: string) {
 	const { dispose } = popup(MkPageWindow, {
 		initialPath: path,
@@ -787,9 +833,9 @@ export function launchUploader(
 		multiple?: boolean;
 	},
 ): Promise<Misskey.entities.DriveFile[]> {
-	return new Promise((res, rej) => {
+	return new Promise(async (res, rej) => {
 		if (files.length === 0) return rej();
-		const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkUploaderDialog.vue')), {
+		const { dispose } = await popupAsyncWithDialog(import('@/components/MkUploaderDialog.vue').then(x => x.default), {
 			files: markRaw(files),
 			folderId: options?.folderId,
 			multiple: options?.multiple,
diff --git a/packages/frontend/src/pages/admin-user.vue b/packages/frontend/src/pages/admin-user.vue
index 15cd219834..b0862ccaa4 100644
--- a/packages/frontend/src/pages/admin-user.vue
+++ b/packages/frontend/src/pages/admin-user.vue
@@ -477,16 +477,16 @@ function toggleRoleItem(role) {
 	}
 }
 
-function createAnnouncement() {
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkUserAnnouncementEditDialog.vue')), {
+async function createAnnouncement() {
+	const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkUserAnnouncementEditDialog.vue').then(x => x.default), {
 		user: user.value,
 	}, {
 		closed: () => dispose(),
 	});
 }
 
-function editAnnouncement(announcement) {
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkUserAnnouncementEditDialog.vue')), {
+async function editAnnouncement(announcement) {
+	const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkUserAnnouncementEditDialog.vue').then(x => x.default), {
 		user: user.value,
 		announcement,
 	}, {
diff --git a/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.vue b/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.vue
index 68c7048ae1..4c2c26ec45 100644
--- a/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.vue
+++ b/packages/frontend/src/pages/admin/custom-emojis-manager.local.list.vue
@@ -525,10 +525,10 @@ const headerPageMetadata = computed(() => ({
 const headerActions = computed(() => [{
 	icon: 'ti ti-search',
 	text: i18n.ts.search,
-	handler: () => {
+	handler: async () => {
 		if (searchWindowOpening) return;
 		searchWindowOpening = true;
-		const { dispose } = os.popup(defineAsyncComponent(() => import('./custom-emojis-manager.local.list.search.vue')), {
+		const { dispose } = await os.popupAsyncWithDialog(import('./custom-emojis-manager.local.list.search.vue').then(x => x.default), {
 			query: searchQuery.value,
 		}, {
 			queryUpdated: (query: EmojiSearchQuery) => {
@@ -584,8 +584,8 @@ const headerActions = computed(() => [{
 }, {
 	icon: 'ti ti-notes',
 	text: i18n.ts._customEmojisManager._gridCommon.registrationLogs,
-	handler: () => {
-		const { dispose } = os.popup(defineAsyncComponent(() => import('./custom-emojis-manager.local.list.logs.vue')), {
+	handler: async () => {
+		const { dispose } = await os.popupAsyncWithDialog(import('./custom-emojis-manager.local.list.logs.vue').then(x => x.default), {
 			logs: requestLogs.value,
 		}, {
 			closed: () => {
diff --git a/packages/frontend/src/pages/avatar-decorations.vue b/packages/frontend/src/pages/avatar-decorations.vue
index 675e558de9..f96c02a567 100644
--- a/packages/frontend/src/pages/avatar-decorations.vue
+++ b/packages/frontend/src/pages/avatar-decorations.vue
@@ -46,7 +46,7 @@ function load() {
 load();
 
 async function add(ev: MouseEvent) {
-	const { dispose } = os.popup(defineAsyncComponent(() => import('./avatar-decoration-edit-dialog.vue')), {
+	const { dispose } = await os.popupAsyncWithDialog(import('./avatar-decoration-edit-dialog.vue').then(x => x.default), {
 	}, {
 		done: result => {
 			if (result.created) {
@@ -57,8 +57,8 @@ async function add(ev: MouseEvent) {
 	});
 }
 
-function edit(avatarDecoration) {
-	const { dispose } = os.popup(defineAsyncComponent(() => import('./avatar-decoration-edit-dialog.vue')), {
+async function edit(avatarDecoration) {
+	const { dispose } = await os.popupAsyncWithDialog(import('./avatar-decoration-edit-dialog.vue').then(x => x.default), {
 		avatarDecoration: avatarDecoration,
 	}, {
 		done: result => {
diff --git a/packages/frontend/src/pages/chat/XMessage.vue b/packages/frontend/src/pages/chat/XMessage.vue
index 95f6d870dc..c5e8d0fdb6 100644
--- a/packages/frontend/src/pages/chat/XMessage.vue
+++ b/packages/frontend/src/pages/chat/XMessage.vue
@@ -181,9 +181,9 @@ function showMenu(ev: MouseEvent, contextmenu = false) {
 		menu.push({
 			text: i18n.ts.reportAbuse,
 			icon: 'ti ti-exclamation-circle',
-			action: () => {
+			action: async () => {
 				const localUrl = `${url}/chat/messages/${props.message.id}`;
-				const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+				const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkAbuseReportWindow.vue').then(x => x.default), {
 					user: props.message.fromUser!,
 					initialComment: `${localUrl}\n-----\n`,
 				}, {
diff --git a/packages/frontend/src/pages/custom-emojis-manager.vue b/packages/frontend/src/pages/custom-emojis-manager.vue
index c2bc621f6a..5aba0f68a3 100644
--- a/packages/frontend/src/pages/custom-emojis-manager.vue
+++ b/packages/frontend/src/pages/custom-emojis-manager.vue
@@ -128,7 +128,7 @@ const toggleSelect = (emoji) => {
 };
 
 const add = async (ev: MouseEvent) => {
-	const { dispose } = os.popup(defineAsyncComponent(() => import('./emoji-edit-dialog.vue')), {
+	const { dispose } = await os.popupAsyncWithDialog(import('./emoji-edit-dialog.vue').then(x => x.default), {
 	}, {
 		done: result => {
 			if (result.created) {
@@ -139,8 +139,8 @@ const add = async (ev: MouseEvent) => {
 	});
 };
 
-const edit = (emoji) => {
-	const { dispose } = os.popup(defineAsyncComponent(() => import('./emoji-edit-dialog.vue')), {
+const edit = async (emoji) => {
+	const { dispose } = await os.popupAsyncWithDialog(import('./emoji-edit-dialog.vue').then(x => x.default), {
 		emoji: emoji,
 	}, {
 		done: result => {
diff --git a/packages/frontend/src/pages/drive.file.info.vue b/packages/frontend/src/pages/drive.file.info.vue
index e8ac13c223..1def215afc 100644
--- a/packages/frontend/src/pages/drive.file.info.vue
+++ b/packages/frontend/src/pages/drive.file.info.vue
@@ -174,10 +174,10 @@ function rename() {
 	});
 }
 
-function describe() {
+async function describe() {
 	if (!file.value) return;
 
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkFileCaptionEditWindow.vue')), {
+	const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkFileCaptionEditWindow.vue').then(x => x.default), {
 		default: file.value.comment ?? '',
 		file: file.value,
 	}, {
diff --git a/packages/frontend/src/pages/emojis.emoji.vue b/packages/frontend/src/pages/emojis.emoji.vue
index d5570eb20a..aaf433e78e 100644
--- a/packages/frontend/src/pages/emojis.emoji.vue
+++ b/packages/frontend/src/pages/emojis.emoji.vue
@@ -67,7 +67,7 @@ function menu(ev) {
 }
 
 const edit = async (emoji) => {
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/pages/emoji-edit-dialog.vue')), {
+	const { dispose } = await os.popupAsyncWithDialog(import('@/pages/emoji-edit-dialog.vue').then(x => x.default), {
 		emoji: emoji,
 	}, {
 		closed: () => dispose(),
diff --git a/packages/frontend/src/pages/flash/flash.vue b/packages/frontend/src/pages/flash/flash.vue
index 8eb6521aac..1c9cb92bc2 100644
--- a/packages/frontend/src/pages/flash/flash.vue
+++ b/packages/frontend/src/pages/flash/flash.vue
@@ -238,12 +238,12 @@ async function run() {
 	}
 }
 
-function reportAbuse() {
+async function reportAbuse() {
 	if (!flash.value) return;
 
 	const pageUrl = `${url}/play/${flash.value.id}`;
 
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+	const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkAbuseReportWindow.vue').then(x => x.default), {
 		user: flash.value.user,
 		initialComment: `Play: ${pageUrl}\n-----\n`,
 	}, {
diff --git a/packages/frontend/src/pages/gallery/post.vue b/packages/frontend/src/pages/gallery/post.vue
index 891f58ad08..3db003d9e2 100644
--- a/packages/frontend/src/pages/gallery/post.vue
+++ b/packages/frontend/src/pages/gallery/post.vue
@@ -153,12 +153,12 @@ function edit() {
 	router.push(`/gallery/${post.value.id}/edit`);
 }
 
-function reportAbuse() {
+async function reportAbuse() {
 	if (!post.value) return;
 
 	const pageUrl = `${url}/gallery/${post.value.id}`;
 
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+	const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkAbuseReportWindow.vue').then(x => x.default), {
 		user: post.value.user,
 		initialComment: `Post: ${pageUrl}\n-----\n`,
 	}, {
diff --git a/packages/frontend/src/pages/page.vue b/packages/frontend/src/pages/page.vue
index 82c953a2df..2cd8718968 100644
--- a/packages/frontend/src/pages/page.vue
+++ b/packages/frontend/src/pages/page.vue
@@ -245,12 +245,12 @@ function pin(pin) {
 	});
 }
 
-function reportAbuse() {
+async function reportAbuse() {
 	if (!page.value) return;
 
 	const pageUrl = `${url}/@${props.username}/pages/${props.pageName}`;
 
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+	const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkAbuseReportWindow.vue').then(x => x.default), {
 		user: page.value.user,
 		initialComment: `Page: ${pageUrl}\n-----\n`,
 	}, {
diff --git a/packages/frontend/src/pages/reset-password.vue b/packages/frontend/src/pages/reset-password.vue
index 6584888148..9e2069f0e5 100644
--- a/packages/frontend/src/pages/reset-password.vue
+++ b/packages/frontend/src/pages/reset-password.vue
@@ -41,9 +41,9 @@ async function save() {
 	mainRouter.push('/');
 }
 
-onMounted(() => {
+onMounted(async () => {
 	if (props.token == null) {
-		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkForgotPassword.vue')), {}, {
+		const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkForgotPassword.vue').then(x => x.default), {}, {
 			closed: () => dispose(),
 		});
 		mainRouter.push('/');
diff --git a/packages/frontend/src/pages/settings/2fa.vue b/packages/frontend/src/pages/settings/2fa.vue
index f47ffc984e..2f639cd090 100644
--- a/packages/frontend/src/pages/settings/2fa.vue
+++ b/packages/frontend/src/pages/settings/2fa.vue
@@ -117,7 +117,7 @@ async function registerTOTP(): Promise<void> {
 		token: auth.result.token,
 	});
 
-	const { dispose } = os.popup(defineAsyncComponent(() => import('./2fa.qrdialog.vue')), {
+	const { dispose } = await os.popupAsyncWithDialog(import('./2fa.qrdialog.vue').then(x => x.default), {
 		twoFactorData,
 	}, {
 		closed: () => dispose(),
diff --git a/packages/frontend/src/pages/settings/avatar-decoration.vue b/packages/frontend/src/pages/settings/avatar-decoration.vue
index 14c3a03d2b..c58cd57c65 100644
--- a/packages/frontend/src/pages/settings/avatar-decoration.vue
+++ b/packages/frontend/src/pages/settings/avatar-decoration.vue
@@ -68,8 +68,8 @@ misskeyApi('get-avatar-decorations').then(_avatarDecorations => {
 	loading.value = false;
 });
 
-function openDecoration(avatarDecoration, index?: number) {
-	const { dispose } = os.popup(defineAsyncComponent(() => import('./avatar-decoration.dialog.vue')), {
+async function openDecoration(avatarDecoration, index?: number) {
+	const { dispose } = await os.popupAsyncWithDialog(import('./avatar-decoration.dialog.vue').then(x => x.default), {
 		decoration: avatarDecoration,
 		usingIndex: index,
 	}, {
diff --git a/packages/frontend/src/pages/settings/connect.vue b/packages/frontend/src/pages/settings/connect.vue
index 280ee546dc..959442d25f 100644
--- a/packages/frontend/src/pages/settings/connect.vue
+++ b/packages/frontend/src/pages/settings/connect.vue
@@ -81,8 +81,8 @@ const pagination = {
 	noPaging: true,
 };
 
-function generateToken() {
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkTokenGenerateWindow.vue')), {}, {
+async function generateToken() {
+	const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkTokenGenerateWindow.vue').then(x => x.default), {}, {
 		done: async result => {
 			const { name, permissions } = result;
 			const { token } = await misskeyApi('miauth/gen-token', {
diff --git a/packages/frontend/src/plugin.ts b/packages/frontend/src/plugin.ts
index 1b51850e77..f557d1047a 100644
--- a/packages/frontend/src/plugin.ts
+++ b/packages/frontend/src/plugin.ts
@@ -95,8 +95,8 @@ export async function authorizePlugin(plugin: Plugin) {
 	if (plugin.permissions == null || plugin.permissions.length === 0) return;
 	if (Object.hasOwn(store.s.pluginTokens, plugin.installId)) return;
 
-	const token = await new Promise<string>((res, rej) => {
-		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkTokenGenerateWindow.vue')), {
+	const token = await new Promise<string>(async (res, rej) => {
+		const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkTokenGenerateWindow.vue').then(x => x.default), {
 			title: i18n.ts.tokenRequested,
 			information: i18n.ts.pluginTokenRequestedDescription,
 			initialName: plugin.name,
diff --git a/packages/frontend/src/ui/_common_/common.ts b/packages/frontend/src/ui/_common_/common.ts
index 819e1fa42f..9872937d21 100644
--- a/packages/frontend/src/ui/_common_/common.ts
+++ b/packages/frontend/src/ui/_common_/common.ts
@@ -4,10 +4,10 @@
  */
 
 import { defineAsyncComponent } from 'vue';
+import { host } from '@@/js/config.js';
 import type { MenuItem } from '@/types/menu.js';
 import * as os from '@/os.js';
 import { instance } from '@/instance.js';
-import { host } from '@@/js/config.js';
 import { i18n } from '@/i18n.js';
 import { $i } from '@/i.js';
 
@@ -146,8 +146,8 @@ export function openInstanceMenu(ev: MouseEvent) {
 		menuItems.push({
 			text: i18n.ts._initialTutorial.launchTutorial,
 			icon: 'ti ti-presentation',
-			action: () => {
-				const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkTutorialDialog.vue')), {}, {
+			action: async () => {
+				const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkTutorialDialog.vue').then(x => x.default), {}, {
 					closed: () => dispose(),
 				});
 			},
diff --git a/packages/frontend/src/ui/_common_/navbar-h.vue b/packages/frontend/src/ui/_common_/navbar-h.vue
index 24e2b28f1c..688e195ce6 100644
--- a/packages/frontend/src/ui/_common_/navbar-h.vue
+++ b/packages/frontend/src/ui/_common_/navbar-h.vue
@@ -71,8 +71,8 @@ const otherNavItemIndicated = computed<boolean>(() => {
 	return false;
 });
 
-function more(ev: MouseEvent) {
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
+async function more(ev: MouseEvent) {
+	const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkLaunchPad.vue').then(x => x.default), {
 		anchorElement: ev.currentTarget ?? ev.target,
 		anchor: { x: 'center', y: 'bottom' },
 	}, {
diff --git a/packages/frontend/src/ui/_common_/navbar.vue b/packages/frontend/src/ui/_common_/navbar.vue
index c8b7491895..28913a54ab 100644
--- a/packages/frontend/src/ui/_common_/navbar.vue
+++ b/packages/frontend/src/ui/_common_/navbar.vue
@@ -176,10 +176,10 @@ function openAccountMenu(ev: MouseEvent) {
 	}, ev);
 }
 
-function more(ev: MouseEvent) {
+async function more(ev: MouseEvent) {
 	const target = getHTMLElementOrNull(ev.currentTarget ?? ev.target);
 	if (!target) return;
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkLaunchPad.vue')), {
+	const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkLaunchPad.vue').then(x => x.default), {
 		anchorElement: target,
 	}, {
 		closed: () => dispose(),
diff --git a/packages/frontend/src/ui/deck/antenna-column.vue b/packages/frontend/src/ui/deck/antenna-column.vue
index 716f0ba995..8de894ee88 100644
--- a/packages/frontend/src/ui/deck/antenna-column.vue
+++ b/packages/frontend/src/ui/deck/antenna-column.vue
@@ -72,7 +72,7 @@ async function setAntenna() {
 	if (canceled || antenna == null) return;
 
 	if (antenna === '_CREATE_') {
-		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAntennaEditorDialog.vue')), {}, {
+		const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkAntennaEditorDialog.vue').then(x => x.default), {}, {
 			created: (newAntenna: MisskeyEntities.Antenna) => {
 				antennasCache.delete();
 				updateColumn(props.column.id, {
diff --git a/packages/frontend/src/ui/deck/notifications-column.vue b/packages/frontend/src/ui/deck/notifications-column.vue
index 0e84ed3572..469e9472ab 100644
--- a/packages/frontend/src/ui/deck/notifications-column.vue
+++ b/packages/frontend/src/ui/deck/notifications-column.vue
@@ -27,8 +27,8 @@ const props = defineProps<{
 
 const notificationsComponent = useTemplateRef('notificationsComponent');
 
-function func() {
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkNotificationSelectWindow.vue')), {
+async function func() {
+	const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkNotificationSelectWindow.vue').then(x => x.default), {
 		excludeTypes: props.column.excludeTypes,
 	}, {
 		done: async (res) => {
diff --git a/packages/frontend/src/utility/drive.ts b/packages/frontend/src/utility/drive.ts
index f171a4d14d..fcc847653d 100644
--- a/packages/frontend/src/utility/drive.ts
+++ b/packages/frontend/src/utility/drive.ts
@@ -172,8 +172,8 @@ export function chooseFileFromPcAndUpload(
 export function chooseDriveFile(options: {
 	multiple?: boolean;
 } = {}): Promise<Misskey.entities.DriveFile[]> {
-	return new Promise(resolve => {
-		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkDriveFileSelectDialog.vue')), {
+	return new Promise(async resolve => {
+		const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkDriveFileSelectDialog.vue').then(x => x.default), {
 			multiple: options.multiple ?? false,
 		}, {
 			done: files => {
@@ -286,8 +286,8 @@ export async function createCroppedImageDriveFileFromImageDriveFile(imageDriveFi
 }
 
 export async function selectDriveFolder(initialFolder: Misskey.entities.DriveFolder['id'] | null): Promise<Misskey.entities.DriveFolder[]> {
-	return new Promise(resolve => {
-		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkDriveFolderSelectDialog.vue')), {
+	return new Promise(async resolve => {
+		const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkDriveFolderSelectDialog.vue').then(x => x.default), {
 			initialFolder,
 		}, {
 			done: folders => {
diff --git a/packages/frontend/src/utility/get-drive-file-menu.ts b/packages/frontend/src/utility/get-drive-file-menu.ts
index 4b4bab3125..040cf8f976 100644
--- a/packages/frontend/src/utility/get-drive-file-menu.ts
+++ b/packages/frontend/src/utility/get-drive-file-menu.ts
@@ -28,8 +28,8 @@ function rename(file: Misskey.entities.DriveFile) {
 	});
 }
 
-function describe(file: Misskey.entities.DriveFile) {
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkFileCaptionEditWindow.vue')), {
+async function describe(file: Misskey.entities.DriveFile) {
+	const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkFileCaptionEditWindow.vue').then(x => x.default), {
 		default: file.comment ?? '',
 		file: file,
 	}, {
diff --git a/packages/frontend/src/utility/get-embed-code.ts b/packages/frontend/src/utility/get-embed-code.ts
index d458e64f19..de36314ac2 100644
--- a/packages/frontend/src/utility/get-embed-code.ts
+++ b/packages/frontend/src/utility/get-embed-code.ts
@@ -64,7 +64,7 @@ export function getEmbedCode(path: string, params?: EmbedParams): string {
  *
  * カスタマイズ機能がいらない場合（事前にパラメータを指定する場合）は getEmbedCode を直接使ってください
  */
-export function genEmbedCode(entity: EmbeddableEntity, id: string, params?: EmbedParams) {
+export async function genEmbedCode(entity: EmbeddableEntity, id: string, params?: EmbedParams) {
 	const _params = { ...params };
 
 	if (embedRouteWithScrollbar.includes(entity) && _params.maxHeight == null) {
@@ -75,7 +75,7 @@ export function genEmbedCode(entity: EmbeddableEntity, id: string, params?: Embe
 	if (window.innerWidth < MOBILE_THRESHOLD) {
 		copyToClipboard(getEmbedCode(`/embed/${entity}/${id}`, _params));
 	} else {
-		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkEmbedCodeGenDialog.vue')), {
+		const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkEmbedCodeGenDialog.vue').then(x => x.default), {
 			entity,
 			id,
 			params: _params,
diff --git a/packages/frontend/src/utility/get-note-menu.ts b/packages/frontend/src/utility/get-note-menu.ts
index dc813cb78e..5b99be5fdb 100644
--- a/packages/frontend/src/utility/get-note-menu.ts
+++ b/packages/frontend/src/utility/get-note-menu.ts
@@ -135,12 +135,12 @@ export function getAbuseNoteMenu(note: Misskey.entities.Note, text: string): Men
 	return {
 		icon: 'ti ti-exclamation-circle',
 		text,
-		action: (): void => {
+		action: async (): Promise<void> => {
 			const localUrl = `${url}/notes/${note.id}`;
 			let noteInfo = '';
 			if (note.url ?? note.uri != null) noteInfo = `Note: ${note.url ?? note.uri}\n`;
 			noteInfo += `Local Note: ${localUrl}\n`;
-			const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+			const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkAbuseReportWindow.vue').then(x => x.default), {
 				user: note.user,
 				initialComment: `${noteInfo}-----\n`,
 			}, {
diff --git a/packages/frontend/src/utility/get-user-menu.ts b/packages/frontend/src/utility/get-user-menu.ts
index 563e45c446..5c08b8c462 100644
--- a/packages/frontend/src/utility/get-user-menu.ts
+++ b/packages/frontend/src/utility/get-user-menu.ts
@@ -94,8 +94,8 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
 		});
 	}
 
-	function reportAbuse() {
-		const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkAbuseReportWindow.vue')), {
+	async function reportAbuse() {
+		const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkAbuseReportWindow.vue').then(x => x.default), {
 			user: user,
 		}, {
 			closed: () => dispose(),
diff --git a/packages/frontend/src/utility/please-login.ts b/packages/frontend/src/utility/please-login.ts
index 9253105f48..737e7d7c6e 100644
--- a/packages/frontend/src/utility/please-login.ts
+++ b/packages/frontend/src/utility/please-login.ts
@@ -3,11 +3,10 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { defineAsyncComponent } from 'vue';
 import { $i } from '@/i.js';
 import { instance } from '@/instance.js';
 import { i18n } from '@/i18n.js';
-import { popup } from '@/os.js';
+import { popupAsyncWithDialog } from '@/os.js';
 
 export type OpenOnRemoteOptions = {
 	/**
@@ -45,7 +44,7 @@ export type OpenOnRemoteOptions = {
 	params: Record<string, string>;
 };
 
-export function pleaseLogin(opts: {
+export async function pleaseLogin(opts: {
 	path?: string;
 	message?: string;
 	openOnRemote?: OpenOnRemoteOptions;
@@ -59,7 +58,7 @@ export function pleaseLogin(opts: {
 		_openOnRemote = opts.openOnRemote;
 	}
 
-	const { dispose } = popup(defineAsyncComponent(() => import('@/components/MkSigninDialog.vue')), {
+	const { dispose } = await popupAsyncWithDialog(import('@/components/MkSigninDialog.vue').then(x => x.default), {
 		autoSet: true,
 		message: opts.message ?? (_openOnRemote ? i18n.ts.signinOrContinueOnRemote : i18n.ts.signinRequired),
 		openOnRemote: _openOnRemote,
diff --git a/packages/frontend/src/widgets/WidgetNotifications.vue b/packages/frontend/src/widgets/WidgetNotifications.vue
index b21a82179e..a1af5d084c 100644
--- a/packages/frontend/src/widgets/WidgetNotifications.vue
+++ b/packages/frontend/src/widgets/WidgetNotifications.vue
@@ -54,8 +54,8 @@ const { widgetProps, configure, save } = useWidgetPropsManager(name,
 	emit,
 );
 
-const configureNotification = () => {
-	const { dispose } = os.popup(defineAsyncComponent(() => import('@/components/MkNotificationSelectWindow.vue')), {
+const configureNotification = async () => {
+	const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkNotificationSelectWindow.vue').then(x => x.default), {
 		excludeTypes: widgetProps.excludeTypes,
 	}, {
 		done: async (res) => {

From 5893a95c9927706a8dee27d338999d932ce78128 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 1 Jun 2025 01:49:22 +0000
Subject: [PATCH 26/31] Bump version to 2025.6.0-beta.0

---
 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 3e192a8ddf..666a0ab022 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.6.0-alpha.0",
+	"version": "2025.6.0-beta.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 31458a227f..11e6dd01d8 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.6.0-alpha.0",
+	"version": "2025.6.0-beta.0",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 9dc423afd4b8b299af5e15a98e83151300ade240 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 2 Jun 2025 08:32:22 +0900
Subject: [PATCH 27/31] fix(frontend): tweak MkFolderPage z-index

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

diff --git a/packages/frontend/src/components/MkFolderPage.vue b/packages/frontend/src/components/MkFolderPage.vue
index edc954cf91..21700c9dd8 100644
--- a/packages/frontend/src/components/MkFolderPage.vue
+++ b/packages/frontend/src/components/MkFolderPage.vue
@@ -41,7 +41,7 @@ const emit = defineEmits<{
 	(_: 'closed'): void
 }>();
 
-const zIndex = claimZIndex('middle');
+const zIndex = claimZIndex('low');
 const showing = ref(true);
 
 function closePage() {

From 8f025c447b57c01f3d198f8ea9871eb338d8e971 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 2 Jun 2025 08:37:22 +0900
Subject: [PATCH 28/31] =?UTF-8?q?fix(backend):=20=E3=83=AD=E3=82=B0?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=8F=E3=81=AA?=
 =?UTF-8?q?=E3=82=8B=E3=81=9F=E3=82=81=E3=80=81ugcVisibilityForVisitor?=
 =?UTF-8?q?=E3=81=8Cnone=E3=81=A7=E3=82=82users/show=E3=81=AF=E8=A8=B1?=
 =?UTF-8?q?=E5=8F=AF=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                            | 3 ++-
 packages/backend/src/server/api/endpoints/users/show.ts | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68a05a67e8..34ad31928f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,10 @@
 ### Client
 - Enhance: 非同期的なコンポーネントの読み込み時のハンドリングを強化
 - Fix: リアクションの一部の絵文字が重複して表示されることがある問題を修正
+- Fix: 非利用者に対するユーザー作成コンテンツの公開範囲が全て非公開になっている場合にログインできない問題を修正
 
 ### Server
--
+- Fix: 非利用者に対するユーザー作成コンテンツの公開範囲が全て非公開になっている場合でもusers/showを許可するように
 
 
 ## 2025.5.1
diff --git a/packages/backend/src/server/api/endpoints/users/show.ts b/packages/backend/src/server/api/endpoints/users/show.ts
index d57db42e6d..5ff3a63d6a 100644
--- a/packages/backend/src/server/api/endpoints/users/show.ts
+++ b/packages/backend/src/server/api/endpoints/users/show.ts
@@ -116,9 +116,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		private apiLoggerService: ApiLoggerService,
 	) {
 		super(meta, paramDef, async (ps, me, _1, _2, _3, ip) => {
-			if (this.serverSettings.ugcVisibilityForVisitor === 'none' && me == null) {
-				throw new ApiError(meta.errors.noSuchUser);
-			}
+			// ログイン時にusers/showできなくなってしまう
+			//if (this.serverSettings.ugcVisibilityForVisitor === 'none' && me == null) {
+			//	throw new ApiError(meta.errors.noSuchUser);
+			//}
 
 			let user;
 

From d40c083233509fdf10508bf83b006d066557ff77 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 2 Jun 2025 08:43:04 +0900
Subject: [PATCH 29/31] =?UTF-8?q?enhance(frontend):=20=E9=9D=9E=E5=90=8C?=
 =?UTF-8?q?=E6=9C=9F=E7=9A=84=E3=81=AA=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC?=
 =?UTF-8?q?=E3=83=8D=E3=83=B3=E3=83=88=E3=81=AE=E8=AA=AD=E3=81=BF=E8=BE=BC?=
 =?UTF-8?q?=E3=81=BF=E6=99=82=E3=81=AE=E3=83=8F=E3=83=B3=E3=83=89=E3=83=AA?=
 =?UTF-8?q?=E3=83=B3=E3=82=B0=E3=82=92=E5=BC=B7=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/os.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index d50f50cf20..be247f96c4 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -211,13 +211,17 @@ export async function popupAsyncWithDialog<T extends Component>(
 	props: ComponentProps<T>,
 	events: Partial<ComponentEmit<T>> = {},
 ): Promise<{ dispose: () => void }> {
-	const closeWaiting = waiting();
-
 	let component: T;
+	let closeWaiting = () => {};
+
+	const timer = window.setTimeout(() => {
+		closeWaiting = waiting();
+	}, 100); // コンポーネントがキャッシュされている場合にもwaitingが表示されて画面がちらつくのを防止するためにラグを追加
 
 	try {
 		component = await componentFetching;
 	} catch (err) {
+		window.clearTimeout(timer);
 		closeWaiting();
 		alert({
 			type: 'error',
@@ -227,6 +231,7 @@ export async function popupAsyncWithDialog<T extends Component>(
 		throw err;
 	}
 
+	window.clearTimeout(timer);
 	closeWaiting();
 
 	markRaw(component);

From 982ae9238de52682e344cef00975bc079ca0067b Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 2 Jun 2025 08:43:56 +0900
Subject: [PATCH 30/31] New Crowdin updates (#16136)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Spanish)
---
 locales/es-ES.yml | 137 ++++++++++++++++++++++++++++++++++++++++++++++
 locales/ko-KR.yml | 111 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 246 insertions(+), 2 deletions(-)

diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 487785b706..480ade4153 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -1330,6 +1330,7 @@ restore: "Restaurar"
 syncBetweenDevices: "Sincronizar entre dispositivos"
 preferenceSyncConflictTitle: "Los valores configurados existen en el servidor."
 preferenceSyncConflictText: "Los ajustes de sincronización activados guardarán sus valores en el servidor. Sin embargo, hay valores existentes en el servidor. ¿Qué conjunto de valores desea sobrescribir?"
+preferenceSyncConflictChoiceMerge: "Fusionar"
 preferenceSyncConflictChoiceServer: "Valores de configuración del servidor"
 preferenceSyncConflictChoiceDevice: "Valor configurado en el dispositivo"
 preferenceSyncConflictChoiceCancel: "Cancelar la activación de la sincronización"
@@ -1626,6 +1627,26 @@ _serverSettings:
   reactionsBufferingDescription: "Cuando se activa, el rendimiento durante la creación de reacciones mejorará considerablemente, reduciendo la carga de la base de datos. Sin embargo, aumentará el uso de memoria de Redis."
   inquiryUrl: "URL de consulta "
   inquiryUrlDescription: "Especifica una URL para el formulario de consulta al responsable del servidor o una página web para la información de contacto."
+  openRegistration: "Registros Abiertos"
+  openRegistrationWarning: "Abrir registros conlleva riesgos. Se recomienda solo habilitarlos si tienes un sistema en el cual puedes monitorear continuamente el servidor y respondes inmediatamente en caso de que haya cualquier problema."
+  thisSettingWillAutomaticallyOffWhenModeratorsInactive: "Si no se ha detectado por un tiempo actividad de un moderador, este ajuste será automáticamente desactivado para prevenir el spam. "
+  deliverSuspendedSoftware: "Software suspendido."
+  deliverSuspendedSoftwareDescription: "Puede especificar un rango de nombres y versiones del software del servidor para detener la entrega, por ejemplo, debido a vulnerabilidades. Esta información sobre la versión la proporciona el servidor y su fiabilidad no está garantizada. Se puede utilizar una especificación de rango  para especificar una versión, pero se recomienda especificar una versión previa, como >= 2024.3.1-0, ya que especificar >= 2024.3.1 no incluirá versiones personalizadas como 2024.3.1-custom.0."
+  singleUserMode: "Modo de usuario único"
+  singleUserMode_description: "Si eres el único usuario de este servidor, activar este modo optimizará su rendimiento."
+  signToActivityPubGet: "Firmar  solicitudes  GET de Activitypub."
+  signToActivityPubGet_description: "Normalmente, debería estar activada. Deshabilitarlo puede mejorar los problemas relacionados con la federación, pero por otro lado podría deshabilitar la federación hacia otros servidores."
+  proxyRemoteFiles: "Proxy de archivos remotos"
+  proxyRemoteFiles_description: "Cuando se activa, el servidor proxy  sirve archivos remotos. Esto es útil para generar miniaturas de imágenes y proteger la privacidad del usuario."
+  allowExternalApRedirect: "Permitir redirecciones para consultas vía ActivityPub"
+  allowExternalApRedirect_description: "Si se activa, otros servidores pueden consultar contenidos de terceros a través de este servidor, pero esto puede dar lugar a la suplantación de contenidos."
+  userGeneratedContentsVisibilityForVisitor: "Visibilidad de contenido generado por un usuario a invitados"
+  userGeneratedContentsVisibilityForVisitor_description: "Esto es útil para evitar problemas causados por contenidos remotos inapropiados que no estén bien moderados y que se publiquen involuntariamente en Internet a través de su propio servidor."
+  userGeneratedContentsVisibilityForVisitor_description2: "Publicar incondicionalmente todo el contenido del servidor en Internet, incluido el contenido remoto recibido por el servidor, es arriesgado. Esto es especialmente importante para los invitados que desconocen la naturaleza distribuida del contenido, ya que pueden creer erróneamente que incluso el contenido remoto es contenido creado por usuarios en el servidor."
+  _userGeneratedContentsVisibilityForVisitor:
+    all: "Todo es público."
+    localOnly: "Sólo se publica el contenido local, el remoto se mantiene privado"
+    none: "Todo es privado"
 _accountMigration:
   moveFrom: "Trasladar de otra cuenta a ésta"
   moveFromSub: "Crear un alias para otra cuenta."
@@ -1922,6 +1943,8 @@ _role:
   descriptionOfIsExplorable: "La línea de tiempo de éste rol y la lista de usuarios serán públicos si se activa.."
   displayOrder: "Posición"
   descriptionOfDisplayOrder: "Entre más alto el número, mayor es la posición en la interfaz."
+  preserveAssignmentOnMoveAccount: "Preservar los roles asignados durante la migración"
+  preserveAssignmentOnMoveAccount_description: "Si está activada, este rol se transferirá a la cuenta de destino cuando se migre una cuenta con este rol."
   canEditMembersByModerator: "Permitir a los moderadores editar los miembros"
   descriptionOfCanEditMembersByModerator: "Si se activa, los moderadores, al igual que los administradores, serán capaces de asignar/quitar usuarios a éste rol. Si se desactiva, sólo los administradores podrán hacerlo."
   priority: "Prioridad"
@@ -1941,7 +1964,9 @@ _role:
     canManageCustomEmojis: "Administrar emojis personalizados"
     canManageAvatarDecorations: "Administrar decoraciones de avatar"
     driveCapacity: "Capacidad del drive"
+    maxFileSize: "Tamaño máximo de archivo que se puede cargar."
     alwaysMarkNsfw: "Siempre marcar archivos como NSFW"
+    canUpdateBioMedia: "Puede editar un icono o una imagen de fondo (banner)"
     pinMax: "Máximo de notas fijadas"
     antennaMax: "Máximo de antenas"
     wordMuteMax: "Máximo de caracteres en palabras silenciadas"
@@ -1956,6 +1981,15 @@ _role:
     canSearchNotes: "Uso de la búsqueda de notas"
     canUseTranslator: "Uso de traductor"
     avatarDecorationLimit: "Número máximo de decoraciones de avatar"
+    canImportAntennas: "Permitir la importación de antenas"
+    canImportBlocking: "Permitir la importación de bloqueos"
+    canImportFollowing: "Permitir la importación de seguidos"
+    canImportMuting: "Permitir la importación de silenciados"
+    canImportUserLists: "Permitir la importación de listas"
+    chatAvailability: "Permitir Chats"
+    uploadableFileTypes: "Tipos de archivos que se pueden cargar."
+    uploadableFileTypes_caption: "Especifica los tipos MIME/archivos permitidos. Se pueden especificar varios tipos MIME separándolos con una nueva línea, y se pueden especificar comodines con un asterisco (*). (por ejemplo, image/*)"
+    uploadableFileTypes_caption2: "Es posible que no se detecten algunos tipos de archivos. Para permitir estos archivos, añade {x} a la especificación."
   _condition:
     roleAssignedTo: "Asignado a roles manuales"
     isLocal: "Usuario local"
@@ -1964,6 +1998,7 @@ _role:
     isBot: "Usuarios Bot"
     isSuspended: "Usuario suspendido"
     isLocked: "Cuentas privadas"
+    isExplorable: "Hacer que la cuenta sea visible en las búsquedas"
     createdLessThan: "Menos de X han pasado desde la creación de la cuenta"
     createdMoreThan: "Más de X han pasado desde la creación de la cuenta"
     followersLessThanOrEq: "Tiene X o menos seguidores"
@@ -2118,6 +2153,7 @@ _theme:
   installed: "{name} ha sido instalado"
   installedThemes: "Temas instalados"
   builtinThemes: "Temas integrados"
+  instanceTheme: "Tema del servidor (o también denominado: tema de la instancia)"
   alreadyInstalled: "Este tema ya está instalado"
   invalid: "El formato del tema no es válido"
   make: "Crear tema"
@@ -2179,6 +2215,7 @@ _sfx:
   noteMy: "Nota (a mí mismo)"
   notification: "Notificaciones"
   reaction: "Al seleccionar una reacción"
+  chatMessage: "Mensajes del Chat"
 _soundSettings:
   driveFile: "Usar un archivo de audio en Drive"
   driveFileWarn: "Selecciona un archivo de audio en Drive."
@@ -2186,6 +2223,7 @@ _soundSettings:
   driveFileTypeWarnDescription: "Selecciona un archivo de audio"
   driveFileDurationWarn: "La duración del audio es demasiado larga."
   driveFileDurationWarnDescription: "Usar un audio de larga duración puede llegar a molestar mientras usas Misskey. ¿Quieres continuar?"
+  driveFileError: "No puedo cargar el sonido. Por favor cambia la configuración."
 _ago:
   future: "Futuro"
   justNow: "Justo ahora"
@@ -2325,6 +2363,7 @@ _permissions:
   "read:federation": "Ver instancias federadas"
   "write:report-abuse": "Crear reportes de usuario"
   "write:chat": "Administrar chat"
+  "read:chat": "Explorar Chats"
 _auth:
   shareAccessTitle: "Permisos de la aplicación"
   shareAccess: "¿Desea permitir el acceso a la cuenta \"{name}\"?"
@@ -2333,8 +2372,11 @@ _auth:
   permissionAsk: "Esta aplicación requiere los siguientes permisos"
   pleaseGoBack: "Por favor, vuelve a la aplicación"
   callback: "Volviendo a la aplicación"
+  accepted: "Acceso concedido."
   denied: "Acceso denegado"
+  scopeUser: "Operar como el siguiente usuario"
   pleaseLogin: "Se requiere un inicio de sesión para darle permisos a la aplicación"
+  byClickingYouWillBeRedirectedToThisUrl: "Cuando el acceso es concedido, serás automáticamente redireccionado a la siguiente URL"
 _antennaSources:
   all: "Todas las notas"
   homeTimeline: "Notas de los usuarios que sigues"
@@ -2444,6 +2486,9 @@ _profile:
   changeBanner: "Cambiar banner"
   verifiedLinkDescription: "Introduciendo una URL que contiene un enlace a tu perfil, se puede mostrar un icono de verificación de propiedad al lado del campo."
   avatarDecorationMax: "Puedes añadir un máximo de {max} decoraciones de avatar."
+  followedMessage: "Mensaje cuando te han seguido"
+  followedMessageDescription: "Puedes establecer un mensaje de bienvenida para nuevos seguidores."
+  followedMessageDescriptionForLockedAccount: "Si apruebas manualmente seguidores, el mensaje se mostrará al seguidor en el momento de la aprobación."
 _exportOrImport:
   allNotes: "Todas las notas"
   favoritedNotes: "Notas favoritas"
@@ -2533,6 +2578,7 @@ _pages:
   eyeCatchingImageSet: "Elegir imagen llamativa"
   eyeCatchingImageRemove: "Borrar imagen llamativa"
   chooseBlock: "Agregar bloque"
+  enterSectionTitle: "Escribe el título de la sección"
   selectType: "Elegir tipo"
   contentBlocks: "Contenido"
   inputBlocks: "Entrada"
@@ -2567,6 +2613,7 @@ _notification:
   newNote: "Nueva nota"
   unreadAntennaNote: "Antena {name}"
   roleAssigned: "Rol asignado"
+  chatRoomInvitationReceived: "Invitado a la sala de chat."
   emptyPushNotificationMessage: "Se han actualizado las notificaciones push"
   achievementEarned: "Logro desbloqueado"
   testNotification: "Notificación de prueba"
@@ -2574,8 +2621,12 @@ _notification:
   sendTestNotification: "Enviar notificación de prueba"
   notificationWillBeDisplayedLikeThis: "Las notificaciones tendrán este aspecto"
   reactedBySomeUsers: "{n} usuarios han reaccionado"
+  likedBySomeUsers: "{n} usuarios les gustó tu nota"
   renotedBySomeUsers: "{n} usuarios han renotado"
   followedBySomeUsers: "Seguido por {n} usuarios"
+  flushNotification: "Limpiar notificaciones"
+  exportOfXCompleted: "La exportación de {x} ha sido completada."
+  login: "Alguien ha iniciado sesión"
   createTokenDescription: "Si no tienes ni idea, elimina el token de acceso a través de \"{text}\"."
   _types:
     all: "Todo"
@@ -2778,21 +2829,107 @@ _reversi:
   rules: "Reglas"
   won: "{name} ha ganado"
   total: "Total"
+  allGames: "Todos los juegos"
+  ended: "Finalizado"
+  playing: "Jugando actualmente"
+  isLlotheo: "El que tenga menos fichas gana (LLoTheO)"
+  loopedMap: "Mapa en bucle"
+  canPutEverywhere: "Las fichas se pueden poner a cualquier lugar\n"
+  timeLimitForEachTurn: "Tiempo límite por jugada."
+  freeMatch: "Partida libre."
+  lookingForPlayer: "Buscando oponente"
+  gameCanceled: "La partida ha sido cancelada."
+  shareToTlTheGameWhenStart: "Compartir la partida en la línea de tiempo cuando comience "
+  iStartedAGame: "¡La partida ha comenzado!"
+  opponentHasSettingsChanged: "El oponente ha cambiado su configuración"
+  allowIrregularRules: "Reglas irregulares (completamente libre)"
+  disallowIrregularRules: "Sin reglas irregulares "
+  showBoardLabels: "Mostrar el número de línea y de columna en el tablero de juego."
+  useAvatarAsStone: "Usar los avatares de los usuarios como fichas\n"
+_offlineScreen:
+  title: "Fuera de línea. No se puede conectar con el servidor"
+  header: "Incapaz de conectar con el servidor"
 _urlPreviewSetting:
+  title: "Configuración para la previsualización de la URL"
+  enable: "Activar la vista previa de URL"
+  allowRedirect: "Permitir la redirección de la visualización previa"
+  allowRedirectDescription: "Si una URL tiene una redirección establecida, puede activar esta función para seguir la redirección y mostrar una vista previa del contenido redirigido. Si se desactiva, se ahorrarán recursos del servidor, pero no se mostrará el contenido redirigido."
   timeout: "Timeout de la carga de vista previa de las URLs (ms)"
+  timeoutDescription: "Si se tarda más de este valor en obtener la vista previa, ésta no se generará."
   maximumContentLength: "Content-Length Máximo (bytes)"
+  maximumContentLengthDescription: "Si Content-Length es superior a este valor, no se generará la vista previa."
+  requireContentLength: "Genere la vista previa sólo si puede obtener Content-Length"
+  requireContentLengthDescription: "Si el otro servidor no devuelve Content-Length, no se generará la vista previa."
   userAgent: "User-Agent"
+  userAgentDescription: "Establece el User-Agent que se utilizará al recuperar vistas previas. Si se deja en blanco, se utilizará el User-Agent por defecto."
+  summaryProxy: "Proxy endpoints para generar vistas previas"
+  summaryProxyDescription: "La vista previa se genera usando Summaly proxy, no la genera el mismo Misskey."
+  summaryProxyDescription2: "Los siguientes parámetros se vinculan al proxy como cadena de consulta (query string). Si el proxy no los admite, los valores se ignoran."
 _mediaControls:
   pip: "Picture in Picture"
   playbackRate: "Velocidad de reproducción"
   loop: "Reproducción en bucle"
+_contextMenu:
+  title: "Menú contextual"
+  app: "Aplicación"
+  appWithShift: "Aplicación con la tecla shift"
+  native: "Interfaz nativa (del navegador web)"
+_gridComponent:
+  _error:
+    requiredValue: "Este valor es obligatorio"
+    columnTypeNotSupport: "La validación con expresión regular sólo se admite para columnas de tipo:texto."
+    patternNotMatch: "Este valor no coincide con el patrón en {pattern}"
+    notUnique: "Este valor debe ser único"
+_roleSelectDialog:
+  notSelected: "No seleccionado"
+_customEmojisManager:
+  _gridCommon:
+    copySelectionRows: "Copiar filas seleccionadas"
+    copySelectionRanges: "Copiar selección"
+    deleteSelectionRows: "Borrar las líneas seleccionadas"
+    deleteSelectionRanges: "Borrar las filas de la selección"
+    searchSettings: "Ajustes de búsqueda"
+    searchSettingCaption: "Establecer criterios de búsqueda detallados."
+    searchLimit: "Límite de resultados"
+    sortOrder: "Ordenar"
+    registrationLogs: "Log de registros "
+    registrationLogsCaption: "Los registros se mostrarán al actualizar o borrar Emojis. Desaparecerán después de actualizarlos o eliminarlos, pasar a una nueva página o recargar."
 _followRequest:
   recieved: "Petición de seguimiento recibida"
   sent: "Petición de seguimiento enviada"
 _remoteLookupErrors:
+  _federationNotAllowed:
+    description: "Es posible que se haya desactivado la comunicación con este servidor o que haya sido bloqueado.\nPonte en contacto con el administrador del servidor.."
+  _uriInvalid:
+    title: "La URI es inválida"
+    description: "Ha habido un problema con la dirección introducida. Comprueba que no hayas escrito caracteres que no pueden ser usados en la URI"
+  _requestFailed:
+    title: "Solicitud fallida."
+    description: "Ha fallado la comunicación con este servidor. Es posible que el servidor no funcione. Asegúrese también de que no ha introducido un URI no válido o inexistente."
+  _responseInvalid:
+    title: "La respuesta no es válida"
+    description: "Has podido comunicarte con este servidor, pero los datos obtenidos eran incorrectos. Si estás consultando contenidos remotos a través de un servidor de terceros, vuelve a realizar la consulta utilizando un URI que pueda obtenerse del servidor de origen."
   _noSuchObject:
     title: "No se encuentra"
+    description: "No se ha encontrado el recurso solicitado, por favor, vuelve a comprobar el URI."
+_captcha:
+  verify: "Por favor verifica el CAPTCHA"
+  testSiteKeyMessage: "Puedes comprobar la vista previa introduciendo los valores de prueba para el sitio y las claves secretas.\nPara más detalles, consulta la página siguiente.\n"
+  _error:
+    _requestFailed:
+      title: "Ha fallado la solicitud del CAPTCHA"
+      text: "Por favor, ejecútalo después de un rato o comprueba los ajustes de nuevo."
+    _verificationFailed:
+      title: "Ha fallado la validación del CAPTCHA"
+      text: "Comprueba que los ajustes son los correctos."
+    _unknown:
+      title: "Error en el CAPTCHA."
+      text: "Se ha producido un error inesperado."
+_bootErrors:
+  title: "Fallo al cargar"
 _search:
   searchScopeAll: "Todo"
   searchScopeLocal: "Local"
   searchScopeUser: "Especificar usuario"
+_uploader:
+  allowedTypes: "Tipos de archivos que se pueden cargar."
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 7396bbf574..c7d36b4a01 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -298,6 +298,7 @@ uploadFromUrl: "URL 업로드"
 uploadFromUrlDescription: "업로드하려는 파일의 URL"
 uploadFromUrlRequested: "업로드를 요청했습니다"
 uploadFromUrlMayTakeTime: "업로드가 완료될 때까지 시간이 소요될 수 있습니다."
+uploadNFiles: "{n}개의 파일을 업로"
 explore: "둘러보기"
 messageRead: "읽음"
 noMoreHistory: "이것보다 과거의 기록이 없습니다"
@@ -326,6 +327,7 @@ dark: "다크"
 lightThemes: "밝은 테마"
 darkThemes: "어두운 테마"
 syncDeviceDarkMode: "디바이스의 다크 모드 설정과 동기화"
+switchDarkModeManuallyWhenSyncEnabledConfirm: "'{x}'가 켜져 있습니다. 동기화를 끄고 수동으로 모드를 변경하겠습니까?"
 drive: "드라이브"
 fileName: "파일명"
 selectFile: "파일 선택"
@@ -575,8 +577,10 @@ showFixedPostForm: "타임라인 상단에 글 입력란을 표시"
 showFixedPostFormInChannel: "채널 타임라인 상단에 글 입력란을 표시"
 withRepliesByDefaultForNewlyFollowed: "팔로우 할 때 기본적으로 답글을 타임라인에 나오게 하기"
 newNoteRecived: "새 노트가 있습니다"
+newNote: "새로운 노트"
 sounds: "소리"
 sound: "소리"
+notificationSoundSettings: "알림 설정"
 listen: "듣기"
 none: "없음"
 showInPage: "페이지로 보기"
@@ -791,6 +795,7 @@ wide: "넓게"
 narrow: "좁게"
 reloadToApplySetting: "이 설정을 적용하려면 페이지를 새로고침해야 합니다. 바로 새로고침하시겠습니까?"
 needReloadToApply: "변경 사항은 새로고침하면 적용됩니다."
+needToRestartServerToApply: "변경 사항은 새로고침이 필요합니다."
 showTitlebar: "타이틀 바를 표시하기"
 clearCache: "캐시 비우기"
 onlineUsersCount: "{n}명이 접속 중"
@@ -997,6 +1002,7 @@ failedToUpload: "업로드 실패"
 cannotUploadBecauseInappropriate: "이 파일은 부적절한 내용을 포함한다고 판단되어 업로드할 수 없습니다."
 cannotUploadBecauseNoFreeSpace: "드라이브 용량이 부족하여 업로드할 수 없습니다."
 cannotUploadBecauseExceedsFileSizeLimit: "파일 크기가 너무 크기 때문에 업로드할 수 없습니다."
+cannotUploadBecauseUnallowedFileType: "허가되지 않은 유형의 파일이기에 업로드할 수 없습니다."
 beta: "베타"
 enableAutoSensitive: "자동 NSFW 탐지"
 enableAutoSensitiveDescription: "이용 가능할 경우 기계학습을 통해 자동으로 미디어 NSFW를 설정합니다. 이 기능을 해제하더라도, 서버 정책에 따라 자동으로 설정될 수 있습니다."
@@ -1324,6 +1330,7 @@ restore: "복원"
 syncBetweenDevices: "장치간 동기화"
 preferenceSyncConflictTitle: "서버에 설정값이 존재합니다."
 preferenceSyncConflictText: "동기화를 활성화 한 항목의 설정 값은 서버에 저장되지만, 해당 항목은 이미 서버에 설정 값이 저장되어져 있습니다. 어느 쪽의 설정 값을 덮어씌울까요?"
+preferenceSyncConflictChoiceMerge: "병합"
 preferenceSyncConflictChoiceServer: "서버 설정값"
 preferenceSyncConflictChoiceDevice: "장치 설정값"
 preferenceSyncConflictChoiceCancel: "동기화 취소"
@@ -1346,6 +1353,18 @@ goToDeck: "덱으로 돌아가기"
 federationJobs: "연합 작업"
 driveAboutTip: "드라이브는 이전에 업로드한 파일 목록을 표시해요. <br>\n노트에 첨부할 때 다시 사용하거나 나중에 게시할 파일을 미리 업로드할 수 있어요. <br>\n<b>파일을 삭제하면, 지금까지 그 파일을 사용한 모든 장소(노트, 페이지, 아바타, 배너 등)에서도 보이지 않게 되므로 주의해 주세요. 폴더를 만들고 정리할 수도 있어요.</b><br>"
 scrollToClose: "스크롤하여 닫기"
+advice: "참고"
+realtimeMode: "실시간 모드"
+turnItOn: "켜기"
+turnItOff: "끄기"
+emojiMute: "이모티콘 뮤트"
+emojiUnmute: "이모티콘 뮤트 해제"
+muteX: "{x}를 뮤트"
+unmuteX: "{x}의 뮤트를 해제"
+abort: "중지"
+tip: "팁과 유용한 정보"
+redisplayAllTips: "모든 '팁과 유용한 정보'를 재표시"
+hideAllTips: "모든 '팁과 유용한 정보'를 비표시"
 _chat:
   noMessagesYet: "아직 메시지가 없습니다"
   newMessage: "새로운 메시지"
@@ -1379,6 +1398,8 @@ _chat:
   chatNotAvailableInOtherAccount: "상대방 계정에서 채팅 기능을 사용할 수 없는 상태입니다."
   cannotChatWithTheUser: "이 유저와 채팅을 시작할 수 없습니다"
   cannotChatWithTheUser_description: "채팅을 사용할 수 없는 상태이거나 상대방이 채팅을 열지 않은 상태입니다."
+  youAreNotAMemberOfThisRoomButInvited: "당신은 이 룸의 참가자가 아닙니다만 초대 신청을 받으셨습니다. 참가하려면 초대를  수락해주십시오."
+  doYouAcceptInvitation: "초대를 수락하시겠습니까?"
   chatWithThisUser: "채팅하기"
   thisUserAllowsChatOnlyFromFollowers: "이 유저는 팔로워만 채팅을 할 수 있습니다."
   thisUserAllowsChatOnlyFromFollowing: "이 유저는 이 유저가 팔로우하는 유저만 채팅을 허용합니다."
@@ -1418,12 +1439,19 @@ _settings:
   makeEveryTextElementsSelectable: "모든 텍스트 요소를 선택할 수 있도록 함"
   makeEveryTextElementsSelectable_description: "활성화 시, 일부 동작에서 유저의 접근성이 나빠질 수도 있습니다."
   useStickyIcons: "아이콘이 스크롤을 따라가도록 하기"
+  enableHighQualityImagePlaceholders: "고화질 이미지의 플레이스홀더를 표시"
+  uiAnimations: "UI 애니메이션"
   showNavbarSubButtons: "내비게이션 바에 보조 버튼 표시"
   ifOn: "켜져 있을 때"
   ifOff: "꺼져 있을 때"
   enableSyncThemesBetweenDevices: "기기 간 설치한 테마 동기화"
   enablePullToRefresh: "계속해서 갱신"
   enablePullToRefresh_description: "마우스에서 휠을 누르면서 드래그해요."
+  realtimeMode_description: "서버에 접속하고 실시간으로 콘텐츠를 업데이트합니다. 데이터 사용량과 배터리의 소비가 증가할 수 있습니다."
+  contentsUpdateFrequency: "콘텐츠의 업데이트 빈도"
+  contentsUpdateFrequency_description: "높을수록 실시간으로 콘텐츠가 업데이트됩니다만, 성능이 저하되고 데이터 사용량과 배터리의 소비가 증가합니다."
+  contentsUpdateFrequency_description2: "실시간 모드가 켜져 있을 때는 이 설정과 상관없이 실시간으로 콘텐츠가 업데이트됩니다."
+  showUrlPreview: "URL 미리보기 표시"
   _chat:
     showSenderName: "발신자 이름 표시"
     sendOnEnter: "엔터로 보내기"
@@ -1604,6 +1632,21 @@ _serverSettings:
   thisSettingWillAutomaticallyOffWhenModeratorsInactive: "일정 기간동안 모더레이터의 활동이 감지되지 않는 경우, 스팸 방지를 위해 이 설정은 자동으로 꺼집니다."
   deliverSuspendedSoftware: "전달 정지 중인 소프트웨어"
   deliverSuspendedSoftwareDescription: "취약성 등의 이유로 서버의 소프트웨어 이름 및 버전 범위를 지정하여 전달을 정지할 수 있어요. 이 버전 정보는 서버가 제공한 것이며 신뢰성은 보장되지 않아요. 버전 지정에는 semver의 범위 지정을 사용할 수 있지만, >= 2024.3.1로 지정하면 2024.3.1-custom.0과 같은 custom.0과 같은 custom 버전이 포함되지 않기 때문에 >= 2024.3.1-0과 같이 prerelease를 지정하는 것이 좋아요."
+  singleUserMode: "1인 모드"
+  singleUserMode_description: "이 서버의 이용자가 자신 뿐인 경우, 이 모드를 활성화하면 동작이 최적화됩니다."
+  signToActivityPubGet: "GET 요청에 사인"
+  signToActivityPubGet_description: "보통의 경우 활성화해 주십시오. 연합의 통신에 관한 문제가 있는 경우, 비활성화하면 개선되는 경우도 있습니다만, 서버에 따라서는 통신이 불가능해지는 경우도 있습니다."
+  proxyRemoteFiles: "리모트 파일 프록시"
+  proxyRemoteFiles_description: "활성화하면 리모트 파일을 프록시로 제공합니다. 이미지의 섬네일 생성이나 유저의 개인정보 보호에 도움을 줍니다."
+  allowExternalApRedirect: "ActivityPub 경유 조회에 리디렉션 허가"
+  allowExternalApRedirect_description: "활성화하면 다른 서버가 이 서버를 통해 제3자의 콘텐츠를 조회할 수 있습니다만, 콘텐츠의 사칭 문제가 생길 수 있습니다."
+  userGeneratedContentsVisibilityForVisitor: "비이용자에 대한 유저 작성 콘텐츠의 공개 범위"
+  userGeneratedContentsVisibilityForVisitor_description: "조정을 하기 힘든 부적절한 리모트 콘텐츠 등이 자신의 서버 경유로 의도치 않게 인터넷에 공개되는 문제의 방지 등에 도움을 줍니다."
+  userGeneratedContentsVisibilityForVisitor_description2: "서버에서 받은 리모트 콘텐츠를 포함해 서버 내의 모든 콘텐츠를 무조건 인터넷에 공개하는 것에는 위험이 따릅니다. 특히, 분산형 특성에 대해 모르는 열람자에게는 리모트 콘텐츠여도 서버 내에서 작성된 콘텐츠라고 잘못 인식할 수 있기에 주의가 필요합니다."
+  _userGeneratedContentsVisibilityForVisitor:
+    all: "모두 공개"
+    localOnly: "로컬 콘텐츠만 공개하고 리모트 콘텐츠는 비공개"
+    none: "모두 비공개"
 _accountMigration:
   moveFrom: "다른 계정에서 이 계정으로 이사"
   moveFromSub: "다른 계정에 대한 별칭을 생성"
@@ -1944,6 +1987,9 @@ _role:
     canImportMuting: "뮤트 목록 가져오기 허용"
     canImportUserLists: "리스트 목록 가져오기 허용"
     chatAvailability: "채팅을 허락"
+    uploadableFileTypes: "업로드 가능한 파일 유형"
+    uploadableFileTypes_caption: "MIME 유형을 "
+    uploadableFileTypes_caption2: "파일에 따라서는 유형을 검사하지 못하는 경우가 있습니다. 그러한 파일을 허가하는 경우에는 {x}를 지정으로 추가해주십시오."
   _condition:
     roleAssignedTo: "수동 역할에 이미 할당됨"
     isLocal: "로컬 유저"
@@ -2796,6 +2842,12 @@ _dataSaver:
   _avatar:
     title: "아이콘 이미지"
     description: "아이콘 이미지의 애니메이션을 멈춥니다. 애니메이션 이미지는 일반 이미지보다 파일 크기가 클 수 있으므로 데이터 사용량을 더 줄일 수 있습니다."
+  _urlPreviewThumbnail:
+    title: "URL 미리보기의 섬네일을 비표시"
+    description: "URL 미리보기의 섬네일 이미지를 불러올 수 없게 됩니다."
+  _disableUrlPreview:
+    title: "URL 미리보기 비활성화"
+    description: "URL 미리보기 기능을 비활성화합니다. 섬네일 이미지와 달리 링크 정보 불러오기 자체를 줄일 수 있습니다."
   _code:
     title: "문자열 강조"
     description: "MFM 등으로 문자열 강조 기법을 사용할 때 누르기 전에는 불러오지 않습니다. 문자열 강조에서는 강조할 언어마다 그 정의 파일을 불러와야 하지만 이를 자동으로 불러오지 않으므로 데이터 사용량을 줄일 수 있습니다."
@@ -2853,6 +2905,8 @@ _offlineScreen:
 _urlPreviewSetting:
   title: "URL 미리보기 설정"
   enable: "URL 미리보기 활성화"
+  allowRedirect: "미리보기 위치의 리디렉션 허가"
+  allowRedirectDescription: "입력된 URL이 리디렉션될 경우, 그 리디렉션 위치를 따라 미리보기를 표시할 것인지 설정합니다. 비활성화하면 서버 리소스를 절약할 수 있습니다만, 리디렉션 위치의 내용은 표시되지 않습니다."
   timeout: "미리보기를 불러올 때의 타임아웃 (ms)"
   timeoutDescription: "미리보기를 로딩하는데 걸리는 시간이 정한 시간보다 오래 걸리는 경우, 미리보기를 생성하지 않습니다."
   maximumContentLength: "Content-Length의 최대치 (byte)"
@@ -3001,11 +3055,64 @@ _search:
   pleaseEnterServerHost: "서버의 호스트를 입력해 주세요."
   pleaseSelectUser: "유저를 선택해주세요"
   serverHostPlaceholder: "예: misskey.example.com"
+_serverSetupWizard:
+  installCompleted: "Misskey의 설치가 완료됐습니다!"
+  firstCreateAccount: "먼저 관리자 계정을 만듭시다."
+  accountCreated: "관리자 계정이 만들어졌습니다!"
+  serverSetting: "서버 설정"
+  youCanEasilyConfigureOptimalServerSettingsWithThisWizard: "이 위자드로 쉽게 최적화된 서버의 설정을 할 수 있습니다."
+  settingsYouMakeHereCanBeChangedLater: "이 설정은 나중에 변경 가능합니다."
+  howWillYouUseMisskey: "Misskey를 어떻게 사용하십니까?"
+  _use:
+    single: "1인 서버"
+    single_description: "자신 전용 서버로 혼자서 사용"
+    single_youCanCreateMultipleAccounts: "1인 서버로 운영하는 경우에도 계정은 필요에 따라 여러 개 만들 수 있습니다."
+    group: "그룹 서버"
+    group_description: "신뢰 가능한 다른 유저를 초대해 여러 명이 사용"
+    open: "오픈 서버"
+    open_description: "불특정 다수의 유저를 받아들이는 운영을 함"
+  openServerAdvice: "불특정 다수의 유저를 받아들이는 것에는 위험이 따릅니다. 문제에 대처할 수 있도록 확실한 조정 체제로 운영하는 것을 권장합니다."
+  openServerAntiSpamAdvice: "자신의 서버가 스팸으로 사용되지 않게끔 reCAPTCHA라는 안티 봇 기능을 활성화하는 등 보안에 대해서도 세심한 주의가 필요합니다."
+  howManyUsersDoYouExpect: "어느 정도의 인원으로 생각 중이십니까?"
+  _scale:
+    small: "100명 이하(소규모)"
+    medium: "100명 이상 1000명 이하(중간 규모)"
+    large: "1000명 이상(대규모)"
+  largeScaleServerAdvice: "대규모 서버에서는 부하분산이나 데이터베이스의 레플리케이션 등 높은 인프라스트럭처 지식이 필요할 수 있습니다."
+  doYouConnectToFediverse: "Fediverse에 접속하시겠습니까?"
+  doYouConnectToFediverse_description1: "분산형 서버로 구성된 네트워크(Fediverse)에 접속하면 다른 서버와 서로 콘텐츠의 주고받기를 할 수 있습니다."
+  doYouConnectToFediverse_description2: "Fediverse에 접속하는 것을 '연합'이라고도 부릅니다."
+  youCanConfigureMoreFederationSettingsLater: "나중에 연합 가능한 서버의 지정 등 고급 설정을 할 수 있습니다."
+  adminInfo: "관리자 정보"
+  adminInfo_description: "문의 접수를 위해 사용되는 관리자 정보를 설정합니다."
+  adminInfo_mustBeFilled: "오픈 서버 혹은 연합이 켜져 있는 경우 반드시 입력해야 합니다."
+  followingSettingsAreRecommended: "아래의 설정이 권장됩니다."
+  applyTheseSettings: "이 설정을 적용"
+  skipSettings: "설정 건너뛰기"
+  settingsCompleted: "설정이 완료됐습니다!"
+  settingsCompleted_description: "수고하셨습니다. 준비를 마쳤으므로 바로 서버의 이용을 시작하실 수 있습니다."
+  settingsCompleted_description2: "상세한 서버 설정은 '제어판'에서 하실 수 있습니다."
+  donationRequest: "기부 요청"
+  _donationRequest:
+    text1: "Misskey는 자원봉사자들에 의해 개발되는 무료 소프트웨어입니다."
+    text2: "앞으로도 계속해서 개발을 할 수 있도록 괜찮으시다면 부디 기부를 부탁드립니다."
+    text3: "지원자 대상 특전도 있습니다!"
+_uploader:
+  compressedToX: "{x}로 압축"
+  savedXPercent: "{x}% 절약"
+  abortConfirm: "업로드되지 않은 파일이 있습니다만, 그만 두시겠습니까?"
+  doneConfirm: "업로드되지 않은 파일이 있습니다만, 완료하시겠습니까?"
+  maxFileSizeIsX: "업오드 가능한 최대 파일 크기는 {x}입니다."
+  allowedTypes: "업로드 가능한 파일 유형"
+  tip: "파일은 아직 업로드되지 않았습니다. 이 다이얼로그에서 업로드 전의 확인, 이름 바꾸기, 압축, 자르기 등을 하실 수 있습니다. 준비가 되셨다면 '업로드' 버튼을 클릭해 업로드를 시작하실 수 있습니다."
 _clientPerformanceIssueTip:
+  title: "배터리 소비가 심하다고 생각되시면"
+  makeSureDisabledAdBlocker: "광고 차단을 비활성화해 주십시오."
+  makeSureDisabledAdBlocker_description: "광고 차단은 성능에 영향을 미칠 수 있습니다. OS의 기능이나 브라우저의 기능, 애드온 등으로 광고 차단이 활성화돼있지 않은지 확인해 주십시오."
   makeSureDisabledCustomCss: "커스텀 CSS를 무효로 해주십시오."
   makeSureDisabledCustomCss_description: "스타일을 덮어쓰기하면 성능에 영향을 미칠 수 있습니다. 커스텀 CSS나 스타일을 덮어쓰기하는 확장 기능이 유효로 돼있는지 확인해주십시오."
-  makeSureDisabledAddons: "확장 기능을 무효로 해주십시오."
-  makeSureDisabledAddons_description: "일부 확장 기능은 클라이언트의 동작에 간섭해 성능에 영향을 미칠 수 있습니다. 브라우저의 확장 기능을 무효로 해 개선할지 확인해주십시오."
+  makeSureDisabledAddons: "확장 기능을 비활성화해 주십시오."
+  makeSureDisabledAddons_description: "일부 확장 기능은 클라이언트의 동작에 간섭해 성능에 영향을 미칠 수 있습니다. 브라우저의 확장 기능을 비활성화해 개선할지 확인해주십시오."
 _clip:
   tip: "클립은 노트를 정리할 수 있는 기능입니다."
 _userLists:

From 51e7081c9dfb73d46dc898d036ce2a15c41a6419 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Sun, 1 Jun 2025 23:49:28 +0000
Subject: [PATCH 31/31] Bump version to 2025.6.0-beta.1

---
 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 666a0ab022..4a0d23c69a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.6.0-beta.0",
+	"version": "2025.6.0-beta.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 11e6dd01d8..6cb4e04db1 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.6.0-beta.0",
+	"version": "2025.6.0-beta.1",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",