jarvis/jarvis-bot
jarvis/jarvis-bot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix errors in client event processing

Browse source
This commit is contained in:
Zeva Rose 2022-03-26 21:40:22 -06:00
parent 029743f977
commit 3b9a3f721b
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
jarvis/client.py
View file

@ -241,16 +241,20 @@ class Jarvis(Snake):
setting = Setting(guild=message.guild.id, setting="noinvite", value=True) setting = Setting(guild=message.guild.id, setting="noinvite", value=True)
await setting.commit() await setting.commit()
if match: if match:
guild_invites = await message.guild.invites() guild_invites = await message.guild.fetch_invites()
guild_invites.append(message.guild.vanity_url_code) if message.guild.vanity_url_code:
guild_invites.append(message.guild.vanity_url_code)
allowed = [x.code for x in guild_invites] + [ allowed = [x.code for x in guild_invites] + [
"dbrand", "dbrand",
"VtgZntXcnZ", "VtgZntXcnZ",
"gPfYGbvTCE", "gPfYGbvTCE",
] ]
if (m := match.group(1)) not in allowed and setting.value: if (m := match.group(1)) not in allowed and setting.value:
self.logger.debug(f"Removing non-allowed invite {m} from {message.guild.id}") self.logger.debug(f"Removing non-allowed invite `{m}` from {message.guild.id}")
await message.delete() try:
await message.delete()
except Exception:
self.logger.debug("Message deleted before action taken")
await Warning( await Warning(
active=True, active=True,
admin=self.user.id, admin=self.user.id,
@ -351,7 +355,7 @@ class Jarvis(Snake):
for match in url.finditer(message.content): for match in url.finditer(message.content):
if (m := match.group("domain")) in self.phishing_domains: if (m := match.group("domain")) in self.phishing_domains:
self.logger.debug( 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( await Warning(
active=True, active=True,
@ -380,7 +384,7 @@ class Jarvis(Snake):
for item in data["processed"]["urls"].values(): for item in data["processed"]["urls"].values():
if not item["safe"]: if not item["safe"]:
self.logger.debug( 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( await Warning(
active=True, active=True,