diff options
author | David <david@panic.tk> | 2018-11-12 16:15:36 +0100 |
---|---|---|
committer | David <david@panic.tk> | 2018-11-12 16:15:36 +0100 |
commit | e64d7ffb0c786b8a635d8e33317663d651481cde (patch) | |
tree | eef5d04a189babadc554b46f92f1df108017ea76 /src/main/java/com/redstoner/modules/discord | |
parent | 9e03a3371ba3344f1756789f112cfe97638824e5 (diff) |
Code cleanup batch 2
Diffstat (limited to 'src/main/java/com/redstoner/modules/discord')
-rw-r--r-- | src/main/java/com/redstoner/modules/discord/Discord.java | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/src/main/java/com/redstoner/modules/discord/Discord.java b/src/main/java/com/redstoner/modules/discord/Discord.java index 8a7e265..4a1bf04 100644 --- a/src/main/java/com/redstoner/modules/discord/Discord.java +++ b/src/main/java/com/redstoner/modules/discord/Discord.java @@ -35,6 +35,7 @@ public class Discord implements Module { @Override public boolean onEnable() { Config config; + try { config = Config.getConfig("Discord.json"); } catch (IOException | org.json.simple.parser.ParseException e1) { @@ -42,20 +43,26 @@ public class Discord implements Module { return false; } - if (config == null || !config.containsKey("database") || !config.containsKey("table") - || !config.containsKey("inviteLink")) { + if (config == null || !config.containsKey("database") || !config.containsKey("table") || !config.containsKey("inviteLink")) { getLogger().error("Could not load the Discord config file, disabling!"); + config.put("database", "redstoner"); config.put("table", "discord"); config.put("inviteLink", "https://discord.gg/example"); + return false; } + inviteLink = config.get("inviteLink"); + try { MysqlDatabase database = MysqlHandler.INSTANCE.getDatabase(config.get("database") + "?autoReconnect=true"); + MysqlField uuid = new MysqlField("uuid", new VarChar(36), false); MysqlField pass = new MysqlField("token", new VarChar(8), false); + database.createTableIfNotExists((String) config.get("table"), uuid, pass); + table = database.getTable(config.get("table")); } catch (NullPointerException e) { getLogger().error("Could not use the Discord config, aborting!"); @@ -82,8 +89,7 @@ public class Discord implements Module { tries++; } - if (tries > 10) - break; + if (tries > 10) break; } if (token == null) { @@ -97,11 +103,8 @@ public class Discord implements Module { table.insert(pUUID, token); new Message(sender, null).appendText("\n&cRedstoner&7 has a &2Discord&7 Now! \nClick ") - .appendLinkHover("&e" + inviteLink, inviteLink, "&aClick to Join") - .appendText("&7 to join. \n\nTo sync you rank, copy ") - .appendSuggestHover("&e" + token, token, "&aClick to Copy") - .appendText("&7 into &3#rank-sync&7.\n") - .send(); + .appendLinkHover("&e" + inviteLink, inviteLink, "&aClick to Join").appendText("&7 to join. \n\nTo sync you rank, copy ") + .appendSuggestHover("&e" + token, token, "&aClick to Copy").appendText("&7 into &3#rank-sync&7.\n").send(); } private String randomToken(int length) { @@ -113,4 +116,4 @@ public class Discord implements Module { return sb.toString(); } -}
\ No newline at end of file +} |