3.8.4 - Another fix attempt

Author: fourjr

CHANGELOG.md

@@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project mostly adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html);
 however, insignificant breaking changes do not guarantee a major version bump, see the reasoning [here](https://github.com/kyb3r/modmail/issues/319). If you're a plugin developer, note the "BREAKING" section.
 
-# v3.8.3
+# v3.8.4
 
 This update is a quick hotfix for a weird behaviour experienced on 1 Feb 2021 where users were not properly cached.
 

bot.py

@@ -1,4 +1,4 @@
-__version__ = "3.8.3"
+__version__ = "3.8.4"
 
 
 import asyncio

core/thread.py

@@ -1092,7 +1092,7 @@ async def find(
     ) -> typing.Optional[Thread]:
         """Finds a thread from cache or from discord channel topics."""
         if recipient is None and channel is not None:
-            thread = self._find_from_channel(channel)
+            thread = await self._find_from_channel(channel)
             if thread is None:
                 user_id, thread = next(
                     ((k, v) for k, v in self.cache.items() if v.channel == channel), (-1, None)
@@ -1133,7 +1133,7 @@ async def find(
                 thread.ready = True
         return thread
 
-    def _find_from_channel(self, channel):
+    async def _find_from_channel(self, channel):
         """
         Tries to find a thread from a channel channel topic,
         if channel topic doesnt exist for some reason, falls back to
@@ -1151,7 +1151,11 @@ def _find_from_channel(self, channel):
         if user_id in self.cache:
             return self.cache[user_id]
 
-        recipient = self.bot.get_user(user_id)
+        try:
+            recipient = self.bot.get_user(user_id) or await self.bot.fetch_user(user_id)
+        except discord.NotFound:
+            recipient = None
+
         if recipient is None:
             self.cache[user_id] = thread = Thread(self, user_id, channel)
         else: