From f2f9abfdd0d0a830e5d64d0403586e96930dbbf3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 17 Nov 2020 13:18:01 +0000 Subject: [PATCH 1/4] Bump json from 20200518 to 20201115 Bumps [json](https://github.com/douglascrockford/JSON-java) from 20200518 to 20201115. - [Release notes](https://github.com/douglascrockford/JSON-java/releases) - [Commits](https://github.com/douglascrockford/JSON-java/commits) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2bbd6d1..75cb006 100644 --- a/pom.xml +++ b/pom.xml @@ -74,7 +74,7 @@ org.json json - 20200518 + 20201115 com.rethinkdb From 08d6382411869d3cb5104c56c6ce4d1a65bf0569 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 17 Nov 2020 13:18:20 +0000 Subject: [PATCH 2/4] Bump JDA from 4.2.0_215 to 4.2.0_217 Bumps JDA from 4.2.0_215 to 4.2.0_217. Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2bbd6d1..450ca9d 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ net.dv8tion JDA - 4.2.0_215 + 4.2.0_217 org.json From 02dd6a5d39e46003b7f2302a43203905a04af90a Mon Sep 17 00:00:00 2001 From: Greg Date: Tue, 17 Nov 2020 21:57:32 +0100 Subject: [PATCH 3/4] Clean up code --- src/main/java/com/bbn/hadder/db/Rethink.java | 4 ++-- src/main/java/com/bbn/hadder/listener/CommandListener.java | 6 +++--- src/main/java/com/bbn/hadder/listener/GuildListener.java | 4 ++-- src/main/java/com/bbn/hadder/listener/MentionListener.java | 4 ++-- .../java/com/bbn/hadder/listener/OwnerMessageListener.java | 6 +++--- .../com/bbn/hadder/listener/PrivateMessageListener.java | 2 +- src/main/java/com/bbn/hadder/listener/ReadyListener.java | 4 ++-- src/main/java/com/bbn/hadder/listener/RulesListener.java | 2 +- .../java/com/bbn/hadder/listener/StarboardListener.java | 2 +- .../java/com/bbn/hadder/listener/VoiceLeaveListener.java | 2 +- src/main/java/com/bbn/hadder/utils/MessageEditor.java | 4 ++-- 11 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/bbn/hadder/db/Rethink.java b/src/main/java/com/bbn/hadder/db/Rethink.java index 6651a39..fe7103c 100644 --- a/src/main/java/com/bbn/hadder/db/Rethink.java +++ b/src/main/java/com/bbn/hadder/db/Rethink.java @@ -27,9 +27,9 @@ import org.json.JSONObject; import java.lang.reflect.Field; public class Rethink { - private RethinkDB r = RethinkDB.r; + private final RethinkDB r = RethinkDB.r; private Connection conn; - private Config config; + private final Config config; public Rethink(Config config) { this.config = config; diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java index 5117359..ae8ace2 100644 --- a/src/main/java/com/bbn/hadder/listener/CommandListener.java +++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java @@ -33,9 +33,9 @@ import java.time.Instant; public class CommandListener extends ListenerAdapter { - private Rethink rethink; - private CommandHandler handler; - private AudioManager audioManager; + private final Rethink rethink; + private final CommandHandler handler; + private final AudioManager audioManager; public CommandListener(Rethink rethink, CommandHandler handler, AudioManager audioManager) { this.rethink = rethink; diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java index 40db876..1d09b4f 100644 --- a/src/main/java/com/bbn/hadder/listener/GuildListener.java +++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java @@ -30,8 +30,8 @@ import java.time.Instant; public class GuildListener extends ListenerAdapter { - private Rethink rethink; - private Config config; + private final Rethink rethink; + private final Config config; public GuildListener(Rethink rethink, Config config) { this.rethink = rethink; diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index 81c7c8f..7b25595 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -33,8 +33,8 @@ import java.util.Random; public class MentionListener extends ListenerAdapter { - private Rethink rethink; - private Config config; + private final Rethink rethink; + private final Config config; public MentionListener(Rethink rethink, Config config) { this.rethink = rethink; diff --git a/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java b/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java index 7e46a1a..db0736b 100644 --- a/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java +++ b/src/main/java/com/bbn/hadder/listener/OwnerMessageListener.java @@ -22,9 +22,9 @@ public class OwnerMessageListener extends ListenerAdapter { @Override public void onMessageReceived(@Nonnull MessageReceivedEvent event) { if (config.getOwners().contains(event.getAuthor().getIdLong()) && event.getMessage().getContentRaw().startsWith(":") && event.getMessage().getContentRaw().endsWith(":")) { - String emotename = event.getMessage().getContentRaw().split(":")[1]; - if (!emotename.contains(" ")) { - Emote[] emotes = event.getJDA().getEmotesByName(emotename, true).toArray(new Emote[0]); + String emoteName = event.getMessage().getContentRaw().split(":")[1]; + if (!emoteName.contains(" ")) { + Emote[] emotes = event.getJDA().getEmotesByName(emoteName, true).toArray(new Emote[0]); StringBuilder sb = new StringBuilder(); if (emotes.length != 0) { for (Emote emote : emotes) { diff --git a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java index 0bf1ff4..d34e515 100644 --- a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java +++ b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java @@ -30,7 +30,7 @@ import java.time.Instant; public class PrivateMessageListener extends ListenerAdapter { - private Rethink rethink; + private final Rethink rethink; public PrivateMessageListener(Rethink rethink) { this.rethink = rethink; diff --git a/src/main/java/com/bbn/hadder/listener/ReadyListener.java b/src/main/java/com/bbn/hadder/listener/ReadyListener.java index c520a4c..9f0d569 100644 --- a/src/main/java/com/bbn/hadder/listener/ReadyListener.java +++ b/src/main/java/com/bbn/hadder/listener/ReadyListener.java @@ -28,8 +28,8 @@ import javax.annotation.Nonnull; public class ReadyListener extends ListenerAdapter { - private Rethink rethink; - private Config config; + private final Rethink rethink; + private final Config config; public ReadyListener(Rethink rethink, Config config) { this.rethink = rethink; diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java index 04901cf..5a58835 100644 --- a/src/main/java/com/bbn/hadder/listener/RulesListener.java +++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java @@ -24,7 +24,7 @@ import net.dv8tion.jda.api.hooks.ListenerAdapter; public class RulesListener extends ListenerAdapter { - private Rethink rethink; + private final Rethink rethink; public RulesListener(Rethink rethink) { this.rethink = rethink; diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/com/bbn/hadder/listener/StarboardListener.java index 060777b..dc1226a 100644 --- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java +++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java @@ -30,7 +30,7 @@ import javax.annotation.Nonnull; public class StarboardListener extends ListenerAdapter { - private Rethink rethink; + private final Rethink rethink; public StarboardListener(Rethink rethink) { this.rethink = rethink; diff --git a/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java b/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java index 753cf7f..aeeb667 100644 --- a/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java +++ b/src/main/java/com/bbn/hadder/listener/VoiceLeaveListener.java @@ -22,7 +22,7 @@ import net.dv8tion.jda.api.hooks.ListenerAdapter; public class VoiceLeaveListener extends ListenerAdapter { - private AudioManager audioManager; + private final AudioManager audioManager; public VoiceLeaveListener(AudioManager audioManager) { this.audioManager = audioManager; diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java index 9485aa6..1a922f1 100644 --- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java +++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java @@ -27,8 +27,8 @@ import java.util.ResourceBundle; public class MessageEditor { - private RethinkUser rethinkUser; - private User user; + private final RethinkUser rethinkUser; + private final User user; public MessageEditor(RethinkUser rethinkUser, User user) { this.rethinkUser = rethinkUser; From 9e40e3d19cffb64b5047bdff44cb9f795e4d1fe2 Mon Sep 17 00:00:00 2001 From: Skidder Date: Tue, 17 Nov 2020 22:00:00 +0100 Subject: [PATCH 4/4] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c9c9452..d421766 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 4.0.0 Hadder Hadder - 1.3.22 + 1.3.24 Hadder 2019 Hadder is a multi-purpose Discord bot.