Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix bot-command-relay option not ignoring itself #4453

Merged
merged 3 commits into from
Aug 12, 2021
Merged

Fix bot-command-relay option not ignoring itself #4453

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3649631
Fix bot-command-relay option not ignoring itself
JRoy Aug 10, 2021
8671ed5
Merge branch '2.x' into fix/self-reply
JRoy Aug 10, 2021
8ace278
Merge branch '2.x' into fix/self-reply
JRoy Aug 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix bot-command-relay option not ignoring itself
  • Loading branch information
@JRoy
JRoy committed Aug 10, 2021
commit 364963161c737147663dba396d60ad86de366e4a
2 changes: 1 addition & 1 deletion ...ialsDiscord/src/main/java/net/essentialsx/discord/listeners/DiscordCommandDispatcher.java
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ public DiscordCommandDispatcher(JDADiscordService jda) {
@Override
public void onGuildMessageReceived(@NotNull GuildMessageReceivedEvent event) {
if (jda.getConsoleWebhook() != null && event.getChannel().getId().equals(channelId)) {
if ((event.isWebhookMessage() || event.getAuthor().isBot()) && (!jda.getSettings().isConsoleBotCommandRelay() || DiscordUtil.ACTIVE_WEBHOOKS.contains(event.getAuthor().getId()))) {
if ((event.isWebhookMessage() || event.getAuthor().isBot()) && (!jda.getSettings().isConsoleBotCommandRelay() || DiscordUtil.ACTIVE_WEBHOOKS.contains(event.getAuthor().getId()) || event.getAuthor().getId().equals(event.getGuild().getSelfMember().getId()))) {
return;
}