Database rework and Startup refactor

src/main/java/com/javadiscord/javabot/SlashCommands.java

@@ -143,7 +143,6 @@ private void updateCustomCommands(CommandListUpdateAction commandUpdateAction, G
 
     private void addCommandPrivileges(List<Command> commands, CommandConfig[] commandConfigs, Guild guild) throws ExecutionException, InterruptedException {
         log.info("Adding command privileges for Guild " + guild.getName());
-        var db = new Database();
         for (var config : commandConfigs) {
             Long commandId = null;
             for (Command command : commands) {
@@ -157,7 +156,7 @@ private void addCommandPrivileges(List<Command> commands, CommandConfig[] comman
             if (config.getPrivileges() != null && config.getPrivileges().length > 0) {
                 List<CommandPrivilege> p = new ArrayList<>();
                 for (var privilegeConfig : config.getPrivileges()) {
-                    p.add(privilegeConfig.toData(guild, db).get());
+                    p.add(privilegeConfig.toData(guild).get());
                     log.info("[{}] Registering privilege for command {}: {}",guild.getName(), config.getName(), Objects.toString(privilegeConfig));
                 }
                 guild.updateCommandPrivilegesById(cid, p).queue(commandPrivileges -> {

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

@@ -11,32 +11,29 @@ public class GetList implements SlashCommandHandler {
 
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
-
-        Database db = new Database();
-
         var eb = new EmbedBuilder()
                 .setColor(Constants.GRAY)
                 .setTitle("Bot Configuration")
 
-                .addField("Lock Status", "Locked: `" + db.getConfigBoolean(event.getGuild(), "other.server_lock.lock_status") + "`" +
-                        "\nCount: `" + db.getConfigInt(event.getGuild(), "other.server_lock.lock_count") + "/5`", true)
-
-                .addField("Question of the Week", "Submission Channel: " + db.getConfigChannelAsMention(event.getGuild(), "channels.submission_cid")
-                        + "\nSubmission-Status: `" + db.getConfigBoolean(event.getGuild(), "other.qotw.dm-qotw") + "`", true)
-
-                .addField("Stats-Category", "Category-ID: `" + db.getConfigString(event.getGuild(), "other.stats_category.stats_cid") + "`" +
-                        "\nText: `" + db.getConfigString(event.getGuild(), "other.stats_category.stats_text") + "`", false)
-
-                .addField("Channel & Roles", "Report Channel: " + db.getConfigChannelAsMention(event.getGuild(), "channels.report_cid") +
-                        ", Log Channel: " + db.getConfigChannelAsMention(event.getGuild(), "channels.log_cid") +
-                        "\nSuggestion Channel: " + db.getConfigChannelAsMention(event.getGuild(), "channels.suggestion_cid") +
-                        ", Starboard Channel: " + db.getConfigChannelAsMention(event.getGuild(), "other.starboard.starboard_cid") +
-                        "\nJam Announcement Channel: " + db.getConfigChannelAsMention(event.getGuild(), "channels.jam_announcement_cid") +
-                        ", Jam Vote Channel: " + db.getConfigChannelAsMention(event.getGuild(), "channels.jam_vote_cid") +
-                        "\n\nMute Role: " + db.getConfigRoleAsMention(event.getGuild(), "roles.mute_rid") +
-                        ", Staff Role: " + db.getConfigRoleAsMention(event.getGuild(), "roles.staff_rid") +
-                        ", Jam-Admin Role: " + db.getConfigRoleAsMention(event.getGuild(), "roles.jam_admin_rid") +
-                        ", Jam-Ping Role: " + db.getConfigRoleAsMention(event.getGuild(), "roles.jam_ping_rid"), false)
+                .addField("Lock Status", "Locked: `" + Database.getConfigBoolean(event.getGuild(), "other.server_lock.lock_status") + "`" +
+                        "\nCount: `" + Database.getConfigInt(event.getGuild(), "other.server_lock.lock_count") + "/5`", true)
+
+                .addField("Question of the Week", "Submission Channel: " + Database.getConfigChannelAsMention(event.getGuild(), "channels.submission_cid")
+                        + "\nSubmission-Status: `" + Database.getConfigBoolean(event.getGuild(), "other.qotw.dm-qotw") + "`", true)
+
+                .addField("Stats-Category", "Category-ID: `" + Database.getConfigString(event.getGuild(), "other.stats_category.stats_cid") + "`" +
+                        "\nText: `" + Database.getConfigString(event.getGuild(), "other.stats_category.stats_text") + "`", false)
+
+                .addField("Channel & Roles", "Report Channel: " + Database.getConfigChannelAsMention(event.getGuild(), "channels.report_cid") +
+                        ", Log Channel: " + Database.getConfigChannelAsMention(event.getGuild(), "channels.log_cid") +
+                        "\nSuggestion Channel: " + Database.getConfigChannelAsMention(event.getGuild(), "channels.suggestion_cid") +
+                        ", Starboard Channel: " + Database.getConfigChannelAsMention(event.getGuild(), "other.starboard.starboard_cid") +
+                        "\nJam Announcement Channel: " + Database.getConfigChannelAsMention(event.getGuild(), "channels.jam_announcement_cid") +
+                        ", Jam Vote Channel: " + Database.getConfigChannelAsMention(event.getGuild(), "channels.jam_vote_cid") +
+                        "\n\nMute Role: " + Database.getConfigRoleAsMention(event.getGuild(), "roles.mute_rid") +
+                        ", Staff Role: " + Database.getConfigRoleAsMention(event.getGuild(), "roles.staff_rid") +
+                        ", Jam-Admin Role: " + Database.getConfigRoleAsMention(event.getGuild(), "roles.jam_admin_rid") +
+                        ", Jam-Ping Role: " + Database.getConfigRoleAsMention(event.getGuild(), "roles.jam_ping_rid"), false)
                 .build();
 
         return event.replyEmbeds(eb);

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

@@ -10,7 +10,7 @@ public class SetDMQOTWStatus implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         boolean status = event.getOption("enabled").getAsBoolean();
-        new Database().queryConfig(event.getGuild().getId(), "other.qotw.dm-qotw", status);
+        Database.queryConfig(event.getGuild().getId(), "other.qotw.dm-qotw", status);
         return event.replyEmbeds(Embeds.configEmbed(
                 event,
                 "QOTW-DM Status",

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

@@ -11,7 +11,7 @@ public class SetJamAdminRole implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         Role role = event.getOption("role").getAsRole();
-        new Database().queryConfig(event.getGuild().getId(), "roles.jam_admin_rid", role.getId());
+        Database.queryConfig(event.getGuild().getId(), "roles.jam_admin_rid", role.getId());
         return event.replyEmbeds(Embeds.configEmbed(
                 event,
                 "Jam Admin Role",

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

@@ -11,7 +11,7 @@ public class SetJamAnnouncementChannel implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         MessageChannel channel = event.getOption("channel").getAsMessageChannel();
-        new Database().queryConfig(event.getGuild().getId(), "channels.jam_announcement_cid", channel.getId());
+        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));
     }
 }

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

@@ -11,7 +11,7 @@ public class SetJamPingRole implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         Role role = event.getOption("role").getAsRole();
-        new Database().queryConfig(event.getGuild().getId(), "roles.jam_ping_rid", role.getId());
+        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));
     }
 }

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

@@ -11,7 +11,7 @@ public class SetJamVoteChannel implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         MessageChannel channel = event.getOption("channel").getAsMessageChannel();
-        new Database().queryConfig(event.getGuild().getId(), "channels.jam_vote_cid", channel.getId());
+        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));
     }
 }

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

@@ -10,7 +10,7 @@ public class SetLockStatus implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         boolean status = event.getOption("locked").getAsBoolean();
-        new Database().queryConfig(event.getGuild().getId(), "other.server_lock.lock_status", status);
+        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));
     }
 }

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

@@ -11,7 +11,7 @@ public class SetLogChannel implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         MessageChannel channel = event.getOption("channel").getAsMessageChannel();
-        new Database().queryConfig(event.getGuild().getId(), "channels.log_cid", channel.getId());
+        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));
     }
 }

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

@@ -11,7 +11,7 @@ public class SetMuteRole implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         Role role = event.getOption("role").getAsRole();
-        new Database().queryConfig(event.getGuild().getId(), "roles.mute_rid", role.getId());
+        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));
     }
 }

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

@@ -11,7 +11,7 @@ public class SetReportChannel implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         MessageChannel channel = event.getOption("channel").getAsMessageChannel();
-        new Database().queryConfig(event.getGuild().getId(), "channels.report_cid", channel.getId());
+        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));
     }
 }

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

@@ -11,7 +11,7 @@ public class SetStaffRole implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         Role role = event.getOption("role").getAsRole();
-        new Database().queryConfig(event.getGuild().getId(), "roles.staff_rid", role.getId());
+        Database.queryConfig(event.getGuild().getId(), "roles.staff_rid", role.getId());
         return event.replyEmbeds(Embeds.configEmbed(event, "Staff Role", "Staff Role successfully changed to", null, role.getId(), true, false, true));
     }
 }

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

@@ -11,7 +11,7 @@ public class SetStarboardChannel implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         MessageChannel channel = event.getOption("channel").getAsMessageChannel();
-        new Database().queryConfig(event.getGuild().getId(), "other.starboard.starboard_cid", channel.getId());
+        Database.queryConfig(event.getGuild().getId(), "other.starboard.starboard_cid", channel.getId());
         return event.replyEmbeds(Embeds.configEmbed(event, "Starboard Channel", "Starboard Channel successfully changed to", null, channel.getId(), true, true));
     }
 }

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

@@ -11,7 +11,7 @@ public class SetStatsCategory implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         String id = event.getOption("id").getAsString();
-        new Database().queryConfig(event.getGuild().getId(), "other.stats_category.stats_cid", id);
+        Database.queryConfig(event.getGuild().getId(), "other.stats_category.stats_cid", id);
         return event.replyEmbeds(Embeds.configEmbed(event, "Stats-Category ID", "Stats-Category ID successfully changed to", null, id, true));
     }
 }

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

@@ -11,7 +11,7 @@ public class SetStatsMessage implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         String message = event.getOption("message").getAsString();
-        new Database().queryConfig(event.getGuild().getId(), "other.stats_category.stats_text", message);
+        Database.queryConfig(event.getGuild().getId(), "other.stats_category.stats_text", message);
         return event.replyEmbeds(Embeds.configEmbed(event, "Stats-Category Message", "Stats-Category Message successfully changed to", null, message, true));
     }
 }

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

@@ -11,7 +11,7 @@ public class SetSubmissionChannel implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         MessageChannel channel = event.getOption("channel").getAsMessageChannel();
-        new Database().queryConfig(event.getGuild().getId(), "channels.submission_cid", channel.getId());
+        Database.queryConfig(event.getGuild().getId(), "channels.submission_cid", channel.getId());
         return event.replyEmbeds(Embeds.configEmbed(event, "QOTW-Submission Channel", "QOTW-Submission Channel successfully changed to", null, channel.getId(), true, true));
     }
 }

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

@@ -12,7 +12,7 @@ public class SetSuggestionChannel implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         MessageChannel channel = event.getOption("channel").getAsMessageChannel();
-        new Database().queryConfig(event.getGuild().getId(), "channels.suggestion_cid", channel.getId());
+        Database.queryConfig(event.getGuild().getId(), "channels.suggestion_cid", channel.getId());
         return event.replyEmbeds(Embeds.configEmbed(event, "Suggest Channel", "Suggest Channel successfully changed to", null, channel.getId(), true, true));
     }
 }

src/main/java/com/javadiscord/javabot/commands/configuation/welcome_system/subcommands/GetList.java

@@ -20,33 +20,31 @@ public ReplyAction handle(SlashCommandEvent event) {
     }
 
     private void send(SlashCommandEvent event) {
-        Database db = new Database();
-
         String status;
-        if (db.getConfigBoolean(event.getGuild(), "welcome_system.welcome_status")) status = "enabled";
+        if (Database.getConfigBoolean(event.getGuild(), "welcome_system.welcome_status")) status = "enabled";
         else status = "disabled";
 
         var eb = new EmbedBuilder()
                 .setTitle("Welcome System Configuration")
                 .setColor(Constants.GRAY)
 
-                .addField("Image", "Width, Height: `" + db.getConfigString(event.getGuild(), "welcome_system.image.imgW") +
-                        "`, `" + db.getConfigString(event.getGuild(), "welcome_system.image.imgH") +
-                        "`\n[Overlay](" + db.getConfigString(event.getGuild(), "welcome_system.image.overlayURL") +
-                        "), [Background](" + db.getConfigString(event.getGuild(), "welcome_system.image.bgURL") + ")", false)
+                .addField("Image", "Width, Height: `" + Database.getConfigString(event.getGuild(), "welcome_system.image.imgW") +
+                        "`, `" + Database.getConfigString(event.getGuild(), "welcome_system.image.imgH") +
+                        "`\n[Overlay](" + Database.getConfigString(event.getGuild(), "welcome_system.image.overlayURL") +
+                        "), [Background](" + Database.getConfigString(event.getGuild(), "welcome_system.image.bgURL") + ")", false)
 
-                .addField("Color", "Primary Color: `#" + Integer.toHexString(db.getConfigInt(event.getGuild(), "welcome_system.image.primCol")) +
-                        "`\nSecondary Color: `#" + Integer.toHexString(db.getConfigInt(event.getGuild(), "welcome_system.image.secCol")) + "`", true)
+                .addField("Color", "Primary Color: `#" + Integer.toHexString(Database.getConfigInt(event.getGuild(), "welcome_system.image.primCol")) +
+                        "`\nSecondary Color: `#" + Integer.toHexString(Database.getConfigInt(event.getGuild(), "welcome_system.image.secCol")) + "`", true)
 
-                .addField("Avatar Image", "Width, Height: `" + db.getConfigInt(event.getGuild(), "welcome_system.image.avatar.avW") +
-                        "`,`" + db.getConfigInt(event.getGuild(), "welcome_system.image.avatar.avH") +
-                        "`\nX, Y: `" + db.getConfigInt(event.getGuild(), "welcome_system.image.avatar.avX") +
-                        "`, `" + db.getConfigInt(event.getGuild(), "welcome_system.image.avatar.avY") + "`", true)
+                .addField("Avatar Image", "Width, Height: `" + Database.getConfigInt(event.getGuild(), "welcome_system.image.avatar.avW") +
+                        "`,`" + Database.getConfigInt(event.getGuild(), "welcome_system.image.avatar.avH") +
+                        "`\nX, Y: `" + Database.getConfigInt(event.getGuild(), "welcome_system.image.avatar.avX") +
+                        "`, `" + Database.getConfigInt(event.getGuild(), "welcome_system.image.avatar.avY") + "`", true)
 
-                .addField("Messages", "Join: `" + db.getConfigString(event.getGuild(), "welcome_system.join_msg") +
-                        "`\nLeave: `" + db.getConfigString(event.getGuild(), "welcome_system.leave_msg") + "`", false)
+                .addField("Messages", "Join: `" + Database.getConfigString(event.getGuild(), "welcome_system.join_msg") +
+                        "`\nLeave: `" + Database.getConfigString(event.getGuild(), "welcome_system.leave_msg") + "`", false)
 
-                .addField("Channel", db.getConfigChannelAsMention(event.getGuild(), "welcome_system.welcome_cid"), true)
+                .addField("Channel", Database.getConfigChannelAsMention(event.getGuild(), "welcome_system.welcome_cid"), true)
                 .addField("Status", "``" + status + "``", true);
 
         try {

src/main/java/com/javadiscord/javabot/commands/configuation/welcome_system/subcommands/SetAvatarHeight.java

@@ -11,7 +11,7 @@ public class SetAvatarHeight implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         int height = (int) event.getOption("height").getAsLong();
-        new Database().queryConfig(event.getGuild().getId(), "welcome_system.image.avatar.avH", height);
+        Database.queryConfig(event.getGuild().getId(), "welcome_system.image.avatar.avH", height);
         return event.replyEmbeds(Embeds.configEmbed(event, "Avatar Image Height", "Avatar Image Height successfully changed to ", null, String.valueOf(height), true));
     }
 }

src/main/java/com/javadiscord/javabot/commands/configuation/welcome_system/subcommands/SetAvatarWidth.java

@@ -11,7 +11,7 @@ public class SetAvatarWidth implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         int width = (int) event.getOption("width").getAsLong();
-        new Database().queryConfig(event.getGuild().getId(), "welcome_system.image.avatar.avW", width);
+        Database.queryConfig(event.getGuild().getId(), "welcome_system.image.avatar.avW", width);
         return event.replyEmbeds(Embeds.configEmbed(event, "Avatar Image Width", "Avatar Image Width successfully changed to ", null, String.valueOf(width), true));
     }
 }

src/main/java/com/javadiscord/javabot/commands/configuation/welcome_system/subcommands/SetAvatarX.java

@@ -11,7 +11,7 @@ public class SetAvatarX implements SlashCommandHandler {
     @Override
     public ReplyAction handle(SlashCommandEvent event) {
         int x = (int) event.getOption("x").getAsLong();
-        new Database().queryConfig(event.getGuild().getId(), "welcome_system.image.avatar.avX", x);
+        Database.queryConfig(event.getGuild().getId(), "welcome_system.image.avatar.avX", x);
         return event.replyEmbeds(Embeds.configEmbed(event, "Avatar Image (X-Pos)", "Avatar Image ``(X-Position)`` successfully changed to ", null, String.valueOf(x), true));
     }
 }