From 661ab2cc966c96d6f05dfc0444f7569b2a8fd727 Mon Sep 17 00:00:00 2001
From: Shivansh-007 <Shivansh-007@users.noreply.github.com>
Date: Thu, 28 Jan 2021 04:44:36 +0530
Subject: Add http status dog and add http_cat to group http_status

---
 bot/exts/evergreen/status_codes.py | 63 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 bot/exts/evergreen/status_codes.py

(limited to 'bot/exts/evergreen/status_codes.py')

diff --git a/bot/exts/evergreen/status_codes.py b/bot/exts/evergreen/status_codes.py
new file mode 100644
index 00000000..eebc23af
--- /dev/null
+++ b/bot/exts/evergreen/status_codes.py
@@ -0,0 +1,63 @@
+import re
+from http import HTTPStatus
+
+import discord
+from discord import HTTPException
+from discord.ext import commands
+
+
+class StatusCats(commands.Cog):
+    """Commands that give HTTP statuses described and visualized by cats and dogs."""
+
+    def __init__(self, bot: commands.Bot):
+        self.bot = bot
+
+    @commands.group(name="http_status", aliases=("status", "httpstatus"))
+    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 ctx.send_help(ctx.command)
+
+    @http_status_group.command(aliases=['cat'])
+    async def http_cat(self, ctx: commands.Context, code: int) -> None:
+        """Sends an embed with an image of a cat, portraying the status code."""
+        embed = discord.Embed(title=f'**Status: {code}**')
+
+        try:
+            HTTPStatus(code)
+
+        except ValueError:
+            embed.set_footer(text='Inputted status code does not exist.')
+
+        else:
+            embed.set_image(url=f'https://http.cat/{code}.jpg')
+
+        finally:
+            await ctx.send(embed=embed)
+
+    @http_status_group.command(aliases=['dog'])
+    async def http_dog(self, ctx: commands.Context, code: int) -> None:
+        """Sends an embed with an image of a dog, portraying the status code."""
+        embed = discord.Embed(title=f'**Status: {code}**')
+
+        try:
+            HTTPStatus(code)
+            async with self.bot.http_session.get(
+                    f'https://httpstatusdogs.com/img/{code}.jpg',
+                    allow_redirects=False
+            ) as response:
+                if response.status != 302:
+                    embed.set_image(url=f'https://httpstatusdogs.com/img/{code}.jpg')
+                else:
+                    raise ValueError
+
+        except ValueError:
+            embed.set_footer(text='Inputted status code does not exist.')
+
+        finally:
+            await ctx.send(embed=embed)
+
+
+def setup(bot: commands.Bot) -> None:
+    """Load the StatusCats cog."""
+    bot.add_cog(StatusCats(bot))
-- 
cgit v1.2.3


From f5eae5bec548bc1e450af7f07387531b80869f84 Mon Sep 17 00:00:00 2001
From: Shivansh-007 <Shivansh-007@users.noreply.github.com>
Date: Sun, 31 Jan 2021 05:26:23 +0530
Subject: Remove unused imports

---
 bot/exts/evergreen/status_codes.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'bot/exts/evergreen/status_codes.py')

diff --git a/bot/exts/evergreen/status_codes.py b/bot/exts/evergreen/status_codes.py
index eebc23af..473e778c 100644
--- a/bot/exts/evergreen/status_codes.py
+++ b/bot/exts/evergreen/status_codes.py
@@ -1,8 +1,6 @@
-import re
 from http import HTTPStatus
 
 import discord
-from discord import HTTPException
 from discord.ext import commands
 
 
-- 
cgit v1.2.3


From c87f6e0561bbeb6510292a0b09a829aa6fa290a7 Mon Sep 17 00:00:00 2001
From: Shivansh-007 <Shivansh-007@users.noreply.github.com>
Date: Mon, 1 Feb 2021 05:21:32 +0530
Subject: rename the cog to HTTPStatusCodes

---
 bot/exts/evergreen/status_codes.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'bot/exts/evergreen/status_codes.py')

diff --git a/bot/exts/evergreen/status_codes.py b/bot/exts/evergreen/status_codes.py
index 473e778c..19375657 100644
--- a/bot/exts/evergreen/status_codes.py
+++ b/bot/exts/evergreen/status_codes.py
@@ -4,7 +4,7 @@ import discord
 from discord.ext import commands
 
 
-class StatusCats(commands.Cog):
+class HTTPStatusCodes(commands.Cog):
     """Commands that give HTTP statuses described and visualized by cats and dogs."""
 
     def __init__(self, bot: commands.Bot):
@@ -57,5 +57,5 @@ class StatusCats(commands.Cog):
 
 
 def setup(bot: commands.Bot) -> None:
-    """Load the StatusCats cog."""
-    bot.add_cog(StatusCats(bot))
+    """Load the HTTPStatusCodes cog."""
+    bot.add_cog(HTTPStatusCodes(bot))
-- 
cgit v1.2.3


From e32182ee7000cea8a49d41605bb01563c0d68800 Mon Sep 17 00:00:00 2001
From: Shivansh-007 <Shivansh-007@users.noreply.github.com>
Date: Mon, 1 Feb 2021 05:28:35 +0530
Subject: Add similar repsonse.status check to  too, and instead of ValueError
 raise NotImplemented error if the status is not implemented yet but is a
 valid status code

---
 bot/exts/evergreen/status_codes.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'bot/exts/evergreen/status_codes.py')

diff --git a/bot/exts/evergreen/status_codes.py b/bot/exts/evergreen/status_codes.py
index 19375657..bfc4bb1a 100644
--- a/bot/exts/evergreen/status_codes.py
+++ b/bot/exts/evergreen/status_codes.py
@@ -23,13 +23,18 @@ class HTTPStatusCodes(commands.Cog):
 
         try:
             HTTPStatus(code)
+            async with self.bot.http_session.get(
+                    f'https://http.cat/{code}.jpg',
+                    allow_redirects=False
+            ) as response:
+                if response.status != 404:
+                    embed.set_image(url=f'https://http.cat/{code}.jpg')
+                else:
+                    raise NotImplementedError
 
         except ValueError:
             embed.set_footer(text='Inputted status code does not exist.')
 
-        else:
-            embed.set_image(url=f'https://http.cat/{code}.jpg')
-
         finally:
             await ctx.send(embed=embed)
 
@@ -47,11 +52,14 @@ class HTTPStatusCodes(commands.Cog):
                 if response.status != 302:
                     embed.set_image(url=f'https://httpstatusdogs.com/img/{code}.jpg')
                 else:
-                    raise ValueError
+                    raise NotImplementedError
 
         except ValueError:
             embed.set_footer(text='Inputted status code does not exist.')
 
+        except NotImplementedError:
+            embed.set_footer(text='Inputted status code is not implemented by httpstatusdogs.com yet.')
+
         finally:
             await ctx.send(embed=embed)
 
-- 
cgit v1.2.3


From aee64f82f5a97a4bdd32c6d6d66f6f0eb8ef51f8 Mon Sep 17 00:00:00 2001
From: Shivansh-007 <Shivansh-007@users.noreply.github.com>
Date: Tue, 2 Feb 2021 05:23:34 +0530
Subject: Add not Implemented error handler for .status cat command

---
 bot/exts/evergreen/status_codes.py | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'bot/exts/evergreen/status_codes.py')

diff --git a/bot/exts/evergreen/status_codes.py b/bot/exts/evergreen/status_codes.py
index bfc4bb1a..ff2ac9e1 100644
--- a/bot/exts/evergreen/status_codes.py
+++ b/bot/exts/evergreen/status_codes.py
@@ -35,6 +35,9 @@ class HTTPStatusCodes(commands.Cog):
         except ValueError:
             embed.set_footer(text='Inputted status code does not exist.')
 
+        except NotImplementedError:
+            embed.set_footer(text='Inputted status code is not implemented by http.cat yet.')
+
         finally:
             await ctx.send(embed=embed)
 
-- 
cgit v1.2.3


From 5e55ea1dbfd652c10999c88d1c32aebd1be768f0 Mon Sep 17 00:00:00 2001
From: Shivansh-007 <Shivansh-007@users.noreply.github.com>
Date: Thu, 4 Feb 2021 05:23:54 +0530
Subject: Make use of constants in the url

---
 bot/exts/evergreen/status_codes.py | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'bot/exts/evergreen/status_codes.py')

diff --git a/bot/exts/evergreen/status_codes.py b/bot/exts/evergreen/status_codes.py
index ff2ac9e1..874c87eb 100644
--- a/bot/exts/evergreen/status_codes.py
+++ b/bot/exts/evergreen/status_codes.py
@@ -3,6 +3,9 @@ from http import HTTPStatus
 import discord
 from discord.ext import commands
 
+HTTP_DOG_URL = "https://httpstatusdogs.com/img/{code}.jpg"
+HTTP_CAT_URL = "https://http.cat/{code}.jpg"
+
 
 class HTTPStatusCodes(commands.Cog):
     """Commands that give HTTP statuses described and visualized by cats and dogs."""
@@ -16,19 +19,17 @@ class HTTPStatusCodes(commands.Cog):
         if not ctx.invoked_subcommand:
             await ctx.send_help(ctx.command)
 
-    @http_status_group.command(aliases=['cat'])
+    @http_status_group.command(name='cat')
     async def http_cat(self, ctx: commands.Context, code: int) -> None:
         """Sends an embed with an image of a cat, portraying the status code."""
         embed = discord.Embed(title=f'**Status: {code}**')
+        url = HTTP_CAT_URL.format(code=code)
 
         try:
             HTTPStatus(code)
-            async with self.bot.http_session.get(
-                    f'https://http.cat/{code}.jpg',
-                    allow_redirects=False
-            ) as response:
+            async with self.bot.http_session.get(url, allow_redirects=False) as response:
                 if response.status != 404:
-                    embed.set_image(url=f'https://http.cat/{code}.jpg')
+                    embed.set_image(url=url)
                 else:
                     raise NotImplementedError
 
@@ -41,19 +42,17 @@ class HTTPStatusCodes(commands.Cog):
         finally:
             await ctx.send(embed=embed)
 
-    @http_status_group.command(aliases=['dog'])
+    @http_status_group.command(name='dog')
     async def http_dog(self, ctx: commands.Context, code: int) -> None:
         """Sends an embed with an image of a dog, portraying the status code."""
         embed = discord.Embed(title=f'**Status: {code}**')
+        url = HTTP_DOG_URL.format(code=code)
 
         try:
             HTTPStatus(code)
-            async with self.bot.http_session.get(
-                    f'https://httpstatusdogs.com/img/{code}.jpg',
-                    allow_redirects=False
-            ) as response:
+            async with self.bot.http_session.get(url, allow_redirects=False) as response:
                 if response.status != 302:
-                    embed.set_image(url=f'https://httpstatusdogs.com/img/{code}.jpg')
+                    embed.set_image(url=url)
                 else:
                     raise NotImplementedError
 
-- 
cgit v1.2.3


From 1cd9c7a4f74834d799bfc706f5f28cb4147fa0ff Mon Sep 17 00:00:00 2001
From: ToxicKidz <78174417+ToxicKidz@users.noreply.github.com>
Date: Thu, 11 Mar 2021 12:24:49 -0500
Subject: change ctx.send_help to ctx.invoke(help_command) ;

---
 bot/exts/christmas/advent_of_code/_cog.py |  3 ++-
 bot/exts/evergreen/emoji.py               |  3 ++-
 bot/exts/evergreen/game.py                |  3 ++-
 bot/exts/evergreen/minesweeper.py         |  3 ++-
 bot/exts/evergreen/movie.py               |  3 ++-
 bot/exts/evergreen/snakes/_snakes_cog.py  |  3 ++-
 bot/exts/evergreen/space.py               |  3 ++-
 bot/exts/evergreen/status_codes.py        |  3 ++-
 bot/exts/utils/extensions.py              | 12 ++++++++----
 bot/exts/valentines/be_my_valentine.py    |  3 ++-
 10 files changed, 26 insertions(+), 13 deletions(-)

(limited to 'bot/exts/evergreen/status_codes.py')

diff --git a/bot/exts/christmas/advent_of_code/_cog.py b/bot/exts/christmas/advent_of_code/_cog.py
index 29902306..bf008ee9 100644
--- a/bot/exts/christmas/advent_of_code/_cog.py
+++ b/bot/exts/christmas/advent_of_code/_cog.py
@@ -51,7 +51,8 @@ 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 ctx.send_help(ctx.command)
+            help_command = self.bot.get_command("help")
+            await ctx.invoke(help_command, ctx.command.name)
 
     @adventofcode_group.command(
         name="subscribe",
diff --git a/bot/exts/evergreen/emoji.py b/bot/exts/evergreen/emoji.py
index 99f71218..40bf83e8 100644
--- a/bot/exts/evergreen/emoji.py
+++ b/bot/exts/evergreen/emoji.py
@@ -75,7 +75,8 @@ class Emojis(commands.Cog):
         if emoji is not None:
             await ctx.invoke(self.info_command, emoji)
         else:
-            await ctx.send_help(ctx.command)
+            help_command = self.bot.get_command("help")
+            await ctx.invoke(help_command, ctx.command.name)
 
     @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 d37be0e2..d49a8858 100644
--- a/bot/exts/evergreen/game.py
+++ b/bot/exts/evergreen/game.py
@@ -234,7 +234,8 @@ class Games(Cog):
         """
         # When user didn't specified genre, send help message
         if genre is None:
-            await ctx.send_help("games")
+            help_command = self.bot.get_command("help")
+            await ctx.invoke(help_command, ctx.command.name)
             return
 
         # Capitalize genre for check
diff --git a/bot/exts/evergreen/minesweeper.py b/bot/exts/evergreen/minesweeper.py
index 286ac7a5..06a75c2b 100644
--- a/bot/exts/evergreen/minesweeper.py
+++ b/bot/exts/evergreen/minesweeper.py
@@ -83,7 +83,8 @@ 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 ctx.send_help(ctx.command)
+        help_command = ctx.bot.get_command("help")
+        await ctx.invoke(help_command, ctx.command.name)
 
     @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 340a5724..238ab038 100644
--- a/bot/exts/evergreen/movie.py
+++ b/bot/exts/evergreen/movie.py
@@ -73,7 +73,8 @@ class Movie(Cog):
         try:
             result = await self.get_movies_list(self.http_session, MovieGenres[genre].value, 1)
         except KeyError:
-            await ctx.send_help('movies')
+            help_command = self.bot.get_command("help")
+            await ctx.invoke(help_command, ctx.command.name)
             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 d5e4f206..819a98b2 100644
--- a/bot/exts/evergreen/snakes/_snakes_cog.py
+++ b/bot/exts/evergreen/snakes/_snakes_cog.py
@@ -440,7 +440,8 @@ 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 ctx.send_help(ctx.command)
+        help_command = self.bot.get_command("help")
+        await ctx.invoke(help_command, ctx.command.name)
 
     @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 bc8e3118..e388e13f 100644
--- a/bot/exts/evergreen/space.py
+++ b/bot/exts/evergreen/space.py
@@ -63,7 +63,8 @@ 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 ctx.send_help("space")
+        help_command = self.bot.get_command("help")
+        await ctx.invoke(help_command, ctx.command.name)
 
     @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 874c87eb..d06724eb 100644
--- a/bot/exts/evergreen/status_codes.py
+++ b/bot/exts/evergreen/status_codes.py
@@ -17,7 +17,8 @@ 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 ctx.send_help(ctx.command)
+            help_command = self.bot.get_command("help")
+            await ctx.invoke(help_command, ctx.command.name)
 
     @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 bb22c353..f7ff2396 100644
--- a/bot/exts/utils/extensions.py
+++ b/bot/exts/utils/extensions.py
@@ -77,7 +77,8 @@ 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 ctx.send_help(ctx.command)
+        help_command = self.bot.get_command("help")
+        await ctx.invoke(help_command, ctx.command.name)
 
     @extensions_group.command(name="load", aliases=("l",))
     async def load_command(self, ctx: Context, *extensions: Extension) -> None:
@@ -87,7 +88,8 @@ class Extensions(commands.Cog):
         If '\*' or '\*\*' is given as the name, all unloaded extensions will be loaded.
         """  # noqa: W605
         if not extensions:
-            await ctx.send_help(ctx.command)
+            help_command = self.bot.get_command("help")
+            await ctx.invoke(help_command, "extensions", ctx.command.name)
             return
 
         if "*" in extensions or "**" in extensions:
@@ -104,7 +106,8 @@ class Extensions(commands.Cog):
         If '\*' or '\*\*' is given as the name, all loaded extensions will be unloaded.
         """  # noqa: W605
         if not extensions:
-            await ctx.send_help(ctx.command)
+            help_command = self.bot.get_command("help")
+            await ctx.invoke(help_command, "extensions", ctx.command.name)
             return
 
         blacklisted = "\n".join(UNLOAD_BLACKLIST & set(extensions))
@@ -130,7 +133,8 @@ class Extensions(commands.Cog):
         If '\*\*' is given as the name, all extensions, including unloaded ones, will be reloaded.
         """  # noqa: W605
         if not extensions:
-            await ctx.send_help(ctx.command)
+            help_command = self.bot.get_command("help")
+            await ctx.invoke(help_command, "extensions", ctx.command.name)
             return
 
         if "**" in extensions:
diff --git a/bot/exts/valentines/be_my_valentine.py b/bot/exts/valentines/be_my_valentine.py
index f3392bcb..59bd42d3 100644
--- a/bot/exts/valentines/be_my_valentine.py
+++ b/bot/exts/valentines/be_my_valentine.py
@@ -43,7 +43,8 @@ class BeMyValentine(commands.Cog):
         2) use the command \".lovefest unsub\" to get rid of the lovefest role.
         """
         if not ctx.invoked_subcommand:
-            await ctx.send_help(ctx.command)
+            help_command = self.bot.get_command("help")
+            await ctx.invoke(help_command, ctx.command.name)
 
     @lovefest_role.command(name="sub")
     async def add_role(self, ctx: commands.Context) -> None:
-- 
cgit v1.2.3


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/exts/christmas/advent_of_code/_cog.py |  4 ++--
 bot/exts/evergreen/emoji.py               |  4 ++--
 bot/exts/evergreen/game.py                |  4 ++--
 bot/exts/evergreen/minesweeper.py         |  4 ++--
 bot/exts/evergreen/movie.py               |  4 ++--
 bot/exts/evergreen/snakes/_snakes_cog.py  |  4 ++--
 bot/exts/evergreen/space.py               |  4 ++--
 bot/exts/evergreen/status_codes.py        |  4 ++--
 bot/exts/utils/extensions.py              | 14 +++++---------
 bot/exts/valentines/be_my_valentine.py    |  4 ++--
 bot/utils/extensions.py                   | 12 ++++++++++++
 11 files changed, 35 insertions(+), 27 deletions(-)

(limited to 'bot/exts/evergreen/status_codes.py')

diff --git a/bot/exts/christmas/advent_of_code/_cog.py b/bot/exts/christmas/advent_of_code/_cog.py
index bf008ee9..6ba5c2af 100644
--- a/bot/exts/christmas/advent_of_code/_cog.py
+++ b/bot/exts/christmas/advent_of_code/_cog.py
@@ -12,6 +12,7 @@ from bot.constants import (
 )
 from bot.exts.christmas.advent_of_code import _helpers
 from bot.utils.decorators import InChannelCheckFailure, in_month, whitelist_override, with_role
+from bot.utils.extensions import invoke_help_command
 
 log = logging.getLogger(__name__)
 
@@ -51,8 +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:
-            help_command = self.bot.get_command("help")
-            await ctx.invoke(help_command, ctx.command.name)
+            await invoke_help_command(ctx, ctx.command.name)
 
     @adventofcode_group.command(
         name="subscribe",
diff --git a/bot/exts/evergreen/emoji.py b/bot/exts/evergreen/emoji.py
index 40bf83e8..042e539d 100644
--- a/bot/exts/evergreen/emoji.py
+++ b/bot/exts/evergreen/emoji.py
@@ -11,6 +11,7 @@ from discord.ext import commands
 from bot.constants import Colours, ERROR_REPLIES
 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__)
 
@@ -75,8 +76,7 @@ class Emojis(commands.Cog):
         if emoji is not None:
             await ctx.invoke(self.info_command, emoji)
         else:
-            help_command = self.bot.get_command("help")
-            await ctx.invoke(help_command, ctx.command.name)
+            await invoke_help_command(ctx, ctx.command.name)
 
     @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 d49a8858..ab4cae77 100644
--- a/bot/exts/evergreen/game.py
+++ b/bot/exts/evergreen/game.py
@@ -16,6 +16,7 @@ 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
 
 # Base URL of IGDB API
 BASE_URL = "https://api.igdb.com/v4"
@@ -234,8 +235,7 @@ class Games(Cog):
         """
         # When user didn't specified genre, send help message
         if genre is None:
-            help_command = self.bot.get_command("help")
-            await ctx.invoke(help_command, ctx.command.name)
+            await invoke_help_command(ctx, ctx.command.name)
             return
 
         # Capitalize genre for check
diff --git a/bot/exts/evergreen/minesweeper.py b/bot/exts/evergreen/minesweeper.py
index 06a75c2b..cfe7150e 100644
--- a/bot/exts/evergreen/minesweeper.py
+++ b/bot/exts/evergreen/minesweeper.py
@@ -8,6 +8,7 @@ from discord.ext import commands
 
 from bot.constants import Client
 from bot.utils.exceptions import UserNotPlayingError
+from bot.utils.extensions import invoke_help_command
 
 MESSAGE_MAPPING = {
     0: ":stop_button:",
@@ -83,8 +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."""
-        help_command = ctx.bot.get_command("help")
-        await ctx.invoke(help_command, ctx.command.name)
+        await invoke_help_command(ctx, ctx.command.name)
 
     @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 238ab038..9aa3aea7 100644
--- a/bot/exts/evergreen/movie.py
+++ b/bot/exts/evergreen/movie.py
@@ -10,6 +10,7 @@ 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
 
 # Define base URL of TMDB
 BASE_URL = "https://api.themoviedb.org/3/"
@@ -73,8 +74,7 @@ class Movie(Cog):
         try:
             result = await self.get_movies_list(self.http_session, MovieGenres[genre].value, 1)
         except KeyError:
-            help_command = self.bot.get_command("help")
-            await ctx.invoke(help_command, ctx.command.name)
+            await invoke_help_command(ctx, ctx.command.name)
             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 819a98b2..d0e60819 100644
--- a/bot/exts/evergreen/snakes/_snakes_cog.py
+++ b/bot/exts/evergreen/snakes/_snakes_cog.py
@@ -22,6 +22,7 @@ from bot.constants import ERROR_REPLIES, Tokens
 from bot.exts.evergreen.snakes import _utils as utils
 from bot.exts.evergreen.snakes._converter import Snake
 from bot.utils.decorators import locked
+from bot.utils.extensions import invoke_help_command
 
 log = logging.getLogger(__name__)
 
@@ -440,8 +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."""
-        help_command = self.bot.get_command("help")
-        await ctx.invoke(help_command, ctx.command.name)
+        await invoke_help_command(ctx, ctx.command.name)
 
     @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 e388e13f..305d6721 100644
--- a/bot/exts/evergreen/space.py
+++ b/bot/exts/evergreen/space.py
@@ -10,6 +10,7 @@ from discord.ext.commands import BadArgument, Cog, Context, Converter, group
 
 from bot.bot import Bot
 from bot.constants import Tokens
+from bot.utils.extensions import invoke_help_command
 
 logger = logging.getLogger(__name__)
 
@@ -63,8 +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."""
-        help_command = self.bot.get_command("help")
-        await ctx.invoke(help_command, ctx.command.name)
+        await invoke_help_command(ctx, ctx.command.name)
 
     @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 d06724eb..a037e117 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"
 HTTP_CAT_URL = "https://http.cat/{code}.jpg"
@@ -17,8 +18,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:
-            help_command = self.bot.get_command("help")
-            await ctx.invoke(help_command, ctx.command.name)
+            await invoke_help_command(ctx, ctx.command.name)
 
     @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 f7ff2396..9c126a7b 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
+from bot.utils.extensions import EXTENSIONS, unqualify, invoke_help_command
 from bot.utils.pagination import LinePaginator
 
 log = logging.getLogger(__name__)
@@ -77,8 +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."""
-        help_command = self.bot.get_command("help")
-        await ctx.invoke(help_command, ctx.command.name)
+        await invoke_help_command(ctx, ctx.command.name)
 
     @extensions_group.command(name="load", aliases=("l",))
     async def load_command(self, ctx: Context, *extensions: Extension) -> None:
@@ -88,8 +87,7 @@ class Extensions(commands.Cog):
         If '\*' or '\*\*' is given as the name, all unloaded extensions will be loaded.
         """  # noqa: W605
         if not extensions:
-            help_command = self.bot.get_command("help")
-            await ctx.invoke(help_command, "extensions", ctx.command.name)
+            await invoke_help_command(ctx, "extensions", ctx.command.name)
             return
 
         if "*" in extensions or "**" in extensions:
@@ -106,8 +104,7 @@ class Extensions(commands.Cog):
         If '\*' or '\*\*' is given as the name, all loaded extensions will be unloaded.
         """  # noqa: W605
         if not extensions:
-            help_command = self.bot.get_command("help")
-            await ctx.invoke(help_command, "extensions", ctx.command.name)
+            await invoke_help_command(ctx, "extensions", ctx.command.name)
             return
 
         blacklisted = "\n".join(UNLOAD_BLACKLIST & set(extensions))
@@ -133,8 +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:
-            help_command = self.bot.get_command("help")
-            await ctx.invoke(help_command, "extensions", ctx.command.name)
+            await invoke_help_command(ctx, "extensions", ctx.command.name)
             return
 
         if "**" in extensions:
diff --git a/bot/exts/valentines/be_my_valentine.py b/bot/exts/valentines/be_my_valentine.py
index 59bd42d3..d5cc8644 100644
--- a/bot/exts/valentines/be_my_valentine.py
+++ b/bot/exts/valentines/be_my_valentine.py
@@ -10,6 +10,7 @@ from discord.ext.commands.cooldowns import BucketType
 
 from bot.constants import Channels, Colours, Lovefest, Month
 from bot.utils.decorators import in_month
+from bot.utils.extensions import invoke_help_command
 
 log = logging.getLogger(__name__)
 
@@ -43,8 +44,7 @@ class BeMyValentine(commands.Cog):
         2) use the command \".lovefest unsub\" to get rid of the lovefest role.
         """
         if not ctx.invoked_subcommand:
-            help_command = self.bot.get_command("help")
-            await ctx.invoke(help_command, ctx.command.name)
+            await invoke_help_command(ctx, ctx.command.name)
 
     @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 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/exts/evergreen/status_codes.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 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/exts/evergreen/status_codes.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