From 8d0aabb09c22d9bd11c0af319ea1e3a1cacbaa80 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 10 Nov 2019 13:11:29 +0100 Subject: [PATCH 1/3] Few changes --- .../java/com/bbn/hadder/commands/misc/GitHubCommand.java | 8 ++------ .../com/bbn/hadder/commands/misc/ScreenshareCommand.java | 6 +++--- 2 files changed, 5 insertions(+), 9 deletions(-) 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 a75f0d4..3240549 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java @@ -33,14 +33,10 @@ public class GitHubCommand implements Command { String website = "None"; try { bio = json.getString("bio"); - } catch (JSONException e) { - - } + } catch (JSONException ignored) {} try { location = json.getString("location"); - } catch (JSONException e) { - - } + } catch (JSONException ignored) {} if(!json.getString("blog").equals("")) website = json.getString("blog"); diff --git a/src/main/java/com/bbn/hadder/commands/misc/ScreenshareCommand.java b/src/main/java/com/bbn/hadder/commands/misc/ScreenshareCommand.java index 7c5f810..80ed92e 100644 --- a/src/main/java/com/bbn/hadder/commands/misc/ScreenshareCommand.java +++ b/src/main/java/com/bbn/hadder/commands/misc/ScreenshareCommand.java @@ -33,7 +33,7 @@ public class ScreenshareCommand implements Command { List vcs = event.getGuild().getVoiceChannelsByName(String.join(" ", args), true); if (vcs.size() > 1) { EmbedBuilder eb = new EmbedBuilder() - .setTitle("Please Choose a Voicechannel") + .setTitle("Please Choose a Voice Channel") .setDescription("There is more than one channel with this name"); for (int i = 0; i < vcs.size(); i++) { VoiceChannel voiceChannel = vcs.get(i); @@ -54,14 +54,14 @@ public class ScreenshareCommand implements Command { } } catch (NumberFormatException e) { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.ERROR, new EmbedBuilder() - .setTitle("Wait, thats illegal") + .setTitle("Wait, that's illegal") .setDescription("This isn't a Number.")).build()).queue(); } }, event.getJDA(), event.getAuthor()); } else if (vcs.size()==0) { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.ERROR, new EmbedBuilder() .setTitle("Hol' up") - .setDescription("There is no Voicechannel named like this. \n\nNote: Make sure the Voicechannel is on this Guild.")).build()).queue(); + .setDescription("There is no Voice Channel named like this. \n\nNote: Make sure the Voice Channel is on this Guild.")).build()).queue(); } else { event.getChannel().sendMessage(new MessageEditor().setDefaultSettings(MessageEditor.Messagetype.INFO, new EmbedBuilder() .setTitle("Here's your Url to share your Screen") -- 2.45.3 From 352a772fe54373105e9a63768d6ce82d27ab1d15 Mon Sep 17 00:00:00 2001 From: GregTCLTK Date: Sun, 10 Nov 2019 13:16:03 +0100 Subject: [PATCH 2/3] Hello my friends --- src/main/java/com/bbn/hadder/Hadder.java | 2 +- src/main/java/com/bbn/hadder/Rethink.java | 8 +++----- src/main/java/com/bbn/hadder/core/CommandHandler.java | 5 ++--- src/main/java/com/bbn/hadder/core/Config.java | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) 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) { -- 2.45.3 From 101a31f3388436f89fdd0966b4742574045bafbd Mon Sep 17 00:00:00 2001 From: Skidder Date: Sun, 10 Nov 2019 20:48:18 +0100 Subject: [PATCH 3/3] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index cd779c4..4f62557 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # Hadder [![Build Status](https://travis-ci.com/BigBotNetwork/Hadder.svg?branch=master)](https://travis-ci.com/BigBotNetwork/Hadder) + -- 2.45.3