From 668a8a14294afeb7c94d856f56e8bb05ee37844b Mon Sep 17 00:00:00 2001 From: Namekuji Date: Thu, 28 Sep 2023 03:52:43 -0400 Subject: [PATCH] fix: skip if pinnedNotes are empty --- packages/backend/src/misc/cache.ts | 2 +- .../backend/src/models/repositories/user.ts | 20 ++++++++++--------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/backend/src/misc/cache.ts b/packages/backend/src/misc/cache.ts index 48d0abaf96..eecc481220 100644 --- a/packages/backend/src/misc/cache.ts +++ b/packages/backend/src/misc/cache.ts @@ -60,7 +60,7 @@ export class Cache { if (keys.length === 0) { return map; } - keys = keys.map((key) => key.slice(redisPrefix?.length)); + keys = keys.map((key) => key.slice(redisPrefix.length)); const values = await redisClient.mgetBuffer(keys); for (const [i, key] of keys.entries()) { diff --git a/packages/backend/src/models/repositories/user.ts b/packages/backend/src/models/repositories/user.ts index 4d0727192a..9427518a43 100644 --- a/packages/backend/src/models/repositories/user.ts +++ b/packages/backend/src/models/repositories/user.ts @@ -422,15 +422,17 @@ export const UserRepository = db.getRepository(User).extend({ }, }).then((notes) => notes.map(({ noteId }) => noteId)); - if (scyllaClient) { - const result = await scyllaClient.execute( - prepared.note.select.byIds, - [pinnedNoteIds], - { prepare: true }, - ); - pinnedNotes = result.rows.map(parseScyllaNote); - } else { - pinnedNotes = await Notes.findBy({ id: In(pinnedNoteIds) }); + if (pinnedNoteIds.length > 0) { + if (scyllaClient) { + const result = await scyllaClient.execute( + prepared.note.select.byIds, + [pinnedNoteIds], + { prepare: true }, + ); + pinnedNotes = result.rows.map(parseScyllaNote); + } else { + pinnedNotes = await Notes.findBy({ id: In(pinnedNoteIds) }); + } } }