From 2321214c98591bcfe1385c1ab5bf0ff7b471ae1d Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 8 Apr 2023 20:51:36 +0900 Subject: [PATCH] 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',