Fix long scheduled close bug

Author: kyb3r

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# v2.16.1
+
+### Fixed
+
+An issue where a scheduled close would not execute over a long period of time if the recipient no shares any servers with the bot.
+
 # v2.16.0
 
 ### What's new?

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = '2.16.0'
+__version__ = '2.16.1'
 
 import asyncio
 import logging
@@ -412,25 +412,23 @@ async def on_ready(self):
                      datetime.utcnow()).total_seconds()
             if after < 0:
                 after = 0
-            recipient = self.get_user(int(recipient_id))
 
-            thread = await self.threads.find(recipient=recipient)
+            thread = await self.threads.find(recipient_id=int(recipient_id))
 
             if not thread:
-                # If the recipient is gone or channel is deleted
+                # If the channel is deleted
                 self.config.closures.pop(str(recipient_id))
                 await self.config.update()
                 continue
 
-            # TODO: Low priority,
-            #  Retrieve messages/replies when bot is down, from history?
             await thread.close(
                 closer=self.get_user(items['closer_id']),
                 after=after,
                 silent=items['silent'],
                 delete_channel=items['delete_channel'],
                 message=items['message']
             )
+
         logger.info(LINE)
 
     async def convert_emoji(self, name):

core/thread.py

@@ -587,22 +587,26 @@ def __iter__(self):
     def __getitem__(self, item):
         return self.cache[item]
 
-    async def find(self, *, recipient=None, channel=None):
+    async def find(self, *, recipient=None, channel=None, recipient_id=None):
         """Finds a thread from cache or from discord channel topics."""
         if recipient is None and channel is not None:
             return await self._find_from_channel(channel)
 
         thread = None
+
+        if recipient:
+            recipient_id = recipient.id
+
         try:
-            thread = self.cache[recipient.id]
+            thread = self.cache[recipient_id]
         except KeyError:
             channel = discord.utils.get(
                 self.bot.modmail_guild.text_channels,
-                topic=f'User ID: {recipient.id}'
+                topic=f'User ID: {recipient_id}'
             )
             if channel:
                 thread = Thread(self, recipient, channel)
-                self.cache[recipient.id] = thread
+                self.cache[recipient_id] = thread
                 thread.ready = True
         return thread