diff --git a/pom.xml b/pom.xml
index 0e927f3..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.
@@ -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);
}
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);
}
-
}
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");
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();
}