From 67089193eae06329edd95081e3514d8dd2d913f5 Mon Sep 17 00:00:00 2001 From: Johann150 Date: Fri, 19 Jul 2024 20:45:25 +0200 Subject: [PATCH] server: query cache is optional The query cache can be disabled in the configuration file and should thus be considered optional. It should not be assumed that it is present. --- .../backend/src/queue/processors/db/import-custom-emojis.ts | 2 +- .../server/api/endpoints/admin/emoji/add-aliases-bulk.ts | 2 +- .../backend/src/server/api/endpoints/admin/emoji/add.ts | 2 +- .../backend/src/server/api/endpoints/admin/emoji/copy.ts | 2 +- .../src/server/api/endpoints/admin/emoji/delete-bulk.ts | 6 +++--- .../backend/src/server/api/endpoints/admin/emoji/delete.ts | 2 +- .../server/api/endpoints/admin/emoji/remove-aliases-bulk.ts | 2 +- .../server/api/endpoints/admin/emoji/set-aliases-bulk.ts | 2 +- .../server/api/endpoints/admin/emoji/set-category-bulk.ts | 2 +- .../backend/src/server/api/endpoints/admin/emoji/update.ts | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/backend/src/queue/processors/db/import-custom-emojis.ts b/packages/backend/src/queue/processors/db/import-custom-emojis.ts index 2a0aabe6f..6bc6bc3cd 100644 --- a/packages/backend/src/queue/processors/db/import-custom-emojis.ts +++ b/packages/backend/src/queue/processors/db/import-custom-emojis.ts @@ -73,7 +73,7 @@ export async function importCustomEmojis(job: Bull.Job, don }); } - await db.queryResultCache!.remove(['meta_emojis']); + await db.queryResultCache?.remove(['meta_emojis']); cleanup(); diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts index 416781ac8..1b662b706 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/add-aliases-bulk.ts @@ -36,5 +36,5 @@ export default define(meta, paramDef, async (ps) => { }); } - await db.queryResultCache!.remove(['meta_emojis']); + await db.queryResultCache?.remove(['meta_emojis']); }); diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts index fe4ac6245..b3399b2e5 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/add.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/add.ts @@ -43,7 +43,7 @@ export default define(meta, paramDef, async (ps, me) => { type: file.webpublicType ?? file.type, }).then(x => Emojis.findOneByOrFail(x.identifiers[0])); - await db.queryResultCache!.remove(['meta_emojis']); + await db.queryResultCache?.remove(['meta_emojis']); publishBroadcastStream('emojiAdded', { emoji: await Emojis.pack(emoji.id), diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts index 148522536..07ed059da 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/copy.ts @@ -62,7 +62,7 @@ export default define(meta, paramDef, async (ps) => { type: driveFile.webpublicType ?? driveFile.type, }).then(x => Emojis.findOneByOrFail(x.identifiers[0])); - await db.queryResultCache!.remove(['meta_emojis']); + await db.queryResultCache?.remove(['meta_emojis']); publishBroadcastStream('emojiAdded', { emoji: await Emojis.pack(copied.id), diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts index 54f8c1b5b..a738df855 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/delete-bulk.ts @@ -29,9 +29,9 @@ export default define(meta, paramDef, async (ps, me) => { for (const emoji of emojis) { await Emojis.delete(emoji.id); - - await db.queryResultCache!.remove(['meta_emojis']); - + + await db.queryResultCache?.remove(['meta_emojis']); + insertModerationLog(me, 'deleteEmoji', { emoji }); } }); diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts index a23e0e41f..712f650aa 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/delete.ts @@ -29,7 +29,7 @@ export default define(meta, paramDef, async (ps, me) => { await Emojis.delete(emoji.id); - await db.queryResultCache!.remove(['meta_emojis']); + await db.queryResultCache?.remove(['meta_emojis']); insertModerationLog(me, 'deleteEmoji', { emoji }); }); diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts index 44355872f..603c6c897 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/remove-aliases-bulk.ts @@ -36,5 +36,5 @@ export default define(meta, paramDef, async (ps) => { }); } - await db.queryResultCache!.remove(['meta_emojis']); + await db.queryResultCache?.remove(['meta_emojis']); }); diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts index fd649e5a2..eed60c8a9 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/set-aliases-bulk.ts @@ -32,5 +32,5 @@ export default define(meta, paramDef, async (ps) => { aliases: ps.aliases, }); - await db.queryResultCache!.remove(['meta_emojis']); + await db.queryResultCache?.remove(['meta_emojis']); }); diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts b/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts index 2e1d6cffb..270e992ae 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/set-category-bulk.ts @@ -34,5 +34,5 @@ export default define(meta, paramDef, async (ps) => { category: ps.category, }); - await db.queryResultCache!.remove(['meta_emojis']); + await db.queryResultCache?.remove(['meta_emojis']); }); diff --git a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts index 802db2858..c07e98a32 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts @@ -42,5 +42,5 @@ export default define(meta, paramDef, async (ps) => { aliases: ps.aliases, }); - await db.queryResultCache!.remove(['meta_emojis']); + await db.queryResultCache?.remove(['meta_emojis']); });