Fix help command for external plugins

Author: kyb3r

CHANGELOG.md

@@ -4,6 +4,10 @@ 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).
 
+# v2.18.5
+
+Fix help command bug when using external plugins.
+
 # v2.18.4
 
 Fix the teams permission bug.

bot.py

@@ -22,7 +22,7 @@
 SOFTWARE.
 """
 
-__version__ = '2.18.4'
+__version__ = '2.18.5'
 
 import asyncio
 import logging

cogs/utility.py

@@ -22,7 +22,7 @@
 from core.decorators import github_access_token_required, trigger_typing
 from core.models import Bot, InvalidConfigError, PermissionLevel
 from core.paginator import PaginatorSession, MessagePaginatorSession
-from core.utils import cleanup_code, info, error, User
+from core.utils import cleanup_code, info, error, User, perms_level
 
 logger = logging.getLogger('Modmail')
 
@@ -38,17 +38,12 @@ async def format_cog_help(self, ctx, cog):
 
         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)):
+                          key=lambda cmd: perms_level(cmd)):
             if cmd.instance is cog and not cmd.hidden:
                 new_fmt = f'`{prefix + cmd.qualified_name}` '
-                perm_level = perms_required(cmd)
+                perm_level = perms_level(cmd)
                 if perm_level is not None:
                     new_fmt = f'`[{perm_level}] {prefix + cmd.qualified_name}` '
 
@@ -88,7 +83,7 @@ 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 = perms_level(cmd)
         perm_level = f'{perm_level.name} [{perm_level}]' if perm_level is not None else ''
 
         embed = Embed(

core/models.py

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

core/utils.py

@@ -6,6 +6,7 @@
 from discord.ext import commands
 
 from colorama import Fore, Style
+from core.models import PermissionLevel
 
 
 def info(*msgs):
@@ -186,6 +187,15 @@ def match_user_id(text: str) -> int:
         return int(match.group(1))
     return -1
 
+def perms_level(cmd):
+    for c in cmd.checks:
+        perm = getattr(c, 'permission_level', None)
+        if perm is not None:
+            return perm
+    for c in cmd.checks:
+        if 'is_owner' in str(c):
+            return PermissionLevel.OWNER
+    return PermissionLevel.NONE
 
 async def ignore(coro):
     try: