aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Chris Lovering <[email protected]>2021-09-21 20:21:12 +0100
committerGravatar Chris Lovering <[email protected]>2021-09-29 20:55:44 +0100
commit6cf9f54c2f2fe51ca08ae44e98dc5dcea97b7ad8 (patch)
tree1cbc1a1f4777cefcfbfac183f6f57c163963c790
parentMock fetch_member in tests that user get_or_fetch now (diff)
Rename channel helper to be consistent with other helpers
-rw-r--r--bot/exts/help_channels/_channel.py4
-rw-r--r--bot/exts/help_channels/_cog.py6
-rw-r--r--bot/utils/channel.py2
3 files changed, 6 insertions, 6 deletions
diff --git a/bot/exts/help_channels/_channel.py b/bot/exts/help_channels/_channel.py
index 0846b28c8..f1bcea171 100644
--- a/bot/exts/help_channels/_channel.py
+++ b/bot/exts/help_channels/_channel.py
@@ -10,7 +10,7 @@ from arrow import Arrow
import bot
from bot import constants
from bot.exts.help_channels import _caches, _message
-from bot.utils.channel import try_get_channel
+from bot.utils.channel import get_or_fetch_channel
log = logging.getLogger(__name__)
@@ -133,7 +133,7 @@ async def move_to_bottom(channel: discord.TextChannel, category_id: int, **optio
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 try_get_channel(category_id)
+ category = await get_or_fetch_channel(category_id)
payload = [{"id": c.id, "position": c.position} for c in category.channels]
diff --git a/bot/exts/help_channels/_cog.py b/bot/exts/help_channels/_cog.py
index a64ceac3a..7c39bc132 100644
--- a/bot/exts/help_channels/_cog.py
+++ b/bot/exts/help_channels/_cog.py
@@ -278,13 +278,13 @@ class HelpChannels(commands.Cog):
log.trace("Getting the CategoryChannel objects for the help categories.")
try:
- self.available_category = await channel_utils.try_get_channel(
+ self.available_category = await channel_utils.get_or_fetch_channel(
constants.Categories.help_available
)
- self.in_use_category = await channel_utils.try_get_channel(
+ self.in_use_category = await channel_utils.get_or_fetch_channel(
constants.Categories.help_in_use
)
- self.dormant_category = await channel_utils.try_get_channel(
+ self.dormant_category = await channel_utils.get_or_fetch_channel(
constants.Categories.help_dormant
)
except discord.HTTPException:
diff --git a/bot/utils/channel.py b/bot/utils/channel.py
index 72603c521..6d2356679 100644
--- a/bot/utils/channel.py
+++ b/bot/utils/channel.py
@@ -53,7 +53,7 @@ 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) -> discord.abc.GuildChannel:
+async def get_or_fetch_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}.")