Merge branch 'fetch-users' of git://github.com/Qwerty-133/modmail into Qwerty-133-fetch-users

Author: fourjr

bot.py

@@ -582,7 +582,7 @@ async def on_ready(self):
                 continue
 
             await thread.close(
-                closer=self.get_user(items["closer_id"]),
+                closer=await self.get_or_fetch_user(items["closer_id"]),
                 after=after,
                 silent=items["silent"],
                 delete_channel=items["delete_channel"],
@@ -656,6 +656,15 @@ async def convert_emoji(self, name: str) -> str:
                 raise
         return name
 
+    async def get_or_fetch_user(self, id: int) -> discord.User:
+        """
+        Retrieve a User based on their ID.
+
+        This tries getting the user from the cache and falls back to making
+        an API call if they're not found in the cache.
+        """
+        return self.get_user(id) or await self.fetch_user(id)
+
     async def retrieve_emoji(self) -> typing.Tuple[str, str]:
 
         sent_emoji = self.config["sent_emoji"]

cogs/modmail.py

@@ -1053,7 +1053,7 @@ async def logs(self, ctx, *, user: User = None):
             thread = ctx.thread
             if not thread:
                 raise commands.MissingRequiredArgument(SimpleNamespace(name="member"))
-            user = thread.recipient or await self.bot.fetch_user(thread.id)
+            user = thread.recipient or await self.bot.get_or_fetch_user(thread.id)
 
         default_avatar = "https://cdn.discordapp.com/embed/avatars/0.png"
         icon_url = getattr(user, "avatar_url", default_avatar)
@@ -1510,15 +1510,12 @@ async def blocked(self, ctx):
                     logger.debug("No longer blocked, user %s.", id_)
                     continue
 
-            user = self.bot.get_user(int(id_))
-            if user:
-                users.append((user.mention, reason))
+            try:
+                user = await self.bot.get_or_fetch_user(int(id_))
+            except discord.NotFound:
+                users.append((id_, reason))
             else:
-                try:
-                    user = await self.bot.fetch_user(id_)
-                    users.append((user.mention, reason))
-                except discord.NotFound:
-                    users.append((id_, reason))
+                users.append((user.mention, reason))
 
         blocked_roles = list(self.bot.blocked_roles.items())
         for id_, reason in blocked_roles:
@@ -1858,7 +1855,7 @@ async def repair(self, ctx):
                 user_id = match_user_id(message.embeds[0].footer.text, any_string=True)
                 other_recipients = match_other_recipients(ctx.channel.topic)
                 for n, uid in enumerate(other_recipients):
-                    other_recipients[n] = self.bot.get_user(uid) or await self.bot.fetch_user(uid)
+                    other_recipients[n] = await self.bot.get_or_fetch_user(uid)
 
                 if user_id != -1:
                     recipient = self.bot.get_user(user_id)
@@ -1911,7 +1908,7 @@ async def repair(self, ctx):
 
                 other_recipients = match_other_recipients(ctx.channel.topic)
                 for n, uid in enumerate(other_recipients):
-                    other_recipients[n] = self.bot.get_user(uid) or await self.bot.fetch_user(uid)
+                    other_recipients[n] = await self.bot.get_or_fetch_user(uid)
 
                 if recipient is None:
                     self.bot.threads.cache[user.id] = thread = Thread(

core/thread.py

@@ -125,12 +125,12 @@ async def from_channel(cls, manager: "ThreadManager", channel: discord.TextChann
         if recipient_id in manager.cache:
             thread = manager.cache[recipient_id]
         else:
-            recipient = manager.bot.get_user(recipient_id) or await manager.bot.fetch_user(recipient_id)
+            recipient = await manager.bot.get_or_fetch_user(recipient_id)
 
             other_recipients = []
             for uid in other_ids:
                 try:
-                    other_recipient = manager.bot.get_user(uid) or await manager.bot.fetch_user(uid)
+                    other_recipient = await manager.bot.get_or_fetch_user(uid)
                 except discord.NotFound:
                     continue
                 other_recipients.append(other_recipient)
@@ -1304,14 +1304,14 @@ async def _find_from_channel(self, channel):
             return self.cache[user_id]
 
         try:
-            recipient = self.bot.get_user(user_id) or await self.bot.fetch_user(user_id)
+            recipient = await self.bot.get_or_fetch_user(user_id)
         except discord.NotFound:
             recipient = None
 
         other_recipients = []
         for uid in other_ids:
             try:
-                other_recipient = self.bot.get_user(uid) or await self.bot.fetch_user(uid)
+                other_recipient = await self.bot.get_or_fetch_user(uid)
             except discord.NotFound:
                 continue
             other_recipients.append(other_recipient)