Use global bot instance in try_get_channel

2 files changed, 8 insertions, 10 deletions

diff --git a/bot/exts/help_channels.py b/bot/exts/help_channels.py
index 062d4fcfe..f5a8b251b 100644
--- a/bot/exts/help_channels.py
+++ b/bot/exts/help_channels.py
@@ -380,16 +380,13 @@ class HelpChannels(commands.Cog):
 
         try:
             self.available_category = await channel_utils.try_get_channel(
-                constants.Categories.help_available,
-                self.bot
+                constants.Categories.help_available
             )
             self.in_use_category = await channel_utils.try_get_channel(
-                constants.Categories.help_in_use,
-                self.bot
+                constants.Categories.help_in_use
             )
             self.dormant_category = await channel_utils.try_get_channel(
-                constants.Categories.help_dormant,
-                self.bot
+                constants.Categories.help_dormant
             )
         except discord.HTTPException:
             log.exception("Failed to get a category; cog will be removed")
@@ -500,7 +497,7 @@ class HelpChannels(commands.Cog):
         options should be avoided, as it may interfere with the category move we perform.
         """
         # Get a fresh copy of the category from the bot to avoid the cache mismatch issue we had.
-        category = await channel_utils.try_get_channel(category_id, self.bot)
+        category = await channel_utils.try_get_channel(category_id)
 
         payload = [{"id": c.id, "position": c.position} for c in category.channels]
 
diff --git a/bot/utils/channel.py b/bot/utils/channel.py
index 851f9e1fe..d9d1b4b86 100644
--- a/bot/utils/channel.py
+++ b/bot/utils/channel.py
@@ -2,6 +2,7 @@ import logging
 
 import discord
 
+import bot
 from bot.constants import Categories
 
 log = logging.getLogger(__name__)
@@ -20,14 +21,14 @@ def is_in_category(channel: discord.TextChannel, category_id: int) -> bool:
     return getattr(channel, "category_id", None) == category_id
 
 
-async def try_get_channel(channel_id: int, client: discord.Client) -> discord.abc.GuildChannel:
+async def try_get_channel(channel_id: int) -> discord.abc.GuildChannel:
     """Attempt to get or fetch a channel and return it."""
     log.trace(f"Getting the channel {channel_id}.")
 
-    channel = client.get_channel(channel_id)
+    channel = bot.instance.get_channel(channel_id)
     if not channel:
         log.debug(f"Channel {channel_id} is not in cache; fetching from API.")
-        channel = await client.fetch_channel(channel_id)
+        channel = await bot.instance.fetch_channel(channel_id)
 
     log.trace(f"Channel #{channel} ({channel_id}) retrieved.")
     return channel