From 2743528727e5a9950fda0176769e13b6cad4fb6a Mon Sep 17 00:00:00 2001
From: Jesse Wierzbinski <contact@cpluspatch.com>
Date: Sat, 7 Dec 2024 11:12:17 +0100
Subject: [PATCH] fix(api): :bug: Fix emoji editing always making the emoji
 non-global

---
 api/api/v1/emojis/:id/index.ts | 5 ++++-
 classes/database/emoji.ts      | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/api/api/v1/emojis/:id/index.ts b/api/api/v1/emojis/:id/index.ts
index 67ecdde0..6d117447 100644
--- a/api/api/v1/emojis/:id/index.ts
+++ b/api/api/v1/emojis/:id/index.ts
@@ -309,7 +309,10 @@ export default apiRoute((app) => {
         modified.shortcode = shortcode ?? modified.shortcode;
         modified.alt = alt ?? modified.alt;
         modified.category = category ?? modified.category;
-        modified.ownerId = emojiGlobal ? null : user.data.id;
+
+        if (emojiGlobal !== undefined) {
+            modified.ownerId = emojiGlobal ? null : user.data.id;
+        }
 
         await emoji.update(modified);
 
diff --git a/classes/database/emoji.ts b/classes/database/emoji.ts
index 4258bddb..97c29251 100644
--- a/classes/database/emoji.ts
+++ b/classes/database/emoji.ts
@@ -197,6 +197,7 @@ export class Emoji extends BaseInterface<typeof Emojis, EmojiWithInstance> {
             visible_in_picker: this.data.visibleInPicker,
             category: this.data.category ?? undefined,
             global: this.data.ownerId === null,
+            description: this.data.alt ?? undefined,
         };
     }