diff options
author | 2021-03-25 08:58:06 +0100 | |
---|---|---|
committer | 2021-03-25 08:58:06 +0100 | |
commit | baa0353faecd4be3769320fb4c85e032480f3541 (patch) | |
tree | 274c0138a393fb4dfb453458a03bc998f5799272 | |
parent | Remove broken link from the April fool collection (diff) | |
parent | Merge pull request #633 from python-discord/reduce-channels-output-in-error-e... (diff) |
Merge branch 'main' into remove-broken-link
-rw-r--r-- | bot/utils/decorators.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/bot/utils/decorators.py b/bot/utils/decorators.py index c12a15ff..60066dc4 100644 --- a/bot/utils/decorators.py +++ b/bot/utils/decorators.py @@ -11,7 +11,7 @@ from discord import Colour, Embed from discord.ext import commands from discord.ext.commands import CheckFailure, Command, Context -from bot.constants import ERROR_REPLIES, Month +from bot.constants import Channels, ERROR_REPLIES, Month, WHITELISTED_CHANNELS from bot.utils import human_months, resolve_current_month from bot.utils.checks import in_whitelist_check @@ -253,6 +253,12 @@ def whitelist_check(**default_kwargs: t.Container[int]) -> t.Callable[[Context], channels = set(kwargs.get("channels") or {}) categories = kwargs.get("categories") + # Only output override channels + community_bot_commands + if channels: + default_whitelist_channels = set(WHITELISTED_CHANNELS) + default_whitelist_channels.discard(Channels.community_bot_commands) + channels.difference_update(default_whitelist_channels) + # Add all whitelisted category channels if categories: for category_id in categories: @@ -260,7 +266,7 @@ def whitelist_check(**default_kwargs: t.Container[int]) -> t.Callable[[Context], if category is None: continue - [channels.add(channel.id) for channel in category.text_channels] + channels.update(channel.id for channel in category.text_channels) if channels: channels_str = ', '.join(f"<#{c_id}>" for c_id in channels) |