From cc72d484115a8acebf0fafe8bb332817168d3acd Mon Sep 17 00:00:00 2001
From: ToxicKidz <78174417+ToxicKidz@users.noreply.github.com>
Date: Fri, 12 Mar 2021 19:17:39 -0500
Subject: make utility invoke_help_command function

---
 bot/utils/extensions.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'bot/utils/extensions.py')

diff --git a/bot/utils/extensions.py b/bot/utils/extensions.py
index 50350ea8..56f6dd00 100644
--- a/bot/utils/extensions.py
+++ b/bot/utils/extensions.py
@@ -4,6 +4,7 @@ import pkgutil
 from typing import Iterator, NoReturn
 
 from bot import exts
+from discord.ext.commands import Context
 
 
 def unqualify(name: str) -> str:
@@ -31,4 +32,15 @@ def walk_extensions() -> Iterator[str]:
         yield module.name
 
 
+async def invoke_help_command(ctx: Context, *commands: str) -> None:
+    """Invoke the help command, and will use the default help command
+       if the help exten is not loaded.
+    """
+
+    if 'bot.exts.evergreen.help' in ctx.bot.extensions:
+        help_command = ctx.bot.get_command('help')
+        await ctx.invoke(help_command, *commands)
+        return
+    await ctx.send_help(''.join(commands))
+
 EXTENSIONS = frozenset(walk_extensions())
-- 
cgit v1.2.3


From ccf7d118eb2dea996b10bf0a4cfca977c452f636 Mon Sep 17 00:00:00 2001
From: ToxicKidz <78174417+ToxicKidz@users.noreply.github.com>
Date: Fri, 12 Mar 2021 20:01:24 -0500
Subject: Make flake8 happy.

---
 bot/exts/evergreen/game.py         | 2 +-
 bot/exts/evergreen/status_codes.py | 1 +
 bot/exts/utils/extensions.py       | 2 +-
 bot/utils/extensions.py            | 7 ++-----
 4 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'bot/utils/extensions.py')

diff --git a/bot/exts/evergreen/game.py b/bot/exts/evergreen/game.py
index ab4cae77..a6bfecaa 100644
--- a/bot/exts/evergreen/game.py
+++ b/bot/exts/evergreen/game.py
@@ -15,8 +15,8 @@ from discord.ext.commands import Cog, Context, group
 from bot.bot import Bot
 from bot.constants import STAFF_ROLES, Tokens
 from bot.utils.decorators import with_role
-from bot.utils.pagination import ImagePaginator, LinePaginator
 from bot.utils.extensions import invoke_help_command
+from bot.utils.pagination import ImagePaginator, LinePaginator
 
 # Base URL of IGDB API
 BASE_URL = "https://api.igdb.com/v4"
diff --git a/bot/exts/evergreen/status_codes.py b/bot/exts/evergreen/status_codes.py
index a037e117..127f3424 100644
--- a/bot/exts/evergreen/status_codes.py
+++ b/bot/exts/evergreen/status_codes.py
@@ -2,6 +2,7 @@ from http import HTTPStatus
 
 import discord
 from discord.ext import commands
+
 from bot.utils.extensions import invoke_help_command
 
 HTTP_DOG_URL = "https://httpstatusdogs.com/img/{code}.jpg"
diff --git a/bot/exts/utils/extensions.py b/bot/exts/utils/extensions.py
index 9c126a7b..4bd606b0 100644
--- a/bot/exts/utils/extensions.py
+++ b/bot/exts/utils/extensions.py
@@ -11,7 +11,7 @@ from bot import exts
 from bot.bot import Bot
 from bot.constants import Client, Emojis, MODERATION_ROLES, Roles
 from bot.utils.checks import with_role_check
-from bot.utils.extensions import EXTENSIONS, unqualify, invoke_help_command
+from bot.utils.extensions import EXTENSIONS, invoke_help_command, unqualify
 from bot.utils.pagination import LinePaginator
 
 log = logging.getLogger(__name__)
diff --git a/bot/utils/extensions.py b/bot/utils/extensions.py
index 56f6dd00..afc57383 100644
--- a/bot/utils/extensions.py
+++ b/bot/utils/extensions.py
@@ -1,10 +1,10 @@
+from discord.ext.commands import Context
 import importlib
 import inspect
 import pkgutil
 from typing import Iterator, NoReturn
 
 from bot import exts
-from discord.ext.commands import Context
 
 
 def unqualify(name: str) -> str:
@@ -33,10 +33,7 @@ def walk_extensions() -> Iterator[str]:
 
 
 async def invoke_help_command(ctx: Context, *commands: str) -> None:
-    """Invoke the help command, and will use the default help command
-       if the help exten is not loaded.
-    """
-
+    """Invoke the help command or default help command if help extensions is not loaded."""
     if 'bot.exts.evergreen.help' in ctx.bot.extensions:
         help_command = ctx.bot.get_command('help')
         await ctx.invoke(help_command, *commands)
-- 
cgit v1.2.3


From b395c05cc0885c427afab80e914d098dd9edc742 Mon Sep 17 00:00:00 2001
From: ToxicKidz <78174417+ToxicKidz@users.noreply.github.com>
Date: Fri, 12 Mar 2021 20:06:56 -0500
Subject: Make flake8 happy again.

---
 bot/exts/evergreen/emoji.py | 2 +-
 bot/exts/evergreen/movie.py | 2 +-
 bot/utils/extensions.py     | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'bot/utils/extensions.py')

diff --git a/bot/exts/evergreen/emoji.py b/bot/exts/evergreen/emoji.py
index 042e539d..e55a11ad 100644
--- a/bot/exts/evergreen/emoji.py
+++ b/bot/exts/evergreen/emoji.py
@@ -9,9 +9,9 @@ from discord import Color, Embed, Emoji
 from discord.ext import commands
 
 from bot.constants import Colours, ERROR_REPLIES
+from bot.utils.extensions import invoke_help_command
 from bot.utils.pagination import LinePaginator
 from bot.utils.time import time_since
-from bot.utils.extensions import invoke_help_command
 
 log = logging.getLogger(__name__)
 
diff --git a/bot/exts/evergreen/movie.py b/bot/exts/evergreen/movie.py
index 9aa3aea7..63ce81da 100644
--- a/bot/exts/evergreen/movie.py
+++ b/bot/exts/evergreen/movie.py
@@ -9,8 +9,8 @@ from discord import Embed
 from discord.ext.commands import Bot, Cog, Context, group
 
 from bot.constants import Tokens
-from bot.utils.pagination import ImagePaginator
 from bot.utils.extensions import invoke_help_command
+from bot.utils.pagination import ImagePaginator
 
 # Define base URL of TMDB
 BASE_URL = "https://api.themoviedb.org/3/"
diff --git a/bot/utils/extensions.py b/bot/utils/extensions.py
index afc57383..ffa8a936 100644
--- a/bot/utils/extensions.py
+++ b/bot/utils/extensions.py
@@ -1,9 +1,10 @@
-from discord.ext.commands import Context
 import importlib
 import inspect
 import pkgutil
 from typing import Iterator, NoReturn
 
+from discord.ext.commands import Context
+
 from bot import exts
 
 
-- 
cgit v1.2.3


From 9ec1cf9b983a69c381507f82c317e0465eecdc35 Mon Sep 17 00:00:00 2001
From: ToxicKidz <78174417+ToxicKidz@users.noreply.github.com>
Date: Sat, 13 Mar 2021 10:16:31 -0500
Subject: make invoke_help_command only take ctx

---
 bot/exts/christmas/advent_of_code/_cog.py | 2 +-
 bot/exts/evergreen/emoji.py               | 2 +-
 bot/exts/evergreen/game.py                | 2 +-
 bot/exts/evergreen/minesweeper.py         | 2 +-
 bot/exts/evergreen/movie.py               | 2 +-
 bot/exts/evergreen/snakes/_snakes_cog.py  | 2 +-
 bot/exts/evergreen/space.py               | 2 +-
 bot/exts/evergreen/status_codes.py        | 2 +-
 bot/exts/utils/extensions.py              | 8 ++++----
 bot/exts/valentines/be_my_valentine.py    | 2 +-
 bot/utils/extensions.py                   | 6 +++---
 11 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'bot/utils/extensions.py')

diff --git a/bot/exts/christmas/advent_of_code/_cog.py b/bot/exts/christmas/advent_of_code/_cog.py
index 6ba5c2af..dc3d7616 100644
--- a/bot/exts/christmas/advent_of_code/_cog.py
+++ b/bot/exts/christmas/advent_of_code/_cog.py
@@ -52,7 +52,7 @@ class AdventOfCode(commands.Cog):
     async def adventofcode_group(self, ctx: commands.Context) -> None:
         """All of the Advent of Code commands."""
         if not ctx.invoked_subcommand:
-            await invoke_help_command(ctx, ctx.command.name)
+            await invoke_help_command(ctx)
 
     @adventofcode_group.command(
         name="subscribe",
diff --git a/bot/exts/evergreen/emoji.py b/bot/exts/evergreen/emoji.py
index e55a11ad..fa3044e3 100644
--- a/bot/exts/evergreen/emoji.py
+++ b/bot/exts/evergreen/emoji.py
@@ -76,7 +76,7 @@ class Emojis(commands.Cog):
         if emoji is not None:
             await ctx.invoke(self.info_command, emoji)
         else:
-            await invoke_help_command(ctx, ctx.command.name)
+            await invoke_help_command(ctx)
 
     @emoji_group.command(name="count", aliases=("c",))
     async def count_command(self, ctx: commands.Context, *, category_query: str = None) -> None:
diff --git a/bot/exts/evergreen/game.py b/bot/exts/evergreen/game.py
index a6bfecaa..068d3f68 100644
--- a/bot/exts/evergreen/game.py
+++ b/bot/exts/evergreen/game.py
@@ -235,7 +235,7 @@ class Games(Cog):
         """
         # When user didn't specified genre, send help message
         if genre is None:
-            await invoke_help_command(ctx, ctx.command.name)
+            await invoke_help_command(ctx)
             return
 
         # Capitalize genre for check
diff --git a/bot/exts/evergreen/minesweeper.py b/bot/exts/evergreen/minesweeper.py
index cfe7150e..3031debc 100644
--- a/bot/exts/evergreen/minesweeper.py
+++ b/bot/exts/evergreen/minesweeper.py
@@ -84,7 +84,7 @@ class Minesweeper(commands.Cog):
     @commands.group(name='minesweeper', aliases=('ms',), invoke_without_command=True)
     async def minesweeper_group(self, ctx: commands.Context) -> None:
         """Commands for Playing Minesweeper."""
-        await invoke_help_command(ctx, ctx.command.name)
+        await invoke_help_command(ctx)
 
     @staticmethod
     def get_neighbours(x: int, y: int) -> typing.Generator[typing.Tuple[int, int], None, None]:
diff --git a/bot/exts/evergreen/movie.py b/bot/exts/evergreen/movie.py
index 63ce81da..b3bfe998 100644
--- a/bot/exts/evergreen/movie.py
+++ b/bot/exts/evergreen/movie.py
@@ -74,7 +74,7 @@ class Movie(Cog):
         try:
             result = await self.get_movies_list(self.http_session, MovieGenres[genre].value, 1)
         except KeyError:
-            await invoke_help_command(ctx, ctx.command.name)
+            await invoke_help_command(ctx)
             return
 
         # Check if "results" is in result. If not, throw error.
diff --git a/bot/exts/evergreen/snakes/_snakes_cog.py b/bot/exts/evergreen/snakes/_snakes_cog.py
index d0e60819..3732b559 100644
--- a/bot/exts/evergreen/snakes/_snakes_cog.py
+++ b/bot/exts/evergreen/snakes/_snakes_cog.py
@@ -441,7 +441,7 @@ class Snakes(Cog):
     @group(name='snakes', aliases=('snake',), invoke_without_command=True)
     async def snakes_group(self, ctx: Context) -> None:
         """Commands from our first code jam."""
-        await invoke_help_command(ctx, ctx.command.name)
+        await invoke_help_command(ctx)
 
     @bot_has_permissions(manage_messages=True)
     @snakes_group.command(name='antidote')
diff --git a/bot/exts/evergreen/space.py b/bot/exts/evergreen/space.py
index 305d6721..323ff659 100644
--- a/bot/exts/evergreen/space.py
+++ b/bot/exts/evergreen/space.py
@@ -64,7 +64,7 @@ class Space(Cog):
     @group(name="space", invoke_without_command=True)
     async def space(self, ctx: Context) -> None:
         """Head command that contains commands about space."""
-        await invoke_help_command(ctx, ctx.command.name)
+        await invoke_help_command(ctx)
 
     @space.command(name="apod")
     async def apod(self, ctx: Context, date: Optional[str] = None) -> None:
diff --git a/bot/exts/evergreen/status_codes.py b/bot/exts/evergreen/status_codes.py
index 127f3424..7c00fe20 100644
--- a/bot/exts/evergreen/status_codes.py
+++ b/bot/exts/evergreen/status_codes.py
@@ -19,7 +19,7 @@ class HTTPStatusCodes(commands.Cog):
     async def http_status_group(self, ctx: commands.Context) -> None:
         """Group containing dog and cat http status code commands."""
         if not ctx.invoked_subcommand:
-            await invoke_help_command(ctx, ctx.command.name)
+            await invoke_help_command(ctx)
 
     @http_status_group.command(name='cat')
     async def http_cat(self, ctx: commands.Context, code: int) -> None:
diff --git a/bot/exts/utils/extensions.py b/bot/exts/utils/extensions.py
index 4bd606b0..64e404d2 100644
--- a/bot/exts/utils/extensions.py
+++ b/bot/exts/utils/extensions.py
@@ -77,7 +77,7 @@ class Extensions(commands.Cog):
     @group(name="extensions", aliases=("ext", "exts", "c", "cogs"), invoke_without_command=True)
     async def extensions_group(self, ctx: Context) -> None:
         """Load, unload, reload, and list loaded extensions."""
-        await invoke_help_command(ctx, ctx.command.name)
+        await invoke_help_command(ctx)
 
     @extensions_group.command(name="load", aliases=("l",))
     async def load_command(self, ctx: Context, *extensions: Extension) -> None:
@@ -87,7 +87,7 @@ class Extensions(commands.Cog):
         If '\*' or '\*\*' is given as the name, all unloaded extensions will be loaded.
         """  # noqa: W605
         if not extensions:
-            await invoke_help_command(ctx, "extensions", ctx.command.name)
+            await invoke_help_command(ctx)
             return
 
         if "*" in extensions or "**" in extensions:
@@ -104,7 +104,7 @@ class Extensions(commands.Cog):
         If '\*' or '\*\*' is given as the name, all loaded extensions will be unloaded.
         """  # noqa: W605
         if not extensions:
-            await invoke_help_command(ctx, "extensions", ctx.command.name)
+            await invoke_help_command(ctx)
             return
 
         blacklisted = "\n".join(UNLOAD_BLACKLIST & set(extensions))
@@ -130,7 +130,7 @@ class Extensions(commands.Cog):
         If '\*\*' is given as the name, all extensions, including unloaded ones, will be reloaded.
         """  # noqa: W605
         if not extensions:
-            await invoke_help_command(ctx, "extensions", ctx.command.name)
+            await invoke_help_command(ctx)
             return
 
         if "**" in extensions:
diff --git a/bot/exts/valentines/be_my_valentine.py b/bot/exts/valentines/be_my_valentine.py
index d5cc8644..09591cf8 100644
--- a/bot/exts/valentines/be_my_valentine.py
+++ b/bot/exts/valentines/be_my_valentine.py
@@ -44,7 +44,7 @@ class BeMyValentine(commands.Cog):
         2) use the command \".lovefest unsub\" to get rid of the lovefest role.
         """
         if not ctx.invoked_subcommand:
-            await invoke_help_command(ctx, ctx.command.name)
+            await invoke_help_command(ctx)
 
     @lovefest_role.command(name="sub")
     async def add_role(self, ctx: commands.Context) -> None:
diff --git a/bot/utils/extensions.py b/bot/utils/extensions.py
index ffa8a936..459588a1 100644
--- a/bot/utils/extensions.py
+++ b/bot/utils/extensions.py
@@ -33,12 +33,12 @@ def walk_extensions() -> Iterator[str]:
         yield module.name
 
 
-async def invoke_help_command(ctx: Context, *commands: str) -> None:
+async def invoke_help_command(ctx: Context) -> None:
     """Invoke the help command or default help command if help extensions is not loaded."""
     if 'bot.exts.evergreen.help' in ctx.bot.extensions:
         help_command = ctx.bot.get_command('help')
-        await ctx.invoke(help_command, *commands)
+        await ctx.invoke(help_command, ctx.command.qualified_name)
         return
-    await ctx.send_help(''.join(commands))
+    await ctx.send_help(ctx.command)
 
 EXTENSIONS = frozenset(walk_extensions())
-- 
cgit v1.2.3