Reformat to check for guild on message delete globally

ClemBotProject · Oct 26, 2023 · f20392a · f20392a
1 parent c895692
commit f20392a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/ClemBot.Bot/bot/clem_bot.py b/ClemBot.Bot/bot/clem_bot.py
@@ -258,10 +258,14 @@ async def on_raw_message_edit(self, payload: discord.RawMessageUpdateEvent) -> N
         await self.publish_with_error(Events.on_raw_message_edit, payload)
 
     async def on_message_delete(self, message: discord.Message) -> None:
+        if not message.guild:
+            return
         if message.author.id != self.user.id:
             await self.publish_with_error(Events.on_message_delete, message)
 
     async def on_raw_message_delete(self, payload: discord.RawMessageDeleteEvent) -> None:
+        if not payload.guild_id:
+            return
         await self.publish_with_error(Events.on_raw_message_delete, payload)
 
     async def on_after_command_invoke(self, ctx: ext.ClemBotContext["ClemBot"]) -> None:

diff --git a/ClemBot.Bot/bot/services/message_handling_service.py b/ClemBot.Bot/bot/services/message_handling_service.py
@@ -297,9 +297,6 @@ async def on_raw_message_edit(self, payload: discord.RawMessageUpdateEvent) -> N
 
     @BaseService.listener(Events.on_message_delete)
     async def on_message_delete(self, message: discord.Message) -> None:
-        if not message.guild:
-            return
-
         log.info(
             "Uncached message deleted in #{channel} by {author}: {content}",
             channel=serializers.log_channel(message.channel),
@@ -331,9 +328,6 @@ async def on_message_delete(self, message: discord.Message) -> None:
 
     @BaseService.listener(Events.on_raw_message_delete)
     async def on_raw_message_delete(self, payload: discord.RawMessageDeleteEvent) -> None:
-        if not payload.guild_id:
-            return
-
         message = await self.bot.message_route.get_message(payload.message_id)
         channel = self.bot.get_channel(payload.channel_id)