Add support for an optional second guild resolves #81

Author: kyb3r

bot.py

@@ -121,15 +121,23 @@ def guild_id(self):
     @property
     def guild(self):
         return discord.utils.get(self.guilds, id=self.guild_id)
+    
+    @property
+    def modmail_guild(self):
+        modmail_guild_id = self.config.get('modmail_guild_id')
+        if not modmail_guild_id:
+            return self.guild 
+        else:
+            return discord.utils.get(self.guilds, id=int(modmail_guild_id))
 
     @property
     def main_category(self):
         if self.guild:
-            return discord.utils.get(self.guild.categories, name='Mod Mail')
+            return discord.utils.get(self.modmail_guild.categories, name='Mod Mail')
 
     @property
     def blocked_users(self):
-        if self.guild:
+        if self.modmail_guild:
             top_chan = self.main_category.channels[0]
             return [int(i) for i in re.findall(r'\d+', top_chan.topic)]
 

cogs/modmail.py

@@ -20,16 +20,16 @@ def __init__(self, bot):
     async def setup(self, ctx):
         '''Sets up a server for modmail'''
         if self.bot.main_category:
-            return await ctx.send('This server is already set up.')
+            return await ctx.send(f'{self.bot.modmail_guild} is already set up.')
 
-        categ = await ctx.guild.create_category(
+        categ = await self.bot.modmail_guild.create_category(
             name='Mod Mail', 
             overwrites=self.bot.overwrites(ctx, modrole=modrole)
             )
 
         await categ.edit(position=0)
 
-        c = await ctx.guild.create_text_channel(name='thread-logs', category=categ)
+        c = await self.bot.modmail_guild.create_text_channel(name='thread-logs', category=categ)
         await c.edit(topic='Manually add user id\'s to block users.\n\n'
                            'Blocked\n-------\n\n')
 
@@ -163,11 +163,11 @@ async def _close(self, ctx):
     @commands.command()
     async def nsfw(self, ctx):
         '''Flags a modmail thread as nsfw.'''
-        if ctx.channel.category and ctx.channel.category.name == 'Mod Mail':
-            await ctx.edit(nsfw=True)
-        em = discord.Embed(description=desc, color=discord.Color.green())
-        em.set_author(name='Thread closed', url=log_url)
-        await ctx.send('Done')
+        thread = self.bot.threads.find(channel=ctx.channel)
+        if thread is None:
+            return 
+        await ctx.edit(nsfw=True)
+        await ctx.message.add_reaction('✅')
 
     @commands.command()
     @trigger_typing
@@ -228,7 +228,7 @@ async def reply(self, ctx, *, msg=''):
         '''
         ctx.message.content = msg
         thread = await self.bot.threads.find(channel=ctx.channel)
-        if thread and thread.channel.category.name == 'Mod Mail':
+        if thread:
             await thread.reply(ctx.message)
 
     @commands.command()
@@ -241,27 +241,29 @@ async def edit(self, ctx, message_id: Optional[int]=None, *, new_message):
         `<new_message>` is the new message that will be edited in.
         '''
         thread = await self.bot.threads.find(channel=ctx.channel)
-        print(message_id, new_message)
-        if thread and thread.channel.category.name == 'Mod Mail':
-            linked_message_id = None
-             
-            async for msg in ctx.channel.history():
-                if message_id is None and msg.embeds:
-                    em = msg.embeds[0]
-                    if 'Moderator' not in str(em.footer.text):
-                        continue
-                    linked_message_id = int(re.findall(r'\d+', em.author.url)[0])
-                    break 
-                elif message_id and msg.id == message_id:
-                    url = msg.embeds[0].author.url 
-                    linked_message_id = int(re.findall(r'\d+', url)[0])
-                    break
+
+        if thread is None:
+            return 
+
+        linked_message_id = None
 
-            if not linked_message_id:
-                raise commands.UserInputError
+        async for msg in ctx.channel.history():
+            if message_id is None and msg.embeds:
+                em = msg.embeds[0]
+                if 'Moderator' not in str(em.footer.text):
+                    continue
+                linked_message_id = int(re.findall(r'\d+', em.author.url)[0])
+                break 
+            elif message_id and msg.id == message_id:
+                url = msg.embeds[0].author.url 
+                linked_message_id = int(re.findall(r'\d+', url)[0])
+                break
+        
+        if not linked_message_id:
+            raise commands.UserInputError
 
-            await thread.edit_message(linked_message_id, new_message)
-            await ctx.message.add_reaction('✅')
+        await thread.edit_message(linked_message_id, new_message)
+        await ctx.message.add_reaction('✅')
 
     @commands.command()
     @trigger_typing
@@ -363,8 +365,8 @@ async def unblock(self, ctx, id=None):
             else:
                 raise commands.UserInputError
 
-        categ = discord.utils.get(ctx.guild.categories, name='Mod Mail')
-        top_chan = categ.channels[0] #bot-info
+        categ = self.bot.main_category
+        top_chan = categ.channels[0] #thread-logs
         topic = str(top_chan.topic)
         topic = topic.replace('\n'+id, '')
 

core/decorators.py

@@ -13,7 +13,7 @@ async def wrapper(self, ctx, *args, **kwargs):
 def auth_required(func):
     @functools.wraps(func)
     async def wrapper(self, ctx, *args, **kwargs):
-        if self.bot.config.get('MODMAIL_API_TOKEN'):
+        if self.bot.config.get('modmail_api_token'):
             return await func(self, ctx, *args, **kwargs)
         em = discord.Embed(
             color=discord.Color.red(),

core/thread.py

@@ -133,7 +133,7 @@ def __init__(self, bot):
         self.cache = {}
 
     async def populate_cache(self):
-        for channel in self.bot.guild.text_channels:
+        for channel in self.bot.modmail_guild.text_channels:
             await self.find(channel=channel)
 
     def __len__(self):
@@ -153,7 +153,7 @@ async def find(self, *, recipient=None, channel=None):
             thread = self.cache[recipient.id]
         except KeyError:
             channel = discord.utils.get(
-                self.bot.guild.text_channels, 
+                self.bot.modmail_guild.text_channels, 
                 topic=f'User ID: {recipient.id}'
                 )
             if not channel:
@@ -175,8 +175,8 @@ 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 and channel.category.name == 'Mod Mail':
-            async for message in channel.history():
+        elif channel.topic is None:
+            async for message in channel.history(limit=50):
                 if message.embeds:
                     em = message.embeds[0]
                     matches = re.findall(r'<@(\d+)>', str(em.description))
@@ -213,7 +213,7 @@ async def create(self, recipient, *, creator=None):
 
         self.cache[recipient.id] = thread = Thread(self, recipient)
 
-        channel = await self.bot.guild.create_text_channel(
+        channel = await self.bot.modmail_guild.create_text_channel(
             name=self._format_channel_name(recipient),
             category=self.bot.main_category
             )
@@ -282,7 +282,7 @@ def _format_channel_name(self, author):
         allowed = string.ascii_letters + string.digits + '-'
         new_name = ''.join(l for l in name if l in allowed) or 'null'
         new_name += f'-{author.discriminator}'
-        while new_name in [c.name for c in self.bot.guild.text_channels]:
+        while new_name in [c.name for c in self.bot.modmail_guild.text_channels]:
             new_name += '-x' # two channels with same name
         return new_name