From 3b9a3f721b7c8fd65451b91dd6377e4a01993fc4 Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Sat, 26 Mar 2022 21:40:22 -0600 Subject: [PATCH] Fix errors in client event processing --- jarvis/client.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/jarvis/client.py b/jarvis/client.py index b0b48eb..85c9e3e 100644 --- a/jarvis/client.py +++ b/jarvis/client.py @@ -241,16 +241,20 @@ class Jarvis(Snake): setting = Setting(guild=message.guild.id, setting="noinvite", value=True) await setting.commit() if match: - guild_invites = await message.guild.invites() - guild_invites.append(message.guild.vanity_url_code) + guild_invites = await message.guild.fetch_invites() + if message.guild.vanity_url_code: + guild_invites.append(message.guild.vanity_url_code) allowed = [x.code for x in guild_invites] + [ "dbrand", "VtgZntXcnZ", "gPfYGbvTCE", ] if (m := match.group(1)) not in allowed and setting.value: - self.logger.debug(f"Removing non-allowed invite {m} from {message.guild.id}") - await message.delete() + self.logger.debug(f"Removing non-allowed invite `{m}` from {message.guild.id}") + try: + await message.delete() + except Exception: + self.logger.debug("Message deleted before action taken") await Warning( active=True, admin=self.user.id, @@ -351,7 +355,7 @@ class Jarvis(Snake): for match in url.finditer(message.content): if (m := match.group("domain")) in self.phishing_domains: self.logger.debug( - f"Phishing url {m} detected in {message.guild.id}/{message.channel.id}/{message.id}" + f"Phishing url `{m}` detected in {message.guild.id}/{message.channel.id}/{message.id}" ) await Warning( active=True, @@ -380,7 +384,7 @@ class Jarvis(Snake): for item in data["processed"]["urls"].values(): if not item["safe"]: self.logger.debug( - f"Phishing url {match.string} detected in {message.guild.id}/{message.channel.id}/{message.id}" + f"Scam url `{match.string}` detected in {message.guild.id}/{message.channel.id}/{message.id}" ) await Warning( active=True,