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

Author: kyb3r

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/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:

cogs/utility.py

@@ -799,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]