CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-08 20:28:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix ignored channels list in [p]ignore (#3746)

Browse Source 
* Fix ignored channels list

* Update settings_caches.py

* Update core_commands.py
This commit is contained in:
jack1142 2020-04-12 00:09:05 +02:00 committed by GitHub
parent 36a0eabf4a
commit 7492636818
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
redbot/core/core_commands.py
View File

@ -2544,17 +2544,14 @@ class Core(commands.Cog, CoreLogic):
if channel.category and channel.category not in category_channels: if channel.category and channel.category not in category_channels:
if await self.bot._ignored_cache.get_ignored_channel(channel.category): if await self.bot._ignored_cache.get_ignored_channel(channel.category):
category_channels.append(channel.category) category_channels.append(channel.category)
continue if await self.bot._ignored_cache.get_ignored_channel(channel, check_category=False):
else:
continue
if await self.bot._ignored_cache.get_ignored_channel(channel):
text_channels.append(channel) text_channels.append(channel)
cat_str = ( cat_str = (
humanize_list([c.name for c in category_channels]) if category_channels else "None" humanize_list([c.name for c in category_channels]) if category_channels else "None"
) )
chan_str = humanize_list([c.mention for c in text_channels]) if text_channels else "None" chan_str = humanize_list([c.mention for c in text_channels]) if text_channels else "None"
msg = _("Currently ignored categories: {categories}\nChannels:{channels}").format( msg = _("Currently ignored categories: {categories}\nChannels: {channels}").format(
categories=cat_str, channels=chan_str categories=cat_str, channels=chan_str
) )
return msg return msg

8
redbot/core/settings_caches.py
View File

@ -59,11 +59,15 @@ class IgnoreManager:
self._cached_channels: Dict[int, bool] = {} self._cached_channels: Dict[int, bool] = {}
self._cached_guilds: Dict[int, bool] = {} self._cached_guilds: Dict[int, bool] = {}
async def get_ignored_channel(self, channel: discord.TextChannel) -> bool: async def get_ignored_channel(
self, channel: discord.TextChannel, check_category: bool = True
) -> bool:
ret: bool ret: bool
cid: int = channel.id cid: int = channel.id
cat_id: Optional[int] = channel.category.id if channel.category else None cat_id: Optional[int] = (
channel.category.id if check_category and channel.category else None
)
if cid in self._cached_channels: if cid in self._cached_channels:
chan_ret = self._cached_channels[cid] chan_ret = self._cached_channels[cid]
else: else: