Added guildOnly to commands that need it

This commit is contained in:
Stijn 2022-09-21 18:52:59 +02:00
parent a49bbb987b
commit 83bb43f696
9 changed files with 26 additions and 11 deletions

View File

@ -31,8 +31,9 @@ public class CommandManage extends DiscordCommand {
.addOption(OptionType.STRING, "command", "Name of the command to enable", true, true), .addOption(OptionType.STRING, "command", "Name of the command to enable", true, true),
new SubcommandData("disable", "Disable a command") new SubcommandData("disable", "Disable a command")
.addOption(OptionType.STRING, "command", "Name of the command to disable", true, true) .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, Util.registerSubOptions(subOptionsMap,
new SubCommandEnable(commandManager, contextMenuManager, null, this), new SubCommandEnable(commandManager, contextMenuManager, null, this),
new SubCommandDisable(commandManager, null, this) new SubCommandDisable(commandManager, null, this)

View File

@ -8,6 +8,7 @@ import com.alttd.util.Util;
import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent; import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; 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.CommandData;
import net.dv8tion.jda.api.interactions.commands.build.Commands; import net.dv8tion.jda.api.interactions.commands.build.Commands;
import net.dv8tion.jda.api.interactions.components.Modal; 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) { public CommandEvidence(JDA jda, ModalManager modalManager, CommandManager commandManager) {
this.modalManager = modalManager; 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()); Util.registerCommand(commandManager, jda, commandData, getName());
} }

View File

@ -31,7 +31,8 @@ public class CommandFlag extends DiscordCommand {
public CommandFlag(JDA jda, CommandManager commandManager) { public CommandFlag(JDA jda, CommandManager commandManager) {
this.commandData = Commands.slash(getName(), "Show flags for a user") this.commandData = Commands.slash(getName(), "Show flags for a user")
.addOption(OptionType.STRING, "user", "The user to show flags for", true) .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()); Util.registerCommand(commandManager, jda, commandData, getName());
} }

View File

@ -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.CommandAutoCompleteInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent;
import net.dv8tion.jda.api.interactions.AutoCompleteQuery; 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.OptionMapping;
import net.dv8tion.jda.api.interactions.commands.OptionType; 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.CommandData;
@ -30,7 +31,9 @@ public class CommandHelp extends DiscordCommand {
this.commandManager = commandManager; this.commandManager = commandManager;
commandData = Commands.slash(getName(), "Show info about all commands or a specific command.") 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()); Util.registerCommand(commandManager, jda, commandData, getName());
} }

View File

@ -33,7 +33,8 @@ public class CommandHistory extends DiscordCommand {
this.commandData = Commands.slash(getName(), "Show history for a user") this.commandData = Commands.slash(getName(), "Show history for a user")
.addOption(OptionType.STRING, "user", "The user to show history for", true) .addOption(OptionType.STRING, "user", "The user to show history for", true)
.addOption(OptionType.STRING, "type", "The type of punishment to show", false, 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()); Util.registerCommand(commandManager, jda, commandData, getName());
} }

View File

@ -33,7 +33,8 @@ public class CommandSetOutputChannel extends DiscordCommand {
commandData = Commands.slash(getName(), "Set up output channels") commandData = Commands.slash(getName(), "Set up output channels")
.addOption(OptionType.STRING, "type", "The type of output channel", true, true) .addOption(OptionType.STRING, "type", "The type of output channel", true, true)
.addOption(OptionType.CHANNEL, "channel", "The channel the specified output should go into", 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()); Util.registerCommand(commandManager, jda, commandData, getName());
} }

View File

@ -8,6 +8,7 @@ import com.alttd.util.Util;
import net.dv8tion.jda.api.JDA; import net.dv8tion.jda.api.JDA;
import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent; import net.dv8tion.jda.api.events.interaction.command.CommandAutoCompleteInteractionEvent;
import net.dv8tion.jda.api.events.interaction.command.SlashCommandInteractionEvent; 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.CommandData;
import net.dv8tion.jda.api.interactions.commands.build.Commands; import net.dv8tion.jda.api.interactions.commands.build.Commands;
import net.dv8tion.jda.api.interactions.components.Modal; import net.dv8tion.jda.api.interactions.components.Modal;
@ -25,7 +26,9 @@ public class CommandSuggestion extends DiscordCommand {
this.commandManager = commandManager; this.commandManager = commandManager;
this.modalManager = modalManager; 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()); Util.registerCommand(commandManager, jda, commandData, getName());
} }

View File

@ -26,7 +26,8 @@ public class CommandUpdateCommands extends DiscordCommand {
public CommandUpdateCommands(JDA jda, CommandManager commandManager) { public CommandUpdateCommands(JDA jda, CommandManager commandManager) {
this.commandManager = commandManager; this.commandManager = commandManager;
this.commandData = Commands.slash(getName(), "Updates all commands for this bot in this guild") 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()); Util.registerCommand(commandManager, jda, commandData, getName());
} }

View File

@ -53,8 +53,9 @@ public class CommandPoll extends DiscordCommand {
.addOption(OptionType.STRING, "message_id", "Id of the poll you're closing", true), .addOption(OptionType.STRING, "message_id", "Id of the poll you're closing", true),
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.STRING, "message_id", "Id of the poll you want the results for", true)); .addOption(OptionType.STRING, "message_id", "Id of the poll you want the results for", true))
commandData.setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.ADMINISTRATOR)); .setDefaultPermissions(DefaultMemberPermissions.enabledFor(Permission.ADMINISTRATOR))
.setGuildOnly(true);
Util.registerSubOptions(subOptionsMap, Util.registerSubOptions(subOptionsMap,
new SubCommandAdd(null,this), new SubCommandAdd(null,this),
new SubCommandAddButton(null, this), new SubCommandAddButton(null, this),