Populate thread cache on bot ready

Author: kyb3r

bot.py

@@ -175,6 +175,8 @@ async def on_ready(self):
         {Fore.YELLOW}Guild ID: {self.guild.id if self.guild else 0}
         {line}
         ''').strip())
+        
+        await self.threads.populate_cache()
 
     async def on_message(self, message):
         if message.author.bot:
@@ -734,9 +736,11 @@ async def edit(self, ctx, message_id: int, *, new_message):
     async def contact(self, ctx, *, user: discord.Member):
         '''Create a thread with a specified member.'''
 
-        # TODO: HANDLE WHEN A THREAD ALREADY EXISTS
-
-        thread = await self.threads.create(user, creator=ctx.author)
+        exists = await self.threads.find(recipient=user)
+        if exists:
+            return await ctx.send('Thread already exists.')
+        else:
+            thread = await self.threads.create(user, creator=ctx.author)
 
         em = discord.Embed(
             title='Created thread',

utils/modmail.py

@@ -13,6 +13,9 @@ def __init__(self, manager, recipient):
         self.channel = None
         self.ready_event = asyncio.Event()
 
+    def __repr__(self):
+        return f'Thread(recipient="{self.recipient}", channel={self.channel.id})'
+    
     def wait_until_ready(self):
         '''Blocks execution until the thread is fully set up.'''
         return self.ready_event.wait()
@@ -121,6 +124,10 @@ def __iter__(self):
     def __getitem__(self, item):
         return self.cache[item]
 
+    async def populate_cache(self):
+        for channel in self.bot.guild.text_channels:
+            await self.find(channel=channel)
+
     async def find(self, *, recipient=None, channel=None):
         '''Finds a thread from cache or from discord channel topics.'''
         if recipient is None and channel is not None:
@@ -151,7 +158,7 @@ async def _find_from_channel(self, channel):
 
         if channel.topic and 'User ID: ' in channel.topic:
             user_id = int(re.findall(r'\d+', channel.topic)[0])
-        elif channel.topic is None:
+        elif channel.topic is None and channel.category.name == 'Mod Mail':
             async for message in channel.history():
                 if message.embeds:
                     em = message.embeds[0]
@@ -204,7 +211,7 @@ async def create(self, recipient, *, creator=None):
         info_embed = self.bot.format_info(recipient, creator, log_url, log_count)
 
         topic = f'User ID: {recipient.id}'
-        mention = self.bot.config.get('MENTION', '@here')
+        mention = self.bot.config.get('MENTION', '@here') if not creator else None
 
         await asyncio.gather(
             channel.edit(topic=topic),