Close cancel also cancels auto close

Author: kyb3r

cogs/modmail.py

@@ -252,7 +252,7 @@ async def close(self, ctx, *, after: UserFriendlyTime = None):
         if cancel:
 
             if thread.close_task is not None:
-                await thread.cancel_closure()
+                await thread.cancel_closure(all=True)
                 embed = discord.Embed(
                     color=discord.Color.red(),
                     description="Scheduled close has been cancelled.",

core/thread.py

@@ -102,18 +102,17 @@ async def setup(self, *, creator=None, category=None):
                 overwrites=overwrites,
                 reason="Creating a thread channel",
             )
-        except discord.HTTPException as e: # Failed to create due to 50 channel limit.
+        except discord.HTTPException as e:  # Failed to create due to 50 channel limit.
             del self.manager.cache[self.id]
             log_channel = self.bot.log_channel
 
             em = discord.Embed(color=discord.Color.red())
-            em.title = 'Error while trying to create a thread'
+            em.title = "Error while trying to create a thread"
             em.description = e.message
-            em.add_field(name='Recipient', value=recipient.mention)
+            em.add_field(name="Recipient", value=recipient.mention)
 
             if log_channel is not None:
                 return await log_channel.send(embed=em)
-                
 
         self._channel = channel
 
@@ -191,7 +190,7 @@ async def close(
         silent: bool = False,
         delete_channel: bool = True,
         message: str = None,
-        auto_close: bool = False
+        auto_close: bool = False,
     ) -> None:
         """Close a thread now or after a set time in seconds"""
 
@@ -333,12 +332,11 @@ async def _close(
 
         await asyncio.gather(*tasks)
 
-    async def cancel_closure(self, auto_close: bool = False) -> None:
-
-        if self.close_task is not None and not auto_close:
+    async def cancel_closure(self, auto_close: bool = False, all: bool = False) -> None:
+        if self.close_task is not None and not auto_close or both:
             self.close_task.cancel()
             self.close_task = None
-        elif self.auto_close_task is not None:
+        if self.auto_close_task is not None and auto_close or both:
             self.auto_close_task.cancel()
             self.auto_close_task = None
 
@@ -415,7 +413,9 @@ async def _restart_close_timer(self):
                 f" '{time_marker_regex}' to specify time."
             )
 
-        await self.close(closer=self.bot.user, after=seconds, message=close_message, auto_close=True)
+        await self.close(
+            closer=self.bot.user, after=seconds, message=close_message, auto_close=True
+        )
 
     async def edit_message(self, message_id: int, message: str) -> None:
         recipient_msg, channel_msg = await asyncio.gather(
@@ -503,7 +503,6 @@ async def reply(self, message: discord.Message, anonymous: bool = False) -> None
                 )
             )
 
-
             # Cancel closing if a thread message is sent.
             if self.close_task is not None:
                 await self.cancel_closure()
@@ -529,7 +528,9 @@ async def send(
         anonymous: bool = False,
     ) -> None:
 
-        self.bot.loop.create_task(self._restart_close_timer()) # Start or restart thread auto close
+        self.bot.loop.create_task(
+            self._restart_close_timer()
+        )  # Start or restart thread auto close
 
         if self.close_task is not None:
             # cancel closing if a thread message is sent.
@@ -549,7 +550,6 @@ async def send(
         if not from_mod and not note:
             self.bot.loop.create_task(self.bot.api.append_log(message, self.channel.id))
 
-
         destination = destination or self.channel
 
         author = message.author