Merge from "master" and removed fieldinator(?) from help

Author: Taaku18

cogs/utility.py

@@ -27,47 +27,29 @@ def __init__(self, bot):
 
     def format_cog_help(self, ctx, cog):
         """Formats the text for a cog help"""
-        sigs = []
+
+        maxlen = 0
         prefix = self.bot.prefix
 
         for cmd in self.bot.commands:
             if cmd.hidden:
                 continue
             if cmd.instance is cog:
-                sigs.append(len(cmd.qualified_name) + len(prefix))
-                if hasattr(cmd, 'all_commands'):
-                    for c in cmd.all_commands.values():
-                        sigs.append(len('\u200b  └─ ' + c.name) + 1)
+                len_ = len(cmd.qualified_name) + len(prefix)
+                if len_ > maxlen:
+                    maxlen = len_
 
-        if not sigs:
+        if maxlen == 0:
             return
 
-        maxlen = max(sigs)
-
-        fmt = ['']
-        index = 0
+        fmt = ''
         for cmd in self.bot.commands:
             if cmd.instance is cog:
                 if cmd.hidden:
                     continue
-                if len(f'{fmt[index]}`{prefix+cmd.qualified_name:<{maxlen}}` '
-                       f'- {cmd.short_doc:<{maxlen}}\n') > 1024:
-                    index += 1
-                    fmt.append('')
-                fmt[index] += f'`{prefix+cmd.qualified_name:<{maxlen}}` - '
-                fmt[index] += f'{cmd.short_doc:<{maxlen}}\n'
-                if hasattr(cmd, 'commands'):
-                    for i, c in enumerate(cmd.commands):
-                        if len(cmd.commands) == i + 1:  # last
-                            branch = '\u200b  └─ ' + c.name
-                        else:
-                            branch = '\u200b  ├─ ' + c.name
-                        if len(f'{fmt[index]}`{branch:<{maxlen+1}}` - '
-                               f'{c.short_doc:<{maxlen}}\n') > 1024:
-                            index += 1
-                            fmt.append('')
-                        fmt[index] += f'`{branch:<{maxlen+1}}` - '
-                        fmt[index] += f'{c.short_doc:<{maxlen}}\n'
+
+                fmt += f'`{prefix+cmd.qualified_name:<{maxlen}}` - '
+                fmt += f'{cmd.short_doc:<{maxlen}}\n'
 
         em = Embed(
             description='*' + inspect.getdoc(cog) + '*',
@@ -76,13 +58,10 @@ def format_cog_help(self, ctx, cog):
         em.set_author(name=cog.__class__.__name__ + ' - Help',
                       icon_url=ctx.bot.user.avatar_url)
 
-        for n, i in enumerate(fmt):
-            if n == 0:
-                em.add_field(name='Commands', value=i)
-            else:
-                em.add_field(name=u'\u200b', value=i)
+        em.add_field(name='Commands', value=fmt)
 
-        em.set_footer(text=f'Type {prefix}command for more info on a command.')
+        em.set_footer(text=f'Type "{prefix}command" '
+                           'for more info on a command.')
         return em
 
     def format_command_help(self, ctx, cmd):
@@ -115,7 +94,7 @@ def format_command_help(self, ctx, cmd):
 
         em.add_field(name='Sub-commands', value=fmt)
         em.set_footer(
-            text=f'Type {prefix}help {cmd} command for more info on a command.'
+            text=f'Type "{prefix}help {cmd}" for more info on a command.'
         )
         return em
 
@@ -125,7 +104,7 @@ def format_not_found(self, ctx, command):
             title='Could not find a cog or command by that name.',
             color=Color.red()
         )
-        em.set_footer(text=f'Type {prefix}help to get '
+        em.set_footer(text=f'Type "{prefix}help" to get '
                            'a full list of commands.')
         cogs = get_close_matches(command, self.bot.cogs.keys())
         cmds = get_close_matches(command, self.bot.all_commands.keys())
@@ -140,11 +119,10 @@ def format_not_found(self, ctx, command):
         return em
 
     @commands.command()
+    @trigger_typing
     async def help(self, ctx, *, command: str = None):
         """Shows the help message."""
 
-        await ctx.trigger_typing()
-
         if command is not None:
             cog = self.bot.cogs.get(command)
             cmd = self.bot.get_command(command)

config.json.example

@@ -1,6 +1,6 @@
 {
-    "TOKEN": "XXX.XXX.XXX",
-    "MODMAIL_API_TOKEN": "XXX.XXX.XXX",
-    "GUILD_ID": 6969696969,
-    "OWNERS": "comma,separated,user_ids"
+  "TOKEN": "MyBotToken",
+  "MODMAIL_API_TOKEN": "MyApiToken",
+  "GUILD_ID": 1234567890,
+  "OWNERS": "Owner1ID,Owner2ID,Owner3ID",
 }