Added Compatibility for the DefaultShardManagerBuilder

Took 14 minutes
JoshiCodes · Oct 11, 2022 · 6f20d5c · 6f20d5c
1 parent a579017
commit 6f20d5c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 
     <groupId>de.joshizockt</groupId>
     <artifactId>discordutils</artifactId>
-    <version>1.1.2</version>
+    <version>1.1.3</version>
 
     <properties>
         <maven.compiler.source>16</maven.compiler.source>

diff --git a/src/main/java/de/joshizockt/discordutils/modules/Module.java b/src/main/java/de/joshizockt/discordutils/modules/Module.java
@@ -1,9 +1,11 @@
 package de.joshizockt.discordutils.modules;
 
 import net.dv8tion.jda.api.JDABuilder;
+import net.dv8tion.jda.api.sharding.DefaultShardManagerBuilder;
 
 public interface Module {
 
     void init(JDABuilder builder);
+    void init(DefaultShardManagerBuilder builder);
 
 }
diff --git a/src/main/java/de/joshizockt/discordutils/modules/ModuleLoader.java b/src/main/java/de/joshizockt/discordutils/modules/ModuleLoader.java
@@ -1,17 +1,25 @@
 package de.joshizockt.discordutils.modules;
 
 import net.dv8tion.jda.api.JDABuilder;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import net.dv8tion.jda.api.sharding.DefaultShardManagerBuilder;
 
 public class ModuleLoader {
 
     public static void loadModules(JDABuilder builder, Module module, Module... modules) {
         module.init(builder);
-        for(Module m : modules) {
-            m.init(builder);
+        if(modules != null && modules.length >= 1) {
+            for(Module m : modules) {
+                m.init(builder);
+            }
+        }
+    }
+
+    public static void loadModules(DefaultShardManagerBuilder builder, Module module, Module... modules) {
+        module.init(builder);
+        if(modules != null && modules.length >= 1) {
+            for(Module m : modules) {
+                m.init(builder);
+            }
         }
     }
 

diff --git a/src/main/java/de/joshizockt/discordutils/modules/message/reaction/ReactionMessage.java b/src/main/java/de/joshizockt/discordutils/modules/message/reaction/ReactionMessage.java
@@ -11,6 +11,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 
 public abstract class ReactionMessage {
 
@@ -130,7 +131,7 @@ public ReactionMessage detect(TextChannel channel, boolean sendMessage) {
             for(Message msg : channel.getIterableHistory()) {
                 if(msg.getEmbeds().size() < 1) continue;
                 if(msg.getEmbeds().get(0).getTitle() == null) continue;
-                if(msg.getEmbeds().get(0).getTitle().equals(embed.getTitle())) {
+                if(Objects.equals(msg.getEmbeds().get(0).getTitle(), embed.getTitle())) {
                     ReactionMessage message = new ReactionMessage() {
                         @Override
                         MessageEmbed getEmbed() {

diff --git a/src/main/java/de/joshizockt/discordutils/modules/message/reaction/ReactionMessageModule.java b/src/main/java/de/joshizockt/discordutils/modules/message/reaction/ReactionMessageModule.java
@@ -11,6 +11,7 @@
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import net.dv8tion.jda.api.interactions.InteractionHook;
 import net.dv8tion.jda.api.interactions.components.buttons.Button;
+import net.dv8tion.jda.api.sharding.DefaultShardManagerBuilder;
 import org.jetbrains.annotations.NotNull;
 
 import java.awt.*;
@@ -28,6 +29,11 @@ public void init(JDABuilder builder) {
         builder.addEventListeners(this);
     }
 
+    @Override
+    public void init(DefaultShardManagerBuilder builder) {
+        builder.addEventListeners(this);
+    }
+
     public static void cacheMessage(ReactionMessage message) {
         cache.add(message);
     }