From cbd0bde157c6e6e7f00a25e28e9e6f4ea52c1742 Mon Sep 17 00:00:00 2001 From: HellhoundSoftware Date: Tue, 14 Jan 2025 01:48:00 +0000 Subject: [PATCH] Fix null coalescing in /admin/emoji/update (fixes #44) (#45) Reviewed-on: https://codeberg.org/yeentown/barkey/pulls/45 Reviewed-by: zima Co-authored-by: HellhoundSoftware Co-committed-by: HellhoundSoftware --- .../backend/src/server/api/endpoints/admin/emoji/update.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 957134c1ad..ea91be8dca 100644 --- a/packages/backend/src/server/api/endpoints/admin/emoji/update.ts +++ b/packages/backend/src/server/api/endpoints/admin/emoji/update.ts @@ -96,10 +96,14 @@ export default class extends Endpoint { // eslint- emojiId = emoji.id; } + let categoryNfc: string|null|undefined = ps.category?.normalize('NFC'); + // stop ?. from turning a null into an undefined + if (ps.category === null) categoryNfc = null; + await this.customEmojiService.update(emojiId, { driveFile, name: nameNfc, - category: ps.category?.normalize('NFC'), + category: categoryNfc, aliases: ps.aliases?.map(a => a.normalize('NFC')), license: ps.license, isSensitive: ps.isSensitive,