Update to JDA v4

pom.xml

@@ -15,7 +15,6 @@
 	<distributionManagement>
         <downloadUrl>https://gitlab.xtremcommunity.com/nn.jar</downloadUrl>
 	</distributionManagement>
-
 	<repositories>
 		<repository> <!-- This repo fixes issues with transitive dependencies -->
 			<id>jcenter</id>
@@ -28,13 +27,13 @@
 		<dependency>
 			<groupId>net.dv8tion</groupId>
 			<artifactId>JDA</artifactId>
-			<version>3.8.1_437</version>
+			<version>4.1.0_81</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
-			<version>3.11.0</version>
+			<version>3.13.0</version>
 		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.json/json -->
@@ -80,7 +79,7 @@
 		<dependency>
 			<groupId>com.sedmelluq</groupId>
 			<artifactId>lavaplayer</artifactId>
-			<version>1.3.10</version>
+			<version>1.3.33</version>
 		</dependency>
         <dependency>
             <groupId>junit</groupId>

src/main/java/netneutrality/MusicBot.java

@@ -1,9 +1,10 @@
 package netneutrality;
 
-import net.dv8tion.jda.core.AccountType;
-import net.dv8tion.jda.core.JDA;
-import net.dv8tion.jda.core.JDABuilder;
-import net.dv8tion.jda.core.entities.Game;
+import net.dv8tion.jda.api.AccountType;
+import net.dv8tion.jda.api.JDA;
+import net.dv8tion.jda.api.JDABuilder;
+import net.dv8tion.jda.api.entities.Activity;
+
 import netneutrality.db.DBController;
 import netneutrality.handler.ConsoleHandler;
 import netneutrality.handler.EditHandler;
@@ -12,6 +13,7 @@ import netneutrality.handler.NewCommandListener;
 import netneutrality.http.server.WebApi;
 import netneutrality.music.MusicManager;
 import netneutrality.utils.Settings;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -19,61 +21,61 @@ import javax.security.auth.login.LoginException;
 
 public class MusicBot {
 
-	private static JDA jda;
-	public static Logger LOGGER  = LoggerFactory.getLogger(MusicBot.class);
+    private static JDA jda;
+    public static Logger LOGGER = LoggerFactory.getLogger(MusicBot.class);
 
-	public static void main(String[] args) {
-		System.setProperty("log4j.skipJansi", "false");
-		DBController.init();
+    public static void main(String[] args) {
+        System.setProperty("log4j.skipJansi", "false");
+        DBController.init();
 
-		try {
-			jda = new JDABuilder(AccountType.BOT).setToken(Settings.TOKEN).build();
-			jda.awaitReady();
-		} catch (LoginException | IllegalArgumentException e) {
-			LogHandler.log(e);
-		} catch (InterruptedException e) {
-			LOGGER.error(e.getMessage());
-		}
+        try {
+            jda = new JDABuilder(AccountType.BOT).setToken(Settings.TOKEN).build();
+            jda.awaitReady();
+        } catch (LoginException | IllegalArgumentException e) {
+            LogHandler.log(e);
+        } catch (InterruptedException e) {
+            LOGGER.error(e.getMessage());
+        }
 
 
-		jda.getPresence().setGame(Game.watching("me load..."));
-		jda.addEventListener(new NewCommandListener(), new EditHandler());
+        jda.getPresence().setActivity(Activity.watching("me load..."));
+        jda.addEventListener(new NewCommandListener(), new EditHandler());
 
-		// WebApi webserver = new WebApi();
+        // WebApi webserver = new WebApi();
 
-		jda.getPresence().setGame(Game.watching("rape"));
+        jda.getPresence().setActivity(Activity.watching("rape"));
 
 
-		ConsoleHandler consoleInput = new ConsoleHandler();
+        ConsoleHandler consoleInput = new ConsoleHandler();
 
-		switch (consoleInput.init()) {
+        switch (consoleInput.init()) {
 
-        case "quit":
-            shutdown();
-            break;
+            case "quit":
+                shutdown();
+                break;
 
         }
 
-	}
+    }
 
-	public static void shutdown() {
-		LOGGER.info("[Net Neutrality] Shutting down...");
-		MusicManager.disconnectPlayers();
-		disconnect();
-		DBController.shutdown();
-		ThreadManager.shutdownExecutor();
-		LOGGER.info("[Net Neutrality] Shutdown complete");
-		System.exit(0);
-	}
+    public static void shutdown() {
+        LOGGER.info("[Net Neutrality] Shutting down...");
+        MusicManager.disconnectPlayers();
+        disconnect();
+        DBController.shutdown();
+        ThreadManager.shutdownExecutor();
+        LOGGER.info("[Net Neutrality] Shutdown complete");
+        System.exit(0);
+    }
 
-	public static JDA getJDA() {
-		return jda;
-	}
+    public static JDA getJDA() {
+        return jda;
+    }
 
-	public static void disconnect() {
-		if (jda != null)
-			jda.shutdown();
-	}
+    public static void disconnect() {
+        if (jda != null)
+            jda.shutdown();
+    }
 
 
 }

src/main/java/netneutrality/command/AbstractCommand.java

@@ -3,7 +3,7 @@ package netneutrality.command;
 import java.util.Arrays;
 import java.util.List;
 
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 public abstract class AbstractCommand {
 	

src/main/java/netneutrality/command/Visibility.java

@@ -6,9 +6,9 @@ package netneutrality.command;
  * This file is closed-source. It should not be distributed or copied in any way or form
  */
 
-import net.dv8tion.jda.core.entities.MessageChannel;
-import net.dv8tion.jda.core.entities.PrivateChannel;
-import net.dv8tion.jda.core.entities.TextChannel;
+import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.PrivateChannel;
+import net.dv8tion.jda.api.entities.TextChannel;
 
 public enum Visibility {
 

src/main/java/netneutrality/command/basic/HelpCommand.java

@@ -1,18 +1,18 @@
 package netneutrality.command.basic;
 
-import java.awt.Color;
-import java.util.HashMap;
-
-import net.dv8tion.jda.core.EmbedBuilder;
-import net.dv8tion.jda.core.MessageBuilder;
-import net.dv8tion.jda.core.entities.MessageChannel;
-import net.dv8tion.jda.core.entities.TextChannel;
-import net.dv8tion.jda.core.entities.User;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.MessageBuilder;
+import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 import netneutrality.utils.Settings;
 
+import java.awt.*;
+import java.util.HashMap;
+
 public class HelpCommand extends AbstractCommand {
 	
 	public HelpCommand() {

src/main/java/netneutrality/command/basic/PingCommand.java

@@ -1,6 +1,6 @@
 package netneutrality.command.basic;
 
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.MusicBot;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
@@ -13,7 +13,7 @@ public class PingCommand extends AbstractCommand {
 	@Override
 	public String execute(MessageReceivedEvent event, String args) {
 		if (countArgs(args) == 0)
-			event.getChannel().sendMessage("Pong! [" + MusicBot.getJDA().getPing() + " ms]").queue();
+			event.getChannel().sendMessage("Pong! [" + MusicBot.getJDA().getGatewayPing() + " ms]").queue();
 		
 		return null;
 		

src/main/java/netneutrality/command/crypto/BitcoinPriceCommand.java

@@ -7,8 +7,8 @@ import netneutrality.command.Visibility;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import net.dv8tion.jda.core.entities.Message;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.http.WebModule;
 

src/main/java/netneutrality/command/crypto/EthereumPriceCommand.java

@@ -6,8 +6,8 @@ import java.util.function.Consumer;
 import netneutrality.command.Visibility;
 import org.json.JSONException;
 
-import net.dv8tion.jda.core.entities.Message;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.http.WebModule;
 

src/main/java/netneutrality/command/crypto/LitecoinPriceCommand.java

@@ -6,8 +6,8 @@ import java.util.function.Consumer;
 import netneutrality.command.Visibility;
 import org.json.JSONException;
 
-import net.dv8tion.jda.core.entities.Message;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.http.WebModule;
 

src/main/java/netneutrality/command/message/BlacklistCommand.java

@@ -1,6 +1,6 @@
 package netneutrality.command.message;
 
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 import netneutrality.db.DBController;

src/main/java/netneutrality/command/message/PruneCommand.java

@@ -1,6 +1,6 @@
 package netneutrality.command.message;
 
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 import netneutrality.utils.ChannelFunction;

src/main/java/netneutrality/command/music/BitconnectCommand.java

@@ -6,9 +6,9 @@ package netneutrality.command.music;
  * This file is closed-source. It should not be distributed or copied in any way or form
  */
 
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.entities.VoiceChannel;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.VoiceChannel;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 import netneutrality.music.MusicManager;

src/main/java/netneutrality/command/music/DeleteQueueCommand.java

@@ -6,9 +6,9 @@ package netneutrality.command.music;
  * This file is closed-source. It should not be distributed or copied in any way or form
  */
 
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.entities.VoiceChannel;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.VoiceChannel;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 import netneutrality.music.MusicManager;

src/main/java/netneutrality/command/music/JoinCommand.java

@@ -6,9 +6,9 @@ package netneutrality.command.music;
  * This file is closed-source. It should not be distributed or copied in any way or form
  */
 
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.entities.VoiceChannel;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.VoiceChannel;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 import netneutrality.music.MusicManager;

src/main/java/netneutrality/command/music/LeaveCommand.java

@@ -6,9 +6,9 @@ package netneutrality.command.music;
  * This file is closed-source. It should not be distributed or copied in any way or form
  */
 
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.entities.VoiceChannel;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.VoiceChannel;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 import netneutrality.music.MusicManager;

src/main/java/netneutrality/command/music/PlayCommand.java

@@ -6,9 +6,9 @@ package netneutrality.command.music;
  * This file is closed-source. It should not be distributed or copied in any way or form
  */
 
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.entities.VoiceChannel;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.VoiceChannel;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 import netneutrality.music.MusicManager;

src/main/java/netneutrality/command/music/SkipCommand.java

@@ -6,9 +6,9 @@ package netneutrality.command.music;
  * This file is closed-source. It should not be distributed or copied in any way or form
  */
 
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.entities.VoiceChannel;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.VoiceChannel;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 import netneutrality.music.MusicManager;

src/main/java/netneutrality/command/music/StopCommand.java

@@ -6,9 +6,9 @@ package netneutrality.command.music;
  * This file is closed-source. It should not be distributed or copied in any way or form
  */
 
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.entities.VoiceChannel;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.VoiceChannel;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 import netneutrality.music.MusicManager;

src/main/java/netneutrality/command/music/VolumeCommand.java

@@ -6,9 +6,9 @@ package netneutrality.command.music;
  * This file is closed-source. It should not be distributed or copied in any way or form
  */
 
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.entities.VoiceChannel;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.VoiceChannel;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 import netneutrality.music.MusicManager;

src/main/java/netneutrality/command/specific/DatabaseCommand.java

@@ -6,10 +6,10 @@ import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.function.Consumer;
 
-import net.dv8tion.jda.core.EmbedBuilder;
-import net.dv8tion.jda.core.entities.PrivateChannel;
-import net.dv8tion.jda.core.entities.User;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.PrivateChannel;
+import net.dv8tion.jda.api.entities.User;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 import netneutrality.db.DBController;

src/main/java/netneutrality/command/specific/EvalMethod.java

@@ -6,7 +6,7 @@ package netneutrality.command.specific;
  * This file is closed-source. It should not be distributed or copied in any way or form
  */
 
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 import netneutrality.music.MusicManager;

src/main/java/netneutrality/command/specific/LoggingCommand.java

@@ -1,6 +1,6 @@
 package netneutrality.command.specific;
 
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 

src/main/java/netneutrality/command/specific/SellyCommand.java

@@ -6,7 +6,7 @@ package netneutrality.command.specific;
  * This file is closed-source. It should not be distributed or copied in any way or form
  */
 
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 import netneutrality.db.DBController;

src/main/java/netneutrality/command/specific/ShutdownCommand.java

@@ -1,6 +1,6 @@
 package netneutrality.command.specific;
 
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 

src/main/java/netneutrality/command/specific/TestCommand.java

@@ -6,7 +6,7 @@ package netneutrality.command.specific;
  * This file is closed-source. It should not be distributed or copied in any way or form
  */
 
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.Visibility;
 import netneutrality.utils.MessageFunction;

src/main/java/netneutrality/db/controllers/DBLogging.java

@@ -7,8 +7,8 @@ package netneutrality.db.controllers;
  * https://discord.gg/CdFcyQ
  */
 
-import net.dv8tion.jda.core.entities.Guild;
-import net.dv8tion.jda.core.entities.TextChannel;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.TextChannel;
 import netneutrality.MusicBot;
 import netneutrality.ThreadManager;
 import netneutrality.db.AbstractController;

src/main/java/netneutrality/handler/EditHandler.java

@@ -2,9 +2,9 @@ package netneutrality.handler;
 
 import java.awt.Color;
 
-import net.dv8tion.jda.core.EmbedBuilder;
-import net.dv8tion.jda.core.events.message.MessageUpdateEvent;
-import net.dv8tion.jda.core.hooks.ListenerAdapter;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.events.message.MessageUpdateEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import netneutrality.db.DBController;
 import netneutrality.db.MysqlDatabase;
 import netneutrality.db.controllers.DBMessage;
@@ -38,7 +38,7 @@ public class EditHandler extends ListenerAdapter {
 			}
 			
 			editEmbed.setFooter("ID : " + event.getMessageId(), null);
-			editEmbed.setTimestamp(event.getMessage().getCreationTime());
+			editEmbed.setTimestamp(event.getMessage().getTimeCreated());
 			event.getJDA().getTextChannelById(logChannel.toString()).sendMessage(editEmbed.build()).queue();
 		}
 		

src/main/java/netneutrality/handler/MessageRateLimit.java

@@ -1,9 +1,9 @@
 package netneutrality.handler;
 
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.entities.Message;
-import net.dv8tion.jda.core.entities.MessageChannel;
-import net.dv8tion.jda.core.entities.PrivateChannel;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.MessageChannel;
+import net.dv8tion.jda.api.entities.PrivateChannel;
 
 import java.time.OffsetDateTime;
 
@@ -20,21 +20,21 @@ public class MessageRateLimit {
 		
 		if (lastSender == null || timestamp == null) {
 			lastSender = member;
-			timestamp = message.getCreationTime();
+			timestamp = message.getTimeCreated();
 			return false;
 		}
 		
 		if (member.getUser().getId().equals(lastSender.getUser().getId())) {
-			if (message.getCreationTime().minusNanos(cooldown).isBefore(timestamp)) {
+			if (message.getTimeCreated().minusNanos(cooldown).isBefore(timestamp)) {
 				lastSender = member;
-				timestamp = message.getCreationTime();
+				timestamp = message.getTimeCreated();
 				message.delete().queue();
 				return true;
 			}
 		}
 		
 		lastSender = member;
-		timestamp = message.getCreationTime();
+		timestamp = message.getTimeCreated();
 		
 		return false;
 		

src/main/java/netneutrality/handler/NewCommandListener.java

@@ -1,9 +1,11 @@
 package netneutrality.handler;
 
-import net.dv8tion.jda.core.entities.ChannelType;
-import net.dv8tion.jda.core.entities.Message;
-import net.dv8tion.jda.core.events.message.MessageReceivedEvent;
-import net.dv8tion.jda.core.hooks.ListenerAdapter;
+
+
+import net.dv8tion.jda.api.entities.ChannelType;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
 import netneutrality.command.AbstractCommand;
 import netneutrality.command.CommandManager;
 import netneutrality.command.Visibility;
@@ -32,7 +34,7 @@ public class NewCommandListener extends ListenerAdapter {
 		if (event.isFromType(ChannelType.TEXT)) {
 			((DBMessage) DBController.get("message")).log(event.getGuild().getName(), event.getTextChannel().getName(),
 					event.getMember().getUser().getName(),
-					event.getMessage().getCreationTime().format(DateTimeFormatter.ofPattern(Settings.DATETIMEFORMAT)), event.getMessage().getId(),
+					event.getMessage().getTimeCreated().format(DateTimeFormatter.ofPattern(Settings.DATETIMEFORMAT)), event.getMessage().getId(),
 					event.getMessage().getContentDisplay().trim());
 		}
 

src/main/java/netneutrality/handler/ServerJoinHandler.java

@@ -7,8 +7,8 @@ package netneutrality.handler;
  * https://discord.gg/CdFcyQ
  */
 
-import net.dv8tion.jda.core.events.guild.GuildJoinEvent;
-import net.dv8tion.jda.core.hooks.ListenerAdapter;
+import net.dv8tion.jda.api.events.guild.GuildJoinEvent;
+import net.dv8tion.jda.api.hooks.ListenerAdapter;
 
 public class ServerJoinHandler extends ListenerAdapter {
 

src/main/java/netneutrality/http/server/GuildBrowser.java

@@ -8,8 +8,8 @@ package netneutrality.http.server;
 
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
-import net.dv8tion.jda.core.entities.Guild;
-import net.dv8tion.jda.core.entities.Member;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.Member;
 import netneutrality.MusicBot;
 import netneutrality.http.WebModule;
 

src/main/java/netneutrality/music/AudioPlayerSendHandler.java

@@ -8,7 +8,9 @@ package netneutrality.music;
 
 import com.sedmelluq.discord.lavaplayer.player.AudioPlayer;
 import com.sedmelluq.discord.lavaplayer.track.playback.AudioFrame;
-import net.dv8tion.jda.core.audio.AudioSendHandler;
+import net.dv8tion.jda.api.audio.AudioSendHandler;
+
+import java.nio.ByteBuffer;
 
 /**
  * This is a wrapper around AudioPlayer which makes it behave as an AudioSendHandler for JDA. As JDA calls canProvide
@@ -36,7 +38,7 @@ public class AudioPlayerSendHandler implements AudioSendHandler {
   }
 
   @Override
-  public byte[] provide20MsAudio() {
+  public ByteBuffer provide20MsAudio() {
     if (lastFrame == null) {
       lastFrame = audioPlayer.provide();
     }
@@ -44,7 +46,7 @@ public class AudioPlayerSendHandler implements AudioSendHandler {
     byte[] data = lastFrame != null ? lastFrame.getData() : null;
     lastFrame = null;
 
-    return data;
+    return ByteBuffer.wrap(data);
   }
 
   @Override

src/main/java/netneutrality/music/MusicManager.java

@@ -14,7 +14,7 @@ import com.sedmelluq.discord.lavaplayer.source.AudioSourceManagers;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import net.dv8tion.jda.core.entities.*;
+import net.dv8tion.jda.api.entities.*;
 import netneutrality.MusicBot;
 import netneutrality.handler.LogHandler;
 import netneutrality.utils.MessageFunction;

src/main/java/netneutrality/music/SourceFinder.java

@@ -1,6 +1,6 @@
 package netneutrality.music;
 
-import net.dv8tion.jda.core.entities.TextChannel;
+import net.dv8tion.jda.api.entities.TextChannel;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

src/main/java/netneutrality/music/TrackScheduler.java

@@ -11,7 +11,7 @@ import com.sedmelluq.discord.lavaplayer.player.event.AudioEventAdapter;
 import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import com.sedmelluq.discord.lavaplayer.track.AudioTrackEndReason;
-import net.dv8tion.jda.core.entities.TextChannel;
+import net.dv8tion.jda.api.entities.TextChannel;
 
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;

src/main/java/netneutrality/utils/ChannelFunction.java

@@ -3,8 +3,9 @@ package netneutrality.utils;
 import java.time.OffsetDateTime;
 import java.util.List;
 
-import net.dv8tion.jda.core.entities.Message;
-import net.dv8tion.jda.core.entities.TextChannel;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.TextChannel;
+import netneutrality.ThreadManager;
 
 public class ChannelFunction {
 
@@ -12,7 +13,8 @@ public class ChannelFunction {
 
 		if (toDelete >= 2500) return;
 
-		Thread deleteMessage = new Thread(() -> {
+        ThreadManager.executor.submit(() -> {
+
             int toDeleteFinal = toDelete + 1;
             int iteration = toDeleteFinal / 100;
             for (int i = 0; i < iteration; i++) {
@@ -27,9 +29,8 @@ public class ChannelFunction {
                 deleteFromList(messages, channel);
 
             }
-        });
 
-		deleteMessage.start();
+        });
 
 	}
 
@@ -40,7 +41,7 @@ public class ChannelFunction {
 
         } catch (IllegalArgumentException e) {
             messages.forEach(m -> {
-				if (!m.getCreationTime().isBefore(OffsetDateTime.now().minusWeeks(Long.parseLong("2")))) {
+				if (!m.getTimeCreated().isBefore(OffsetDateTime.now().minusWeeks(2))) {
 					m.delete().queue();
 				}
 			});

src/main/java/netneutrality/utils/MessageFunction.java

@@ -11,8 +11,8 @@ import java.time.OffsetDateTime;
 import java.util.List;
 
 import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
-import net.dv8tion.jda.core.EmbedBuilder;
-import net.dv8tion.jda.core.entities.*;
+import net.dv8tion.jda.api.EmbedBuilder;
+import net.dv8tion.jda.api.entities.*;
 import netneutrality.db.DBController;
 import netneutrality.db.controllers.DBBlacklist;
 import netneutrality.db.models.MBlacklist;

src/main/java/netneutrality/utils/Settings.java

@@ -1,8 +1,8 @@
 package netneutrality.utils;
 
-import net.dv8tion.jda.core.entities.Guild;
-import net.dv8tion.jda.core.entities.TextChannel;
-import net.dv8tion.jda.core.entities.User;
+import net.dv8tion.jda.api.entities.Guild;
+import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.User;
 import netneutrality.MusicBot;
 import netneutrality.db.DBController;
 import netneutrality.db.controllers.DBSettings;

src/main/java/netneutrality/utils/UserFunction.java

@@ -1,8 +1,8 @@
 package netneutrality.utils;
 
-import net.dv8tion.jda.core.Permission;
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.entities.Role;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Role;
 
 public class UserFunction {