Merge commit '232accba33a700b48cda451980774fc7fe188cc5' into development

modmail-dev · Jan 14, 2021 · 04b706b · 04b706b
2 parents d00b562 + 232accb
commit 04b706b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bot.py b/bot.py
@@ -1153,7 +1153,7 @@ async def on_typing(self, channel, user, _):
 
     async def handle_reaction_events(self, payload):
         user = self.get_user(payload.user_id)
-        if user.bot:
+        if user is None or user.bot:
             return
 
         channel = self.get_channel(payload.channel_id)

diff --git a/cogs/modmail.py b/cogs/modmail.py
@@ -680,7 +680,7 @@ async def logs(self, ctx, *, user: User = None):
             thread = ctx.thread
             if not thread:
                 raise commands.MissingRequiredArgument(SimpleNamespace(name="member"))
-            user = thread.recipient
+            user = thread.recipient or await self.bot.fetch_user(thread.id)
 
         default_avatar = "https://cdn.discordapp.com/embed/avatars/0.png"
         icon_url = getattr(user, "avatar_url", default_avatar)