diff --git a/build.gradle.kts b/build.gradle.kts index bc91869..8c0033e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,7 +54,7 @@ tasks { dependencies { // JDA - implementation("net.dv8tion:JDA:5.0.0-alpha.10") { + implementation("net.dv8tion:JDA:5.0.0-alpha.18") { exclude("opus-java") // exclude audio } // MySQL diff --git a/src/main/java/com/alttd/commandManager/commands/AddCommand/CommandManage.java b/src/main/java/com/alttd/commandManager/commands/AddCommand/CommandManage.java index 0a8a304..28b9bab 100644 --- a/src/main/java/com/alttd/commandManager/commands/AddCommand/CommandManage.java +++ b/src/main/java/com/alttd/commandManager/commands/AddCommand/CommandManage.java @@ -52,7 +52,7 @@ public class CommandManage extends DiscordCommand { .addOption(OptionType.CHANNEL, "channel", "Channel to disable this command in", true) .addOption(OptionType.STRING, "command", "Name of the command to disable", true, true) ); - slashCommandData.setDefaultEnabled(true); +// slashCommandData.setDefaultEnabled(true); Util.registerSubOptions(subOptionsMap, new SubCommandDisable(commandManager, null, this), new SubCommandEnable(commandManager, null, this)); @@ -70,7 +70,7 @@ public class CommandManage extends DiscordCommand { event.replyEmbeds(Util.guildOnlyCommand(getName())).setEphemeral(true).queue(); return; } - if (PermissionManager.getInstance().hasPermission(event.getTextChannel(), event.getIdLong(), Util.getGroupIds(event.getMember()), getPermission())) { + if (PermissionManager.getInstance().hasPermission(event.getChannel().asTextChannel(), event.getIdLong(), Util.getGroupIds(event.getMember()), getPermission())) { event.replyEmbeds(Util.noPermission(getName())).setEphemeral(true).queue(); return; } diff --git a/src/main/java/com/alttd/commandManager/commands/AddCommand/SubCommandGroupSet.java b/src/main/java/com/alttd/commandManager/commands/AddCommand/SubCommandGroupSet.java index f672bdf..9055897 100644 --- a/src/main/java/com/alttd/commandManager/commands/AddCommand/SubCommandGroupSet.java +++ b/src/main/java/com/alttd/commandManager/commands/AddCommand/SubCommandGroupSet.java @@ -28,7 +28,7 @@ public class SubCommandGroupSet extends SubCommandGroup { @Override public void execute(SlashCommandInteractionEvent event) { - if (PermissionManager.getInstance().hasPermission(event.getTextChannel(), event.getIdLong(), Util.getGroupIds(event.getMember()), getPermission())) { + if (PermissionManager.getInstance().hasPermission(event.getChannel().asTextChannel(), event.getIdLong(), Util.getGroupIds(event.getMember()), getPermission())) { event.replyEmbeds(Util.noPermission(getName())).setEphemeral(true).queue(); return; } diff --git a/src/main/java/com/alttd/commandManager/commands/AddCommand/SubCommandGroupUnset.java b/src/main/java/com/alttd/commandManager/commands/AddCommand/SubCommandGroupUnset.java index 26fc722..6e9e845 100644 --- a/src/main/java/com/alttd/commandManager/commands/AddCommand/SubCommandGroupUnset.java +++ b/src/main/java/com/alttd/commandManager/commands/AddCommand/SubCommandGroupUnset.java @@ -28,7 +28,7 @@ public class SubCommandGroupUnset extends SubCommandGroup { @Override public void execute(SlashCommandInteractionEvent event) { - if (PermissionManager.getInstance().hasPermission(event.getTextChannel(), event.getIdLong(), Util.getGroupIds(event.getMember()), getPermission())) { + if (PermissionManager.getInstance().hasPermission(event.getChannel().asTextChannel(), event.getIdLong(), Util.getGroupIds(event.getMember()), getPermission())) { event.replyEmbeds(Util.noPermission(getName())).setEphemeral(true).queue(); return; } diff --git a/src/main/java/com/alttd/commandManager/commands/CommandHelp.java b/src/main/java/com/alttd/commandManager/commands/CommandHelp.java index a256070..19efa52 100644 --- a/src/main/java/com/alttd/commandManager/commands/CommandHelp.java +++ b/src/main/java/com/alttd/commandManager/commands/CommandHelp.java @@ -45,14 +45,14 @@ public class CommandHelp extends DiscordCommand { public void execute(SlashCommandInteractionEvent event) { PermissionManager permissionManager = PermissionManager.getInstance(); - if (permissionManager.hasPermission(event.getTextChannel(), event.getIdLong(), Util.getGroupIds(event.getMember()), getPermission())) { + if (permissionManager.hasPermission(event.getChannel().asTextChannel(), event.getIdLong(), Util.getGroupIds(event.getMember()), getPermission())) { event.replyEmbeds(Util.noPermission(getName())).setEphemeral(true).queue(); return; } StringBuilder helpMessage = new StringBuilder(); List options = event.getOptions(); - TextChannel textChannel = event.getTextChannel(); + TextChannel textChannel = event.getChannel().asTextChannel(); if (options.size() == 0) { commandManager.getCommands(textChannel).stream() .filter(command -> permissionManager.hasPermission( diff --git a/src/main/java/com/alttd/commandManager/commands/PollCommand/CommandPoll.java b/src/main/java/com/alttd/commandManager/commands/PollCommand/CommandPoll.java index dbd0dc5..dc83025 100644 --- a/src/main/java/com/alttd/commandManager/commands/PollCommand/CommandPoll.java +++ b/src/main/java/com/alttd/commandManager/commands/PollCommand/CommandPoll.java @@ -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.INTEGER, "message_id", "Id of the poll you want the results for", true)); - slashCommandData.setDefaultEnabled(true); +// slashCommandData.setDefaultEnabled(true); Util.registerSubOptions(subOptionsMap, new SubCommandAdd(null,this), new SubCommandAddButton(null, this), @@ -77,7 +77,7 @@ public class CommandPoll extends DiscordCommand { event.replyEmbeds(Util.guildOnlyCommand(getName())).setEphemeral(true).queue(); return; } - if (PermissionManager.getInstance().hasPermission(event.getTextChannel(), event.getIdLong(), Util.getGroupIds(event.getMember()), getPermission())) { + if (PermissionManager.getInstance().hasPermission(event.getChannel().asTextChannel(), event.getIdLong(), Util.getGroupIds(event.getMember()), getPermission())) { event.replyEmbeds(Util.noPermission(getName())).setEphemeral(true).queue(); return; } diff --git a/src/main/java/com/alttd/util/OptionMappingParsing.java b/src/main/java/com/alttd/util/OptionMappingParsing.java index b3f7c93..086c237 100644 --- a/src/main/java/com/alttd/util/OptionMappingParsing.java +++ b/src/main/java/com/alttd/util/OptionMappingParsing.java @@ -16,7 +16,7 @@ public class OptionMappingParsing { 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;