Move thread close logging within thread class

Author: kyb3r

bot.py

@@ -264,46 +264,20 @@ async def on_message(self, message):
     async def on_guild_channel_delete(self, channel):
         if channel.guild != self.modmail_guild:
             return 
+
         thread = await self.threads.find(channel=channel)
-        if thread:
-            del self.threads.cache[thread.id]
-
-            mod = None 
-
-            audit_logs = self.modmail_guild.audit_logs()
-            entry = await audit_logs.find(lambda e: e.target.id == channel.id)
-            mod = entry.user
-            if mod.bot:
-                return
-
-            log_data = await self.modmail_api.post_log(channel.id, {
-                'open': False,
-                'closed_at': str(datetime.datetime.utcnow()),
-                'closer': {
-                    'id': str(mod.id),
-                    'name': mod.name,
-                    'discriminator': mod.discriminator,
-                    'avatar_url': mod.avatar_url,
-                    'mod': True
-                }})
-
-            em = discord.Embed(title='Thread Closed')
-            em.description = f'{mod.mention} has closed this modmail thread.'
-            em.color = discord.Color.red()
-
-            try:
-                await thread.recipient.send(embed=em)
-            except:
-                pass
-            
-            log_url = f"https://logs.modmail.tk/{log_data['user_id']}/{log_data['key']}"
-
-            user = thread.recipient.mention if thread.recipient else f'`{thread.id}`'
-
-            desc = f"[`{log_data['key']}`]({log_url}) {mod.mention} closed a thread with {user}"
-            em = discord.Embed(description=desc, color=em.color)
-            em.set_author(name='Thread closed', url=log_url)
-            await self.log_channel.send(embed=em)
+        if not thread:
+            return
+
+        mod = None 
+        audit_logs = self.modmail_guild.audit_logs()
+        entry = await audit_logs.find(lambda e: e.target.id == channel.id)
+        mod = entry.user
+
+        if mod.bot:
+            return
+        
+        await thread.close(closer=mod, silent=True)
 
     async def on_message_delete(self, message):
         """Support for deleting linked messages"""

cogs/modmail.py

@@ -116,48 +116,14 @@ async def move(self, ctx, *, category: discord.CategoryChannel):
 
     @commands.command(name='close')
     @commands.has_permissions(manage_channels=True)
-    async def _close(self, ctx):
+    async def _close(self, ctx, after: int=0):
         """Close the current thread."""
 
         thread = await self.bot.threads.find(channel=ctx.channel)
         if not thread:
             return await ctx.send('This is not a modmail thread.')
 
-        await thread.close()
-
-        em = discord.Embed(title='Thread Closed')
-        em.description = f'{ctx.author.mention} has closed this modmail thread.'
-        em.color = discord.Color.red()
-
-        try:
-            await thread.recipient.send(embed=em)
-        except:
-            pass
-
-        # Logging
-        log_channel = self.bot.log_channel
-
-        log_data = await self.bot.modmail_api.post_log(ctx.channel.id, {
-            'open': False, 'closed_at': str(datetime.datetime.utcnow()), 'closer': {
-                'id': str(ctx.author.id),
-                'name': ctx.author.name,
-                'discriminator': ctx.author.discriminator,
-                'avatar_url': ctx.author.avatar_url,
-                'mod': True
-            }
-        })
-
-        if isinstance(log_data, str):
-            print(log_data) # error
-
-        log_url = f"https://logs.modmail.tk/{log_data['user_id']}/{log_data['key']}"
-
-        user = thread.recipient.mention if thread.recipient else f'`{thread.id}`'
-
-        desc = f"[`{log_data['key']}`]({log_url}) {ctx.author.mention} closed a thread with {user}"
-        em = discord.Embed(description=desc, color=em.color)
-        em.set_author(name='Thread closed', url=log_url)
-        await log_channel.send(embed=em)
+        await thread.close(closer=ctx.author, after=after)
 
     @commands.command()
     async def nsfw(self, ctx):

core/thread.py

@@ -41,19 +41,59 @@ def ready(self, flag):
         if flag is True:
             self.ready_event.set()
 
-    async def _close_after(self, after):
+    async def _close_after(self, after, **kwargs):
         await asyncio.sleep(after)
-        await self.close()
+        await self.close(**kwargs)
 
-    async def close(self, *, after=0):
+    async def close(self, *, closer, after=0, silent=False):
         '''Close a thread now or after a set time in seconds'''
         if after > 0:
             if self.close_task is not None and not self.close_task.cancelled():
                 self.close_task.cancel()
-            self.close_task = asyncio.create_task(self._close_after(after))
-        else:
-            del self.manager.cache[self.id]
-            await self.channel.delete()
+            self.close_task = asyncio.create_task(self._close_after(after, closer=closer, silent=silent))
+            return 
+
+        print(self.manager.cache)
+        print(self.id)
+        print(self.id in self.manager.cache)
+        del self.manager.cache[self.id]
+        print(self.manager.cache)
+        
+        await self.channel.delete()
+
+        # Logging
+        log_data = await self.bot.modmail_api.post_log(self.channel.id, {
+            'open': False, 'closed_at': str(datetime.datetime.utcnow()), 'closer': {
+                'id': str(closer.id),
+                'name': closer.name,
+                'discriminator': closer.discriminator,
+                'avatar_url': closer.avatar_url,
+                'mod': True
+            }
+        })
+
+        if isinstance(log_data, str):
+            print(log_data) # error
+
+        log_url = f"https://logs.modmail.tk/{log_data['user_id']}/{log_data['key']}"
+
+        user = self.recipient.mention if self.recipient else f'`{self.id}`'
+
+        desc = f"[`{log_data['key']}`]({log_url}) {closer.mention} closed a thread with {user}"
+
+        em = discord.Embed(description=desc, color=discord.Color.red())
+        em.set_author(name='Thread closed', url=log_url)
+
+        tasks = [self.bot.log_channel.send(embed=em)]
+
+        em = discord.Embed(title='Thread Closed')
+        em.description = f'{closer.mention} has closed this modmail thread.'
+        em.color = discord.Color.red()
+
+        if not silent:
+            tasks.append(self.recipient.send(embed=em))
+        
+        await asyncio.gather(*tasks)
 
     async def _edit_thread_message(self, channel, message_id, message):
         async for msg in channel.history():