added 🗑️ Delete Button to Submission Messages, added Error handling in Config.java & WelcomeSystem.java

Author: jasonlessenich

src/main/java/com/javadiscord/javabot/commands/configuation/config/Config.java

@@ -1,13 +1,18 @@
 package com.javadiscord.javabot.commands.configuation.config;
 
 import com.javadiscord.javabot.commands.DelegatingCommandHandler;
+import com.javadiscord.javabot.commands.Responses;
 import com.javadiscord.javabot.commands.configuation.config.subcommands.*;
+import com.javadiscord.javabot.commands.moderation.Embed;
 import com.javadiscord.javabot.other.Constants;
 import com.javadiscord.javabot.other.Embeds;
+import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyAction;
 
+import java.util.Date;
+
 // TODO: Replace with file-based config or at least something much less convoluted.
 @Deprecated(forRemoval = true)
 public class Config extends DelegatingCommandHandler {
@@ -37,7 +42,8 @@ public ReplyAction handle(SlashCommandEvent event) {
             return event.replyEmbeds(Embeds.permissionError("ADMINISTRATOR", event)).setEphemeral(Constants.ERR_EPHEMERAL);
         }
 
-        return super.handle(event);
+        try { return super.handle(event);
+        } catch (Exception e) { return Responses.error(event, "```" + e.getMessage() + "```"); }
     }
 }
 

src/main/java/com/javadiscord/javabot/commands/configuation/welcome_system/WelcomeSystem.java

@@ -1,6 +1,7 @@
 package com.javadiscord.javabot.commands.configuation.welcome_system;
 
 import com.javadiscord.javabot.commands.DelegatingCommandHandler;
+import com.javadiscord.javabot.commands.Responses;
 import com.javadiscord.javabot.commands.configuation.welcome_system.subcommands.*;
 import com.javadiscord.javabot.other.Constants;
 import com.javadiscord.javabot.other.Embeds;
@@ -33,7 +34,8 @@ public ReplyAction handle(SlashCommandEvent event) {
         if (!event.getMember().hasPermission(Permission.ADMINISTRATOR)) {
             return event.replyEmbeds(Embeds.permissionError("ADMINISTRATOR", event)).setEphemeral(Constants.ERR_EPHEMERAL);
         }
-        return super.handle(event);
+        try { return super.handle(event);
+        } catch (Exception e) { return Responses.error(event, "```" + e.getMessage() + "```"); }
     }
 }
 

src/main/java/com/javadiscord/javabot/events/ButtonClickListener.java

@@ -55,6 +55,7 @@ private void handleSubmission(MongoDatabase database, Guild guild, ButtonClickEv
 		switch (id[1]) {
 			case "approve" -> new SubmissionListener().submissionApprove(event, userID);
 			case "decline" -> new SubmissionListener().submissionDecline(event);
+			case "delete" -> new SubmissionListener().submissionDelete(event);
 		}
 		submissionMessages.deleteOne(document);
 	}

src/main/java/com/javadiscord/javabot/events/SubmissionListener.java

@@ -8,6 +8,7 @@
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoDatabase;
 import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.Emoji;
 import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.events.interaction.ButtonClickEvent;
@@ -41,7 +42,8 @@ public void dmSubmissionSend (ButtonClickEvent event, String text) {
 
         Bot.config.get(guild).getQotw().getSubmissionChannel().sendMessageEmbeds(eb).setActionRows(ActionRow.of(
                 Button.success("submission:approve:" + event.getUser().getId(), "Approve"),
-                Button.danger("submission:decline:" + event.getUser().getId(), "Decline")))
+                Button.danger("submission:decline:" + event.getUser().getId(), "Decline"),
+                Button.secondary("submission:delete:" + event.getUser().getId(), "🗑️")))
                 .queue(m -> {
 
                     MongoCollection<Document> submission_messages = database.getCollection("submission_messages");
@@ -88,6 +90,11 @@ public void submissionDecline (ButtonClickEvent event) {
                 .queue();
     }
 
+    public void submissionDelete (ButtonClickEvent event) {
+
+        event.getHook().deleteOriginal().queue();
+    }
+
     @Override
     public void onPrivateMessageReceived(PrivateMessageReceivedEvent event) {
         if (event.getAuthor().isBot()) return;