Merge branch 'master' of https://github.com/verixx/modmail

Author: kyb3r

CHANGELOG.md

@@ -4,7 +4,7 @@ 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).
 
-# 2.15.0
+# v2.15.0
 
 ### What's new?
 

bot.py

@@ -439,11 +439,9 @@ async def convert_emoji(self, name):
 
         if name not in UNICODE_EMOJI:
             try:
-                return await converter.convert(
-                    ctx, sent_emoji.strip(':')
-                )
+                name = await converter.convert(ctx, name.strip(':'))
             except commands.BadArgument:
-                pass
+                logger.warning(f'{name} is not a valid emoji.')
         return name
 
     async def retrieve_emoji(self):
@@ -456,7 +454,6 @@ async def retrieve_emoji(self):
         sent_emoji = self.config.get('sent_emoji', '✅')
         blocked_emoji = self.config.get('blocked_emoji', '🚫')
 
-
         if sent_emoji not in UNICODE_EMOJI:
             try:
                 sent_emoji = await converter.convert(
@@ -660,25 +657,28 @@ async def on_raw_reaction_add(self, payload):
 
         channel = self.get_channel(payload.channel_id)
 
-        if not channel: # dm channel not in internal cache
+        if not channel:  # dm channel not in internal cache
             _thread = await self.threads.find(recipient=user)
             if not _thread:
                 return
             channel = await _thread.recipient.create_dm()
 
-        message = await channel.get_message(payload.message_id) # TODO: change to fetch_message (breaking change in d.py)
+        # TODO: change to fetch_message (breaking change in d.py)
+        message = await channel.get_message(payload.message_id)
         reaction = payload.emoji
 
         close_emoji = await self.convert_emoji(self.config.get('close_emoji', '🔒'))
 
-        if isinstance(channel, discord.DMChannel) and str(reaction) == str(close_emoji): # closing thread
+        if isinstance(channel, discord.DMChannel) and str(reaction) == str(close_emoji):  # closing thread
             thread = await self.threads.find(recipient=user)
             ts = message.embeds[0].timestamp if message.embeds else None
             if thread and ts == thread.channel.created_at: 
                 # the reacted message is the corresponding thread creation embed
                 if not self.config.get('disable_recipient_thread_close'):
                     await thread.close(closer=user)
         elif not isinstance(channel, discord.DMChannel):
+            if not message.embeds:
+                return
             message_id = str(message.embeds[0].author.url).split('/')[-1]
             if message_id.isdigit():
                 thread = await self.threads.find(channel=message.channel)
@@ -689,7 +689,6 @@ async def on_raw_reaction_add(self, payload):
                     if msg.id == int(message_id):
                         await msg.add_reaction(reaction)
 
-
     async def on_guild_channel_delete(self, channel):
         if channel.guild != self.modmail_guild:
             return

core/models.py

@@ -140,6 +140,10 @@ def main_color(self) -> typing.Union[Color, int]:
     async def process_modmail(self, message: Message) -> None:
         raise NotImplementedError
 
+    @abc.abstractmethod
+    async def convert_emoji(self, name: str) -> str:
+        raise NotImplementedError
+
     @staticmethod
     @abc.abstractmethod
     def overwrites(ctx: commands.Context) -> dict:

core/thread.py

@@ -152,21 +152,15 @@ async def send_info_embed():
             footer = 'Click the lock to close the thread'
 
         footer = self.bot.config.get('thread_creation_footer', footer)
-            
-
-        embed.set_footer(text=footer,
-                         icon_url=self.bot.guild.icon_url)
-
+        embed.set_footer(text=footer, icon_url=self.bot.guild.icon_url)
         embed.title = self.bot.config.get('thread_creation_title', 'Thread Created')
 
-
         if creator is None:
             msg = await recipient.send(embed=embed)
             if not self.bot.config.get('disable_recipient_thread_close'):
                 close_emoji = self.bot.config.get('close_emoji', '🔒')
                 close_emoji = await self.bot.convert_emoji(close_emoji)
                 await msg.add_reaction(close_emoji) 
-        
 
     def _close_after(self, closer, silent, delete_channel, message):
         return self.bot.loop.create_task(
@@ -243,6 +237,7 @@ async def _close(self, closer, silent=False, delete_channel=True,
             desc += truncate(sneak_peak, max=75 - 13)
         else:
             desc = "Could not resolve log url."
+            log_url = None
 
         embed = discord.Embed(description=desc, color=discord.Color.red())
 
@@ -276,7 +271,6 @@ async def _close(self, closer, silent=False, delete_channel=True,
                               color=discord.Color.red(),
                               timestamp=datetime.utcnow())
 
-
         if not message:
             if self.id == closer.id:
                 message = self.bot.config.get(
@@ -691,7 +685,7 @@ def _format_info_embed(self, user, log_url, log_count, color):
         role_names = ''
         if member:
             sep_server = self.bot.using_multiple_server_setup
-            seperator = ', ' if sep_server else ' '
+            separator = ', ' if sep_server else ' '
 
             roles = []
 
@@ -702,12 +696,13 @@ def _format_info_embed(self, user, log_url, log_count, color):
                 fmt = role.name if sep_server else role.mention
                 roles.append(fmt)
 
-                if len(seperator.join(roles)) > 1000:
-                    roles.pop()
+                if len(separator.join(roles)) > 1024:
                     roles.append('...')
+                    while len(separator.join(roles)) > 1024:
+                        roles.pop(-2)
                     break
-                
-            role_names = seperator.join(roles)
+
+            role_names = separator.join(roles)
 
         embed = discord.Embed(color=color,
                               description=user.mention,