diff --git a/locales/index.d.ts b/locales/index.d.ts index cec098e770..bf49869bf8 100644 --- a/locales/index.d.ts +++ b/locales/index.d.ts @@ -5904,7 +5904,6 @@ export interface Locale extends ILocale { *  ・Followers from this account will automatically be migrated to the new account *  ・This account will unfollow all users it is currently following *  ・You will be unable to create new notes etc. on this account - *  ・Scheduled notes will be migrated to the new account if it's on this same instance * * While migration of followers is automatic, you must manually prepare some steps to migrate the list of users you are following. To do so, carry out a follows export that you will later import on the new account in the settings menu. The same procedure applies to your lists as well as your muted and blocked users. * diff --git a/packages/backend/src/core/AccountMoveService.ts b/packages/backend/src/core/AccountMoveService.ts index 0eb8a76bff..e24fefb4b5 100644 --- a/packages/backend/src/core/AccountMoveService.ts +++ b/packages/backend/src/core/AccountMoveService.ts @@ -122,7 +122,7 @@ export class AccountMoveService { await Promise.all([ this.copyBlocking(src, dst), this.copyMutings(src, dst), - this.updateScheduledNotes(src, dst), + this.deleteScheduledNotes(src), this.updateLists(src, dst), ]); } catch { @@ -206,18 +206,7 @@ export class AccountMoveService { } @bindThis - public async updateScheduledNotes(src: ThinUser, dst: MiUser): Promise { - // we're moving to a different local user: change scheduled notes' ownership - if (dst.host === null) { - await this.noteScheduleRepository.update( - { userId: src.id }, - { userId: dst.id }, - ); - - return; - } - - // we're moving to a remote user: delete scheduled notes + public async deleteScheduledNotes(src: ThinUser): Promise { const scheduledNotes = await this.noteScheduleRepository.findBy({ userId: src.id, }) as MiNoteSchedule[]; diff --git a/sharkey-locales/en-US.yml b/sharkey-locales/en-US.yml index 157ab4db92..6e49b0ba37 100644 --- a/sharkey-locales/en-US.yml +++ b/sharkey-locales/en-US.yml @@ -206,7 +206,7 @@ _serverSettings: inquiryUrl: "Contact URL" inquiryUrlDescription: "Specify the URL of a web page that contains a contact form or the instance operators' contact information." _accountMigration: - moveAccountDescription: "This will migrate your account to a different one.\n ・Followers from this account will automatically be migrated to the new account\n ・This account will unfollow all users it is currently following\n ・You will be unable to create new notes etc. on this account\n ・Scheduled notes will be migrated to the new account if it's on this same instance\n\nWhile migration of followers is automatic, you must manually prepare some steps to migrate the list of users you are following. To do so, carry out a follows export that you will later import on the new account in the settings menu. The same procedure applies to your lists as well as your muted and blocked users.\n\n(This explanation applies to Sharkey v13.12.0 and later. Other ActivityPub software, such as Mastodon, might function differently.)" + moveAccountDescription: "This will migrate your account to a different one.\n ・Followers from this account will automatically be migrated to the new account\n ・This account will unfollow all users it is currently following\n ・You will be unable to create new notes etc. on this account\n\nWhile migration of followers is automatic, you must manually prepare some steps to migrate the list of users you are following. To do so, carry out a follows export that you will later import on the new account in the settings menu. The same procedure applies to your lists as well as your muted and blocked users.\n\n(This explanation applies to Sharkey v13.12.0 and later. Other ActivityPub software, such as Mastodon, might function differently.)" _achievements: _types: _notes1: