diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java index 5cf0dfc..c515960 100644 --- a/src/main/java/com/bbn/hadder/Hadder.java +++ b/src/main/java/com/bbn/hadder/Hadder.java @@ -23,7 +23,7 @@ public class Hadder { startBot(); } - public static void startBot() { + private static void startBot() { Config config = new Config("./config.json"); if (!config.fileExists()) config.create(); config.load(); diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/Rethink.java index 7aed33c..959892c 100644 --- a/src/main/java/com/bbn/hadder/Rethink.java +++ b/src/main/java/com/bbn/hadder/Rethink.java @@ -18,11 +18,11 @@ public class Rethink { private Connection conn; private Config config; - public Rethink(Config config) { + Rethink(Config config) { this.config = config; } - public boolean connect() { + public void connect() { try { conn = r.connection() .hostname(config.getDatabaseIP()) @@ -35,7 +35,6 @@ public class Rethink { System.out.println(e.toString()); System.out.println("DB CONNECTION FAILED"); } - return true; } public void disconnect() { @@ -46,8 +45,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); - JSONArray jsonArray = new JSONArray(string); - return jsonArray; + return new JSONArray(string); } catch (NoSuchElementException e) { return null; } catch (Exception e) { diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java index cb7f7dd..71c3a49 100644 --- a/src/main/java/com/bbn/hadder/core/CommandHandler.java +++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java @@ -9,8 +9,8 @@ import java.util.List; public class CommandHandler { - List commandList; - Config config; + private List commandList; + private Config config; public CommandHandler(List commandList, Config config) { this.commandList = commandList; @@ -18,7 +18,6 @@ public class CommandHandler { } public void handle(MessageReceivedEvent event, Rethink rethink, String prefix) { - StringBuilder regexBuilder = new StringBuilder().append("\\").append(prefix); String invoke = event.getMessage().getContentRaw().replaceFirst(prefix, "").split(" ")[0]; for (Command cmd : commandList) { for (String label : cmd.labels()) { diff --git a/src/main/java/com/bbn/hadder/core/Config.java b/src/main/java/com/bbn/hadder/core/Config.java index 7b9ea31..70f030a 100644 --- a/src/main/java/com/bbn/hadder/core/Config.java +++ b/src/main/java/com/bbn/hadder/core/Config.java @@ -33,7 +33,7 @@ public class Config { public void create() { try { if (Files.notExists(file)) { - file = Files.createFile(file); + Files.createFile(file); } Files.write(file, defaultConfigContent().getBytes()); } catch (IOException e) {