From 70f4bf13d608859377a5576cb60c019aa6180300 Mon Sep 17 00:00:00 2001 From: Stijn Date: Wed, 21 Sep 2022 18:37:03 +0200 Subject: [PATCH] Added guildOnly to commands that need it --- .../commandManager/commands/AddCommand/CommandManage.java | 5 +++-- .../com/alttd/commandManager/commands/CommandEvidence.java | 5 ++++- .../java/com/alttd/commandManager/commands/CommandFlag.java | 3 ++- .../java/com/alttd/commandManager/commands/CommandHelp.java | 5 ++++- .../com/alttd/commandManager/commands/CommandHistory.java | 3 ++- .../commandManager/commands/CommandSetOutputChannel.java | 3 ++- .../com/alttd/commandManager/commands/CommandSuggestion.java | 5 ++++- .../alttd/commandManager/commands/CommandUpdateCommands.java | 3 ++- .../commandManager/commands/PollCommand/CommandPoll.java | 5 +++-- 9 files changed, 26 insertions(+), 11 deletions(-) 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 546c85c..35e1275 100644 --- a/src/main/java/com/alttd/commandManager/commands/AddCommand/CommandManage.java +++ b/src/main/java/com/alttd/commandManager/commands/AddCommand/CommandManage.java @@ -30,8 +30,9 @@ public class CommandManage extends DiscordCommand { .addOption(OptionType.STRING, "command", "Name of the command to enable", true, true), new SubcommandData("disable", "Disable a command") .addOption(OptionType.STRING, "command", "Name of the command to disable", true, true) - ); - commandData.setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.ADMINISTRATOR)); + ) + .setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.ADMINISTRATOR)) + .setGuildOnly(true); Util.registerSubOptions(subOptionsMap, new SubCommandEnable(commandManager, null, this), new SubCommandEnable(commandManager, null, this) diff --git a/src/main/java/com/alttd/commandManager/commands/CommandEvidence.java b/src/main/java/com/alttd/commandManager/commands/CommandEvidence.java index ccc366b..7dfc7bd 100644 --- a/src/main/java/com/alttd/commandManager/commands/CommandEvidence.java +++ b/src/main/java/com/alttd/commandManager/commands/CommandEvidence.java @@ -8,6 +8,7 @@ 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.build.CommandData; import net.dv8tion.jda.api.interactions.commands.build.Commands; import net.dv8tion.jda.api.interactions.components.Modal; @@ -23,7 +24,9 @@ public class CommandEvidence extends DiscordCommand { public CommandEvidence(JDA jda, ModalManager modalManager, CommandManager commandManager) { this.modalManager = modalManager; - commandData = Commands.slash(getName(), "Open suggestion form."); + commandData = Commands.slash(getName(), "Open suggestion form.") + .setDefaultPermissions(DefaultMemberPermissions.DISABLED) + .setGuildOnly(true); Util.registerCommand(commandManager, jda, commandData, getName()); } diff --git a/src/main/java/com/alttd/commandManager/commands/CommandFlag.java b/src/main/java/com/alttd/commandManager/commands/CommandFlag.java index bbc9b47..034e995 100644 --- a/src/main/java/com/alttd/commandManager/commands/CommandFlag.java +++ b/src/main/java/com/alttd/commandManager/commands/CommandFlag.java @@ -31,7 +31,8 @@ public class CommandFlag extends DiscordCommand { public CommandFlag(JDA jda, CommandManager commandManager) { this.commandData = Commands.slash(getName(), "Show flags for a user") .addOption(OptionType.STRING, "user", "The user to show flags for", true) - .setDefaultPermissions(DefaultMemberPermissions.ENABLED); + .setDefaultPermissions(DefaultMemberPermissions.ENABLED) + .setGuildOnly(true); Util.registerCommand(commandManager, jda, commandData, getName()); } diff --git a/src/main/java/com/alttd/commandManager/commands/CommandHelp.java b/src/main/java/com/alttd/commandManager/commands/CommandHelp.java index 88b0d27..0e2c7ad 100644 --- a/src/main/java/com/alttd/commandManager/commands/CommandHelp.java +++ b/src/main/java/com/alttd/commandManager/commands/CommandHelp.java @@ -11,6 +11,7 @@ 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.AutoCompleteQuery; +import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; import net.dv8tion.jda.api.interactions.commands.OptionMapping; import net.dv8tion.jda.api.interactions.commands.OptionType; import net.dv8tion.jda.api.interactions.commands.build.CommandData; @@ -30,7 +31,9 @@ public class CommandHelp extends DiscordCommand { this.commandManager = commandManager; commandData = Commands.slash(getName(), "Show info about all commands or a specific command.") - .addOption(OptionType.STRING, "command", "Command to get more info about", true , true); + .addOption(OptionType.STRING, "command", "Command to get more info about", true , true) + .setDefaultPermissions(DefaultMemberPermissions.ENABLED) + .setGuildOnly(true); Util.registerCommand(commandManager, jda, commandData, getName()); } diff --git a/src/main/java/com/alttd/commandManager/commands/CommandHistory.java b/src/main/java/com/alttd/commandManager/commands/CommandHistory.java index aacd21e..7dcf957 100644 --- a/src/main/java/com/alttd/commandManager/commands/CommandHistory.java +++ b/src/main/java/com/alttd/commandManager/commands/CommandHistory.java @@ -33,7 +33,8 @@ public class CommandHistory extends DiscordCommand { this.commandData = Commands.slash(getName(), "Show history for a user") .addOption(OptionType.STRING, "user", "The user to show history for", true) .addOption(OptionType.STRING, "type", "The type of punishment to show", false, true) - .setDefaultPermissions(DefaultMemberPermissions.ENABLED); + .setDefaultPermissions(DefaultMemberPermissions.ENABLED) + .setGuildOnly(true); Util.registerCommand(commandManager, jda, commandData, getName()); } diff --git a/src/main/java/com/alttd/commandManager/commands/CommandSetOutputChannel.java b/src/main/java/com/alttd/commandManager/commands/CommandSetOutputChannel.java index f44dbe1..44c7c65 100644 --- a/src/main/java/com/alttd/commandManager/commands/CommandSetOutputChannel.java +++ b/src/main/java/com/alttd/commandManager/commands/CommandSetOutputChannel.java @@ -32,7 +32,8 @@ public class CommandSetOutputChannel extends DiscordCommand { commandData = Commands.slash(getName(), "Set up output channels") .addOption(OptionType.STRING, "type", "The type of output channel", true, true) .addOption(OptionType.CHANNEL, "channel", "The channel the specified output should go into", true) - .setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.ADMINISTRATOR)); + .setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.ADMINISTRATOR)) + .setGuildOnly(true); Util.registerCommand(commandManager, jda, commandData, getName()); } diff --git a/src/main/java/com/alttd/commandManager/commands/CommandSuggestion.java b/src/main/java/com/alttd/commandManager/commands/CommandSuggestion.java index 9054267..0b68407 100644 --- a/src/main/java/com/alttd/commandManager/commands/CommandSuggestion.java +++ b/src/main/java/com/alttd/commandManager/commands/CommandSuggestion.java @@ -8,6 +8,7 @@ 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.build.CommandData; import net.dv8tion.jda.api.interactions.commands.build.Commands; import net.dv8tion.jda.api.interactions.components.Modal; @@ -25,7 +26,9 @@ public class CommandSuggestion extends DiscordCommand { this.commandManager = commandManager; this.modalManager = modalManager; - commandData = Commands.slash(getName(), "Open suggestion form."); + commandData = Commands.slash(getName(), "Open suggestion form.") + .setGuildOnly(true) + .setDefaultPermissions(DefaultMemberPermissions.ENABLED); Util.registerCommand(commandManager, jda, commandData, getName()); } diff --git a/src/main/java/com/alttd/commandManager/commands/CommandUpdateCommands.java b/src/main/java/com/alttd/commandManager/commands/CommandUpdateCommands.java index 158b500..cad39c0 100644 --- a/src/main/java/com/alttd/commandManager/commands/CommandUpdateCommands.java +++ b/src/main/java/com/alttd/commandManager/commands/CommandUpdateCommands.java @@ -26,7 +26,8 @@ public class CommandUpdateCommands extends DiscordCommand { public CommandUpdateCommands(JDA jda, CommandManager commandManager) { this.commandManager = commandManager; this.commandData = Commands.slash(getName(), "Updates all commands for this bot in this guild") - .setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.ADMINISTRATOR)); + .setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.ADMINISTRATOR)) + .setGuildOnly(true); Util.registerCommand(commandManager, jda, commandData, getName()); } 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 9aa4cba..bd66efc 100644 --- a/src/main/java/com/alttd/commandManager/commands/PollCommand/CommandPoll.java +++ b/src/main/java/com/alttd/commandManager/commands/PollCommand/CommandPoll.java @@ -53,8 +53,9 @@ public class CommandPoll extends DiscordCommand { .addOption(OptionType.STRING, "message_id", "Id of the poll you're closing", true), 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.setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.ADMINISTRATOR)); + .addOption(OptionType.STRING, "message_id", "Id of the poll you want the results for", true)) + .setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.ADMINISTRATOR)) + .setGuildOnly(true); Util.registerSubOptions(subOptionsMap, new SubCommandAdd(null,this), new SubCommandAddButton(null, this),