From ccf56298d875644748ecfef6ae139c7e4985ce3d Mon Sep 17 00:00:00 2001 From: anthorob Date: Sat, 5 Oct 2024 10:13:21 -0400 Subject: [PATCH] fix(CommandProcessor): missing guild check and if command exists before execution --- .../bobert/netneutrality/context/MessageCommandContext.java | 5 +++++ .../me/bobert/netneutrality/context/MusicChannelContext.java | 5 +++++ .../me/bobert/netneutrality/context/SlashCommandContext.java | 5 +++++ src/main/java/me/bobert/netneutrality/core/AsyncMessage.java | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/src/main/java/me/bobert/netneutrality/context/MessageCommandContext.java b/src/main/java/me/bobert/netneutrality/context/MessageCommandContext.java index 34d44f4..a2a7a7f 100644 --- a/src/main/java/me/bobert/netneutrality/context/MessageCommandContext.java +++ b/src/main/java/me/bobert/netneutrality/context/MessageCommandContext.java @@ -66,6 +66,11 @@ public class MessageCommandContext extends CommandContext { return true; } + @Override + public boolean isFromGuild() { + return event.isFromGuild(); + } + @Override public InteractionHook getInteractionHook() { return null; diff --git a/src/main/java/me/bobert/netneutrality/context/MusicChannelContext.java b/src/main/java/me/bobert/netneutrality/context/MusicChannelContext.java index c5236f8..37d4ac5 100644 --- a/src/main/java/me/bobert/netneutrality/context/MusicChannelContext.java +++ b/src/main/java/me/bobert/netneutrality/context/MusicChannelContext.java @@ -37,6 +37,11 @@ public class MusicChannelContext extends AbstractContext implements NoMessageCon return true; } + @Override + public boolean isFromGuild() { + return true; + } + @Override public void deleteMessage() { diff --git a/src/main/java/me/bobert/netneutrality/context/SlashCommandContext.java b/src/main/java/me/bobert/netneutrality/context/SlashCommandContext.java index dccd5ba..3206379 100644 --- a/src/main/java/me/bobert/netneutrality/context/SlashCommandContext.java +++ b/src/main/java/me/bobert/netneutrality/context/SlashCommandContext.java @@ -33,6 +33,11 @@ public class SlashCommandContext extends CommandContext { return event.isAcknowledged(); } + @Override + public boolean isFromGuild() { + return event.isFromGuild(); + } + @Override public InteractionHook getInteractionHook() { if (!event.isAcknowledged()) diff --git a/src/main/java/me/bobert/netneutrality/core/AsyncMessage.java b/src/main/java/me/bobert/netneutrality/core/AsyncMessage.java index 048fa31..eddcf81 100644 --- a/src/main/java/me/bobert/netneutrality/core/AsyncMessage.java +++ b/src/main/java/me/bobert/netneutrality/core/AsyncMessage.java @@ -47,6 +47,11 @@ public class AsyncMessage extends AbstractContext { return true; } + @Override + public boolean isFromGuild() { + return false; + } + @Override public void deleteMessage() { if (hook != null) {