From bd74ecd7651e32b4da78cb371f83b36b27b3ae07 Mon Sep 17 00:00:00 2001
From: Yuzu <yuzu@kirameki.cafe>
Date: Sun, 19 Sep 2021 08:39:16 -0700
Subject: [PATCH] Fixed icon bugs and deferred crash

---
 src/utils/DiscordMessage.ts | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/utils/DiscordMessage.ts b/src/utils/DiscordMessage.ts
index 1336c26..e8f3af3 100644
--- a/src/utils/DiscordMessage.ts
+++ b/src/utils/DiscordMessage.ts
@@ -35,19 +35,19 @@ export function makeEmbed(icon: string | undefined, title: string, description:
 }
 
 export function makeSuccessEmbed(options: any) {
-    return makeEmbed(options.icon || "✅", options.title, options.description, '#B5EAD7', options.fields, options.user, options.setTimestamp || true);
+    return makeEmbed(typeof options.icon === 'undefined' ? "✅" : options.icon, options.title, options.description, '#B5EAD7', options.fields, options.user, options.setTimestamp || true);
 }
 
 export function makeErrorEmbed(options: any) {
-    return makeEmbed(options.icon || "❌", options.title, options.description, '#FF9AA2', options.fields, options.user, options.setTimestamp || true);
+    return makeEmbed(typeof options.icon === 'undefined' ? "❌" : options.icon, options.title, options.description, '#FF9AA2', options.fields, options.user, options.setTimestamp || true);
 }
 
 export function makeProcessingEmbed(options: any) {
-    return makeEmbed(options.icon || getEmotes().yumiloading, options.title, options.description, '#E2F0CB', options.fields, options.user, options.setTimestamp || true);
+    return makeEmbed(typeof options.icon === 'undefined' ? getEmotes().yumiloading : options.icon, options.title, options.description, '#E2F0CB', options.fields, options.user, options.setTimestamp || true);
 }
 
 export function makeInfoEmbed(options: any) {
-    return makeEmbed(options.icon || "🔮", options.title, options.description, '#C7CEEA', options.fields, options.user, options.setTimestamp || true);
+    return makeEmbed(typeof options.icon === 'undefined' ? "🔮" : options.icon, options.title, options.description, '#C7CEEA', options.fields, options.user, options.setTimestamp || true);
 }
 
 export async function sendMessage(channel: TextChannel | DMChannel | BaseGuildTextChannel | TextBasedChannels, user: User | undefined, options: string | MessagePayload | MessageOptions) {
@@ -93,7 +93,12 @@ export async function sendMessageOrInteractionResponse(data: Message | Interacti
     if(isSlashCommand) {
         if(!data.replied) {
             let message;
-            try { return await data.reply(payload); }
+            try {
+                if(!data.deferred)
+                    return await data.reply(payload);
+                else
+                    return await data.editReply(payload);
+            }
             catch(errorDM) {
                 Logger.error(`Cannot find available destinations to send the message CID: ${data.channel!.id} UID: ${data.user.id} DM_ERR: ${errorDM}`);
                 return;