From 3a56c0da11c7c09cfe298871374618e1b12a4353 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 10 Mar 2020 13:17:38 +0000 Subject: [PATCH 1/8] Bump rethinkdb-driver from 2.4.0 to 2.4.1.1 Bumps [rethinkdb-driver](https://github.com/rethinkdb/rethinkdb-java) from 2.4.0 to 2.4.1.1. - [Release notes](https://github.com/rethinkdb/rethinkdb-java/releases) - [Commits](https://github.com/rethinkdb/rethinkdb-java/compare/v2.4.0...v2.4.1.1) 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 c77db22..45289ec 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.0 + 2.4.1.1 org.slf4j -- 2.45.3 From cc5b2946d7f172e25432a6e8dade2cf8ec1abcc2 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 16 Mar 2020 13:20:03 +0000 Subject: [PATCH 2/8] Bump JDA from 4.1.1_113 to 4.1.1_116 Bumps JDA from 4.1.1_113 to 4.1.1_116. 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 8fc48d9..62f6bd5 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_113 + 4.1.1_116 org.json -- 2.45.3 From bdf23106180546ec4540e79165a2cc3479362292 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 18 Mar 2020 13:18:23 +0000 Subject: [PATCH 3/8] Bump JDA from 4.1.1_116 to 4.1.1_121 Bumps JDA from 4.1.1_116 to 4.1.1_121. 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 62f6bd5..8dfe5c5 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_116 + 4.1.1_121 org.json -- 2.45.3 From 1438fba6ba35e2e71f498975e0d8620ef821d14d Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 18 Mar 2020 18:38:59 +0100 Subject: [PATCH 4/8] Remove deprecated function --- src/main/java/com/bbn/hadder/Hadder.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 99f9b3d..4afe7ca 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -51,15 +51,14 @@ public class Hadder { Rethink rethink = new Rethink(config); rethink.connect(); - DefaultShardManagerBuilder builder = new DefaultShardManagerBuilder(); + DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.createDefault(config.getBotToken()); builder.setAutoReconnect(true); builder.setShardsTotal(1); - builder.setChunkingFilter(ChunkingFilter.ALL); + builder.setChunkingFilter(ChunkingFilter.NONE); builder.setBulkDeleteSplittingEnabled(true); builder.setActivity(Activity.listening("to h.help")); builder.setStatus(OnlineStatus.DO_NOT_DISTURB); - builder.setToken(config.getBotToken()); HelpCommand helpCommand = new HelpCommand(); AudioManager audioManager = new AudioManager(); -- 2.45.3 From e77dd007a0ca394201c36f454ae8829715eee745 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 20 Mar 2020 13:17:53 +0000 Subject: [PATCH 5/8] Bump JDA from 4.1.1_121 to 4.1.1_122 Bumps JDA from 4.1.1_121 to 4.1.1_122. 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 7df9612..e9cd4b9 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_121 + 4.1.1_122 org.json -- 2.45.3 From e74d46418407306dc8f19e4d8c6b5fd35541ef88 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 20 Mar 2020 19:16:54 +0100 Subject: [PATCH 6/8] Downgrade again :( --- pom.xml | 2 +- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7df9612..8dfe5c5 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.1.1 + 2.4.0 org.slf4j diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index aeaaf58..6be8bdd 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -72,8 +72,8 @@ public class Rethink { else return null; } - public Object getByID(String table, String wherevalue, String column) { - return r.table(table).get(wherevalue).getField(column).run(conn); + public Object getByID(String table, String where, String column) { + return r.table(table).get(where).getField(column).run(conn); } public JSONObject getObjectByID(String table, String id) { -- 2.45.3 From 8bde70bdec3943ec1289a159c787f29b4c72088b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Fri, 20 Mar 2020 19:22:08 +0100 Subject: [PATCH 7/8] Bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 98c98df..5870d56 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Hadder Hadder - 1.1.3 + 1.3.1 Hadder 2019 Hadder is a multi-purpose Discord bot. -- 2.45.3 From fe7efa6b84212efb54ee3efef1506eb7f49a5c42 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sat, 21 Mar 2020 17:39:50 +0100 Subject: [PATCH 8/8] New error messages --- .../hadder/commands/misc/MoveAllCommand.java | 29 ++++++++++++++----- .../Translations/Translations_en.properties | 4 +++ 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java index 519e681..b8d1dc6 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java @@ -20,6 +20,7 @@ import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; import com.bbn.hadder.core.Perms; import com.bbn.hadder.utils.MessageEditor; +import org.apache.commons.lang3.StringUtils; @Perms(Perm.VOICE_MOVE_OTHERS) public class MoveAllCommand implements Command { @@ -27,14 +28,26 @@ public class MoveAllCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { if (args.length == 2) { - int count = e.getGuild().getVoiceChannelById(args[0]).getMembers().size(); - e.getGuild().getVoiceChannelById(args[0]).getMembers().forEach( - member -> e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue() - ); - e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, - "commands.misc.moveall.success.title", "", - "commands.misc.moveall.success.description", String.valueOf(count)) - .build()).queue(); + if (StringUtils.isNumeric(args[0]) && args[0].length() == 18) { + if (StringUtils.isNumeric(args[1]) && args[1].length() == 18) { + int count = e.getGuild().getVoiceChannelById(args[0]).getMembers().size(); + e.getGuild().getVoiceChannelById(args[0]).getMembers().forEach( + member -> e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue() + ); + e.getChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.INFO, + "commands.misc.moveall.success.title", "", + "commands.misc.moveall.success.description", String.valueOf(count)) + .build()).queue(); + } else { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.misc.moveall.error.target.int.title", + "commands.misc.moveall.error.target.int.description").build()).queue(); + } + } else { + e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.ERROR, + "commands.misc.moveall.error.source.int.title", + "commands.misc.moveall.error.source.int.description").build()).queue(); + } } else e.getHelpCommand().sendHelp(this, e); } diff --git a/src/main/resources/Translations/Translations_en.properties b/src/main/resources/Translations/Translations_en.properties index 1f07242..54ef718 100644 --- a/src/main/resources/Translations/Translations_en.properties +++ b/src/main/resources/Translations/Translations_en.properties @@ -100,6 +100,10 @@ commands.misc.code.error.description = I can't find the specified invite code. commands.misc.code.help.description = Shows information about a invite code. commands.misc.moveall.success.title = Successfully moved commands.misc.moveall.success.description = I successfully moved %extra% members. Have fun\! +commands.misc.moveall.error.source.int.title = Invalid ID +commands.misc.moveall.error.source.int.description = You didn't specified a ID as the source channel. +commands.misc.moveall.error.target.int.title = Invalid ID +commands.misc.moveall.error.target.int.description = You didn't specified a ID as the target channel. commands.misc.moveall.help.description = Moves all users in the source channel to the target channel. commands.misc.corona.help.description = Show the newest stats about COVID-19 -- 2.45.3