Altitude/AltitudeBot
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update JDA

Browse Source
This commit is contained in:
Len 2022-09-09 15:31:14 +02:00
parent 3bb4fa8b0f
commit d371b44a66
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle.kts
View File

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

4
src/main/java/com/alttd/commandManager/commands/AddCommand/CommandManage.java
View File

@ -52,7 +52,7 @@ public class CommandManage extends DiscordCommand {
.addOption(OptionType.CHANNEL, "channel", "Channel to disable this command in", true) .addOption(OptionType.CHANNEL, "channel", "Channel to disable this command in", true)
.addOption(OptionType.STRING, "command", "Name of the command to disable", true, true) .addOption(OptionType.STRING, "command", "Name of the command to disable", true, true)
); );
slashCommandData.setDefaultEnabled(true); // slashCommandData.setDefaultEnabled(true);
Util.registerSubOptions(subOptionsMap, Util.registerSubOptions(subOptionsMap,
new SubCommandDisable(commandManager, null, this), new SubCommandDisable(commandManager, null, this),
new SubCommandEnable(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(); event.replyEmbeds(Util.guildOnlyCommand(getName())).setEphemeral(true).queue();
return; 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(); event.replyEmbeds(Util.noPermission(getName())).setEphemeral(true).queue();
return; return;
} }

2
src/main/java/com/alttd/commandManager/commands/AddCommand/SubCommandGroupSet.java
View File

@ -28,7 +28,7 @@ public class SubCommandGroupSet extends SubCommandGroup {
@Override @Override
public void execute(SlashCommandInteractionEvent event) { 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(); event.replyEmbeds(Util.noPermission(getName())).setEphemeral(true).queue();
return; return;
} }

2
src/main/java/com/alttd/commandManager/commands/AddCommand/SubCommandGroupUnset.java
View File

@ -28,7 +28,7 @@ public class SubCommandGroupUnset extends SubCommandGroup {
@Override @Override
public void execute(SlashCommandInteractionEvent event) { 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(); event.replyEmbeds(Util.noPermission(getName())).setEphemeral(true).queue();
return; return;
} }

4
src/main/java/com/alttd/commandManager/commands/CommandHelp.java
View File

@ -45,14 +45,14 @@ public class CommandHelp extends DiscordCommand {
public void execute(SlashCommandInteractionEvent event) { public void execute(SlashCommandInteractionEvent event) {
PermissionManager permissionManager = PermissionManager.getInstance(); 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(); event.replyEmbeds(Util.noPermission(getName())).setEphemeral(true).queue();
return; return;
} }
StringBuilder helpMessage = new StringBuilder(); StringBuilder helpMessage = new StringBuilder();
List<OptionMapping> options = event.getOptions(); List<OptionMapping> options = event.getOptions();
TextChannel textChannel = event.getTextChannel(); TextChannel textChannel = event.getChannel().asTextChannel();
if (options.size() == 0) { if (options.size() == 0) {
commandManager.getCommands(textChannel).stream() commandManager.getCommands(textChannel).stream()
.filter(command -> permissionManager.hasPermission( .filter(command -> permissionManager.hasPermission(

4
src/main/java/com/alttd/commandManager/commands/PollCommand/CommandPoll.java
View File

@ -53,7 +53,7 @@ public class CommandPoll extends DiscordCommand {
new SubcommandData("results", "Get the results for a poll") new SubcommandData("results", "Get the results for a poll")
.addOption(OptionType.CHANNEL, "channel", "Channel this poll is in", true) .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)); .addOption(OptionType.INTEGER, "message_id", "Id of the poll you want the results for", true));
slashCommandData.setDefaultEnabled(true); // slashCommandData.setDefaultEnabled(true);
Util.registerSubOptions(subOptionsMap, Util.registerSubOptions(subOptionsMap,
new SubCommandAdd(null,this), new SubCommandAdd(null,this),
new SubCommandAddButton(null, this), new SubCommandAddButton(null, this),
@ -77,7 +77,7 @@ public class CommandPoll extends DiscordCommand {
event.replyEmbeds(Util.guildOnlyCommand(getName())).setEphemeral(true).queue(); event.replyEmbeds(Util.guildOnlyCommand(getName())).setEphemeral(true).queue();
return; 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(); event.replyEmbeds(Util.noPermission(getName())).setEphemeral(true).queue();
return; return;
} }

2
src/main/java/com/alttd/util/OptionMappingParsing.java
View File

@ -16,7 +16,7 @@ public class OptionMappingParsing {
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); OptionMapping optionMappingChannel = event.getInteraction().getOption(optionName);
GuildMessageChannel messageChannel = optionMappingChannel == null ? null : optionMappingChannel.getAsMessageChannel(); GuildMessageChannel messageChannel = optionMappingChannel == null ? null : optionMappingChannel.getAsChannel().asGuildMessageChannel();
if (messageChannel == null) 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(); event.replyEmbeds(Util.invalidCommand(commandName, "Not a valid text channel or didn't give input for " + optionName, event.getInteraction())).setEphemeral(true).queue();
return messageChannel; return messageChannel;