setemoji quick message improvement for DMs

cmorley191 · Feb 11, 2022 · 3047890 · 3047890
1 parent a58fa23
commit 3047890
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetemojiCmd.java b/src/main/java/com/jagrosh/jmusicbot/commands/owner/SetemojiCmd.java
@@ -456,10 +456,18 @@ private void updateEmojis(CommandEvent event, Guild guild, int iMessageType, Str
     if (m != null) {
       updateReactions.accept(m, (removeIgnore) -> selectEmojiAndContinue(event, guild, iMessageType, unionEmojisArr, null, m, messageText, removeIgnore));
     } else {
-      event.reply(messageText, m2 -> {
-        if (add) updateReactions.accept(m2, (removeIgnore) -> selectEmojiAndContinue(event, guild, iMessageType, unionEmojisArr, null, m2, messageText, removeIgnore));
-        else selectEmojiAndContinue(event, guild, iMessageType, unionEmojisArr, null, m2, messageText, null);
-      });
+      if (!event.getChannelType().isGuild()) {
+        String text = messageText == null ? "" : messageText;
+        if (existingEmojis != null && existingEmojis.length != 0) {
+          text += "\nNew \""+messageTypes[iMessageType]+"\" list for "+(guild == null ? "all guilds" : guild.getName())+": "+String.join(", ", unionEmojisArr)+".";
+        }
+        event.reply(text);
+      } else {
+        event.reply(messageText, m2 -> {
+          if (add) updateReactions.accept(m2, (removeIgnore) -> selectEmojiAndContinue(event, guild, iMessageType, unionEmojisArr, null, m2, messageText, removeIgnore));
+          else selectEmojiAndContinue(event, guild, iMessageType, unionEmojisArr, null, m2, messageText, null);
+        });
+      }
     }
   }
 }