From d47236291e088743a96b3c25279c79ed556077f9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 31 Mar 2020 13:17:18 +0000 Subject: [PATCH 1/7] Bump rethinkdb-driver from 2.4.0 to 2.4.2 Bumps [rethinkdb-driver](https://github.com/rethinkdb/rethinkdb-java) from 2.4.0 to 2.4.2. - [Release notes](https://github.com/rethinkdb/rethinkdb-java/releases) - [Commits](https://github.com/rethinkdb/rethinkdb-java/compare/v2.4.0...v2.4.2) 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 0460e6c..5128cea 100644 --- a/pom.xml +++ b/pom.xml @@ -76,7 +76,7 @@ com.rethinkdb rethinkdb-driver - 2.4.0 + 2.4.2 org.slf4j From 11fb585997c81eba2f93b56bfcae78122fa82dce Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 13 May 2020 11:47:55 +0200 Subject: [PATCH 2/7] Better code yk --- src/main/java/com/bbn/hadder/Hadder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 4335d3b..2fe8cf3 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -52,7 +52,7 @@ public class Hadder { Rethink rethink = new Rethink(config); rethink.connect(); - DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.GUILD_MEMBERS, GatewayIntent.DIRECT_MESSAGE_REACTIONS, GatewayIntent.GUILD_PRESENCES, GatewayIntent.GUILD_VOICE_STATES, GatewayIntent.GUILD_EMOJIS, GatewayIntent.GUILD_MESSAGES); + DefaultShardManagerBuilder builder = DefaultShardManagerBuilder.create(GatewayIntent.getIntents(GatewayIntent.ALL_INTENTS)); builder.setAutoReconnect(true); builder.setShardsTotal(1); From 281d8d474d9530f7356b4dcb6d026bcd38987e00 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 13 May 2020 13:16:51 +0000 Subject: [PATCH 3/7] Bump lavaplayer from 1.3.47 to 1.3.48 Bumps lavaplayer from 1.3.47 to 1.3.48. 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 5028ed4..ff9b491 100644 --- a/pom.xml +++ b/pom.xml @@ -96,7 +96,7 @@ com.sedmelluq lavaplayer - 1.3.47 + 1.3.48 com.fasterxml.jackson.core From 7ddec14f25b82ab036c53bb2beda5ad32ae8c91e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 13 May 2020 13:17:20 +0000 Subject: [PATCH 4/7] Bump JDA from 4.1.1_148 to 4.1.1_149 Bumps JDA from 4.1.1_148 to 4.1.1_149. 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 5028ed4..1579f5b 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ net.dv8tion JDA - 4.1.1_148 + 4.1.1_149 org.json From 6737eb432cbddb866c8d1b04c04e6d5dbff74106 Mon Sep 17 00:00:00 2001 From: Schlauer-Hax Date: Wed, 13 May 2020 15:45:44 +0200 Subject: [PATCH 5/7] Fixed Rethink Stuff --- src/main/java/com/bbn/hadder/Rethink.java | 27 ++--------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 5f8ee59..8366e95 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -21,12 +21,10 @@ import com.rethinkdb.RethinkDB; import com.rethinkdb.gen.exc.ReqlNonExistenceError; import com.rethinkdb.gen.exc.ReqlOpFailedError; import com.rethinkdb.net.Connection; -import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; import java.lang.reflect.Field; -import java.util.NoSuchElementException; public class Rethink { private RethinkDB r = RethinkDB.r; @@ -52,33 +50,12 @@ 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); - return new JSONArray(string); - } catch (NoSuchElementException e) { - return null; - } catch (Exception e) { - e.printStackTrace(); - } - return new JSONArray(); - } - - public Object get(String table, String where, String value, String column) { - JSONArray array = this.getAsArray(table, where, value); - if (array.length() > 0) - if (array.getJSONObject(0).has(column)) - return array.getJSONObject(0).get(column); - else return null; - else return null; - } - public Object getByID(String table, String where, String column) { - return r.table(table).get(where).getField(column).run(conn); + return r.table(table).get(where).getField(column).run(conn).first(); } public JSONObject getObjectByID(String table, String id) { - String response = r.table(table).get(id).toJson().run(conn); + String response = String.valueOf(r.table(table).get(id).toJson().run(conn).first()); try { return new JSONObject(response); } catch (JSONException e) { From 0e20bcfc9a048188fd47585366682f019bcc6500 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 13 May 2020 18:05:37 +0200 Subject: [PATCH 6/7] Bump version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4b3ac33..da35d33 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Hadder Hadder - 1.3.3 + 1.3.11 Hadder 2019 Hadder is a multi-purpose Discord bot. From 66f90d35604aa9b85753c0e6f91dc8b0ba374680 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Wed, 13 May 2020 18:18:01 +0200 Subject: [PATCH 7/7] Rethink --- src/main/java/com/bbn/hadder/Rethink.java | 4 ++-- src/main/java/com/bbn/hadder/RethinkServer.java | 2 +- src/main/java/com/bbn/hadder/RethinkUser.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 8366e95..069209f 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -140,7 +140,7 @@ public class Rethink { } } - public void pushServer(RethinkServer server) { + public void push(RethinkServer server) { JSONObject object = new JSONObject(); for (Field field : server.getClass().getDeclaredFields()) { if (!field.getName().equals("rethink")) { @@ -154,7 +154,7 @@ public class Rethink { r.table("server").get(server.getId()).update(object.toMap()).run(conn); } - public void pushUser(RethinkUser user) { + public void push(RethinkUser user) { JSONObject object = new JSONObject(); for (Field field : user.getClass().getDeclaredFields()) { if (!field.getName().equals("rethink")) { diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/RethinkServer.java index 200e13a..e54dfd9 100644 --- a/src/main/java/com/bbn/hadder/RethinkServer.java +++ b/src/main/java/com/bbn/hadder/RethinkServer.java @@ -128,6 +128,6 @@ public class RethinkServer { } public void push() { - rethink.pushServer(this); + rethink.push(this); } } diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/RethinkUser.java index cc3b41d..0579947 100644 --- a/src/main/java/com/bbn/hadder/RethinkUser.java +++ b/src/main/java/com/bbn/hadder/RethinkUser.java @@ -76,6 +76,6 @@ public class RethinkUser { } public void push() { - rethink.pushUser(this); + rethink.push(this); } }