diff --git a/src/main/java/netneutrality/MusicBot.java b/src/main/java/netneutrality/MusicBot.java index b734615..cc11e06 100644 --- a/src/main/java/netneutrality/MusicBot.java +++ b/src/main/java/netneutrality/MusicBot.java @@ -56,16 +56,6 @@ public class MusicBot { MusicBot.shutdown(); })); - ConsoleHandler consoleInput = new ConsoleHandler(); - - switch (consoleInput.init()) { - - case "quit": - System.exit(0); - break; - - } - } public static void shutdown() { diff --git a/src/main/java/netneutrality/db/MysqlConnector.java b/src/main/java/netneutrality/db/MysqlConnector.java index 92c7676..ced5beb 100644 --- a/src/main/java/netneutrality/db/MysqlConnector.java +++ b/src/main/java/netneutrality/db/MysqlConnector.java @@ -25,9 +25,11 @@ public class MysqlConnector { * @return {@link MysqlConnector} */ public MysqlConnector connect() throws SQLException { + String jdbc = "jdbc:mysql://" + dbHost + ":3306/" + dbName; + try { Class.forName("com.mysql.cj.jdbc.Driver"); - c = DriverManager.getConnection("jdbc:mysql://" + dbHost + ":3306/" + dbName, dbUser, dbPass); + c = DriverManager.getConnection(jdbc, dbUser, dbPass); } catch (ClassNotFoundException e) { e.printStackTrace(); } diff --git a/src/main/java/netneutrality/db/controllers/DBGuild.java b/src/main/java/netneutrality/db/controllers/DBGuild.java index cca67e1..8e946d9 100644 --- a/src/main/java/netneutrality/db/controllers/DBGuild.java +++ b/src/main/java/netneutrality/db/controllers/DBGuild.java @@ -13,6 +13,7 @@ public class DBGuild extends AbstractController { public void insertGuildInDB(Guild g) { if (!database.exists("guilds", "guild_id", g.getId())) { database.prepareAndExecuteAsync("INSERT INTO guilds VALUES(?, ?, ?)", g.getId(), "0", null).blocking(); + database.prepareAndExecuteAsync("INSERT INTO guild_settings VALUES(?)", g.getId()).blocking(); } } diff --git a/src/main/java/netneutrality/handler/NewCommandListener.java b/src/main/java/netneutrality/handler/NewCommandListener.java index df15bb9..75ad125 100644 --- a/src/main/java/netneutrality/handler/NewCommandListener.java +++ b/src/main/java/netneutrality/handler/NewCommandListener.java @@ -63,7 +63,10 @@ public class NewCommandListener extends ListenerAdapter { } } - c.execute(event, args); + if (c.canBeExecutedBy(event.getGuild(), event.getMember())) { + c.execute(event, args); + } + } } } else {