Use extension utils from bot-core

6 files changed, 14 insertions, 14 deletions

diff --git a/bot/exts/utilities/colour.py b/bot/exts/utilities/colour.py
index ee6bad93..5282bc6d 100644
--- a/bot/exts/utilities/colour.py
+++ b/bot/exts/utilities/colour.py
@@ -13,7 +13,6 @@ from discord.ext import commands
 
 from bot import constants
 from bot.bot import Bot
-from bot.exts.core.extensions import invoke_help_command
 from bot.utils.decorators import whitelist_override
 
 THUMBNAIL_SIZE = (80, 80)
@@ -99,7 +98,7 @@ class Colour(commands.Cog):
             extra_colour = ImageColor.getrgb(colour_input)
             await self.send_colour_response(ctx, extra_colour)
         except ValueError:
-            await invoke_help_command(ctx)
+            await self.bot.invoke_help_command(ctx)
 
     @colour.command()
     async def rgb(self, ctx: commands.Context, red: int, green: int, blue: int) -> None:
diff --git a/bot/exts/utilities/emoji.py b/bot/exts/utilities/emoji.py
index fa438d7f..2b2fab8a 100644
--- a/bot/exts/utilities/emoji.py
+++ b/bot/exts/utilities/emoji.py
@@ -10,7 +10,6 @@ from discord.ext import commands
 
 from bot.bot import Bot
 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
 
@@ -20,6 +19,9 @@ log = logging.getLogger(__name__)
 class Emojis(commands.Cog):
     """A collection of commands related to emojis in the server."""
 
+    def __init__(self, bot: Bot) -> None:
+        self.bot = bot
+
     @staticmethod
     def embed_builder(emoji: dict) -> tuple[Embed, list[str]]:
         """Generates an embed with the emoji names and count."""
@@ -74,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)
+            await self.bot.invoke_help_command(ctx)
 
     @emoji_group.command(name="count", aliases=("c",))
     async def count_command(self, ctx: commands.Context, *, category_query: str = None) -> None:
@@ -120,4 +122,4 @@ class Emojis(commands.Cog):
 
 def setup(bot: Bot) -> None:
     """Load the Emojis cog."""
-    bot.add_cog(Emojis())
+    bot.add_cog(Emojis(bot))
diff --git a/bot/exts/utilities/epoch.py b/bot/exts/utilities/epoch.py
index 42312dd1..2a21688e 100644
--- a/bot/exts/utilities/epoch.py
+++ b/bot/exts/utilities/epoch.py
@@ -6,7 +6,6 @@ from dateutil import parser
 from discord.ext import commands
 
 from bot.bot import Bot
-from bot.utils.extensions import invoke_help_command
 
 # https://discord.com/developers/docs/reference#message-formatting-timestamp-styles
 STYLES = {
@@ -48,6 +47,9 @@ class DateString(commands.Converter):
 class Epoch(commands.Cog):
     """Convert an entered time and date to a unix timestamp."""
 
+    def __init__(self, bot: Bot) -> None:
+        self.bot = bot
+
     @commands.command(name="epoch")
     async def epoch(self, ctx: commands.Context, *, date_time: DateString = None) -> None:
         """
@@ -71,7 +73,7 @@ class Epoch(commands.Cog):
         Times in the dropdown are shown in UTC
         """
         if not date_time:
-            await invoke_help_command(ctx)
+            await self.bot.invoke_help_command(ctx)
             return
 
         if isinstance(date_time, tuple):
@@ -135,4 +137,4 @@ class TimestampMenuView(discord.ui.View):
 
 def setup(bot: Bot) -> None:
     """Load the Epoch cog."""
-    bot.add_cog(Epoch())
+    bot.add_cog(Epoch(bot))
diff --git a/bot/exts/utilities/githubinfo.py b/bot/exts/utilities/githubinfo.py
index 046f67df..ed176290 100644
--- a/bot/exts/utilities/githubinfo.py
+++ b/bot/exts/utilities/githubinfo.py
@@ -12,7 +12,6 @@ from discord.ext import commands
 
 from bot.bot import Bot
 from bot.constants import Colours, ERROR_REPLIES, Emojis, NEGATIVE_REPLIES, Tokens
-from bot.exts.core.extensions import invoke_help_command
 
 log = logging.getLogger(__name__)
 
@@ -168,7 +167,7 @@ class GithubInfo(commands.Cog):
     async def github_group(self, ctx: commands.Context) -> None:
         """Commands for finding information related to GitHub."""
         if ctx.invoked_subcommand is None:
-            await invoke_help_command(ctx)
+            await self.bot.invoke_help_command(ctx)
 
     @commands.Cog.listener()
     async def on_message(self, message: discord.Message) -> None:
diff --git a/bot/exts/utilities/reddit.py b/bot/exts/utilities/reddit.py
index 782583d2..fa50eb36 100644
--- a/bot/exts/utilities/reddit.py
+++ b/bot/exts/utilities/reddit.py
@@ -15,7 +15,6 @@ from discord.utils import escape_markdown, sleep_until
 from bot.bot import Bot
 from bot.constants import Channels, ERROR_REPLIES, Emojis, Reddit as RedditConfig, STAFF_ROLES
 from bot.utils.converters import Subreddit
-from bot.utils.extensions import invoke_help_command
 from bot.utils.messages import sub_clyde
 from bot.utils.pagination import ImagePaginator, LinePaginator
 
@@ -302,7 +301,7 @@ class Reddit(Cog):
     @group(name="reddit", invoke_without_command=True)
     async def reddit_group(self, ctx: Context) -> None:
         """View the top posts from various subreddits."""
-        await invoke_help_command(ctx)
+        await self.bot.invoke_help_command(ctx)
 
     @reddit_group.command(name="top")
     async def top_command(self, ctx: Context, subreddit: Subreddit = "r/Python") -> None:
diff --git a/bot/exts/utilities/twemoji.py b/bot/exts/utilities/twemoji.py
index c915f05b..a4477bc1 100644
--- a/bot/exts/utilities/twemoji.py
+++ b/bot/exts/utilities/twemoji.py
@@ -9,7 +9,6 @@ from emoji import UNICODE_EMOJI_ENGLISH, is_emoji
 from bot.bot import Bot
 from bot.constants import Colours, Roles
 from bot.utils.decorators import whitelist_override
-from bot.utils.extensions import invoke_help_command
 
 log = logging.getLogger(__name__)
 BASE_URLS = {
@@ -133,7 +132,7 @@ class Twemoji(commands.Cog):
     async def twemoji(self, ctx: commands.Context, *raw_emoji: str) -> None:
         """Sends a preview of a given Twemoji, specified by codepoint or emoji."""
         if len(raw_emoji) == 0:
-            await invoke_help_command(ctx)
+            await self.bot.invoke_help_command(ctx)
             return
         try:
             codepoint = self.codepoint_from_input(raw_emoji)