From 448860022955833825dd98e10e77c3c11d1976cb Mon Sep 17 00:00:00 2001
From: rxdn <29165304+rxdn@users.noreply.github.com>
Date: Fri, 18 Nov 2022 18:26:24 +0000
Subject: [PATCH] Fix missing emoji bug

---
 .../endpoints/api/panel/panelmessagedata.go   | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/http/endpoints/api/panel/panelmessagedata.go b/app/http/endpoints/api/panel/panelmessagedata.go
index 3f8871e..749015e 100644
--- a/app/http/endpoints/api/panel/panelmessagedata.go
+++ b/app/http/endpoints/api/panel/panelmessagedata.go
@@ -24,15 +24,16 @@ type panelMessageData struct {
 
 func panelIntoMessageData(panel database.Panel, isPremium bool) panelMessageData {
 	var emote *emoji.Emoji
-	if panel.EmojiName != nil && *panel.EmojiName == "" { // No emoji = nil
-		id := objects.NewNullSnowflake()
-		if panel.EmojiId != nil {
-			id = objects.NewNullableSnowflake(*panel.EmojiId)
-		}
-
-		emote = &emoji.Emoji{
-			Id:   id,
-			Name: *panel.EmojiName,
+	if panel.EmojiName != nil { // No emoji = nil
+		if panel.EmojiId == nil { // Unicode emoji
+			emote = &emoji.Emoji{
+				Name: *panel.EmojiName,
+			}
+		} else { // Custom emoji
+			emote = &emoji.Emoji{
+				Id:   objects.NewNullableSnowflake(*panel.EmojiId),
+				Name: *panel.EmojiName,
+			}
 		}
 	}