From 112ea391ba8f09a3ea8350fc8ccc489519d90fb1 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 5 Oct 2020 13:15:58 +0000
Subject: [PATCH 1/4] Bump JDA from 4.2.0_207 to 4.2.0_208

Bumps JDA from 4.2.0_207 to 4.2.0_208.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0fae6af..215d500 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>4.2.0_207</version>
+            <version>4.2.0_208</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>

From 750dfaeebd03a9640df59f6f77a6d50ac9e3fdd4 Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 13:19:46 +0000
Subject: [PATCH 2/4] Bump JDA from 4.2.0_208 to 4.2.0_209

Bumps JDA from 4.2.0_208 to 4.2.0_209.

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 215d500..67e95f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>net.dv8tion</groupId>
             <artifactId>JDA</artifactId>
-            <version>4.2.0_208</version>
+            <version>4.2.0_209</version>
         </dependency>
         <dependency>
             <groupId>org.json</groupId>

From 656cce485132f8f05405bcc804d42b28c7c49f13 Mon Sep 17 00:00:00 2001
From: Greg <gregtcltk@gmail.com>
Date: Tue, 13 Oct 2020 22:37:14 +0200
Subject: [PATCH 3/4] Fix minor bug

---
 .../hadder/listener/InviteLinkListener.java   | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
index d0d8b13..f845009 100644
--- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
+++ b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
@@ -43,7 +43,7 @@ public class InviteLinkListener extends ListenerAdapter {
 
     @Override
     public void onMessageReceived(@Nonnull MessageReceivedEvent e) {
-        scanMessage(e.isFromType(ChannelType.TEXT), e.getGuild(), e.getMessage(), e.getMember());
+        if (e.isFromType(ChannelType.TEXT)) scanMessage(e.getGuild(), e.getMessage(), e.getMember());
     }
 
     public void checkInvite(Message message, String regex) {
@@ -64,19 +64,17 @@ public class InviteLinkListener extends ListenerAdapter {
 
     @Override
     public void onMessageUpdate(@Nonnull MessageUpdateEvent e) {
-        scanMessage(e.isFromType(ChannelType.TEXT), e.getGuild(), e.getMessage(), e.getMember());
+        if (e.isFromType(ChannelType.TEXT)) scanMessage(e.getGuild(), e.getMessage(), e.getMember());
     }
 
-    public void scanMessage(boolean fromType, Guild guild, Message message, Member member) {
-        if (fromType) {
-            RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", guild.getId()), rethink);
-            if (message.getContentRaw().contains("discord.gg/") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) {
-                checkInvite(message, "discord.gg/");
-            } else if (message.getContentRaw().contains("discord.com/invite") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) {
-                checkInvite(message, "discord.com/invite/");
-            } else if (message.getContentRaw().contains("discordapp.com/invite") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) {
-                checkInvite(message, "discordapp.com/invite/");
-            }
+    public void scanMessage(Guild guild, Message message, Member member) {
+        RethinkServer rethinkServer = new RethinkServer(rethink.getObjectByID("server", guild.getId()), rethink);
+        if (message.getContentRaw().contains("discord.gg/") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) {
+            checkInvite(message, "discord.gg/");
+        } else if (message.getContentRaw().contains("discord.com/invite") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) {
+            checkInvite(message, "discord.com/invite/");
+        } else if (message.getContentRaw().contains("discordapp.com/invite") && !member.hasPermission(Permission.ADMINISTRATOR) && rethinkServer.hasInviteDetect()) {
+            checkInvite(message, "discordapp.com/invite/");
         }
     }
 }

From a0e4a950282563537ed57f9b1413dff83ef8f5bc Mon Sep 17 00:00:00 2001
From: Greg <gregtcltk@gmail.com>
Date: Tue, 13 Oct 2020 22:42:50 +0200
Subject: [PATCH 4/4] Bump Hadder verison

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 67e95f8..28a2f3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>Hadder</groupId>
     <artifactId>Hadder</artifactId>
-    <version>1.3.17</version>
+    <version>1.3.18</version>
     <name>Hadder</name>
     <inceptionYear>2019</inceptionYear>
     <description>Hadder is a multi-purpose Discord bot.</description>