handle scheduled notes when migrating account - fixes #931
I'm not sure we want the "change ownership of notes if dst is local", though
This commit is contained in:
@@ -9,7 +9,7 @@ import { IsNull, In, MoreThan, Not } from 'typeorm';
|
||||
import { bindThis } from '@/decorators.js';
|
||||
import { DI } from '@/di-symbols.js';
|
||||
import type { MiLocalUser, MiRemoteUser, MiUser } from '@/models/User.js';
|
||||
import type { BlockingsRepository, FollowingsRepository, InstancesRepository, MiMeta, MutingsRepository, UserListMembershipsRepository, UsersRepository } from '@/models/_.js';
|
||||
import type { BlockingsRepository, FollowingsRepository, InstancesRepository, MiMeta, MutingsRepository, UserListMembershipsRepository, UsersRepository, NoteScheduleRepository, MiNoteSchedule } from '@/models/_.js';
|
||||
import type { RelationshipJobData, ThinUser } from '@/queue/types.js';
|
||||
|
||||
import { IdService } from '@/core/IdService.js';
|
||||
@@ -49,6 +49,9 @@ export class AccountMoveService {
|
||||
@Inject(DI.instancesRepository)
|
||||
private instancesRepository: InstancesRepository,
|
||||
|
||||
@Inject(DI.noteScheduleRepository)
|
||||
private noteScheduleRepository: NoteScheduleRepository,
|
||||
|
||||
private userEntityService: UserEntityService,
|
||||
private idService: IdService,
|
||||
private apPersonService: ApPersonService,
|
||||
@@ -119,6 +122,7 @@ export class AccountMoveService {
|
||||
await Promise.all([
|
||||
this.copyBlocking(src, dst),
|
||||
this.copyMutings(src, dst),
|
||||
this.updateScheduledNotes(src, dst),
|
||||
this.updateLists(src, dst),
|
||||
]);
|
||||
} catch {
|
||||
@@ -201,6 +205,32 @@ export class AccountMoveService {
|
||||
await this.mutingsRepository.insert(arrayToInsert);
|
||||
}
|
||||
|
||||
@bindThis
|
||||
public async updateScheduledNotes(src: ThinUser, dst: MiUser): 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({
|
||||
userId: src.id,
|
||||
}) as MiNoteSchedule[];
|
||||
|
||||
for (const note of scheduledNotes) {
|
||||
await this.queueService.ScheduleNotePostQueue.remove(`schedNote:${note.id}`);
|
||||
}
|
||||
|
||||
await this.noteScheduleRepository.delete({
|
||||
userId: src.id,
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Update lists while moving accounts.
|
||||
* - No removal of the old account from the lists
|
||||
|
||||
Reference in New Issue
Block a user