Upgrade JDA to latest version.

greatman · Jan 28, 2018 · f6ba1c2 · f6ba1c2
1 parent 1136f04
commit f6ba1c2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/api/src/main/java/com/greatmancode/legendarybot/api/commands/CommandHandler.java b/api/src/main/java/com/greatmancode/legendarybot/api/commands/CommandHandler.java
@@ -112,13 +112,13 @@ public void handle(MessageReceivedEvent event) {
         if (!bot.isReady()) {
             return;
         }
-        String text = event.getMessage().getContent();
+        String text = event.getMessage().getContentDisplay();
         String prefix = bot.getGuildSettings(event.getGuild()).getSetting("PREFIX");
         if (prefix == null) {
             prefix = "!";
         }
         if (text.startsWith(prefix) || event.getMessage().isMentioned(event.getJDA().getSelfUser())) {
-            log.info("[" + event.getGuild().getName() + "]" + event.getAuthor().getName() + ": " + event.getMessage().getContent());
+            log.info("[" + event.getGuild().getName() + "]" + event.getAuthor().getName() + ": " + event.getMessage().getContentDisplay());
             String command = null;
             String[] commandArray = text.split(" ");
             if (text.startsWith(prefix)) {

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ subprojects {
     }
     sourceCompatibility = 1.9
     dependencies {
-        compile 'net.dv8tion:JDA:3.4.0_317'
+        compile 'net.dv8tion:JDA:3.5.0_327'
         compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.8.1'
         compile group: 'org.pf4j', name: 'pf4j', version: '2.0.0'
 

diff --git a/...main/java/com/greatmancode/legendarybot/plugin/customcommands/IUnknownCommandHandler.java b/...main/java/com/greatmancode/legendarybot/plugin/customcommands/IUnknownCommandHandler.java
@@ -43,7 +43,7 @@ public IUnknownCommandHandler(CustomCommandsPlugin plugin) {
 
     @Override
     public void handle(MessageReceivedEvent event) {
-        String[] split = event.getMessage().getContent().split(" ");
+        String[] split = event.getMessage().getContentDisplay().split(" ");
         String prefix = plugin.getBot().getGuildSettings(event.getGuild()).getSetting("PREFIX");
         if (prefix == null ) {
             prefix = "!";

diff --git a/server/src/main/java/com/greatmancode/legendarybot/ILegendaryBot.java b/server/src/main/java/com/greatmancode/legendarybot/ILegendaryBot.java
@@ -185,8 +185,7 @@ public ILegendaryBot() throws IOException, LoginException, InterruptedException,
         for (int i = 0; i < maxShard; i++) {
             log.info("Starting shard " + i);
             jdaList.add(builder.useSharding(i,maxShard)
-                    .buildBlocking(JDA.Status.AWAITING_LOGIN_CONFIRMATION));
-            Thread.sleep(5000);
+                    .buildBlocking(JDA.Status.CONNECTED));
         }
         //Load the settings for each guild
         jdaList.forEach((jda) -> jda.getGuilds().forEach(guild -> guildSettings.put(guild.getId(), new IGuildSettings(guild, this))));

diff --git a/.../src/main/java/com/greatmancode/legendarybot/plugin/setupmodule/SetupMessageListener.java b/.../src/main/java/com/greatmancode/legendarybot/plugin/setupmodule/SetupMessageListener.java
@@ -81,18 +81,18 @@ public void onMessageReceived(MessageReceivedEvent event) {
             return;
         }
 
-        if (event.getMessage().getContent().contains("setup")) {
+        if (event.getMessage().getContentDisplay().contains("setup")) {
             return;
         }
 
-        if (event.getMessage().getContent().equalsIgnoreCase("cancel")) {
+        if (event.getMessage().getContentDisplay().equalsIgnoreCase("cancel")) {
             plugin.setupDone(event.getGuild());
             event.getChannel().sendMessage("Setup canceled. The bot may behave weirdly if you left right in the middle of the setup wizard.").queue();
             return;
         }
 
         if (setupHandler.getState() == SetupState.STEP_PREFIX) {
-            String prefix = event.getMessage().getContent();
+            String prefix = event.getMessage().getContentDisplay();
             plugin.getBot().getGuildSettings(event.getGuild()).setSetting("PREFIX", prefix);
             setupHandler.setState(SetupState.STEP_REGION);
 
@@ -114,7 +114,7 @@ public void onMessageReceived(MessageReceivedEvent event) {
         }
 
         if (setupHandler.getState() == SetupState.STEP_REGION) {
-            String region = event.getMessage().getContent();
+            String region = event.getMessage().getContentDisplay();
             if (!region.equalsIgnoreCase("us") && !region.equalsIgnoreCase("eu")) {
                 event.getChannel().sendMessage("I only support ``US`` or ``EU``. Please type one or the other.").queue();
                 return;
@@ -141,7 +141,7 @@ public void onMessageReceived(MessageReceivedEvent event) {
         }
 
         if (setupHandler.getState() == SetupState.STEP_REALM) {
-            String realm = event.getMessage().getContent();
+            String realm = event.getMessage().getContentDisplay();
 
             try {
                 String realmData = WoWUtils.getRealmInformation(plugin.getBot(),plugin.getBot().getGuildSettings(event.getGuild()).getRegionName(), realm);
@@ -171,7 +171,7 @@ public void onMessageReceived(MessageReceivedEvent event) {
         }
 
         if (setupHandler.getState() == SetupState.STEP_REALM_CONFIRM) {
-            String confirmation = event.getMessage().getContent();
+            String confirmation = event.getMessage().getContentDisplay();
             if (confirmation.equalsIgnoreCase("no")) {
 
                 event.getChannel().sendMessage("Please type the realm name you want to configure.").queue();
@@ -199,7 +199,7 @@ public void onMessageReceived(MessageReceivedEvent event) {
             return;
         }
         if (setupHandler.getState() == SetupState.STEP_GUILD) {
-            String guild = event.getMessage().getContent();
+            String guild = event.getMessage().getContentDisplay();
             GuildSettings settings = plugin.getBot().getGuildSettings(event.getGuild());
             try {
                 if (guildExist(settings.getRegionName(),settings.getWowServerName(),guild)) {