Some stuff #53

Merged
greg6775 merged 2 commits from greg-dev into master 2019-11-10 20:49:10 +01:00
4 changed files with 7 additions and 10 deletions
Showing only changes of commit 352a772fe5 - Show all commits

View file

@ -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();

View file

@ -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) {

View file

@ -9,8 +9,8 @@ import java.util.List;
public class CommandHandler {
List<Command> commandList;
Config config;
private List<Command> commandList;
private Config config;
public CommandHandler(List<Command> 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()) {

View file

@ -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) {