Fixed a typo, changed help message to include all commands

Author: Taaku18

CHANGELOG.md

@@ -11,11 +11,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - A brand new permission system! Replacing the old guild-based permissions (ie. manage channels, manage messages), the new system enables you to customize your desire permission level specific to a command or a group of commands for a role or user.
 - There are five permission groups/levels:
-  - Owner
-  - Administrator
-  - Moderator
-  - Supporter
-  - Regular
+  - Owner [5]
+  - Administrator [4]
+  - Moderator [3]
+  - Supporter [2]
+  - Regular [1]
 
 You may add a role or user to a permission group through any of the following methods:
 - `?permissions add level owner @role`
@@ -36,6 +36,8 @@ To view all roles and users with permission for a permission group or command do
 
 By default, all newly set up Modmail will have `OWNER` set to the owner of the bot, and `EGULAR` set to @everyone.
 
+The help message no longer conceal inaccessible commands due to check failures.
+
 ### Note
 
 When updating to this version, all prior permission settings with guild-based permissions will be invalidated. You will need to convert to the above system.

cogs/utility.py

@@ -10,7 +10,6 @@
 from json import JSONDecodeError
 from textwrap import indent
 
-import discord
 from discord import Embed, Color, Activity
 from discord.enums import ActivityType, Status
 from discord.ext import commands
@@ -28,23 +27,11 @@
 
 
 class Utility:
-    """General commands that provide utility"""
+    """General commands that provide utility."""
 
     def __init__(self, bot: Bot):
         self.bot = bot
 
-    @staticmethod
-    async def verify_checks(ctx, cmd):
-        predicates = cmd.checks
-        if not predicates:
-            return True
-
-        try:
-            return await discord.utils.async_all(predicate(ctx)
-                                                 for predicate in predicates)
-        except commands.CheckFailure:
-            return False
-
     async def format_cog_help(self, ctx, cog):
         """Formats the text for a cog help"""
 
@@ -53,10 +40,13 @@ async def format_cog_help(self, ctx, cog):
         fmts = ['']
         for cmd in sorted(self.bot.commands,
                           key=lambda cmd: cmd.qualified_name):
-            if cmd.instance is cog and not cmd.hidden and \
-                    await self.verify_checks(ctx, cmd):
-                new_fmt = f'`{prefix + cmd.qualified_name}` - '
-                new_fmt += f'{cmd.short_doc}\n'
+            if cmd.instance is cog and not cmd.hidden:
+                new_fmt = f'`{prefix + cmd.qualified_name}` '
+                perm_level = next(getattr(c, 'permission_level', None) for c in cmd.checks)
+                if perm_level is not None:
+                    new_fmt += f'[{perm_level}] '
+
+                new_fmt += f'- {cmd.short_doc}\n'
                 if len(new_fmt) + len(fmts[-1]) >= 1024:
                     fmts.append(new_fmt)
                 else:
@@ -81,19 +71,21 @@ async def format_cog_help(self, ctx, cog):
             embeds.append(embed)
         return embeds
 
-    async def format_command_help(self, ctx, cmd):
+    async def format_command_help(self, cmd):
         """Formats command help."""
-        if cmd.hidden or not await self.verify_checks(ctx, cmd):
+        if cmd.hidden:
             return None
 
         prefix = self.bot.prefix
+
+        perm_level = next(getattr(c, 'permission_level', None) for c in cmd.checks)
+        perm_level = f' [{perm_level}]' if perm_level is not None else ''
         embed = Embed(
+            title=f'`{prefix}{cmd.signature}`{perm_level}',
             color=self.bot.main_color,
             description=cmd.help
         )
 
-        embed.title = f'`{prefix}{cmd.signature}`'
-
         if not isinstance(cmd, commands.Group):
             return embed
 
@@ -124,20 +116,12 @@ async def format_not_found(self, ctx, command):
                               'a full list of commands.')
 
         choices = set()
-        # filter out hidden commands & blank cogs
-        for i in self.bot.cogs:
-            for cmd in self.bot.commands:
-                if cmd.cog_name == i and not cmd.hidden and \
-                        await self.verify_checks(ctx, cmd):
-                    # as long as there's one valid cmd, add cog
-                    choices.add(i)
-                    break
-
-        for i in self.bot.commands:
-            if not i.hidden and await self.verify_checks(ctx, i):
-                choices.add(i.name)
-
-        closest = get_close_matches(command, choices, n=1, cutoff=0.45)
+
+        for name, c in self.bot.all_commands:
+            if not c.hidden:
+                choices.add(name)
+
+        closest = get_close_matches(command, choices, n=1, cutoff=0.75)
         if closest:
             # Perhaps you meant:
             #  - `item`
@@ -157,7 +141,7 @@ async def help_(self, ctx, *, command: str = None):
             embeds = []
 
             if cmd:
-                help_msg = await self.format_command_help(ctx, cmd)
+                help_msg = await self.format_command_help(cmd)
                 if help_msg:
                     embeds = [help_msg]
 
@@ -876,11 +860,11 @@ async def permissions(self, ctx):
         levels.
 
         Acceptable permission levels are:
-            - **Owner** (absolute control over the bot)
-            - **Administrator** (administrative powers such as setting activities)
-            - **Moderator** (ability to block)
-            - **Supporter** (access to core Modmail supporting functions)
-            - **Regular** (most basic interactions such as help and about)
+            - **Owner** [5] (absolute control over the bot)
+            - **Administrator** [4] (administrative powers such as setting activities)
+            - **Moderator** [3] (ability to block)
+            - **Supporter** [2] (access to core Modmail supporting functions)
+            - **Regular** [1] (most basic interactions such as help and about)
 
         By default, owner is set to the bot owner and regular is @everyone.
 
@@ -955,7 +939,8 @@ async def add_perms_level(self, ctx, level: str, user_or_role: Union[User, str])
         )
         return await ctx.send(embed=embed)
 
-    @permissions.group(name='remove', aliases=['del', 'delete', 'rm', 'revoke'])
+    @permissions.group(name='remove', aliases=['del', 'delete', 'rm', 'revoke'],
+                       invoke_without_command=True)
     @checks.has_permissions(PermissionLevel.OWNER)
     async def remove_perms(self, ctx):
         """Remove a permission to use a command or permission level."""

core/checks.py

@@ -34,6 +34,8 @@ async def predicate(ctx):
             logger.error(error(f'You does not have permission to use this command: '
                                f'`{ctx.command.qualified_name}` ({permission_level.name}).'))
         return has_perm
+
+    predicate.permission_level = permission_level
     return commands.check(predicate)