mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-04-29 01:56:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't move scheduled notes to new account when migrating

Browse source 
@Julia confirms it would confuse people more than it helps
This commit is contained in:
dakkar 2025-03-02 16:51:54 +00:00
parent 687cb5b168
commit 0fba8dc26a
3 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
locales/index.d.ts vendored
View file

@ -5904,7 +5904,6 @@ export interface Locale extends ILocale {
* 　・Followers from this account will automatically be migrated to the new account * 　・Followers from this account will automatically be migrated to the new account
* 　・This account will unfollow all users it is currently following * 　・This account will unfollow all users it is currently following
* 　・You will be unable to create new notes etc. on this account * 　・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. * 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.
* *

15
packages/backend/src/core/AccountMoveService.ts
View file

@ -122,7 +122,7 @@ export class AccountMoveService {
await Promise.all([ await Promise.all([
this.copyBlocking(src, dst), this.copyBlocking(src, dst),
this.copyMutings(src, dst), this.copyMutings(src, dst),
this.updateScheduledNotes(src, dst), this.deleteScheduledNotes(src),
this.updateLists(src, dst), this.updateLists(src, dst),
]); ]);
} catch { } catch {
@ -206,18 +206,7 @@ export class AccountMoveService {
} }
@bindThis @bindThis
public async updateScheduledNotes(src: ThinUser, dst: MiUser): Promise<void> { public async deleteScheduledNotes(src: ThinUser): Promise<void> {
// 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
const scheduledNotes = await this.noteScheduleRepository.findBy({ const scheduledNotes = await this.noteScheduleRepository.findBy({
userId: src.id, userId: src.id,
}) as MiNoteSchedule[]; }) as MiNoteSchedule[];

2
sharkey-locales/en-US.yml
View file

@ -206,7 +206,7 @@ _serverSettings:
inquiryUrl: "Contact URL" inquiryUrl: "Contact URL"
inquiryUrlDescription: "Specify the URL of a web page that contains a contact form or the instance operators' contact information." inquiryUrlDescription: "Specify the URL of a web page that contains a contact form or the instance operators' contact information."
_accountMigration: _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: _achievements:
_types: _types:
_notes1: _notes1: