removed MongoDB Config Getters & Setters (-> file-based config), renamed queryMember to setMemberEntry, made Correct#correct not static & added Guild-check to Warns#warnCount

Author: jasonlessenich

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

@@ -3,16 +3,12 @@
 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 {

src/main/java/com/javadiscord/javabot/commands/moderation/ClearWarns.java

@@ -23,7 +23,7 @@ public ReplyAction handle(SlashCommandEvent event) {
 
         Member member = event.getOption("user").getAsMember();
 
-        new Database().queryMember(member.getId(), "warns", 0);
+        new Database().setMemberEntry(member.getId(), "warns", 0);
         new Warn().deleteAllDocs(member.getId());
 
         var e = new EmbedBuilder()

src/main/java/com/javadiscord/javabot/commands/moderation/Kick.java

@@ -44,7 +44,7 @@ public ReplyAction handle(SlashCommandEvent event) {
         try {
 
             member.kick(reason).queueAfter(3, TimeUnit.SECONDS);
-            new Database().queryMember(member.getId(), "warns", 0);
+            new Database().setMemberEntry(member.getId(), "warns", 0);
 
             new Warn().deleteAllDocs(member.getId());
 

src/main/java/com/javadiscord/javabot/commands/moderation/Warns.java

@@ -4,6 +4,7 @@
 import com.google.gson.JsonParser;
 import com.javadiscord.javabot.commands.SlashCommandHandler;
 import com.javadiscord.javabot.other.Constants;
+import com.mongodb.BasicDBObject;
 import com.mongodb.client.MongoCollection;
 import com.mongodb.client.MongoCursor;
 import com.mongodb.client.MongoDatabase;
@@ -25,7 +26,11 @@ public long warnCount (Member member) {
         MongoDatabase database = mongoClient.getDatabase("userdata");
         MongoCollection<Document> warns = database.getCollection("warns");
 
-        return warns.countDocuments(eq("user_id", member.getId()));
+        BasicDBObject criteria = new BasicDBObject()
+                .append("guild_id", member.getGuild().getId())
+                .append("user_id", member.getId());
+
+        return warns.countDocuments(criteria);
     }
 
     @Override

src/main/java/com/javadiscord/javabot/commands/other/Question.java

@@ -15,7 +15,6 @@
 import net.dv8tion.jda.api.requests.restaction.interactions.ReplyAction;
 import org.bson.Document;
 
-import java.util.Arrays;
 import java.util.List;
 
 import static com.javadiscord.javabot.events.Startup.mongoClient;

src/main/java/com/javadiscord/javabot/commands/other/qotw/ClearQOTW.java

@@ -20,7 +20,7 @@ public ReplyAction handle(SlashCommandEvent event) {
         }
 
         Member member = event.getOption("user").getAsMember();
-        new Database().queryMember(member.getId(), "qotwpoints", 0);
+        new Database().setMemberEntry(member.getId(), "qotwpoints", 0);
             var e = new EmbedBuilder()
                 .setAuthor(member.getUser().getAsTag() + " | QOTW-Points cleared", null, member.getUser().getEffectiveAvatarUrl())
                 .setColor(Constants.RED)

src/main/java/com/javadiscord/javabot/commands/other/qotw/Correct.java

@@ -1,47 +1,40 @@
 package com.javadiscord.javabot.commands.other.qotw;
 
-import com.javadiscord.javabot.Bot;
 import com.javadiscord.javabot.other.Constants;
 import com.javadiscord.javabot.other.Database;
-import com.javadiscord.javabot.other.Embeds;
+import com.javadiscord.javabot.other.Misc;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.Member;
-import net.dv8tion.jda.api.entities.TextChannel;
 import net.dv8tion.jda.api.events.interaction.ButtonClickEvent;
 
 import java.util.Date;
 
 public class Correct {
 
-    public static void correct(ButtonClickEvent event, Member member) {
+    public void correct(ButtonClickEvent event, Member member) {
 
-        String check;
-        TextChannel tc = Bot.config.get(event.getGuild()).getModeration().getLogChannel();
-        check = event.getGuild().getEmotesByName("check", false).get(0).getAsMention();
+        int qotwPoints = new Database().getMemberInt(member, "qotwpoints") + 1;
+        new Database().setMemberEntry(member.getId(), "qotwpoints", qotwPoints);
 
-        int qotwPoints = new Database().getMemberInt(member, "qotwpoints");
-        new Database().queryMember(member.getId(), "qotwpoints", qotwPoints + 1);
-
-        EmbedBuilder eb = new EmbedBuilder()
-                .setAuthor("Question of the Week", null, member.getUser().getEffectiveAvatarUrl())
+        var eb = new EmbedBuilder()
+                .setAuthor(member.getUser().getAsTag() + " | QOTW-Point added", null, member.getUser().getEffectiveAvatarUrl())
                 .setColor(Constants.GREEN)
-                .setDescription("Your answer was correct! " + check + "\nYou've been granted **1 QOTW-Point!** (Total: " + (qotwPoints + 1) + ")")
-                .setTimestamp(new Date().toInstant());
-
-        try {
-            member.getUser().openPrivateChannel().complete().sendMessage(eb.build()).queue();
-
-            EmbedBuilder emb = new EmbedBuilder()
-                    .setAuthor(member.getUser().getAsTag() + " | QOTW-Point added", null, member.getUser().getEffectiveAvatarUrl())
-                    .setColor(Constants.GREEN)
-                    .addField("Total QOTW-Points", "```" + (qotwPoints + 1) + "```", true)
-                    .addField("Rank", "```#" + new Leaderboard().getQOTWRank(event.getGuild(), member.getId()) + "```", true)
-                    .setFooter("ID: " + member.getId())
-                    .setTimestamp(new Date().toInstant());
-            tc.sendMessageEmbeds(emb.build()).queue();
-
-        } catch (Exception e) {
-            tc.sendMessageEmbeds(Embeds.emptyError("```Couldn't send message <:abort:759740784882089995> (" + member.getUser().getAsTag() + ")```", event.getUser())).queue();
-        }
+                .addField("Total QOTW-Points", "```" + qotwPoints + "```", true)
+                .addField("Rank", "```#" + new Leaderboard().getQOTWRank(event.getGuild(), member.getId()) + "```", true)
+                .setFooter("ID: " + member.getId())
+                .setTimestamp(new Date().toInstant())
+                .build();
+        Misc.sendToLog(event.getGuild(), eb);
+
+        if (!member.getUser().hasPrivateChannel()) Misc.sendToLog(event.getGuild(), "> Couldn't send Message to User " + member.getUser().getAsTag());
+        member.getUser().openPrivateChannel().complete()
+                .sendMessageEmbeds(new EmbedBuilder()
+                        .setAuthor("Question of the Week", null, member.getUser().getEffectiveAvatarUrl())
+                        .setColor(Constants.GREEN)
+                        .setDescription("Your answer was correct! " + Constants.SUCCESS +
+                                "\nYou've been granted **1 QOTW-Point!** (Total: " + qotwPoints + ")")
+                        .setTimestamp(new Date().toInstant())
+                        .build())
+                .queue();
     }
 }

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

@@ -8,7 +8,6 @@
 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;
@@ -73,7 +72,7 @@ public void dmSubmissionCancel (ButtonClickEvent event) {
 
     public void submissionApprove (ButtonClickEvent event, String userID) {
 
-        Correct.correct(event, event.getGuild().getMemberById(userID));
+        new Correct().correct(event, event.getGuild().getMemberById(userID));
 
         event.getHook().editOriginalEmbeds(event.getMessage().getEmbeds().get(0))
                 .setActionRows(ActionRow.of(
@@ -100,16 +99,11 @@ public void onPrivateMessageReceived(PrivateMessageReceivedEvent event) {
         if (event.getAuthor().isBot()) return;
 
         String message = event.getMessage().getContentDisplay();
-        String[] args = message.split("\\s+");
-
-        if (args[0].startsWith("!")) return;
-
         Guild guild = Startup.preferredGuild;
 
             if (!Bot.config.get(guild).getQotw().isDmEnabled()) return;
 
                 try {
-
                     EmbedBuilder submissionEb = new EmbedBuilder()
                             .setColor(Constants.GRAY)
                             .setAuthor("Question of the Week | Submission", null, event.getAuthor().getEffectiveAvatarUrl())
@@ -149,67 +143,7 @@ public void onPrivateMessageReceived(PrivateMessageReceivedEvent event) {
 
                                     collection.insertOne(doc);
                                 });
-
-//                    EventWaiter waiter = new EventWaiter();
-//                    event.getJDA().addEventListener(waiter);
-//
-//                    waiter.waitForEvent(
-//                            ButtonClickEvent.class,
-//
-//                            e -> e.getChannel().getType() == ChannelType.PRIVATE,
-//
-//                            e -> {
-//
-//                                String[] id = e.getComponentId().split(":");
-//                                String authorId = id[0];
-//
-//                                if (!authorId.equals(e.getUser().getId())) return;
-//
-//                                switch (id[2]) {
-//
-//                                    case "send":
-//
-//                                        EmbedBuilder submittedEb = new EmbedBuilder()
-//                                                .setColor(Constants.GRAY)
-//                                                .setAuthor("Submission by " + e.getUser().getAsTag(), null, e.getUser().getEffectiveAvatarUrl())
-//                                                .setDescription(message)
-//                                                .setFooter("ID: " + e.getUser().getId())
-//                                                .setTimestamp(new Date().toInstant());
-//
-//                                        submissionChannel.sendMessage(new MessageBuilder().setEmbed(submittedEb.build()).setActionRows(ActionRow.of(
-//                                                Button.success(e.getUser().getId() + ":submission:approve", "Approve"),
-//                                                Button.danger(e.getUser().getId() + ":submission:decline", "Decline"))).build())
-//
-//                                                .queue(m -> {
-//                                                    MongoCollection<Document> submission_messages = database.getCollection("submission_messages");
-//
-//                                                    Document doc = new Document()
-//                                                            .append("guild_id", m.getGuild().getId())
-//                                                            .append("channel_id", m.getChannel().getId())
-//                                                            .append("message_id", m.getId())
-//                                                            .append("user_id", event.getAuthor().getId());
-//
-//                                                    submission_messages.insertOne(doc);
-//                                                });
-//
-//                                        e.getHook().editOriginalEmbeds(e.getMessage().getEmbeds().get(0))
-//                                                .setActionRows(ActionRow.of(
-//                                                        Button.success(authorId + ":dm-submission:send", "Submission sent").asDisabled())
-//                                                )
-//                                                .queue();
-//                                        break;
-//
-//                                    case "cancel":
-//
-//                                        e.getHook().editOriginalEmbeds(e.getMessage().getEmbeds().get(0))
-//                                                .setActionRows(ActionRow.of(
-//                                                        Button.danger(authorId + ":dm-submission:cancel", "Process canceled").asDisabled())
-//                                                )
-//                                                .queue();
-//                                        break;
-//                                    }});
-
-                } catch (NullPointerException ignored) { }
+                } catch (NullPointerException e) { e.printStackTrace(); }
             }
     }
 

src/main/java/com/javadiscord/javabot/jam/subcommands/admin/ListThemesSubcommand.java

@@ -1,6 +1,5 @@
 package com.javadiscord.javabot.jam.subcommands.admin;
 
-import com.javadiscord.javabot.Bot;
 import com.javadiscord.javabot.jam.dao.JamThemeRepository;
 import com.javadiscord.javabot.jam.model.Jam;
 import com.javadiscord.javabot.jam.model.JamTheme;