+
+ ID
+
URL
From ff85d650bf6491f517766a2228bce722b80b6539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=BE=E3=81=A3=E3=81=A1=E3=82=83=E3=81=A6=E3=81=83?=
=?UTF-8?q?=E3=83=BC=E3=80=82?=
<56515516+mattyatea@users.noreply.github.com>
Date: Sat, 1 Feb 2025 22:57:18 +0900
Subject: [PATCH 10/23] =?UTF-8?q?feat(account-migration):=20=E3=82=A2?=
=?UTF-8?q?=E3=82=AB=E3=82=A6=E3=83=B3=E3=83=88=E7=A7=BB=E8=A1=8C=E3=83=AD?=
=?UTF-8?q?=E3=82=B0=E3=81=AE=E3=83=95=E3=82=A3=E3=83=AB=E3=82=BF=E3=83=BC?=
=?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=20(MisskeyIO#919)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
locales/en-US.yml | 4 +-
locales/index.d.ts | 8 ++++
locales/ja-JP.yml | 2 +
locales/ko-KR.yml | 2 +
.../admin/show-user-account-move-logs.ts | 24 ++++++++++
.../src/pages/admin/useraccountmovelog.vue | 46 ++++++++++++++++---
packages/misskey-js/src/autogen/types.ts | 4 ++
7 files changed, 82 insertions(+), 8 deletions(-)
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 2117fb056..f13ddc7bf 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1498,7 +1498,9 @@ _accountMigration:
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."
movedAndCannotBeUndone: "\nThis account has been migrated.\nMigration cannot be reversed."
postMigrationNote: "This account will unfollow all accounts it is currently following 24 hours after migration finishes.\nBoth the number of follows and followers will then become zero. To avoid your followers from being unable to see followers only posts of this account, they will however continue following this account."
- movedTo: "New account:"
+ movedTo: "Migrated account:"
+ movedToServer: "Migrated server"
+ movedFromServer: "Original server"
_achievements:
earnedAt: "Unlocked at"
_types:
diff --git a/locales/index.d.ts b/locales/index.d.ts
index dce1d15b8..269480fb0 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -6004,6 +6004,14 @@ export interface Locale extends ILocale {
* 移行先のアカウント:
*/
"movedTo": string;
+ /**
+ * 移行先のサーバー
+ */
+ "movedToServer": string;
+ /**
+ * 移行元のサーバー
+ */
+ "movedFromServer": string;
};
"_achievements": {
/**
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index e5038ead0..60507f0b1 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -1511,6 +1511,8 @@ _accountMigration:
movedAndCannotBeUndone: "\nアカウントは移行されています。\n移行を取り消すことはできません。"
postMigrationNote: "このアカウントからのフォロー解除は移行操作から24時間後に実行されます。\nこのアカウントのフォロー・フォロワー数は0になっています。フォロワーの解除はされないため、あなたのフォロワーはこのアカウントのフォロワー向け投稿を引き続き閲覧できます。"
movedTo: "移行先のアカウント:"
+ movedToServer: "移行先のサーバー"
+ movedFromServer: "移行元のサーバー"
_achievements:
earnedAt: "獲得日時"
diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
index 6bc34827a..001aeb124 100644
--- a/locales/ko-KR.yml
+++ b/locales/ko-KR.yml
@@ -1496,6 +1496,8 @@ _accountMigration:
movedAndCannotBeUndone: "\n이사한 계정입니다.\n이사는 취소할 수 없습니다."
postMigrationNote: "이 계정의 팔로잉 해제는 이사 후 24시간 뒤에 실행됩니다.\n이 계정의 팔로우 및 팔로워 수는 0으로 표시됩니다. 팔로워 해제는 이루어지지 않으므로, 당신의 팔로워는 이 계정의 팔로워 한정 게시물을 계속해서 열람할 수 있습니다."
movedTo: "이사할 계정:"
+ movedToServer: "이사한 서버"
+ movedFromServer: "기존 서버"
_achievements:
earnedAt: "달성 일시"
_types:
diff --git a/packages/backend/src/server/api/endpoints/admin/show-user-account-move-logs.ts b/packages/backend/src/server/api/endpoints/admin/show-user-account-move-logs.ts
index 46e4bd8cc..ea353b75d 100644
--- a/packages/backend/src/server/api/endpoints/admin/show-user-account-move-logs.ts
+++ b/packages/backend/src/server/api/endpoints/admin/show-user-account-move-logs.ts
@@ -62,6 +62,8 @@ export const paramDef = {
untilId: { type: 'string', format: 'misskey:id' },
movedFromId: { type: 'string', format: 'misskey:id', nullable: true },
movedToId: { type: 'string', format: 'misskey:id', nullable: true },
+ from: { type: 'string', enum: ['local', 'remote', 'all'], nullable: true },
+ to: { type: 'string', enum: ['local', 'remote', 'all'], nullable: true },
},
required: [],
} as const;
@@ -86,6 +88,28 @@ export default class extends Endpoint
{ // eslint-
query.andWhere('accountMoveLogs.movedToId = :movedToId', { movedToId: ps.movedToId });
}
+ if (ps.from != null || ps.to != null) {
+ query
+ .innerJoin('accountMoveLogs.movedFrom', 'movedFrom')
+ .innerJoin('accountMoveLogs.movedTo', 'movedTo');
+
+ if (ps.from === 'local') {
+ query.andWhere('movedFrom.host IS NULL');
+ }
+
+ if (ps.from === 'remote') {
+ query.andWhere('movedFrom.host IS NOT NULL');
+ }
+
+ if (ps.to === 'local') {
+ query.andWhere('movedTo.host IS NULL');
+ }
+
+ if (ps.to === 'remote') {
+ query.andWhere('movedTo.host IS NOT NULL');
+ }
+ }
+
const accountMoveLogs = await query.limit(ps.limit).getMany();
return await this.userAccountMoveLogEntityService.packMany(accountMoveLogs, me);
diff --git a/packages/frontend/src/pages/admin/useraccountmovelog.vue b/packages/frontend/src/pages/admin/useraccountmovelog.vue
index 6a37d4b65..883590b2c 100644
--- a/packages/frontend/src/pages/admin/useraccountmovelog.vue
+++ b/packages/frontend/src/pages/admin/useraccountmovelog.vue
@@ -2,13 +2,29 @@
-
-
- {{ i18n.ts.moveFromId }}
-
-
- {{ i18n.ts.movedToId }}
-
+
+
+
+ {{ i18n.ts._accountMigration.movedFromServer }}
+
+
+
+
+
+ {{ i18n.ts._accountMigration.movedToServer }}
+
+
+
+
+
+
+
+ {{ i18n.ts.moveFromId }}
+
+
+ {{ i18n.ts.movedToId }}
+
+