diff --git a/src/main/java/me/bobert/netneutrality/context/command/SlashCommandContext.java b/src/main/java/me/bobert/netneutrality/context/command/SlashCommandContext.java index 0ece84f..3121fcd 100644 --- a/src/main/java/me/bobert/netneutrality/context/command/SlashCommandContext.java +++ b/src/main/java/me/bobert/netneutrality/context/command/SlashCommandContext.java @@ -30,11 +30,6 @@ public class SlashCommandContext extends CommandContext implements InteractionCo return true; } - @Override - public boolean canSkipPermissionCheck() { - return true; - } - @Override public SlashCommandInteractionEvent getEvent() { return event; 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 232e707..84626d4 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 @@ -21,19 +21,21 @@ public class PermissionPrecondition implements CommandPrecondition { return true; } - if (command.canBeExecutedFrom(context.getChannel())) { - return true; + if (!command.canBeExecutedFrom(context.getChannel())) { + context.replyEphemeral("This command cannot be executed in the current channel"); + return false; } - if (command.canBeExecutedBy(context.getGuildUser())) { - return true; + if (command.needAdmin() && !UserFunction.isAdmin(context.getGuildUser())) { + context.replyEphemeral("You are not powerful enough, scrub"); + return false; } - if (command.needAdmin() && UserFunction.isAdmin(context.getGuildUser())) { - return true; + if (!command.canBeExecutedBy(context.getGuildUser())) { + context.replyEphemeral("You are not powerful enough, scrub"); + return false; } - context.reply("You are not powerful enough, scrub"); - return false; + return true; } } diff --git a/src/main/java/me/bobert/netneutrality/db/service/GuildService.java b/src/main/java/me/bobert/netneutrality/db/service/GuildService.java index a3f0692..06aa534 100644 --- a/src/main/java/me/bobert/netneutrality/db/service/GuildService.java +++ b/src/main/java/me/bobert/netneutrality/db/service/GuildService.java @@ -62,7 +62,7 @@ public class GuildService { * @return the persistent guild */ public OGuild findOrCreateGuild(String guildId) { - logger.debug("Loading Guild[{}]", guildId); + logger.debug("Loading Guild: {}", guildId); return guildRepository.findOrCreate(guildId); }