From 4e6842bcd352fd72822d361601f0a4f10082a932 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 9 Mar 2020 19:26:53 +0100 Subject: [PATCH 1/5] Revert "v1.1.2" --- pom.xml | 4 ++-- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8cb9b8d..0e927f3 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.1.1 + 2.4.0 org.slf4j @@ -91,7 +91,7 @@ org.kohsuke github-api - 1.108 + 1.107 com.sedmelluq diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index d1e3c3f..aeaaf58 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -53,7 +53,7 @@ public class Rethink { private JSONArray getAsArray(String table, String where, String value) { try { - String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn).toString(); + String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn); return new JSONArray(string); } catch (NoSuchElementException e) { return null; @@ -77,7 +77,7 @@ public class Rethink { } public JSONObject getObjectByID(String table, String id) { - String response = r.table(table).get(id).toJson().run(conn).toString(); + String response = r.table(table).get(id).toJson().run(conn); return new JSONObject(response); } -- 2.45.3 From 841821abe3af7e450073d88a77fc4a7e114518c6 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 9 Mar 2020 19:31:05 +0100 Subject: [PATCH 2/5] Revert "Revert "v1.1.2"" --- pom.xml | 4 ++-- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 0e927f3..8cb9b8d 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.0 + 2.4.1.1 org.slf4j @@ -91,7 +91,7 @@ org.kohsuke github-api - 1.107 + 1.108 com.sedmelluq diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index aeaaf58..d1e3c3f 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -53,7 +53,7 @@ public class Rethink { private JSONArray getAsArray(String table, String where, String value) { try { - String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn); + String string = r.table(table).filter(row -> row.g(where.toLowerCase()).eq(value)).coerceTo("array").toJson().run(conn).toString(); return new JSONArray(string); } catch (NoSuchElementException e) { return null; @@ -77,7 +77,7 @@ public class Rethink { } public JSONObject getObjectByID(String table, String id) { - String response = r.table(table).get(id).toJson().run(conn); + String response = r.table(table).get(id).toJson().run(conn).toString(); return new JSONObject(response); } -- 2.45.3 From 8b4926aab245ada31d87f21814d814b3667603f2 Mon Sep 17 00:00:00 2001 From: Schlauer-Hax Date: Fri, 13 Mar 2020 22:15:33 +0100 Subject: [PATCH 3/5] Fix --- .../java/com/bbn/hadder/commands/misc/MoveAllCommand.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 5d26277..90aa962 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java @@ -8,6 +8,7 @@ import com.bbn.hadder.commands.Command; import com.bbn.hadder.commands.CommandEvent; import com.bbn.hadder.core.Perm; import com.bbn.hadder.core.Perms; +import net.dv8tion.jda.api.EmbedBuilder; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; @@ -20,9 +21,14 @@ public class MoveAllCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { if (args.length == 2) { + int count = 0; Objects.requireNonNull(e.getGuild().getVoiceChannelById(args[0])).getMembers().forEach( - member -> e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue() + member -> { + e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue(); + } ); + e.getChannel().sendMessage(new EmbedBuilder().setTitle("Successfully Moved!").setDescription("I moved " + + Objects.requireNonNull(e.getGuild().getVoiceChannelById(args[0])).getMembers().size() + " Members. Have fun!").build()).queue(); } else { e.getHelpCommand().sendHelp(this, e); } -- 2.45.3 From fbbdb9f48813cf627d490f6c69bb37f0b11e367b Mon Sep 17 00:00:00 2001 From: Schlauer-Hax Date: Fri, 13 Mar 2020 22:15:54 +0100 Subject: [PATCH 4/5] a --- src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java | 3 +-- 1 file changed, 1 insertion(+), 2 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 90aa962..33684f0 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java @@ -21,13 +21,12 @@ public class MoveAllCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { if (args.length == 2) { - int count = 0; Objects.requireNonNull(e.getGuild().getVoiceChannelById(args[0])).getMembers().forEach( member -> { e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue(); } ); - e.getChannel().sendMessage(new EmbedBuilder().setTitle("Successfully Moved!").setDescription("I moved " + + e.getChannel().sendMessage(new EmbedBuilder().setTitle("Successfully Moved!").setDescription("I moved " + Objects.requireNonNull(e.getGuild().getVoiceChannelById(args[0])).getMembers().size() + " Members. Have fun!").build()).queue(); } else { e.getHelpCommand().sendHelp(this, e); -- 2.45.3 From e0df9cc7388d28cadbdd32d4e97d58120a47b5d6 Mon Sep 17 00:00:00 2001 From: Schlauer-Hax Date: Fri, 13 Mar 2020 22:16:33 +0100 Subject: [PATCH 5/5] aa --- src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 33684f0..bf8fc95 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/MoveAllCommand.java @@ -21,13 +21,14 @@ public class MoveAllCommand implements Command { @Override public void executed(String[] args, CommandEvent e) { if (args.length == 2) { + int count = Objects.requireNonNull(e.getGuild().getVoiceChannelById(args[0])).getMembers().size(); Objects.requireNonNull(e.getGuild().getVoiceChannelById(args[0])).getMembers().forEach( member -> { e.getGuild().moveVoiceMember(member, e.getGuild().getVoiceChannelById(args[1])).queue(); } ); e.getChannel().sendMessage(new EmbedBuilder().setTitle("Successfully Moved!").setDescription("I moved " + - Objects.requireNonNull(e.getGuild().getVoiceChannelById(args[0])).getMembers().size() + " Members. Have fun!").build()).queue(); + count + " Members. Have fun!").build()).queue(); } else { e.getHelpCommand().sendHelp(this, e); } -- 2.45.3