refactoring automod for easier reading

more null checks
L48djvzjv · Jul 6, 2021 · b831516 · b831516
1 parent cbf50be
commit b831516
Show file tree

Hide file tree

Showing 6 changed files with 221 additions and 188 deletions.
diff --git a/src/main/java/com/jagrosh/vortex/Listener.java b/src/main/java/com/jagrosh/vortex/Listener.java
@@ -17,7 +17,6 @@
 
 import com.jagrosh.vortex.logging.MessageCache.CachedMessage;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import net.dv8tion.jda.api.JDA.ShardInfo;
 import net.dv8tion.jda.api.entities.Message;
@@ -146,7 +145,7 @@ else if (event instanceof GuildMemberRoleAddEvent)
 
             // Signal the modlogger if someone was muted
             Role mRole = vortex.getDatabase().settings.getSettings(gmrae.getGuild()).getMutedRole(gmrae.getGuild());
-            if(gmrae.getRoles().contains(mRole))
+            if(mRole != null && gmrae.getRoles().contains(mRole))
                 vortex.getModLogger().setNeedUpdate(gmrae.getGuild());
         }
         else if (event instanceof GuildMemberRoleRemoveEvent)
@@ -155,7 +154,7 @@ else if (event instanceof GuildMemberRoleRemoveEvent)
 
             // Signal the modlogger if someone was unmuted
             Role mRole = vortex.getDatabase().settings.getSettings(gmrre.getGuild()).getMutedRole(gmrre.getGuild());
-            if(gmrre.getRoles().contains(mRole))
+            if(mRole != null && gmrre.getRoles().contains(mRole))
             {
                 vortex.getDatabase().tempmutes.removeMute(gmrre.getGuild(), gmrre.getUser().getIdLong());
                 vortex.getModLogger().setNeedUpdate(gmrre.getGuild());