Should address a bug and some issues

Author: Taaku18

bot.py

@@ -222,7 +222,8 @@ async def on_ready(self):
                 await self.config.update()
                 continue
 
-            # TODO: Retrieve messages/replies when bot is down, from history?
+            # 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'],

cogs/modmail.py

@@ -174,11 +174,11 @@ async def _close(self, ctx, *, after: UserFriendlyTime=None):
         silent = str(message).lower() in {'silent', 'silently'}
         cancel = str(message).lower() == 'cancel'
 
-        if cancel and thread.close_task is not None and not thread.close_task.cancelled():
-            thread.close_task.cancel()
-            await ctx.send(embed=discord.Embed(color=discord.Color.red(), description='Scheduled close has been cancelled.'))
-            return
-        elif cancel:
+        if cancel:
+            if thread.close_task is not None:
+                await thread.cancel_closure()
+                await ctx.send(embed=discord.Embed(color=discord.Color.red(), description='Scheduled close has been cancelled.'))
+                return
             return await ctx.send(embed=discord.Embed(color=discord.Color.red(), description='This thread has not already been scheduled to close.'))
 
         if after and after.dt > now:

core/thread.py

@@ -50,10 +50,8 @@ async def close(self, *, closer, after=0, silent=False,
                     delete_channel=True, message=None):
         """Close a thread now or after a set time in seconds"""
 
-        if self.close_task is not None:
-            # restarts the after timer
-            self.close_task.cancel()
-            self.close_task = None
+        # restarts the after timer
+        await self.cancel_closure()
 
         if after > 0:
             # TODO: Add somewhere to clean up broken closures
@@ -82,9 +80,7 @@ async def _close(self, closer, silent=False, delete_channel=True,
                      message=None, scheduled=False):
         del self.manager.cache[self.id]
 
-        if scheduled:
-            self.bot.config.closures.pop(str(self.id), None)
-            await self.bot.config.update()
+        await self.cancel_closure()
 
         if str(self.id) in self.bot.config.subscriptions:
             del self.bot.config.subscriptions[str(self.id)]
@@ -112,7 +108,7 @@ async def _close(self, closer, silent=False, delete_channel=True,
             log_url = f"https://logs.modmail.tk/" \
                       f"{log_data['user_id']}/{log_data['key']}"
 
-        user = self.recipient.mention if self.recipient else str(self.id)
+        user = self.recipient.mention if self.recipient else f'`{self.id}`'
 
         if log_data['messages']:
             msg = str(log_data['messages'][0]['content'])
@@ -148,6 +144,15 @@ async def _close(self, closer, silent=False, delete_channel=True,
 
         await asyncio.gather(*tasks)
 
+    async def cancel_closure(self):
+        if self.close_task is not None:
+            self.close_task.cancel()
+            self.close_task = None
+
+        to_update = self.bot.config.closures.pop(str(self.id), None)
+        if to_update is not None:
+            await self.bot.config.update()
+
     @staticmethod
     async def _edit_thread_message(channel, message_id, message):
         async for msg in channel.history():
@@ -188,8 +193,7 @@ async def reply(self, message):
 
         if self.close_task is not None:
             # cancel closing if a thread message is sent.
-            self.close_task.cancel()
-            self.close_task = None
+            await self.cancel_closure()
             tasks.append(self.channel.send(
                 embed=discord.Embed(color=discord.Color.red(),
                                     description='Scheduled close has '
@@ -200,8 +204,7 @@ async def reply(self, message):
     async def send(self, message, destination=None, from_mod=False):
         if self.close_task is not None:
             # cancel closing if a thread message is sent.
-            self.close_task.cancel()
-            self.close_task = None
+            await self.cancel_closure()
             await self.channel.send(embed=discord.Embed(
                 color=discord.Color.red(),
                 description='Scheduled close has been cancelled.'))