From c32ebdd4cdcf73277d7f24fe3cdcca29ce8133a8 Mon Sep 17 00:00:00 2001 From: Hazelnoot Date: Thu, 6 Nov 2025 21:44:54 -0500 Subject: [PATCH] fix rebase errors --- packages/backend/src/core/NoteEditService.ts | 8 ++++---- .../src/server/api/endpoints/get-online-users-count.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/backend/src/core/NoteEditService.ts b/packages/backend/src/core/NoteEditService.ts index f9bd39d580..3a0eeaaaf8 100644 --- a/packages/backend/src/core/NoteEditService.ts +++ b/packages/backend/src/core/NoteEditService.ts @@ -350,12 +350,12 @@ export class NoteEditService implements OnApplicationShutdown { } // Check for recursion - if (data.renote.id === oldnote.id) { - throw new IdentifiableError('33510210-8452-094c-6227-4a6c05d99f02', `edit failed for ${oldnote.id}: note cannot quote itself`); + if (data.renote.id === oldNote.id) { + throw new IdentifiableError('33510210-8452-094c-6227-4a6c05d99f02', `edit failed for ${oldNote.id}: note cannot quote itself`); } for (let nextRenoteId = data.renote.renoteId; nextRenoteId != null;) { - if (nextRenoteId === oldnote.id) { - throw new IdentifiableError('ea93b7c2-3d6c-4e10-946b-00d50b1a75cb', `edit failed for ${oldnote.id}: note cannot quote a quote of itself`); + if (nextRenoteId === oldNote.id) { + throw new IdentifiableError('ea93b7c2-3d6c-4e10-946b-00d50b1a75cb', `edit failed for ${oldNote.id}: note cannot quote a quote of itself`); } // TODO create something like threadId but for quotes, that way we don't need full recursion diff --git a/packages/backend/src/server/api/endpoints/get-online-users-count.ts b/packages/backend/src/server/api/endpoints/get-online-users-count.ts index 394f422da6..0d5663b367 100644 --- a/packages/backend/src/server/api/endpoints/get-online-users-count.ts +++ b/packages/backend/src/server/api/endpoints/get-online-users-count.ts @@ -75,6 +75,6 @@ export default class extends Endpoint { // eslint- }); }); - this.cache = cacheManagementService.createMemorySingleCache<{ count: number, countAcrossNetwork: number }>(1000 * 60); // 1 minute + this.cache = cacheManagementService.createMemorySingleCache<{ count: number, countAcrossNetwork: number }>('onlineUsers', { lifetime: 1000 * 60 }); // 1 minute } }