diff --git a/src/bot/cogs/logging/logging_message_delete.py b/src/bot/cogs/logging/logging_message_delete.py index 5d5ccfe..47ca05a 100644 --- a/src/bot/cogs/logging/logging_message_delete.py +++ b/src/bot/cogs/logging/logging_message_delete.py @@ -122,10 +122,11 @@ async def on_message_delete(self, message) -> None: """ If a mod deletes, take the audit log event. If a user deletes, handle it normally. """ - if ( - message.author.guild.id != int(os.getenv("MASTER_GUILD", 0)) - or message.author.guild.id is None - ): + if message.guild is None: + logger.debug(">> on_message_delete fired in DMs. Ignoring event.") + return + + if message.guild.id != int(os.getenv("MASTER_GUILD", 0)): logger.warning( ">> on_message_delete fired, but not in master guild. Ignoring event." ) diff --git a/src/bot/cogs/logging/logging_message_edit.py b/src/bot/cogs/logging/logging_message_edit.py index 45ce56e..239a676 100644 --- a/src/bot/cogs/logging/logging_message_edit.py +++ b/src/bot/cogs/logging/logging_message_edit.py @@ -57,10 +57,11 @@ def __init__(self, bot): @commands.Cog.listener() async def on_message_edit(self, message_before, message_after): - if ( - message_before.guild.id != int(os.getenv("MASTER_GUILD")) - or message_before.guild.id is None - ): + if message_before.guild is None: + logger.debug(">> on_message_edit fired in DMs. Ignoring event.") + return + + if message_before.guild.id != int(os.getenv("MASTER_GUILD")): logger.warning( ">> on_message_edit fired, but not in master guild. Ignoring event." )