diff --git a/src/main/java/me/bobert/netneutrality/core/command/Command.java b/src/main/java/me/bobert/netneutrality/core/command/Command.java index 08377d6..a470e1d 100644 --- a/src/main/java/me/bobert/netneutrality/core/command/Command.java +++ b/src/main/java/me/bobert/netneutrality/core/command/Command.java @@ -12,7 +12,7 @@ import net.dv8tion.jda.api.interactions.commands.DefaultMemberPermissions; public interface Command { enum Type { - SLASH, USER, MESSAGE + CHAT, USER, MESSAGE } boolean needAdmin(); diff --git a/src/main/java/me/bobert/netneutrality/core/command/CommandManager.java b/src/main/java/me/bobert/netneutrality/core/command/CommandManager.java index 201e07d..0b491f9 100644 --- a/src/main/java/me/bobert/netneutrality/core/command/CommandManager.java +++ b/src/main/java/me/bobert/netneutrality/core/command/CommandManager.java @@ -96,7 +96,7 @@ public class CommandManager implements CommandRegistry { return; } - if (command.getDescription() == null && command.getType() == Command.Type.SLASH) { + if (command.getDescription() == null && command.getType() == Command.Type.CHAT) { logger.error("Failed to load command {}: Command description is null", command.getClass().getName()); return; } diff --git a/src/main/java/me/bobert/netneutrality/core/command/CommandOptionsBuilder.java b/src/main/java/me/bobert/netneutrality/core/command/CommandOptionsBuilder.java index 258a0e3..8d5cb92 100644 --- a/src/main/java/me/bobert/netneutrality/core/command/CommandOptionsBuilder.java +++ b/src/main/java/me/bobert/netneutrality/core/command/CommandOptionsBuilder.java @@ -31,7 +31,7 @@ public class CommandOptionsBuilder implements SlashCommandData { public CommandOptionsBuilder(Command.Type type, Command command) { - if (type == Command.Type.SLASH) { + if (type == Command.Type.CHAT) { commandData = (CommandDataImpl) Commands.slash(command.getCommandName(), command.getDescription()); } diff --git a/src/main/java/me/bobert/netneutrality/core/command/CommandProcessor.java b/src/main/java/me/bobert/netneutrality/core/command/CommandProcessor.java index 3a68e7a..b170b33 100644 --- a/src/main/java/me/bobert/netneutrality/core/command/CommandProcessor.java +++ b/src/main/java/me/bobert/netneutrality/core/command/CommandProcessor.java @@ -83,7 +83,7 @@ public class CommandProcessor { logger.info("Executing command {} on guild {}", command.getCommandName(), context.getGuild() == null ? "PrivateMessage" : context.getGuild().getId()); configureSentry(command); - if (command.getType() == Command.Type.SLASH && !usageValidator.validate(context, container)) { + if (command.getType() == Command.Type.CHAT && !usageValidator.validate(context, container)) { return; } diff --git a/src/main/java/me/bobert/netneutrality/core/command/impl/AbstractCommand.java b/src/main/java/me/bobert/netneutrality/core/command/impl/AbstractCommand.java index 9eedddd..48cbaec 100644 --- a/src/main/java/me/bobert/netneutrality/core/command/impl/AbstractCommand.java +++ b/src/main/java/me/bobert/netneutrality/core/command/impl/AbstractCommand.java @@ -34,7 +34,7 @@ public abstract class AbstractCommand implements Command { @Override public Type getType() { - return Type.SLASH; + return Type.CHAT; } @Override diff --git a/src/main/java/me/bobert/netneutrality/core/command/precondition/PermissionPrecondition.java b/src/main/java/me/bobert/netneutrality/core/command/precondition/PermissionPrecondition.java index 84626d4..23c020e 100644 --- a/src/main/java/me/bobert/netneutrality/core/command/precondition/PermissionPrecondition.java +++ b/src/main/java/me/bobert/netneutrality/core/command/precondition/PermissionPrecondition.java @@ -13,7 +13,7 @@ public class PermissionPrecondition implements CommandPrecondition { @Override public boolean check(CommandContext context, Command command) { - if (command.getType() != Command.Type.SLASH) { + if (command.getType() != Command.Type.CHAT) { return true; } diff --git a/src/test/java/me/bobert/netneutrality/core/command/CommandProcessorTest.java b/src/test/java/me/bobert/netneutrality/core/command/CommandProcessorTest.java index 198ebb7..9f02857 100644 --- a/src/test/java/me/bobert/netneutrality/core/command/CommandProcessorTest.java +++ b/src/test/java/me/bobert/netneutrality/core/command/CommandProcessorTest.java @@ -109,7 +109,7 @@ class CommandProcessorTest { when(commands.getCommandContainer(COMMAND_NAME)).thenReturn(container); when(container.getCommand()).thenReturn(command); when(command.getCommandName()).thenReturn(COMMAND_NAME); - when(command.getType()).thenReturn(Command.Type.SLASH); + when(command.getType()).thenReturn(Command.Type.CHAT); when(command.execute(context)).thenReturn(result); when(usageValidator.validate(context, container)).thenReturn(true); }