diff --git a/jarvis/__init__.py b/jarvis/__init__.py index 953ec4d..9129aa5 100644 --- a/jarvis/__init__.py +++ b/jarvis/__init__.py @@ -25,7 +25,7 @@ intents.members = True restart_ctx = None invites = re.compile( - r"(https?://)?(www.)?(discord.(gg|io|me|li)|discord(app)?.com/invite)/([^\s/]+?)(?=\b)", + r"(?:https?://)?(?:www.)?(?:discord.(?:gg|io|me|li)|discord(?:app)?.com/invite)/([^\s/]+?)(?=\b)", flags=re.IGNORECASE, ) @@ -194,7 +194,6 @@ async def on_message(message: Message): if autopurge: await message.delete(delay=autopurge["delay"]) content = re.sub(r"\s+", "", message.content) - content = re.sub(r"[^\w\d./]+", "", content) match = invites.search(content) if match: guild_invites = await message.guild.invites() @@ -202,7 +201,7 @@ async def on_message(message: Message): "dbrand", "VtgZntXcnZ", ] - if match.group(6) not in allowed: + if match.group(1) not in allowed: await message.delete() db.jarvis.warns.insert_one( { diff --git a/jarvis/cogs/modlog.py b/jarvis/cogs/modlog.py index 2bb67bd..16f2a6f 100644 --- a/jarvis/cogs/modlog.py +++ b/jarvis/cogs/modlog.py @@ -357,7 +357,7 @@ class ModlogCog(commands.Cog): async def on_message_edit( self, before: discord.Message, after: discord.Message ): - if before.author != self.bot.user.id: + if before.author != get_config().client_id: modlog = self.db.jarvis.settings.find_one( {"guild": after.guild.id, "setting": "modlog"} )