Fixed some issues with how data is displayed in the info embed.

Author: kyb3r

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+# v2.0.3
+
+Fixed some issues with how data is displayed in the info embed.
+
+### Fixed
+- Thread creation embed now shows the correct amount of past logs. 
+- If using a seperate server setup, roles in the info embed now are shown as names instead of mentions.
+    - This is due to the fact that you can't mention roles across servers.
+
 # v2.0.2
 
 ### Security

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = '2.0.2'
+__version__ = '2.0.3'
 
 import asyncio
 import textwrap
@@ -36,12 +36,13 @@
 from discord.ext.commands.view import StringView
 from colorama import init, Fore, Style
 
+init()
+
 from core.api import Github, ModmailApiClient
 from core.thread import ThreadManager
 from core.config import ConfigManager
 
 
-init()
 
 line = Fore.BLACK + Style.BRIGHT + '-------------------------' + Style.RESET_ALL
 
@@ -111,10 +112,12 @@ def guild_id(self):
 
     @property
     def guild(self):
+        '''The guild that the bot is serving (the server where users message it from)'''
         return discord.utils.get(self.guilds, id=self.guild_id)
 
     @property
     def modmail_guild(self):
+        '''The guild that the bot is operating in (where the bot is creating threads)'''
         modmail_guild_id = self.config.get('modmail_guild_id')
         if not modmail_guild_id:
             return self.guild

core/thread.py

@@ -65,7 +65,7 @@ def edit_message(self, message_id, message):
 
     async def reply(self, message):
         if not message.content and not message.attachments:
-            raise commands.UserInputError('msg is a required argument.')
+            raise commands.UserInputError
         if not self.recipient:
             return await message.channel.send('This user does not share any servers with the bot and is thus unreachable.')
         await asyncio.gather(
@@ -227,7 +227,7 @@ async def create(self, recipient, *, creator=None):
             self.get_dominant_color(recipient.avatar_url)
         )
 
-        log_count = len(log_data)
+        log_count = sum(1 for log in log_data if not log['open'])
         info_embed = self._format_info_embed(recipient, creator, log_url, log_count, dc)
 
         topic = f'User ID: {recipient.id}'
@@ -303,8 +303,9 @@ def _format_info_embed(self, user, creator, log_url, log_count, dc):
         desc = f'{desc} [`{key}`]({log_url})'
 
         if member:
+            seperate_server = self.bot.guild != self.bot.modmail_guild
             roles = sorted(member.roles, key=lambda c: c.position)
-            rolenames = ' '.join([r.mention for r in roles if r.name != "@everyone"])
+            rolenames = ' '.join(r.mention if not seperate_server else r.name for r in roles if r.name != "@everyone")
 
         em = discord.Embed(colour=dc, description=desc, timestamp=time)
 
@@ -323,8 +324,8 @@ def _format_info_embed(self, user, creator, log_url, log_count, dc):
                 em.add_field(name='Past logs', value=f'{log_count}')
             joined = str((time - member.joined_at).days)
             em.add_field(name='Joined', value=joined + days(joined))
-            # em.add_field(name='Member No.',value=str(member_number),inline = True)
-            em.add_field(name='Nickname', value=member.nick, inline=True)
+            if member.nick:
+                em.add_field(name='Nickname', value=member.nick, inline=True)
             if rolenames:
                 em.add_field(name='Roles', value=rolenames, inline=False)
         else: