diff --git a/build.gradle b/build.gradle index 6d75d95..c636acc 100644 --- a/build.gradle +++ b/build.gradle @@ -38,7 +38,7 @@ dependencies { compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.2' // Discord Gateway API - compile group: 'com.github.austinv11', name: 'Discord4j', version: '2.6.1' + compile group: 'com.github.austinv11', name: 'Discord4j', version: '2.7.0' // Util compile group: 'net.jodah', name: 'failsafe', version: '0.8.3' diff --git a/dcf.properties.example b/dcf.properties.example index 8c291ad..0191b2a 100644 --- a/dcf.properties.example +++ b/dcf.properties.example @@ -10,13 +10,8 @@ general.plugins_dir = plugins # Data storage location general.storage_dir = data -# Initial connection token... +# Initial connection token discord.token = tokenGoesHere -# ... or username/password combination if you don't use bot mode -# comment out discord.token if using us/pw tuple -#discord.username = email -#discord.password = superSecretPassword - # Command prefix commands.prefix = ! \ No newline at end of file diff --git a/src/main/java/net/pingex/dcf/DiscordCommandableFramework.java b/src/main/java/net/pingex/dcf/DiscordCommandableFramework.java index bb0fd64..a89d905 100644 --- a/src/main/java/net/pingex/dcf/DiscordCommandableFramework.java +++ b/src/main/java/net/pingex/dcf/DiscordCommandableFramework.java @@ -37,9 +37,7 @@ public class DiscordCommandableFramework PluginLoader.getInstance().bulkLoadPlugins(); // Set up initial connection - ClientBuilder builder = new ClientBuilder(); - if(Configuration.isConnectionToken()) builder.withToken(Configuration.CONNECTION_TOKEN); - else builder.withLogin(Configuration.CONNECTION_USERNAME, Configuration.CONNECTION_PASSWORD); + ClientBuilder builder = new ClientBuilder().withToken(Configuration.CONNECTION_TOKEN); GatewayConnectionManager.registerConnection(builder); // Register internal commands diff --git a/src/main/java/net/pingex/dcf/core/GatewayConnectionManager.java b/src/main/java/net/pingex/dcf/core/GatewayConnectionManager.java index 1c70305..8c63cd9 100644 --- a/src/main/java/net/pingex/dcf/core/GatewayConnectionManager.java +++ b/src/main/java/net/pingex/dcf/core/GatewayConnectionManager.java @@ -72,20 +72,4 @@ public class GatewayConnectionManager LOGGER.debug("Update done. diff: +{} -{}", toRegister, toUnregister); } - - /** - * Reconnect a disconnected gateway connection - */ - @Deprecated - public static void reconnect() - { - try - { - connection.login(); - } - catch (DiscordException e) - { - LOGGER.warn("User #" + connection.getOurUser().getID() + " failed to reconnect to the gateway.", e); - } - } }