Merge pull request #363 from Java-Discord/dynxsty/jda_alpha20

Upgraded to JDA v5.0.0-alpha.20

Author: jasonlessenich

build.gradle.kts

@@ -27,8 +27,8 @@ dependencies {
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.0")
 
     // DIH4JDA (Interaction Framework) & JDA
-    implementation("com.github.DynxstyGIT:DIH4JDA:f564af77e9")
-    implementation("net.dv8tion:JDA:5.0.0-alpha.17") {
+    implementation("com.github.DynxstyGIT:DIH4JDA:c8f7928efc")
+    implementation("net.dv8tion:JDA:5.0.0-alpha.20") {
         exclude(module = "opus-java")
     }
 

src/main/java/net/javadiscord/javabot/Bot.java

@@ -15,10 +15,10 @@
 import net.dv8tion.jda.api.OnlineStatus;
 import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.requests.GatewayIntent;
-import net.dv8tion.jda.api.utils.AllowedMentions;
 import net.dv8tion.jda.api.utils.ChunkingFilter;
 import net.dv8tion.jda.api.utils.MemberCachePolicy;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
+import net.dv8tion.jda.api.utils.messages.MessageRequest;
 import net.javadiscord.javabot.data.config.BotConfig;
 import net.javadiscord.javabot.data.h2db.DbHelper;
 import net.javadiscord.javabot.data.h2db.commands.QuickMigrateSubcommand;
@@ -145,7 +145,7 @@ public static void main(String[] args) throws Exception {
 				.enableIntents(GatewayIntent.GUILD_MEMBERS, GatewayIntent.GUILD_PRESENCES, GatewayIntent.MESSAGE_CONTENT)
 				.addEventListeners(autoMod, new StateListener())
 				.build();
-		AllowedMentions.setDefaultMentions(EnumSet.of(Message.MentionType.ROLE, Message.MentionType.CHANNEL, Message.MentionType.USER, Message.MentionType.EMOJI));
+		MessageRequest.setDefaultMentions(EnumSet.of(Message.MentionType.ROLE, Message.MentionType.CHANNEL, Message.MentionType.USER, Message.MentionType.EMOJI));
 		dih4jda = DIH4JDABuilder.setJDA(jda)
 				.setDefaultCommandType(RegistrationType.GLOBAL)
 				.disableLogging(DIH4JDALogger.Type.SMART_QUEUE_IGNORED)

src/main/java/net/javadiscord/javabot/data/config/guild/HelpConfig.java

@@ -2,8 +2,8 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import net.dv8tion.jda.api.entities.Category;
 import net.dv8tion.jda.api.entities.Role;
+import net.dv8tion.jda.api.entities.channel.concrete.Category;
 import net.javadiscord.javabot.data.config.GuildConfigItem;
 import net.javadiscord.javabot.systems.help.naming_strategies.*;
 

src/main/java/net/javadiscord/javabot/data/config/guild/MessageCacheConfig.java

@@ -2,7 +2,7 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.javadiscord.javabot.data.config.GuildConfigItem;
 
 import java.util.List;

src/main/java/net/javadiscord/javabot/data/config/guild/MetricsConfig.java

@@ -2,7 +2,7 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import net.dv8tion.jda.api.entities.Category;
+import net.dv8tion.jda.api.entities.channel.concrete.Category;
 import net.javadiscord.javabot.data.config.GuildConfigItem;
 
 /**

src/main/java/net/javadiscord/javabot/data/config/guild/ModerationConfig.java

@@ -3,7 +3,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.javadiscord.javabot.data.config.GuildConfigItem;
 
 import java.util.List;

src/main/java/net/javadiscord/javabot/data/config/guild/QOTWConfig.java

@@ -2,9 +2,9 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import net.dv8tion.jda.api.entities.NewsChannel;
 import net.dv8tion.jda.api.entities.Role;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.NewsChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.javadiscord.javabot.data.config.GuildConfigItem;
 
 /**

src/main/java/net/javadiscord/javabot/data/config/guild/StarboardConfig.java

@@ -2,7 +2,7 @@
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import net.dv8tion.jda.api.entities.TextChannel;
+import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
 import net.dv8tion.jda.api.entities.emoji.Emoji;
 import net.dv8tion.jda.api.entities.emoji.UnicodeEmoji;
 import net.javadiscord.javabot.data.config.GuildConfigItem;

src/main/java/net/javadiscord/javabot/data/h2db/commands/ExportSchemaSubcommand.java

@@ -6,6 +6,7 @@
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
+import net.dv8tion.jda.api.utils.FileUpload;
 import net.javadiscord.javabot.Bot;
 import net.javadiscord.javabot.util.ExceptionLogger;
 
@@ -45,7 +46,8 @@ public void execute(SlashCommandInteractionEvent event) {
 				if (!success) {
 					event.getHook().sendMessage("Exporting the schema was not successful.").queue();
 				} else {
-					event.getHook().sendMessage("The export was successful.").addFile(SCHEMA_FILE.toFile(), "database/schema.sql").queue(msg -> {
+					event.getHook().sendMessage("The export was successful.")
+							.addFiles(FileUpload.fromData(SCHEMA_FILE.toFile(), "database/schema.sql")).queue(msg -> {
 						try {
 							Files.delete(SCHEMA_FILE);
 						} catch (IOException e) {

src/main/java/net/javadiscord/javabot/data/h2db/commands/ExportTableSubcommand.java

@@ -7,6 +7,7 @@
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
+import net.dv8tion.jda.api.utils.FileUpload;
 import net.javadiscord.javabot.Bot;
 import net.javadiscord.javabot.util.ExceptionLogger;
 import net.javadiscord.javabot.util.Responses;
@@ -65,7 +66,8 @@ public void execute(SlashCommandInteractionEvent event) {
 				if (!success) {
 					event.getHook().sendMessage("Exporting the table was not successful.").queue();
 				} else {
-					event.getHook().sendMessage("The export was successful.").addFile(TABLE_FILE.toFile(), "table.sql").queue(msg -> {
+					event.getHook().sendMessage("The export was successful.")
+							.addFiles(FileUpload.fromData(TABLE_FILE.toFile(), "table.sql")).queue(msg -> {
 						try {
 							Files.delete(TABLE_FILE);
 						} catch (IOException e) {