From 473b3993c45c5bafb8bd10b3df6a681a2c0fb0d7 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Wed, 25 Jun 2025 14:10:12 -0400 Subject: [PATCH] remove queued user updated when deleted --- .../backend/src/core/CollapsedQueueService.ts | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts index 9c01f434a2..4b619320e3 100644 --- a/packages/backend/src/core/CollapsedQueueService.ts +++ b/packages/backend/src/core/CollapsedQueueService.ts @@ -132,6 +132,8 @@ export class CollapsedQueueService implements OnApplicationShutdown { concurrency: 4, // High concurrency - this queue gets a lot of activity }, ); + + this.internalEventService.on('userChangeDeletedState', this.onUserDeleted); } @bindThis @@ -166,18 +168,20 @@ export class CollapsedQueueService implements OnApplicationShutdown { this.logger.error(`Error persisting ${queue.name}: ${renderInlineError(error)}`); } + @bindThis + private onUserDeleted(data: { id: string, isDeleted: boolean }) { + if (data.isDeleted) { + this.updateUserQueue.delete(data.id); + } + } + async onApplicationShutdown() { - // TODO note/user delete events + this.internalEventService.off('userChangeDeletedState', this.onUserDeleted); await this.performAllNow(); } } -function maxDate(first: Date, second: Date | undefined): Date; -function maxDate(first: Date | undefined, second: Date): Date; -function maxDate(first: Date | undefined, second: Date | undefined): Date | undefined; -// eslint requires a space here -_- - function maxDate(first: Date | undefined, second: Date | undefined): Date | undefined { if (first && second) { if (first.getTime() > second.getTime()) {