diff --git a/jarvis/client.py b/jarvis/client.py index 33ac521..904edd0 100644 --- a/jarvis/client.py +++ b/jarvis/client.py @@ -430,10 +430,11 @@ class Jarvis(StatsClient): """Handle autopurge events.""" autopurge = await Autopurge.find_one(q(guild=message.guild.id, channel=message.channel.id)) if autopurge: - self.logger.debug( - f"Autopurging message {message.guild.id}/{message.channel.id}/{message.id}" - ) - await message.delete(delay=autopurge.delay) + if not message.author.has_permission(Permissions.ADMINISTRATOR): + self.logger.debug( + f"Autopurging message {message.guild.id}/{message.channel.id}/{message.id}" + ) + await message.delete(delay=autopurge.delay) async def autoreact(self, message: Message) -> None: """Handle autoreact events.""" @@ -450,7 +451,8 @@ class Jarvis(StatsClient): for reaction in autoreact.reactions: await message.add_reaction(reaction) if autoreact.thread: - name = message.content + name = message.content.replace("\n", " ") + name = re.sub(r"<:\w+:(\d+)>", "", name) if len(name) > 100: name = name[:97] + "..." await message.create_thread(name=message.content, reason="Autoreact")