From 081da47b7119204347ab1666702037fb24ba968b Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 9 Mar 2020 19:10:15 +0100 Subject: [PATCH 1/5] IMPORTANT --- src/main/java/com/bbn/hadder/audio/AudioManager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/audio/AudioManager.java b/src/main/java/com/bbn/hadder/audio/AudioManager.java index 363581c..512f460 100644 --- a/src/main/java/com/bbn/hadder/audio/AudioManager.java +++ b/src/main/java/com/bbn/hadder/audio/AudioManager.java @@ -162,5 +162,4 @@ public class AudioManager { s = s - (minutes * 60); return (hours == 0 ? "" : hours + ":") + String.format("%02d", minutes) + ":" + String.format("%02d", s); } - } -- 2.45.3 From 5cc7acfe0dc12b845dd73ce3e2b3a73dbaffe966 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 9 Mar 2020 19:20:21 +0100 Subject: [PATCH 2/5] Mention Listener fix --- src/main/java/com/bbn/hadder/listener/MentionListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java index 276a02f..7fb9e11 100644 --- a/src/main/java/com/bbn/hadder/listener/MentionListener.java +++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java @@ -50,7 +50,7 @@ public class MentionListener extends ListenerAdapter { MavenXpp3Reader reader = new MavenXpp3Reader(); Model model = null; try { - model = reader.read(this.getClass().getClassLoader().getResourceAsStream("pom.xml")); + model = reader.read(getClass().getResourceAsStream("pom.xml")); } catch (IOException | XmlPullParserException ex) { ex.printStackTrace(); } -- 2.45.3 From c12e4e8e7c61a18c3a11ecb344e87bfb3d05584e Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 9 Mar 2020 19:20:26 +0100 Subject: [PATCH 3/5] more --- src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java | 4 +--- .../java/com/bbn/hadder/commands/misc/GitHubCommand.java | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java b/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java index 29e01e4..50f2bcf 100644 --- a/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java +++ b/src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java @@ -66,9 +66,7 @@ public class ClydeCommand implements Command { } webhook.delete().queue(); e.getMessage().delete().queue(); - } else { - e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); - } + } else e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue(); } else e.getHelpCommand().sendHelp(this, e); } diff --git a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java index 606c9bb..fa9ad54 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java @@ -54,12 +54,10 @@ public class GitHubCommand implements Command { String website = "None"; try { bio = json.getString("bio"); - } catch (JSONException ignored) { - } + } catch (JSONException ignored) {} try { location = json.getString("location"); - } catch (JSONException ignored) { - } + } catch (JSONException ignored) {} if (!json.getString("blog").equals("")) website = json.getString("blog"); -- 2.45.3 From e72560450088c66d73642d464486d29ff7b93768 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Mon, 9 Mar 2020 19:22:53 +0100 Subject: [PATCH 4/5] Version bump --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8cb9b8d..45289ec 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 Hadder Hadder - 1.1.1 + 1.1.3 Hadder 2019 Hadder is a multi-purpose Discord bot. -- 2.45.3 From 4e6842bcd352fd72822d361601f0a4f10082a932 Mon Sep 17 00:00:00 2001 From: Skidder Date: Mon, 9 Mar 2020 19:26:53 +0100 Subject: [PATCH 5/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