HidemaruOwO/puyoskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge: handle scheduled notes when deleting and migrating accounts - fixes #931 #936 (!920)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/920

Closes #931 and #936

Approved-by: Marie <github@yuugi.dev>
Approved-by: Julia <julia@insertdomain.name>
This commit is contained in:
dakkar 2025-03-02 18:28:15 +00:00
commit 92bac81a7f
2 changed files with 42 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,7 @@ import { IsNull, In, MoreThan, Not } from 'typeorm';
import { bindThis } from '@/decorators.js'; import { bindThis } from '@/decorators.js';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import type { MiLocalUser, MiRemoteUser, MiUser } from '@/models/User.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 type { RelationshipJobData, ThinUser } from '@/queue/types.js';
import { IdService } from '@/core/IdService.js'; import { IdService } from '@/core/IdService.js';
@ -49,6 +49,9 @@ export class AccountMoveService {
@Inject(DI.instancesRepository) @Inject(DI.instancesRepository)
private instancesRepository: InstancesRepository, private instancesRepository: InstancesRepository,
@Inject(DI.noteScheduleRepository)
private noteScheduleRepository: NoteScheduleRepository,
private userEntityService: UserEntityService, private userEntityService: UserEntityService,
private idService: IdService, private idService: IdService,
private apPersonService: ApPersonService, private apPersonService: ApPersonService,
@ -119,6 +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.deleteScheduledNotes(src),
this.updateLists(src, dst), this.updateLists(src, dst),
]); ]);
} catch { } catch {
@ -201,6 +205,21 @@ export class AccountMoveService {
await this.mutingsRepository.insert(arrayToInsert); await this.mutingsRepository.insert(arrayToInsert);
} }
@bindThis
public async deleteScheduledNotes(src: ThinUser): Promise<void> {
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. * Update lists while moving accounts.
* - No removal of the old account from the lists * - No removal of the old account from the lists

23
packages/backend/src/queue/processors/DeleteAccountProcessorService.ts
View file

@ -6,7 +6,7 @@
import { Inject, Injectable } from '@nestjs/common'; import { Inject, Injectable } from '@nestjs/common';
import { MoreThan } from 'typeorm'; import { MoreThan } from 'typeorm';
import { DI } from '@/di-symbols.js'; import { DI } from '@/di-symbols.js';
import type { DriveFilesRepository, NoteReactionsRepository, NotesRepository, UserProfilesRepository, UsersRepository } from '@/models/_.js'; import type { DriveFilesRepository, NoteReactionsRepository, NotesRepository, UserProfilesRepository, UsersRepository, NoteScheduleRepository, MiNoteSchedule } from '@/models/_.js';
import type Logger from '@/logger.js'; import type Logger from '@/logger.js';
import { DriveService } from '@/core/DriveService.js'; import { DriveService } from '@/core/DriveService.js';
import type { MiDriveFile } from '@/models/DriveFile.js'; import type { MiDriveFile } from '@/models/DriveFile.js';
@ -20,6 +20,7 @@ import { ReactionService } from '@/core/ReactionService.js';
import { QueueLoggerService } from '../QueueLoggerService.js'; import { QueueLoggerService } from '../QueueLoggerService.js';
import type * as Bull from 'bullmq'; import type * as Bull from 'bullmq';
import type { DbUserDeleteJobData } from '../types.js'; import type { DbUserDeleteJobData } from '../types.js';
import { QueueService } from '@/core/QueueService.js';
@Injectable() @Injectable()
export class DeleteAccountProcessorService { export class DeleteAccountProcessorService {
@ -41,6 +42,10 @@ export class DeleteAccountProcessorService {
@Inject(DI.noteReactionsRepository) @Inject(DI.noteReactionsRepository)
private noteReactionsRepository: NoteReactionsRepository, private noteReactionsRepository: NoteReactionsRepository,
@Inject(DI.noteScheduleRepository)
private noteScheduleRepository: NoteScheduleRepository,
private queueService: QueueService,
private driveService: DriveService, private driveService: DriveService,
private emailService: EmailService, private emailService: EmailService,
private queueLoggerService: QueueLoggerService, private queueLoggerService: QueueLoggerService,
@ -60,6 +65,22 @@ export class DeleteAccountProcessorService {
return; return;
} }
{ // Delete scheduled notes
const scheduledNotes = await this.noteScheduleRepository.findBy({
userId: user.id,
}) as MiNoteSchedule[];
for (const note of scheduledNotes) {
await this.queueService.ScheduleNotePostQueue.remove(`schedNote:${note.id}`);
}
await this.noteScheduleRepository.delete({
userId: user.id,
});
this.logger.succ('All scheduled notes deleted');
}
{ // Delete notes { // Delete notes
let cursor: MiNote['id'] | null = null; let cursor: MiNote['id'] | null = null;