Updated JDA

build.gradle.kts

@@ -58,7 +58,7 @@ tasks {
 
 dependencies {
 // JDA
-    implementation("net.dv8tion:JDA:5.0.0-alpha.10") {
+    implementation("net.dv8tion:JDA:5.0.0-alpha.19") {
         exclude("opus-java") // exclude audio
     }
     // MySQL

src/main/java/com/alttd/AltitudeBot.java

@@ -1,24 +1,20 @@
 package com.alttd;
 
-import com.alttd.commandManager.listeners.JDAListener;
 import com.alttd.config.MessagesConfig;
 import com.alttd.config.SettingsConfig;
 import com.alttd.console.ConsoleCommandManager;
 import com.alttd.database.Database;
 import com.alttd.database.DatabaseTables;
+import com.alttd.listeners.JDAListener;
 import com.alttd.util.Logger;
-import com.alttd.util.Util;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.JDABuilder;
 import net.dv8tion.jda.api.OnlineStatus;
 import net.dv8tion.jda.api.entities.Activity;
 
-import javax.security.auth.login.LoginException;
 import java.io.File;
 import java.net.URISyntaxException;
 
-import static java.lang.System.exit;
-
 public class AltitudeBot {
 
     private JDA jda;
@@ -36,13 +32,7 @@ public class AltitudeBot {
     private void start() {
         Logger.info("Starting bot...");
         initConfigs();
-        try {
+        jda = JDABuilder.createDefault(SettingsConfig.TOKEN).build();
-            jda = JDABuilder.createDefault(SettingsConfig.TOKEN).build();
-        } catch (LoginException e) {
-            Logger.info("Unable to log in, shutting down (check token in settings.yml).");
-            Logger.exception(e);
-            exit(1);
-        }
         DatabaseTables.createTables(Database.getDatabase().getConnection());
         ConsoleCommandManager.startConsoleCommands(jda);
         try {

src/main/java/com/alttd/commandManager/commands/PollCommand/CommandPoll.java

@@ -8,10 +8,10 @@ import com.alttd.util.Util;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
+import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions;
 import net.dv8tion.jda.api.interactions.commands.OptionType;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
 import net.dv8tion.jda.api.interactions.commands.build.Commands;
-import net.dv8tion.jda.api.interactions.commands.build.OptionData;
 import net.dv8tion.jda.api.interactions.commands.build.SubcommandData;
 
 import java.util.HashMap;
@@ -53,7 +53,7 @@ public class CommandPoll extends DiscordCommand {
                         new SubcommandData("results", "Get the results for a poll")
                                 .addOption(OptionType.CHANNEL, "channel", "Channel this poll is in", true)
                                 .addOption(OptionType.STRING, "message_id", "Id of the poll you want the results for", true));
-        commandData.setDefaultEnabled(true);
+        commandData.setDefaultPermissions(DefaultMemberPermissions.ENABLED);
         Util.registerSubOptions(subOptionsMap,
                 new SubCommandAdd(null,this),
                 new SubCommandAddButton(null, this),

src/main/java/com/alttd/commandManager/commands/PollCommand/SubCommandAdd.java

@@ -3,14 +3,16 @@ package com.alttd.commandManager.commands.PollCommand;
 import com.alttd.commandManager.DiscordCommand;
 import com.alttd.commandManager.SubCommand;
 import com.alttd.commandManager.SubCommandGroup;
-import com.alttd.config.MessagesConfig;
 import com.alttd.templates.Parser;
 import com.alttd.templates.Template;
 import com.alttd.util.Logger;
 import com.alttd.util.OptionMappingParsing;
 import com.alttd.util.Util;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.InteractionHook;

src/main/java/com/alttd/commandManager/commands/PollCommand/SubCommandAddButton.java

@@ -8,11 +8,10 @@ import com.alttd.templates.Template;
 import com.alttd.util.Logger;
 import com.alttd.util.OptionMappingParsing;
 import com.alttd.util.Util;
-import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.ChannelType;
-import net.dv8tion.jda.api.entities.GuildMessageChannel;
 import net.dv8tion.jda.api.entities.Member;
 import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.InteractionHook;

src/main/java/com/alttd/commandManager/commands/PollCommand/SubCommandClose.java

@@ -5,7 +5,7 @@ import com.alttd.commandManager.SubCommand;
 import com.alttd.commandManager.SubCommandGroup;
 import com.alttd.util.OptionMappingParsing;
 import com.alttd.util.Util;
-import net.dv8tion.jda.api.entities.GuildMessageChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 

src/main/java/com/alttd/commandManager/commands/PollCommand/SubCommandEditDescription.java

@@ -6,8 +6,8 @@ import com.alttd.commandManager.SubCommandGroup;
 import com.alttd.util.OptionMappingParsing;
 import com.alttd.util.Util;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.GuildMessageChannel;
 import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.InteractionHook;

src/main/java/com/alttd/commandManager/commands/PollCommand/SubCommandEditTitle.java

@@ -6,8 +6,8 @@ import com.alttd.commandManager.SubCommandGroup;
 import com.alttd.util.OptionMappingParsing;
 import com.alttd.util.Util;
 import net.dv8tion.jda.api.EmbedBuilder;
-import net.dv8tion.jda.api.entities.GuildMessageChannel;
 import net.dv8tion.jda.api.entities.Message;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.InteractionHook;

src/main/java/com/alttd/commandManager/commands/PollCommand/SubCommandOpen.java

@@ -5,7 +5,7 @@ import com.alttd.commandManager.SubCommand;
 import com.alttd.commandManager.SubCommandGroup;
 import com.alttd.util.OptionMappingParsing;
 import com.alttd.util.Util;
-import net.dv8tion.jda.api.entities.GuildMessageChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 

src/main/java/com/alttd/commandManager/commands/PollCommand/SubCommandRemoveButton.java

@@ -4,7 +4,7 @@ import com.alttd.commandManager.DiscordCommand;
 import com.alttd.commandManager.SubCommand;
 import com.alttd.commandManager.SubCommandGroup;
 import com.alttd.util.OptionMappingParsing;
-import net.dv8tion.jda.api.entities.GuildMessageChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 

src/main/java/com/alttd/commandManager/commands/PollCommand/SubCommandResults.java

@@ -4,7 +4,7 @@ import com.alttd.commandManager.DiscordCommand;
 import com.alttd.commandManager.SubCommand;
 import com.alttd.commandManager.SubCommandGroup;
 import com.alttd.util.OptionMappingParsing;
-import net.dv8tion.jda.api.entities.GuildMessageChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 

src/main/java/com/alttd/util/OptionMappingParsing.java

@@ -1,6 +1,6 @@
 package com.alttd.util;
 
-import net.dv8tion.jda.api.entities.GuildMessageChannel;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 
@@ -14,9 +14,9 @@ public class OptionMappingParsing {
         return text;
     }
 
-    public static  GuildMessageChannel getGuildChannel(String optionName, SlashCommandInteractionEvent event, String commandName) {
+    public static GuildMessageChannel getGuildChannel(String optionName, SlashCommandInteractionEvent event, String commandName) {
         OptionMapping optionMappingChannel = event.getInteraction().getOption(optionName);
-        GuildMessageChannel messageChannel = optionMappingChannel == null ? null : optionMappingChannel.getAsMessageChannel();
+        GuildMessageChannel messageChannel = optionMappingChannel == null ? null : optionMappingChannel.getAsChannel().asGuildMessageChannel();
         if (messageChannel == null)
             event.replyEmbeds(Util.invalidCommand(commandName, "Not a valid text channel or didn't give input for " + optionName, event.getInteraction())).setEphemeral(true).queue();
         return messageChannel;

src/main/java/com/alttd/util/Util.java

@@ -10,7 +10,8 @@ import com.alttd.templates.Template;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
-import net.dv8tion.jda.api.interactions.commands.Command;
+import net.dv8tion.jda.api.entities.channel.ChannelType;
+import net.dv8tion.jda.api.entities.channel.middleman.GuildMessageChannel;
 import net.dv8tion.jda.api.interactions.commands.OptionMapping;
 import net.dv8tion.jda.api.interactions.commands.SlashCommandInteraction;
 import net.dv8tion.jda.api.interactions.commands.build.CommandData;
@@ -22,7 +23,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public class Util {
     public static List<Long> getGroupIds(Member member) {