Merge branch 'master' of https://git.slipstreamm.dev/discordbot

# Conflicts:
#	cogs/logging_cog.py

cogs/logging_cog.py

@@ -172,7 +172,6 @@ class LoggingCog(commands.Cog):
                 self.header_section.accessory = ui.Thumbnail(
                     media=user.display_avatar.url
                 )
-
             if "User ID:" not in self.footer_display.content:
                 self.footer_display.content += f" | User ID: {user.id}"
 
@@ -644,6 +643,11 @@ class LoggingCog(commands.Cog):
             author=thread.owner if thread.owner else None,
             footer=f"Thread ID: {thread.id} | Parent ID: {thread.parent_id}",
         )
+<<<<<<< HEAD
+=======
+        if thread.owner:  # Sometimes owner isn't cached immediately
+            embed.set_author(thread.owner)
+>>>>>>> bf75350a7c8913e0922782327a57505a76ec2df5
         await self._send_log_embed(guild, embed)
 
     @commands.Cog.listener()