Don't debug-log ignoring own webhooks (#1628)

DiscordSRV · Jan 16, 2024 · 07bbd90 · 07bbd90
2 parents b172fde + 88e0d6a
commit 07bbd90
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/github/scarsz/discordsrv/listeners/DiscordChatListener.java b/src/main/java/github/scarsz/discordsrv/listeners/DiscordChatListener.java
@@ -64,14 +64,14 @@ public void onGuildMessageReceived(GuildMessageReceivedEvent event) {
 
         // block webhooks
         if (event.isWebhookMessage()) {
-            if (DiscordSRV.config().getBoolean("DiscordChatChannelBlockWebhooks")) {
-                DiscordSRV.debug(Debug.DISCORD_TO_MINECRAFT, "Received Discord message from webhook" + event.getAuthor() + " but DiscordChatChannelBlockWebhooks is on");
-                return;
-            }
-
             // Prevent our own webhook from being picked up
             String webhook = WebhookUtil.getWebhookUrlFromCache(event.getChannel());
             if (webhook != null && webhook.split("/")[6].equals(event.getAuthor().getId())) return;
+
+            if (DiscordSRV.config().getBoolean("DiscordChatChannelBlockWebhooks")) {
+                DiscordSRV.debug(Debug.DISCORD_TO_MINECRAFT, "Received Discord message from webhook " + event.getAuthor() + " but DiscordChatChannelBlockWebhooks is on");
+                return;
+            }
         }
 
         // canned responses