From d74e285764e953010be4dca0fb6fc0a8f71482c4 Mon Sep 17 00:00:00 2001
From: Adriene Hutchins <ustin.a.h@gmail.com>
Date: Sun, 1 Mar 2020 23:58:05 -0500
Subject: [PATCH] New help command, fixed ping assist

---
 .gitignore                                 |   3 +-
 extensions/__pycache__/core.cpython-38.pyc | Bin 5837 -> 8150 bytes
 extensions/botlist.py                      |   4 +-
 extensions/core.py                         |  67 ++++++++++++++++++++-
 main.py                                    |   4 +-
 5 files changed, 72 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 482d026..9d71bc5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,4 +50,5 @@ coverage.xml
 *.pot
 
 # Sphinx documentation
-docs/_build/
\ No newline at end of file
+docs/_build/
+extensions/__pycache__/core.cpython-38.pyc
diff --git a/extensions/__pycache__/core.cpython-38.pyc b/extensions/__pycache__/core.cpython-38.pyc
index 5fdc3848a656fc0362309aa879abf105ac6630a3..c4719e944ee170ae289a53464365039397af4ae7 100644
GIT binary patch
delta 3657
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

delta 1282
zcmZvb%TE(Q9LHyN+wDRhX<951c~qj}q7scH7(;we6p&C<)WpU>N@uNWU>9e$DujeY
ziD$_iJo>s2<zni=f54ORsE08z@#ev^MlbmLZL3IQH@{Ej@q2uKotcj(-ycd`j>nq`
z{Jtz)o4(q*mT0Fp*A7f(M+nndXqB*#t>0|EuNR^$%#2l1h%q`vtjOBygVcQWrHO`M
z)+4{u?5TFhvP_rB3}LiP92|i?(Vh}Y7y&meubS<<zU>OfbA_cVeb)1pDQw?&+_I2w
zwQkxZziN}|1f&vyENW;P(Kd}x^`hQGJ5AV7IwavuFscFlcm$BCJ_<E!{ecf1Drn<i
z6JR4?mxdZ5RCMM>WxnXnF8a3Uu6{5~N|&miBkOc;tw_ngtMqwMZj1{TXT6F)P<`37
zN_&-2^4#lAneRgpJ%2R?>QI<69QU^4+r#oo^atH3^Red%>`obF+h1@P?~t3Z191$u
zOpcZLemM~D-(}%&dy^_G{Gu<Wst@8}+JPY|WHZO-yKtyGu5THCQmiMsTDC{?)8JK>
zpAsF^s{Tw2Q+iCENDg%c$}s~s5Me|Lkwy&4$I0E%nl79V$#==N9osXj(41Ffx8$$n
z&uk8zLV%_8nLkIJt+?o5vp#-Irc=E}t)$GQ_74n#s}-)R4hkU7A;u96m5f@dd(~&D
zF-mjtTe=h4h_-aE45RlMz*6g0VMn+<ezsoRiq=l4q1QYH1`VSYeiku_7(t98#t@B4
zxQ%%q!j@<wL~gV^o(TH72rHKMPe%=b5pKgVa{oC-;y*>gNxBrvdED-+Z{@8NAC;L*
z=Smc|gS)MC;d9=BQw^XZC2t;XFXO$qbQm#!z(ZE1BWAoiuFd%buAN6*KujUF^aP{e
z`RK3_0~37!Q!`C7me`S`@=a!s#&!9k^XQ62^OmL}MaE`IUYTQrMQhh(D`Rlw!|<Xj
z3mcdYwGzq;=p0uO=7^HV84q4Sv_9*@=Zud0H~=b$MYrU5(D9-uL`n-4$Gz?;Io)NP
oKY|W=u3kP!`@eRSIXLgJ%A9?ILV(BsOlr~?*xyf2t&rWn0b2|bNB{r;

diff --git a/extensions/botlist.py b/extensions/botlist.py
index 15ff567..6e9d377 100644
--- a/extensions/botlist.py
+++ b/extensions/botlist.py
@@ -12,7 +12,7 @@ from discord.ext import commands, tasks
 import dbl
 
 
-class Botlist(commands.Cog):
+class BotList(commands.Cog, name='Bot List'):
     def __init__(self, bot):
         self.bot = bot
         self.request = bot.request
@@ -116,4 +116,4 @@ class Botlist(commands.Cog):
 
 
 def setup(bot):
-    bot.add_cog(Botlist(bot))
+    bot.add_cog(BotList(bot))
diff --git a/extensions/core.py b/extensions/core.py
index cd78407..c4dfa51 100644
--- a/extensions/core.py
+++ b/extensions/core.py
@@ -7,16 +7,23 @@ import sys
 import cpuinfo
 import math
 import psutil
+import itertools
 
 
 class Core(commands.Cog):
 
     def __init__(self, bot):
         self.bot = bot
-        self.settings = {
+        self.settings = {   
             'extensions': []
         }
 
+        # 
+        self._original_help_command = bot.help_command
+        if bot.config['CUSTOM_HELP']:
+            bot.help_command = HelpCommand()
+        bot.help_command.cog = self
+
         self._init_extensions()
 
     def _init_extensions(self):
@@ -168,6 +175,64 @@ Number of extensions present: {len(ctx.bot.cogs)}
         await ctx.send(':zzz: **Restarting.**')
         exit()
 
+    def cog_unload(self):
+        self.bot.help_command = self._original_help_command
+
+class HelpCommand(commands.MinimalHelpCommand):
+    def __init__(self, **options):
+        super().__init__(**options)
+
+    def add_bot_commands_formatting(self, commands, heading):
+        if commands:
+            self.paginator.add_line(f"**{heading}**")
+            if heading == 'Main':
+                self.paginator.add_line(", ".join(f"`{c.name}`" for c in commands))
+            else:
+                for c in commands:
+                    self.paginator.add_line(f'`{c.name}` - _{c.short_doc}_')
+        self.paginator.add_line()
+
+    async def send_bot_help(self, mapping):
+        ctx = self.context
+        bot = ctx.bot
+
+        if bot.description:
+            self.paginator.add_line(bot.description, empty=True)
+
+        note = self.get_opening_note()
+        if note:
+            self.paginator.add_line(note, empty=True)
+
+        no_category = '\u200b{0.no_category}'.format(self)
+        def get_category(command, *, no_category=no_category):
+            cog = command.cog
+            return cog.qualified_name if cog is not None else no_category
+
+        filtered = await self.filter_commands(bot.commands, sort=True, key=get_category)
+        to_iterate = itertools.groupby(filtered, key=get_category)
+
+        main_cmds = []
+        other_cmds = {}
+
+        for category, commands in to_iterate:
+            commands = sorted(commands, key=lambda c: c.name) if self.sort_commands else list(commands)
+            if category in ['Core', 'Bot List']:
+                main_cmds.extend(commands) 
+            else:
+                other_cmds[category] = commands
+            
+        self.add_bot_commands_formatting(main_cmds, 'Main')
+        for category, commands in other_cmds.items():
+            self.add_bot_commands_formatting(commands, category)
+
+        note = self.get_ending_note()
+        if note:
+            self.paginator.add_line()
+            self.paginator.add_line(note)
+
+        await self.send_pages()
+
+
 
 def setup(bot):
     bot.add_cog(Core(bot))
diff --git a/main.py b/main.py
index ae84488..b7edef9 100644
--- a/main.py
+++ b/main.py
@@ -75,7 +75,7 @@ class Bot(commands.Bot):
     async def on_message(self, message):
 
         # Prerequisites
-        mentions = commands.when_mentioned(bot, message)
+        mentions = [self.user.mention, f'<@!{self.user.id}>']
         ctx = await self.get_context(message)
 
         # Handling
@@ -88,7 +88,7 @@ class Bot(commands.Bot):
         elif self.maintenance and not message.author.is_owner():
             # Maintenance mode
             return
-        elif message.content in mentions and self.config['MENTION_ASSIST']:
+        elif message.content in mentions and self.config.get('MENTION_ASSIST'):
             # Empty ping for assistance
             assist_msg = (
                 "**Hi there! How can I help?**\n\n"