Removed Embed.java & old Permission Checks

Author: jasonlessenich

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

@@ -4,13 +4,15 @@
 import com.javadiscord.javabot.commands.Responses;
 import com.javadiscord.javabot.commands.configuation.config.subcommands.*;
 import com.javadiscord.javabot.other.Constants;
-import com.javadiscord.javabot.other.Embeds;
-import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.MessageEmbed;
 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)
+@Deprecated
 public class Config extends DelegatingCommandHandler {
     public Config() {
         addSubcommand("list", new GetList());
@@ -34,12 +36,19 @@ public Config() {
 
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
-        if (event.getMember() != null && !event.getMember().hasPermission(Permission.ADMINISTRATOR)) {
-            return event.replyEmbeds(Embeds.permissionError("ADMINISTRATOR", event)).setEphemeral(Constants.ERR_EPHEMERAL);
-        }
 
         try { return super.handle(event);
         } catch (Exception e) { return Responses.error(event, "```" + e.getMessage() + "```"); }
     }
+
+    public MessageEmbed configEmbed (String configName, String newValue) {
+        var embed = new EmbedBuilder()
+                .setColor(Constants.GRAY)
+                .setAuthor("Config: " + configName)
+                .setDescription("Successfully set ``" + configName + "`` to " + newValue)
+                .setTimestamp(new Date().toInstant())
+                .build();
+        return embed;
+    }
 }
 

src/main/java/com/javadiscord/javabot/commands/configuation/config/subcommands/SetDMQOTWStatus.java

@@ -1,8 +1,7 @@
 package com.javadiscord.javabot.commands.configuation.config.subcommands;
 
 import com.javadiscord.javabot.commands.SlashCommandHandler;
-import com.javadiscord.javabot.other.Database;
-import com.javadiscord.javabot.other.Embeds;
+import com.javadiscord.javabot.commands.configuation.config.Config;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyAction;
 
@@ -11,13 +10,9 @@ public class SetDMQOTWStatus implements SlashCommandHandler {
     public ReplyAction handle(SlashCommandEvent event) {
         boolean status = event.getOption("enabled").getAsBoolean();
         //new Database().queryConfig(event.getGuild().getId(), "other.qotw.dm-qotw", status);
-        return event.replyEmbeds(Embeds.configEmbed(
-                event,
-                "QOTW-DM Status",
-                "QOTW-DM Status successfully changed to",
-                null,
-                String.valueOf(status),
-                true
+        return event.replyEmbeds(new Config().configEmbed(
+                "DM-QOTW Status",
+                "`" + status + "`"
         ));
     }
 }

src/main/java/com/javadiscord/javabot/commands/configuation/config/subcommands/SetJamAdminRole.java

@@ -1,8 +1,7 @@
 package com.javadiscord.javabot.commands.configuation.config.subcommands;
 
 import com.javadiscord.javabot.commands.SlashCommandHandler;
-import com.javadiscord.javabot.other.Database;
-import com.javadiscord.javabot.other.Embeds;
+import com.javadiscord.javabot.commands.configuation.config.Config;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyAction;
@@ -12,15 +11,9 @@ public class SetJamAdminRole implements SlashCommandHandler {
     public ReplyAction handle(SlashCommandEvent event) {
         Role role = event.getOption("role").getAsRole();
         //new Database().queryConfig(event.getGuild().getId(), "roles.jam_admin_rid", role.getId());
-        return event.replyEmbeds(Embeds.configEmbed(
-                event,
+        return event.replyEmbeds(new Config().configEmbed(
                 "Jam Admin Role",
-                "Jam Admin Role successfully changed to",
-                null,
-                role.getId(),
-                true,
-                false,
-                true
+                role.getAsMention()
         ));
     }
 }

src/main/java/com/javadiscord/javabot/commands/configuation/config/subcommands/SetJamAnnouncementChannel.java

@@ -1,8 +1,7 @@
 package com.javadiscord.javabot.commands.configuation.config.subcommands;
 
 import com.javadiscord.javabot.commands.SlashCommandHandler;
-import com.javadiscord.javabot.other.Database;
-import com.javadiscord.javabot.other.Embeds;
+import com.javadiscord.javabot.commands.configuation.config.Config;
 import net.dv8tion.jda.api.entities.MessageChannel;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyAction;
@@ -12,6 +11,9 @@ public class SetJamAnnouncementChannel implements SlashCommandHandler {
     public ReplyAction handle(SlashCommandEvent event) {
         MessageChannel channel = event.getOption("channel").getAsMessageChannel();
         //new Database().queryConfig(event.getGuild().getId(), "channels.jam_announcement_cid", channel.getId());
-        return event.replyEmbeds(Embeds.configEmbed(event, "Jam Announcement Channel", "Jam Announcement Channel successfully changed to", null, channel.getId(), true, true));
+        return event.replyEmbeds(new Config().configEmbed(
+                "Jam Announcement Channel",
+                "<#" + channel.getId() + ">"
+        ));
     }
 }

src/main/java/com/javadiscord/javabot/commands/configuation/config/subcommands/SetJamPingRole.java

@@ -1,8 +1,7 @@
 package com.javadiscord.javabot.commands.configuation.config.subcommands;
 
 import com.javadiscord.javabot.commands.SlashCommandHandler;
-import com.javadiscord.javabot.other.Database;
-import com.javadiscord.javabot.other.Embeds;
+import com.javadiscord.javabot.commands.configuation.config.Config;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyAction;
@@ -12,6 +11,9 @@ public class SetJamPingRole implements SlashCommandHandler {
     public ReplyAction handle(SlashCommandEvent event) {
         Role role = event.getOption("role").getAsRole();
         //new Database().queryConfig(event.getGuild().getId(), "roles.jam_ping_rid", role.getId());
-        return event.replyEmbeds(Embeds.configEmbed(event, "Jam Ping Role", "Jam Ping Role successfully changed to", null, role.getId(), true, false, true));
+        return event.replyEmbeds(new Config().configEmbed(
+                "Jam Ping Role",
+                role.getAsMention()
+        ));
     }
 }

src/main/java/com/javadiscord/javabot/commands/configuation/config/subcommands/SetJamVoteChannel.java

@@ -1,8 +1,7 @@
 package com.javadiscord.javabot.commands.configuation.config.subcommands;
 
 import com.javadiscord.javabot.commands.SlashCommandHandler;
-import com.javadiscord.javabot.other.Database;
-import com.javadiscord.javabot.other.Embeds;
+import com.javadiscord.javabot.commands.configuation.config.Config;
 import net.dv8tion.jda.api.entities.MessageChannel;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyAction;
@@ -12,6 +11,9 @@ public class SetJamVoteChannel implements SlashCommandHandler {
     public ReplyAction handle(SlashCommandEvent event) {
         MessageChannel channel = event.getOption("channel").getAsMessageChannel();
         //new Database().queryConfig(event.getGuild().getId(), "channels.jam_vote_cid", channel.getId());
-        return event.replyEmbeds(Embeds.configEmbed(event, "Jam Vote Channel", "Jam Vote Channel successfully changed to", null, channel.getId(), true, true));
+        return event.replyEmbeds(new Config().configEmbed(
+                "Jam Vote Channel",
+                "<#" + channel.getId() + ">"
+        ));
     }
 }

src/main/java/com/javadiscord/javabot/commands/configuation/config/subcommands/SetLockStatus.java

@@ -1,8 +1,7 @@
 package com.javadiscord.javabot.commands.configuation.config.subcommands;
 
 import com.javadiscord.javabot.commands.SlashCommandHandler;
-import com.javadiscord.javabot.other.Database;
-import com.javadiscord.javabot.other.Embeds;
+import com.javadiscord.javabot.commands.configuation.config.Config;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyAction;
 
@@ -11,6 +10,9 @@ public class SetLockStatus implements SlashCommandHandler {
     public ReplyAction handle(SlashCommandEvent event) {
         boolean status = event.getOption("locked").getAsBoolean();
         //new Database().queryConfig(event.getGuild().getId(), "other.server_lock.lock_status", status);
-        return event.replyEmbeds(Embeds.configEmbed(event, "Lock Status changed", "Lock Status successfully changed to ", null, Boolean.toString(status), true));
+        return event.replyEmbeds(new Config().configEmbed(
+                "Lock Status",
+                "`" + status + "`"
+        ));
     }
 }

src/main/java/com/javadiscord/javabot/commands/configuation/config/subcommands/SetLogChannel.java

@@ -1,8 +1,7 @@
 package com.javadiscord.javabot.commands.configuation.config.subcommands;
 
 import com.javadiscord.javabot.commands.SlashCommandHandler;
-import com.javadiscord.javabot.other.Database;
-import com.javadiscord.javabot.other.Embeds;
+import com.javadiscord.javabot.commands.configuation.config.Config;
 import net.dv8tion.jda.api.entities.MessageChannel;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyAction;
@@ -12,6 +11,9 @@ public class SetLogChannel implements SlashCommandHandler {
     public ReplyAction handle(SlashCommandEvent event) {
         MessageChannel channel = event.getOption("channel").getAsMessageChannel();
         //new Database().queryConfig(event.getGuild().getId(), "channels.log_cid", channel.getId());
-        return event.replyEmbeds(Embeds.configEmbed(event, "Log Channel", "Log Channel successfully changed to", null, channel.getId(), true, true));
+        return event.replyEmbeds(new Config().configEmbed(
+                "Log Channel",
+                "<#" + channel.getId() + ">"
+        ));
     }
 }

src/main/java/com/javadiscord/javabot/commands/configuation/config/subcommands/SetMuteRole.java

@@ -1,8 +1,7 @@
 package com.javadiscord.javabot.commands.configuation.config.subcommands;
 
 import com.javadiscord.javabot.commands.SlashCommandHandler;
-import com.javadiscord.javabot.other.Database;
-import com.javadiscord.javabot.other.Embeds;
+import com.javadiscord.javabot.commands.configuation.config.Config;
 import net.dv8tion.jda.api.entities.Role;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyAction;
@@ -12,6 +11,9 @@ public class SetMuteRole implements SlashCommandHandler {
     public ReplyAction handle(SlashCommandEvent event) {
         Role role = event.getOption("role").getAsRole();
         //new Database().queryConfig(event.getGuild().getId(), "roles.mute_rid", role.getId());
-        return event.replyEmbeds(Embeds.configEmbed(event, "Mute Role", "Mute Role successfully changed to", null, role.getId(), true, false, true));
+        return event.replyEmbeds(new Config().configEmbed(
+                "Mute Role",
+                role.getAsMention()
+        ));
     }
 }

src/main/java/com/javadiscord/javabot/commands/configuation/config/subcommands/SetReportChannel.java

@@ -1,8 +1,7 @@
 package com.javadiscord.javabot.commands.configuation.config.subcommands;
 
 import com.javadiscord.javabot.commands.SlashCommandHandler;
-import com.javadiscord.javabot.other.Database;
-import com.javadiscord.javabot.other.Embeds;
+import com.javadiscord.javabot.commands.configuation.config.Config;
 import net.dv8tion.jda.api.entities.MessageChannel;
 import net.dv8tion.jda.api.events.interaction.SlashCommandEvent;
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyAction;
@@ -12,6 +11,9 @@ public class SetReportChannel implements SlashCommandHandler {
     public ReplyAction handle(SlashCommandEvent event) {
         MessageChannel channel = event.getOption("channel").getAsMessageChannel();
         //new Database().queryConfig(event.getGuild().getId(), "channels.report_cid", channel.getId());
-        return event.replyEmbeds(Embeds.configEmbed(event, "Report Channel", "Report Channel successfully changed to", null, channel.getId(), true, true));
+        return event.replyEmbeds(new Config().configEmbed(
+                "Report Channel",
+                "<#" + channel.getId() + ">"
+        ));
     }
 }