Help command and stuff

Author: Taaku18

bot.py

@@ -202,12 +202,12 @@ def run(self, *args, **kwargs):
                 self.metadata_task.cancel()
                 self.loop.run_until_complete(self.metadata_task)
             except asyncio.CancelledError:
-                logger.debug('data_task has been cancelled')
+                logger.debug(info('data_task has been cancelled.'))
             try:
                 self.autoupdate_task.cancel()
                 self.loop.run_until_complete(self.autoupdate_task)
             except asyncio.CancelledError:
-                logger.debug('autoupdate_task has been cancelled')
+                logger.debug(info('autoupdate_task has been cancelled.'))
 
             self.loop.run_until_complete(self.logout())
             for task in asyncio.Task.all_tasks():
@@ -217,7 +217,7 @@ def run(self, *args, **kwargs):
                     asyncio.gather(*asyncio.Task.all_tasks())
                 )
             except asyncio.CancelledError:
-                logger.debug('All pending tasks has been cancelled')
+                logger.debug(info('All pending tasks has been cancelled.'))
             finally:
                 self.loop.run_until_complete(self.session.close())
                 self.loop.close()
@@ -922,7 +922,7 @@ async def metadata_loop(self):
 
             try:
                 await self.session.post('https://api.modmail.tk/metadata', json=data)
-                logger.debug('Posted metadata')
+                logger.debug(info('Posted metadata'))
             except:
                 pass
 

cogs/utility.py

@@ -6,6 +6,7 @@
 from datetime import datetime
 from difflib import get_close_matches
 from io import StringIO
+from operator import itemgetter
 from typing import Union
 from json import JSONDecodeError
 from pkg_resources import parse_version
@@ -33,23 +34,27 @@ class Utility:
     def __init__(self, bot: Bot):
         self.bot = bot
 
+    @staticmethod
+    def get_perms_required(cmd) -> PermissionLevel:
+        for c in cmd.checks:
+            perm_level = getattr(c, 'permission_level',
+                                 PermissionLevel.INVALID)
+            if perm_level is not PermissionLevel.INVALID:
+                return perm_level
+        return PermissionLevel.INVALID
+
     async def format_cog_help(self, ctx, cog):
         """Formats the text for a cog help"""
 
         prefix = self.bot.prefix
 
-        def perms_required(cmd):
-            for c in cmd.checks:
-                return getattr(c, 'permission_level', 0)
-            return 0
-
         fmts = ['']
-        for cmd in sorted(self.bot.commands,
-                          key=lambda cmd: perms_required(cmd)):
+        for perm_level, cmd in sorted(((self.get_perms_required(c), c) for c in self.bot.commands),
+                                      key=itemgetter(0)):
             if cmd.instance is cog and not cmd.hidden:
-                new_fmt = f'`{prefix + cmd.qualified_name}` '
-                perm_level = perms_required(cmd)
-                if perm_level is not None:
+                if perm_level is PermissionLevel.INVALID:
+                    new_fmt = f'`{prefix + cmd.qualified_name}` '
+                else:
                     new_fmt = f'`[{perm_level}] {prefix + cmd.qualified_name}` '
 
                 new_fmt += f'- {cmd.short_doc}\n'
@@ -88,15 +93,17 @@ async def format_command_help(self, cmd):
 
         prefix = self.bot.prefix
 
-        perm_level = next(getattr(c, 'permission_level', None) for c in cmd.checks)
-        perm_level = f'{perm_level.name} [{perm_level}]' if perm_level is not None else ''
+        perm_level = self.get_perms_required(cmd)
+        if perm_level is not PermissionLevel.INVALID:
+            perm_level = f'{perm_level.name} [{perm_level}]'
+        else:
+            perm_level = ''
 
         embed = Embed(
             title=f'`{prefix}{cmd.signature}`',
             color=self.bot.main_color,
             description=cmd.help
         )
-                
 
         if not isinstance(cmd, commands.Group):
             embed.set_footer(text=f'Permission level: {perm_level}')

core/changelog.py

@@ -106,11 +106,11 @@ class Changelog:
     ----------------
     RAW_CHANGELOG_URL : str
         The URL to Modmail changelog.
+    CHANGELOG_URL : str
+        The URL to Modmail changelog directly from in GitHub.
     VERSION_REGEX : re.Pattern
         The regex used to parse the versions.
     """
-    
-
 
     RAW_CHANGELOG_URL = 'https://raw.githubusercontent.com/kyb3r/modmail/master/CHANGELOG.md'
     CHANGELOG_URL = 'https://github.com/kyb3r/modmail/blob/master/CHANGELOG.md'

core/models.py

@@ -20,6 +20,7 @@ class PermissionLevel(IntEnum):
     MOD = 3
     SUPPORTER = 2
     REGULAR = 1
+    INVALID = -1
 
 
 class Bot(abc.ABC, commands.Bot):