Fix errors in client event processing
This commit is contained in:
parent
029743f977
commit
3b9a3f721b
1 changed files with 10 additions and 6 deletions
|
@ -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,
|
||||
|
|
Loading…
Add table
Reference in a new issue