added optional titles to /embed & /editembed

Dynxsty · Dynxsty · commit 63d02b57f083 · 2021-07-21T15:53:26.000+02:00
diff --git a/src/main/java/com/javadiscord/javabot/commands/moderation/EditEmbed.java b/src/main/java/com/javadiscord/javabot/commands/moderation/EditEmbed.java
@@ -31,34 +31,38 @@ public void handle(SlashCommandEvent event) {
     }
 
     void editEmbedFromLink(SlashCommandEvent event) {
-        String oriLink = event.getOption("original-link").getAsString();
-        String newLink = event.getOption("new-link").getAsString();
+        String emLink = event.getOption("embed-link").getAsString();
+        String msgLink = event.getOption("message-link").getAsString();
 
-        String[] oriValue = oriLink.split("/");
-        String[] newValue = newLink.split("/");
+        String[] emValue = emLink.split("/");
+        String[] msgValue = msgLink.split("/");
 
-        Message oriMessage, newMessage;
+        Message emMessage, msgMessage;
         try {
-            TextChannel oriChannel = event.getGuild().getTextChannelById(oriValue[5]);
-            oriMessage = oriChannel.retrieveMessageById(oriValue[6]).complete();
+            TextChannel emChannel = event.getGuild().getTextChannelById(emValue[5]);
+            emMessage = emChannel.retrieveMessageById(emValue[6]).complete();
         } catch (Exception e) {
             event.replyEmbeds(Embeds.emptyError("```" + e.getMessage() + "```", event.getUser())).setEphemeral(Constants.ERR_EPHEMERAL).queue();
             return;
         }
 
         try {
-            TextChannel newChannel = event.getGuild().getTextChannelById(newValue[5]);
-            newMessage = newChannel.retrieveMessageById(newValue[6]).complete();
+            TextChannel msgChannel = event.getGuild().getTextChannelById(msgValue[5]);
+            msgMessage = msgChannel.retrieveMessageById(msgValue[6]).complete();
         } catch (Exception e) {
             event.replyEmbeds(Embeds.emptyError("```" + e.getMessage() + "```", event.getUser())).setEphemeral(Constants.ERR_EPHEMERAL).queue();
             return;
         }
 
+        OptionMapping embedOption = event.getOption("title");
+        String title = embedOption == null ? emMessage.getEmbeds().get(0).getTitle() : embedOption.getAsString();
+
             EmbedBuilder eb = new EmbedBuilder()
-                    .setColor(oriMessage.getEmbeds().get(0).getColor())
-                    .setDescription(newMessage.getContentRaw());
+                    .setColor(emMessage.getEmbeds().get(0).getColor())
+                    .setTitle(title)
+                    .setDescription(msgMessage.getContentRaw());
 
-            oriMessage.editMessageEmbeds(eb.build()).queue();
+            emMessage.editMessageEmbeds(eb.build()).queue();
             event.reply("Done!").setEphemeral(true).queue();
     }
 
@@ -76,7 +80,9 @@ void editEmbed(SlashCommandEvent event) {
             return;
         }
 
-        String title = event.getOption("title").getAsString();
+        OptionMapping embedOption = event.getOption("title");
+        String title = embedOption == null ? message.getEmbeds().get(0).getTitle() : embedOption.getAsString();
+
         String description = event.getOption("description").getAsString();
 
         EmbedBuilder eb = new EmbedBuilder()
diff --git a/src/main/java/com/javadiscord/javabot/commands/moderation/Embed.java b/src/main/java/com/javadiscord/javabot/commands/moderation/Embed.java
@@ -7,6 +7,7 @@
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 
@@ -29,21 +30,31 @@ public void handle(SlashCommandEvent event) {
     }
 
     void createEmbedFromLink(SlashCommandEvent event) {
-        MessageChannel channel = event.getOption("channel").getAsMessageChannel();
-        String messageID = event.getOption("message-id").getAsString();
+
+        String link = event.getOption("link").getAsString();
+        String[] value = link.split("/");
+
+        Message message;
 
         try {
-        Message message = channel.retrieveMessageById(messageID).complete();
+            TextChannel channel = event.getGuild().getTextChannelById(value[5]);
+            message = channel.retrieveMessageById(value[6]).complete();
+        } catch (Exception e) {
+            event.replyEmbeds(Embeds.emptyError("```" + e.getMessage() + "```", event.getUser())).setEphemeral(Constants.ERR_EPHEMERAL).queue();
+            return;
+        }
+
+        OptionMapping embedOption = event.getOption("title");
+        String title = embedOption == null ? null : embedOption.getAsString();
 
-        var e = new EmbedBuilder()
+        var eb = new EmbedBuilder()
                 .setColor(Constants.GRAY)
+                .setTitle(title)
                 .setDescription(message.getContentRaw())
                 .build();
 
-        event.getChannel().sendMessageEmbeds(e).queue();
+        event.getChannel().sendMessageEmbeds(eb).queue();
         event.reply("Done!").setEphemeral(true).queue();
-
-        } catch (Exception e) { event.replyEmbeds(Embeds.emptyError("```" + e.getMessage() + "```", event.getUser())).setEphemeral(Constants.ERR_EPHEMERAL).queue(); }
     }
 
     void createEmbed(SlashCommandEvent event) {
@@ -80,14 +91,8 @@ void createEmbed(SlashCommandEvent event) {
                 eb.setAuthor(authorname, url, iconurl);
                 eb.setImage(img);
                 eb.setThumbnail(thumb);
+                eb.setColor(Color.decode(color));
 
-                if (!(color == null)) {
-                    try {
-                        eb.setColor(Color.decode(color));
-                    } catch (Exception e) {
-                        eb.setColor(Constants.GRAY);
-                    }
-                }
 
                 event.replyEmbeds(eb.build()).queue();
 
diff --git a/src/main/resources/commands.yaml b/src/main/resources/commands.yaml
@@ -74,13 +74,14 @@
       name: edit
       options:
         - { description: Link of the original Message, name: link, required: true, type: STRING }
-        - { description: Title of the embed, name: title, required: true, type: STRING }
         - { description: Description of the embed, name: description, required: true, type: STRING }
+        - { description: Title of the embed, name: title, required: false, type: STRING }
     - description: Edits an Embed from a Message
       name: from-message
       options:
-        - { description: Link of the original Message, name: original-link, required: true, type: STRING }
-        - { description: Link of the new Message, name: new-link, required: true, type: STRING }
+        - { description: Link of the original Message, name: embed-link, required: true, type: STRING }
+        - { description: Link of the new Message, name: message-link, required: true, type: STRING }
+        - { description: Title of the embed, name: title, required: false, type: STRING }
 - description: Sends an embed
   name: embed
   handler: com.javadiscord.javabot.commands.moderation.Embed
@@ -102,8 +103,8 @@
     - description: Created a new Embed from a Message
       name: from-message
       options:
-        - { description: Channel of the original Message, name: channel, required: true, type: CHANNEL }
-        - { description: ID of the original Message, name: message-id, required: true, type: STRING }
+        - { description: Link of the original Message, name: link, required: true, type: STRING }
+        - { description: Title of the embed, name: title, required: false, type: STRING }
 - description: Kicks a member
   name: kick
   handler: com.javadiscord.javabot.commands.moderation.Kick
