aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar MarkKoz <[email protected]>2020-06-15 10:51:47 -0700
committerGravatar MarkKoz <[email protected]>2020-06-15 10:51:47 -0700
commit0ad19a48680fe6bc729d0e893d32a517a21df7dc (patch)
treeff0e0530f00dde63c165e7a66766f1270be0b314
parentToken remover: exit early if message already deleted (diff)
Webhook remover: ignore DMs and bot messages
Can't remove messages in DMs, so don't bother trying.
-rw-r--r--bot/cogs/webhook_remover.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/bot/cogs/webhook_remover.py b/bot/cogs/webhook_remover.py
index 1b5c3f821..74a353e98 100644
--- a/bot/cogs/webhook_remover.py
+++ b/bot/cogs/webhook_remover.py
@@ -59,6 +59,10 @@ class WebhookRemover(Cog):
@Cog.listener()
async def on_message(self, msg: Message) -> None:
"""Check if a Discord webhook URL is in `message`."""
+ # Ignore DMs; can't delete messages in there anyway.
+ if not msg.guild or msg.author.bot:
+ return
+
matches = WEBHOOK_URL_RE.search(msg.content)
if matches:
await self.delete_and_respond(msg, matches[1] + "xxx")