Merge remote-tracking branch 'upstream/master'

Author: Agent-Fennec

bot.py

@@ -439,42 +439,32 @@ async def convert_emoji(self, name: str) -> str:
             try:
                 name = await converter.convert(ctx, name.strip(':'))
             except commands.BadArgument:
-                logger.warning(f'{name} is not a valid emoji.')
+                logger.warning(info('%s is not a valid emoji.'), name)
+                raise
         return name
 
     async def retrieve_emoji(self) -> typing.Tuple[str, str]:
 
-        # TODO: use a function to convert emojis
-
-        ctx = SimpleNamespace(bot=self, guild=self.modmail_guild)
-        converter = commands.EmojiConverter()
-
         sent_emoji = self.config.get('sent_emoji', '✅')
         blocked_emoji = self.config.get('blocked_emoji', '🚫')
 
-        if sent_emoji not in UNICODE_EMOJI:
+        if sent_emoji != 'disable':
             try:
-                sent_emoji = await converter.convert(
-                    ctx, sent_emoji.strip(':')
-                )
+                sent_emoji = await self.convert_emoji(sent_emoji)
             except commands.BadArgument:
-                if sent_emoji != 'disable':
-                    logger.warning(info(f'Sent Emoji ({sent_emoji}) '
-                                        f'is not a valid emoji.'))
-                    del self.config.cache['sent_emoji']
-                    await self.config.update()
+                logger.warning(info('Removed sent emoji (%s).'), sent_emoji)
+                del self.config.cache['sent_emoji']
+                await self.config.update()
+                sent_emoji = '✅'
 
-        if blocked_emoji not in UNICODE_EMOJI:
+        if blocked_emoji != 'disable':
             try:
-                blocked_emoji = await converter.convert(
-                    ctx, blocked_emoji.strip(':')
-                )
+                blocked_emoji = await self.convert_emoji(blocked_emoji)
             except commands.BadArgument:
-                if blocked_emoji != 'disable':
-                    logger.warning(info(f'Blocked emoji ({blocked_emoji}) '
-                                        'is not a valid emoji.'))
-                    del self.config.cache['blocked_emoji']
-                    await self.config.update()
+                logger.warning(info('Removed blocked emoji (%s).'), blocked_emoji)
+                del self.config.cache['blocked_emoji']
+                await self.config.update()
+                blocked_emoji = '🚫'
 
         return sent_emoji, blocked_emoji
 
@@ -912,14 +902,14 @@ async def validate_database_connection(self):
                     "IPs correctly. Make sure to whitelist all "
                     "IPs (0.0.0.0/0) https://i.imgur.com/mILuQ5U.png"
                     ))
-            
+
             if 'OperationFailure' in message:
                 logger.critical(error("This is due to having invalid credentials in your MONGO_URI."))
                 logger.critical(error(
                     "Recheck the username/password and make sure to url encode them. "
                     "https://www.urlencoder.io/"
                 ))
-            
+
             return await self.logout()
         else:
             logger.info(info('Successfully connected to the database.'))

cogs/modmail.py

@@ -60,9 +60,10 @@ async def setup(self, ctx):
             color=self.bot.main_color
         )
 
-        embed.add_field(name='Thanks for using the bot!', value='If you like what you see, '
-        'consider giving the [repo a star](https://github.com/kyb3r/modmail) :star: or if you are '
-        'feeling generous, check us out on [Patreon](https://patreon.com/kyber)!')
+        embed.add_field(name='Thanks for using the bot!',
+                        value='If you like what you see, consider giving the '
+                              '[repo a star](https://github.com/kyb3r/modmail) :star: or if you are '
+                              'feeling generous, check us out on [Patreon](https://patreon.com/kyber)!')
 
         embed.set_footer(text=f'Type "{self.bot.prefix}help" '
                               'for a complete list of commands.')

cogs/plugins.py

@@ -357,12 +357,10 @@ async def plugin_registry(self, ctx, *, plugin_name: str = None):
         registry = list(self.registry.items())
         random.shuffle(registry)
 
-        def find_index(name):
-            index = 0
-            for n, info in registry:
-                if name == n:
-                    return index
-                index += 1
+        def find_index(find_name):
+            for i, (n, _) in enumerate(registry):
+                if find_name == n:
+                    return i
 
         index = 0
         if plugin_name in self.registry:
@@ -376,7 +374,7 @@ def find_index(name):
             matches = get_close_matches(plugin_name, self.registry.keys())
 
             if matches:
-                embed.add_field(name='Perhaps you meant', value='\n'.join(f'`{m}`' for m in matches))
+                embed.add_field(name='Perhaps you meant:', value='\n'.join(f'`{m}`' for m in matches))
 
             return await ctx.send(embed=embed)
 

cogs/utility.py

@@ -7,6 +7,7 @@
 from difflib import get_close_matches
 from io import StringIO
 from typing import Union
+from types import SimpleNamespace as param
 from json import JSONDecodeError
 from textwrap import indent
 
@@ -154,10 +155,9 @@ async def send_error_message(self, msg):  # pylint: disable=W0221
             if not cmd.hidden:
                 choices.add(name)
         command = self.context.kwargs.get('command')
-        # print(self.context.message.content[self.context.in])
-        closest = get_close_matches(command, choices, n=1, cutoff=0.75)
+        closest = get_close_matches(command, choices)
         if closest:
-            embed.add_field(name=f'Perhaps you meant:', value=f'`{closest[0]}`')
+            embed.add_field(name=f'Perhaps you meant:', value="\n".join(f'`{x}`' for x in closest))
         else:
             embed.title = 'Cannot find command or category'
             embed.set_footer(text=f'Type "{self.clean_prefix}{self.command_attrs["name"]}" '
@@ -233,6 +233,9 @@ async def about(self, ctx):
                         value='https://github.com/kyb3r/modmail',
                         inline=False)
 
+        embed.add_field(name='\u200b',
+                        value='Support this bot on [Patreon](https://patreon.com/kyber).')
+
         embed.set_footer(text=footer)
         await ctx.send(embed=embed)
 
@@ -453,15 +456,15 @@ async def activity(self, ctx, activity_type: str.lower, *, message: str = ''):
             return await ctx.send(embed=embed)
 
         if not message:
-            raise commands.UserInputError
+            raise commands.MissingRequiredArgument(param(name='message'))
 
         activity, msg = (await self.set_presence(
             activity_identifier=activity_type,
             activity_by_key=True,
             activity_message=message
         ))['activity']
         if activity is None:
-            raise commands.UserInputError
+            raise commands.MissingRequiredArgument(param(name='activity'))
 
         self.bot.config['activity_type'] = activity.type.value
         self.bot.config['activity_message'] = message
@@ -506,7 +509,7 @@ async def status(self, ctx, *, status_type: str.lower):
             status_by_key=True
         ))['status']
         if status is None:
-            raise commands.UserInputError
+            raise commands.MissingRequiredArgument(param(name='status'))
 
         self.bot.config['status'] = status.value
         await self.bot.config.update()
@@ -796,8 +799,8 @@ async def config_get(self, ctx, key: str.lower = None):
                 if val and key in keys
             }
 
-            for k, v in reversed(list(config.items())):
-                embed.add_field(name=k, value=f'`{v}`', inline=False)
+            for name, value in reversed(list(config.items())):
+                embed.add_field(name=name, value=f'`{value}`', inline=False)
 
         return await ctx.send(embed=embed)
 

core/paginator.py

@@ -298,7 +298,7 @@ async def show_page(self, index: int) -> None:
         """
         if not 0 <= index < len(self.messages):
             return
-        
+
         self.current = index
         page = self.messages[index]
 

core/thread.py

@@ -635,6 +635,14 @@ async def find(self, *,
 
         try:
             thread = self.cache[recipient_id]
+            if not self.bot.get_channel(thread.channel.id): # deleted channel
+                self.bot.loop.create_task(
+                    thread.close(
+                        closer=self.bot.user, 
+                        silent=True, 
+                        delete_channel=False
+                        ))
+                thread = None
         except KeyError:
             channel = discord.utils.get(
                 self.bot.modmail_guild.text_channels,