From 3b4879133c4be16a5e9ed7edd31a210ed3ab89af Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Mon, 18 Aug 2025 18:06:32 +0900
Subject: [PATCH 01/19] =?UTF-8?q?=F0=9F=8E=A8?=
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 +
 packages/frontend/src/components/MkUpdated.vue | 9 ++++++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/locales/index.d.ts b/locales/index.d.ts
index 79aa665c06..7036619cf7 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5525,6 +5525,10 @@ export interface Locale extends ILocale {
      * セーフモードが有効な間はデフォルトのテーマが使用されます。セーフモードをオフにすると元に戻ります。
      */
     "themeIsDefaultBecauseSafeMode": string;
+    /**
+     * ベータ版の検証にご協力いただきありがとうございます！
+     */
+    "thankYouForTestingBeta": string;
     "_order": {
         /**
          * 新しい順
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index aa500c4f38..f95f3be279 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1376,6 +1376,7 @@ safeModeEnabled: "セーフモードが有効です"
 pluginsAreDisabledBecauseSafeMode: "セーフモードが有効なため、プラグインはすべて無効化されています。"
 customCssIsDisabledBecauseSafeMode: "セーフモードが有効なため、カスタムCSSは適用されていません。"
 themeIsDefaultBecauseSafeMode: "セーフモードが有効な間はデフォルトのテーマが使用されます。セーフモードをオフにすると元に戻ります。"
+thankYouForTestingBeta: "ベータ版の検証にご協力いただきありがとうございます！"
 
 _order:
   newest: "新しい順"
diff --git a/packages/frontend/src/components/MkUpdated.vue b/packages/frontend/src/components/MkUpdated.vue
index 79ab464cb0..eba8e5472c 100644
--- a/packages/frontend/src/components/MkUpdated.vue
+++ b/packages/frontend/src/components/MkUpdated.vue
@@ -4,10 +4,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkModal ref="modal" :zPriority="'middle'" @click="modal?.close()" @closed="$emit('closed')">
+<MkModal ref="modal" preferType="dialog" :zPriority="'middle'" @click="modal?.close()" @closed="$emit('closed')">
 	<div :class="$style.root">
 		<div :class="$style.title"><MkSparkle>{{ i18n.ts.misskeyUpdated }}</MkSparkle></div>
 		<div :class="$style.version">✨{{ version }}🚀</div>
+		<div v-if="isBeta" :class="$style.beta">{{ i18n.ts.thankYouForTestingBeta }}</div>
 		<MkButton full @click="whatIsNew">{{ i18n.ts.whatIsNew }}</MkButton>
 		<MkButton :class="$style.gotIt" primary full @click="modal?.close()">{{ i18n.ts.gotIt }}</MkButton>
 	</div>
@@ -25,6 +26,8 @@ import { confetti } from '@/utility/confetti.js';
 
 const modal = useTemplateRef('modal');
 
+const isBeta = version.includes('-beta') || version.includes('-alpha') || version.includes('-rc');
+
 function whatIsNew() {
 	modal.value?.close();
 	window.open(`https://misskey-hub.net/docs/releases/#_${version.replace(/\./g, '')}`, '_blank');
@@ -58,6 +61,10 @@ onMounted(() => {
 	margin: 1em 0;
 }
 
+.beta {
+	margin: 1em 0;
+}
+
 .gotIt {
 	margin: 8px 0 0 0;
 }

From 39801722437193952ecfdd235969ed320005ae53 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 19 Aug 2025 14:15:19 +0900
Subject: [PATCH 02/19] =?UTF-8?q?feat:=20=E9=9D=9E=E3=83=AD=E3=82=B0?=
 =?UTF-8?q?=E3=82=A4=E3=83=B3=E6=99=82=E3=81=AB=E8=A1=A8=E7=A4=BA=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=82=8B=E3=83=88=E3=83=83=E3=83=97=E3=83=9A=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=81=AE=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB=E3=82=92?=
 =?UTF-8?q?=E9=81=B8=E6=8A=9E=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=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                            | 12 ++++
 locales/ja-JP.yml                             |  3 +
 .../1755574887486-entrancePageStyle.js        | 16 +++++
 .../src/core/entities/MetaEntityService.ts    |  1 +
 packages/backend/src/models/Meta.ts           |  5 ++
 .../backend/src/models/json-schema/meta.ts    |  4 ++
 .../src/server/api/endpoints/admin/meta.ts    |  5 ++
 .../server/api/endpoints/admin/update-meta.ts |  5 ++
 .../src/components/MkServerSetupWizard.vue    |  8 +++
 .../src/components/MkVisitorDashboard.vue     | 18 ++---
 .../frontend/src/pages/admin/branding.vue     | 30 ++++++++
 ...nce.a.vue => welcome.entrance.classic.vue} |  0
 .../src/pages/welcome.entrance.simple.vue     | 69 +++++++++++++++++++
 packages/frontend/src/pages/welcome.vue       |  8 ++-
 packages/misskey-js/src/autogen/types.ts      |  3 +
 16 files changed, 177 insertions(+), 11 deletions(-)
 create mode 100644 packages/backend/migration/1755574887486-entrancePageStyle.js
 rename packages/frontend/src/pages/{welcome.entrance.a.vue => welcome.entrance.classic.vue} (100%)
 create mode 100644 packages/frontend/src/pages/welcome.entrance.simple.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b7094d8c5..a6feb3e8b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@
 		- `g` キーを連打する
 		- URLに`?safemode=true`を付ける
 		- PWAのショートカットで Safemode を選択して起動する
+- Feat: 非ログイン時に表示されるトップページのスタイルを選択できるように
 - Feat: ページのタブバーを下部に表示できるように
 - Feat: (実験的)iOSでの触覚フィードバックを有効にできるように
 - Enhance: 「自動でもっと見る」オプションが有効になり、安定性が向上しました
diff --git a/locales/index.d.ts b/locales/index.d.ts
index 7036619cf7..eefd8a5ecb 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -6622,6 +6622,18 @@ export interface Locale extends ILocale {
          * 現在の一部の設定はリセットされます。
          */
         "restartServerSetupWizardConfirm_text": string;
+        /**
+         * エントランスページのスタイル
+         */
+        "entrancePageStyle": string;
+        /**
+         * タイムラインを表示する
+         */
+        "showTimelineForVisitor": string;
+        /**
+         * アクティビティを表示する
+         */
+        "showActivityiesForVisitor": string;
         "_userGeneratedContentsVisibilityForVisitor": {
             /**
              * 全て公開
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index f95f3be279..d04445282a 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1683,6 +1683,9 @@ _serverSettings:
   userGeneratedContentsVisibilityForVisitor_description2: "サーバーで受信したリモートのコンテンツを含め、サーバー内の全てのコンテンツを無条件でインターネットに公開することはリスクが伴います。特に、分散型の特性を知らない閲覧者にとっては、リモートのコンテンツであってもサーバー内で作成されたコンテンツであると誤って認識してしまう可能性があるため、注意が必要です。"
   restartServerSetupWizardConfirm_title: "サーバーの初期設定ウィザードをやり直しますか？"
   restartServerSetupWizardConfirm_text: "現在の一部の設定はリセットされます。"
+  entrancePageStyle: "エントランスページのスタイル"
+  showTimelineForVisitor: "タイムラインを表示する"
+  showActivityiesForVisitor: "アクティビティを表示する"
 
   _userGeneratedContentsVisibilityForVisitor:
     all: "全て公開"
diff --git a/packages/backend/migration/1755574887486-entrancePageStyle.js b/packages/backend/migration/1755574887486-entrancePageStyle.js
new file mode 100644
index 0000000000..ba40764b94
--- /dev/null
+++ b/packages/backend/migration/1755574887486-entrancePageStyle.js
@@ -0,0 +1,16 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+export class EntrancePageStyle1755574887486 {
+    name = 'EntrancePageStyle1755574887486'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" ADD "clientOptions" jsonb NOT NULL DEFAULT '{}'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "meta" DROP COLUMN "clientOptions"`);
+    }
+}
diff --git a/packages/backend/src/core/entities/MetaEntityService.ts b/packages/backend/src/core/entities/MetaEntityService.ts
index 02783dc450..f8abfb2f98 100644
--- a/packages/backend/src/core/entities/MetaEntityService.ts
+++ b/packages/backend/src/core/entities/MetaEntityService.ts
@@ -109,6 +109,7 @@ export class MetaEntityService {
 			maxNoteTextLength: MAX_NOTE_TEXT_LENGTH,
 			defaultLightTheme,
 			defaultDarkTheme,
+			clientOptions: instance.clientOptions,
 			ads: ads.map(ad => ({
 				id: ad.id,
 				url: ad.url,
diff --git a/packages/backend/src/models/Meta.ts b/packages/backend/src/models/Meta.ts
index 1fc50cbd07..f8021a7a84 100644
--- a/packages/backend/src/models/Meta.ts
+++ b/packages/backend/src/models/Meta.ts
@@ -716,6 +716,11 @@ export class MiMeta {
 		default: 90, // days
 	})
 	public remoteNotesCleaningExpiryDaysForEachNotes: number;
+
+	@Column('jsonb', {
+		default: { },
+	})
+	public clientOptions: Record<string, any>;
 }
 
 export type SoftwareSuspension = {
diff --git a/packages/backend/src/models/json-schema/meta.ts b/packages/backend/src/models/json-schema/meta.ts
index 2cd7620af0..357ff26041 100644
--- a/packages/backend/src/models/json-schema/meta.ts
+++ b/packages/backend/src/models/json-schema/meta.ts
@@ -71,6 +71,10 @@ export const packedMetaLiteSchema = {
 			type: 'string',
 			optional: false, nullable: true,
 		},
+		clientOptions: {
+			type: 'object',
+			optional: false, nullable: false,
+		},
 		disableRegistration: {
 			type: 'boolean',
 			optional: false, nullable: false,
diff --git a/packages/backend/src/server/api/endpoints/admin/meta.ts b/packages/backend/src/server/api/endpoints/admin/meta.ts
index 4d3f6d6cd8..6ec908d5bf 100644
--- a/packages/backend/src/server/api/endpoints/admin/meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/meta.ts
@@ -425,6 +425,10 @@ export const meta = {
 				type: 'string',
 				optional: false, nullable: true,
 			},
+			clientOptions: {
+				type: 'object',
+				optional: false, nullable: false,
+			},
 			description: {
 				type: 'string',
 				optional: false, nullable: true,
@@ -650,6 +654,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				logoImageUrl: instance.logoImageUrl,
 				defaultLightTheme: instance.defaultLightTheme,
 				defaultDarkTheme: instance.defaultDarkTheme,
+				clientOptions: instance.clientOptions,
 				enableEmail: instance.enableEmail,
 				enableServiceWorker: instance.enableServiceWorker,
 				translatorAvailable: instance.deeplAuthKey != null,
diff --git a/packages/backend/src/server/api/endpoints/admin/update-meta.ts b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
index 08cea23119..a1a2a99d6e 100644
--- a/packages/backend/src/server/api/endpoints/admin/update-meta.ts
+++ b/packages/backend/src/server/api/endpoints/admin/update-meta.ts
@@ -67,6 +67,7 @@ export const paramDef = {
 		description: { type: 'string', nullable: true },
 		defaultLightTheme: { type: 'string', nullable: true },
 		defaultDarkTheme: { type: 'string', nullable: true },
+		clientOptions: { type: 'object', nullable: false },
 		cacheRemoteFiles: { type: 'boolean' },
 		cacheRemoteSensitiveFiles: { type: 'boolean' },
 		emailRequiredForSignup: { type: 'boolean' },
@@ -326,6 +327,10 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 				set.defaultDarkTheme = ps.defaultDarkTheme;
 			}
 
+			if (ps.clientOptions !== undefined) {
+				set.clientOptions = ps.clientOptions;
+			}
+
 			if (ps.cacheRemoteFiles !== undefined) {
 				set.cacheRemoteFiles = ps.cacheRemoteFiles;
 			}
diff --git a/packages/frontend/src/components/MkServerSetupWizard.vue b/packages/frontend/src/components/MkServerSetupWizard.vue
index d2f56b55c4..1d2dfed297 100644
--- a/packages/frontend/src/components/MkServerSetupWizard.vue
+++ b/packages/frontend/src/components/MkServerSetupWizard.vue
@@ -132,6 +132,11 @@ SPDX-License-Identifier: AGPL-3.0-only
 				<div>{{ serverSettings.enableReactionsBuffering ? i18n.ts.yes : i18n.ts.no }}</div>
 			</div>
 
+			<div>
+				<div><b>{{ i18n.ts._serverSettings.entrancePageStyle }}:</b></div>
+				<div>{{ serverSettings.clientOptions.entrancePageStyle }}</div>
+			</div>
+
 			<div>
 				<div><b>{{ i18n.ts._role.baseRole }}/{{ i18n.ts._role._options.rateLimitFactor }}:</b></div>
 				<div>{{ defaultPolicies.rateLimitFactor }}</div>
@@ -233,6 +238,9 @@ const serverSettings = computed<Misskey.entities.AdminUpdateMetaRequest>(() => {
 		enableFanoutTimeline: true,
 		enableFanoutTimelineDbFallback: q_use.value === 'single',
 		enableReactionsBuffering,
+		clientOptions: {
+			entrancePageStyle: q_use.value === 'open' ? 'classic' : 'simple',
+		},
 	};
 });
 
diff --git a/packages/frontend/src/components/MkVisitorDashboard.vue b/packages/frontend/src/components/MkVisitorDashboard.vue
index a809e9040d..1f0117406e 100644
--- a/packages/frontend/src/components/MkVisitorDashboard.vue
+++ b/packages/frontend/src/components/MkVisitorDashboard.vue
@@ -30,7 +30,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 		</div>
 	</div>
-	<div v-if="stats" :class="$style.stats">
+	<div v-if="stats && instance.clientOptions.showActivityiesForVisitor !== false" :class="$style.stats">
 		<div :class="[$style.statsItem, $style.panel]">
 			<div :class="$style.statsItemLabel">{{ i18n.ts.users }}</div>
 			<div :class="$style.statsItemCount"><MkNumber :value="stats.originalUsersCount"/></div>
@@ -40,13 +40,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 			<div :class="$style.statsItemCount"><MkNumber :value="stats.originalNotesCount"/></div>
 		</div>
 	</div>
-	<div v-if="instance.policies.ltlAvailable" :class="[$style.tl, $style.panel]">
+	<div v-if="instance.policies.ltlAvailable && instance.clientOptions.showTimelineForVisitor !== false" :class="[$style.tl, $style.panel]">
 		<div :class="$style.tlHeader">{{ i18n.ts.letsLookAtTimeline }}</div>
 		<div :class="$style.tlBody">
 			<MkStreamingNotesTimeline src="local"/>
 		</div>
 	</div>
-	<div :class="$style.panel">
+	<div v-if="instance.clientOptions.showActivityiesForVisitor !== false" :class="$style.panel">
 		<XActiveUsersChart/>
 	</div>
 </div>
@@ -55,12 +55,13 @@ SPDX-License-Identifier: AGPL-3.0-only
 <script lang="ts" setup>
 import { ref } from 'vue';
 import * as Misskey from 'misskey-js';
+import { instanceName } from '@@/js/config.js';
+import type { MenuItem } from '@/types/menu.js';
 import XSigninDialog from '@/components/MkSigninDialog.vue';
 import XSignupDialog from '@/components/MkSignupDialog.vue';
 import MkButton from '@/components/MkButton.vue';
 import MkStreamingNotesTimeline from '@/components/MkStreamingNotesTimeline.vue';
 import MkInfo from '@/components/MkInfo.vue';
-import { instanceName } from '@@/js/config.js';
 import * as os from '@/os.js';
 import { misskeyApi } from '@/utility/misskey-api.js';
 import { i18n } from '@/i18n.js';
@@ -68,13 +69,14 @@ import { instance } from '@/instance.js';
 import MkNumber from '@/components/MkNumber.vue';
 import XActiveUsersChart from '@/components/MkVisitorDashboard.ActiveUsersChart.vue';
 import { openInstanceMenu } from '@/ui/_common_/common.js';
-import type { MenuItem } from '@/types/menu.js';
 
 const stats = ref<Misskey.entities.StatsResponse | null>(null);
 
-misskeyApi('stats', {}).then((res) => {
-	stats.value = res;
-});
+if (instance.clientOptions.showActivityiesForVisitor !== false) {
+	misskeyApi('stats', {}).then((res) => {
+		stats.value = res;
+	});
+}
 
 function signin() {
 	const { dispose } = os.popup(XSigninDialog, {
diff --git a/packages/frontend/src/pages/admin/branding.vue b/packages/frontend/src/pages/admin/branding.vue
index dc6495e06d..ac7797becc 100644
--- a/packages/frontend/src/pages/admin/branding.vue
+++ b/packages/frontend/src/pages/admin/branding.vue
@@ -8,6 +8,26 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<div class="_spacer" style="--MI_SPACER-w: 700px; --MI_SPACER-min: 16px; --MI_SPACER-max: 32px;">
 		<SearchMarker path="/admin/branding" :label="i18n.ts.branding" :keywords="['branding']" icon="ti ti-paint">
 			<div class="_gaps_m">
+				<SearchMarker :keywords="['entrance', 'welcome', 'landing', 'front', 'home', 'page', 'style']">
+					<MkRadios v-model="entrancePageStyle">
+						<template #label><SearchLabel>{{ i18n.ts._serverSettings.entrancePageStyle }}</SearchLabel></template>
+						<option value="classic">Classic</option>
+						<option value="simple">Simple</option>
+					</MkRadios>
+				</SearchMarker>
+
+				<SearchMarker :keywords="['timeline']">
+					<MkSwitch v-model="showTimelineForVisitor">
+						<template #label><SearchLabel>{{ i18n.ts._serverSettings.showTimelineForVisitor }}</SearchLabel></template>
+					</MkSwitch>
+				</SearchMarker>
+
+				<SearchMarker :keywords="['activity', 'activities']">
+					<MkSwitch v-model="showActivityiesForVisitor">
+						<template #label><SearchLabel>{{ i18n.ts._serverSettings.showActivityiesForVisitor }}</SearchLabel></template>
+					</MkSwitch>
+				</SearchMarker>
+
 				<SearchMarker :keywords="['icon', 'image']">
 					<MkInput v-model="iconUrl" type="url">
 						<template #prefix><i class="ti ti-link"></i></template>
@@ -141,9 +161,14 @@ import { i18n } from '@/i18n.js';
 import { definePage } from '@/page.js';
 import MkButton from '@/components/MkButton.vue';
 import MkColorInput from '@/components/MkColorInput.vue';
+import MkRadios from '@/components/MkRadios.vue';
+import MkSwitch from '@/components/MkSwitch.vue';
 
 const meta = await misskeyApi('admin/meta');
 
+const entrancePageStyle = ref(meta.clientOptions.entrancePageStyle ?? 'classic');
+const showTimelineForVisitor = ref(meta.clientOptions.showTimelineForVisitor ?? true);
+const showActivityiesForVisitor = ref(meta.clientOptions.showActivityiesForVisitor ?? true);
 const iconUrl = ref(meta.iconUrl);
 const app192IconUrl = ref(meta.app192IconUrl);
 const app512IconUrl = ref(meta.app512IconUrl);
@@ -161,6 +186,11 @@ const manifestJsonOverride = ref(meta.manifestJsonOverride === '' ? '{}' : JSON.
 
 function save() {
 	os.apiWithDialog('admin/update-meta', {
+		clientOptions: {
+			entrancePageStyle: entrancePageStyle.value,
+			showTimelineForVisitor: showTimelineForVisitor.value,
+			showActivityiesForVisitor: showActivityiesForVisitor.value,
+		},
 		iconUrl: iconUrl.value,
 		app192IconUrl: app192IconUrl.value,
 		app512IconUrl: app512IconUrl.value,
diff --git a/packages/frontend/src/pages/welcome.entrance.a.vue b/packages/frontend/src/pages/welcome.entrance.classic.vue
similarity index 100%
rename from packages/frontend/src/pages/welcome.entrance.a.vue
rename to packages/frontend/src/pages/welcome.entrance.classic.vue
diff --git a/packages/frontend/src/pages/welcome.entrance.simple.vue b/packages/frontend/src/pages/welcome.entrance.simple.vue
new file mode 100644
index 0000000000..c2a2420e50
--- /dev/null
+++ b/packages/frontend/src/pages/welcome.entrance.simple.vue
@@ -0,0 +1,69 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<div v-if="meta" :class="$style.root">
+	<MkFeaturedPhotos :class="$style.bg"/>
+	<div :class="$style.logoWrapper">
+		<div :class="$style.poweredBy">Powered by</div>
+		<img :src="misskeysvg" :class="$style.misskey"/>
+	</div>
+	<div :class="$style.contents">
+		<MkVisitorDashboard/>
+	</div>
+</div>
+</template>
+
+<script lang="ts" setup>
+import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue';
+import misskeysvg from '/client-assets/misskey.svg';
+import MkVisitorDashboard from '@/components/MkVisitorDashboard.vue';
+import { instance as meta } from '@/instance.js';
+</script>
+
+<style lang="scss" module>
+.root {
+	height: 100cqh;
+	overflow: auto;
+	overscroll-behavior: contain;
+}
+
+.bg {
+	position: fixed;
+	top: 0;
+	right: 0;
+	width: 80vw; // 100%からshapeの幅を引いている
+	height: 100vh;
+}
+
+.logoWrapper {
+	position: fixed;
+	top: 36px;
+	left: 36px;
+	flex: auto;
+	color: #fff;
+	user-select: none;
+	pointer-events: none;
+}
+
+.poweredBy {
+	margin-bottom: 2px;
+}
+
+.misskey {
+	width: 120px;
+
+	@media (max-width: 450px) {
+		width: 100px;
+	}
+}
+
+.contents {
+	position: relative;
+	width: min(430px, calc(100% - 32px));
+	margin: auto;
+	padding: 100px 0 100px 0;
+}
+</style>
diff --git a/packages/frontend/src/pages/welcome.vue b/packages/frontend/src/pages/welcome.vue
index d3e571c053..2b70996252 100644
--- a/packages/frontend/src/pages/welcome.vue
+++ b/packages/frontend/src/pages/welcome.vue
@@ -6,16 +6,18 @@ SPDX-License-Identifier: AGPL-3.0-only
 <template>
 <div v-if="instance">
 	<XSetup v-if="instance.requireSetup"/>
-	<XEntrance v-else/>
+	<XEntranceClassic v-else-if="(instance.clientOptions.entrancePageStyle ?? 'classic') === 'classic'"/>
+	<XEntranceSimple v-else/>
 </div>
 </template>
 
 <script lang="ts" setup>
 import { computed, ref } from 'vue';
 import * as Misskey from 'misskey-js';
-import XSetup from './welcome.setup.vue';
-import XEntrance from './welcome.entrance.a.vue';
 import { instanceName } from '@@/js/config.js';
+import XSetup from './welcome.setup.vue';
+import XEntranceClassic from './welcome.entrance.classic.vue';
+import XEntranceSimple from './welcome.entrance.simple.vue';
 import { definePage } from '@/page.js';
 import { fetchInstance } from '@/instance.js';
 
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 13c5dcf5f1..05ac143762 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -5330,6 +5330,7 @@ export type components = {
             feedbackUrl: string | null;
             defaultDarkTheme: string | null;
             defaultLightTheme: string | null;
+            clientOptions: Record<string, never>;
             disableRegistration: boolean;
             emailRequiredForSignup: boolean;
             enableHcaptcha: boolean;
@@ -9340,6 +9341,7 @@ export interface operations {
                         deeplIsPro: boolean;
                         defaultDarkTheme: string | null;
                         defaultLightTheme: string | null;
+                        clientOptions: Record<string, never>;
                         description: string | null;
                         disableRegistration: boolean;
                         impressumUrl: string | null;
@@ -12575,6 +12577,7 @@ export interface operations {
                     description?: string | null;
                     defaultLightTheme?: string | null;
                     defaultDarkTheme?: string | null;
+                    clientOptions?: Record<string, never>;
                     cacheRemoteFiles?: boolean;
                     cacheRemoteSensitiveFiles?: boolean;
                     emailRequiredForSignup?: boolean;

From a17271a5c4c7be05ea6de297ad5a34f2f06527e5 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Tue, 19 Aug 2025 14:19:54 +0900
Subject: [PATCH 03/19] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6feb3e8b7..5664b94b81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,7 +25,7 @@
 ### Client
 - Feat: AiScriptが1.1.0に更新されました
 	- プラグインは1.xに対応したものが必要です
-	- Playはそのまま動作しますが、新規に作られるプリセットは1.0になります
+	- Playはそのまま動作しますが、新規に作られるプリセットは1.xになります
 	- 以前のバージョンから無効化されていた note_view_interruptor が有効になりました
 - Feat: セーフモード
 	- プラグイン・テーマ・カスタムCSSの使用でクライアントの起動に問題が発生した際に、これらを無効にして起動できます
@@ -34,6 +34,7 @@
 		- URLに`?safemode=true`を付ける
 		- PWAのショートカットで Safemode を選択して起動する
 - Feat: 非ログイン時に表示されるトップページのスタイルを選択できるように
+	- コントロールパネル→ブランディング→エントランスページのスタイル
 - Feat: ページのタブバーを下部に表示できるように
 - Feat: (実験的)iOSでの触覚フィードバックを有効にできるように
 - Enhance: 「自動でもっと見る」オプションが有効になり、安定性が向上しました

From 44a2d531b3fcf38488f97b77ca9311038ec0ae6f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Aug 2025 14:20:53 +0900
Subject: [PATCH 04/19] fix(deps): update dependency tmp to v0.2.4 [security]
 (#16374)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 packages/backend/package.json |  2 +-
 pnpm-lock.yaml                | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/backend/package.json b/packages/backend/package.json
index 13ec9a862d..0d1ae4ac3d 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -176,7 +176,7 @@
 		"stringz": "2.1.0",
 		"systeminformation": "5.27.7",
 		"tinycolor2": "1.6.0",
-		"tmp": "0.2.3",
+		"tmp": "0.2.4",
 		"tsc-alias": "1.8.16",
 		"tsconfig-paths": "4.2.0",
 		"typeorm": "0.3.25",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c54d7aa264..0f6f3f707e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -417,8 +417,8 @@ importers:
         specifier: 1.6.0
         version: 1.6.0
       tmp:
-        specifier: 0.2.3
-        version: 0.2.3
+        specifier: 0.2.4
+        version: 0.2.4
       tsc-alias:
         specifier: 1.8.16
         version: 1.8.16
@@ -10215,8 +10215,8 @@ packages:
     resolution: {integrity: sha512-rv8LUyez4Ygkopqn+M6OLItAOT9FF3REpPQDkdMx5ix8w4qkuE7Vo2o/vw1nxKQYmJDV8JpAMJQr1b+lTKf0FA==}
     hasBin: true
 
-  tmp@0.2.3:
-    resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==}
+  tmp@0.2.4:
+    resolution: {integrity: sha512-UdiSoX6ypifLmrfQ/XfiawN6hkjSBpCjhKxxZcWlUUmoXLaCKQU0bx4HF/tdDK2uzRuchf1txGvrWBzYREssoQ==}
     engines: {node: '>=14.14'}
 
   tmpl@1.0.5:
@@ -16587,7 +16587,7 @@ snapshots:
       request-progress: 3.0.0
       semver: 7.7.2
       supports-color: 8.1.1
-      tmp: 0.2.3
+      tmp: 0.2.4
       tree-kill: 1.2.2
       untildify: 4.0.0
       yauzl: 2.10.0
@@ -16634,7 +16634,7 @@ snapshots:
       request-progress: 3.0.0
       semver: 7.7.2
       supports-color: 8.1.1
-      tmp: 0.2.3
+      tmp: 0.2.4
       tree-kill: 1.2.2
       untildify: 4.0.0
       yauzl: 2.10.0
@@ -21838,7 +21838,7 @@ snapshots:
     dependencies:
       tldts-core: 6.1.61
 
-  tmp@0.2.3: {}
+  tmp@0.2.4: {}
 
   tmpl@1.0.5: {}
 

From 4190c6cb8ecb4dd118f080ab36bc8e7ed1604f6c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Tue, 19 Aug 2025 05:24:14 +0000
Subject: [PATCH 05/19] Bump version to 2025.8.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 7c9a8f597a..dc92be543f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.8.0-beta.0",
+	"version": "2025.8.0-beta.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index b74afa9115..c15c4146ce 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.8.0-beta.0",
+	"version": "2025.8.0-beta.1",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From bdfe70931995e7ec79c2ec399b2a00c095692b21 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 20 Aug 2025 15:57:20 +0900
Subject: [PATCH 06/19] =?UTF-8?q?fix(frontend):=20=E8=AA=AD=E3=81=BF?=
 =?UTF-8?q?=E8=BE=BC=E3=81=BF=E7=9B=B4=E5=BE=8C=E3=81=AB=E3=83=97=E3=83=A9?=
 =?UTF-8?q?=E3=82=B0=E3=82=A4=E3=83=B3=E3=81=AB=E3=82=88=E3=82=8B=E3=83=8E?=
 =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=AE=E6=9B=B8=E3=81=8D=E6=8F=9B=E3=81=88?=
 =?UTF-8?q?=E3=81=8C=E8=A1=8C=E3=82=8F=E3=82=8C=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 #16428
---
 packages/frontend/src/boot/common.ts    |  7 +++++++
 packages/frontend/src/boot/main-boot.ts |  5 +----
 packages/frontend/src/plugin.ts         | 10 ++++++----
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/frontend/src/boot/common.ts b/packages/frontend/src/boot/common.ts
index 395d1e5e7e..574012ff78 100644
--- a/packages/frontend/src/boot/common.ts
+++ b/packages/frontend/src/boot/common.ts
@@ -29,6 +29,7 @@ import { miLocalStorage } from '@/local-storage.js';
 import { fetchCustomEmojis } from '@/custom-emojis.js';
 import { prefer } from '@/preferences.js';
 import { $i } from '@/i.js';
+import { launchPlugins } from '@/plugin.js';
 
 export async function common(createVue: () => Promise<App<Element>>) {
 	console.info(`Misskey v${version}`);
@@ -338,6 +339,12 @@ export async function common(createVue: () => Promise<App<Element>>) {
 		});
 	}
 
+	try {
+		await launchPlugins();
+	} catch (error) {
+		console.error('Failed to launch plugins:', error);
+	}
+
 	app.mount(rootEl);
 
 	// boot.jsのやつを解除
diff --git a/packages/frontend/src/boot/main-boot.ts b/packages/frontend/src/boot/main-boot.ts
index 46e690a55f..6ae8379801 100644
--- a/packages/frontend/src/boot/main-boot.ts
+++ b/packages/frontend/src/boot/main-boot.ts
@@ -26,7 +26,6 @@ import { mainRouter } from '@/router.js';
 import { makeHotkey } from '@/utility/hotkey.js';
 import { addCustomEmoji, removeCustomEmojis, updateCustomEmojis } from '@/custom-emojis.js';
 import { prefer } from '@/preferences.js';
-import { launchPlugins } from '@/plugin.js';
 import { updateCurrentAccountPartial } from '@/accounts.js';
 import { migrateOldSettings } from '@/pref-migrate.js';
 import { unisonReload } from '@/utility/unison-reload.js';
@@ -79,8 +78,6 @@ export async function mainBoot() {
 		}
 	}
 
-	launchPlugins();
-
 	try {
 		if (prefer.s.enableSeasonalScreenEffect) {
 			const month = new Date().getMonth() + 1;
@@ -421,7 +418,7 @@ export async function mainBoot() {
 				}
 			},
 			allowRepeat: true,
-		}
+		},
 	} as const satisfies Keymap;
 	window.document.addEventListener('keydown', makeHotkey(keymap), { passive: false });
 
diff --git a/packages/frontend/src/plugin.ts b/packages/frontend/src/plugin.ts
index 632c913ad7..346e275575 100644
--- a/packages/frontend/src/plugin.ts
+++ b/packages/frontend/src/plugin.ts
@@ -233,11 +233,13 @@ function addPluginHandler<K extends keyof HandlerDef>(installId: Plugin['install
 }
 
 export function launchPlugins() {
-	for (const plugin of prefer.s.plugins) {
+	return Promise.all(prefer.s.plugins.map(plugin => {
 		if (plugin.active) {
-			launchPlugin(plugin.installId);
+			return launchPlugin(plugin.installId);
+		} else {
+			return Promise.resolve();
 		}
-	}
+	}));
 }
 
 async function launchPlugin(id: Plugin['installId']): Promise<void> {
@@ -292,7 +294,7 @@ async function launchPlugin(id: Plugin['installId']): Promise<void> {
 	pluginContexts.set(plugin.installId, aiscript);
 
 	const parser = await getParser();
-	aiscript.exec(parser.parse(plugin.src)).then(
+	await aiscript.exec(parser.parse(plugin.src)).then(
 		() => {
 			console.info('Plugin installed:', plugin.name, 'v' + plugin.version);
 			systemLog('Plugin started');

From b07bf838e36dd5cc4b4d2533229d88bb3ba85481 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:35:26 +0900
Subject: [PATCH 07/19] =?UTF-8?q?=E3=82=B5=E3=83=BC=E3=83=90=E3=83=BC?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E3=82=B3=E3=83=9E=E3=83=B3=E3=83=89=20(#1588?=
 =?UTF-8?q?2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* wip

* Update cli.ts

* Update cli.ts

* wip

* Update CHANGELOG.md

* Delete cli.mjs
---
 CHANGELOG.md                               |  4 ++
 package.json                               |  1 +
 packages/backend/package.json              |  1 +
 packages/backend/src/boot/cli.ts           | 49 ++++++++++++++++++++++
 packages/backend/src/cli/CommandModule.ts  | 23 ++++++++++
 packages/backend/src/cli/CommandService.ts | 49 ++++++++++++++++++++++
 6 files changed, 127 insertions(+)
 create mode 100644 packages/backend/src/boot/cli.ts
 create mode 100644 packages/backend/src/cli/CommandModule.ts
 create mode 100644 packages/backend/src/cli/CommandService.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5664b94b81..6875cdda23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,10 @@
 - Fix: メンションとしての条件を満たしていても、特定の条件(`-`が含まれる場合など)で正しくサジェストされない問題を一部修正
 
 ### Server
+- Feat: サーバー管理コマンド
+	- `pnpm cli foo` の形式で実行可能です
+	- 現在以下のコマンドが利用可能です
+		- `reset-captcha` - CAPTCHA設定をリセットします
 - Enhance: ノートの削除処理の効率化
 - Enhance: 全体的なパフォーマンスの向上
 - Enhance: 依存ソフトウェアの更新
diff --git a/package.json b/package.json
index dc92be543f..5ab8c64ef1 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,7 @@
 		"build-misskey-js-with-types": "pnpm build-pre && pnpm --filter backend... --filter=!misskey-js build && pnpm --filter backend generate-api-json --no-build && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build && pnpm --filter misskey-js api",
 		"start": "pnpm check:connect && cd packages/backend && node ./built/boot/entry.js",
 		"start:test": "ncp ./.github/misskey/test.yml ./.config/test.yml && cd packages/backend && cross-env NODE_ENV=test node ./built/boot/entry.js",
+		"cli": "cd packages/backend && pnpm cli",
 		"init": "pnpm migrate",
 		"migrate": "cd packages/backend && pnpm migrate",
 		"revert": "cd packages/backend && pnpm revert",
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 0d1ae4ac3d..39ea07125d 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -11,6 +11,7 @@
 		"start:test": "cross-env NODE_ENV=test node ./built/boot/entry.js",
 		"migrate": "pnpm typeorm migration:run -d ormconfig.js",
 		"revert": "pnpm typeorm migration:revert -d ormconfig.js",
+		"cli": "node ./built/boot/cli.js",
 		"check:connect": "node ./scripts/check_connect.js",
 		"build": "swc src -d built -D --strip-leading-paths",
 		"build:test": "swc test-server -d built-test -D --config-file test-server/.swcrc --strip-leading-paths",
diff --git a/packages/backend/src/boot/cli.ts b/packages/backend/src/boot/cli.ts
new file mode 100644
index 0000000000..a5618f8152
--- /dev/null
+++ b/packages/backend/src/boot/cli.ts
@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import 'reflect-metadata';
+import { EventEmitter } from 'node:events';
+import { NestFactory } from '@nestjs/core';
+import { CommandModule } from '@/cli/CommandModule.js';
+import { NestLogger } from '@/NestLogger.js';
+import { CommandService } from '@/cli/CommandService.js';
+
+process.title = 'Misskey Cli';
+
+Error.stackTraceLimit = Infinity;
+EventEmitter.defaultMaxListeners = 128;
+
+const app = await NestFactory.createApplicationContext(CommandModule, {
+	logger: new NestLogger(),
+});
+
+const commandService = app.get(CommandService);
+
+const command = process.argv[2] ?? 'help';
+
+switch (command) {
+	case 'help': {
+		console.log('Available commands:');
+		console.log('  help - Displays this help message');
+		console.log('  reset-captcha - Resets the captcha');
+		break;
+	}
+	case 'ping': {
+		await commandService.ping();
+		break;
+	}
+	case 'reset-captcha': {
+		await commandService.resetCaptcha();
+		console.log('Captcha has been reset.');
+		break;
+	}
+	default: {
+		console.error(`Unrecognized command: ${command}`);
+		console.error('Use "help" to see available commands.');
+		process.exit(1);
+	}
+}
+
+process.exit(0);
diff --git a/packages/backend/src/cli/CommandModule.ts b/packages/backend/src/cli/CommandModule.ts
new file mode 100644
index 0000000000..f4b1d25c18
--- /dev/null
+++ b/packages/backend/src/cli/CommandModule.ts
@@ -0,0 +1,23 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Module } from '@nestjs/common';
+import { CoreModule } from '@/core/CoreModule.js';
+import { GlobalModule } from '@/GlobalModule.js';
+import { CommandService } from './CommandService.js';
+
+@Module({
+	imports: [
+		GlobalModule,
+		CoreModule,
+	],
+	providers: [
+		CommandService,
+	],
+	exports: [
+		CommandService,
+	],
+})
+export class CommandModule {}
diff --git a/packages/backend/src/cli/CommandService.ts b/packages/backend/src/cli/CommandService.ts
new file mode 100644
index 0000000000..cdb2a9f382
--- /dev/null
+++ b/packages/backend/src/cli/CommandService.ts
@@ -0,0 +1,49 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import type { Config } from '@/config.js';
+import { DI } from '@/di-symbols.js';
+import type Logger from '@/logger.js';
+import { bindThis } from '@/decorators.js';
+import { MetaService } from '@/core/MetaService.js';
+
+@Injectable()
+export class CommandService {
+	private logger: Logger;
+
+	constructor(
+		@Inject(DI.config)
+		private config: Config,
+
+		private metaService: MetaService,
+	) {
+	}
+
+	@bindThis
+	public async ping() {
+		console.log('pong');
+	}
+
+	@bindThis
+	public async resetCaptcha() {
+		await this.metaService.update({
+			enableHcaptcha: false,
+			hcaptchaSiteKey: null,
+			hcaptchaSecretKey: null,
+			enableMcaptcha: false,
+			mcaptchaSitekey: null,
+			mcaptchaSecretKey: null,
+			mcaptchaInstanceUrl: null,
+			enableRecaptcha: false,
+			recaptchaSiteKey: null,
+			recaptchaSecretKey: null,
+			enableTurnstile: false,
+			turnstileSiteKey: null,
+			turnstileSecretKey: null,
+			enableTestcaptcha: false,
+		});
+	}
+}

From 3a856b785d0ced1956d855b42914372bc25dde14 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Wed, 20 Aug 2025 16:35:50 +0900
Subject: [PATCH 08/19] New Crowdin updates (#16416)

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

* New translations ja-jp.yml (Korean)

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

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Catalan)

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

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

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Italian)

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

* New translations ja-jp.yml (Korean)

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

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Italian)
---
 locales/ca-ES.yml | 6 ++++++
 locales/en-US.yml | 2 ++
 locales/it-IT.yml | 8 +++++++-
 locales/ko-KR.yml | 6 ++++++
 locales/th-TH.yml | 3 +++
 locales/zh-CN.yml | 6 ++++++
 locales/zh-TW.yml | 6 ++++++
 7 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index 2eb8ab33c9..ae9de0f173 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1054,6 +1054,7 @@ permissionDeniedError: "Operació no permesa "
 permissionDeniedErrorDescription: "Aquest compte no té suficients permisos per dur a terme aquesta acció "
 preset: "Predefinit"
 selectFromPresets: "Escull des dels predefinits"
+custom: "Personalitzat"
 achievements: "Assoliments"
 gotInvalidResponseError: "Resposta del servidor invàlida "
 gotInvalidResponseErrorDescription: "No es pot contactar amb el servidor o potser es troba fora de línia per manteniment. Provar-ho de nou més tard."
@@ -1375,6 +1376,7 @@ safeModeEnabled: "Mode segur activat"
 pluginsAreDisabledBecauseSafeMode: "Els afegits no estan activats perquè el mode segur està activat."
 customCssIsDisabledBecauseSafeMode: "El CSS personalitzat no s'aplica perquè el mode segur es troba activat."
 themeIsDefaultBecauseSafeMode: "El tema predeterminat es farà servir mentre el mode segur estigui activat. Una vegada es desactivi el mode segur es restablirà el tema escollit."
+thankYouForTestingBeta: "Gràcies per ajudar-nos a provar la versió beta!"
 _order:
   newest: "Més recent"
   oldest: "Antigues primer"
@@ -1664,6 +1666,9 @@ _serverSettings:
   userGeneratedContentsVisibilityForVisitor_description2: "La publicació incondicional de tots els continguts del servidor a internet, incloent-hi els continguts remots rebuts pel servidor, comporta riscos. Això és extremadament important per els espectadors que desconeixen el caràcter descentralitzat dels continguts, ja que poden percebre erroneament els continguts remots com contingut generat per el propi servidor."
   restartServerSetupWizardConfirm_title: "Vols tornar a executar l'assistent de configuració inicial del servidor?"
   restartServerSetupWizardConfirm_text: "Algunes configuracions actuals seran restablertes."
+  entrancePageStyle: "Estil de la pàgina d'inici"
+  showTimelineForVisitor: "Mostrar la línia de temps"
+  showActivityiesForVisitor: "Mostrar les activitats"
   _userGeneratedContentsVisibilityForVisitor:
     all: "Tot obert al públic "
     localOnly: "Només es publiquen els continguts locals, el contingut remot es manté privat"
@@ -2273,6 +2278,7 @@ _time:
   minute: "Minut(s)"
   hour: "Hor(a)(es)"
   day: "Di(a)(es)"
+  month: "Mes(os)"
 _2fa:
   alreadyRegistered: "J has registrat un dispositiu d'autenticació de doble factor."
   registerTOTP: "Registrar una aplicació autenticadora"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 395540ea01..4a797e0fc2 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1054,6 +1054,7 @@ permissionDeniedError: "Operation denied"
 permissionDeniedErrorDescription: "This account does not have the permission to perform this action."
 preset: "Preset"
 selectFromPresets: "Choose from presets"
+custom: "Custom"
 achievements: "Achievements"
 gotInvalidResponseError: "Invalid server response"
 gotInvalidResponseErrorDescription: "The server may be unreachable or undergoing maintenance. Please try again later."
@@ -2273,6 +2274,7 @@ _time:
   minute: "Minute(s)"
   hour: "Hour(s)"
   day: "Day(s)"
+  month: "Month(s)"
 _2fa:
   alreadyRegistered: "You have already registered a 2-factor authentication device."
   registerTOTP: "Register authenticator app"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 81487c4d79..5d1b9dc924 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -1054,6 +1054,7 @@ permissionDeniedError: "Errore, attività non autorizzata"
 permissionDeniedErrorDescription: "Non si dispone dell'autorizzazione per eseguire questa operazione."
 preset: "Preimpostato"
 selectFromPresets: "Seleziona preimpostato"
+custom: "Personalizzato"
 achievements: "Conquiste"
 gotInvalidResponseError: "Risposta del server non valida"
 gotInvalidResponseErrorDescription: "Il server potrebbe essere irraggiungibile o in manutenzione. Riprova più tardi."
@@ -1375,6 +1376,7 @@ safeModeEnabled: "La modalità sicura è attiva"
 pluginsAreDisabledBecauseSafeMode: "Tutti i plugin sono disattivati, poiché la modalità sicura è attiva."
 customCssIsDisabledBecauseSafeMode: "Il CSS personalizzato non è stato applicato, poiché la modalità sicura è attiva."
 themeIsDefaultBecauseSafeMode: "Quando la modalità sicura è attiva, viene utilizzato il tema predefinito. Quando la modalità sicura viene disattivata, il tema torna a essere quello precedente."
+thankYouForTestingBeta: "Grazie per la tua collaborazione nella verifica delle versioni beta!"
 _order:
   newest: "Prima i più recenti"
   oldest: "Meno recenti prima"
@@ -1664,6 +1666,9 @@ _serverSettings:
   userGeneratedContentsVisibilityForVisitor_description2: "Esistono dei rischi nell'esporre incondizionatamente su internet tutto il contenuto del tuo server, incluso il contenuto remoto ricevuto da altri server. In particolare, occorre prestare attenzione, perché le persone non consapevoli della federazione potrebbero erroneamente credere che il contenuto remoto sia stato invece creato all'interno del proprio server."
   restartServerSetupWizardConfirm_title: "Vuoi ripetere la procedura guidata di configurazione iniziale del server?"
   restartServerSetupWizardConfirm_text: "Verranno ripristinate alcune tue impostazioni personalizzate."
+  entrancePageStyle: "Stile della pagina di ingresso"
+  showTimelineForVisitor: "Mostra la Timeline a visitatori non autenticati"
+  showActivityiesForVisitor: "Mostra le attività a visitatori non autenticati"
   _userGeneratedContentsVisibilityForVisitor:
     all: "Tutto pubblico"
     localOnly: "Pubblica solo contenuti locali, mantieni privati ​​i contenuti remoti"
@@ -2273,6 +2278,7 @@ _time:
   minute: "min"
   hour: "ore"
   day: "giorni"
+  month: "Mese"
 _2fa:
   alreadyRegistered: "La configurazione è stata già completata."
   registerTOTP: "Registra una App di autenticazione a due fattori (2FA/MFA)"
@@ -3231,7 +3237,7 @@ _imageEffector:
     zoomLinesThreshold: "Limite delle linee zoom"
     zoomLinesMaskSize: "Ampiezza del diametro"
     zoomLinesBlack: "Bande nere"
-drafts: "Bozza"
+drafts: "Bozze"
 _drafts:
   select: "Selezionare bozza"
   cannotCreateDraftAnymore: "Hai superato il numero massimo di bozze ammissibili."
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index ff9bb32788..382a506726 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1054,6 +1054,7 @@ permissionDeniedError: "작업이 거부되었습니다"
 permissionDeniedErrorDescription: "이 작업을 수행할 권한이 없습니다."
 preset: "프리셋"
 selectFromPresets: "프리셋에서 선택"
+custom: "커스텀"
 achievements: "도전 과제"
 gotInvalidResponseError: "서버의 응답이 올바르지 않습니다"
 gotInvalidResponseErrorDescription: " 서버가 다운되었거나 점검중일 가능성이 있습니다. 잠시후에 다시 시도해 주십시오."
@@ -1375,6 +1376,7 @@ safeModeEnabled: "세이프 모드가 활성화돼있습니다"
 pluginsAreDisabledBecauseSafeMode: "세이프 모드가 활성화돼있기에 플러그인은 전부 비활성화됩니다."
 customCssIsDisabledBecauseSafeMode: "세이프 모드가 활성화돼있기에 커스텀 CSS는 적용되지 않습니다."
 themeIsDefaultBecauseSafeMode: "세이프 모드가 활성화돼있는 동안에는 기본 테마가 사용됩니다. 세이프 모드를 끄면 원래대로 돌아옵니다."
+thankYouForTestingBeta: "베타 버전의 검증에 협력해 주셔서 감사합니다!"
 _order:
   newest: "최신 순"
   oldest: "오래된 순"
@@ -1664,6 +1666,9 @@ _serverSettings:
   userGeneratedContentsVisibilityForVisitor_description2: "서버에서 받은 리모트 콘텐츠를 포함해 서버 내의 모든 콘텐츠를 무조건 인터넷에 공개하는 것에는 위험이 따릅니다. 특히, 분산형 특성에 대해 모르는 열람자에게는 리모트 콘텐츠여도 서버 내에서 작성된 콘텐츠라고 잘못 인식할 수 있기에 주의가 필요합니다."
   restartServerSetupWizardConfirm_title: "서버의 초기 설정 위자드를 재시도하시겠습니까?"
   restartServerSetupWizardConfirm_text: "현재 일부 설정은 리셋됩니다."
+  entrancePageStyle: "입구 페이지의 스타일"
+  showTimelineForVisitor: "타임라인 표시"
+  showActivityiesForVisitor: "활동 표시"
   _userGeneratedContentsVisibilityForVisitor:
     all: "모두 공개"
     localOnly: "로컬 콘텐츠만 공개하고 리모트 콘텐츠는 비공개"
@@ -2273,6 +2278,7 @@ _time:
   minute: "분"
   hour: "시간"
   day: "일"
+  month: "개월"
 _2fa:
   alreadyRegistered: "이미 설정이 완료되었습니다."
   registerTOTP: "인증 앱 설정 시작"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index 7ed6a3dbdc..0835902642 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -1054,6 +1054,7 @@ permissionDeniedError: "การดำเนินถูกปฏิเสธ"
 permissionDeniedErrorDescription: "บัญชีนี้ไม่มีสิทธิ์อนุญาตในการดำเนินการนี้"
 preset: "พรีเซ็ต"
 selectFromPresets: "เลือกจากการพรีเซ็ต"
+custom: "แบบกำหนดเอง"
 achievements: "ความสำเร็จ"
 gotInvalidResponseError: "การตอบสนองเซิร์ฟเวอร์ไม่ถูกต้อง"
 gotInvalidResponseErrorDescription: "เซิร์ฟเวอร์อาจไม่สามารถเข้าถึงได้หรืออาจจะกำลังอยู่ในระหว่างปรับปรุง กรุณาลองใหม่อีกครั้งในภายหลังนะคะ"
@@ -1375,6 +1376,7 @@ safeModeEnabled: "โหมดปลอดภัยถูกเปิดใช
 pluginsAreDisabledBecauseSafeMode: "เนื่องจากโหมดปลอดภัยถูกเปิดใช้งาน ปลั๊กอินทั้งหมดจึงถูกปิดใช้งาน"
 customCssIsDisabledBecauseSafeMode: "เนื่องจากโหมดปลอดภัยถูกเปิดใช้งาน CSS แบบกำหนดเองจึงไม่ได้ถูกนำมาใช้"
 themeIsDefaultBecauseSafeMode: "ในระหว่างที่โหมดปลอดภัยถูกเปิดใช้งาน จะใช้ธีมเริ่มต้น เมื่อปิดโหมดปลอดภัยจะกลับคืนดังเดิม"
+thankYouForTestingBeta: "ขอบคุณที่ให้ความร่วมมือในการทดสอบเวอร์ชันเบต้า!"
 _order:
   newest: "เรียงจากใหม่ไปเก่า"
   oldest: "เรียงจากเก่าไปใหม่"
@@ -2273,6 +2275,7 @@ _time:
   minute: "นาที"
   hour: "ชั่วโมง"
   day: "วัน"
+  month: "เดือน"
 _2fa:
   alreadyRegistered: "คุณได้ลงทะเบียนอุปกรณ์ยืนยันตัวตนแบบ 2 ชั้นแล้ว"
   registerTOTP: "ลงทะเบียนแอพตัวตรวจสอบสิทธิ์"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index b095374e4d..7fbb907783 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1054,6 +1054,7 @@ permissionDeniedError: "操作被拒绝"
 permissionDeniedErrorDescription: "本账户没有执行该操作的权限。"
 preset: "预设值"
 selectFromPresets: "从预设值中选择"
+custom: "自定义"
 achievements: "成就"
 gotInvalidResponseError: "服务器无应答"
 gotInvalidResponseErrorDescription: "您的网络连接可能出现了问题, 或是远程服务器暂时不可用. 请稍后重试。"
@@ -1375,6 +1376,7 @@ safeModeEnabled: "已启用安全模式"
 pluginsAreDisabledBecauseSafeMode: "因启用了安全模式，所有插件均已被禁用。"
 customCssIsDisabledBecauseSafeMode: "因启用了安全模式，无法应用自定义 CSS。"
 themeIsDefaultBecauseSafeMode: "启用安全模式时将使用默认主题。关闭安全模式后将还原。"
+thankYouForTestingBeta: "感谢您协助测试 beta 版！"
 _order:
   newest: "从新到旧"
   oldest: "从旧到新"
@@ -1664,6 +1666,9 @@ _serverSettings:
   userGeneratedContentsVisibilityForVisitor_description2: "包含服务器接收到的远程内容在内，无条件将服务器上的所有内容公开在互联网上存在风险。特别是对去中心化的特性不是很了解的访问者有可能将远程服务器上的内容误认为是在此服务器内生成的，需要特别留意。"
   restartServerSetupWizardConfirm_title: "要重新开始服务器初始设定向导吗？"
   restartServerSetupWizardConfirm_text: "现有的部分设定将重置。"
+  entrancePageStyle: "入口页面样式"
+  showTimelineForVisitor: "显示时间线"
+  showActivityiesForVisitor: "显示活动"
   _userGeneratedContentsVisibilityForVisitor:
     all: "全部公开"
     localOnly: "仅公开本地内容，隐藏远程内容"
@@ -2273,6 +2278,7 @@ _time:
   minute: "分"
   hour: "小时"
   day: "日"
+  month: "个月"
 _2fa:
   alreadyRegistered: "此设备已被注册"
   registerTOTP: "开始设置验证器"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index b9f5f9a6c9..ead814b7bb 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1054,6 +1054,7 @@ permissionDeniedError: "操作被拒絕"
 permissionDeniedErrorDescription: "此帳戶沒有執行這個操作的權限。"
 preset: "預設值"
 selectFromPresets: "從預設值中選擇"
+custom: "自訂"
 achievements: "成就"
 gotInvalidResponseError: "伺服器的回應無效"
 gotInvalidResponseErrorDescription: "伺服器可能已關閉或者在維護中，請稍後再試。"
@@ -1375,6 +1376,7 @@ safeModeEnabled: "啟用安全模式"
 pluginsAreDisabledBecauseSafeMode: "由於啟用安全模式，所有的外掛都被停用。"
 customCssIsDisabledBecauseSafeMode: "由於啟用安全模式，所有的客製 CSS 都被停用。"
 themeIsDefaultBecauseSafeMode: "在安全模式啟用期間將使用預設主題。關閉安全模式後會恢復原本的設定。"
+thankYouForTestingBeta: "感謝您協助驗證 beta 版！"
 _order:
   newest: "最新的在前"
   oldest: "最舊的在前"
@@ -1664,6 +1666,9 @@ _serverSettings:
   userGeneratedContentsVisibilityForVisitor_description2: "包括伺服器接收到的遠端內容在內，無條件地將伺服器內所有內容公開到網際網路上是具有風險的。特別是對於不了解分散式架構特性的瀏覽者來說，他們可能會誤以為這些遠端內容是由該伺服器所創建的，因此需要特別留意。"
   restartServerSetupWizardConfirm_title: "要重新執行伺服器的初始設定精靈嗎？"
   restartServerSetupWizardConfirm_text: "當前的部分設定將會被重設。"
+  entrancePageStyle: "入口頁面的樣式"
+  showTimelineForVisitor: "顯示時間軸"
+  showActivityiesForVisitor: "顯示活動"
   _userGeneratedContentsVisibilityForVisitor:
     all: "全部公開\n"
     localOnly: "僅公開本地內容，遠端內容則不公開\n"
@@ -2273,6 +2278,7 @@ _time:
   minute: "分鐘"
   hour: "小時"
   day: "日"
+  month: "個月"
 _2fa:
   alreadyRegistered: "此裝置已被註冊過了"
   registerTOTP: "開始設定驗證應用程式"

From 8c433d27061267c71a58168e8062feba75b1d3b8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Wed, 20 Aug 2025 07:41:12 +0000
Subject: [PATCH 09/19] Bump version to 2025.8.0-beta.2

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

diff --git a/package.json b/package.json
index 5ab8c64ef1..85d3137563 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.8.0-beta.1",
+	"version": "2025.8.0-beta.2",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index c15c4146ce..73cc0851ba 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.8.0-beta.1",
+	"version": "2025.8.0-beta.2",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 7f6ba2e50128182258b92a8572700d14a05a9f8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 21 Aug 2025 16:52:30 +0900
Subject: [PATCH 10/19] =?UTF-8?q?enhance:=20verify-email=E3=81=AB=E3=83=95?=
 =?UTF-8?q?=E3=83=AD=E3=83=B3=E3=83=88=E3=82=A8=E3=83=B3=E3=83=89UI?=
 =?UTF-8?q?=E3=82=92=E5=AE=9F=E8=A3=85=20(#16431)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* enhance: メールのverifyをAPIに変更

* enhance(frontend): メールのVerifyページを追加

* fix

* :art:

* :art:

* Update Changelog

* lint
---
 CHANGELOG.md                                  |   1 +
 locales/index.d.ts                            |   2 +-
 locales/ja-JP.yml                             |   2 +-
 packages/backend/src/server/ServerService.ts  |  24 ----
 .../backend/src/server/api/endpoint-list.ts   |   1 +
 .../src/server/api/endpoints/verify-email.ts  |  66 ++++++++++
 packages/frontend/src/_boot_.ts               |   2 +-
 packages/frontend/src/components/MkButton.vue |   3 +-
 .../frontend/src/pages/signup-complete.vue    |   2 +-
 packages/frontend/src/pages/verify-email.vue  | 122 ++++++++++++++++++
 packages/frontend/src/router.definition.ts    |   3 +
 packages/misskey-js/etc/misskey-js.api.md     |   4 +
 .../misskey-js/src/autogen/apiClientJSDoc.ts  |  11 ++
 packages/misskey-js/src/autogen/endpoint.ts   |   2 +
 packages/misskey-js/src/autogen/entities.ts   |   1 +
 packages/misskey-js/src/autogen/types.ts      |  71 ++++++++++
 16 files changed, 288 insertions(+), 29 deletions(-)
 create mode 100644 packages/backend/src/server/api/endpoints/verify-email.ts
 create mode 100644 packages/frontend/src/pages/verify-email.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6875cdda23..02f07be69c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -44,6 +44,7 @@
 - Enhance: 画像エフェクトのパラメータ名の多言語対応
 - Enhance: 依存ソフトウェアの更新
 - Enhance: ノートを非表示にする相対期間を1ヶ月単位で自由に指定できるように
+- Enhance: メールアドレス確認画面のUIを改善
 - Fix: 投稿フォームでファイルのアップロードが中止または失敗した際のハンドリングを修正
 - Fix: 一部の設定検索結果が存在しないパスになる問題を修正  
   (Cherry-picked from https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1171)
diff --git a/locales/index.d.ts b/locales/index.d.ts
index eefd8a5ecb..c31a3f4e83 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -5001,7 +5001,7 @@ export interface Locale extends ILocale {
     /**
      * メールアドレスの確認中に問題が発生しました。リンクの有効期限が切れている可能性があります。
      */
-    "signupPendingError": string;
+    "emailVerificationFailedError": string;
     /**
      * 「内容を隠す」がオンの場合は注釈の記述が必要です。
      */
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index d04445282a..522f53ce4d 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1245,7 +1245,7 @@ releaseToRefresh: "離してリロード"
 refreshing: "リロード中"
 pullDownToRefresh: "引っ張ってリロード"
 useGroupedNotifications: "通知をグルーピング"
-signupPendingError: "メールアドレスの確認中に問題が発生しました。リンクの有効期限が切れている可能性があります。"
+emailVerificationFailedError: "メールアドレスの確認中に問題が発生しました。リンクの有効期限が切れている可能性があります。"
 cwNotationRequired: "「内容を隠す」がオンの場合は注釈の記述が必要です。"
 doReaction: "リアクションする"
 code: "コード"
diff --git a/packages/backend/src/server/ServerService.ts b/packages/backend/src/server/ServerService.ts
index 23c085ee27..7325c53df0 100644
--- a/packages/backend/src/server/ServerService.ts
+++ b/packages/backend/src/server/ServerService.ts
@@ -238,30 +238,6 @@ export class ServerService implements OnApplicationShutdown {
 			}
 		});
 
-		fastify.get<{ Params: { code: string } }>('/verify-email/:code', async (request, reply) => {
-			const profile = await this.userProfilesRepository.findOneBy({
-				emailVerifyCode: request.params.code,
-			});
-
-			if (profile != null) {
-				await this.userProfilesRepository.update({ userId: profile.userId }, {
-					emailVerified: true,
-					emailVerifyCode: null,
-				});
-
-				this.globalEventService.publishMainStream(profile.userId, 'meUpdated', await this.userEntityService.pack(profile.userId, { id: profile.userId }, {
-					schema: 'MeDetailed',
-					includeSecrets: true,
-				}));
-
-				reply.code(200).send('Verification succeeded! メールアドレスの認証に成功しました。');
-				return;
-			} else {
-				reply.code(404).send('Verification failed. Please try again. メールアドレスの認証に失敗しました。もう一度お試しください');
-				return;
-			}
-		});
-
 		fastify.register(this.clientServerService.createServer);
 
 		this.streamingApiServerService.attach(fastify.server);
diff --git a/packages/backend/src/server/api/endpoint-list.ts b/packages/backend/src/server/api/endpoint-list.ts
index c0c43dd5c9..f4aa07875d 100644
--- a/packages/backend/src/server/api/endpoint-list.ts
+++ b/packages/backend/src/server/api/endpoint-list.ts
@@ -412,6 +412,7 @@ export * as 'users/search' from './endpoints/users/search.js';
 export * as 'users/search-by-username-and-host' from './endpoints/users/search-by-username-and-host.js';
 export * as 'users/show' from './endpoints/users/show.js';
 export * as 'users/update-memo' from './endpoints/users/update-memo.js';
+export * as 'verify-email' from './endpoints/verify-email.js';
 export * as 'chat/messages/create-to-user' from './endpoints/chat/messages/create-to-user.js';
 export * as 'chat/messages/create-to-room' from './endpoints/chat/messages/create-to-room.js';
 export * as 'chat/messages/delete' from './endpoints/chat/messages/delete.js';
diff --git a/packages/backend/src/server/api/endpoints/verify-email.ts b/packages/backend/src/server/api/endpoints/verify-email.ts
new file mode 100644
index 0000000000..e069ed59f2
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/verify-email.ts
@@ -0,0 +1,66 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { Inject, Injectable } from '@nestjs/common';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import type { UserProfilesRepository } from '@/models/_.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { DI } from '@/di-symbols.js';
+import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { ApiError } from '../error.js';
+
+export const meta = {
+	requireCredential: false,
+
+	tags: ['account'],
+
+	errors: {
+		noSuchCode: {
+			message: 'No such code.',
+			code: 'NO_SUCH_CODE',
+			id: '97c1f576-e4b8-4b8a-a6dc-9cb65e7f6f85',
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		code: { type: 'string' },
+	},
+	required: ['code'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-disable-line import/no-default-export
+	constructor(
+		@Inject(DI.userProfilesRepository)
+		private userProfilesRepository: UserProfilesRepository,
+
+		private userEntityService: UserEntityService,
+		private globalEventService: GlobalEventService,
+	) {
+		super(meta, paramDef, async (ps) => {
+			const profile = await this.userProfilesRepository.findOneBy({
+				emailVerifyCode: ps.code,
+			});
+
+			if (profile == null) {
+				throw new ApiError(meta.errors.noSuchCode);
+			}
+
+			await this.userProfilesRepository.update({ userId: profile.userId }, {
+				emailVerified: true,
+				emailVerifyCode: null,
+			});
+
+			this.globalEventService.publishMainStream(profile.userId, 'meUpdated', await this.userEntityService.pack(profile.userId, { id: profile.userId }, {
+				schema: 'MeDetailed',
+				includeSecrets: true,
+			}));
+		});
+	}
+}
+
diff --git a/packages/frontend/src/_boot_.ts b/packages/frontend/src/_boot_.ts
index 354fb95544..111a4abbfd 100644
--- a/packages/frontend/src/_boot_.ts
+++ b/packages/frontend/src/_boot_.ts
@@ -16,7 +16,7 @@ import '@/style.scss';
 import { mainBoot } from '@/boot/main-boot.js';
 import { subBoot } from '@/boot/sub-boot.js';
 
-const subBootPaths = ['/share', '/auth', '/miauth', '/oauth', '/signup-complete', '/install-extensions'];
+const subBootPaths = ['/share', '/auth', '/miauth', '/oauth', '/signup-complete', '/verify-email', '/install-extensions'];
 
 if (subBootPaths.some(i => window.location.pathname === i || window.location.pathname.startsWith(i + '/'))) {
 	subBoot();
diff --git a/packages/frontend/src/components/MkButton.vue b/packages/frontend/src/components/MkButton.vue
index a77ebd6ac5..b729128a21 100644
--- a/packages/frontend/src/components/MkButton.vue
+++ b/packages/frontend/src/components/MkButton.vue
@@ -36,6 +36,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { nextTick, onMounted, useTemplateRef } from 'vue';
+import type { MkABehavior } from '@/components/global/MkA.vue';
 
 const props = defineProps<{
 	type?: 'button' | 'submit' | 'reset';
@@ -45,7 +46,7 @@ const props = defineProps<{
 	inline?: boolean;
 	link?: boolean;
 	to?: string;
-	linkBehavior?: null | 'window' | 'browser';
+	linkBehavior?: MkABehavior;
 	autofocus?: boolean;
 	wait?: boolean;
 	danger?: boolean;
diff --git a/packages/frontend/src/pages/signup-complete.vue b/packages/frontend/src/pages/signup-complete.vue
index 15954ccc82..8a907c9066 100644
--- a/packages/frontend/src/pages/signup-complete.vue
+++ b/packages/frontend/src/pages/signup-complete.vue
@@ -51,7 +51,7 @@ function submit() {
 		os.alert({
 			type: 'error',
 			title: i18n.ts.somethingHappened,
-			text: i18n.ts.signupPendingError,
+			text: i18n.ts.emailVerificationFailedError,
 		});
 	});
 }
diff --git a/packages/frontend/src/pages/verify-email.vue b/packages/frontend/src/pages/verify-email.vue
new file mode 100644
index 0000000000..daf3a0c4c6
--- /dev/null
+++ b/packages/frontend/src/pages/verify-email.vue
@@ -0,0 +1,122 @@
+<!--
+SPDX-FileCopyrightText: syuilo and misskey-project
+SPDX-License-Identifier: AGPL-3.0-only
+-->
+
+<template>
+<PageWithAnimBg>
+	<div :class="$style.formContainer">
+		<form :class="$style.form" class="_panel" @submit.prevent="submit()">
+			<div :class="$style.banner">
+				<i class="ti ti-mail-check"></i>
+			</div>
+			<Transition
+				mode="out-in"
+				:enterActiveClass="$style.transition_enterActive"
+				:leaveActiveClass="$style.transition_leaveActive"
+				:enterFromClass="$style.transition_enterFrom"
+				:leaveToClass="$style.transition_leaveTo"
+			>
+				<div v-if="!succeeded" key="input" class="_gaps_m" style="padding: 32px;">
+					<div :class="$style.mainText">{{ i18n.tsx.clickToFinishEmailVerification({ ok: i18n.ts.gotIt }) }}</div>
+					<div>
+						<MkButton gradate large rounded type="submit" :disabled="submitting" style="margin: 0 auto;">
+							{{ submitting ? i18n.ts.processing : i18n.ts.gotIt }}<MkEllipsis v-if="submitting"/>
+						</MkButton>
+					</div>
+				</div>
+				<div v-else key="success" class="_gaps_m" style="padding: 32px;">
+					<div :class="$style.mainText">{{ i18n.ts.emailVerified }}</div>
+					<div>
+						<MkButton large rounded link to="/" linkBehavior="browser" style="margin: 0 auto;">
+							{{ i18n.ts.goToMisskey }}
+						</MkButton>
+					</div>
+				</div>
+			</Transition>
+		</form>
+	</div>
+</PageWithAnimBg>
+</template>
+
+<script lang="ts" setup>
+import { ref } from 'vue';
+import MkButton from '@/components/MkButton.vue';
+import { i18n } from '@/i18n.js';
+import * as os from '@/os.js';
+import { misskeyApi } from '@/utility/misskey-api.js';
+
+const submitting = ref(false);
+const succeeded = ref(false);
+
+const props = defineProps<{
+	code: string;
+}>();
+
+function submit() {
+	if (submitting.value) return;
+	submitting.value = true;
+
+	misskeyApi('verify-email', {
+		code: props.code,
+	}).then(() => {
+		succeeded.value = true;
+		submitting.value = false;
+	}).catch(() => {
+		submitting.value = false;
+
+		os.alert({
+			type: 'error',
+			title: i18n.ts.somethingHappened,
+			text: i18n.ts.emailVerificationFailedError,
+		});
+	});
+}
+</script>
+
+<style lang="scss" module>
+.transition_enterActive,
+.transition_leaveActive {
+	transition: opacity 0.3s cubic-bezier(0,0,.35,1), transform 0.3s cubic-bezier(0,0,.35,1);
+}
+.transition_enterFrom {
+	opacity: 0;
+	transform: translateX(50px);
+}
+.transition_leaveTo {
+	opacity: 0;
+	transform: translateX(-50px);
+}
+
+.formContainer {
+	min-height: 100svh;
+	padding: 32px 32px 64px 32px;
+	box-sizing: border-box;
+	display: flex;
+	align-items: center;
+}
+
+.form {
+	position: relative;
+	display: block;
+	margin: 0 auto;
+	z-index: 10;
+	border-radius: var(--MI-radius);
+	box-shadow: 0 8px 16px rgba(0, 0, 0, 0.1);
+	overflow: clip;
+	width: 100%;
+	max-width: 500px;
+}
+
+.banner {
+	padding: 16px;
+	text-align: center;
+	font-size: 26px;
+	background-color: var(--MI_THEME-accentedBg);
+	color: var(--MI_THEME-accent);
+}
+
+.mainText {
+	text-align: center;
+}
+</style>
diff --git a/packages/frontend/src/router.definition.ts b/packages/frontend/src/router.definition.ts
index 57d9a860d6..e25e0fe161 100644
--- a/packages/frontend/src/router.definition.ts
+++ b/packages/frontend/src/router.definition.ts
@@ -202,6 +202,9 @@ export const ROUTE_DEF = [{
 }, {
 	path: '/signup-complete/:code',
 	component: page(() => import('@/pages/signup-complete.vue')),
+}, {
+	path: '/verify-email/:code',
+	component: page(() => import('@/pages/verify-email.vue')),
 }, {
 	path: '/announcements',
 	component: page(() => import('@/pages/announcements.vue')),
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index ae12547f35..0416e46cdc 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -2129,6 +2129,7 @@ declare namespace entities {
         UsersUpdateMemoRequest,
         V2AdminEmojiListRequest,
         V2AdminEmojiListResponse,
+        VerifyEmailRequest,
         Error_2 as Error,
         UserLite,
         UserDetailedNotMeOnly,
@@ -3807,6 +3808,9 @@ type V2AdminEmojiListRequest = operations['v2___admin___emoji___list']['requestB
 // @public (undocumented)
 type V2AdminEmojiListResponse = operations['v2___admin___emoji___list']['responses']['200']['content']['application/json'];
 
+// @public (undocumented)
+type VerifyEmailRequest = operations['verify-email']['requestBody']['content']['application/json'];
+
 // Warnings were encountered during analysis:
 //
 // src/entities.ts:55:2 - (ae-forgotten-export) The symbol "ModerationLogPayloads" needs to be exported by the entry point index.d.ts
diff --git a/packages/misskey-js/src/autogen/apiClientJSDoc.ts b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
index 5407b7a653..c4428efcc2 100644
--- a/packages/misskey-js/src/autogen/apiClientJSDoc.ts
+++ b/packages/misskey-js/src/autogen/apiClientJSDoc.ts
@@ -4762,5 +4762,16 @@ declare module '../api.js' {
       params: P,
       credential?: string | null,
     ): Promise<SwitchCaseResponseType<E, P>>;
+
+    /**
+     * No description provided.
+     * 
+     * **Credential required**: *No*
+     */
+    request<E extends 'verify-email', P extends Endpoints[E]['req']>(
+      endpoint: E,
+      params: P,
+      credential?: string | null,
+    ): Promise<SwitchCaseResponseType<E, P>>;
   }
 }
diff --git a/packages/misskey-js/src/autogen/endpoint.ts b/packages/misskey-js/src/autogen/endpoint.ts
index d7cb2a46eb..5e9fc936b5 100644
--- a/packages/misskey-js/src/autogen/endpoint.ts
+++ b/packages/misskey-js/src/autogen/endpoint.ts
@@ -652,6 +652,7 @@ import type {
 	UsersUpdateMemoRequest,
 	V2AdminEmojiListRequest,
 	V2AdminEmojiListResponse,
+	VerifyEmailRequest,
 } from './entities.js';
 
 export type Endpoints = {
@@ -1083,6 +1084,7 @@ export type Endpoints = {
 	'users/show': { req: UsersShowRequest; res: UsersShowResponse };
 	'users/update-memo': { req: UsersUpdateMemoRequest; res: EmptyResponse };
 	'v2/admin/emoji/list': { req: V2AdminEmojiListRequest; res: V2AdminEmojiListResponse };
+	'verify-email': { req: VerifyEmailRequest; res: EmptyResponse };
 };
 
 /**
diff --git a/packages/misskey-js/src/autogen/entities.ts b/packages/misskey-js/src/autogen/entities.ts
index a14febb6e6..73e460c50a 100644
--- a/packages/misskey-js/src/autogen/entities.ts
+++ b/packages/misskey-js/src/autogen/entities.ts
@@ -655,3 +655,4 @@ export type UsersShowResponse = operations['users___show']['responses']['200']['
 export type UsersUpdateMemoRequest = operations['users___update-memo']['requestBody']['content']['application/json'];
 export type V2AdminEmojiListRequest = operations['v2___admin___emoji___list']['requestBody']['content']['application/json'];
 export type V2AdminEmojiListResponse = operations['v2___admin___emoji___list']['responses']['200']['content']['application/json'];
+export type VerifyEmailRequest = operations['verify-email']['requestBody']['content']['application/json'];
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 05ac143762..472b2f9c9e 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -3906,6 +3906,15 @@ export type paths = {
          */
         post: operations['v2___admin___emoji___list'];
     };
+    '/verify-email': {
+        /**
+         * verify-email
+         * @description No description provided.
+         *
+         *     **Credential required**: *No*
+         */
+        post: operations['verify-email'];
+    };
 };
 export type webhooks = Record<string, never>;
 export type components = {
@@ -36387,5 +36396,67 @@ export interface operations {
             };
         };
     };
+    'verify-email': {
+        requestBody: {
+            content: {
+                'application/json': {
+                    code: string;
+                };
+            };
+        };
+        responses: {
+            /** @description OK (without any results) */
+            204: {
+                headers: {
+                    [name: string]: unknown;
+                };
+            };
+            /** @description Client error */
+            400: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    'application/json': components['schemas']['Error'];
+                };
+            };
+            /** @description Authentication error */
+            401: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    'application/json': components['schemas']['Error'];
+                };
+            };
+            /** @description Forbidden error */
+            403: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    'application/json': components['schemas']['Error'];
+                };
+            };
+            /** @description I'm Ai */
+            418: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    'application/json': components['schemas']['Error'];
+                };
+            };
+            /** @description Internal server error */
+            500: {
+                headers: {
+                    [name: string]: unknown;
+                };
+                content: {
+                    'application/json': components['schemas']['Error'];
+                };
+            };
+        };
+    };
 }
 

From 1eabb21d69fc365970a03eabde20d54d05966f64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Thu, 21 Aug 2025 19:02:21 +0900
Subject: [PATCH 11/19] =?UTF-8?q?fix(backend):=20=E3=82=AF=E3=83=AA?=
 =?UTF-8?q?=E3=83=83=E3=83=97=E4=B8=80=E8=A6=A7API=E3=82=92=E3=83=9A?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=8D=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3?=
 =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=95=E3=81=9B=E3=82=8B=20(#1643?=
 =?UTF-8?q?4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(backend): クリップ一覧APIをページネーションに対応させる

* Update Changelog
---
 CHANGELOG.md                                    |  1 +
 .../src/server/api/endpoints/clips/list.ts      | 17 +++++++++++++----
 packages/misskey-js/etc/misskey-js.api.md       |  4 ++++
 packages/misskey-js/src/autogen/endpoint.ts     |  3 ++-
 packages/misskey-js/src/autogen/entities.ts     |  1 +
 packages/misskey-js/src/autogen/types.ts        | 14 ++++++++++++++
 6 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 02f07be69c..f9b250a1a7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -62,6 +62,7 @@
 - Enhance: ノートの削除処理の効率化
 - Enhance: 全体的なパフォーマンスの向上
 - Enhance: 依存ソフトウェアの更新
+- Enhance: `clips/list` APIがページネーションに対応しました
 - Fix: SystemWebhook設定でsecretを空に出来ない問題を修正
 
 
diff --git a/packages/backend/src/server/api/endpoints/clips/list.ts b/packages/backend/src/server/api/endpoints/clips/list.ts
index 2e4a3ff820..af20ea9f8d 100644
--- a/packages/backend/src/server/api/endpoints/clips/list.ts
+++ b/packages/backend/src/server/api/endpoints/clips/list.ts
@@ -5,6 +5,7 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { Endpoint } from '@/server/api/endpoint-base.js';
+import { QueryService } from '@/core/QueryService.js';
 import type { ClipsRepository } from '@/models/_.js';
 import { ClipEntityService } from '@/core/entities/ClipEntityService.js';
 import { DI } from '@/di-symbols.js';
@@ -29,7 +30,13 @@ export const meta = {
 
 export const paramDef = {
 	type: 'object',
-	properties: {},
+	properties: {
+		limit: { type: 'integer', minimum: 1, maximum: 100, default: 10 },
+		sinceId: { type: 'string', format: 'misskey:id' },
+		untilId: { type: 'string', format: 'misskey:id' },
+		sinceDate: { type: 'integer' },
+		untilDate: { type: 'integer' },
+	},
 	required: [],
 } as const;
 
@@ -39,12 +46,14 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 		@Inject(DI.clipsRepository)
 		private clipsRepository: ClipsRepository,
 
+		private queryService: QueryService,
 		private clipEntityService: ClipEntityService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			const clips = await this.clipsRepository.findBy({
-				userId: me.id,
-			});
+			const query = this.queryService.makePaginationQuery(this.clipsRepository.createQueryBuilder('clip'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
+				.andWhere('clip.userId = :userId', { userId: me.id });
+
+			const clips = await query.limit(ps.limit).getMany();
 
 			return await this.clipEntityService.packMany(clips, me);
 		});
diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index 0416e46cdc..170c20f163 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -1196,6 +1196,9 @@ type ClipsDeleteRequest = operations['clips___delete']['requestBody']['content']
 // @public (undocumented)
 type ClipsFavoriteRequest = operations['clips___favorite']['requestBody']['content']['application/json'];
 
+// @public (undocumented)
+type ClipsListRequest = operations['clips___list']['requestBody']['content']['application/json'];
+
 // @public (undocumented)
 type ClipsListResponse = operations['clips___list']['responses']['200']['content']['application/json'];
 
@@ -1741,6 +1744,7 @@ declare namespace entities {
         ClipsCreateResponse,
         ClipsDeleteRequest,
         ClipsFavoriteRequest,
+        ClipsListRequest,
         ClipsListResponse,
         ClipsMyFavoritesResponse,
         ClipsNotesRequest,
diff --git a/packages/misskey-js/src/autogen/endpoint.ts b/packages/misskey-js/src/autogen/endpoint.ts
index 5e9fc936b5..4b83a9dd9b 100644
--- a/packages/misskey-js/src/autogen/endpoint.ts
+++ b/packages/misskey-js/src/autogen/endpoint.ts
@@ -264,6 +264,7 @@ import type {
 	ClipsCreateResponse,
 	ClipsDeleteRequest,
 	ClipsFavoriteRequest,
+	ClipsListRequest,
 	ClipsListResponse,
 	ClipsMyFavoritesResponse,
 	ClipsNotesRequest,
@@ -830,7 +831,7 @@ export type Endpoints = {
 	'clips/create': { req: ClipsCreateRequest; res: ClipsCreateResponse };
 	'clips/delete': { req: ClipsDeleteRequest; res: EmptyResponse };
 	'clips/favorite': { req: ClipsFavoriteRequest; res: EmptyResponse };
-	'clips/list': { req: EmptyRequest; res: ClipsListResponse };
+	'clips/list': { req: ClipsListRequest; res: ClipsListResponse };
 	'clips/my-favorites': { req: EmptyRequest; res: ClipsMyFavoritesResponse };
 	'clips/notes': { req: ClipsNotesRequest; res: ClipsNotesResponse };
 	'clips/remove-note': { req: ClipsRemoveNoteRequest; res: EmptyResponse };
diff --git a/packages/misskey-js/src/autogen/entities.ts b/packages/misskey-js/src/autogen/entities.ts
index 73e460c50a..4ebe9a5155 100644
--- a/packages/misskey-js/src/autogen/entities.ts
+++ b/packages/misskey-js/src/autogen/entities.ts
@@ -267,6 +267,7 @@ export type ClipsCreateRequest = operations['clips___create']['requestBody']['co
 export type ClipsCreateResponse = operations['clips___create']['responses']['200']['content']['application/json'];
 export type ClipsDeleteRequest = operations['clips___delete']['requestBody']['content']['application/json'];
 export type ClipsFavoriteRequest = operations['clips___favorite']['requestBody']['content']['application/json'];
+export type ClipsListRequest = operations['clips___list']['requestBody']['content']['application/json'];
 export type ClipsListResponse = operations['clips___list']['responses']['200']['content']['application/json'];
 export type ClipsMyFavoritesResponse = operations['clips___my-favorites']['responses']['200']['content']['application/json'];
 export type ClipsNotesRequest = operations['clips___notes']['requestBody']['content']['application/json'];
diff --git a/packages/misskey-js/src/autogen/types.ts b/packages/misskey-js/src/autogen/types.ts
index 472b2f9c9e..3525d082d5 100644
--- a/packages/misskey-js/src/autogen/types.ts
+++ b/packages/misskey-js/src/autogen/types.ts
@@ -18263,6 +18263,20 @@ export interface operations {
         };
     };
     clips___list: {
+        requestBody: {
+            content: {
+                'application/json': {
+                    /** @default 10 */
+                    limit?: number;
+                    /** Format: misskey:id */
+                    sinceId?: string;
+                    /** Format: misskey:id */
+                    untilId?: string;
+                    sinceDate?: number;
+                    untilDate?: number;
+                };
+            };
+        };
         responses: {
             /** @description OK (with results) */
             200: {

From 8cbbb80e3f08f94f7235d40bd7ae4d4c6781011e Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Thu, 21 Aug 2025 19:10:16 +0900
Subject: [PATCH 12/19] =?UTF-8?q?fix(backend):=20`notes/mentions`=20?=
 =?UTF-8?q?=E3=81=A7=E5=A0=B4=E5=90=88=E3=81=AB=E3=82=88=E3=81=A3=E3=81=A6?=
 =?UTF-8?q?=E3=81=AF=E4=B8=A6=E3=81=B3=E9=A0=86=E3=81=8C=E6=AD=A3=E3=81=97?=
 =?UTF-8?q?=E3=81=8F=E8=BF=94=E3=81=95=E3=82=8C=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 #16398
---
 CHANGELOG.md                                                | 1 +
 packages/backend/src/server/api/endpoints/notes/mentions.ts | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9b250a1a7..59c3e7481b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@
 - Enhance: 全体的なパフォーマンスの向上
 - Enhance: 依存ソフトウェアの更新
 - Enhance: `clips/list` APIがページネーションに対応しました
+- Fix: `notes/mentions` で場合によっては並び順が正しく返されない問題を修正
 - Fix: SystemWebhook設定でsecretを空に出来ない問題を修正
 
 
diff --git a/packages/backend/src/server/api/endpoints/notes/mentions.ts b/packages/backend/src/server/api/endpoints/notes/mentions.ts
index 05ffdc1f97..e775bdb7fd 100644
--- a/packages/backend/src/server/api/endpoints/notes/mentions.ts
+++ b/packages/backend/src/server/api/endpoints/notes/mentions.ts
@@ -66,7 +66,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
 						.orWhere(':meIdAsList <@ note.visibleUserIds');
 				}))
 				// Avoid scanning primary key index
-				.orderBy('CONCAT(note.id)', 'DESC')
+				.orderBy('CONCAT(note.id)', (ps.sinceDate || ps.sinceId) ? 'ASC' : 'DESC')
 				.innerJoinAndSelect('note.user', 'user')
 				.leftJoinAndSelect('note.reply', 'reply')
 				.leftJoinAndSelect('note.renote', 'renote')

From 20d81696e1facad04eca01b616a674c87ade3aed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 22 Aug 2025 18:26:19 +0900
Subject: [PATCH 13/19] fix(backend): fix test (#16441)

* fix(backend): fix test

* fix

* fix
---
 packages/backend/test/e2e/clips.ts | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/packages/backend/test/e2e/clips.ts b/packages/backend/test/e2e/clips.ts
index 570cc61c4b..fe9a217ee8 100644
--- a/packages/backend/test/e2e/clips.ts
+++ b/packages/backend/test/e2e/clips.ts
@@ -363,14 +363,11 @@ describe('クリップ', () => {
 		const clipLimit = DEFAULT_POLICIES.clipLimit;
 		const clips = await createMany({}, clipLimit);
 		const res = await list({
-			parameters: { limit: 1 }, // FIXME: 無視されて11全部返ってくる
+			parameters: { limit: clips.length },
 		});
 
-		// 返ってくる配列には順序保障がないのでidでソートして厳密比較
-		assert.deepStrictEqual(
-			res.sort(compareBy(s => s.id)),
-			clips.sort(compareBy(s => s.id)),
-		);
+		// 作成responseの配列には順序保障がないのでidでソートして厳密比較
+		assert.deepStrictEqual(res.toReversed(), clips.sort(compareBy(s => s.id)));
 	});
 
 	test('の一覧が取得できる(空)', async () => {

From 4d215bde1052d952a01b8ab7584d5e05f4ea10f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 22 Aug 2025 19:31:27 +0900
Subject: [PATCH 14/19] fix(frontend): follow-up of #16380

---
 packages/frontend-shared/js/const.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend-shared/js/const.ts b/packages/frontend-shared/js/const.ts
index 5c33c38f44..b2d83fff8b 100644
--- a/packages/frontend-shared/js/const.ts
+++ b/packages/frontend-shared/js/const.ts
@@ -88,6 +88,7 @@ export const ROLE_POLICIES = [
 	'canManageCustomEmojis',
 	'canManageAvatarDecorations',
 	'canSearchNotes',
+	'canSearchUsers',
 	'canUseTranslator',
 	'canHideAds',
 	'driveCapacityMb',

From ade603ff7a6e2985a236949ed3d737ddab095aa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=A3=E3=81=93=E3=81=8B=E3=82=8A?=
 <67428053+kakkokari-gtyih@users.noreply.github.com>
Date: Fri, 22 Aug 2025 19:34:20 +0900
Subject: [PATCH 15/19] =?UTF-8?q?fix(frontend):=20=E3=83=9A=E3=83=BC?=
 =?UTF-8?q?=E3=82=B8=E3=83=8D=E3=83=BC=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=AE?=
 =?UTF-8?q?=E9=80=B2=E8=A1=8C=E6=96=B9=E5=90=91=E3=82=92=E6=8C=87=E5=AE=9A?=
 =?UTF-8?q?=E3=81=A7=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=20(#1643?=
 =?UTF-8?q?3)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(frontend): ページネーションの進行方向を指定できるように

* Update Changelog

* fix lint

* fix: directionをMkPaginationに移動

* fix

* fix

* fix

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
---
 CHANGELOG.md                                  |  1 +
 .../src/components/MkNotesTimeline.vue        |  5 +-
 .../frontend/src/components/MkPagination.vue  | 51 ++++++++++++++++---
 packages/frontend/src/pages/note.vue          |  4 +-
 packages/frontend/src/utility/paginator.ts    | 44 ++++++++++++----
 5 files changed, 86 insertions(+), 19 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59c3e7481b..c6d674b4f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -53,6 +53,7 @@
 - Fix: カラムの名前が正しくリスト/チャンネルの名前にならない問題を修正
 - Fix: 複数のメンションを1行に記述した場合に、サジェストが正しく表示されない問題を修正
 - Fix: メンションとしての条件を満たしていても、特定の条件(`-`が含まれる場合など)で正しくサジェストされない問題を一部修正
+- Fix: ユーザーの前後ノートを閲覧する機能が壊れている問題を修正
 
 ### Server
 - Feat: サーバー管理コマンド
diff --git a/packages/frontend/src/components/MkNotesTimeline.vue b/packages/frontend/src/components/MkNotesTimeline.vue
index 42d44dffdb..d94cf3924c 100644
--- a/packages/frontend/src/components/MkNotesTimeline.vue
+++ b/packages/frontend/src/components/MkNotesTimeline.vue
@@ -4,7 +4,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 -->
 
 <template>
-<MkPagination :paginator="paginator" :autoLoad="autoLoad" :pullToRefresh="pullToRefresh" :withControl="withControl">
+<MkPagination :paginator="paginator" :direction="direction" :autoLoad="autoLoad" :pullToRefresh="pullToRefresh" :withControl="withControl">
 	<template #empty><MkResult type="empty" :text="i18n.ts.noNotes"/></template>
 
 	<template #default="{ items: notes }">
@@ -50,11 +50,14 @@ import { isSeparatorNeeded, getSeparatorInfo } from '@/utility/timeline-date-sep
 const props = withDefaults(defineProps<{
 	paginator: T;
 	noGap?: boolean;
+
+	direction?: 'up' | 'down' | 'both';
 	autoLoad?: boolean;
 	pullToRefresh?: boolean;
 	withControl?: boolean;
 }>(), {
 	autoLoad: true,
+	direction: 'down',
 	pullToRefresh: true,
 	withControl: true,
 });
diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 8ca1c80e84..4ea62f2812 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -25,15 +25,15 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</div>
 
 			<div v-else key="_root_" class="_gaps">
-				<slot :items="unref(paginator.items)" :fetching="paginator.fetching.value || paginator.fetchingOlder.value"></slot>
-				<div v-if="paginator.order.value === 'oldest'">
-					<MkButton v-if="!paginator.fetchingNewer.value" :class="$style.more" :wait="paginator.fetchingNewer.value" primary rounded @click="paginator.fetchNewer()">
+				<div v-if="direction === 'up' || direction === 'both'" v-show="upButtonVisible">
+					<MkButton v-if="!upButtonLoading" :class="$style.more" primary rounded @click="upButtonClick">
 						{{ i18n.ts.loadMore }}
 					</MkButton>
 					<MkLoading v-else/>
 				</div>
-				<div v-else v-show="paginator.canFetchOlder.value">
-					<MkButton v-if="!paginator.fetchingOlder.value" :class="$style.more" :wait="paginator.fetchingOlder.value" primary rounded @click="paginator.fetchOlder()">
+				<slot :items="unref(paginator.items)" :fetching="paginator.fetching.value || paginator.fetchingOlder.value"></slot>
+				<div v-if="direction === 'down' || direction === 'both'" v-show="downButtonVisible">
+					<MkButton v-if="!downButtonLoading" :class="$style.more" primary rounded @click="downButtonClick">
 						{{ i18n.ts.loadMore }}
 					</MkButton>
 					<MkLoading v-else/>
@@ -46,7 +46,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup generic="T extends IPaginator">
 import { isLink } from '@@/js/is-link.js';
-import { onMounted, watch, unref } from 'vue';
+import { onMounted, computed, watch, unref } from 'vue';
 import type { UnwrapRef } from 'vue';
 import type { IPaginator } from '@/utility/paginator.js';
 import MkButton from '@/components/MkButton.vue';
@@ -58,11 +58,20 @@ import * as os from '@/os.js';
 
 const props = withDefaults(defineProps<{
 	paginator: T;
+
+	// ページネーションを進める方向
+	// up: 上方向
+	// down: 下方向 (default)
+	// both: 双方向
+	// NOTE: この方向はページネーションの方向であって、アイテムの並び順ではない
+	direction?: 'up' | 'down' | 'both';
+
 	autoLoad?: boolean;
 	pullToRefresh?: boolean;
 	withControl?: boolean;
 }>(), {
 	autoLoad: true,
+	direction: 'down',
 	pullToRefresh: true,
 	withControl: false,
 });
@@ -93,6 +102,36 @@ if (props.paginator.computedParams) {
 	}, { immediate: false, deep: true });
 }
 
+const upButtonVisible = computed(() => {
+	return props.paginator.order.value === 'oldest' ? props.paginator.canFetchOlder.value : props.paginator.canFetchNewer.value;
+});
+const upButtonLoading = computed(() => {
+	return props.paginator.order.value === 'oldest' ? props.paginator.fetchingOlder.value : props.paginator.fetchingNewer.value;
+});
+
+function upButtonClick() {
+	if (props.paginator.order.value === 'oldest') {
+		props.paginator.fetchOlder();
+	} else {
+		props.paginator.fetchNewer();
+	}
+}
+
+const downButtonVisible = computed(() => {
+	return props.paginator.order.value === 'oldest' ? props.paginator.canFetchNewer.value : props.paginator.canFetchOlder.value;
+});
+const downButtonLoading = computed(() => {
+	return props.paginator.order.value === 'oldest' ? props.paginator.fetchingNewer.value : props.paginator.fetchingOlder.value;
+});
+
+function downButtonClick() {
+	if (props.paginator.order.value === 'oldest') {
+		props.paginator.fetchNewer();
+	} else {
+		props.paginator.fetchOlder();
+	}
+}
+
 defineSlots<{
 	empty: () => void;
 	default: (props: { items: UnwrapRef<T['items']> }) => void;
diff --git a/packages/frontend/src/pages/note.vue b/packages/frontend/src/pages/note.vue
index 9de1ef099b..89ae3d2d83 100644
--- a/packages/frontend/src/pages/note.vue
+++ b/packages/frontend/src/pages/note.vue
@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<Transition :name="prefer.s.animation ? 'fade' : ''" mode="out-in">
 			<div v-if="note">
 				<div v-if="showNext" class="_margin">
-					<MkNotesTimeline :withControl="false" :pullToRefresh="false" class="" :paginator="showNext === 'channel' ? nextChannelPaginator : nextUserPaginator" :noGap="true"/>
+					<MkNotesTimeline direction="up" :withControl="false" :pullToRefresh="false" class="" :paginator="showNext === 'channel' ? nextChannelPaginator : nextUserPaginator" :noGap="true"/>
 				</div>
 
 				<div class="_margin">
@@ -81,7 +81,6 @@ const error = ref();
 const prevUserPaginator = markRaw(new Paginator('users/notes', {
 	limit: 10,
 	initialId: props.noteId,
-	initialDirection: 'older',
 	computedParams: computed(() => note.value ? ({
 		userId: note.value.userId,
 	}) : undefined),
@@ -99,7 +98,6 @@ const nextUserPaginator = markRaw(new Paginator('users/notes', {
 const prevChannelPaginator = markRaw(new Paginator('channels/timeline', {
 	limit: 10,
 	initialId: props.noteId,
-	initialDirection: 'older',
 	computedParams: computed(() => note.value && note.value.channelId != null ? ({
 		channelId: note.value.channelId,
 	}) : undefined),
diff --git a/packages/frontend/src/utility/paginator.ts b/packages/frontend/src/utility/paginator.ts
index 63525b311a..7db55db7d6 100644
--- a/packages/frontend/src/utility/paginator.ts
+++ b/packages/frontend/src/utility/paginator.ts
@@ -37,6 +37,7 @@ export interface IPaginator<T = unknown, _T = T & MisskeyEntity> {
 	fetchingOlder: Ref<boolean>;
 	fetchingNewer: Ref<boolean>;
 	canFetchOlder: Ref<boolean>;
+	canFetchNewer: Ref<boolean>;
 	canSearch: boolean;
 	error: Ref<boolean>;
 	computedParams: ComputedRef<Misskey.Endpoints[PaginatorCompatibleEndpointPaths]['req'] | null | undefined> | null;
@@ -77,6 +78,7 @@ export class Paginator<
 	public fetchingOlder = ref(false);
 	public fetchingNewer = ref(false);
 	public canFetchOlder = ref(false);
+	public canFetchNewer = ref(false);
 	public canSearch = false;
 	public error = ref(false);
 	private endpoint: Endpoint;
@@ -85,7 +87,12 @@ export class Paginator<
 	public computedParams: ComputedRef<E['req'] | null | undefined> | null;
 	public initialId: MisskeyEntity['id'] | null = null;
 	public initialDate: number | null = null;
+
+	// 初回読み込み時、initialIdを基準にそれより新しいものを取得するか古いものを取得するか
+	// newer: initialIdより新しいものを取得する
+	// older: initialIdより古いものを取得する (default)
 	public initialDirection: 'newer' | 'older';
+
 	private offsetMode: boolean;
 	public noPaging: boolean;
 	public searchQuery = ref<null | string>('');
@@ -116,6 +123,7 @@ export class Paginator<
 		initialId?: MisskeyEntity['id'];
 		initialDate?: number | null;
 		initialDirection?: 'newer' | 'older';
+
 		order?: 'newest' | 'oldest';
 
 		// 一部のAPIはさらに遡れる場合でもパフォーマンス上の理由でlimit以下の結果を返す場合があり、その場合はsafe、それ以外はlimitにすることを推奨
@@ -222,15 +230,15 @@ export class Paginator<
 
 		if (this.canFetchDetection === 'limit') {
 			if (apiRes.length < FIRST_FETCH_LIMIT) {
-				this.canFetchOlder.value = false;
+				(this.initialDirection === 'older' ? this.canFetchOlder : this.canFetchNewer).value = false;
 			} else {
-				this.canFetchOlder.value = true;
+				(this.initialDirection === 'older' ? this.canFetchOlder : this.canFetchNewer).value = true;
 			}
 		} else if (this.canFetchDetection === 'safe' || this.canFetchDetection == null) {
 			if (apiRes.length === 0 || this.noPaging) {
-				this.canFetchOlder.value = false;
+				(this.initialDirection === 'older' ? this.canFetchOlder : this.canFetchNewer).value = false;
 			} else {
-				this.canFetchOlder.value = true;
+				(this.initialDirection === 'older' ? this.canFetchOlder : this.canFetchNewer).value = true;
 			}
 		}
 
@@ -273,7 +281,11 @@ export class Paginator<
 			if (i === 10) item._shouldInsertAd_ = true;
 		}
 
-		this.pushItems(apiRes);
+		if (this.order.value === 'oldest') {
+			this.unshiftItems(apiRes.toReversed(), false);
+		} else {
+			this.pushItems(apiRes);
+		}
 
 		if (this.canFetchDetection === 'limit') {
 			if (apiRes.length < FIRST_FETCH_LIMIT) {
@@ -313,7 +325,11 @@ export class Paginator<
 
 		this.fetchingNewer.value = false;
 
-		if (apiRes == null || apiRes.length === 0) return; // これやらないと余計なre-renderが走る
+		if (apiRes == null || apiRes.length === 0) {
+			this.canFetchNewer.value = false;
+			// 余計なre-renderを防止するためここで終了
+			return;
+		}
 
 		if (options.toQueue) {
 			this.aheadQueue.unshift(...apiRes.toReversed());
@@ -325,9 +341,19 @@ export class Paginator<
 			if (this.order.value === 'oldest') {
 				this.pushItems(apiRes);
 			} else {
-				this.unshiftItems(apiRes.toReversed());
+				this.unshiftItems(apiRes.toReversed(), false);
 			}
 		}
+
+		if (this.canFetchDetection === 'limit') {
+			if (apiRes.length < FIRST_FETCH_LIMIT) {
+				this.canFetchNewer.value = false;
+			} else {
+				this.canFetchNewer.value = true;
+			}
+		}
+		// canFetchDetectionが'safe'の場合・apiRes.length === 0 の場合は apiRes.length === 0 の場合に canFetchNewer.value = false になるが、
+		// 余計な re-render を防ぐために上部で処理している。そのため、ここでは何もしない
 	}
 
 	public trim(trigger = true): void {
@@ -336,10 +362,10 @@ export class Paginator<
 		if (this.useShallowRef && trigger) triggerRef(this.items);
 	}
 
-	public unshiftItems(newItems: T[]): void {
+	public unshiftItems(newItems: T[], trim = true): void {
 		if (newItems.length === 0) return; // これやらないと余計なre-renderが走る
 		this.items.value.unshift(...newItems.filter(x => !this.items.value.some(y => y.id === x.id))); // ストリーミングやポーリングのタイミングによっては重複することがあるため
-		this.trim(false);
+		if (trim) this.trim(true);
 		if (this.useShallowRef) triggerRef(this.items);
 	}
 

From 1f6716d69ba268af83c6648f59fca84dd955d2aa Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Fri, 22 Aug 2025 19:37:20 +0900
Subject: [PATCH 16/19] New Crowdin updates (#16436)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (English)

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

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

* New translations ja-jp.yml (French)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Portuguese)

* New translations ja-jp.yml (Turkish)

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

* New translations ja-jp.yml (Vietnamese)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Catalan)

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

* New translations ja-jp.yml (Italian)
---
 locales/ca-ES.yml | 2 +-
 locales/de-DE.yml | 1 -
 locales/en-US.yml | 1 -
 locales/es-ES.yml | 1 -
 locales/fr-FR.yml | 1 -
 locales/id-ID.yml | 1 -
 locales/it-IT.yml | 2 +-
 locales/ja-KS.yml | 1 -
 locales/ko-KR.yml | 2 +-
 locales/pt-PT.yml | 1 -
 locales/ru-RU.yml | 1 -
 locales/th-TH.yml | 1 -
 locales/tr-TR.yml | 1 -
 locales/vi-VN.yml | 1 -
 locales/zh-CN.yml | 2 +-
 locales/zh-TW.yml | 2 +-
 16 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index ae9de0f173..f1a97bb63b 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -1245,7 +1245,7 @@ releaseToRefresh: "Deixar anar per actualitzar"
 refreshing: "Recarregant..."
 pullDownToRefresh: "Llisca cap a baix per recarregar"
 useGroupedNotifications: "Mostrar les notificacions agrupades "
-signupPendingError: "Hi ha hagut un problema verificant l'adreça de correu electrònic. L'enllaç pot haver caducat."
+emailVerificationFailedError: "Hem tingut un problema en verificar la teva adreça de correu electrònic. És probable que l'enllaç estigui caducat."
 cwNotationRequired: "Si està activat \"Amagar contingut\" s'ha d'escriure una descripció "
 doReaction: "Afegeix una reacció "
 code: "Codi"
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index 51ae0642aa..2d7d41bfdd 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -1243,7 +1243,6 @@ releaseToRefresh: "Zum Aktualisieren loslassen"
 refreshing: "Wird aktualisiert..."
 pullDownToRefresh: "Zum Aktualisieren ziehen"
 useGroupedNotifications: "Benachrichtigungen gruppieren"
-signupPendingError: "Beim Überprüfen der Mailadresse ist etwas schiefgelaufen. Der Link könnte abgelaufen sein."
 cwNotationRequired: "Ist \"Inhaltswarnung verwenden\" aktiviert, muss eine Beschreibung gegeben werden."
 doReaction: "Reagieren"
 code: "Code"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 4a797e0fc2..3247273ea2 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1245,7 +1245,6 @@ releaseToRefresh: "Release to refresh"
 refreshing: "Refreshing..."
 pullDownToRefresh: "Pull down to refresh"
 useGroupedNotifications: "Display grouped notifications"
-signupPendingError: "There was a problem verifying the email address. The link may have expired."
 cwNotationRequired: "If \"Hide content\" is enabled, a description must be provided."
 doReaction: "Add reaction"
 code: "Code"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 51b377d49f..2340b020ec 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -1244,7 +1244,6 @@ releaseToRefresh: "Soltar para recargar"
 refreshing: "Recargando..."
 pullDownToRefresh: "Tira hacia abajo para recargar"
 useGroupedNotifications: "Mostrar notificaciones agrupadas"
-signupPendingError: "Ha habido un problema al verificar tu dirección de correo electrónico. Es posible que el enlace haya caducado."
 cwNotationRequired: "Si se ha activado \"ocultar contenido\", es necesario proporcionar una descripción."
 doReaction: "Añadir reacción"
 code: "Código"
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index f47a350369..8ea21bdb46 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -1208,7 +1208,6 @@ releaseToRefresh: "Relâcher pour rafraîchir"
 refreshing: "Rafraîchissement..."
 pullDownToRefresh: "Tirer vers le bas pour rafraîchir"
 useGroupedNotifications: "Grouper les notifications"
-signupPendingError: "Un problème est survenu lors de la vérification de votre adresse e-mail. Le lien a peut-être expiré."
 cwNotationRequired: "Si « Masquer le contenu » est activé, une description doit être fournie."
 doReaction: "Réagir"
 code: "Code"
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index 93683508b5..ac6aefa4b4 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -1212,7 +1212,6 @@ releaseToRefresh: "Lepaskan untuk memuat ulang"
 refreshing: "Sedang memuat ulang..."
 pullDownToRefresh: "Tarik ke bawah untuk memuat ulang"
 useGroupedNotifications: "Tampilkan notifikasi secara dikelompokkan"
-signupPendingError: "Terdapat masalah ketika memverifikasi alamat surel. Tautan kemungkinan telah kedaluwarsa."
 cwNotationRequired: "Jika \"Sembunyikan konten\" diaktifkan, deskripsi harus disediakan."
 doReaction: "Tambahkan reaksi"
 code: "Kode"
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 5d1b9dc924..9d91e558f9 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -1245,7 +1245,7 @@ releaseToRefresh: "Rilascia per aggiornare"
 refreshing: "Aggiornamento..."
 pullDownToRefresh: "Trascinare per aggiornare"
 useGroupedNotifications: "Mostra le notifiche raggruppate"
-signupPendingError: "Si è verificato un problema durante la verifica del tuo indirizzo email. Potrebbe essere scaduto il collegamento temporaneo."
+emailVerificationFailedError: "La verifica dell'indirizzo e-mail non è andata a buon fine. Il link potrebbe essere scaduto."
 cwNotationRequired: "Devi indicare perché il contenuto è indicato come esplicito."
 doReaction: "Reagisci"
 code: "Codice"
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index 05113500a3..d44ed1c3fc 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -1239,7 +1239,6 @@ releaseToRefresh: "離したらリロード"
 refreshing: "リロードしとる"
 pullDownToRefresh: "引っ張ってリロードするで"
 useGroupedNotifications: "通知をグループ分けして出すで"
-signupPendingError: "メアド確認してたらなんか変なことなったわ。リンクの期限切れてるかもしれん。"
 cwNotationRequired: "「内容を隠す」んやったら注釈書かなアカンで。"
 doReaction: "ツッコむで"
 code: "コード"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 382a506726..bcd927e758 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1245,7 +1245,7 @@ releaseToRefresh: "놓아서 새로고침"
 refreshing: "새로고침 중"
 pullDownToRefresh: "아래로 내려서 새로고침"
 useGroupedNotifications: "알림을 그룹화하고 표시"
-signupPendingError: "메일 주소 확인중에 문제가 발생했습니다. 링크의 유효기간이 지났을 가능성이 있습니다."
+emailVerificationFailedError: "메일 주소 확인에 실패했습니다. 확인에 필요한 URL의 유효기간이 지났을 가능성이 있습니다."
 cwNotationRequired: "'내용을 숨기기'를 체크한 경우 주석을 써야 합니다."
 doReaction: "리액션 추가"
 code: "문자열"
diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml
index 64fec3957e..013d2ef549 100644
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -1243,7 +1243,6 @@ releaseToRefresh: "Solte para atualizar"
 refreshing: "Atualizando..."
 pullDownToRefresh: "Puxe para baixo para atualizar"
 useGroupedNotifications: "Agrupar notificações"
-signupPendingError: "Houve um problema ao verificar o endereço de email. O link pode ter expirado."
 cwNotationRequired: "Se \"Esconder conteúdo\" está habilitado, uma descrição deve ser adicionada."
 doReaction: "Adicionar reação"
 code: "Código"
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index 3d3ecca531..aea69f6f24 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -1220,7 +1220,6 @@ flip: "Переворот"
 showAvatarDecorations: "Показать украшения для аватара"
 pullDownToRefresh: "Опустите что бы обновить"
 useGroupedNotifications: "Отображать уведомления сгруппировано"
-signupPendingError: "Возникла проблема с подтверждением вашего адреса электронной почты. Возможно, срок действия ссылки истёк."
 cwNotationRequired: "Если включена опция «Скрыть содержимое», необходимо написать аннотацию."
 doReaction: "Добавить реакцию"
 code: "Код"
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index 0835902642..f70b0d5be8 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -1245,7 +1245,6 @@ releaseToRefresh: "ปล่อยเพื่อรีเฟรช"
 refreshing: "กำลังรีเฟรช..."
 pullDownToRefresh: "ดึงลงเพื่อรีเฟรช"
 useGroupedNotifications: "แสดงผลการแจ้งเตือนแบบกลุ่มแล้ว"
-signupPendingError: "มีปัญหาในการตรวจสอบที่อยู่อีเมลลิงก์อาจหมดอายุแล้ว"
 cwNotationRequired: "หากเปิดใช้งาน “ซ่อนเนื้อหา” จะต้องระบุคำอธิบาย"
 doReaction: "เพิ่มรีแอคชั่น"
 code: "โค้ด"
diff --git a/locales/tr-TR.yml b/locales/tr-TR.yml
index cabd80e6e7..95a1ff1c0f 100644
--- a/locales/tr-TR.yml
+++ b/locales/tr-TR.yml
@@ -1244,7 +1244,6 @@ releaseToRefresh: "Yenilemek için serbest bırak"
 refreshing: "Yenileniyor..."
 pullDownToRefresh: "Yenilemek için aşağı çekin"
 useGroupedNotifications: "Gruplandırılmış bildirimleri göster"
-signupPendingError: "E-posta adresini doğrulamada bir sorun oluştu. Bağlantının süresi dolmuş olabilir."
 cwNotationRequired: "“İçeriği gizle” seçeneği etkinleştirilirse, bir açıklama sağlanmalı."
 doReaction: "Tepki ekle"
 code: "Kod"
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index 8b4f1bfd5e..cb2f37bed7 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -1196,7 +1196,6 @@ showAvatarDecorations: "Hiển thị trang trí ảnh đại diện"
 releaseToRefresh: "Thả để làm mới"
 refreshing: "Đang làm mới"
 pullDownToRefresh: "Kéo xuống để làm mới"
-signupPendingError: "Đã xảy ra sự cố khi xác minh địa chỉ email của bạn. Liên kết có thể đã hết hạn."
 cwNotationRequired: "Nếu \"Ẩn nội dung\" được bật thì cần phải có chú thích."
 decorate: "Trang trí"
 lastNDays: "{n} ngày trước"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 7fbb907783..08f3fda096 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -1245,7 +1245,7 @@ releaseToRefresh: "松开以刷新"
 refreshing: "刷新中"
 pullDownToRefresh: "下拉以刷新"
 useGroupedNotifications: "分组显示通知"
-signupPendingError: "确认电子邮件时出现错误。链接可能已过期。"
+emailVerificationFailedError: "确认电子邮件时出现错误。链接可能已过期。"
 cwNotationRequired: "在启用「隐藏内容」时必须输入注释"
 doReaction: "回应"
 code: "代码"
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index ead814b7bb..1656896133 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1245,7 +1245,7 @@ releaseToRefresh: "放開以更新內容"
 refreshing: "載入更新中"
 pullDownToRefresh: "往下拉來更新內容"
 useGroupedNotifications: "分組顯示通知訊息"
-signupPendingError: "驗證您的電子郵件地址時出現問題。連結可能已過期。"
+emailVerificationFailedError: "驗證您的電子郵件地址時出現問題。連結可能已過期。"
 cwNotationRequired: "如果開啟「隱藏內容」，則需要註解說明。"
 doReaction: "做出反應"
 code: "程式碼"

From 16030c63819e97b4c96170d87bb18e5866428b29 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Fri, 22 Aug 2025 10:39:14 +0000
Subject: [PATCH 17/19] Bump version to 2025.8.0-beta.3

---
 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 85d3137563..f2196de4ea 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.8.0-beta.2",
+	"version": "2025.8.0-beta.3",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
diff --git a/packages/misskey-js/package.json b/packages/misskey-js/package.json
index 73cc0851ba..c15c33d735 100644
--- a/packages/misskey-js/package.json
+++ b/packages/misskey-js/package.json
@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.8.0-beta.2",
+	"version": "2025.8.0-beta.3",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",

From 07ccb82691521dc4b49be8bf5969f325e7c7cebc Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Fri, 22 Aug 2025 19:40:15 +0900
Subject: [PATCH 18/19] Update CHANGELOG with recent feature and fix entries

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c6d674b4f2..a41cd21c89 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -37,8 +37,8 @@
 	- コントロールパネル→ブランディング→エントランスページのスタイル
 - Feat: ページのタブバーを下部に表示できるように
 - Feat: (実験的)iOSでの触覚フィードバックを有効にできるように
+- Feat: コントロールパネルを検索できるように
 - Enhance: 「自動でもっと見る」オプションが有効になり、安定性が向上しました
-- Enhance: コントロールパネルを検索できるように
 - Enhance: トルコ語 (tr-TR) に対応
 - Enhance: 不必要な翻訳データを読み込まなくなり、パフォーマンスが向上しました
 - Enhance: 画像エフェクトのパラメータ名の多言語対応
@@ -53,7 +53,7 @@
 - Fix: カラムの名前が正しくリスト/チャンネルの名前にならない問題を修正
 - Fix: 複数のメンションを1行に記述した場合に、サジェストが正しく表示されない問題を修正
 - Fix: メンションとしての条件を満たしていても、特定の条件(`-`が含まれる場合など)で正しくサジェストされない問題を一部修正
-- Fix: ユーザーの前後ノートを閲覧する機能が壊れている問題を修正
+- Fix: ユーザーの前後ノートを閲覧する機能が動作しない問題を修正
 
 ### Server
 - Feat: サーバー管理コマンド

From bd0730e5e805840ad3cb5e0f80a212b9651a16e1 Mon Sep 17 00:00:00 2001
From: syuilo <4439005+syuilo@users.noreply.github.com>
Date: Sat, 23 Aug 2025 17:37:15 +0900
Subject: [PATCH 19/19] =?UTF-8?q?fix(backend):=20=E5=89=8A=E9=99=A4?=
 =?UTF-8?q?=E3=81=95=E3=82=8C=E3=81=9F=E3=83=A6=E3=83=BC=E3=82=B6=E3=83=BC?=
 =?UTF-8?q?=E3=81=8C=E3=83=81=E3=83=A3=E3=83=83=E3=83=88=E3=83=A1=E3=83=83?=
 =?UTF-8?q?=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=AB=E3=83=AA=E3=82=A2=E3=82=AF?=
 =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B?=
 =?UTF-8?q?=E5=A0=B4=E5=90=88`chat/history`=E3=81=AA=E3=81=A9=E3=81=A7?=
 =?UTF-8?q?=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA=E3=82=8B=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 #16445
---
 CHANGELOG.md                                      |  1 +
 .../src/core/entities/ChatEntityService.ts        | 15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a41cd21c89..b072de50b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,6 +66,7 @@
 - Enhance: `clips/list` APIがページネーションに対応しました
 - Fix: `notes/mentions` で場合によっては並び順が正しく返されない問題を修正
 - Fix: SystemWebhook設定でsecretを空に出来ない問題を修正
+- Fix: 削除されたユーザーがチャットメッセージにリアクションしている場合`chat/history`などでエラーになる問題を修正
 
 
 ## 2025.7.0
diff --git a/packages/backend/src/core/entities/ChatEntityService.ts b/packages/backend/src/core/entities/ChatEntityService.ts
index 6bce2413fd..cfa983e766 100644
--- a/packages/backend/src/core/entities/ChatEntityService.ts
+++ b/packages/backend/src/core/entities/ChatEntityService.ts
@@ -54,12 +54,13 @@ export class ChatEntityService {
 
 		const message = typeof src === 'object' ? src : await this.chatMessagesRepository.findOneByOrFail({ id: src });
 
-		const reactions: { user: Packed<'UserLite'>; reaction: string; }[] = [];
+		// userは削除されている可能性があるのでnull許容
+		const reactions: { user: Packed<'UserLite'> | null; reaction: string; }[] = [];
 
 		for (const record of message.reactions) {
 			const [userId, reaction] = record.split('/');
 			reactions.push({
-				user: packedUsers?.get(userId) ?? await this.userEntityService.pack(userId),
+				user: packedUsers?.get(userId) ?? await this.userEntityService.pack(userId).catch(() => null),
 				reaction,
 			});
 		}
@@ -76,7 +77,7 @@ export class ChatEntityService {
 			toRoom: message.toRoomId ? (packedRooms?.get(message.toRoomId) ?? await this.packRoom(message.toRoom ?? message.toRoomId, me)) : undefined,
 			fileId: message.fileId,
 			file: message.fileId ? (packedFiles?.get(message.fileId) ?? await this.driveFileEntityService.pack(message.file ?? message.fileId)) : null,
-			reactions,
+			reactions: reactions.filter((r): r is { user: Packed<'UserLite'>; reaction: string; } => r.user != null),
 		};
 	}
 
@@ -108,6 +109,7 @@ export class ChatEntityService {
 			}
 		}
 
+		// TODO: packedUsersに削除されたユーザーもnullとして含める
 		const [packedUsers, packedFiles, packedRooms] = await Promise.all([
 			this.userEntityService.packMany(users, me)
 				.then(users => new Map(users.map(u => [u.id, u]))),
@@ -183,12 +185,13 @@ export class ChatEntityService {
 
 		const message = typeof src === 'object' ? src : await this.chatMessagesRepository.findOneByOrFail({ id: src });
 
-		const reactions: { user: Packed<'UserLite'>; reaction: string; }[] = [];
+		// userは削除されている可能性があるのでnull許容
+		const reactions: { user: Packed<'UserLite'> | null; reaction: string; }[] = [];
 
 		for (const record of message.reactions) {
 			const [userId, reaction] = record.split('/');
 			reactions.push({
-				user: packedUsers?.get(userId) ?? await this.userEntityService.pack(userId),
+				user: packedUsers?.get(userId) ?? await this.userEntityService.pack(userId).catch(() => null),
 				reaction,
 			});
 		}
@@ -202,7 +205,7 @@ export class ChatEntityService {
 			toRoomId: message.toRoomId!,
 			fileId: message.fileId,
 			file: message.fileId ? (packedFiles?.get(message.fileId) ?? await this.driveFileEntityService.pack(message.file ?? message.fileId)) : null,
-			reactions,
+			reactions: reactions.filter((r): r is { user: Packed<'UserLite'>; reaction: string; } => r.user != null),
 		};
 	}