From 2fd44d68c5977f257d6485da4831aa8d75759a29 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Wed, 25 Jun 2025 13:32:11 -0400 Subject: [PATCH] rename additionalNotes to notesCountDelta --- .../backend/src/core/CollapsedQueueService.ts | 17 +++++++++-------- packages/backend/src/core/NoteCreateService.ts | 4 ++-- packages/backend/src/core/NoteDeleteService.ts | 4 ++-- packages/backend/src/core/NoteEditService.ts | 2 +- 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/packages/backend/src/core/CollapsedQueueService.ts b/packages/backend/src/core/CollapsedQueueService.ts index 88b33e9960..ddcb0003b2 100644 --- a/packages/backend/src/core/CollapsedQueueService.ts +++ b/packages/backend/src/core/CollapsedQueueService.ts @@ -14,24 +14,25 @@ import { bindThis } from '@/decorators.js'; import type { MiInstance } from '@/models/Instance.js'; import { InternalEventService } from '@/core/InternalEventService.js'; import { MiUser } from '@/models/User.js'; -import type { UsersRepository } from '@/models/_.js'; +import type { MiNote, UsersRepository } from '@/models/_.js'; import { DI } from '@/di-symbols.js'; export type UpdateInstanceJob = { latestRequestReceivedAt?: Date, shouldUnsuspend?: boolean, - additionalNotes?: number, + notesCountDelta?: number, }; export type UpdateUserJob = { updatedAt?: Date, - additionalNotes?: number, + notesCountDelta?: number, }; @Injectable() export class CollapsedQueueService implements OnApplicationShutdown { - // Moved from InboxProcessorService to allow access from ApInboxService + // Moved from InboxProcessorService public readonly updateInstanceQueue: CollapsedQueue; + // Moved from NoteCreateService, NoteEditService, and NoteDeleteService public readonly updateUserQueue: CollapsedQueue; private readonly logger: Logger; @@ -57,13 +58,13 @@ export class CollapsedQueueService implements OnApplicationShutdown { (oldJob, newJob) => ({ latestRequestReceivedAt: maxDate(oldJob.latestRequestReceivedAt, newJob.latestRequestReceivedAt), shouldUnsuspend: oldJob.shouldUnsuspend || newJob.shouldUnsuspend, - additionalNotes: (oldJob.additionalNotes ?? 0) + (newJob.additionalNotes ?? 0), + notesCountDelta: (oldJob.notesCountDelta ?? 0) + (newJob.notesCountDelta ?? 0), }), (id, job) => this.federatedInstanceService.update(id, { latestRequestReceivedAt: job.latestRequestReceivedAt, isNotResponding: job.latestRequestReceivedAt ? false : undefined, suspensionState: job.shouldUnsuspend ? 'none' : undefined, - notesCount: job.additionalNotes ? () => `"notesCount" + ${job.additionalNotes}` : undefined, + notesCount: job.notesCountDelta ? () => `"notesCount" + ${job.notesCountDelta}` : undefined, }), { onError: this.onQueueError, @@ -76,11 +77,11 @@ export class CollapsedQueueService implements OnApplicationShutdown { oneMinuteInterval, (oldJob, newJob) => ({ updatedAt: maxDate(oldJob.updatedAt, newJob.updatedAt), - additionalNotes: (oldJob.additionalNotes ?? 0) + (newJob.additionalNotes ?? 0), + notesCountDelta: (oldJob.notesCountDelta ?? 0) + (newJob.notesCountDelta ?? 0), }), (id, job) => this.usersRepository.update({ id }, { updatedAt: job.updatedAt, - notesCount: job.additionalNotes ? () => `"notesCount" + ${job.additionalNotes}` : undefined, + notesCount: job.notesCountDelta ? () => `"notesCount" + ${job.notesCountDelta}` : undefined, }), { onError: this.onQueueError, diff --git a/packages/backend/src/core/NoteCreateService.ts b/packages/backend/src/core/NoteCreateService.ts index ee1f681a76..e14bb56685 100644 --- a/packages/backend/src/core/NoteCreateService.ts +++ b/packages/backend/src/core/NoteCreateService.ts @@ -587,7 +587,7 @@ export class NoteCreateService implements OnApplicationShutdown { if (isRemoteUser(user)) { this.federatedInstanceService.fetchOrRegister(user.host).then(async i => { if (!this.isRenote(note) || this.isQuote(note)) { - this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { additionalNotes: 1 }); + this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { notesCountDelta: 1 }); } if (this.meta.enableChartsForFederatedInstances) { this.instanceChart.updateNote(i.host, note, true); @@ -605,7 +605,7 @@ export class NoteCreateService implements OnApplicationShutdown { if (!this.isRenote(note) || this.isQuote(note)) { // Increment notes count (user) - this.collapsedQueueService.updateUserQueue.enqueue(user.id, { additionalNotes: 1 }); + this.collapsedQueueService.updateUserQueue.enqueue(user.id, { notesCountDelta: 1 }); } this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() }); diff --git a/packages/backend/src/core/NoteDeleteService.ts b/packages/backend/src/core/NoteDeleteService.ts index 5bab95862d..5198340c4d 100644 --- a/packages/backend/src/core/NoteDeleteService.ts +++ b/packages/backend/src/core/NoteDeleteService.ts @@ -141,14 +141,14 @@ export class NoteDeleteService { if (!isPureRenote(note)) { // Decrement notes count (user) - this.collapsedQueueService.updateUserQueue.enqueue(user.id, { additionalNotes: -1 }); + this.collapsedQueueService.updateUserQueue.enqueue(user.id, { notesCountDelta: -1 }); } this.collapsedQueueService.updateUserQueue.enqueue(user.id, { updatedAt: new Date() }); for (const cascade of cascadingNotes) { if (!isPureRenote(cascade)) { - this.collapsedQueueService.updateUserQueue.enqueue(cascade.user.id, { additionalNotes: -1 }); + this.collapsedQueueService.updateUserQueue.enqueue(cascade.user.id, { notesCountDelta: -1 }); } // Don't mark cascaded user as updated (active) } diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts index 2be3361585..adff0cbb5b 100644 --- a/packages/backend/src/core/NoteEditService.ts +++ b/packages/backend/src/core/NoteEditService.ts @@ -616,7 +616,7 @@ export class NoteEditService implements OnApplicationShutdown { if (isRemoteUser(user)) { this.federatedInstanceService.fetchOrRegister(user.host).then(async i => { if (note.renote && note.text || !note.renote) { - this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { additionalNotes: 1 }); + this.collapsedQueueService.updateInstanceQueue.enqueue(i.id, { notesCountDelta: 1 }); } if (this.meta.enableChartsForFederatedInstances) { this.instanceChart.updateNote(i.host, note, true);