From 44a4faebc00c67becba925bd4bb928b941cde91a Mon Sep 17 00:00:00 2001
From: remi <768.jac@gmail.com>
Date: Sat, 8 Apr 2023 05:55:05 +0200
Subject: [PATCH 01/55] feat: add minimize/Fold button for windows (#10508)

* add window minimizing!

* Fix window being able to go offscreen

* Revert en-US.yml changes

---------

Co-authored-by: mothmoon <remilia@remilia.se>
---
 CHANGELOG.md                                  |  1 +
 locales/ja-JP.yml                             |  1 +
 packages/frontend/src/components/MkWindow.vue | 64 +++++++++++++------
 3 files changed, 48 insertions(+), 18 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e701d84bbf..3fce3195ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 		  - 左耳は上からおよそ 10%, 左からおよそ 20% の位置で決定します
 			- 右耳は上からおよそ 10%, 左からおよそ 80% の位置で決定します
 	- 「UIのアニメーションを減らす」 (`reduceAnimation`) で猫耳を撫でられなくなります
+- Add Minimizing ("folding") of windows
 
 ### Server
 - イベント用Redisを別サーバーに分離できるように
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 66b591760c..04e4d52b28 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -920,6 +920,7 @@ pushNotificationNotSupported: "ブラウザかサーバーがプッシュ通知
 sendPushNotificationReadMessage: "通知やメッセージが既読になったらプッシュ通知を削除する"
 sendPushNotificationReadMessageCaption: "「{emptyPushNotificationMessage}」という通知が一瞬表示されるようになります。端末の電池消費量が増加する可能性があります。"
 windowMaximize: "最大化"
+windowMinimize: "最小化"
 windowRestore: "元に戻す"
 caption: "キャプション"
 loggedInAsBot: "Botアカウントでログイン中"
diff --git a/packages/frontend/src/components/MkWindow.vue b/packages/frontend/src/components/MkWindow.vue
index 30b5391e9a..1afcb104e9 100644
--- a/packages/frontend/src/components/MkWindow.vue
+++ b/packages/frontend/src/components/MkWindow.vue
@@ -11,15 +11,17 @@
 		<div :class="$style.body" class="_shadow" @mousedown="onBodyMousedown" @keydown="onKeydown">
 			<div :class="[$style.header, { [$style.mini]: mini }]" @contextmenu.prevent.stop="onContextmenu">
 				<span :class="$style.headerLeft">
-					<button v-for="button in buttonsLeft" v-tooltip="button.title" class="_button" :class="[$style.headerButton, { [$style.highlighted]: button.highlighted }]" @click="button.onClick"><i :class="button.icon"></i></button>
+					<button v-for="button in buttonsLeft" v-if="!minimized" v-tooltip="button.title" class="_button" :class="[$style.headerButton, { [$style.highlighted]: button.highlighted }]" @click="button.onClick"><i :class="button.icon"></i></button>
 				</span>
 				<span :class="$style.headerTitle" @mousedown.prevent="onHeaderMousedown" @touchstart.prevent="onHeaderMousedown">
 					<slot name="header"></slot>
 				</span>
 				<span :class="$style.headerRight">
-					<button v-for="button in buttonsRight" v-tooltip="button.title" class="_button" :class="[$style.headerButton, { [$style.highlighted]: button.highlighted }]" @click="button.onClick"><i :class="button.icon"></i></button>
+					<button v-for="button in buttonsRight" v-if="!minimized" v-tooltip="button.title" class="_button" :class="[$style.headerButton, { [$style.highlighted]: button.highlighted }]" @click="button.onClick"><i :class="button.icon"></i></button>
+					<button v-if="canResize && minimized" v-tooltip="i18n.ts.windowRestore" class="_button" :class="$style.headerButton" @click="unMinimize()"><i class="ti ti-maximize"></i></button>
+					<button v-else-if="canResize && !maximized" v-tooltip="i18n.ts.windowMinimize" class="_button" :class="$style.headerButton" @click="minimize()"><i class="ti ti-minimize"></i></button>
 					<button v-if="canResize && maximized" v-tooltip="i18n.ts.windowRestore" class="_button" :class="$style.headerButton" @click="unMaximize()"><i class="ti ti-picture-in-picture"></i></button>
-					<button v-else-if="canResize && !maximized" v-tooltip="i18n.ts.windowMaximize" class="_button" :class="$style.headerButton" @click="maximize()"><i class="ti ti-rectangle"></i></button>
+					<button v-else-if="canResize && !maximized && !minimized" v-tooltip="i18n.ts.windowMaximize" class="_button" :class="$style.headerButton" @click="maximize()"><i class="ti ti-rectangle"></i></button>
 					<button v-if="closeButton" v-tooltip="i18n.ts.close" class="_button" :class="$style.headerButton" @click="close()"><i class="ti ti-x"></i></button>
 				</span>
 			</div>
@@ -27,7 +29,7 @@
 				<slot></slot>
 			</div>
 		</div>
-		<template v-if="canResize">
+		<template v-if="canResize && !minimized">
 			<div :class="$style.handleTop" @mousedown.prevent="onTopHandleMousedown"></div>
 			<div :class="$style.handleRight" @mousedown.prevent="onRightHandleMousedown"></div>
 			<div :class="$style.handleBottom" @mousedown.prevent="onBottomHandleMousedown"></div>
@@ -100,10 +102,11 @@ let rootEl = $shallowRef<HTMLElement | null>();
 let showing = $ref(true);
 let beforeClickedAt = 0;
 let maximized = $ref(false);
-let unMaximizedTop = '';
-let unMaximizedLeft = '';
-let unMaximizedWidth = '';
-let unMaximizedHeight = '';
+let minimized = $ref(false);
+let unResizedTop = '';
+let unResizedLeft = '';
+let unResizedWidth = '';
+let unResizedHeight = '';
 
 function close() {
 	showing = false;
@@ -132,10 +135,10 @@ function top() {
 
 function maximize() {
 	maximized = true;
-	unMaximizedTop = rootEl.style.top;
-	unMaximizedLeft = rootEl.style.left;
-	unMaximizedWidth = rootEl.style.width;
-	unMaximizedHeight = rootEl.style.height;
+	unResizedTop = rootEl.style.top;
+	unResizedLeft = rootEl.style.left;
+	unResizedWidth = rootEl.style.width;
+	unResizedHeight = rootEl.style.height;
 	rootEl.style.top = '0';
 	rootEl.style.left = '0';
 	rootEl.style.width = '100%';
@@ -144,10 +147,35 @@ function maximize() {
 
 function unMaximize() {
 	maximized = false;
-	rootEl.style.top = unMaximizedTop;
-	rootEl.style.left = unMaximizedLeft;
-	rootEl.style.width = unMaximizedWidth;
-	rootEl.style.height = unMaximizedHeight;
+	rootEl.style.top = unResizedTop;
+	rootEl.style.left = unResizedLeft;
+	rootEl.style.width = unResizedWidth;
+	rootEl.style.height = unResizedHeight;
+}
+
+function minimize() {
+	minimized = true;
+	unResizedWidth = rootEl.style.width;
+	unResizedHeight = rootEl.style.height;
+	rootEl.style.width = minWidth + 'px';
+	rootEl.style.height = props.mini ? '32px' : '39px';
+}
+
+function unMinimize() {
+	const main = rootEl;
+	if (main == null) return;
+
+	minimized = false;
+	rootEl.style.width = unResizedWidth;
+	rootEl.style.height = unResizedHeight;
+	const browserWidth = window.innerWidth;
+	const browserHeight = window.innerHeight;
+	const windowWidth = main.offsetWidth;
+	const windowHeight = main.offsetHeight;
+
+	const position = main.getBoundingClientRect();
+	if (position.top + windowHeight > browserHeight) main.style.top = browserHeight - windowHeight + 'px';
+	if (position.left + windowWidth > browserWidth) main.style.left = browserWidth - windowWidth + 'px';
 }
 
 function onBodyMousedown() {
@@ -155,7 +183,7 @@ function onBodyMousedown() {
 }
 
 function onDblClick() {
-	maximize();
+	if (minimized) {unMinimize();} else {maximize();}
 }
 
 function onHeaderMousedown(evt: MouseEvent) {
@@ -187,7 +215,7 @@ function onHeaderMousedown(evt: MouseEvent) {
 
 	const clickX = evt.touches && evt.touches.length > 0 ? evt.touches[0].clientX : evt.clientX;
 	const clickY = evt.touches && evt.touches.length > 0 ? evt.touches[0].clientY : evt.clientY;
-	const moveBaseX = beforeMaximized ? parseInt(unMaximizedWidth, 10) / 2 : clickX - position.left; // TODO: parseIntやめる
+	const moveBaseX = beforeMaximized ? parseInt(unResizedWidth, 10) / 2 : clickX - position.left; // TODO: parseIntやめる
 	const moveBaseY = beforeMaximized ? 20 : clickY - position.top;
 	const browserWidth = window.innerWidth;
 	const browserHeight = window.innerHeight;

From 33bce49ee80f833e7424f7b69c0164dfe5c9fbf0 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 12:56:21 +0900
Subject: [PATCH 02/55] lint fix

---
 packages/frontend/src/components/MkWindow.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/components/MkWindow.vue b/packages/frontend/src/components/MkWindow.vue
index 1afcb104e9..5bcfa1a3e4 100644
--- a/packages/frontend/src/components/MkWindow.vue
+++ b/packages/frontend/src/components/MkWindow.vue
@@ -183,7 +183,11 @@ function onBodyMousedown() {
 }
 
 function onDblClick() {
-	if (minimized) {unMinimize();} else {maximize();}
+	if (minimized) {
+		unMinimize();
+	} else {
+		maximize();
+	}
 }
 
 function onHeaderMousedown(evt: MouseEvent) {

From e3b8e8746ee0620e215cf576b98365c4bd1c4aa7 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 12:57:05 +0900
Subject: [PATCH 03/55] lint fixes

---
 packages/frontend/src/components/MkWindow.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/frontend/src/components/MkWindow.vue b/packages/frontend/src/components/MkWindow.vue
index 5bcfa1a3e4..97fb7e01d4 100644
--- a/packages/frontend/src/components/MkWindow.vue
+++ b/packages/frontend/src/components/MkWindow.vue
@@ -10,14 +10,16 @@
 	<div v-if="showing" ref="rootEl" :class="[$style.root, { [$style.maximized]: maximized }]">
 		<div :class="$style.body" class="_shadow" @mousedown="onBodyMousedown" @keydown="onKeydown">
 			<div :class="[$style.header, { [$style.mini]: mini }]" @contextmenu.prevent.stop="onContextmenu">
-				<span :class="$style.headerLeft">
-					<button v-for="button in buttonsLeft" v-if="!minimized" v-tooltip="button.title" class="_button" :class="[$style.headerButton, { [$style.highlighted]: button.highlighted }]" @click="button.onClick"><i :class="button.icon"></i></button>
+				<span v-if="!minimized" :class="$style.headerLeft">
+					<button v-for="button in buttonsLeft" v-tooltip="button.title" class="_button" :class="[$style.headerButton, { [$style.highlighted]: button.highlighted }]" @click="button.onClick"><i :class="button.icon"></i></button>
 				</span>
 				<span :class="$style.headerTitle" @mousedown.prevent="onHeaderMousedown" @touchstart.prevent="onHeaderMousedown">
 					<slot name="header"></slot>
 				</span>
 				<span :class="$style.headerRight">
-					<button v-for="button in buttonsRight" v-if="!minimized" v-tooltip="button.title" class="_button" :class="[$style.headerButton, { [$style.highlighted]: button.highlighted }]" @click="button.onClick"><i :class="button.icon"></i></button>
+					<template v-if="!minimized">
+						<button v-for="button in buttonsRight" v-tooltip="button.title" class="_button" :class="[$style.headerButton, { [$style.highlighted]: button.highlighted }]" @click="button.onClick"><i :class="button.icon"></i></button>
+					</template>
 					<button v-if="canResize && minimized" v-tooltip="i18n.ts.windowRestore" class="_button" :class="$style.headerButton" @click="unMinimize()"><i class="ti ti-maximize"></i></button>
 					<button v-else-if="canResize && !maximized" v-tooltip="i18n.ts.windowMinimize" class="_button" :class="$style.headerButton" @click="minimize()"><i class="ti ti-minimize"></i></button>
 					<button v-if="canResize && maximized" v-tooltip="i18n.ts.windowRestore" class="_button" :class="$style.headerButton" @click="unMaximize()"><i class="ti ti-picture-in-picture"></i></button>

From 40b304160877d3b796bfad9097e8cc5efe8bec4a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 13:01:28 +0900
Subject: [PATCH 04/55] tweak MkWindow.vue

---
 packages/frontend/src/components/MkWindow.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/MkWindow.vue b/packages/frontend/src/components/MkWindow.vue
index 97fb7e01d4..687abed632 100644
--- a/packages/frontend/src/components/MkWindow.vue
+++ b/packages/frontend/src/components/MkWindow.vue
@@ -10,8 +10,10 @@
 	<div v-if="showing" ref="rootEl" :class="[$style.root, { [$style.maximized]: maximized }]">
 		<div :class="$style.body" class="_shadow" @mousedown="onBodyMousedown" @keydown="onKeydown">
 			<div :class="[$style.header, { [$style.mini]: mini }]" @contextmenu.prevent.stop="onContextmenu">
-				<span v-if="!minimized" :class="$style.headerLeft">
-					<button v-for="button in buttonsLeft" v-tooltip="button.title" class="_button" :class="[$style.headerButton, { [$style.highlighted]: button.highlighted }]" @click="button.onClick"><i :class="button.icon"></i></button>
+				<span :class="$style.headerLeft">
+					<template v-if="!minimized">
+						<button v-for="button in buttonsLeft" v-tooltip="button.title" class="_button" :class="[$style.headerButton, { [$style.highlighted]: button.highlighted }]" @click="button.onClick"><i :class="button.icon"></i></button>
+					</template>
 				</span>
 				<span :class="$style.headerTitle" @mousedown.prevent="onHeaderMousedown" @touchstart.prevent="onHeaderMousedown">
 					<slot name="header"></slot>

From fa67fb42b1baf616d860c54f6cdf9123fc7ed57a Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 13:12:49 +0900
Subject: [PATCH 05/55] =?UTF-8?q?enhance(backend):=20Redis=E3=81=AB?=
 =?UTF-8?q?=E3=83=81=E3=83=A3=E3=83=B3=E3=83=8D=E3=83=AB=E6=8A=95=E7=A8=BF?=
 =?UTF-8?q?=E3=81=8C=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=81=AFDB?=
 =?UTF-8?q?=E3=81=8B=E3=82=89=E6=8C=81=E3=81=A3=E3=81=A6=E3=81=8F=E3=82=8B?=
 =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #10473
---
 .../server/api/endpoints/channels/timeline.ts | 75 ++++++++++++-------
 1 file changed, 47 insertions(+), 28 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/channels/timeline.ts b/packages/backend/src/server/api/endpoints/channels/timeline.ts
index dfc2a582dc..2556557b24 100644
--- a/packages/backend/src/server/api/endpoints/channels/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/channels/timeline.ts
@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@nestjs/common';
 import Redis from 'ioredis';
 import { Endpoint } from '@/server/api/endpoint-base.js';
-import type { ChannelsRepository, NotesRepository } from '@/models/index.js';
+import type { ChannelsRepository, Note, NotesRepository } from '@/models/index.js';
 import { QueryService } from '@/core/QueryService.js';
 import { NoteEntityService } from '@/core/entities/NoteEntityService.js';
 import ActiveUsersChart from '@/core/chart/charts/active-users.js';
@@ -73,6 +73,8 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				throw new ApiError(meta.errors.noSuchChannel);
 			}
 
+			let timeline: Note[] = [];
+
 			const noteIdsRes = await this.redisClient.xrevrange(
 				`channelTimeline:${channel.id}`,
 				ps.untilId ? this.idService.parse(ps.untilId).date.getTime() : '+',
@@ -80,35 +82,52 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 				'COUNT', ps.limit + 1); // untilIdに指定したものも含まれるため+1
 
 			if (noteIdsRes.length === 0) {
-				return [];
+				//#region Construct query
+				const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
+					.andWhere('note.channelId = :channelId', { channelId: channel.id })
+					.innerJoinAndSelect('note.user', 'user')
+					.leftJoinAndSelect('note.reply', 'reply')
+					.leftJoinAndSelect('note.renote', 'renote')
+					.leftJoinAndSelect('reply.user', 'replyUser')
+					.leftJoinAndSelect('renote.user', 'renoteUser')
+					.leftJoinAndSelect('note.channel', 'channel');
+
+				if (me) {
+					this.queryService.generateMutedUserQuery(query, me);
+					this.queryService.generateMutedNoteQuery(query, me);
+					this.queryService.generateBlockedUserQuery(query, me);
+				}
+				//#endregion
+
+				timeline = await query.take(ps.limit).getMany();
+			} else {
+				const noteIds = noteIdsRes.map(x => x[1][1]).filter(x => x !== ps.untilId);
+
+				if (noteIds.length === 0) {
+					return [];
+				}
+
+				//#region Construct query
+				const query = this.notesRepository.createQueryBuilder('note')
+					.where('note.id IN (:...noteIds)', { noteIds: noteIds })
+					.innerJoinAndSelect('note.user', 'user')
+					.leftJoinAndSelect('note.reply', 'reply')
+					.leftJoinAndSelect('note.renote', 'renote')
+					.leftJoinAndSelect('reply.user', 'replyUser')
+					.leftJoinAndSelect('renote.user', 'renoteUser')
+					.leftJoinAndSelect('note.channel', 'channel');
+
+				if (me) {
+					this.queryService.generateMutedUserQuery(query, me);
+					this.queryService.generateMutedNoteQuery(query, me);
+					this.queryService.generateBlockedUserQuery(query, me);
+				}
+				//#endregion
+
+				timeline = await query.getMany();
+				timeline.sort((a, b) => a.id > b.id ? -1 : 1);
 			}
 
-			const noteIds = noteIdsRes.map(x => x[1][1]).filter(x => x !== ps.untilId);
-
-			if (noteIds.length === 0) {
-				return [];
-			}
-
-			//#region Construct query
-			const query = this.notesRepository.createQueryBuilder('note')
-				.where('note.id IN (:...noteIds)', { noteIds: noteIds })
-				.innerJoinAndSelect('note.user', 'user')
-				.leftJoinAndSelect('note.reply', 'reply')
-				.leftJoinAndSelect('note.renote', 'renote')
-				.leftJoinAndSelect('reply.user', 'replyUser')
-				.leftJoinAndSelect('renote.user', 'renoteUser')
-				.leftJoinAndSelect('note.channel', 'channel');
-
-			if (me) {
-				this.queryService.generateMutedUserQuery(query, me);
-				this.queryService.generateMutedNoteQuery(query, me);
-				this.queryService.generateBlockedUserQuery(query, me);
-			}
-			//#endregion
-
-			const timeline = await query.getMany();
-			timeline.sort((a, b) => a.id > b.id ? -1 : 1);
-
 			if (me) this.activeUsersChart.read(me);
 
 			return await this.noteEntityService.packMany(timeline, me);

From 25ebb73756017174c3197376b7485e5e7fcb5fd1 Mon Sep 17 00:00:00 2001
From: Namekuji <11836635+nmkj-io@users.noreply.github.com>
Date: Sat, 8 Apr 2023 01:16:26 -0400
Subject: [PATCH 06/55] feat: account migration (#10507)

* add Move activity

* add endpoint to move from local to remote

* follow move activity coming to inbox

* fix move endpoint

* add known-as endpoint to create account alias

* add migration page

* add route to migration page

* add move and known-as endpoints

* fix dependnecies error

* fix new endpoints

* fix move activity id

* fix refollow

* add movedToUri and alsoKnownAs to api

* fix moveToUri indicator

* fix missing context

* add chengelog

* rename MkMoved to MkAccountMoved

* add missing semicolon

* fix targetUri

* fix followings query

* remove redundant null check
---
 CHANGELOG.md                                  |   3 +-
 locales/en-US.yml                             |  11 +-
 locales/ja-JP.yml                             |  10 +-
 .../backend/src/core/AccountMoveService.ts    | 114 +++++++++++++
 .../backend/src/core/AccountUpdateService.ts  |   2 +-
 packages/backend/src/core/CoreModule.ts       |   6 +
 .../src/core/activitypub/ApInboxService.ts    | 155 ++++++++++++------
 .../src/core/activitypub/ApRendererService.ts |  26 ++-
 .../activitypub/models/ApPersonService.ts     |   4 +
 packages/backend/src/core/activitypub/type.ts |   8 +
 .../src/core/entities/UserEntityService.ts    |   9 +-
 packages/backend/src/models/entities/User.ts  |  13 ++
 .../backend/src/models/json-schema/user.ts    |  12 ++
 .../backend/src/server/api/EndpointsModule.ts |   8 +
 packages/backend/src/server/api/endpoints.ts  |   4 +
 .../src/server/api/endpoints/i/known-as.ts    |  92 +++++++++++
 .../src/server/api/endpoints/i/move.ts        | 136 +++++++++++++++
 .../src/components/MkAccountMoved.vue         |  33 ++++
 .../frontend/src/pages/settings/index.vue     |   5 +
 .../frontend/src/pages/settings/migration.vue |  73 +++++++++
 packages/frontend/src/pages/user/home.vue     |   2 +
 packages/frontend/src/router.ts               |   4 +
 packages/misskey-js/src/api.types.ts          |   2 +
 packages/misskey-js/src/entities.ts           |   2 +
 24 files changed, 676 insertions(+), 58 deletions(-)
 create mode 100644 packages/backend/src/core/AccountMoveService.ts
 create mode 100644 packages/backend/src/server/api/endpoints/i/known-as.ts
 create mode 100644 packages/backend/src/server/api/endpoints/i/move.ts
 create mode 100644 packages/frontend/src/components/MkAccountMoved.vue
 create mode 100644 packages/frontend/src/pages/settings/migration.vue

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fce3195ee..615a3aad3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@
 -
 
 ### Client
-- 
+-
 
 ### Server
 -
@@ -21,6 +21,7 @@
 ### General
 - チャンネルをお気に入りに登録できるように
 - チャンネルにノートをピン留めできるように
+- アカウントの引っ越し（フォロワー引き継ぎ）に対応
 
 ### Client
 - 検索ページでURLを入力した際に照会したときと同等の挙動をするように
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 0a6272ee47..a134bb3a3a 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -988,6 +988,16 @@ enableChartsForFederatedInstances: "Generate remote instance data charts"
 showClipButtonInNoteFooter: "Add \"Clip\" to note action menu"
 largeNoteReactions: "Enlargen displayed reactions"
 noteIdOrUrl: "Note ID or URL"
+migration: "Migration"
+moveTo: "Move current account to new account"
+moveToLabel: "Account you're moving to:"
+moveAccountDescription: "This process is irreversible. Make sure you've set up an alias for this account on your new account before moving. Please enter the tag of the account formatted like @person@instance.com"
+moveFrom: "Move to this account from an older account"
+moveFromLabel: "Account you're moving from:"
+moveFromDescription: "This will set an alias of your old account so that you can move from that account to this current one. Do this BEFORE moving from your older account. Please enter the tag of the account formatted like @person@instance.com"
+migrationConfirm: "Are you absolutely sure you want to migrate your acccount to {account}? Once you do this, you won't be able to reverse it, and you won't be able to use your account normally again.\nAlso, please ensure that you've set this current account as the account you're moving from."
+accountMoved: "User has moved to a new account:"
+
 _achievements:
   earnedAt: "Unlocked at"
   _types:
@@ -1898,4 +1908,3 @@ _webhookSettings:
     renote: "When renoted"
     reaction: "When receiving a reaction"
     mention: "When being mentioned"
-
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 04e4d52b28..af47408c67 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -989,6 +989,15 @@ enableChartsForFederatedInstances: "リモートサーバーのチャートを
 showClipButtonInNoteFooter: "ノートのアクションにクリップを追加"
 largeNoteReactions: "ノートのリアクションを大きく表示"
 noteIdOrUrl: "ノートIDまたはURL"
+migration: "アカウントの引っ越し"
+moveTo: "このアカウントを新しいアカウントに引っ越す"
+moveToLabel: "引っ越し先のアカウント："
+moveAccountDescription: "この操作は取り消せません。まずは引っ越し先のアカウントでこのアカウントに対しエイリアスを作成したことを確認してください。エイリアス作成後、引っ越し先のアカウントをこのように入力してください：@person@instance.com"
+moveFrom: "別のアカウントからこのアカウントに引っ越す"
+moveFromLabel: "引っ越し元のアカウント："
+moveFromDescription: "別のアカウントからこのアカウントにフォロワーを引き継いで引っ越したい場合、ここでエイリアスを作成しておく必要があります。必ず引っ越しを実行する前に作成してください！引っ越し元のアカウントをこのように入力してください：@person@instance.com"
+migrationConfirm: "本当にこのアカウントを {account} に引っ越しますか？一度引っ越しを行うと取り消せず、二度とこのアカウントを元の状態で使用できなくなります。\nまた、引っ越し先のアカウントでエイリアスを作成したことを確認してください。"
+accountMoved: "このユーザーは新しいアカウントに引っ越しました："
 
 _achievements:
   earnedAt: "獲得日時"
@@ -1955,4 +1964,3 @@ _webhookSettings:
     renote: "Renoteされたとき"
     reaction: "リアクションがあったとき"
     mention: "メンションされたとき"
-
diff --git a/packages/backend/src/core/AccountMoveService.ts b/packages/backend/src/core/AccountMoveService.ts
new file mode 100644
index 0000000000..6a7727c57a
--- /dev/null
+++ b/packages/backend/src/core/AccountMoveService.ts
@@ -0,0 +1,114 @@
+import { Inject, Injectable } from '@nestjs/common';
+import { IsNull } from 'typeorm';
+
+import { bindThis } from '@/decorators.js';
+import { DI } from '@/di-symbols.js';
+import type { LocalUser } from '@/models/entities/User.js';
+import { User } from '@/models/entities/User.js';
+import type { FollowingsRepository, UsersRepository } from '@/models/index.js';
+
+import { GlobalEventService } from '@/core/GlobalEventService.js';
+import { UserFollowingService } from '@/core/UserFollowingService.js';
+import { ApDeliverManagerService } from '@/core/activitypub/ApDeliverManagerService.js';
+import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { AccountUpdateService } from '@/core/AccountUpdateService.js';
+import { RelayService } from '@/core/RelayService.js';
+
+@Injectable()
+export class AccountMoveService {
+	constructor(
+		@Inject(DI.usersRepository)
+		private usersRepository: UsersRepository,
+
+		@Inject(DI.followingsRepository)
+		private followingsRepository: FollowingsRepository,
+
+		private userEntityService: UserEntityService,
+		private apRendererService: ApRendererService,
+		private apDeliverManagerService: ApDeliverManagerService,
+		private globalEventService: GlobalEventService,
+		private userFollowingService: UserFollowingService,
+		private accountUpdateService: AccountUpdateService,
+		private relayService: RelayService,
+	) {
+	}
+
+	/**
+	 * Move a local account to a remote account.
+	 *
+	 * After delivering Move activity, its local followers unfollow the old account and then follow the new one.
+	 */
+	@bindThis
+	public async moveToRemote(src: LocalUser, dst: User): Promise<unknown> {
+		// Make sure that the destination is a remote account.
+		if (this.userEntityService.isLocalUser(dst)) throw new Error('move destiantion is not remote');
+		if (!dst.uri) throw new Error('destination uri is empty');
+
+		// add movedToUri to indicate that the user has moved
+		const update = {} as Partial<User>;
+		update.alsoKnownAs = src.alsoKnownAs?.concat([dst.uri]) ?? [dst.uri];
+		update.movedToUri = dst.uri;
+		await this.usersRepository.update(src.id, update);
+
+		const srcPerson = await this.apRendererService.renderPerson(src);
+		const updateAct = this.apRendererService.addContext(this.apRendererService.renderUpdate(srcPerson, src));
+		await this.apDeliverManagerService.deliverToFollowers(src, updateAct);
+		this.relayService.deliverToRelays(src, updateAct);
+
+		// Deliver Move activity to the followers of the old account
+		const moveAct = this.apRendererService.addContext(this.apRendererService.renderMove(src, dst));
+		await this.apDeliverManagerService.deliverToFollowers(src, moveAct);
+
+		// Publish meUpdated event
+		const iObj = await this.userEntityService.pack<true, true>(src.id, src, { detail: true, includeSecrets: true });
+		this.globalEventService.publishMainStream(src.id, 'meUpdated', iObj);
+
+		// follow the new account and unfollow the old one
+		const followings = await this.followingsRepository.find({
+			relations: {
+				follower: true,
+			},
+			where: {
+				followeeId: src.id,
+				followerHost: IsNull(), // follower is local
+			}
+		});
+		followings.forEach(async (following) => {
+			if (!following.follower) return;
+			try {
+				await this.userFollowingService.follow(following.follower, dst);
+				await this.userFollowingService.unfollow(following.follower, src);
+			} catch {
+				/* empty */
+			}
+		});
+
+		return iObj;
+	}
+
+	/**
+	 * Create an alias of an old remote account.
+	 *
+	 * The user's new profile will be published to the followers.
+	 */
+	@bindThis
+	public async createAlias(me: LocalUser, updates: Partial<User>): Promise<unknown> {
+		await this.usersRepository.update(me.id, updates);
+
+		// Publish meUpdated event
+		const iObj = await this.userEntityService.pack<true, true>(me.id, me, {
+			detail: true,
+			includeSecrets: true,
+		});
+		this.globalEventService.publishMainStream(me.id, 'meUpdated', iObj);
+
+		if (me.isLocked === false) {
+			await this.userFollowingService.acceptAllFollowRequests(me);
+		}
+
+		this.accountUpdateService.publishToFollowers(me.id);
+
+		return iObj;
+	}
+}
diff --git a/packages/backend/src/core/AccountUpdateService.ts b/packages/backend/src/core/AccountUpdateService.ts
index d8ba7b169d..b146fc66be 100644
--- a/packages/backend/src/core/AccountUpdateService.ts
+++ b/packages/backend/src/core/AccountUpdateService.ts
@@ -29,7 +29,7 @@ export class AccountUpdateService {
 	public async publishToFollowers(userId: User['id']) {
 		const user = await this.usersRepository.findOneBy({ id: userId });
 		if (user == null) throw new Error('user not found');
-	
+
 		// フォロワーがリモートユーザーかつ投稿者がローカルユーザーならUpdateを配信
 		if (this.userEntityService.isLocalUser(user)) {
 			const content = this.apRendererService.addContext(this.apRendererService.renderUpdate(await this.apRendererService.renderPerson(user), user));
diff --git a/packages/backend/src/core/CoreModule.ts b/packages/backend/src/core/CoreModule.ts
index ea6e229610..8775536e4a 100644
--- a/packages/backend/src/core/CoreModule.ts
+++ b/packages/backend/src/core/CoreModule.ts
@@ -1,4 +1,5 @@
 import { Module } from '@nestjs/common';
+import { AccountMoveService } from './AccountMoveService.js';
 import { AccountUpdateService } from './AccountUpdateService.js';
 import { AiService } from './AiService.js';
 import { AntennaService } from './AntennaService.js';
@@ -119,6 +120,7 @@ import type { Provider } from '@nestjs/common';
 
 //#region 文字列ベースでのinjection用(循環参照対応のため)
 const $LoggerService: Provider = { provide: 'LoggerService', useExisting: LoggerService };
+const $AccountMoveService: Provider = { provide: 'AccountMoveService', useExisting: AccountMoveService };
 const $AccountUpdateService: Provider = { provide: 'AccountUpdateService', useExisting: AccountUpdateService };
 const $AiService: Provider = { provide: 'AiService', useExisting: AiService };
 const $AntennaService: Provider = { provide: 'AntennaService', useExisting: AntennaService };
@@ -242,6 +244,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 	],
 	providers: [
 		LoggerService,
+		AccountMoveService,
 		AccountUpdateService,
 		AiService,
 		AntennaService,
@@ -359,6 +362,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 
 		//#region 文字列ベースでのinjection用(循環参照対応のため)
 		$LoggerService,
+		$AccountMoveService,
 		$AccountUpdateService,
 		$AiService,
 		$AntennaService,
@@ -477,6 +481,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 	exports: [
 		QueueModule,
 		LoggerService,
+		AccountMoveService,
 		AccountUpdateService,
 		AiService,
 		AntennaService,
@@ -593,6 +598,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 
 		//#region 文字列ベースでのinjection用(循環参照対応のため)
 		$LoggerService,
+		$AccountMoveService,
 		$AccountUpdateService,
 		$AiService,
 		$AntennaService,
diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
index 055bffe731..40d7ba551d 100644
--- a/packages/backend/src/core/activitypub/ApInboxService.ts
+++ b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -1,5 +1,5 @@
 import { Inject, Injectable } from '@nestjs/common';
-import { In } from 'typeorm';
+import { In, IsNull } from 'typeorm';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { UserFollowingService } from '@/core/UserFollowingService.js';
@@ -22,7 +22,7 @@ import { QueueService } from '@/core/QueueService.js';
 import type { UsersRepository, NotesRepository, FollowingsRepository, AbuseUserReportsRepository, FollowRequestsRepository } from '@/models/index.js';
 import { bindThis } from '@/decorators.js';
 import type { RemoteUser } from '@/models/entities/User.js';
-import { getApId, getApIds, getApType, isAccept, isActor, isAdd, isAnnounce, isBlock, isCollection, isCollectionOrOrderedCollection, isCreate, isDelete, isFlag, isFollow, isLike, isPost, isReject, isRemove, isTombstone, isUndo, isUpdate, validActor, validPost } from './type.js';
+import { getApHrefNullable, getApId, getApIds, getApType, getOneApHrefNullable, isAccept, isActor, isAdd, isAnnounce, isBlock, isCollection, isCollectionOrOrderedCollection, isCreate, isDelete, isFlag, isFollow, isLike, isMove, isPost, isReject, isRemove, isTombstone, isUndo, isUpdate, validActor, validPost } from './type.js';
 import { ApNoteService } from './models/ApNoteService.js';
 import { ApLoggerService } from './ApLoggerService.js';
 import { ApDbResolverService } from './ApDbResolverService.js';
@@ -31,7 +31,7 @@ import { ApAudienceService } from './ApAudienceService.js';
 import { ApPersonService } from './models/ApPersonService.js';
 import { ApQuestionService } from './models/ApQuestionService.js';
 import type { Resolver } from './ApResolverService.js';
-import type { IAccept, IAdd, IAnnounce, IBlock, ICreate, IDelete, IFlag, IFollow, ILike, IObject, IReject, IRemove, IUndo, IUpdate } from './type.js';
+import type { IAccept, IAdd, IAnnounce, IBlock, ICreate, IDelete, IFlag, IFollow, ILike, IObject, IReject, IRemove, IUndo, IUpdate, IMove } from './type.js';
 
 @Injectable()
 export class ApInboxService {
@@ -80,7 +80,7 @@ export class ApInboxService {
 	) {
 		this.logger = this.apLoggerService.logger;
 	}
-	
+
 	@bindThis
 	public async performActivity(actor: RemoteUser, activity: IObject) {
 		if (isCollectionOrOrderedCollection(activity)) {
@@ -139,6 +139,8 @@ export class ApInboxService {
 			await this.block(actor, activity);
 		} else if (isFlag(activity)) {
 			await this.flag(actor, activity);
+		} else if (isMove(activity)) {
+			await this.move(actor, activity);
 		} else {
 			this.logger.warn(`unrecognized activity type: ${activity.type}`);
 		}
@@ -147,15 +149,15 @@ export class ApInboxService {
 	@bindThis
 	private async follow(actor: RemoteUser, activity: IFollow): Promise<string> {
 		const followee = await this.apDbResolverService.getUserFromApId(activity.object);
-	
+
 		if (followee == null) {
 			return 'skip: followee not found';
 		}
-	
+
 		if (followee.host != null) {
 			return 'skip: フォローしようとしているユーザーはローカルユーザーではありません';
 		}
-	
+
 		await this.userFollowingService.follow(actor, followee, activity.id);
 		return 'ok';
 	}
@@ -183,16 +185,16 @@ export class ApInboxService {
 		const uri = activity.id ?? activity;
 
 		this.logger.info(`Accept: ${uri}`);
-	
+
 		const resolver = this.apResolverService.createResolver();
-	
+
 		const object = await resolver.resolve(activity.object).catch(err => {
 			this.logger.error(`Resolution failed: ${err}`);
 			throw err;
 		});
-	
+
 		if (isFollow(object)) return await this.acceptFollow(actor, object);
-	
+
 		return `skip: Unknown Accept type: ${getApType(object)}`;
 	}
 
@@ -225,18 +227,18 @@ export class ApInboxService {
 		if ('actor' in activity && actor.uri !== activity.actor) {
 			throw new Error('invalid actor');
 		}
-	
+
 		if (activity.target == null) {
 			throw new Error('target is null');
 		}
-	
+
 		if (activity.target === actor.featured) {
 			const note = await this.apNoteService.resolveNote(activity.object);
 			if (note == null) throw new Error('note not found');
 			await this.notePiningService.addPinned(actor, note.id);
 			return;
 		}
-	
+
 		throw new Error(`unknown target: ${activity.target}`);
 	}
 
@@ -405,10 +407,10 @@ export class ApInboxService {
 		if ('actor' in activity && actor.uri !== activity.actor) {
 			throw new Error('invalid actor');
 		}
-	
+
 		// 削除対象objectのtype
 		let formerType: string | undefined;
-	
+
 		if (typeof activity.object === 'string') {
 			// typeが不明だけど、どうせ消えてるのでremote resolveしない
 			formerType = undefined;
@@ -420,19 +422,19 @@ export class ApInboxService {
 				formerType = toSingle(object.type);
 			}
 		}
-	
+
 		const uri = getApId(activity.object);
-	
+
 		// type不明でもactorとobjectが同じならばそれはPersonに違いない
 		if (!formerType && actor.uri === uri) {
 			formerType = 'Person';
 		}
-	
+
 		// それでもなかったらおそらくNote
 		if (!formerType) {
 			formerType = 'Note';
 		}
-	
+
 		if (validPost.includes(formerType)) {
 			return await this.deleteNote(actor, uri);
 		} else if (validActor.includes(formerType)) {
@@ -445,44 +447,44 @@ export class ApInboxService {
 	@bindThis
 	private async deleteActor(actor: RemoteUser, uri: string): Promise<string> {
 		this.logger.info(`Deleting the Actor: ${uri}`);
-	
+
 		if (actor.uri !== uri) {
 			return `skip: delete actor ${actor.uri} !== ${uri}`;
 		}
-	
+
 		const user = await this.usersRepository.findOneBy({ id: actor.id });
 		if (user == null) {
 			return 'skip: actor not found';
 		} else if (user.isDeleted) {
 			return 'skip: already deleted';
 		}
-	
+
 		const job = await this.queueService.createDeleteAccountJob(actor);
-	
+
 		await this.usersRepository.update(actor.id, {
 			isDeleted: true,
 		});
-	
+
 		return `ok: queued ${job.name} ${job.id}`;
 	}
 
 	@bindThis
 	private async deleteNote(actor: RemoteUser, uri: string): Promise<string> {
 		this.logger.info(`Deleting the Note: ${uri}`);
-	
+
 		const unlock = await this.appLockService.getApLock(uri);
-	
+
 		try {
 			const note = await this.apDbResolverService.getNoteFromApId(uri);
-	
+
 			if (note == null) {
 				return 'message not found';
 			}
-	
+
 			if (note.userId !== actor.id) {
 				return '投稿を削除しようとしているユーザーは投稿の作成者ではありません';
 			}
-	
+
 			await this.noteDeleteService.delete(actor, note);
 			return 'ok: note deleted';
 		} finally {
@@ -536,23 +538,23 @@ export class ApInboxService {
 	@bindThis
 	private async rejectFollow(actor: RemoteUser, activity: IFollow): Promise<string> {
 		// ※ activityはこっちから投げたフォローリクエストなので、activity.actorは存在するローカルユーザーである必要がある
-	
+
 		const follower = await this.apDbResolverService.getUserFromApId(activity.actor);
-	
+
 		if (follower == null) {
 			return 'skip: follower not found';
 		}
-	
+
 		if (!this.userEntityService.isLocalUser(follower)) {
 			return 'skip: follower is not a local user';
 		}
-	
+
 		// relay
 		const match = activity.id?.match(/follow-relay\/(\w+)/);
 		if (match) {
 			return await this.relayService.relayRejected(match[1]);
 		}
-	
+
 		await this.userFollowingService.remoteReject(actor, follower);
 		return 'ok';
 	}
@@ -562,18 +564,18 @@ export class ApInboxService {
 		if ('actor' in activity && actor.uri !== activity.actor) {
 			throw new Error('invalid actor');
 		}
-	
+
 		if (activity.target == null) {
 			throw new Error('target is null');
 		}
-	
+
 		if (activity.target === actor.featured) {
 			const note = await this.apNoteService.resolveNote(activity.object);
 			if (note == null) throw new Error('note not found');
 			await this.notePiningService.removePinned(actor, note.id);
 			return;
 		}
-	
+
 		throw new Error(`unknown target: ${activity.target}`);
 	}
 
@@ -582,24 +584,24 @@ export class ApInboxService {
 		if ('actor' in activity && actor.uri !== activity.actor) {
 			throw new Error('invalid actor');
 		}
-	
+
 		const uri = activity.id ?? activity;
-	
+
 		this.logger.info(`Undo: ${uri}`);
-	
+
 		const resolver = this.apResolverService.createResolver();
-	
+
 		const object = await resolver.resolve(activity.object).catch(e => {
 			this.logger.error(`Resolution failed: ${e}`);
 			throw e;
 		});
-	
+
 		if (isFollow(object)) return await this.undoFollow(actor, object);
 		if (isBlock(object)) return await this.undoBlock(actor, object);
 		if (isLike(object)) return await this.undoLike(actor, object);
 		if (isAnnounce(object)) return await this.undoAnnounce(actor, object);
 		if (isAccept(object)) return await this.undoAccept(actor, object);
-	
+
 		return `skip: unknown object type ${getApType(object)}`;
 	}
 
@@ -609,17 +611,17 @@ export class ApInboxService {
 		if (follower == null) {
 			return 'skip: follower not found';
 		}
-	
+
 		const following = await this.followingsRepository.findOneBy({
 			followerId: follower.id,
 			followeeId: actor.id,
 		});
-	
+
 		if (following) {
 			await this.userFollowingService.unfollow(follower, actor);
 			return 'ok: unfollowed';
 		}
-	
+
 		return 'skip: フォローされていない';
 	}
 
@@ -708,16 +710,16 @@ export class ApInboxService {
 		if ('actor' in activity && actor.uri !== activity.actor) {
 			return 'skip: invalid actor';
 		}
-	
+
 		this.logger.debug('Update');
-	
+
 		const resolver = this.apResolverService.createResolver();
-	
+
 		const object = await resolver.resolve(activity.object).catch(e => {
 			this.logger.error(`Resolution failed: ${e}`);
 			throw e;
 		});
-	
+
 		if (isActor(object)) {
 			await this.apPersonService.updatePerson(actor.uri!, resolver, object);
 			return 'ok: Person updated';
@@ -728,4 +730,55 @@ export class ApInboxService {
 			return `skip: Unknown type: ${getApType(object)}`;
 		}
 	}
+
+	@bindThis
+	private async move(actor: RemoteUser, activity: IMove): Promise<string> {
+		// fetch the new and old accounts
+		const targetUri = getApHrefNullable(activity.target);
+		if (!targetUri) return 'skip: invalid activity target';
+		const new_acc = await this.apPersonService.resolvePerson(targetUri);
+		const old_acc = await this.apPersonService.resolvePerson(actor.uri);
+
+		// update them if they're remote
+		if (new_acc.uri) await this.apPersonService.updatePerson(new_acc.uri);
+		if (old_acc.uri) await this.apPersonService.updatePerson(old_acc.uri);
+
+		// check if alsoKnownAs of the new account is valid
+		let isValidMove = true;
+		if (old_acc.uri) {
+			if (!new_acc.alsoKnownAs?.includes(old_acc.uri)) {
+				isValidMove = false;
+			}
+		} else if (!new_acc.alsoKnownAs?.includes(old_acc.id)) {
+			isValidMove = false;
+		}
+		if (!isValidMove) {
+			return 'skip: accounts invalid';
+		}
+
+		// add target uri to movedToUri in order to indicate that the user has moved
+		await this.usersRepository.update(old_acc.id, { movedToUri: targetUri });
+
+		// follow the new account and unfollow the old one
+		const followings = await this.followingsRepository.find({
+			relations: {
+				follower: true,
+			},
+			where: {
+				followeeId: old_acc.id,
+				followerHost: IsNull(), // follower is local
+			}
+		});
+		followings.forEach(async (following) => {
+			if (!following.follower) return;
+			try {
+				await this.userFollowingService.follow(following.follower, new_acc);
+				await this.userFollowingService.unfollow(following.follower, old_acc);
+			} catch {
+				/* empty */
+			}
+		});
+
+		return 'ok';
+	}
 }
diff --git a/packages/backend/src/core/activitypub/ApRendererService.ts b/packages/backend/src/core/activitypub/ApRendererService.ts
index b250b796d6..0b22aa9bcf 100644
--- a/packages/backend/src/core/activitypub/ApRendererService.ts
+++ b/packages/backend/src/core/activitypub/ApRendererService.ts
@@ -25,7 +25,7 @@ import { CustomEmojiService } from '@/core/CustomEmojiService.js';
 import { isNotNull } from '@/misc/is-not-null.js';
 import { LdSignatureService } from './LdSignatureService.js';
 import { ApMfmService } from './ApMfmService.js';
-import type { IAccept, IActivity, IAdd, IAnnounce, IApDocument, IApEmoji, IApHashtag, IApImage, IApMention, IBlock, ICreate, IDelete, IFlag, IFollow, IKey, ILike, IObject, IPost, IQuestion, IReject, IRemove, ITombstone, IUndo, IUpdate } from './type.js';
+import type { IAccept, IActivity, IAdd, IAnnounce, IApDocument, IApEmoji, IApHashtag, IApImage, IApMention, IBlock, ICreate, IDelete, IFlag, IFollow, IKey, ILike, IMove, IObject, IPost, IQuestion, IReject, IRemove, ITombstone, IUndo, IUpdate } from './type.js';
 import type { IIdentifier } from './models/identifier.js';
 
 @Injectable()
@@ -292,6 +292,22 @@ export class ApRendererService {
 		};
 	}
 
+	@bindThis
+	public renderMove(
+		src: { id: User['id']; host: User['host']; uri: User['host'] },
+		dst: { id: User['id']; host: User['host']; uri: User['host'] },
+	): IMove {
+		const actor = this.userEntityService.isLocalUser(src) ? `${this.config.url}/users/${src.id}` : src.uri!;
+		const target = this.userEntityService.isLocalUser(dst) ? `${this.config.url}/users/${dst.id}` : dst.uri!;
+		return {
+			id: `${this.config.url}/moves/${src.id}/${dst.id}`,
+			actor,
+			type: 'Move',
+			object: actor,
+			target,
+		};
+	}
+
 	@bindThis
 	public async renderNote(note: Note, dive = true): Promise<IPost> {
 		const getPromisedFiles = async (ids: string[]) => {
@@ -498,6 +514,14 @@ export class ApRendererService {
 			attachment: attachment.length ? attachment : undefined,
 		} as any;
 
+		if (user.movedToUri) {
+			person.movedTo = user.movedToUri;
+		}
+
+		if (user.alsoKnownAs) {
+			person.alsoKnownAs = user.alsoKnownAs;
+		}
+
 		if (profile.birthday) {
 			person['vcard:bday'] = profile.birthday;
 		}
diff --git a/packages/backend/src/core/activitypub/models/ApPersonService.ts b/packages/backend/src/core/activitypub/models/ApPersonService.ts
index 664e7eb4ea..21797cfcb7 100644
--- a/packages/backend/src/core/activitypub/models/ApPersonService.ts
+++ b/packages/backend/src/core/activitypub/models/ApPersonService.ts
@@ -281,6 +281,8 @@ export class ApPersonService implements OnModuleInit {
 					lastFetchedAt: new Date(),
 					name: truncate(person.name, nameLength),
 					isLocked: !!person.manuallyApprovesFollowers,
+					movedToUri: person.movedTo,
+					alsoKnownAs: person.alsoKnownAs,
 					isExplorable: !!person.discoverable,
 					username: person.preferredUsername,
 					usernameLower: person.preferredUsername!.toLowerCase(),
@@ -473,6 +475,8 @@ export class ApPersonService implements OnModuleInit {
 			isBot: getApType(object) === 'Service',
 			isCat: (person as any).isCat === true,
 			isLocked: !!person.manuallyApprovesFollowers,
+			movedToUri: person.movedTo ?? null,
+			alsoKnownAs: person.alsoKnownAs ?? null,
 			isExplorable: !!person.discoverable,
 		} as Partial<User>;
 
diff --git a/packages/backend/src/core/activitypub/type.ts b/packages/backend/src/core/activitypub/type.ts
index 8851946330..625135da6c 100644
--- a/packages/backend/src/core/activitypub/type.ts
+++ b/packages/backend/src/core/activitypub/type.ts
@@ -157,6 +157,8 @@ export interface IActor extends IObject {
 	name?: string;
 	preferredUsername?: string;
 	manuallyApprovesFollowers?: boolean;
+	movedTo?: string;
+	alsoKnownAs?: string[];
 	discoverable?: boolean;
 	inbox: string;
 	sharedInbox?: string;	// 後方互換性のため
@@ -300,6 +302,11 @@ export interface IFlag extends IActivity {
 	type: 'Flag';
 }
 
+export interface IMove extends IActivity {
+	type: 'Move';
+	target: IObject | string;
+}
+
 export const isCreate = (object: IObject): object is ICreate => getApType(object) === 'Create';
 export const isDelete = (object: IObject): object is IDelete => getApType(object) === 'Delete';
 export const isUpdate = (object: IObject): object is IUpdate => getApType(object) === 'Update';
@@ -314,3 +321,4 @@ export const isLike = (object: IObject): object is ILike => getApType(object) ==
 export const isAnnounce = (object: IObject): object is IAnnounce => getApType(object) === 'Announce';
 export const isBlock = (object: IObject): object is IBlock => getApType(object) === 'Block';
 export const isFlag = (object: IObject): object is IFlag => getApType(object) === 'Flag';
+export const isMove = (object: IObject): object is IMove => getApType(object) === 'Move';
diff --git a/packages/backend/src/core/entities/UserEntityService.ts b/packages/backend/src/core/entities/UserEntityService.ts
index cbe94451cc..e02f7535d4 100644
--- a/packages/backend/src/core/entities/UserEntityService.ts
+++ b/packages/backend/src/core/entities/UserEntityService.ts
@@ -15,6 +15,7 @@ import { birthdaySchema, descriptionSchema, localUsernameSchema, locationSchema,
 import type { UsersRepository, UserSecurityKeysRepository, FollowingsRepository, FollowRequestsRepository, BlockingsRepository, MutingsRepository, DriveFilesRepository, NoteUnreadsRepository, ChannelFollowingsRepository, UserNotePiningsRepository, UserProfilesRepository, InstancesRepository, AnnouncementReadsRepository, AnnouncementsRepository, PagesRepository, UserProfile, RenoteMutingsRepository } from '@/models/index.js';
 import { bindThis } from '@/decorators.js';
 import { RoleService } from '@/core/RoleService.js';
+import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
 import { FederatedInstanceService } from '@/core/FederatedInstanceService.js';
 import type { OnModuleInit } from '@nestjs/common';
 import type { AntennaService } from '../AntennaService.js';
@@ -25,7 +26,7 @@ import type { PageEntityService } from './PageEntityService.js';
 
 type IsUserDetailed<Detailed extends boolean> = Detailed extends true ? Packed<'UserDetailed'> : Packed<'UserLite'>;
 type IsMeAndIsUserDetailed<ExpectsMe extends boolean | null, Detailed extends boolean> =
-	Detailed extends true ? 
+	Detailed extends true ?
 		ExpectsMe extends true ? Packed<'MeDetailed'> :
 		ExpectsMe extends false ? Packed<'UserDetailedNotMe'> :
 		Packed<'UserDetailed'> :
@@ -47,6 +48,7 @@ function isRemoteUser(user: User | { host: User['host'] }): boolean {
 
 @Injectable()
 export class UserEntityService implements OnModuleInit {
+	private apPersonService: ApPersonService;
 	private noteEntityService: NoteEntityService;
 	private driveFileEntityService: DriveFileEntityService;
 	private pageEntityService: PageEntityService;
@@ -122,6 +124,7 @@ export class UserEntityService implements OnModuleInit {
 	}
 
 	onModuleInit() {
+		this.apPersonService = this.moduleRef.get('ApPersonService');
 		this.noteEntityService = this.moduleRef.get('NoteEntityService');
 		this.driveFileEntityService = this.moduleRef.get('DriveFileEntityService');
 		this.pageEntityService = this.moduleRef.get('PageEntityService');
@@ -237,7 +240,7 @@ export class UserEntityService implements OnModuleInit {
 	@bindThis
 	public async getHasUnreadNotification(userId: User['id']): Promise<boolean> {
 		const latestReadNotificationId = await this.redisClient.get(`latestReadNotification:${userId}`);
-		
+
 		const latestNotificationIdsRes = await this.redisClient.xrevrange(
 			`notificationTimeline:${userId}`,
 			'+',
@@ -363,6 +366,8 @@ export class UserEntityService implements OnModuleInit {
 			...(opts.detail ? {
 				url: profile!.url,
 				uri: user.uri,
+				movedToUri: user.movedToUri ? await this.apPersonService.resolvePerson(user.movedToUri) : null,
+				alsoKnownAs: user.alsoKnownAs,
 				createdAt: user.createdAt.toISOString(),
 				updatedAt: user.updatedAt ? user.updatedAt.toISOString() : null,
 				lastFetchedAt: user.lastFetchedAt ? user.lastFetchedAt.toISOString() : null,
diff --git a/packages/backend/src/models/entities/User.ts b/packages/backend/src/models/entities/User.ts
index ca53c57d5a..04dfa21107 100644
--- a/packages/backend/src/models/entities/User.ts
+++ b/packages/backend/src/models/entities/User.ts
@@ -68,6 +68,19 @@ export class User {
 	})
 	public followingCount: number;
 
+	@Column('varchar', {
+		length: 512,
+		nullable: true,
+		comment: 'The URI of the new account of the User',
+	})
+	public movedToUri: string | null;
+
+	@Column('simple-array', {
+		nullable: true,
+		comment: 'URIs the user is known as too',
+	})
+	public alsoKnownAs: string[] | null;
+
 	@Column('integer', {
 		default: 0,
 		comment: 'The count of notes.',
diff --git a/packages/backend/src/models/json-schema/user.ts b/packages/backend/src/models/json-schema/user.ts
index e388a77a5e..7d40979e3d 100644
--- a/packages/backend/src/models/json-schema/user.ts
+++ b/packages/backend/src/models/json-schema/user.ts
@@ -72,6 +72,18 @@ export const packedUserDetailedNotMeOnlySchema = {
 			format: 'uri',
 			nullable: true, optional: false,
 		},
+		movedToUri: {
+			type: 'string',
+			format: 'uri',
+			nullable: true,
+			optional: false,
+		},
+		alsoKnownAs: {
+			type: 'array',
+			format: 'uri',
+			nullable: true,
+			optional: false,
+		},
 		createdAt: {
 			type: 'string',
 			nullable: false, optional: false,
diff --git a/packages/backend/src/server/api/EndpointsModule.ts b/packages/backend/src/server/api/EndpointsModule.ts
index cab2477414..5a53b3faf7 100644
--- a/packages/backend/src/server/api/EndpointsModule.ts
+++ b/packages/backend/src/server/api/EndpointsModule.ts
@@ -220,6 +220,8 @@ import * as ep___i_signinHistory from './endpoints/i/signin-history.js';
 import * as ep___i_unpin from './endpoints/i/unpin.js';
 import * as ep___i_updateEmail from './endpoints/i/update-email.js';
 import * as ep___i_update from './endpoints/i/update.js';
+import * as ep___i_move from './endpoints/i/move.js';
+import * as ep___i_knownAs from './endpoints/i/known-as.js';
 import * as ep___i_webhooks_create from './endpoints/i/webhooks/create.js';
 import * as ep___i_webhooks_show from './endpoints/i/webhooks/show.js';
 import * as ep___i_webhooks_list from './endpoints/i/webhooks/list.js';
@@ -551,6 +553,8 @@ const $i_signinHistory: Provider = { provide: 'ep:i/signin-history', useClass: e
 const $i_unpin: Provider = { provide: 'ep:i/unpin', useClass: ep___i_unpin.default };
 const $i_updateEmail: Provider = { provide: 'ep:i/update-email', useClass: ep___i_updateEmail.default };
 const $i_update: Provider = { provide: 'ep:i/update', useClass: ep___i_update.default };
+const $i_move: Provider = { provide: 'ep:i/move', useClass: ep___i_move.default };
+const $i_knownAs: Provider = { provide: 'ep:i/known-as', useClass: ep___i_knownAs.default };
 const $i_webhooks_create: Provider = { provide: 'ep:i/webhooks/create', useClass: ep___i_webhooks_create.default };
 const $i_webhooks_list: Provider = { provide: 'ep:i/webhooks/list', useClass: ep___i_webhooks_list.default };
 const $i_webhooks_show: Provider = { provide: 'ep:i/webhooks/show', useClass: ep___i_webhooks_show.default };
@@ -886,6 +890,8 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
 		$i_unpin,
 		$i_updateEmail,
 		$i_update,
+		$i_move,
+		$i_knownAs,
 		$i_webhooks_create,
 		$i_webhooks_list,
 		$i_webhooks_show,
@@ -1215,6 +1221,8 @@ const $retention: Provider = { provide: 'ep:retention', useClass: ep___retention
 		$i_unpin,
 		$i_updateEmail,
 		$i_update,
+		$i_move,
+		$i_knownAs,
 		$i_webhooks_create,
 		$i_webhooks_list,
 		$i_webhooks_show,
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index e33c2349cd..c8375ca149 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -220,6 +220,8 @@ import * as ep___i_signinHistory from './endpoints/i/signin-history.js';
 import * as ep___i_unpin from './endpoints/i/unpin.js';
 import * as ep___i_updateEmail from './endpoints/i/update-email.js';
 import * as ep___i_update from './endpoints/i/update.js';
+import * as ep___i_move from './endpoints/i/move.js';
+import * as ep___i_knownAs from './endpoints/i/known-as.js';
 import * as ep___i_webhooks_create from './endpoints/i/webhooks/create.js';
 import * as ep___i_webhooks_show from './endpoints/i/webhooks/show.js';
 import * as ep___i_webhooks_list from './endpoints/i/webhooks/list.js';
@@ -549,6 +551,8 @@ const eps = [
 	['i/unpin', ep___i_unpin],
 	['i/update-email', ep___i_updateEmail],
 	['i/update', ep___i_update],
+	['i/move', ep___i_move],
+	['i/known-as', ep___i_knownAs],
 	['i/webhooks/create', ep___i_webhooks_create],
 	['i/webhooks/list', ep___i_webhooks_list],
 	['i/webhooks/show', ep___i_webhooks_show],
diff --git a/packages/backend/src/server/api/endpoints/i/known-as.ts b/packages/backend/src/server/api/endpoints/i/known-as.ts
new file mode 100644
index 0000000000..964704d82b
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/i/known-as.ts
@@ -0,0 +1,92 @@
+import { Injectable } from '@nestjs/common';
+import ms from 'ms';
+
+import { User } from '@/models/entities/User.js';
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ApiError } from '@/server/api/error.js';
+
+import { AccountMoveService } from '@/core/AccountMoveService.js';
+import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { ApiLoggerService } from '@/server/api/ApiLoggerService.js';
+
+export const meta = {
+	tags: ['users'],
+
+	secure: true,
+	requireCredential: true,
+
+	limit: {
+		duration: ms('1day'),
+		max: 30,
+	},
+
+	errors: {
+		noSuchUser: {
+			message: 'No such user.',
+			code: 'NO_SUCH_USER',
+			id: 'fcd2eef9-a9b2-4c4f-8624-038099e90aa5',
+		},
+		notRemote: {
+			message: 'User is not remote. You can only migrate from other instances.',
+			code: 'NOT_REMOTE',
+			id: '4362f8dc-731f-4ad8-a694-be2a88922a24',
+		},
+		uriNull: {
+			message: 'User ActivityPup URI is null.',
+			code: 'URI_NULL',
+			id: 'bf326f31-d430-4f97-9933-5d61e4d48a23',
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		alsoKnownAs: { type: 'string' },
+	},
+	required: ['alsoKnownAs'],
+} as const;
+
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> {
+	constructor(
+		private userEntityService: UserEntityService,
+		private remoteUserResolveService: RemoteUserResolveService,
+		private apiLoggerService: ApiLoggerService,
+		private accountMoveService: AccountMoveService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			// Check parameter
+			if (!ps.alsoKnownAs) throw new ApiError(meta.errors.noSuchUser);
+
+			let unfiltered = ps.alsoKnownAs;
+			const updates = {} as Partial<User>;
+
+			if (!unfiltered) {
+				updates.alsoKnownAs = null;
+			} else {
+				// Parse user's input into the old account
+				if (unfiltered.startsWith('acct:')) unfiltered = unfiltered.substring(5);
+				if (unfiltered.startsWith('@')) unfiltered = unfiltered.substring(1);
+				if (!unfiltered.includes('@')) throw new ApiError(meta.errors.notRemote);
+
+				const userAddress = unfiltered.split('@');
+				// Retrieve the old account
+				const knownAs = await this.remoteUserResolveService.resolveUser(userAddress[0], userAddress[1]).catch((e) => {
+					this.apiLoggerService.logger.warn(`failed to resolve remote user: ${e}`);
+					throw new ApiError(meta.errors.noSuchUser);
+				});
+
+				const toUrl: string | null = knownAs.uri;
+				if (!toUrl) throw new ApiError(meta.errors.uriNull);
+				// Only allow moving from a remote account
+				if (this.userEntityService.isLocalUser(knownAs)) throw new ApiError(meta.errors.notRemote);
+
+				updates.alsoKnownAs = updates.alsoKnownAs?.concat([toUrl]) ?? [toUrl];
+			}
+
+			return await this.accountMoveService.createAlias(me, updates);
+		});
+	}
+}
diff --git a/packages/backend/src/server/api/endpoints/i/move.ts b/packages/backend/src/server/api/endpoints/i/move.ts
new file mode 100644
index 0000000000..346d8f95bb
--- /dev/null
+++ b/packages/backend/src/server/api/endpoints/i/move.ts
@@ -0,0 +1,136 @@
+import { Inject, Injectable } from '@nestjs/common';
+import ms from 'ms';
+
+import type { Config } from '@/config.js';
+import { DI } from '@/di-symbols.js';
+
+import { Endpoint } from '@/server/api/endpoint-base.js';
+import { ApiError } from '@/server/api/error.js';
+
+import { AccountMoveService } from '@/core/AccountMoveService.js';
+import { RemoteUserResolveService } from '@/core/RemoteUserResolveService.js';
+import { UserEntityService } from '@/core/entities/UserEntityService.js';
+import { ApiLoggerService } from '@/server/api/ApiLoggerService.js';
+import { GetterService } from '@/server/api/GetterService.js';
+import { ApPersonService } from '@/core/activitypub/models/ApPersonService.js';
+
+export const meta = {
+	tags: ['users'],
+
+	secure: true,
+	requireCredential: true,
+	limit: {
+		duration: ms('1day'),
+		max: 5,
+	},
+
+	errors: {
+		noSuchMoveTarget: {
+			message: 'No such move target.',
+			code: 'NO_SUCH_MOVE_TARGET',
+			id: 'b5c90186-4ab0-49c8-9bba-a1f76c202ba4',
+		},
+		remoteAccountForbids: {
+			message:
+				'Remote account doesn\'t have proper \'Known As\' alias. Did you remember to set it?',
+			code: 'REMOTE_ACCOUNT_FORBIDS',
+			id: 'b5c90186-4ab0-49c8-9bba-a1f766282ba4',
+		},
+		notRemote: {
+			message: 'User is not remote. You can only migrate to other instances.',
+			code: 'NOT_REMOTE',
+			id: '4362f8dc-731f-4ad8-a694-be2a88922a24',
+		},
+		rootForbidden: {
+			message: 'The root cant migrate.',
+			code: 'NOT_ROOT_FORBIDDEN',
+			id: '4362e8dc-731f-4ad8-a694-be2a88922a24',
+		},
+		noSuchUser: {
+			message: 'No such user.',
+			code: 'NO_SUCH_USER',
+			id: 'fcd2eef9-a9b2-4c4f-8624-038099e90aa5',
+		},
+		uriNull: {
+			message: 'User ActivityPup URI is null.',
+			code: 'URI_NULL',
+			id: 'bf326f31-d430-4f97-9933-5d61e4d48a23',
+		},
+		localUriNull: {
+			message: 'Local User ActivityPup URI is null.',
+			code: 'URI_NULL',
+			id: '95ba11b9-90e8-43a5-ba16-7acc1ab32e71',
+		},
+		alreadyMoved: {
+			message: 'Account was already moved to another account.',
+			code: 'ALREADY_MOVED',
+			id: 'b234a14e-9ebe-4581-8000-074b3c215962',
+		},
+	},
+} as const;
+
+export const paramDef = {
+	type: 'object',
+	properties: {
+		moveToAccount: { type: 'string' },
+	},
+	required: ['moveToAccount'],
+} as const;
+
+// eslint-disable-next-line import/no-default-export
+@Injectable()
+export default class extends Endpoint<typeof meta, typeof paramDef> {
+	constructor(
+		@Inject(DI.config)
+		private config: Config,
+
+		private userEntityService: UserEntityService,
+		private remoteUserResolveService: RemoteUserResolveService,
+		private apiLoggerService: ApiLoggerService,
+		private accountMoveService: AccountMoveService,
+		private getterService: GetterService,
+		private apPersonService: ApPersonService,
+	) {
+		super(meta, paramDef, async (ps, me) => {
+			// Check parameter
+			if (!ps.moveToAccount) throw new ApiError(meta.errors.noSuchMoveTarget);
+			// Abort if user is the root
+			if (me.isRoot) throw new ApiError(meta.errors.rootForbidden);
+			// Abort if user has already moved
+			if (me.movedToUri) throw new ApiError(meta.errors.alreadyMoved);
+
+			let unfiltered = ps.moveToAccount;
+			if (!unfiltered) throw new ApiError(meta.errors.noSuchMoveTarget);
+
+			// Parse user's input into the destination account
+			if (unfiltered.startsWith('acct:')) unfiltered = unfiltered.substring(5);
+			if (unfiltered.startsWith('@')) unfiltered = unfiltered.substring(1);
+			if (!unfiltered.includes('@')) throw new ApiError(meta.errors.notRemote);
+
+			const userAddress = unfiltered.split('@');
+			// Retrieve the destination account
+			const remoteMoveTo = await this.remoteUserResolveService.resolveUser(userAddress[0], userAddress[1]).catch((e) => {
+				this.apiLoggerService.logger.warn(`failed to resolve remote user: ${e}`);
+				throw new ApiError(meta.errors.noSuchMoveTarget);
+			});
+			const moveTo = await this.getterService.getRemoteUser(remoteMoveTo.id);
+			if (!moveTo.uri) throw new ApiError(meta.errors.uriNull);
+			await this.apPersonService.updatePerson(moveTo.uri);
+			// Only allow moving to a remote account
+			if (this.userEntityService.isLocalUser(moveTo)) throw new ApiError(meta.errors.notRemote);
+
+			let allowed = false;
+
+			const fromUrl = `${this.config.url}/users/${me.id}`;
+			// Make sure that the user has indicated the old account as an alias
+			moveTo.alsoKnownAs?.forEach((elem) => {
+				if (fromUrl.includes(elem)) allowed = true;
+			});
+
+			// Abort if unintended
+			if (!(allowed && moveTo.uri && fromUrl)) throw new ApiError(meta.errors.remoteAccountForbids);
+
+			return await this.accountMoveService.moveToRemote(me, moveTo);
+		});
+	}
+}
diff --git a/packages/frontend/src/components/MkAccountMoved.vue b/packages/frontend/src/components/MkAccountMoved.vue
new file mode 100644
index 0000000000..1d4fbd9a54
--- /dev/null
+++ b/packages/frontend/src/components/MkAccountMoved.vue
@@ -0,0 +1,33 @@
+<template>
+<div class="msjugskd _block">
+	<i class="ti ti-plane-departure" style="margin-right: 8px;"></i>
+	{{ i18n.ts.accountMoved }}
+	<MkMention class="link" :username="acct" :host="host ?? localHost"/>
+</div>
+</template>
+
+<script lang="ts" setup>
+import MkMention from './MkMention.vue';
+import { i18n } from '@/i18n';
+import { host as localHost } from '@/config';
+
+defineProps<{
+	acct: string;
+	host: string;
+}>();
+</script>
+
+<style lang="scss" scoped>
+.msjugskd {
+	padding: 16px;
+	font-size: 90%;
+	background: var(--infoWarnBg);
+	color: var(--error);
+	border-radius: var(--radius);
+
+	> .link {
+		margin-left: 4px;
+		color: var(--accent);
+	}
+}
+</style>
diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue
index ae36466eec..4e22d7b60b 100644
--- a/packages/frontend/src/pages/settings/index.vue
+++ b/packages/frontend/src/pages/settings/index.vue
@@ -130,6 +130,11 @@ const menuDef = computed(() => [{
 }, {
 	title: i18n.ts.otherSettings,
 	items: [{
+		icon: 'ti ti-plane',
+		text: i18n.ts.migration,
+		to: '/settings/migration',
+		active: currentPage?.route.name === 'migration',
+	}, {
 		icon: 'ti ti-package',
 		text: i18n.ts.importAndExport,
 		to: '/settings/import-export',
diff --git a/packages/frontend/src/pages/settings/migration.vue b/packages/frontend/src/pages/settings/migration.vue
new file mode 100644
index 0000000000..0295aeae18
--- /dev/null
+++ b/packages/frontend/src/pages/settings/migration.vue
@@ -0,0 +1,73 @@
+<template>
+<div class="_gaps_m">
+	<FormSection>
+		<template #label>{{ i18n.ts.moveTo }}</template>
+		<MkInput v-model="moveToAccount" manual-save>
+			<template #prefix><i class="ti ti-plane-departure"></i></template>
+			<template #label>{{ i18n.ts.moveToLabel }}</template>
+		</MkInput>
+	</FormSection>
+	<FormInfo warn>{{ i18n.ts.moveAccountDescription }}</FormInfo>
+
+	<FormSection>
+		<template #label>{{ i18n.ts.moveFrom }}</template>
+		<MkInput v-model="accountAlias" manual-save>
+			<template #prefix><i class="ti ti-plane-arrival"></i></template>
+			<template #label>{{ i18n.ts.moveFromLabel }}</template>
+		</MkInput>
+	</FormSection>
+	<FormInfo warn>{{ i18n.ts.moveFromDescription }}</FormInfo>
+</div>
+</template>
+
+<script lang="ts" setup>
+import { ref, watch } from 'vue';
+import FormSection from '@/components/form/section.vue';
+import FormInfo from '@/components/MkInfo.vue';
+import MkInput from '@/components/MkInput.vue';
+import * as os from '@/os';
+import { i18n } from '@/i18n';
+import { definePageMetadata } from '@/scripts/page-metadata';
+
+const moveToAccount = ref('');
+const accountAlias = ref('');
+
+async function move(): Promise<void> {
+	const account = moveToAccount.value;
+	const confirm = await os.confirm({
+		type: 'warning',
+		text: i18n.t('migrationConfirm', { account: account.toString() }),
+	});
+	if (confirm.canceled) return;
+	os.apiWithDialog('i/move', {
+		moveToAccount: account,
+	});
+}
+
+async function save(): Promise<void> {
+	const account = accountAlias.value;
+	os.apiWithDialog('i/known-as', {
+		alsoKnownAs: account,
+	});
+}
+
+watch(accountAlias, async () => {
+	await save();
+});
+
+watch(moveToAccount, async () => {
+	await move();
+});
+
+definePageMetadata({
+	title: i18n.ts.migration,
+	icon: 'ti ti-plane',
+});
+</script>
+
+<style lang="scss">
+.description {
+	font-size: .85em;
+	padding: 1rem;
+}
+</style>
diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue
index 1ce0bedbe3..8c3478d8f2 100644
--- a/packages/frontend/src/pages/user/home.vue
+++ b/packages/frontend/src/pages/user/home.vue
@@ -7,6 +7,7 @@
 			<!-- <div class="punished" v-if="user.isSilenced"><i class="ti ti-alert-triangle" style="margin-right: 8px;"></i> {{ i18n.ts.userSilenced }}</div> -->
 
 			<div class="profile _gaps">
+				<MkAccountMoved v-if="user.movedToUri" :host="user.movedToUri.host" :acct="user.movedToUri.username"/>
 				<MkRemoteCaution v-if="user.host != null" :href="user.url ?? user.uri!" class="warn"/>
 
 				<div :key="user.id" class="main _panel">
@@ -117,6 +118,7 @@ import calcAge from 's-age';
 import * as misskey from 'misskey-js';
 import MkNote from '@/components/MkNote.vue';
 import MkFollowButton from '@/components/MkFollowButton.vue';
+import MkAccountMoved from '@/components/MkAccountMoved.vue';
 import MkRemoteCaution from '@/components/MkRemoteCaution.vue';
 import MkOmit from '@/components/MkOmit.vue';
 import MkInfo from '@/components/MkInfo.vue';
diff --git a/packages/frontend/src/router.ts b/packages/frontend/src/router.ts
index c8077edd28..0769ec2614 100644
--- a/packages/frontend/src/router.ts
+++ b/packages/frontend/src/router.ts
@@ -161,6 +161,10 @@ export const routes = [{
 		path: '/preferences-backups',
 		name: 'preferences-backups',
 		component: page(() => import('./pages/settings/preferences-backups.vue')),
+	}, {
+		path: '/migration',
+		name: 'migration',
+		component: page(() => import('./pages/settings/migration.vue'))
 	}, {
 		path: '/custom-css',
 		name: 'general',
diff --git a/packages/misskey-js/src/api.types.ts b/packages/misskey-js/src/api.types.ts
index d72e163cd4..aed9f5bf84 100644
--- a/packages/misskey-js/src/api.types.ts
+++ b/packages/misskey-js/src/api.types.ts
@@ -362,6 +362,8 @@ export type Endpoints = {
 	'i/get-word-muted-notes-count': { req: TODO; res: TODO; };
 	'i/import-following': { req: TODO; res: TODO; };
 	'i/import-user-lists': { req: TODO; res: TODO; };
+	'i/move': { req: TODO; res: TODO; };
+	'i/known-as': { req: TODO; res: TODO; };
 	'i/notifications': { req: {
 		limit?: number;
 		sinceId?: Notification['id'];
diff --git a/packages/misskey-js/src/entities.ts b/packages/misskey-js/src/entities.ts
index 7343fd74ad..0c90e44494 100644
--- a/packages/misskey-js/src/entities.ts
+++ b/packages/misskey-js/src/entities.ts
@@ -14,6 +14,8 @@ export type UserLite = {
 	onlineStatus: 'online' | 'active' | 'offline' | 'unknown';
 	avatarUrl: string;
 	avatarBlurhash: string;
+	alsoKnownAs: string[];
+	movedToUri: any;
 	emojis: {
 		name: string;
 		url: string;

From 68e8892f61b94e06724591d5e355c73463cfb40c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 14:18:28 +0900
Subject: [PATCH 07/55] chore: use for instead of forEach

---
 packages/backend/src/core/AccountMoveService.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/core/AccountMoveService.ts b/packages/backend/src/core/AccountMoveService.ts
index 6a7727c57a..3f2a19b771 100644
--- a/packages/backend/src/core/AccountMoveService.ts
+++ b/packages/backend/src/core/AccountMoveService.ts
@@ -72,17 +72,17 @@ export class AccountMoveService {
 			where: {
 				followeeId: src.id,
 				followerHost: IsNull(), // follower is local
-			}
+			},
 		});
-		followings.forEach(async (following) => {
-			if (!following.follower) return;
+		for (const following of followings) {
+			if (!following.follower) continue;
 			try {
 				await this.userFollowingService.follow(following.follower, dst);
 				await this.userFollowingService.unfollow(following.follower, src);
 			} catch {
 				/* empty */
 			}
-		});
+		}
 
 		return iObj;
 	}

From 008e3fb37e417a55cfbe41b1d18933a7d5298208 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 14:20:40 +0900
Subject: [PATCH 08/55] Create 1680931179228-account-move.js

---
 .../migration/1680931179228-account-move.js     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 packages/backend/migration/1680931179228-account-move.js

diff --git a/packages/backend/migration/1680931179228-account-move.js b/packages/backend/migration/1680931179228-account-move.js
new file mode 100644
index 0000000000..821318d1bc
--- /dev/null
+++ b/packages/backend/migration/1680931179228-account-move.js
@@ -0,0 +1,17 @@
+export class AccountMove1680931179228 {
+    name = 'AccountMove1680931179228'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "user" ADD "movedToUri" character varying(512)`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."movedToUri" IS 'The URI of the new account of the User'`);
+        await queryRunner.query(`ALTER TABLE "user" ADD "alsoKnownAs" text`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."alsoKnownAs" IS 'URIs the user is known as too'`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`COMMENT ON COLUMN "user"."alsoKnownAs" IS 'URIs the user is known as too'`);
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "alsoKnownAs"`);
+        await queryRunner.query(`COMMENT ON COLUMN "user"."movedToUri" IS 'The URI of the new account of the User'`);
+        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "movedToUri"`);
+    }
+}

From 05aa0fa11a088b99b8414618dde5e02ae692277f Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 14:31:09 +0900
Subject: [PATCH 09/55] :art:

---
 .../frontend/src/pages/settings/index.vue     | 22 +++++++++----------
 .../frontend/src/pages/settings/migration.vue |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue
index 4e22d7b60b..9824fa8c15 100644
--- a/packages/frontend/src/pages/settings/index.vue
+++ b/packages/frontend/src/pages/settings/index.vue
@@ -130,16 +130,6 @@ const menuDef = computed(() => [{
 }, {
 	title: i18n.ts.otherSettings,
 	items: [{
-		icon: 'ti ti-plane',
-		text: i18n.ts.migration,
-		to: '/settings/migration',
-		active: currentPage?.route.name === 'migration',
-	}, {
-		icon: 'ti ti-package',
-		text: i18n.ts.importAndExport,
-		to: '/settings/import-export',
-		active: currentPage?.route.name === 'import-export',
-	}, {
 		icon: 'ti ti-badges',
 		text: i18n.ts.roles,
 		to: '/settings/roles',
@@ -169,6 +159,16 @@ const menuDef = computed(() => [{
 		text: 'Webhook',
 		to: '/settings/webhook',
 		active: currentPage?.route.name === 'webhook',
+	}, {
+		icon: 'ti ti-package',
+		text: i18n.ts.importAndExport,
+		to: '/settings/import-export',
+		active: currentPage?.route.name === 'import-export',
+	}, {
+		icon: 'ti ti-plane',
+		text: i18n.ts.migration,
+		to: '/settings/migration',
+		active: currentPage?.route.name === 'migration',
 	}, {
 		icon: 'ti ti-dots',
 		text: i18n.ts.other,
@@ -236,7 +236,7 @@ onUnmounted(() => {
 });
 
 watch(router.currentRef, (to) => {
-	if (to.route.name === "settings" && to.child?.route.name == null && !narrow) {
+	if (to.route.name === 'settings' && to.child?.route.name == null && !narrow) {
 		router.replace('/settings/profile');
 	}
 });
diff --git a/packages/frontend/src/pages/settings/migration.vue b/packages/frontend/src/pages/settings/migration.vue
index 0295aeae18..1fd3d64fd5 100644
--- a/packages/frontend/src/pages/settings/migration.vue
+++ b/packages/frontend/src/pages/settings/migration.vue
@@ -1,6 +1,6 @@
 <template>
 <div class="_gaps_m">
-	<FormSection>
+	<FormSection first>
 		<template #label>{{ i18n.ts.moveTo }}</template>
 		<MkInput v-model="moveToAccount" manual-save>
 			<template #prefix><i class="ti ti-plane-departure"></i></template>

From 551b00302b15bc7137ed3de8f1ae31909c7806bd Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 14:32:21 +0900
Subject: [PATCH 10/55] use css module

---
 .../frontend/src/components/MkAccountMoved.vue    | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/frontend/src/components/MkAccountMoved.vue b/packages/frontend/src/components/MkAccountMoved.vue
index 1d4fbd9a54..fd472de6c1 100644
--- a/packages/frontend/src/components/MkAccountMoved.vue
+++ b/packages/frontend/src/components/MkAccountMoved.vue
@@ -1,8 +1,8 @@
 <template>
-<div class="msjugskd _block">
+<div :class="$style.root">
 	<i class="ti ti-plane-departure" style="margin-right: 8px;"></i>
 	{{ i18n.ts.accountMoved }}
-	<MkMention class="link" :username="acct" :host="host ?? localHost"/>
+	<MkMention :class="$style.link" :username="acct" :host="host ?? localHost"/>
 </div>
 </template>
 
@@ -17,17 +17,16 @@ defineProps<{
 }>();
 </script>
 
-<style lang="scss" scoped>
-.msjugskd {
+<style lang="scss" module>
+.root {
 	padding: 16px;
 	font-size: 90%;
 	background: var(--infoWarnBg);
 	color: var(--error);
 	border-radius: var(--radius);
+}
 
-	> .link {
-		margin-left: 4px;
-		color: var(--accent);
-	}
+.link {
+	margin-left: 4px;
 }
 </style>

From b697f948dfb778e56b193958173d4ac8889ae196 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 14:32:52 +0900
Subject: [PATCH 11/55] Update misskey-js.api.md

---
 packages/misskey-js/etc/misskey-js.api.md | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index 2511f14dcc..e57484be6b 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -166,6 +166,8 @@ export type Channels = {
             readAllAntennas: () => void;
             unreadAntenna: (payload: Antenna) => void;
             readAllAnnouncements: () => void;
+            readAllChannels: () => void;
+            unreadChannel: (payload: Note['id']) => void;
             myTokenRegenerated: () => void;
             reversiNoInvites: () => void;
             reversiInvited: (payload: FIXME) => void;
@@ -1855,6 +1857,12 @@ export type Endpoints = {
         req: NoParams;
         res: null;
     };
+    'notifications/read': {
+        req: {
+            notificationId: Notification_2['id'];
+        };
+        res: null;
+    };
     'page-push': {
         req: {
             pageId: Page['id'];
@@ -2353,6 +2361,7 @@ type MeDetailed = UserDetailed & {
     hasPendingReceivedFollowRequest: boolean;
     hasUnreadAnnouncement: boolean;
     hasUnreadAntenna: boolean;
+    hasUnreadChannel: boolean;
     hasUnreadMentions: boolean;
     hasUnreadMessagingMessage: boolean;
     hasUnreadNotification: boolean;
@@ -2609,11 +2618,7 @@ export class Stream extends EventEmitter<StreamEvents> {
     // (undocumented)
     removeSharedConnectionPool(pool: Pool): void;
     // (undocumented)
-    send(typeOrPayload: string): void;
-    // (undocumented)
-    send(typeOrPayload: string, payload: any): void;
-    // (undocumented)
-    send(typeOrPayload: Record<string, any> | any[]): void;
+    send(typeOrPayload: any, payload?: any): void;
     // (undocumented)
     state: 'initializing' | 'reconnecting' | 'connected';
     // (undocumented)
@@ -2709,8 +2714,8 @@ type UserSorting = '+follower' | '-follower' | '+createdAt' | '-createdAt' | '+u
 //
 // src/api.types.ts:16:32 - (ae-forgotten-export) The symbol "TODO" needs to be exported by the entry point index.d.ts
 // src/api.types.ts:18:25 - (ae-forgotten-export) The symbol "NoParams" needs to be exported by the entry point index.d.ts
-// src/api.types.ts:594:18 - (ae-forgotten-export) The symbol "ShowUserReq" needs to be exported by the entry point index.d.ts
-// src/streaming.types.ts:33:4 - (ae-forgotten-export) The symbol "FIXME" needs to be exported by the entry point index.d.ts
+// src/api.types.ts:595:18 - (ae-forgotten-export) The symbol "ShowUserReq" needs to be exported by the entry point index.d.ts
+// src/streaming.types.ts:35:4 - (ae-forgotten-export) The symbol "FIXME" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)
 

From 65584f21bb15ca40db04c02ea5d38d81c1a69073 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 14:39:54 +0900
Subject: [PATCH 12/55] Update misskey-js.api.md

---
 packages/misskey-js/etc/misskey-js.api.md | 29 +++++++++++++----------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/packages/misskey-js/etc/misskey-js.api.md b/packages/misskey-js/etc/misskey-js.api.md
index e57484be6b..67d12000b8 100644
--- a/packages/misskey-js/etc/misskey-js.api.md
+++ b/packages/misskey-js/etc/misskey-js.api.md
@@ -166,8 +166,6 @@ export type Channels = {
             readAllAntennas: () => void;
             unreadAntenna: (payload: Antenna) => void;
             readAllAnnouncements: () => void;
-            readAllChannels: () => void;
-            unreadChannel: (payload: Note['id']) => void;
             myTokenRegenerated: () => void;
             reversiNoInvites: () => void;
             reversiInvited: (payload: FIXME) => void;
@@ -1355,6 +1353,14 @@ export type Endpoints = {
         req: TODO;
         res: TODO;
     };
+    'i/move': {
+        req: TODO;
+        res: TODO;
+    };
+    'i/known-as': {
+        req: TODO;
+        res: TODO;
+    };
     'i/notifications': {
         req: {
             limit?: number;
@@ -1857,12 +1863,6 @@ export type Endpoints = {
         req: NoParams;
         res: null;
     };
-    'notifications/read': {
-        req: {
-            notificationId: Notification_2['id'];
-        };
-        res: null;
-    };
     'page-push': {
         req: {
             pageId: Page['id'];
@@ -2361,7 +2361,6 @@ type MeDetailed = UserDetailed & {
     hasPendingReceivedFollowRequest: boolean;
     hasUnreadAnnouncement: boolean;
     hasUnreadAntenna: boolean;
-    hasUnreadChannel: boolean;
     hasUnreadMentions: boolean;
     hasUnreadMessagingMessage: boolean;
     hasUnreadNotification: boolean;
@@ -2618,7 +2617,11 @@ export class Stream extends EventEmitter<StreamEvents> {
     // (undocumented)
     removeSharedConnectionPool(pool: Pool): void;
     // (undocumented)
-    send(typeOrPayload: any, payload?: any): void;
+    send(typeOrPayload: string): void;
+    // (undocumented)
+    send(typeOrPayload: string, payload: any): void;
+    // (undocumented)
+    send(typeOrPayload: Record<string, any> | any[]): void;
     // (undocumented)
     state: 'initializing' | 'reconnecting' | 'connected';
     // (undocumented)
@@ -2693,6 +2696,8 @@ type UserLite = {
     onlineStatus: 'online' | 'active' | 'offline' | 'unknown';
     avatarUrl: string;
     avatarBlurhash: string;
+    alsoKnownAs: string[];
+    movedToUri: any;
     emojis: {
         name: string;
         url: string;
@@ -2714,8 +2719,8 @@ type UserSorting = '+follower' | '-follower' | '+createdAt' | '-createdAt' | '+u
 //
 // src/api.types.ts:16:32 - (ae-forgotten-export) The symbol "TODO" needs to be exported by the entry point index.d.ts
 // src/api.types.ts:18:25 - (ae-forgotten-export) The symbol "NoParams" needs to be exported by the entry point index.d.ts
-// src/api.types.ts:595:18 - (ae-forgotten-export) The symbol "ShowUserReq" needs to be exported by the entry point index.d.ts
-// src/streaming.types.ts:35:4 - (ae-forgotten-export) The symbol "FIXME" needs to be exported by the entry point index.d.ts
+// src/api.types.ts:596:18 - (ae-forgotten-export) The symbol "ShowUserReq" needs to be exported by the entry point index.d.ts
+// src/streaming.types.ts:33:4 - (ae-forgotten-export) The symbol "FIXME" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)
 

From 1aa8f09b95a4807e9d4e579e37d52e0c1fa6c27c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 14:42:11 +0900
Subject: [PATCH 13/55] 13.11.0-beta.7

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

diff --git a/package.json b/package.json
index d1c081c86d..d2a103c573 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.11.0-beta.6",
+	"version": "13.11.0-beta.7",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 33e94285101339e9000274fd1a000d48ec7fdf9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Sat, 8 Apr 2023 15:22:39 +0900
Subject: [PATCH 14/55] chore: disable sampling for cat ears (#10513)

* chore: sample 3px for cat ears

* fix: typo

* chore: disable avatar plot for cat ears
---
 .../src/components/global/MkAvatar.vue        | 35 +++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/components/global/MkAvatar.vue b/packages/frontend/src/components/global/MkAvatar.vue
index 0cc30a887f..8497b8443b 100644
--- a/packages/frontend/src/components/global/MkAvatar.vue
+++ b/packages/frontend/src/components/global/MkAvatar.vue
@@ -4,12 +4,16 @@
 	<MkUserOnlineIndicator v-if="indicator" :class="$style.indicator" :user="user"/>
 	<div v-if="user.isCat" :class="[$style.ears, { [$style.mask]: useBlurEffect }]">
 		<div :class="$style.earLeft">
-			<div v-if="useBlurEffect" :class="$style.layer">
+			<div v-if="false" :class="$style.layer">
+				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"/>
+				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"/>
 				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"/>
 			</div>
 		</div>
 		<div :class="$style.earRight">
-			<div v-if="useBlurEffect" :class="$style.layer">
+			<div v-if="false" :class="$style.layer">
+				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"/>
+				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"/>
 				<div :class="$style.plot" :style="{ backgroundImage: `url(${JSON.stringify(url)})` }"/>
 			</div>
 		</div>
@@ -195,11 +199,21 @@ watch(() => props.user.avatarBlurhash, () => {
 
 				> .plot {
 					contain: strict;
+					position: absolute;
 					width: 100%;
 					height: 100%;
 					clip-path: path('M0 0H1V1H0z');
 					transform: scale(32767);
 					transform-origin: 0 0;
+					opacity: 0.5;
+
+					&:first-child {
+						opacity: 1;
+					}
+
+					&:last-child {
+						opacity: calc(1 / 3);
+					}
 				}
 			}
 		}
@@ -221,6 +235,14 @@ watch(() => props.user.avatarBlurhash, () => {
 
 				> .plot {
 					background-position: 20% 10%; /* ~= 37.5deg */
+
+					&:first-child {
+						background-position-x: 21%;
+					}
+
+					&:last-child {
+						background-position-y: 11%;
+					}
 				}
 			}
 		}
@@ -241,7 +263,16 @@ watch(() => props.user.avatarBlurhash, () => {
 										-38.5857864376%); /* 40 - 2 * sqrt(2) */
 
 				> .plot {
+					position: absolute;
 					background-position: 80% 10%; /* ~= 37.5deg */
+
+					&:first-child {
+						background-position-x: 79%;
+					}
+
+					&:last-child {
+						background-position-y: 11%;
+					}
 				}
 			}
 		}

From 132feea1fa9311db1b13e3ada4078671934ccda2 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 15:49:29 +0900
Subject: [PATCH 15/55] :art

---
 packages/frontend/src/components/MkDialog.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/frontend/src/components/MkDialog.vue b/packages/frontend/src/components/MkDialog.vue
index 7649eb54ea..93c1f89199 100644
--- a/packages/frontend/src/components/MkDialog.vue
+++ b/packages/frontend/src/components/MkDialog.vue
@@ -17,8 +17,8 @@
 		<MkInput v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder || undefined" :autocomplete="input.autocomplete" @keydown="onInputKeydown">
 			<template v-if="input.type === 'password'" #prefix><i class="ti ti-lock"></i></template>
 			<template #caption>
-				<span v-if="okButtonDisabled && disabledReason === 'charactersExceeded'" v-text="i18n.t('_dialog.charactersExceeded', { current: (inputValue as string).length, max: input.maxLength ?? 'NaN' })" />
-				<span v-else-if="okButtonDisabled && disabledReason === 'charactersBelow'" v-text="i18n.t('_dialog.charactersBelow', { current: (inputValue as string).length, min: input.minLength ?? 'NaN' })" />
+				<span v-if="okButtonDisabled && disabledReason === 'charactersExceeded'" v-text="i18n.t('_dialog.charactersExceeded', { current: (inputValue as string).length, max: input.maxLength ?? 'NaN' })"/>
+				<span v-else-if="okButtonDisabled && disabledReason === 'charactersBelow'" v-text="i18n.t('_dialog.charactersBelow', { current: (inputValue as string).length, min: input.minLength ?? 'NaN' })"/>
 			</template>
 		</MkInput>
 		<MkSelect v-if="select" v-model="selectedValue" autofocus>
@@ -32,11 +32,11 @@
 			</template>
 		</MkSelect>
 		<div v-if="(showOkButton || showCancelButton) && !actions" :class="$style.buttons">
-			<MkButton v-if="showOkButton" inline primary :autofocus="!input && !select" :disabled="okButtonDisabled" @click="ok">{{ okText ?? ((showCancelButton || input || select) ? i18n.ts.ok : i18n.ts.gotIt) }}</MkButton>
-			<MkButton v-if="showCancelButton || input || select" inline @click="cancel">{{ cancelText ?? i18n.ts.cancel }}</MkButton>
+			<MkButton v-if="showOkButton" inline primary rounded :autofocus="!input && !select" :disabled="okButtonDisabled" @click="ok">{{ okText ?? ((showCancelButton || input || select) ? i18n.ts.ok : i18n.ts.gotIt) }}</MkButton>
+			<MkButton v-if="showCancelButton || input || select" inline rounded @click="cancel">{{ cancelText ?? i18n.ts.cancel }}</MkButton>
 		</div>
 		<div v-if="actions" :class="$style.buttons">
-			<MkButton v-for="action in actions" :key="action.text" inline :primary="action.primary" :danger="action.danger" @click="() => { action.callback(); modal?.close(); }">{{ action.text }}</MkButton>
+			<MkButton v-for="action in actions" :key="action.text" inline rounded :primary="action.primary" :danger="action.danger" @click="() => { action.callback(); modal?.close(); }">{{ action.text }}</MkButton>
 		</div>
 	</div>
 </MkModal>

From 9114c8cb8e7d0bb0f686190d47c60591ac211f35 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 15:53:36 +0900
Subject: [PATCH 16/55] feat(backend): support replication of postgresql

Resolve #10205
---
 .config/docker_example.yml       | 17 +++++++++++++++++
 .config/example.yml              | 17 +++++++++++++++++
 .devcontainer/devcontainer.yml   | 17 +++++++++++++++++
 CHANGELOG.md                     |  2 ++
 chart/files/default.yml          | 17 +++++++++++++++++
 packages/backend/src/config.ts   | 10 ++++++++++
 packages/backend/src/postgres.ts | 16 ++++++++++++++++
 7 files changed, 96 insertions(+)

diff --git a/.config/docker_example.yml b/.config/docker_example.yml
index d93cc8b70e..af0a90dc95 100644
--- a/.config/docker_example.yml
+++ b/.config/docker_example.yml
@@ -51,6 +51,23 @@ db:
   #extra:
   #  ssl: true
 
+dbReplications: false
+
+# You can configure any number of replicas here
+#dbSlaves:
+#  -
+#    host: 
+#    port: 
+#    db: 
+#    user: 
+#    pass: 
+#  -
+#    host: 
+#    port: 
+#    db: 
+#    user: 
+#    pass: 
+
 #   ┌─────────────────────┐
 #───┘ Redis configuration └─────────────────────────────────────
 
diff --git a/.config/example.yml b/.config/example.yml
index b61ed14809..57e2b56b78 100644
--- a/.config/example.yml
+++ b/.config/example.yml
@@ -51,6 +51,23 @@ db:
   #extra:
   #  ssl: true
 
+dbReplications: false
+
+# You can configure any number of replicas here
+#dbSlaves:
+#  -
+#    host: 
+#    port: 
+#    db: 
+#    user: 
+#    pass: 
+#  -
+#    host: 
+#    port: 
+#    db: 
+#    user: 
+#    pass: 
+
 #   ┌─────────────────────┐
 #───┘ Redis configuration └─────────────────────────────────────
 
diff --git a/.devcontainer/devcontainer.yml b/.devcontainer/devcontainer.yml
index 1350e70157..2af306e3da 100644
--- a/.devcontainer/devcontainer.yml
+++ b/.devcontainer/devcontainer.yml
@@ -51,6 +51,23 @@ db:
   #extra:
   #  ssl: true
 
+dbReplications: false
+
+# You can configure any number of replicas here
+#dbSlaves:
+#  -
+#    host: 
+#    port: 
+#    db: 
+#    user: 
+#    pass: 
+#  -
+#    host: 
+#    port: 
+#    db: 
+#    user: 
+#    pass: 
+
 #   ┌─────────────────────┐
 #───┘ Redis configuration └─────────────────────────────────────
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 615a3aad3c..2486a7e54f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,8 @@
 - Add Minimizing ("folding") of windows
 
 ### Server
+- PostgreSQLのレプリケーション対応
+	- 設定ファイルの `dbReplications` および `dbSlaves` にて設定できます
 - イベント用Redisを別サーバーに分離できるように
 - ジョブキュー用Redisを別サーバーに分離できるように
 - サーバーの全体的なパフォーマンスを向上
diff --git a/chart/files/default.yml b/chart/files/default.yml
index 1d8e5b490a..1888669245 100644
--- a/chart/files/default.yml
+++ b/chart/files/default.yml
@@ -72,6 +72,23 @@ db:
   #extra:
   #  ssl: true
 
+dbReplications: false
+
+# You can configure any number of replicas here
+#dbSlaves:
+#  -
+#    host: 
+#    port: 
+#    db: 
+#    user: 
+#    pass: 
+#  -
+#    host: 
+#    port: 
+#    db: 
+#    user: 
+#    pass: 
+
 #   ┌─────────────────────┐
 #───┘ Redis configuration └─────────────────────────────────────
 
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index fd2b83cf2a..1443e63385 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -25,6 +25,16 @@ export type Source = {
 		disableCache?: boolean;
 		extra?: { [x: string]: string };
 	};
+	dbReplications?: boolean;
+	dbSlaves?: {
+		host: string;
+		port: number;
+		db: string;
+		user: string;
+		pass: string;
+		disableCache?: boolean;
+		extra?: { [x: string]: string };
+	}[];
 	redis: {
 		host: string;
 		port: number;
diff --git a/packages/backend/src/postgres.ts b/packages/backend/src/postgres.ts
index efeca46b49..bb21ed827e 100644
--- a/packages/backend/src/postgres.ts
+++ b/packages/backend/src/postgres.ts
@@ -200,6 +200,22 @@ export function createPostgresDataSource(config: Config) {
 			statement_timeout: 1000 * 10,
 			...config.db.extra,
 		},
+		replication: config.dbReplications ? {
+			master: {
+				host: config.db.host,
+				port: config.db.port,
+				username: config.db.user,
+				password: config.db.pass,
+				database: config.db.db,
+			},
+			slaves: config.dbSlaves!.map(rep => ({
+				host: rep.host,
+				port: rep.port,
+				username: rep.user,
+				password: rep.pass,
+				database: rep.db,
+			})),
+		} : undefined,
 		synchronize: process.env.NODE_ENV === 'test',
 		dropSchema: process.env.NODE_ENV === 'test',
 		cache: !config.db.disableCache && process.env.NODE_ENV !== 'test' ? { // dbをcloseしても何故かredisのコネクションが内部的に残り続けるようで、テストの際に支障が出るため無効にする(キャッシュも含めてテストしたいため本当は有効にしたいが...)

From 975e79fa3bcaf33839c024773572b5c0bb18dac2 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 15:59:41 +0900
Subject: [PATCH 17/55] fix type

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

diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index 1443e63385..e4f7601fa9 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -32,8 +32,6 @@ export type Source = {
 		db: string;
 		user: string;
 		pass: string;
-		disableCache?: boolean;
-		extra?: { [x: string]: string };
 	}[];
 	redis: {
 		host: string;

From 7636536973dfc390aa97d60f52771a9b0fba558d Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 16:06:08 +0900
Subject: [PATCH 18/55] tweak locale

---
 locales/ja-JP.yml                              | 18 ++++++++++--------
 packages/frontend/src/pages/settings/index.vue |  2 +-
 .../frontend/src/pages/settings/migration.vue  | 14 +++++++-------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index af47408c67..32bf47c209 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -989,16 +989,18 @@ enableChartsForFederatedInstances: "リモートサーバーのチャートを
 showClipButtonInNoteFooter: "ノートのアクションにクリップを追加"
 largeNoteReactions: "ノートのリアクションを大きく表示"
 noteIdOrUrl: "ノートIDまたはURL"
-migration: "アカウントの引っ越し"
-moveTo: "このアカウントを新しいアカウントに引っ越す"
-moveToLabel: "引っ越し先のアカウント："
-moveAccountDescription: "この操作は取り消せません。まずは引っ越し先のアカウントでこのアカウントに対しエイリアスを作成したことを確認してください。エイリアス作成後、引っ越し先のアカウントをこのように入力してください：@person@instance.com"
-moveFrom: "別のアカウントからこのアカウントに引っ越す"
-moveFromLabel: "引っ越し元のアカウント："
-moveFromDescription: "別のアカウントからこのアカウントにフォロワーを引き継いで引っ越したい場合、ここでエイリアスを作成しておく必要があります。必ず引っ越しを実行する前に作成してください！引っ越し元のアカウントをこのように入力してください：@person@instance.com"
-migrationConfirm: "本当にこのアカウントを {account} に引っ越しますか？一度引っ越しを行うと取り消せず、二度とこのアカウントを元の状態で使用できなくなります。\nまた、引っ越し先のアカウントでエイリアスを作成したことを確認してください。"
+accountMigration: "アカウントの引っ越し"
 accountMoved: "このユーザーは新しいアカウントに引っ越しました："
 
+_accountMigration:
+  moveTo: "このアカウントを新しいアカウントに引っ越す"
+  moveToLabel: "引っ越し先のアカウント："
+  moveAccountDescription: "この操作は取り消せません。まずは引っ越し先のアカウントでこのアカウントに対しエイリアスを作成したことを確認してください。エイリアス作成後、引っ越し先のアカウントをこのように入力してください：@person@instance.com"
+  moveFrom: "別のアカウントからこのアカウントに引っ越す"
+  moveFromLabel: "引っ越し元のアカウント："
+  moveFromDescription: "別のアカウントからこのアカウントにフォロワーを引き継いで引っ越したい場合、ここでエイリアスを作成しておく必要があります。必ず引っ越しを実行する前に作成してください！引っ越し元のアカウントをこのように入力してください：@person@instance.com"
+  migrationConfirm: "本当にこのアカウントを {account} に引っ越しますか？一度引っ越しを行うと取り消せず、二度とこのアカウントを元の状態で使用できなくなります。\nまた、引っ越し先のアカウントでエイリアスを作成したことを確認してください。"
+
 _achievements:
   earnedAt: "獲得日時"
   _types:
diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue
index 9824fa8c15..7e9ec3de93 100644
--- a/packages/frontend/src/pages/settings/index.vue
+++ b/packages/frontend/src/pages/settings/index.vue
@@ -166,7 +166,7 @@ const menuDef = computed(() => [{
 		active: currentPage?.route.name === 'import-export',
 	}, {
 		icon: 'ti ti-plane',
-		text: i18n.ts.migration,
+		text: i18n.ts.accountMigration,
 		to: '/settings/migration',
 		active: currentPage?.route.name === 'migration',
 	}, {
diff --git a/packages/frontend/src/pages/settings/migration.vue b/packages/frontend/src/pages/settings/migration.vue
index 1fd3d64fd5..2ef8af7481 100644
--- a/packages/frontend/src/pages/settings/migration.vue
+++ b/packages/frontend/src/pages/settings/migration.vue
@@ -1,22 +1,22 @@
 <template>
 <div class="_gaps_m">
 	<FormSection first>
-		<template #label>{{ i18n.ts.moveTo }}</template>
+		<template #label>{{ i18n.ts._accountMigration.moveTo }}</template>
 		<MkInput v-model="moveToAccount" manual-save>
 			<template #prefix><i class="ti ti-plane-departure"></i></template>
-			<template #label>{{ i18n.ts.moveToLabel }}</template>
+			<template #label>{{ i18n.ts._accountMigration.moveToLabel }}</template>
 		</MkInput>
 	</FormSection>
-	<FormInfo warn>{{ i18n.ts.moveAccountDescription }}</FormInfo>
+	<FormInfo warn>{{ i18n.ts._accountMigration.moveAccountDescription }}</FormInfo>
 
 	<FormSection>
-		<template #label>{{ i18n.ts.moveFrom }}</template>
+		<template #label>{{ i18n.ts._accountMigration.moveFrom }}</template>
 		<MkInput v-model="accountAlias" manual-save>
 			<template #prefix><i class="ti ti-plane-arrival"></i></template>
-			<template #label>{{ i18n.ts.moveFromLabel }}</template>
+			<template #label>{{ i18n.ts._accountMigration.moveFromLabel }}</template>
 		</MkInput>
 	</FormSection>
-	<FormInfo warn>{{ i18n.ts.moveFromDescription }}</FormInfo>
+	<FormInfo warn>{{ i18n.ts._accountMigration.moveFromDescription }}</FormInfo>
 </div>
 </template>
 
@@ -60,7 +60,7 @@ watch(moveToAccount, async () => {
 });
 
 definePageMetadata({
-	title: i18n.ts.migration,
+	title: i18n.ts.accountMigration,
 	icon: 'ti ti-plane',
 });
 </script>

From 0f328e8472065255d22d5ed9c36b8fc65921ad9b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 16:09:43 +0900
Subject: [PATCH 19/55] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2486a7e54f..280c3871e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - アカウントの引っ越し（フォロワー引き継ぎ）に対応
 
 ### Client
+- 投稿フォームのデザインを改善
 - 検索ページでURLを入力した際に照会したときと同等の挙動をするように
 - ノートのリアクションを大きく表示するオプションを追加
 - ギャラリー一覧にメディア表示と同じように NSFW 設定を反映するように（ホバーで表示）

From e23cf77f864f7937c20e52932d08b1107d20ce92 Mon Sep 17 00:00:00 2001
From: Namekuji <11836635+nmkj-io@users.noreply.github.com>
Date: Sat, 8 Apr 2023 03:13:50 -0400
Subject: [PATCH 20/55] fetch person again (#10514)

---
 .../src/core/activitypub/ApInboxService.ts    |  8 +++--
 .../src/server/api/endpoints/i/move.ts        | 30 +++++++++++--------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
index 40d7ba551d..a95c178317 100644
--- a/packages/backend/src/core/activitypub/ApInboxService.ts
+++ b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -736,13 +736,17 @@ export class ApInboxService {
 		// fetch the new and old accounts
 		const targetUri = getApHrefNullable(activity.target);
 		if (!targetUri) return 'skip: invalid activity target';
-		const new_acc = await this.apPersonService.resolvePerson(targetUri);
-		const old_acc = await this.apPersonService.resolvePerson(actor.uri);
+		let new_acc = await this.apPersonService.resolvePerson(targetUri);
+		let old_acc = await this.apPersonService.resolvePerson(actor.uri);
 
 		// update them if they're remote
 		if (new_acc.uri) await this.apPersonService.updatePerson(new_acc.uri);
 		if (old_acc.uri) await this.apPersonService.updatePerson(old_acc.uri);
 
+		// retrieve updated users
+		new_acc = await this.apPersonService.resolvePerson(targetUri);
+		old_acc = await this.apPersonService.resolvePerson(actor.uri);
+
 		// check if alsoKnownAs of the new account is valid
 		let isValidMove = true;
 		if (old_acc.uri) {
diff --git a/packages/backend/src/server/api/endpoints/i/move.ts b/packages/backend/src/server/api/endpoints/i/move.ts
index 346d8f95bb..ac76e1f620 100644
--- a/packages/backend/src/server/api/endpoints/i/move.ts
+++ b/packages/backend/src/server/api/endpoints/i/move.ts
@@ -42,7 +42,7 @@ export const meta = {
 			id: '4362f8dc-731f-4ad8-a694-be2a88922a24',
 		},
 		rootForbidden: {
-			message: 'The root cant migrate.',
+			message: 'The root can\'t migrate.',
 			code: 'NOT_ROOT_FORBIDDEN',
 			id: '4362e8dc-731f-4ad8-a694-be2a88922a24',
 		},
@@ -92,42 +92,46 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 		private apPersonService: ApPersonService,
 	) {
 		super(meta, paramDef, async (ps, me) => {
-			// Check parameter
+			// check parameter
 			if (!ps.moveToAccount) throw new ApiError(meta.errors.noSuchMoveTarget);
-			// Abort if user is the root
+			// abort if user is the root
 			if (me.isRoot) throw new ApiError(meta.errors.rootForbidden);
-			// Abort if user has already moved
+			// abort if user has already moved
 			if (me.movedToUri) throw new ApiError(meta.errors.alreadyMoved);
 
 			let unfiltered = ps.moveToAccount;
 			if (!unfiltered) throw new ApiError(meta.errors.noSuchMoveTarget);
 
-			// Parse user's input into the destination account
+			// parse user's input into the destination account
 			if (unfiltered.startsWith('acct:')) unfiltered = unfiltered.substring(5);
 			if (unfiltered.startsWith('@')) unfiltered = unfiltered.substring(1);
 			if (!unfiltered.includes('@')) throw new ApiError(meta.errors.notRemote);
 
 			const userAddress = unfiltered.split('@');
-			// Retrieve the destination account
-			const remoteMoveTo = await this.remoteUserResolveService.resolveUser(userAddress[0], userAddress[1]).catch((e) => {
+			// retrieve the destination account
+			let moveTo = await this.remoteUserResolveService.resolveUser(userAddress[0], userAddress[1]).catch((e) => {
 				this.apiLoggerService.logger.warn(`failed to resolve remote user: ${e}`);
 				throw new ApiError(meta.errors.noSuchMoveTarget);
 			});
-			const moveTo = await this.getterService.getRemoteUser(remoteMoveTo.id);
-			if (!moveTo.uri) throw new ApiError(meta.errors.uriNull);
-			await this.apPersonService.updatePerson(moveTo.uri);
-			// Only allow moving to a remote account
+			const remoteMoveTo = await this.getterService.getRemoteUser(moveTo.id);
+			if (!remoteMoveTo.uri) throw new ApiError(meta.errors.uriNull);
+
+			// update local db
+			await this.apPersonService.updatePerson(remoteMoveTo.uri);
+			// retrieve updated user
+			moveTo = await this.apPersonService.resolvePerson(remoteMoveTo.uri);
+			// only allow moving to a remote account
 			if (this.userEntityService.isLocalUser(moveTo)) throw new ApiError(meta.errors.notRemote);
 
 			let allowed = false;
 
 			const fromUrl = `${this.config.url}/users/${me.id}`;
-			// Make sure that the user has indicated the old account as an alias
+			// make sure that the user has indicated the old account as an alias
 			moveTo.alsoKnownAs?.forEach((elem) => {
 				if (fromUrl.includes(elem)) allowed = true;
 			});
 
-			// Abort if unintended
+			// abort if unintended
 			if (!(allowed && moveTo.uri && fromUrl)) throw new ApiError(meta.errors.remoteAccountForbids);
 
 			return await this.accountMoveService.moveToRemote(me, moveTo);

From e72d6c9f2cc6f86ab6f3f9438a4ebd567112f626 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 16:15:43 +0900
Subject: [PATCH 21/55] 13.11.0-beta.8

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

diff --git a/package.json b/package.json
index d2a103c573..67bccb971b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.11.0-beta.7",
+	"version": "13.11.0-beta.8",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From a432f53d6cbfdac1a0c157a8f0424d8902818c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Sat, 8 Apr 2023 07:16:10 +0000
Subject: [PATCH 22/55] ci: avoid 0000000

---
 .github/workflows/storybook.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/storybook.yml b/.github/workflows/storybook.yml
index 3a62bf2378..6792674d9f 100644
--- a/.github/workflows/storybook.yml
+++ b/.github/workflows/storybook.yml
@@ -44,7 +44,11 @@ jobs:
       if: github.ref != 'refs/heads/master'
       id: chromatic
       run: |
-        CHROMATIC_PARAMETER="$(node packages/frontend/.storybook/changes.js $(git diff-tree --no-commit-id --name-only -r ${{ github.event.before }} HEAD | xargs))"
+        DIFF="${{ github.event.before }} HEAD"
+        if [ "$DIFF" = "0000000000000000000000000000000000000000 HEAD" ]; then
+          DIFF="HEAD"
+        fi
+        CHROMATIC_PARAMETER="$(node packages/frontend/.storybook/changes.js $(git diff-tree --no-commit-id --name-only -r $(echo "$DIFF") | xargs))"
         if [ "$CHROMATIC_PARAMETER" = " --skip" ]; then
           echo "skip=true" >> $GITHUB_OUTPUT
         fi

From 59693bcb65861f00959358b7c520f352fcabf595 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Sat, 8 Apr 2023 17:02:18 +0900
Subject: [PATCH 23/55] docs: thanks (#10518)

---
 README.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fdc8c1d8d3..2aae4bb865 100644
--- a/README.md
+++ b/README.md
@@ -61,10 +61,18 @@ Misskey Documentation can be found at [Misskey Hub](https://misskey-hub.net/), s
 
 ## Thanks
 
-<a href="https://www.chromatic.com/"><img src="https://user-images.githubusercontent.com/321738/84662277-e3db4f80-af1b-11ea-88f5-91d67a5e59f6.png" width="153" height="30" alt="Chromatic" /></a>
+<a href="https://www.chromatic.com/"><img src="https://user-images.githubusercontent.com/321738/84662277-e3db4f80-af1b-11ea-88f5-91d67a5e59f6.png" height="30" alt="Chromatic" /></a>
 
 Thanks to [Chromatic](https://www.chromatic.com/) for providing the visual testing platform that helps us review UI changes and catch visual regressions.
 
-<a href="https://hub.docker.com/"><img src="https://user-images.githubusercontent.com/20679825/230148221-f8e73a32-a49b-47c3-9029-9a15c3824f92.png" width="117" height="30" alt="Docker" /></a>
+<a href="https://about.codecov.io/for/open-source/"><img src="https://about.codecov.io/wp-content/themes/codecov/assets/brand/sentry-cobranding/logos/codecov-by-sentry-logo.svg" height="30" alt="Codecov" /></a>
+
+Thanks to [Codecov](https://about.codecov.io/for/open-source/) for providing the code coverage platform that helps us improve our test coverage.
+
+<a href="https://crowdin.com/"><img src="https://user-images.githubusercontent.com/20679825/230709597-1299a011-171a-4294-a91e-355a9b37c672.svg" height="30" alt="Crowdin" /></a>
+
+Thanks to [Crowdin](https://crowdin.com/) for providing the localization platform that helps us translate Misskey into many languages.
+
+<a href="https://hub.docker.com/"><img src="https://user-images.githubusercontent.com/20679825/230148221-f8e73a32-a49b-47c3-9029-9a15c3824f92.png" height="30" alt="Docker" /></a>
 
 Thanks to [Docker](https://hub.docker.com/) for providing the container platform that helps us run Misskey in production.

From 66342337efe728850352778a6023f946d0fc31d0 Mon Sep 17 00:00:00 2001
From: omi <28837028+omi-key@users.noreply.github.com>
Date: Sat, 8 Apr 2023 17:06:42 +0900
Subject: [PATCH 24/55] =?UTF-8?q?chore:=20local=20test=20=E3=81=8C=20redis?=
 =?UTF-8?q?=20version=20=E8=B5=B7=E5=9B=A0=E3=81=A7=E8=90=BD=E3=81=A1?=
 =?UTF-8?q?=E3=82=8B=20(#10519)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/test/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/backend/test/docker-compose.yml b/packages/backend/test/docker-compose.yml
index 5f95bec4c0..da6c01dda1 100644
--- a/packages/backend/test/docker-compose.yml
+++ b/packages/backend/test/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 
 services:
   redistest:
-    image: redis:6
+    image: redis:7
     ports:
       - "127.0.0.1:56312:6379"
 

From 95f670e3ec5bdf1ef678f316d976f60388c3c45e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?=
 <root@acid-chicken.com>
Date: Sat, 8 Apr 2023 17:18:00 +0900
Subject: [PATCH 25/55] test: use M PLUS Rounded 1c on Storybook (#10520)

* test: use M PLUS Rounded 1c on Storybook

* test: fix hostname
---
 packages/frontend/.storybook/preview-head.html | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/frontend/.storybook/preview-head.html b/packages/frontend/.storybook/preview-head.html
index 01912da28b..64e537b931 100644
--- a/packages/frontend/.storybook/preview-head.html
+++ b/packages/frontend/.storybook/preview-head.html
@@ -1,4 +1,10 @@
 <link rel="stylesheet" href="https://unpkg.com/@tabler/icons-webfont@2.12.0/tabler-icons.min.css">
+<link rel="stylesheet" href="https://unpkg.com/@fontsource/m-plus-rounded-1c/index.css">
+<style>
+	html {
+		font-family: 'Hiragino Maru Gothic Pro', 'BIZ UDGothic', Roboto, HelveticaNeue, Arial, 'M PLUS Rounded 1c', sans-serif;
+	}
+</style>
 <script>
   window.global = window;
 </script>

From 90df0d87ae6bff061a3c14d654db991d3b65c959 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 17:39:44 +0900
Subject: [PATCH 26/55] disable flaky test

---
 packages/backend/test/e2e/streaming.ts | 69 +++++++++++++-------------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/packages/backend/test/e2e/streaming.ts b/packages/backend/test/e2e/streaming.ts
index b832117b37..d1394ef7a8 100644
--- a/packages/backend/test/e2e/streaming.ts
+++ b/packages/backend/test/e2e/streaming.ts
@@ -391,6 +391,8 @@ describe('Streaming', () => {
 			});
 		});
 
+		// XXX: QueryFailedError: duplicate key value violates unique constraint "IDX_347fec870eafea7b26c8a73bac"
+		/*
 		describe('Hashtag Timeline', () => {
 			test('指定したハッシュタグの投稿が流れる', () => new Promise<void>(async done => {
 				const ws = await connectStream(chitose, 'hashtag', ({ type, body }) => {
@@ -410,45 +412,43 @@ describe('Streaming', () => {
 				});
 			}));
 
-			// XXX: QueryFailedError: duplicate key value violates unique constraint "IDX_347fec870eafea7b26c8a73bac"
+			test('指定したハッシュタグの投稿が流れる (AND)', () => new Promise<void>(async done => {
+				let fooCount = 0;
+				let barCount = 0;
+				let fooBarCount = 0;
 
-			// test('指定したハッシュタグの投稿が流れる (AND)', () => new Promise<void>(async done => {
-			// 	let fooCount = 0;
-			// 	let barCount = 0;
-			// 	let fooBarCount = 0;
+				const ws = await connectStream(chitose, 'hashtag', ({ type, body }) => {
+					if (type === 'note') {
+						if (body.text === '#foo') fooCount++;
+						if (body.text === '#bar') barCount++;
+						if (body.text === '#foo #bar') fooBarCount++;
+					}
+				}, {
+					q: [
+						['foo', 'bar'],
+					],
+				});
 
-			// 	const ws = await connectStream(chitose, 'hashtag', ({ type, body }) => {
-			// 		if (type === 'note') {
-			// 			if (body.text === '#foo') fooCount++;
-			// 			if (body.text === '#bar') barCount++;
-			// 			if (body.text === '#foo #bar') fooBarCount++;
-			// 		}
-			// 	}, {
-			// 		q: [
-			// 			['foo', 'bar'],
-			// 		],
-			// 	});
+				post(chitose, {
+					text: '#foo',
+				});
 
-			// 	post(chitose, {
-			// 		text: '#foo',
-			// 	});
+				post(chitose, {
+					text: '#bar',
+				});
 
-			// 	post(chitose, {
-			// 		text: '#bar',
-			// 	});
+				post(chitose, {
+					text: '#foo #bar',
+				});
 
-			// 	post(chitose, {
-			// 		text: '#foo #bar',
-			// 	});
-
-			// 	setTimeout(() => {
-			// 		assert.strictEqual(fooCount, 0);
-			// 		assert.strictEqual(barCount, 0);
-			// 		assert.strictEqual(fooBarCount, 1);
-			// 		ws.close();
-			// 		done();
-			// 	}, 3000);
-			// }));
+				setTimeout(() => {
+					assert.strictEqual(fooCount, 0);
+					assert.strictEqual(barCount, 0);
+					assert.strictEqual(fooBarCount, 1);
+					ws.close();
+					done();
+				}, 3000);
+			}));
 
 			test('指定したハッシュタグの投稿が流れる (OR)', () => new Promise<void>(async done => {
 				let fooCount = 0;
@@ -549,5 +549,6 @@ describe('Streaming', () => {
 				}, 3000);
 			}));
 		});
+		*/
 	});
 });

From abe73c99043d130bfc676291d8ee1ff1df0bd8ec Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 17:40:31 +0900
Subject: [PATCH 27/55] New Crowdin updates (#10512)

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

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

* New translations ja-JP.yml (English)

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

* New translations ja-JP.yml (Polish)

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

* New translations ja-JP.yml (Romanian)

* New translations ja-JP.yml (French)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (Arabic)

* New translations ja-JP.yml (Catalan)

* New translations ja-JP.yml (Czech)

* New translations ja-JP.yml (Danish)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Greek)

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (Korean)

* New translations ja-JP.yml (Dutch)

* New translations ja-JP.yml (Norwegian)

* New translations ja-JP.yml (Portuguese)

* New translations ja-JP.yml (Russian)

* New translations ja-JP.yml (Slovak)

* New translations ja-JP.yml (Swedish)

* New translations ja-JP.yml (Turkish)

* New translations ja-JP.yml (Ukrainian)

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

* New translations ja-JP.yml (Vietnamese)

* New translations ja-JP.yml (Indonesian)

* New translations ja-JP.yml (Bengali)

* New translations ja-JP.yml (Thai)

* New translations ja-JP.yml (Croatian)

* New translations ja-JP.yml (Uyghur)

* New translations ja-JP.yml (Lojban)

* New translations ja-JP.yml (Sinhala)

* New translations ja-JP.yml (Kannada)

* New translations ja-JP.yml (Lao)

* New translations ja-JP.yml (Haitian Creole)

* New translations ja-JP.yml (Kabyle)

* New translations ja-JP.yml (English)

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

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (German)

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

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (Spanish)

* New translations ja-JP.yml (German)

* New translations ja-JP.yml (Swedish)
---
 locales/ar-SA.yml   |  1 -
 locales/bn-BD.yml   |  1 -
 locales/ca-ES.yml   |  1 -
 locales/cs-CZ.yml   |  1 -
 locales/da-DK.yml   |  1 -
 locales/de-DE.yml   | 20 +++++++++++++++-----
 locales/el-GR.yml   |  1 -
 locales/en-US.yml   | 20 +++++++++++---------
 locales/es-ES.yml   | 34 +++++++++++++++++++++++++++++++++-
 locales/fr-FR.yml   |  1 -
 locales/hr-HR.yml   |  1 -
 locales/ht-HT.yml   |  1 -
 locales/id-ID.yml   |  1 -
 locales/it-IT.yml   |  1 -
 locales/ja-KS.yml   |  3 ++-
 locales/jbo-EN.yml  |  1 -
 locales/kab-KAB.yml |  1 -
 locales/kn-IN.yml   |  1 -
 locales/ko-KR.yml   |  1 -
 locales/lo-LA.yml   |  1 -
 locales/nl-NL.yml   |  1 -
 locales/no-NO.yml   |  1 -
 locales/pl-PL.yml   |  1 -
 locales/pt-PT.yml   |  1 -
 locales/ro-RO.yml   |  1 -
 locales/ru-RU.yml   |  1 -
 locales/si-LK.yml   |  1 -
 locales/sk-SK.yml   |  1 -
 locales/sv-SE.yml   | 19 ++++++++++++++++++-
 locales/th-TH.yml   |  1 -
 locales/tr-TR.yml   |  1 -
 locales/ug-CN.yml   |  1 -
 locales/uk-UA.yml   |  1 -
 locales/vi-VN.yml   |  1 -
 locales/zh-CN.yml   |  6 +++---
 locales/zh-TW.yml   |  1 -
 36 files changed, 82 insertions(+), 50 deletions(-)

diff --git a/locales/ar-SA.yml b/locales/ar-SA.yml
index c2910b90cd..4b9062051b 100644
--- a/locales/ar-SA.yml
+++ b/locales/ar-SA.yml
@@ -1277,4 +1277,3 @@ _deck:
 _webhookSettings:
   name: "الإسم"
   active: "مفعّل"
-
diff --git a/locales/bn-BD.yml b/locales/bn-BD.yml
index 40af5a3326..734943960c 100644
--- a/locales/bn-BD.yml
+++ b/locales/bn-BD.yml
@@ -1356,4 +1356,3 @@ _deck:
 _webhookSettings:
   name: "নাম"
   active: "চালু"
-
diff --git a/locales/ca-ES.yml b/locales/ca-ES.yml
index bc9e662493..2b1168f780 100644
--- a/locales/ca-ES.yml
+++ b/locales/ca-ES.yml
@@ -460,4 +460,3 @@ _deck:
     list: "Llistes"
     mentions: "Mencions"
     direct: "Publicacions directes"
-
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
index 4b59192474..19815c6f37 100644
--- a/locales/cs-CZ.yml
+++ b/locales/cs-CZ.yml
@@ -779,4 +779,3 @@ _deck:
 _webhookSettings:
   name: "Jméno"
   active: "Zapnuto"
-
diff --git a/locales/da-DK.yml b/locales/da-DK.yml
index d1fbec9f67..08c15ed092 100644
--- a/locales/da-DK.yml
+++ b/locales/da-DK.yml
@@ -1,3 +1,2 @@
 ---
 _lang_: "Dansk"
-
diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index df01f39b3f..aa56493930 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -67,7 +67,7 @@ import: "Import"
 export: "Export"
 files: "Dateien"
 download: "Herunterladen"
-driveFileDeleteConfirm: "Möchtest du die Datei „{name}“ wirklich löschen? Notizen mit dieser Datei werden ebenso verschwinden."
+driveFileDeleteConfirm: "Möchtest du die Datei „{name}“ wirklich löschen? Sie wird in allen Inhalten, die sie verwenden, auch verschwinden."
 unfollowConfirm: "Möchtest du {name} wirklich nicht mehr folgen?"
 exportRequested: "Du hast einen Export angefragt. Dies kann etwas Zeit in Anspruch nehmen. Sobald der Export abgeschlossen ist, wird er deiner Drive hinzugefügt."
 importRequested: "Du hast einen Import angefragt. Dies kann etwas Zeit in Anspruch nehmen."
@@ -500,7 +500,7 @@ objectStoragePrefixDesc: "Dateien werden in Ordnern unter diesem Prefix gespeich
 objectStorageEndpoint: "Endpoint"
 objectStorageEndpointDesc: "Im Falle von S3 leerlassen, für andere Anbieter den relevanten Endpoint im Format „<host>“ oder „<host>:<port>“ angeben."
 objectStorageRegion: "Region"
-objectStorageRegionDesc: "Gib eine Region wie z.B. „xx-east-1“ an. Falls dein Anbieter nicht zwischen Regionen unterscheidet, lass dieses Feld leer oder gib „us-east-1“ an."
+objectStorageRegionDesc: "Gib eine Region wie z.B. „xx-east-1“ an. Falls dein Anbieter nicht zwischen Regionen unterscheidet, gib „us-east-1“ an. Lasse es leer bei Verwendung von AWS Konfigurationsdateien oder Umgebungsvariablen."
 objectStorageUseSSL: "SSL verwenden"
 objectStorageUseSSLDesc: "Deaktiviere dies, falls du für API-Verbindungen kein HTTPS verwenden wirst"
 objectStorageUseProxy: "Über Proxy verbinden"
@@ -920,6 +920,7 @@ pushNotificationNotSupported: "Entweder dein Browser oder deine Instanz unterst
 sendPushNotificationReadMessage: "Push-Benachrichtigungen löschen, sobald die relevanten Benachrichtigungen oder Nachrichten gelesen wurden"
 sendPushNotificationReadMessageCaption: "Eine Push-Benachrichtigungen mit dem Inhalt \"{emptyPushNotificationMessage}\" wird kurz eingeblendet. Dies kann gegebenenfalls den Batterieverbrauch deines Gerätes erhöhen."
 windowMaximize: "Maximieren"
+windowMinimize: "Minimieren"
 windowRestore: "Wiederherstellen"
 caption: "Beschreibung"
 loggedInAsBot: "Momentan als Bot angemeldet"
@@ -988,6 +989,16 @@ enableChartsForFederatedInstances: "Diagramme für fremde Instanzen erstellen"
 showClipButtonInNoteFooter: "\"Clip\" zum Notizmenu hinzufügen"
 largeNoteReactions: "Reaktionen vergrößert anzeigen"
 noteIdOrUrl: "Notiz-ID oder URL"
+accountMigration: "Konto-Umzug"
+accountMoved: "Dieser Benutzer ist zu einem neuen Konto umgezogen:"
+_accountMigration:
+  moveTo: "Dieses Konto zu einem neuen umziehen"
+  moveToLabel: "Umzugsziel:"
+  moveAccountDescription: "Ein Umzug kann nicht rückgängig gemacht werden. Stelle zuerst sicher, dass du auf dem Umzugsziel einen Alias erstellt hast. Gib dann das Umzugsziel in folgendem Format ein: @person@instance.com"
+  moveFrom: "Von einem anderen Konto zu diesem umziehen"
+  moveFromLabel: "Umzugsursprung:"
+  moveFromDescription: "Stelle sicher, dass du auf dem Umzugsursprungskonto einen Alias zu diesem Konto erstellt hast, falls du die Follower des Ursprungskontos übertragen möchtest. Dies muss vor dem Umzug geschehen! Gib dann das Ursprungskonto in folgendem Format an: @person@instance.com"
+  migrationConfirm: "Dieses Konto wirklich zu {account} umziehen? Sobald der Umzug beginnt, kann er nicht rückgängig gemacht werden, und dieses Konto nicht wieder im ursprünglichen Zustand verwendet werden.\n\nÜberprüfe zusätzlich, dass du auf dem Umzugsziel einen Alias eingerichtet hast."
 _achievements:
   earnedAt: "Freigeschaltet am"
   _types:
@@ -1260,7 +1271,7 @@ _role:
     gtlAvailable: "Kann auf die globale Chronik zugreifen"
     ltlAvailable: "Kann auf die lokale Chronik zugreifen"
     canPublicNote: "Kann öffentliche Notizen erstellen"
-    canInvite: "Kann Einladungscodes für diese Instanz erstellen"
+    canInvite: "Erstellung von Einladungscodes für diese Instanz"
     canManageCustomEmojis: "Benutzerdefinierte Emojis verwalten"
     driveCapacity: "Drive-Kapazität"
     pinMax: "Maximale Anzahl an angehefteten Notizen"
@@ -1413,7 +1424,7 @@ _instanceMute:
   instanceMuteDescription: "Schaltet alle Notizen/Renotes stumm, die von den gelisteten Instanzen stammen, inklusive Antworten von Benutzern an einen Benutzer einer stummgeschalteten Instanz."
   instanceMuteDescription2: "Instanzen getrennt durch Zeilenumbrüchen angeben"
   title: "Blendet Notizen von stummgeschalteten Instanzen aus."
-  heading: "Liste der stummzuschaltenden Instanzen"
+  heading: "Stummzuschaltende Instanzen"
 _theme:
   explore: "Farbschemata erforschen"
   install: "Farbschemata installieren"
@@ -1898,4 +1909,3 @@ _webhookSettings:
     renote: "Wenn du ein Renote erhältst"
     reaction: "Wenn du eine Reaktion erhältst"
     mention: "Wenn du erwähnt wirst"
-
diff --git a/locales/el-GR.yml b/locales/el-GR.yml
index 634e36c29e..32964e9982 100644
--- a/locales/el-GR.yml
+++ b/locales/el-GR.yml
@@ -394,4 +394,3 @@ _deck:
     mentions: "Επισημάνσεις"
 _webhookSettings:
   name: "Όνομα"
-
diff --git a/locales/en-US.yml b/locales/en-US.yml
index a134bb3a3a..4b8ec86224 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -920,6 +920,7 @@ pushNotificationNotSupported: "Your browser or instance does not support push no
 sendPushNotificationReadMessage: "Delete push notifications once the relevant notifications or messages have been read"
 sendPushNotificationReadMessageCaption: "A notification containing the text \"{emptyPushNotificationMessage}\" will be displayed for a short time. This may increase the battery usage of your device, if applicable."
 windowMaximize: "Maximize"
+windowMinimize: "Minimize"
 windowRestore: "Restore"
 caption: "Caption"
 loggedInAsBot: "Currently logged in as bot"
@@ -988,15 +989,16 @@ enableChartsForFederatedInstances: "Generate remote instance data charts"
 showClipButtonInNoteFooter: "Add \"Clip\" to note action menu"
 largeNoteReactions: "Enlargen displayed reactions"
 noteIdOrUrl: "Note ID or URL"
-migration: "Migration"
-moveTo: "Move current account to new account"
-moveToLabel: "Account you're moving to:"
-moveAccountDescription: "This process is irreversible. Make sure you've set up an alias for this account on your new account before moving. Please enter the tag of the account formatted like @person@instance.com"
-moveFrom: "Move to this account from an older account"
-moveFromLabel: "Account you're moving from:"
-moveFromDescription: "This will set an alias of your old account so that you can move from that account to this current one. Do this BEFORE moving from your older account. Please enter the tag of the account formatted like @person@instance.com"
-migrationConfirm: "Are you absolutely sure you want to migrate your acccount to {account}? Once you do this, you won't be able to reverse it, and you won't be able to use your account normally again.\nAlso, please ensure that you've set this current account as the account you're moving from."
-accountMoved: "User has moved to a new account:"
+accountMigration: "Account Migration"
+accountMoved: "This user has moved to a new account:"
+_accountMigration:
+  moveTo: "Migrate this account to a different one"
+  moveToLabel: "Account to move to:"
+  moveAccountDescription: "This action is irreversible. First, create an alias for this account on the account you wish to move to. Then, enter the account to move to in the following format: @person@instance.com"
+  moveFrom: "Migrate another account to this one"
+  moveFromLabel: "Account to move from:"
+  moveFromDescription: "Create an alias for the account to move from on this account if you wish to transfer its followers. This has to be done before the transfer! Then, enter the account to move to in the following format: @person@instance.com"
+  migrationConfirm: "Really migrate this account to {account}? Once started, this process cannot be stopped or taken back, and you will not be able to use this account in its original state anymore.\n\nAlso, confirm you've created an alias at the account to migrate to."
 
 _achievements:
   earnedAt: "Unlocked at"
diff --git a/locales/es-ES.yml b/locales/es-ES.yml
index 8649101741..29cf9b3ec9 100644
--- a/locales/es-ES.yml
+++ b/locales/es-ES.yml
@@ -506,6 +506,7 @@ objectStorageUseSSLDesc: "Desactive esto si no va a usar HTTPS para la conexión
 objectStorageUseProxy: "Conectarse a través de Proxy"
 objectStorageUseProxyDesc: "Desactive esto si no va a usar Proxy para la conexión de Almacenamiento de objetos"
 objectStorageSetPublicRead: "Seleccionar \"public-read\" al subir "
+s3ForcePathStyleDesc: "Si s3ForcePathStyle esta habilitado el nombre del bucket debe ser especificado como parte de la URL en lugar del nombre de host en la URL. Puede ser necesario activar esta opción cuando se utilice, por ejemplo, Minio en un servidor propio."
 serverLogs: "Registros del servidor"
 deleteAll: "Eliminar todos"
 showFixedPostForm: "Mostrar el formulario de las entradas encima de la línea de tiempo"
@@ -919,6 +920,7 @@ pushNotificationNotSupported: "El navegador o la instancia no admiten notificaci
 sendPushNotificationReadMessage: "Eliminar las notificaciones push después de leer las notificaciones y los mensajes"
 sendPushNotificationReadMessageCaption: "La notificación \"{emptyPushNotificationMessage}\" aparecerá momentáneamente. Esto puede aumentar el consumo de batería del dispositivo."
 windowMaximize: "Maximizar"
+windowMinimize: "Minimizar"
 windowRestore: "Regresar"
 caption: "Pie de foto"
 loggedInAsBot: "Inicio sesión como cuenta bot."
@@ -960,6 +962,9 @@ copyErrorInfo: "Copiar detalles del error"
 joinThisServer: "Registrarse en esta instancia"
 exploreOtherServers: "Buscar otra instancia"
 letsLookAtTimeline: "Mirar la línea de tiempo local"
+disableFederationConfirm: "¿Estas seguro que quieres desactivar la federación?"
+disableFederationConfirmWarn: "Aunque no exista federación los posts no serán marcados como privados. En la mayoría de los casos, no es necesario hacer los posts no federar."
+disableFederationOk: "Desactivar."
 invitationRequiredToRegister: "Esta instancia está configurada sólo por invitación, tienes que ingresar un código de invitación válido."
 emailNotSupported: "Esta instancia no soporta el envío de correo electrónico"
 postToTheChannel: "Publicar en el canal"
@@ -979,6 +984,21 @@ drivecleaner: "Limpiador del Drive"
 retryAllQueuesNow: "Reintentar inmediatamente todas las colas"
 retryAllQueuesConfirmTitle: "Desea ¿reintentar inmediatamente todas las colas?"
 retryAllQueuesConfirmText: "La carga del servidor está incrementándose temporalmente "
+enableChartsForRemoteUser: "Generar gráficas de usuarios remotos."
+enableChartsForFederatedInstances: "Generar gráficos de servidores remotos"
+showClipButtonInNoteFooter: "Añadir \"Clip\" al menú de notas"
+largeNoteReactions: "Agrandar las reacciones de las notas"
+noteIdOrUrl: "ID o URL de la nota"
+accountMigration: "Migración de cuenta"
+accountMoved: "Este usuario se ha mudado a una nueva cuenta:"
+_accountMigration:
+  moveTo: "Mover esta cuenta a una nueva"
+  moveToLabel: "Cuenta destino:"
+  moveAccountDescription: "Esta operación no puede deshacerse. En primer lugar, asegúrese de haber creado un alias para esta cuenta en la cuenta a la que se va a trasladar. Después de crear el alias, introduzca la cuenta a la que se está trasladando de la siguiente manera: @person@instance.com"
+  moveFrom: "Trasladar de otra cuenta a ésta"
+  moveFromLabel: "Cuenta desde la que se realiza el traslado:"
+  moveFromDescription: "Si quieres transferir seguidores de otra cuenta a esta cuenta y trasladarlos, tendrás que crear un alias aquí. Asegúrate de crearlo antes de realizar el traslado. Introduce la cuenta desde la que estás moviendo los seguidores así: @person@instance.com"
+  migrationConfirm: "¿Estás seguro de que quieres mover esta cuenta a {account}? Una vez trasladada, no podrás deshacer el traslado y no podrás volver a utilizar la cuenta original.\n\nAdemás, compruebe que ha configurado un alias en el destino del traslado."
 _achievements:
   earnedAt: "Desbloqueado el"
   _types:
@@ -1275,6 +1295,8 @@ _role:
     followersMoreThanOrEq: "Tiene X o más seguidores"
     followingLessThanOrEq: "Sigue X o menos cuentas"
     followingMoreThanOrEq: "Sigue X o más cuentas"
+    notesLessThanOrEq: "El número de notas es inferior o igual a"
+    notesMoreThanOrEq: "El número de notas es superior o igual a"
     and: "Condicional AND"
     or: "Condicional OR"
     not: "Condicional NOT"
@@ -1874,6 +1896,16 @@ _drivecleaner:
   orderBySizeDesc: "Más grandes"
   orderByCreatedAtAsc: "Más antiguos"
 _webhookSettings:
+  createWebhook: "Crear Webhook"
   name: "Nombre"
+  secret: "Secreto"
+  events: "Eventos de webhook"
   active: "Activado"
-
+  _events:
+    follow: "Cuando se sigue a alguien"
+    followed: "Cuando se es seguido"
+    note: "Cuando se publica una nota"
+    reply: "Cuando se recibe una respuesta"
+    renote: "Cuando reciba un \"re-note\""
+    reaction: "Cuando se recibe una reacción"
+    mention: "Cuando hay una mención"
diff --git a/locales/fr-FR.yml b/locales/fr-FR.yml
index 11573e0ce0..e0767fdc09 100644
--- a/locales/fr-FR.yml
+++ b/locales/fr-FR.yml
@@ -1470,4 +1470,3 @@ _deck:
 _webhookSettings:
   name: "Nom"
   active: "Activé"
-
diff --git a/locales/hr-HR.yml b/locales/hr-HR.yml
index cd21505a47..ed97d539c0 100644
--- a/locales/hr-HR.yml
+++ b/locales/hr-HR.yml
@@ -1,2 +1 @@
 ---
-
diff --git a/locales/ht-HT.yml b/locales/ht-HT.yml
index cd21505a47..ed97d539c0 100644
--- a/locales/ht-HT.yml
+++ b/locales/ht-HT.yml
@@ -1,2 +1 @@
 ---
-
diff --git a/locales/id-ID.yml b/locales/id-ID.yml
index e5a057477a..1272da9b3e 100644
--- a/locales/id-ID.yml
+++ b/locales/id-ID.yml
@@ -1806,4 +1806,3 @@ _deck:
 _webhookSettings:
   name: "Nama"
   active: "Aktif"
-
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 41865d7bf1..01209b6fd4 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -1894,4 +1894,3 @@ _webhookSettings:
     renote: "Quando la Nota è Rinotata"
     reaction: "Quando ricevo una reazione"
     mention: "Quando mi menzionano"
-
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index 5e9bbde7d1..398dbcd5c0 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -920,6 +920,7 @@ pushNotificationNotSupported: "ブラウザかサーバーがプッシュ通知
 sendPushNotificationReadMessage: "通知やメッセージが既読になったらプッシュ通知を消すで"
 sendPushNotificationReadMessageCaption: "「{emptyPushNotificationMessage}」っていう表示が一瞬表示されるようになるで。端末の電池使用量が増える可能性があるで。"
 windowMaximize: "最大化"
+windowMinimize: "最小化"
 windowRestore: "元に戻す"
 caption: "キャプション"
 loggedInAsBot: "Botアカウントでログイン中やで"
@@ -988,6 +989,7 @@ enableChartsForFederatedInstances: "リモートサーバーのチャートを
 showClipButtonInNoteFooter: "ノートのアクションにクリップを追加"
 largeNoteReactions: "ノートのリアクションを大きする"
 noteIdOrUrl: "ノートIDかURL"
+accountMoved: "このユーザーはさらのアカウントに引っ越したで："
 _achievements:
   earnedAt: "貰った日ぃ"
   _types:
@@ -1898,4 +1900,3 @@ _webhookSettings:
     renote: "Renoteされるとき～！"
     reaction: "リアクションがあるとき～！"
     mention: "メンションがあるとき～！"
-
diff --git a/locales/jbo-EN.yml b/locales/jbo-EN.yml
index cd21505a47..ed97d539c0 100644
--- a/locales/jbo-EN.yml
+++ b/locales/jbo-EN.yml
@@ -1,2 +1 @@
 ---
-
diff --git a/locales/kab-KAB.yml b/locales/kab-KAB.yml
index 8b43041e4c..18fd8f5a58 100644
--- a/locales/kab-KAB.yml
+++ b/locales/kab-KAB.yml
@@ -103,4 +103,3 @@ _deck:
   _columns:
     notifications: "Ilɣuyen"
     list: "Tibdarin"
-
diff --git a/locales/kn-IN.yml b/locales/kn-IN.yml
index 63a75302a1..ef66f3fbd2 100644
--- a/locales/kn-IN.yml
+++ b/locales/kn-IN.yml
@@ -83,4 +83,3 @@ _deck:
     notifications: "ಅಧಿಸೂಚನೆಗಳು"
     tl: "ಸಮಯಸಾಲು"
     mentions: "ಹೆಸರಿಸಿದ"
-
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index dc4aacec33..3ff00482d6 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1850,4 +1850,3 @@ _dialog:
 _webhookSettings:
   name: "이름"
   active: "활성화"
-
diff --git a/locales/lo-LA.yml b/locales/lo-LA.yml
index 5736fa67a7..9c1a48c67c 100644
--- a/locales/lo-LA.yml
+++ b/locales/lo-LA.yml
@@ -368,4 +368,3 @@ _deck:
     list: "ລາຍການ"
     channel: "ຊ່ອງ"
     mentions: "ກ່າວເຖິງ"
-
diff --git a/locales/nl-NL.yml b/locales/nl-NL.yml
index efbb83c70f..31c28a66e3 100644
--- a/locales/nl-NL.yml
+++ b/locales/nl-NL.yml
@@ -485,4 +485,3 @@ _deck:
     mentions: "Vermeldingen"
 _webhookSettings:
   name: "Naam"
-
diff --git a/locales/no-NO.yml b/locales/no-NO.yml
index 36a0a2e0e3..83e189b9cf 100644
--- a/locales/no-NO.yml
+++ b/locales/no-NO.yml
@@ -1,3 +1,2 @@
 ---
 _lang_: "Norsk Bokmål"
-
diff --git a/locales/pl-PL.yml b/locales/pl-PL.yml
index cc71e8777f..517e8431f9 100644
--- a/locales/pl-PL.yml
+++ b/locales/pl-PL.yml
@@ -1379,4 +1379,3 @@ _deck:
 _webhookSettings:
   name: "Nazwa"
   active: "Właczono"
-
diff --git a/locales/pt-PT.yml b/locales/pt-PT.yml
index 870ad50150..8a7232fa2c 100644
--- a/locales/pt-PT.yml
+++ b/locales/pt-PT.yml
@@ -557,4 +557,3 @@ _deck:
     direct: "Notas diretas"
 _webhookSettings:
   name: "Nome"
-
diff --git a/locales/ro-RO.yml b/locales/ro-RO.yml
index 89f8afac9a..bbf0160de9 100644
--- a/locales/ro-RO.yml
+++ b/locales/ro-RO.yml
@@ -703,4 +703,3 @@ _deck:
     mentions: "Mențiuni"
 _webhookSettings:
   name: "Nume"
-
diff --git a/locales/ru-RU.yml b/locales/ru-RU.yml
index cde3224c9f..8a09d30306 100644
--- a/locales/ru-RU.yml
+++ b/locales/ru-RU.yml
@@ -1838,4 +1838,3 @@ _dialog:
 _webhookSettings:
   name: "Название"
   active: "Вкл."
-
diff --git a/locales/si-LK.yml b/locales/si-LK.yml
index cd21505a47..ed97d539c0 100644
--- a/locales/si-LK.yml
+++ b/locales/si-LK.yml
@@ -1,2 +1 @@
 ---
-
diff --git a/locales/sk-SK.yml b/locales/sk-SK.yml
index ff6075b703..7c74060158 100644
--- a/locales/sk-SK.yml
+++ b/locales/sk-SK.yml
@@ -1477,4 +1477,3 @@ _deck:
 _webhookSettings:
   name: "Názov"
   active: "Zapnuté"
-
diff --git a/locales/sv-SE.yml b/locales/sv-SE.yml
index 6ea5f77c21..c5653d32ec 100644
--- a/locales/sv-SE.yml
+++ b/locales/sv-SE.yml
@@ -343,9 +343,15 @@ recentlyRegisteredUsers: "Nyligen registrerade användare"
 userList: "Listor"
 aboutMisskey: "Om Misskey"
 administrator: "Administratör"
+passwordLessLogin: "Lösenordsfri inloggning"
+passwordLessLoginDescription: "Tillåter lösenordsfri inloggning med endast en säkerhetsnyckel eller en passkey."
 newPasswordIs: "Det nya lösenordet är \"{password}\""
 share: "Dela"
 enable: "Aktivera"
+weakPassword: "Svagt Lösenord"
+normalPassword: "Medel Lösenord"
+strongPassword: "Starkt Lösenord"
+signinFailed: "Kan inte logga in. Det angivna användarnamnet eller lösenordet är felaktigt."
 serviceworkerInfo: "Måste vara aktiverad för pushnotiser."
 enableInfiniteScroll: "Ladda mer automatiskt"
 enablePlayer: "Öppna videospelare"
@@ -354,11 +360,13 @@ enableEmail: "Aktivera epost-utskick"
 smtpHost: "Värd"
 smtpUser: "Användarnamn"
 smtpPass: "Lösenord"
+emptyToDisableSmtpAuth: "Lämna användarnamn och lösenord tomt för att avaktivera SMTP verifiering"
 clearCache: "Rensa cache"
 enabled: "Aktiverad"
 user: "Användare"
 global: "Global"
 squareAvatars: "Visa fyrkantiga profilbilder"
+incorrectPassword: "Fel lösenord."
 searchByGoogle: "Sök"
 file: "Filer"
 enableAutoSensitive: "Automatisk NSFW markering"
@@ -368,6 +376,15 @@ subscribePushNotification: "Aktivera pushnotiser"
 unsubscribePushNotification: "Avaktivera pushnotiser"
 pushNotificationAlreadySubscribed: "Pushnotiser är redan aktiverade"
 pushNotificationNotSupported: "Din webbläsare eller instans har inte stöd för pushnotiser"
+windowMaximize: "Maximera"
+windowMinimize: "Minimera"
+windowRestore: "Återställ"
+resetPasswordConfirm: "Återställ verkligen ditt lösenord?"
+_achievements:
+  _types:
+    _open3windows:
+      title: "Flera Fönster"
+      description: "Ha minst 3 fönster öppna samtidigt"
 _email:
   _follow:
     title: "följde dig"
@@ -384,6 +401,7 @@ _sfx:
   chat: "Chatt"
   antenna: "Antenner"
 _2fa:
+  passwordToTOTP: "Skriv in ditt lösenord"
   renewTOTPCancel: "Nej tack"
 _antennaSources:
   all: "Alla noter"
@@ -444,4 +462,3 @@ _deck:
     mentions: "Omnämningar"
 _webhookSettings:
   active: "Aktiverad"
-
diff --git a/locales/th-TH.yml b/locales/th-TH.yml
index b4bf5c79f5..8d4a41bf34 100644
--- a/locales/th-TH.yml
+++ b/locales/th-TH.yml
@@ -1868,4 +1868,3 @@ _drivecleaner:
 _webhookSettings:
   name: "ชื่อ"
   active: "เปิดใช้งาน"
-
diff --git a/locales/tr-TR.yml b/locales/tr-TR.yml
index 0f53dbafcb..7bd8188a48 100644
--- a/locales/tr-TR.yml
+++ b/locales/tr-TR.yml
@@ -60,4 +60,3 @@ _deck:
   _columns:
     notifications: "Bildirim"
     tl: "Zaman çizelgesi"
-
diff --git a/locales/ug-CN.yml b/locales/ug-CN.yml
index 5b825d7bf3..65ef841259 100644
--- a/locales/ug-CN.yml
+++ b/locales/ug-CN.yml
@@ -2,4 +2,3 @@
 _lang_: "ياپونچە"
 search: "ئىزدەش"
 searchByGoogle: "ئىزدەش"
-
diff --git a/locales/uk-UA.yml b/locales/uk-UA.yml
index 7b2ee6d891..895d2e1f12 100644
--- a/locales/uk-UA.yml
+++ b/locales/uk-UA.yml
@@ -1641,4 +1641,3 @@ _deck:
 _webhookSettings:
   name: "Ім'я"
   active: "Увімкнено"
-
diff --git a/locales/vi-VN.yml b/locales/vi-VN.yml
index f814454732..ebd046b6d4 100644
--- a/locales/vi-VN.yml
+++ b/locales/vi-VN.yml
@@ -1707,4 +1707,3 @@ _dialog:
 _webhookSettings:
   name: "Tên"
   active: "Đã bật"
-
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 5f45827e27..563609d500 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -60,7 +60,7 @@ youGotNewFollower: "你有新的关注者"
 receiveFollowRequest: "您收到了关注请求"
 followRequestAccepted: "您的关注请求被通过了"
 mention: "提及"
-mentions: "提及"
+mentions: "提到我的"
 directNotes: "私信"
 importAndExport: "导入和导出"
 import: "导入"
@@ -142,7 +142,7 @@ customEmojis: "自定义表情符号"
 emoji: "表情符号"
 emojis: "表情符号"
 emojiName: "表情符号名称"
-emojiUrl: "表情符号地址"
+emojiUrl: "emoji 地址"
 addEmoji: "添加表情符号"
 settingGuide: "推荐配置"
 cacheRemoteFiles: "缓存远程文件"
@@ -920,6 +920,7 @@ pushNotificationNotSupported: "浏览器或服务器不支持推送通知消息"
 sendPushNotificationReadMessage: "删除已读推送通知消息"
 sendPushNotificationReadMessageCaption: "“{emptyPushNotificationMessage}”的通知消息将会显示。您终端设备的电池消耗可能会增加。"
 windowMaximize: "最大化"
+windowMinimize: "最小化"
 windowRestore: "还原"
 caption: "标题"
 loggedInAsBot: "以Bot账户登录"
@@ -1898,4 +1899,3 @@ _webhookSettings:
     renote: "被转发时"
     reaction: "被回应时"
     mention: "被提及时"
-
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index d14dc49307..69f3d2f52c 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -1894,4 +1894,3 @@ _webhookSettings:
     renote: "當被轉發時"
     reaction: "當獲得反應時"
     mention: "當被提到時"
-

From 6892e9fbb7c763806263572cb09aa4861974fc01 Mon Sep 17 00:00:00 2001
From: okayurisotto <aytkzm@gmail.com>
Date: Sat, 8 Apr 2023 17:41:23 +0900
Subject: [PATCH 28/55] =?UTF-8?q?fix(frontend):=20URL=E3=81=AB=E4=BB=96?=
 =?UTF-8?q?=E3=81=AE=E3=82=AF=E3=82=A8=E3=83=AA=E3=81=8C=E3=81=82=E3=82=8B?=
 =?UTF-8?q?=E3=81=A8=E3=81=8D=E3=81=AB=E3=82=82Zen=20UI=E3=81=8C=E9=81=A9?=
 =?UTF-8?q?=E7=94=A8=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
 =?UTF-8?q?=20(#10477)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/init.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/init.ts b/packages/frontend/src/init.ts
index 7809017951..5b3e7ec932 100644
--- a/packages/frontend/src/init.ts
+++ b/packages/frontend/src/init.ts
@@ -187,7 +187,7 @@ try {
 } catch (err) {}
 
 const app = createApp(
-	window.location.search === '?zen' ? defineAsyncComponent(() => import('@/ui/zen.vue')) :
+	new URLSearchParams(window.location.search).has('zen') ? defineAsyncComponent(() => import('@/ui/zen.vue')) :
 	!$i ? defineAsyncComponent(() => import('@/ui/visitor.vue')) :
 	ui === 'deck' ? defineAsyncComponent(() => import('@/ui/deck.vue')) :
 	ui === 'classic' ? defineAsyncComponent(() => import('@/ui/classic.vue')) :

From 5cd93834d1763e404ff3dcca48be03e5c8974f0b Mon Sep 17 00:00:00 2001
From: atsuchan <83960488+atsu1125@users.noreply.github.com>
Date: Sat, 8 Apr 2023 17:42:08 +0900
Subject: [PATCH 29/55] =?UTF-8?q?enhance(client):=20=E5=BA=83=E5=91=8A?=
 =?UTF-8?q?=E3=83=BB=E3=81=8A=E7=9F=A5=E3=82=89=E3=81=9B=E3=81=8C=E6=96=B0?=
 =?UTF-8?q?=E8=A6=8F=E7=99=BB=E9=8C=B2=E6=99=82=E3=81=AB=E5=A2=97=E6=AE=96?=
 =?UTF-8?q?=E3=81=97=E3=81=AA=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=20(#1041?=
 =?UTF-8?q?2)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/frontend/src/pages/admin/ads.vue     | 44 ++++++++++++++++++-
 .../src/pages/admin/announcements.vue         |  9 ++++
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/packages/frontend/src/pages/admin/ads.vue b/packages/frontend/src/pages/admin/ads.vue
index 828bfe6007..803e8cb7b0 100644
--- a/packages/frontend/src/pages/admin/ads.vue
+++ b/packages/frontend/src/pages/admin/ads.vue
@@ -113,16 +113,37 @@ function remove(ad) {
 
 function save(ad) {
 	if (ad.id == null) {
-		os.apiWithDialog('admin/ad/create', {
+		os.api('admin/ad/create', {
 			...ad,
 			expiresAt: new Date(ad.expiresAt).getTime(),
 			startsAt: new Date(ad.startsAt).getTime(),
+		}).then(() => {
+			os.alert({
+				type: 'success',
+				text: i18n.ts.saved,
+			});
+			refresh();
+		}).catch(err => {
+			os.alert({
+				type: 'error',
+				text: err,
+			});
 		});
 	} else {
-		os.apiWithDialog('admin/ad/update', {
+		os.api('admin/ad/update', {
 			...ad,
 			expiresAt: new Date(ad.expiresAt).getTime(),
 			startsAt: new Date(ad.startsAt).getTime(),
+		}).then(() => {
+			os.alert({
+				type: 'success',
+				text: i18n.ts.saved,
+			});
+		}).catch(err => {
+			os.alert({
+				type: 'error',
+				text: err,
+			});
 		});
 	}
 }
@@ -141,6 +162,25 @@ function more() {
 		}));
 	});
 }
+
+function refresh() {
+	os.api('admin/ad/list').then(adsResponse => {
+		ads = adsResponse.map(r => {
+			const exdate = new Date(r.expiresAt);
+			const stdate = new Date(r.startsAt);
+			exdate.setMilliseconds(exdate.getMilliseconds() - localTimeDiff);
+			stdate.setMilliseconds(stdate.getMilliseconds() - localTimeDiff);
+			return {
+				...r,
+				expiresAt: exdate.toISOString().slice(0, 16),
+				startsAt: stdate.toISOString().slice(0, 16),
+			};
+		});
+	});
+}
+
+refresh();
+
 const headerActions = $computed(() => [{
 	asFullButton: true,
 	icon: 'ti ti-plus',
diff --git a/packages/frontend/src/pages/admin/announcements.vue b/packages/frontend/src/pages/admin/announcements.vue
index d5d177bf76..b76e4b9114 100644
--- a/packages/frontend/src/pages/admin/announcements.vue
+++ b/packages/frontend/src/pages/admin/announcements.vue
@@ -69,6 +69,7 @@ function save(announcement) {
 				type: 'success',
 				text: i18n.ts.saved,
 			});
+			refresh();
 		}).catch(err => {
 			os.alert({
 				type: 'error',
@@ -90,6 +91,14 @@ function save(announcement) {
 	}
 }
 
+function refresh() {
+	os.api('admin/announcements/list').then(announcementResponse => {
+		announcements = announcementResponse;
+	});
+}
+
+refresh();
+
 const headerActions = $computed(() => [{
 	asFullButton: true,
 	icon: 'ti ti-plus',

From a7455035c5953187084a0902fbdc8ab4cd4ef970 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 17:42:34 +0900
Subject: [PATCH 30/55] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 280c3871e3..0243e6a173 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,7 @@
 - ノートのリアクションを大きく表示するオプションを追加
 - ギャラリー一覧にメディア表示と同じように NSFW 設定を反映するように（ホバーで表示）
 - オブジェクトストレージの設定画面を分かりやすく
+- 広告・お知らせが新規登録時に増殖しないように
 -　「にゃああああああああああああああ！！！！！！！！！！！！」 (`isCat`) 有効時にアバターに表示される猫耳について挙動を変更
   - 「UIにぼかし効果を使用」 (`useBlurEffect`) で次の挙動が有効になります
 	  - 猫耳のアバター内部部分をぼかしでマスク表示してより猫耳っぽく見えるように

From cd915b69396df99c036189dc9e84fc843c966212 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 18:44:03 +0900
Subject: [PATCH 31/55] [ci skip] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0243e6a173..f39e131db7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,7 @@
 
 ### NOTE
 - このバージョンからRedis 7.xが必要です。
-- アップデートを行うと全ての通知はリセットされます。
+- アップデートを行うと全ての通知およびアンテナのノートはリセットされます。
 
 ### General
 - チャンネルをお気に入りに登録できるように

From 1c158dc5109c1d2bc1ed1572aeb0eacea9dad71d Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sat, 8 Apr 2023 10:37:35 +0000
Subject: [PATCH 32/55] fix(client): Fix antenna list infinite items loading
 https://github.com/misskey-dev/misskey/pull/10506#issuecomment-1500859975

---
 packages/frontend/src/pages/my-antennas/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/frontend/src/pages/my-antennas/index.vue b/packages/frontend/src/pages/my-antennas/index.vue
index 9daf23f9b5..f1764b1aad 100644
--- a/packages/frontend/src/pages/my-antennas/index.vue
+++ b/packages/frontend/src/pages/my-antennas/index.vue
@@ -24,6 +24,7 @@ import { definePageMetadata } from '@/scripts/page-metadata';
 
 const pagination = {
 	endpoint: 'antennas/list' as const,
+	noPaging: true,
 	limit: 10,
 };
 

From ad9f72291feaccb2e70b9c07bd62d67e4a0979e8 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 20:03:32 +0900
Subject: [PATCH 33/55] use for of

---
 packages/backend/src/core/activitypub/ApInboxService.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
index a95c178317..ff90af435b 100644
--- a/packages/backend/src/core/activitypub/ApInboxService.ts
+++ b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -771,17 +771,17 @@ export class ApInboxService {
 			where: {
 				followeeId: old_acc.id,
 				followerHost: IsNull(), // follower is local
-			}
+			},
 		});
-		followings.forEach(async (following) => {
-			if (!following.follower) return;
+		for (const following of followings) {
+			if (!following.follower) continue;
 			try {
 				await this.userFollowingService.follow(following.follower, new_acc);
 				await this.userFollowingService.unfollow(following.follower, old_acc);
 			} catch {
 				/* empty */
 			}
-		});
+		}
 
 		return 'ok';
 	}

From 50a9b29c48d3c756c72ca54ee2992c17cd9749b4 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 20:29:55 +0900
Subject: [PATCH 34/55] [ci skip] 13.11.0

---
 CHANGELOG.md | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f39e131db7..4eb2b82947 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
 
 -->
 
-## 13.x.x (unreleased)
+## 13.11.0
 
 ### NOTE
 - このバージョンからRedis 7.xが必要です。
diff --git a/package.json b/package.json
index 67bccb971b..c590388f3d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.11.0-beta.8",
+	"version": "13.11.0",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 2321214c98591bcfe1385c1ab5bf0ff7b471ae1d Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 20:51:36 +0900
Subject: [PATCH 35/55] disable account migration

---
 CHANGELOG.md                                            | 1 -
 packages/backend/src/core/activitypub/ApInboxService.ts | 2 +-
 packages/backend/src/server/api/endpoints.ts            | 4 ++--
 packages/frontend/src/pages/settings/index.vue          | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4eb2b82947..5399d8bdaf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,6 @@
 ### General
 - チャンネルをお気に入りに登録できるように
 - チャンネルにノートをピン留めできるように
-- アカウントの引っ越し（フォロワー引き継ぎ）に対応
 
 ### Client
 - 投稿フォームのデザインを改善
diff --git a/packages/backend/src/core/activitypub/ApInboxService.ts b/packages/backend/src/core/activitypub/ApInboxService.ts
index ff90af435b..3fca0bb1fd 100644
--- a/packages/backend/src/core/activitypub/ApInboxService.ts
+++ b/packages/backend/src/core/activitypub/ApInboxService.ts
@@ -140,7 +140,7 @@ export class ApInboxService {
 		} else if (isFlag(activity)) {
 			await this.flag(actor, activity);
 		} else if (isMove(activity)) {
-			await this.move(actor, activity);
+			//await this.move(actor, activity);
 		} else {
 			this.logger.warn(`unrecognized activity type: ${activity.type}`);
 		}
diff --git a/packages/backend/src/server/api/endpoints.ts b/packages/backend/src/server/api/endpoints.ts
index c8375ca149..fd268c7912 100644
--- a/packages/backend/src/server/api/endpoints.ts
+++ b/packages/backend/src/server/api/endpoints.ts
@@ -551,8 +551,8 @@ const eps = [
 	['i/unpin', ep___i_unpin],
 	['i/update-email', ep___i_updateEmail],
 	['i/update', ep___i_update],
-	['i/move', ep___i_move],
-	['i/known-as', ep___i_knownAs],
+	//['i/move', ep___i_move],
+	//['i/known-as', ep___i_knownAs],
 	['i/webhooks/create', ep___i_webhooks_create],
 	['i/webhooks/list', ep___i_webhooks_list],
 	['i/webhooks/show', ep___i_webhooks_show],
diff --git a/packages/frontend/src/pages/settings/index.vue b/packages/frontend/src/pages/settings/index.vue
index 7e9ec3de93..17af7417fd 100644
--- a/packages/frontend/src/pages/settings/index.vue
+++ b/packages/frontend/src/pages/settings/index.vue
@@ -164,12 +164,12 @@ const menuDef = computed(() => [{
 		text: i18n.ts.importAndExport,
 		to: '/settings/import-export',
 		active: currentPage?.route.name === 'import-export',
-	}, {
+	}, /*{
 		icon: 'ti ti-plane',
 		text: i18n.ts.accountMigration,
 		to: '/settings/migration',
 		active: currentPage?.route.name === 'migration',
-	}, {
+	},*/ {
 		icon: 'ti ti-dots',
 		text: i18n.ts.other,
 		to: '/settings/other',

From 789689e75956251568aee26ded8afe3e0cceb9d5 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sat, 8 Apr 2023 21:26:43 +0900
Subject: [PATCH 36/55] [ci skip] Update CHANGELOG.md

---
 CHANGELOG.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5399d8bdaf..adc9891746 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,9 +32,6 @@
 -　「にゃああああああああああああああ！！！！！！！！！！！！」 (`isCat`) 有効時にアバターに表示される猫耳について挙動を変更
   - 「UIにぼかし効果を使用」 (`useBlurEffect`) で次の挙動が有効になります
 	  - 猫耳のアバター内部部分をぼかしでマスク表示してより猫耳っぽく見えるように
-		- 猫耳の色がアバター上部のピクセルから決定されます（無効化時はアバター全体の平均色）
-		  - 左耳は上からおよそ 10%, 左からおよそ 20% の位置で決定します
-			- 右耳は上からおよそ 10%, 左からおよそ 80% の位置で決定します
 	- 「UIのアニメーションを減らす」 (`reduceAnimation`) で猫耳を撫でられなくなります
 - Add Minimizing ("folding") of windows
 

From e58b3579187dfe94615453e57e5f810c2b9e42fe Mon Sep 17 00:00:00 2001
From: Takeshi Kishi <takeya0x86@icloud.com>
Date: Sun, 9 Apr 2023 01:37:45 +0900
Subject: [PATCH 37/55] =?UTF-8?q?fix(client):=20PWA=E6=99=82=E3=81=AE?=
 =?UTF-8?q?=E7=B5=B5=E6=96=87=E5=AD=97=E3=83=94=E3=83=83=E3=82=AB=E3=83=BC?=
 =?UTF-8?q?=E3=81=AE=E4=BD=8D=E7=BD=AE=E3=82=92=E3=83=9B=E3=83=BC=E3=83=A0?=
 =?UTF-8?q?=E3=83=90=E3=83=BC=E3=81=AB=E9=87=8D=E3=81=AA=E3=82=89=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E3=82=88=E3=81=86=E3=81=AB=E8=AA=BF=E6=95=B4=20(#1053?=
 =?UTF-8?q?4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix emoji picker padding

emoji picker bottoms are hidden by iPhone Home Bar.
To fix this, add safe-area padding

* update CHANGELOG
---
 CHANGELOG.md                                       | 1 +
 packages/frontend/src/components/MkEmojiPicker.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index adc9891746..36eaa3e43b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@
 	  - 猫耳のアバター内部部分をぼかしでマスク表示してより猫耳っぽく見えるように
 	- 「UIのアニメーションを減らす」 (`reduceAnimation`) で猫耳を撫でられなくなります
 - Add Minimizing ("folding") of windows
+- PWA時の絵文字ピッカーの位置をホームバーに重ならないように調整
 
 ### Server
 - PostgreSQLのレプリケーション対応
diff --git a/packages/frontend/src/components/MkEmojiPicker.vue b/packages/frontend/src/components/MkEmojiPicker.vue
index a5a39108d6..0ae182ce32 100644
--- a/packages/frontend/src/components/MkEmojiPicker.vue
+++ b/packages/frontend/src/components/MkEmojiPicker.vue
@@ -439,6 +439,7 @@ defineExpose({
 
 	&.asDrawer {
 		width: 100% !important;
+		padding: 12px 0 max(env(safe-area-inset-bottom, 0px), 12px) 0;
 
 		> .emojis {
 			::v-deep(section) {

From 7a33c5d2ee2d967bc97838816d4409ca87b2a15a Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sat, 8 Apr 2023 16:44:49 +0000
Subject: [PATCH 38/55] update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 36eaa3e43b..60f6a1237a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,18 @@
 
 -->
 
+## 13.x.x (unreleased)
+
+### General
+-
+
+### Client
+- PWA時の絵文字ピッカーの位置をホームバーに重ならないように調整
+
+### Server
+-
+
+
 ## 13.11.0
 
 ### NOTE
@@ -34,7 +46,6 @@
 	  - 猫耳のアバター内部部分をぼかしでマスク表示してより猫耳っぽく見えるように
 	- 「UIのアニメーションを減らす」 (`reduceAnimation`) で猫耳を撫でられなくなります
 - Add Minimizing ("folding") of windows
-- PWA時の絵文字ピッカーの位置をホームバーに重ならないように調整
 
 ### Server
 - PostgreSQLのレプリケーション対応

From d76220cc800616373b0ae177f5a054802c2abd84 Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 9 Apr 2023 04:41:06 +0900
Subject: [PATCH 39/55] =?UTF-8?q?fix(server):=20IdService.parse=E3=82=92?=
 =?UTF-8?q?=E5=85=A8=E3=81=A6=E3=81=AEid=E3=82=BF=E3=82=A4=E3=83=97?=
 =?UTF-8?q?=E3=81=AB=E5=AF=BE=E5=BF=9C=E3=81=95=E3=81=9B=E3=82=8B=E3=82=88?=
 =?UTF-8?q?=E3=81=86=E3=81=AB=20(#10533)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* wip fix-id

* :v:

* fix import
---
 packages/backend/src/core/IdService.ts    | 14 ++++----
 packages/backend/src/misc/id/aid.ts       |  2 ++
 packages/backend/src/misc/id/meid.ts      |  9 +++++
 packages/backend/src/misc/id/meidg.ts     |  7 ++++
 packages/backend/src/misc/id/object-id.ts |  9 +++++
 packages/backend/src/misc/id/ulid.ts      | 14 ++++++++
 packages/backend/test/unit/misc/id.ts     | 44 +++++++++++++++++++++++
 7 files changed, 92 insertions(+), 7 deletions(-)
 create mode 100644 packages/backend/src/misc/id/ulid.ts
 create mode 100644 packages/backend/test/unit/misc/id.ts

diff --git a/packages/backend/src/core/IdService.ts b/packages/backend/src/core/IdService.ts
index 94084ad84f..8aa6ccfc4e 100644
--- a/packages/backend/src/core/IdService.ts
+++ b/packages/backend/src/core/IdService.ts
@@ -3,10 +3,11 @@ import { ulid } from 'ulid';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { genAid, parseAid } from '@/misc/id/aid.js';
-import { genMeid } from '@/misc/id/meid.js';
-import { genMeidg } from '@/misc/id/meidg.js';
+import { genMeid, parseMeid } from '@/misc/id/meid.js';
+import { genMeidg, parseMeidg } from '@/misc/id/meidg.js';
 import { genObjectId } from '@/misc/id/object-id.js';
 import { bindThis } from '@/decorators.js';
+import { parseUlid } from '@/misc/id/ulid.js';
 
 @Injectable()
 export class IdService {
@@ -37,11 +38,10 @@ export class IdService {
 	public parse(id: string): { date: Date; } {
 		switch (this.method) {
 			case 'aid': return parseAid(id);
-			// TODO
-			//case 'meid':
-			//case 'meidg':
-			//case 'ulid':
-			//case 'objectid':
+			case 'objectid':
+			case 'meid': return parseMeid(id);
+			case 'meidg': return parseMeidg(id);
+			case 'ulid': return parseUlid(id);
 			default: throw new Error('unrecognized id generation method');
 		}
 	}
diff --git a/packages/backend/src/misc/id/aid.ts b/packages/backend/src/misc/id/aid.ts
index 93a9929aa7..9e206ee98f 100644
--- a/packages/backend/src/misc/id/aid.ts
+++ b/packages/backend/src/misc/id/aid.ts
@@ -3,6 +3,8 @@
 
 import * as crypto from 'node:crypto';
 
+export const aidRegExp = /^[0-9a-z]{10}$/;
+
 const TIME2000 = 946684800000;
 let counter = crypto.randomBytes(2).readUInt16LE(0);
 
diff --git a/packages/backend/src/misc/id/meid.ts b/packages/backend/src/misc/id/meid.ts
index 30bbdf1698..337416b059 100644
--- a/packages/backend/src/misc/id/meid.ts
+++ b/packages/backend/src/misc/id/meid.ts
@@ -1,5 +1,8 @@
 const CHARS = '0123456789abcdef';
 
+// same as object-id
+export const meidRegExp = /^[0-9a-f]{24}$/;
+
 function getTime(time: number) {
 	if (time < 0) time = 0;
 	if (time === 0) {
@@ -24,3 +27,9 @@ function getRandom() {
 export function genMeid(date: Date): string {
 	return getTime(date.getTime()) + getRandom();
 }
+
+export function parseMeid(id: string): { date: Date; } {
+	return {
+		date: new Date(parseInt(id.slice(0, 12), 16) - 0x800000000000),
+	};
+}
diff --git a/packages/backend/src/misc/id/meidg.ts b/packages/backend/src/misc/id/meidg.ts
index d4aaaea1ba..19d0bc1fd2 100644
--- a/packages/backend/src/misc/id/meidg.ts
+++ b/packages/backend/src/misc/id/meidg.ts
@@ -3,6 +3,7 @@ const CHARS = '0123456789abcdef';
 //  4bit Fixed hex value 'g'
 // 44bit UNIX Time ms in Hex
 // 48bit Random value in Hex
+export const meidgRegExp = /^g[0-9a-f]{23}$/;
 
 function getTime(time: number) {
 	if (time < 0) time = 0;
@@ -26,3 +27,9 @@ function getRandom() {
 export function genMeidg(date: Date): string {
 	return 'g' + getTime(date.getTime()) + getRandom();
 }
+
+export function parseMeidg(id: string): { date: Date; } {
+	return {
+		date: new Date(parseInt(id.slice(1, 12), 16)),
+	};
+}
diff --git a/packages/backend/src/misc/id/object-id.ts b/packages/backend/src/misc/id/object-id.ts
index 392ea43301..aec3447bd7 100644
--- a/packages/backend/src/misc/id/object-id.ts
+++ b/packages/backend/src/misc/id/object-id.ts
@@ -1,5 +1,8 @@
 const CHARS = '0123456789abcdef';
 
+// same as meid
+export const objectIdRegExp = /^[0-9a-f]{24}$/;
+
 function getTime(time: number) {
 	if (time < 0) time = 0;
 	if (time === 0) {
@@ -24,3 +27,9 @@ function getRandom() {
 export function genObjectId(date: Date): string {
 	return getTime(date.getTime()) + getRandom();
 }
+
+export function parseObjectId(id: string): { date: Date; } {
+	return {
+		date: new Date(parseInt(id.slice(0, 8), 16) * 1000),
+	};
+}
diff --git a/packages/backend/src/misc/id/ulid.ts b/packages/backend/src/misc/id/ulid.ts
new file mode 100644
index 0000000000..e8aa752890
--- /dev/null
+++ b/packages/backend/src/misc/id/ulid.ts
@@ -0,0 +1,14 @@
+// Crockford's Base32
+// https://github.com/ulid/spec#encoding
+const CHARS = '0123456789ABCDEFGHJKMNPQRSTVWXYZ';
+
+export const ulidRegExp = /^[0123456789ABCDEFGHJKMNPQRSTVWXYZ]{26}$/;
+
+export function parseUlid(id: string): { date: Date; } {
+    const timestamp = id.slice(0, 10);
+    let time = 0;
+    for (let i = 0; i < 10; i++) {
+        time = time * 32 + CHARS.indexOf(timestamp[i]);
+    }
+    return { date: new Date(time) };
+}
diff --git a/packages/backend/test/unit/misc/id.ts b/packages/backend/test/unit/misc/id.ts
new file mode 100644
index 0000000000..ecd0e60a31
--- /dev/null
+++ b/packages/backend/test/unit/misc/id.ts
@@ -0,0 +1,44 @@
+import { aidRegExp, genAid, parseAid } from '@/misc/id/aid.js';
+import { genMeid, meidRegExp, parseMeid } from '@/misc/id/meid.js';
+import { genMeidg, meidgRegExp, parseMeidg } from '@/misc/id/meidg.js';
+import { genObjectId, objectIdRegExp, parseObjectId } from '@/misc/id/object-id.js';
+import { ulidRegExp, parseUlid } from '@/misc/id/ulid.js';
+import { ulid } from 'ulid';
+import { describe, test, expect } from '@jest/globals';
+
+describe('misc:id', () => {
+    test('aid', () => {
+        const date = new Date();
+        const gotAid = genAid(date);
+        expect(gotAid).toMatch(aidRegExp);
+        expect(parseAid(gotAid).date.getTime()).toBe(date.getTime());
+    });
+
+    test('meid', () => {
+        const date = new Date();
+        const gotMeid = genMeid(date);
+        expect(gotMeid).toMatch(meidRegExp);
+        expect(parseMeid(gotMeid).date.getTime()).toBe(date.getTime());
+    });
+
+    test('meidg', () => {
+        const date = new Date();
+        const gotMeidg = genMeidg(date);
+        expect(gotMeidg).toMatch(meidgRegExp);
+        expect(parseMeidg(gotMeidg).date.getTime()).toBe(date.getTime());
+    });
+
+    test('objectid', () => {
+        const date = new Date();
+        const gotObjectId = genObjectId(date);
+        expect(gotObjectId).toMatch(objectIdRegExp);
+        expect(Math.floor(parseObjectId(gotObjectId).date.getTime() / 1000)).toBe(Math.floor(date.getTime() / 1000));
+    });
+
+    test('ulid', () => {
+        const date = new Date();
+        const gotUlid = ulid(date.getTime());
+        expect(gotUlid).toMatch(ulidRegExp);
+        expect(parseUlid(gotUlid).date.getTime()).toBe(date.getTime());
+    });
+});

From 64597a2dabac0c65254e31f6eede787839824ddb Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 9 Apr 2023 04:56:36 +0900
Subject: [PATCH 40/55] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60f6a1237a..f6ea16a3ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -32,6 +32,7 @@
 
 ### General
 - チャンネルをお気に入りに登録できるように
+  - タイムラインのアンテナ選択などでは、フォローしているアンテナの代わりにお気に入りしたアンテナが表示されるようになっています。チャンネルをお気に入りに登録するには、当該チャンネルのページ→概要→⭐️のボタンを押します。
 - チャンネルにノートをピン留めできるように
 
 ### Client

From 038365bf2d1f497385eb84ab74dba42be9c425ae Mon Sep 17 00:00:00 2001
From: futchitwo <74236683+futchitwo@users.noreply.github.com>
Date: Sun, 9 Apr 2023 07:56:27 +0900
Subject: [PATCH 41/55] =?UTF-8?q?fix:=20redis=20=E3=81=8B=E3=82=89?=
 =?UTF-8?q?=E5=8F=96=E5=BE=97=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84=E3=83=81?=
 =?UTF-8?q?=E3=83=A3=E3=83=B3=E3=83=8D=E3=83=AB=E6=8A=95=E7=A8=BF=E3=81=AF?=
 =?UTF-8?q?DB=E3=81=8B=E3=82=89=E5=8F=96=E5=BE=97=20(#10539)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/api/endpoints/channels/timeline.ts  | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/server/api/endpoints/channels/timeline.ts b/packages/backend/src/server/api/endpoints/channels/timeline.ts
index 2556557b24..2491d14235 100644
--- a/packages/backend/src/server/api/endpoints/channels/timeline.ts
+++ b/packages/backend/src/server/api/endpoints/channels/timeline.ts
@@ -75,13 +75,19 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
 
 			let timeline: Note[] = [];
 
-			const noteIdsRes = await this.redisClient.xrevrange(
-				`channelTimeline:${channel.id}`,
-				ps.untilId ? this.idService.parse(ps.untilId).date.getTime() : '+',
-				'-',
-				'COUNT', ps.limit + 1); // untilIdに指定したものも含まれるため+1
+			const limit = ps.limit + (ps.untilId ? 1 : 0); // untilIdに指定したものも含まれるため+1
+			let noteIdsRes: [string, string[]][] = [];
+			
+			if (!ps.sinceId && !ps.sinceDate) {
+				noteIdsRes = await this.redisClient.xrevrange(
+					`channelTimeline:${channel.id}`,
+					ps.untilId ? this.idService.parse(ps.untilId).date.getTime() : ps.untilDate ?? '+',
+					'-',
+					'COUNT', limit);
+			}
 
-			if (noteIdsRes.length === 0) {
+			// redis から取得していないとき・取得数が足りないとき
+			if (noteIdsRes.length < limit) {
 				//#region Construct query
 				const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
 					.andWhere('note.channelId = :channelId', { channelId: channel.id })

From b7ed3ddfddb5de60a29707f15fbeb115c262d07b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 9 Apr 2023 08:02:52 +0900
Subject: [PATCH 42/55] =?UTF-8?q?fix(backend):=20=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=81=BF=E3=81=A7=E3=82=A8=E3=83=A9?=
 =?UTF-8?q?=E3=83=BC=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=99=E3=82=8B=E5=A0=B4?=
 =?UTF-8?q?=E5=90=88=E3=81=8C=E3=81=82=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                          | 2 +-
 packages/backend/src/core/FederatedInstanceService.ts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6ea16a3ba..b2e90d9403 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@
 - PWA時の絵文字ピッカーの位置をホームバーに重ならないように調整
 
 ### Server
--
+- 通知読み込みでエラーが発生する場合がある問題を修正
 
 
 ## 13.11.0
diff --git a/packages/backend/src/core/FederatedInstanceService.ts b/packages/backend/src/core/FederatedInstanceService.ts
index 1d0c87280f..56660ae0d0 100644
--- a/packages/backend/src/core/FederatedInstanceService.ts
+++ b/packages/backend/src/core/FederatedInstanceService.ts
@@ -29,6 +29,7 @@ export class FederatedInstanceService {
 			toRedisConverter: (value) => JSON.stringify(value),
 			fromRedisConverter: (value) => {
 				const parsed = JSON.parse(value);
+				if (parsed == null) return null;
 				return {
 					...parsed,
 					firstRetrievedAt: new Date(parsed.firstRetrievedAt),

From f794f3ad0a3128e8103832c8c1e06de9cbc51544 Mon Sep 17 00:00:00 2001
From: taichan <40626578+taichanNE30@users.noreply.github.com>
Date: Sun, 9 Apr 2023 08:03:29 +0900
Subject: [PATCH 43/55] =?UTF-8?q?fix(client):=20=E3=83=AA=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E3=80=81=E3=82=AF=E3=83=AA=E3=83=83=E3=83=97=E3=81=8C?=
 =?UTF-8?q?=E7=84=A1=E9=99=90=E3=83=AD=E3=83=BC=E3=83=89=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=82=8B=E7=8F=BE=E8=B1=A1=E3=81=AE=E8=A7=A3=E6=B1=BA=20(#1053?=
 =?UTF-8?q?8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix my-list infinite items loading

* update CHANGELOG.md

* fix my-clip infinite items loading
---
 CHANGELOG.md                                   | 2 ++
 packages/frontend/src/pages/my-clips/index.vue | 1 +
 packages/frontend/src/pages/my-lists/index.vue | 1 +
 3 files changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2e90d9403..53e9b17195 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,8 @@
 
 ### Client
 - PWA時の絵文字ピッカーの位置をホームバーに重ならないように調整
+- リスト管理の画面でリストが無限に読み込まれる問題を修正
+- 自分のクリップが無限に読み込まれる問題を修正
 
 ### Server
 - 通知読み込みでエラーが発生する場合がある問題を修正
diff --git a/packages/frontend/src/pages/my-clips/index.vue b/packages/frontend/src/pages/my-clips/index.vue
index aad914d6bb..ccffa7b563 100644
--- a/packages/frontend/src/pages/my-clips/index.vue
+++ b/packages/frontend/src/pages/my-clips/index.vue
@@ -32,6 +32,7 @@ import { clipsCache } from '@/cache';
 
 const pagination = {
 	endpoint: 'clips/list' as const,
+	noPaging: true,
 	limit: 10,
 };
 
diff --git a/packages/frontend/src/pages/my-lists/index.vue b/packages/frontend/src/pages/my-lists/index.vue
index 11a2aca8c5..47437f3e57 100644
--- a/packages/frontend/src/pages/my-lists/index.vue
+++ b/packages/frontend/src/pages/my-lists/index.vue
@@ -30,6 +30,7 @@ const pagingComponent = $shallowRef<InstanceType<typeof MkPagination>>();
 
 const pagination = {
 	endpoint: 'users/lists/list' as const,
+	noPaging: true,
 	limit: 10,
 };
 

From ad4006738b52eb1c6ceaaa6c3ed8434275ce30b7 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 9 Apr 2023 08:09:25 +0900
Subject: [PATCH 44/55] =?UTF-8?q?=E3=83=81=E3=83=A3=E3=83=B3=E3=83=8D?=
 =?UTF-8?q?=E3=83=AB=E3=81=AE=E3=81=8A=E6=B0=97=E3=81=AB=E5=85=A5=E3=82=8A?=
 =?UTF-8?q?=E3=81=8C=E7=84=A1=E9=99=90=E3=81=AB=E8=AA=AD=E3=81=BF=E8=BE=BC?=
 =?UTF-8?q?=E3=81=BE=E3=82=8C=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                             | 1 +
 packages/frontend/src/pages/channels.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53e9b17195..09ff5125c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@
 - PWA時の絵文字ピッカーの位置をホームバーに重ならないように調整
 - リスト管理の画面でリストが無限に読み込まれる問題を修正
 - 自分のクリップが無限に読み込まれる問題を修正
+- チャンネルのお気に入りが無限に読み込まれる問題を修正
 
 ### Server
 - 通知読み込みでエラーが発生する場合がある問題を修正
diff --git a/packages/frontend/src/pages/channels.vue b/packages/frontend/src/pages/channels.vue
index fd1d2d03cf..3a5aa00c5b 100644
--- a/packages/frontend/src/pages/channels.vue
+++ b/packages/frontend/src/pages/channels.vue
@@ -47,6 +47,7 @@ const featuredPagination = {
 const favoritesPagination = {
 	endpoint: 'channels/my-favorites' as const,
 	limit: 100,
+	noPaging: true,
 };
 const followingPagination = {
 	endpoint: 'channels/followed' as const,

From 9ae2e87a46719380579c47aac1e6d194530babbc Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 9 Apr 2023 08:10:12 +0900
Subject: [PATCH 45/55] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09ff5125c2..7c3f8ee8f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,7 +15,7 @@
 ## 13.x.x (unreleased)
 
 ### General
--
+- チャンネルの投稿を過去までさかのぼれるように
 
 ### Client
 - PWA時の絵文字ピッカーの位置をホームバーに重ならないように調整

From 004ace396dcda9d020f9be32c4aa458f46efdb91 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 9 Apr 2023 08:12:50 +0900
Subject: [PATCH 46/55] =?UTF-8?q?=E3=81=95=E3=81=8C=E3=81=99=E3=81=AE?=
 =?UTF-8?q?=E3=83=AD=E3=83=BC=E3=82=AB=E3=83=AB=E3=83=A6=E3=83=BC=E3=82=B6?=
 =?UTF-8?q?=E3=83=BC=EF=BC=88=E3=83=94=E3=83=B3=E3=81=A9=E3=82=81=EF=BC=89?=
 =?UTF-8?q?=E3=81=8C=E7=84=A1=E9=99=90=E3=81=AB=E7=94=9F=E6=88=90=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  | 1 +
 packages/frontend/src/pages/explore.users.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7c3f8ee8f9..bc8849d9ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 - リスト管理の画面でリストが無限に読み込まれる問題を修正
 - 自分のクリップが無限に読み込まれる問題を修正
 - チャンネルのお気に入りが無限に読み込まれる問題を修正
+- さがすのローカルユーザー（ピンどめ）が無限に生成される問題を修正
 
 ### Server
 - 通知読み込みでエラーが発生する場合がある問題を修正
diff --git a/packages/frontend/src/pages/explore.users.vue b/packages/frontend/src/pages/explore.users.vue
index c441407d97..3f4ff5182b 100644
--- a/packages/frontend/src/pages/explore.users.vue
+++ b/packages/frontend/src/pages/explore.users.vue
@@ -88,7 +88,7 @@ const tagUsers = $computed(() => ({
 	},
 }));
 
-const pinnedUsers = { endpoint: 'pinned-users' };
+const pinnedUsers = { endpoint: 'pinned-users', noPaging: true };
 const popularUsers = { endpoint: 'users', limit: 10, noPaging: true, params: {
 	state: 'alive',
 	origin: 'local',

From cb3a84adb472688a17071cdca70c20722c74c296 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 9 Apr 2023 08:22:49 +0900
Subject: [PATCH 47/55] =?UTF-8?q?=E3=83=81=E3=83=A3=E3=83=B3=E3=83=8D?=
 =?UTF-8?q?=E3=83=AB=E3=82=92=E6=96=B0=E8=A6=8F=E4=BD=9C=E6=88=90=E3=81=A7?=
 =?UTF-8?q?=E3=81=8D=E3=81=AA=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                   | 1 +
 packages/frontend/src/pages/channel-editor.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc8849d9ed..802449ce02 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@
 - 自分のクリップが無限に読み込まれる問題を修正
 - チャンネルのお気に入りが無限に読み込まれる問題を修正
 - さがすのローカルユーザー（ピンどめ）が無限に生成される問題を修正
+- チャンネルを新規作成できない問題を修正
 
 ### Server
 - 通知読み込みでエラーが発生する場合がある問題を修正
diff --git a/packages/frontend/src/pages/channel-editor.vue b/packages/frontend/src/pages/channel-editor.vue
index 667caab966..9cb440d2bb 100644
--- a/packages/frontend/src/pages/channel-editor.vue
+++ b/packages/frontend/src/pages/channel-editor.vue
@@ -2,7 +2,7 @@
 <MkStickyContainer>
 	<template #header><MkPageHeader :actions="headerActions" :tabs="headerTabs"/></template>
 	<MkSpacer :content-max="700">
-		<div v-if="channel" class="_gaps_m">
+		<div v-if="channelId == null || channel != null" class="_gaps_m">
 			<MkInput v-model="name">
 				<template #label>{{ i18n.ts.name }}</template>
 			</MkInput>

From 087da7643eaf1a5a043f5cf8dcab908acf7c8ec9 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 9 Apr 2023 08:37:55 +0900
Subject: [PATCH 48/55] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 802449ce02..076d1d6139 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,7 +27,7 @@
 
 ### Server
 - 通知読み込みでエラーが発生する場合がある問題を修正
-
+- IDをaid以外に設定している場合の問題を修正
 
 ## 13.11.0
 

From b9d022f1649a0fd350303c08217b06c11479dcee Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 9 Apr 2023 09:18:18 +0900
Subject: [PATCH 49/55] New Crowdin updates (#10522)

* New translations ja-JP.yml (Swedish)

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

* New translations ja-JP.yml (Italian)

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

* New translations ja-JP.yml (Italian)

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

* New translations ja-JP.yml (Italian)

* New translations ja-JP.yml (English)

* New translations ja-JP.yml (German)
---
 locales/de-DE.yml |  4 ++--
 locales/en-US.yml |  3 +--
 locales/it-IT.yml | 29 ++++++++++++++++++++++-------
 locales/ja-KS.yml |  9 +++++++++
 locales/sv-SE.yml |  2 ++
 locales/zh-CN.yml | 12 +++++++++++-
 locales/zh-TW.yml |  4 ++++
 7 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/locales/de-DE.yml b/locales/de-DE.yml
index aa56493930..ef1cea6e72 100644
--- a/locales/de-DE.yml
+++ b/locales/de-DE.yml
@@ -196,7 +196,7 @@ instanceInfo: "Instanzinformationen"
 statistics: "Statistiken"
 clearQueue: "Warteschlange leeren"
 clearQueueConfirmTitle: "Möchtest du die Warteschlange wirklich leeren?"
-clearQueueConfirmText: "Hierdurch werden jegliche noch nicht gesendete Notizen nicht förderiert. Normalerweise wird dies nicht benötigt."
+clearQueueConfirmText: "Hierdurch werden jegliche noch nicht gesendete Notizen nicht föderiert. Normalerweise wird dies nicht benötigt."
 clearCachedFiles: "Cache leeren"
 clearCachedFilesConfirm: "Sollen alle im Cache gespeicherten Dateien von anderen Instanzen wirklich gelöscht werden?"
 blockedInstances: "Blockierte Instanzen"
@@ -1696,7 +1696,7 @@ _visibility:
   followersDescription: "Nur für Follower sichtbar"
   specified: "Direkt"
   specifiedDescription: "Nur für bestimmte Benutzer sichtbar"
-  disableFederation: "Deförderiert"
+  disableFederation: "Deföderieren"
   disableFederationDescription: "Nicht an andere Instanzen übertragen"
 _postForm:
   replyPlaceholder: "Dieser Notiz antworten …"
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 4b8ec86224..1137199739 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -999,7 +999,6 @@ _accountMigration:
   moveFromLabel: "Account to move from:"
   moveFromDescription: "Create an alias for the account to move from on this account if you wish to transfer its followers. This has to be done before the transfer! Then, enter the account to move to in the following format: @person@instance.com"
   migrationConfirm: "Really migrate this account to {account}? Once started, this process cannot be stopped or taken back, and you will not be able to use this account in its original state anymore.\n\nAlso, confirm you've created an alias at the account to migrate to."
-
 _achievements:
   earnedAt: "Unlocked at"
   _types:
@@ -1697,7 +1696,7 @@ _visibility:
   followersDescription: "Make visible to your followers only"
   specified: "Direct"
   specifiedDescription: "Make visible for specified users only"
-  disableFederation: "Unfederated"
+  disableFederation: "Defederate"
   disableFederationDescription: "Don't transmit to other instances"
 _postForm:
   replyPlaceholder: "Reply to this note..."
diff --git a/locales/it-IT.yml b/locales/it-IT.yml
index 01209b6fd4..f9b65488bb 100644
--- a/locales/it-IT.yml
+++ b/locales/it-IT.yml
@@ -170,7 +170,7 @@ proxyAccountDescription: "Un profilo proxy funziona come follower per i profili
 host: "Server remoto"
 selectUser: "Seleziona profilo"
 recipient: "Destinatario"
-annotation: "Annotazione"
+annotation: "Annotazione preventiva"
 federation: "Federazione"
 instances: "Istanza"
 registeredAt: "Registrato presso"
@@ -506,6 +506,7 @@ objectStorageUseSSLDesc: "Disabilita quest'opzione se non utilizzi HTTPS per le
 objectStorageUseProxy: "Usa proxy"
 objectStorageUseProxyDesc: "Disabilita quest'opzione se non usi proxy per la connessione API."
 objectStorageSetPublicRead: "Imposta \"visibilità pubblica\" al momento di caricare"
+s3ForcePathStyleDesc: "L'attivazione di s3ForcePathStyle impone di specificare il nome del bucket come parte del percorso nell'URL anziché del nome host. Potrebbe tornare utile quando si utilizzano applicazioni come Minio."
 serverLogs: "Log del server"
 deleteAll: "Cancella cronologia"
 showFixedPostForm: "Visualizzare la finestra di pubblicazione in cima alla timeline"
@@ -564,7 +565,7 @@ invisibleNote: "Nota invisibile"
 enableInfiniteScroll: "Abilita scorrimento infinito"
 visibility: "Visibilità"
 poll: "Sondaggio"
-useCw: "Nascondere media"
+useCw: "Content Warning"
 enablePlayer: "Visualizza"
 disablePlayer: "Chiudi"
 expandTweet: "Espandi tweet"
@@ -579,7 +580,7 @@ plugins: "Estensioni"
 preferencesBackups: "Backup delle impostazioni"
 deck: "Deck"
 undeck: "Esci dal deck"
-useBlurEffectForModal: "Utilizza effetto sfocatura per i modali"
+useBlurEffectForModal: "Utilizza effetto sfocatura per le finestre modali"
 useFullReactionPicker: "Usa la totalità del pannello di reazioni"
 width: "Larghezza"
 height: "Altezza"
@@ -814,7 +815,7 @@ translatedFrom: "Tradotto da {x}"
 accountDeletionInProgress: "È in corso l'eliminazione del profilo"
 usernameInfo: "Un nome per identificare univocamente il tuo profilo sull'istanza. Puoi utilizzare caratteri alfanumerici maiuscoli, minuscoli e il trattino basso (_). Non potrai cambiare nome utente in seguito."
 aiChanMode: "Modalità Ai"
-keepCw: "Mantieni il CW"
+keepCw: "Mantieni il Content Warning"
 pubSub: "Publish/Subscribe del profilo"
 lastCommunication: "La comunicazione più recente"
 resolved: "Risolto"
@@ -919,6 +920,7 @@ pushNotificationNotSupported: "Il client o il server non supporta le notifiche p
 sendPushNotificationReadMessage: "Elimina le notifiche push dopo la relativa lettura"
 sendPushNotificationReadMessageCaption: "Se possibile, verrà mostrata brevemente una notifica con il testo \"{emptyPushNotificationMessage}\". Potrebbe influire negativamente sulla durata della batteria."
 windowMaximize: "Ingrandisci"
+windowMinimize: "Contrai finestra"
 windowRestore: "Ripristina"
 caption: "Didascalia"
 loggedInAsBot: "Connessione come Bot"
@@ -960,6 +962,9 @@ copyErrorInfo: "Copia le informazioni sull'errore"
 joinThisServer: "Registrati su questa istanza"
 exploreOtherServers: "Trova altre istanze"
 letsLookAtTimeline: "Sbircia la timeline"
+disableFederationConfirm: "Vuoi davvero disattivare la federazione?"
+disableFederationConfirmWarn: "Anche se defederate, le Note continueranno ad essere pubbliche, se non diversamente specificato. Di solito, non è necessario far questo."
+disableFederationOk: "Disabilita federazione"
 invitationRequiredToRegister: "L'accesso a questa istanza è solo ad invito. Può registrarsi solo chi ha un codice fornito dall'amministrazione."
 emailNotSupported: "L'istanza non supporta l'invio di email"
 postToTheChannel: "Pubblica nel canale"
@@ -984,6 +989,16 @@ enableChartsForFederatedInstances: "Abilita i grafici per le istanze federate"
 showClipButtonInNoteFooter: "Aggiungi il bottone Clip tra le azioni delle Note"
 largeNoteReactions: "Ingrandisci le reazioni"
 noteIdOrUrl: "ID della Nota o URL"
+accountMigration: "Migrazione del profilo"
+accountMoved: "Questo profilo ha migrato altrove:"
+_accountMigration:
+  moveTo: "Migrare questo profilo verso un un altro"
+  moveToLabel: "Profilo verso cui migrare"
+  moveAccountDescription: "Questa attività è irreversibile! Innanzitutto, assicurati di aver creato, nella istanza di destinazione, un alias con l'indirizzo di questo profilo. Successivamente, indica qui il profilo di destinazione in questo modo: @persona@istanza.it"
+  moveFrom: "Migra un altro profilo dentro a questo"
+  moveFromLabel: "Profilo da cui migrare:"
+  moveFromDescription: "Se desideri spostare i profili follower da un altro profilo a questo, devi prima creare un alias qui. Assicurati averlo creato PRIMA di eseguire l'attività! Inserisci l'indirizzo del profilo mittente in questo modo: @persona@istanza.it"
+  migrationConfirm: "Vuoi davvero migrare questo profilo su {account}? L'azione è irreversibile e non potrai più utilizzare questo profilo nel suo stato originale.\nInoltre, assicurati di aver già creato un alias sull'account a cui ti stai trasferendo."
 _achievements:
   earnedAt: "Data di conseguimento"
   _types:
@@ -1676,12 +1691,12 @@ _visibility:
   public: "Pubblica"
   publicDescription: "Visibile per tutti sul Fediverso"
   home: "Home"
-  homeDescription: "Visibile solo sulla timeline \"Home\""
+  homeDescription: "Visibile solo sulla timeline locale"
   followers: "Follower"
-  followersDescription: "Visibile solo per i tuoi follower"
+  followersDescription: "Visibile solo ai tuoi follower"
   specified: "Nota diretta"
   specifiedDescription: "Visibile solo ai profili menzionati"
-  disableFederation: "Interrompi la federazione"
+  disableFederation: "Federazione disabilitata"
   disableFederationDescription: "Non spedire attività alle altre istanze remote"
 _postForm:
   replyPlaceholder: "Rispondi a questa nota..."
diff --git a/locales/ja-KS.yml b/locales/ja-KS.yml
index 398dbcd5c0..81f99aace2 100644
--- a/locales/ja-KS.yml
+++ b/locales/ja-KS.yml
@@ -989,7 +989,16 @@ enableChartsForFederatedInstances: "リモートサーバーのチャートを
 showClipButtonInNoteFooter: "ノートのアクションにクリップを追加"
 largeNoteReactions: "ノートのリアクションを大きする"
 noteIdOrUrl: "ノートIDかURL"
+accountMigration: "アカウントのお引っ越し"
 accountMoved: "このユーザーはさらのアカウントに引っ越したで："
+_accountMigration:
+  moveTo: "このアカウントをさらのアカウントに引っ越すで"
+  moveToLabel: "引っ越し先のアカウント："
+  moveAccountDescription: "この操作は戻されへんで。まず引っ越し先のアカウントでこのアカウントへのエイリアスが作れたか確認してきなはれや。エイリアスができてたら、引っ越し先のアカウントをこんな風に入力してくれへんか？：@person@instance.com"
+  moveFrom: "別のアカウントからこのアカウントに引っ越す"
+  moveFromLabel: "引っ越し元のアカウント："
+  moveFromDescription: "別のアカウントからこのアカウントにフォロワーを引き継いで引っ越したかったら、ここでエイリアスを作っとく必要があるで。必ずお引っ越しを実行する前に作っとかなあかんで！引っ越し元のアカウントをこんな風に入力してくれへんか？：@person@instance.com"
+  migrationConfirm: "ほんまにこのアカウントを {account} に引っ越すんか？一回引っ越してもうたら取り消されへんし、二度とこのアカウントを元に戻されへんくなるで。\nそれと、引っ越し先のアカウントでエイリアスが作れたかちゃ～んと確認しーや？"
 _achievements:
   earnedAt: "貰った日ぃ"
   _types:
diff --git a/locales/sv-SE.yml b/locales/sv-SE.yml
index c5653d32ec..6369adb454 100644
--- a/locales/sv-SE.yml
+++ b/locales/sv-SE.yml
@@ -345,6 +345,7 @@ aboutMisskey: "Om Misskey"
 administrator: "Administratör"
 passwordLessLogin: "Lösenordsfri inloggning"
 passwordLessLoginDescription: "Tillåter lösenordsfri inloggning med endast en säkerhetsnyckel eller en passkey."
+resetPassword: "Återställ Lösenord"
 newPasswordIs: "Det nya lösenordet är \"{password}\""
 share: "Dela"
 enable: "Aktivera"
@@ -362,6 +363,7 @@ smtpUser: "Användarnamn"
 smtpPass: "Lösenord"
 emptyToDisableSmtpAuth: "Lämna användarnamn och lösenord tomt för att avaktivera SMTP verifiering"
 clearCache: "Rensa cache"
+onlineUsersCount: "{n} användare är online"
 enabled: "Aktiverad"
 user: "Användare"
 global: "Global"
diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
index 563609d500..d9df760186 100644
--- a/locales/zh-CN.yml
+++ b/locales/zh-CN.yml
@@ -148,7 +148,7 @@ settingGuide: "推荐配置"
 cacheRemoteFiles: "缓存远程文件"
 cacheRemoteFilesDescription: "当禁用此设定时远程文件将直接从远程服务器载入。禁用后会减小储存空间需求，但是会增加流量，因为缩略图不会被生成。"
 flagAsBot: "这是一个机器人账号"
-flagAsBotDescription: "如果此帐户由程序控制，请启用此项。启用后，此标志可以帮助其他开发人员防止机器人之间产生无限互动的行为，并让Misskey的内部系统将此帐户识别为机器人。"
+flagAsBotDescription: "如果此账户由程序控制，请启用此项。启用后，此标志可以帮助其他开发人员防止机器人之间产生无限互动的行为，并让Misskey的内部系统将此账户识别为机器人。"
 flagAsCat: "将这个账户设定为一只猫"
 flagAsCatDescription: "如果您想表明此帐户是一只猫，请打开此标志。\n开启后，会在您的头像上出现猫耳朵，并将你的帖子中的「na」替换为「nya」，日文同理。"
 flagShowTimelineReplies: "在时间线上显示帖子的回复"
@@ -989,6 +989,16 @@ enableChartsForFederatedInstances: "生成远程服务器的图表"
 showClipButtonInNoteFooter: "在贴文下方显示便签按钮"
 largeNoteReactions: "使用大图标来显示回应"
 noteIdOrUrl: "帖子ID或URL"
+accountMigration: "账户迁移"
+accountMoved: "此用户已迁移账户"
+_accountMigration:
+  moveTo: "把这个账户迁移到新的账户"
+  moveToLabel: "迁移后的账户"
+  moveAccountDescription: "此操作无法取消。请先确认您已在迁移后的账户上，为此账户创造了别名。创造别名后，请如以下输入您的迁移后的账户：@person@instance.com"
+  moveFrom: "从别的账号迁移到此账户"
+  moveFromLabel: "迁移前的账户"
+  moveFromDescription: "如果迁移时需要继承其他账户的关注者，请在此创造别名。此操作需要在实行迁移之前完成！请如已下输入需要迁移的账户：@person@instance.com"
+  migrationConfirm: "确定要把此账户迁移到{account}吗？一旦确定后，此操作无法取消，此账户也无法以原来的状态使用。\n同时，请确认迁移后的账户，已创造别名。"
 _achievements:
   earnedAt: "达成时间"
   _types:
diff --git a/locales/zh-TW.yml b/locales/zh-TW.yml
index 69f3d2f52c..48934463d0 100644
--- a/locales/zh-TW.yml
+++ b/locales/zh-TW.yml
@@ -984,6 +984,10 @@ enableChartsForFederatedInstances: "生成遠端伺服器的圖表"
 showClipButtonInNoteFooter: "將摘錄添加至貼文"
 largeNoteReactions: "將貼文的反應放大顯示"
 noteIdOrUrl: "貼文ID或URL"
+accountMigration: "遷移帳戶"
+_accountMigration:
+  moveTo: "將這個帳戶遷移至新的帳戶"
+  moveToLabel: "要遷移的帳戶："
 _achievements:
   earnedAt: "獲得日期"
   _types:

From 31ff3a22b7ec054b5af97c0a1034bf5a485116ab Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 9 Apr 2023 09:40:00 +0900
Subject: [PATCH 50/55] 13.11.1

---
 CHANGELOG.md | 2 +-
 package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 076d1d6139..3112fb44e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,7 +12,7 @@
 
 -->
 
-## 13.x.x (unreleased)
+## 13.11.1
 
 ### General
 - チャンネルの投稿を過去までさかのぼれるように
diff --git a/package.json b/package.json
index c590388f3d..89733ea179 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "13.11.0",
+	"version": "13.11.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

From 269d1e72cb159449b862fd6577b1ffdc21d3087b Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 9 Apr 2023 09:44:00 +0900
Subject: [PATCH 51/55] =?UTF-8?q?fix(frontend):=20=E3=83=A6=E3=83=BC?=
 =?UTF-8?q?=E3=82=B6=E3=83=BC=E3=83=97=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E3=81=8C=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84?=
 =?UTF-8?q?=E5=95=8F=E9=A1=8C=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #10540
---
 CHANGELOG.md                                     | 1 +
 packages/frontend/src/directives/user-preview.ts | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3112fb44e8..99c017a33e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,6 +24,7 @@
 - チャンネルのお気に入りが無限に読み込まれる問題を修正
 - さがすのローカルユーザー（ピンどめ）が無限に生成される問題を修正
 - チャンネルを新規作成できない問題を修正
+- ユーザープレビューが表示されない問題を修正
 
 ### Server
 - 通知読み込みでエラーが発生する場合がある問題を修正
diff --git a/packages/frontend/src/directives/user-preview.ts b/packages/frontend/src/directives/user-preview.ts
index ae12f2670a..397f449bd1 100644
--- a/packages/frontend/src/directives/user-preview.ts
+++ b/packages/frontend/src/directives/user-preview.ts
@@ -13,8 +13,6 @@ export class UserPreview {
 		this.el = el;
 		this.user = user;
 
-		this.attach();
-
 		this.show = this.show.bind(this);
 		this.close = this.close.bind(this);
 		this.onMouseover = this.onMouseover.bind(this);
@@ -22,6 +20,8 @@ export class UserPreview {
 		this.onClick = this.onClick.bind(this);
 		this.attach = this.attach.bind(this);
 		this.detach = this.detach.bind(this);
+
+		this.attach();
 	}
 
 	private show() {

From 9feb6b0f5b07151bcd129445f01941140c0cc29d Mon Sep 17 00:00:00 2001
From: tamaina <tamaina@hotmail.co.jp>
Date: Sun, 9 Apr 2023 09:52:19 +0900
Subject: [PATCH 52/55] =?UTF-8?q?fix(server):=20=E3=83=AA=E3=82=A2?=
 =?UTF-8?q?=E3=82=AF=E3=82=B7=E3=83=A7=E3=83=B3=E3=81=A7=E3=81=8D=E3=81=AA?=
 =?UTF-8?q?=E3=81=84=E5=95=8F=E9=A1=8C=E3=82=92=E3=81=A8=E3=82=8A=E3=81=82?=
 =?UTF-8?q?=E3=81=88=E3=81=9A=E4=BF=AE=E6=AD=A3=20(#10529)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix(server): リアクションできない問題をとりあえず修正
Fix #10502

* Update packages/backend/src/core/CustomEmojiService.ts

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
---
 packages/backend/src/core/CustomEmojiService.ts | 5 ++++-
 packages/backend/src/misc/cache.ts              | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
index 604a94707f..0a7ee4b9c9 100644
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -44,7 +44,10 @@ export class CustomEmojiService {
 			memoryCacheLifetime: 1000 * 60 * 3, // 3m
 			fetcher: () => this.emojisRepository.find({ where: { host: IsNull() } }).then(emojis => new Map(emojis.map(emoji => [emoji.name, emoji]))),
 			toRedisConverter: (value) => JSON.stringify(value.values()),
-			fromRedisConverter: (value) => new Map(JSON.parse(value).map((x: Emoji) => [x.name, x])), // TODO: Date型の変換
+			fromRedisConverter: (value) => {
+				if (!Array.isArray(JSON.parse(value))) return undefined;
+				return new Map(JSON.parse(value).map((x: Emoji) => [x.name, x]));
+			}, // TODO: Date型の変換
 		});
 	}
 
diff --git a/packages/backend/src/misc/cache.ts b/packages/backend/src/misc/cache.ts
index d35414acf7..a4abd4f878 100644
--- a/packages/backend/src/misc/cache.ts
+++ b/packages/backend/src/misc/cache.ts
@@ -8,7 +8,7 @@ export class RedisKVCache<T> {
 	private memoryCache: MemoryKVCache<T>;
 	private fetcher: (key: string) => Promise<T>;
 	private toRedisConverter: (value: T) => string;
-	private fromRedisConverter: (value: string) => T;
+	private fromRedisConverter: (value: string) => T | undefined; // undefined means no cache
 
 	constructor(redisClient: RedisKVCache<T>['redisClient'], name: RedisKVCache<T>['name'], opts: {
 		lifetime: RedisKVCache<T>['lifetime'];
@@ -92,7 +92,7 @@ export class RedisSingleCache<T> {
 	private memoryCache: MemorySingleCache<T>;
 	private fetcher: () => Promise<T>;
 	private toRedisConverter: (value: T) => string;
-	private fromRedisConverter: (value: string) => T;
+	private fromRedisConverter: (value: string) => T | undefined; // undefined means no cache
 
 	constructor(redisClient: RedisSingleCache<T>['redisClient'], name: RedisSingleCache<T>['name'], opts: {
 		lifetime: RedisSingleCache<T>['lifetime'];

From 1057da1556afe033b3d33b741104b276fb108c0c Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 9 Apr 2023 09:53:02 +0900
Subject: [PATCH 53/55] add note

---
 packages/backend/src/core/CustomEmojiService.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts
index 0a7ee4b9c9..dc365986fe 100644
--- a/packages/backend/src/core/CustomEmojiService.ts
+++ b/packages/backend/src/core/CustomEmojiService.ts
@@ -45,6 +45,7 @@ export class CustomEmojiService {
 			fetcher: () => this.emojisRepository.find({ where: { host: IsNull() } }).then(emojis => new Map(emojis.map(emoji => [emoji.name, emoji]))),
 			toRedisConverter: (value) => JSON.stringify(value.values()),
 			fromRedisConverter: (value) => {
+				// 原因不明だが配列以外が入ってくることがあるため
 				if (!Array.isArray(JSON.parse(value))) return undefined;
 				return new Map(JSON.parse(value).map((x: Emoji) => [x.name, x]));
 			}, // TODO: Date型の変換

From 86de46debf541de6e63742c4de515c4ec818f3fd Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 9 Apr 2023 09:53:29 +0900
Subject: [PATCH 54/55] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 99c017a33e..8ec1b2277f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@
 
 ### Server
 - 通知読み込みでエラーが発生する場合がある問題を修正
+- リアクションできないことがある問題を修正
 - IDをaid以外に設定している場合の問題を修正
 
 ## 13.11.0

From 59d0d507d5cc9b87a517b9fbec3aa288dc0859f2 Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Sun, 9 Apr 2023 10:19:57 +0900
Subject: [PATCH 55/55] =?UTF-8?q?fix(backend):=20=E9=80=A3=E5=90=88?=
 =?UTF-8?q?=E3=81=97=E3=81=A6=E3=81=84=E3=82=8B=E3=82=A4=E3=83=B3=E3=82=B9?=
 =?UTF-8?q?=E3=82=BF=E3=83=B3=E3=82=B9=E3=81=AB=E3=81=A4=E3=81=84=E3=81=A6?=
 =?UTF-8?q?=E4=BA=88=E6=9C=9F=E3=81=9B=E3=81=9A=E9=85=8D=E9=80=81=E3=81=8C?=
 =?UTF-8?q?=E5=85=A8=E3=81=A6=E5=81=9C=E6=AD=A2=E3=81=95=E3=82=8C=E3=82=8B?=
 =?UTF-8?q?=E3=81=93=E3=81=A8=E3=81=8C=E3=81=82=E3=82=8B=E5=95=8F=E9=A1=8C?=
 =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #10499
---
 CHANGELOG.md                                                    | 1 +
 .../backend/src/core/activitypub/ApDeliverManagerService.ts     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ec1b2277f..5e6fa2cf4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 - 通知読み込みでエラーが発生する場合がある問題を修正
 - リアクションできないことがある問題を修正
 - IDをaid以外に設定している場合の問題を修正
+- 連合しているインスタンスについて予期せず配送が全て停止されることがある問題を修正
 
 ## 13.11.0
 
diff --git a/packages/backend/src/core/activitypub/ApDeliverManagerService.ts b/packages/backend/src/core/activitypub/ApDeliverManagerService.ts
index 70a6d32fe2..62a2a33a19 100644
--- a/packages/backend/src/core/activitypub/ApDeliverManagerService.ts
+++ b/packages/backend/src/core/activitypub/ApDeliverManagerService.ts
@@ -186,7 +186,7 @@ class DeliverManager {
 
 			for (const following of followers) {
 				const inbox = following.followerSharedInbox ?? following.followerInbox;
-				inboxes.set(inbox, following.followerSharedInbox === null);
+				inboxes.set(inbox, following.followerSharedInbox != null);
 			}
 		}