gnouseu
/
tuxbot-bot
4
0
Fork 0
Code Issues Pull Requests Wiki Activity

fix(core): close TUXBOT-BOT-11, close TUXBOT-BOT-19

This commit is contained in:
Romain J 2021-02-11 18:40:00 +01:00
parent fa98d67276
commit 7423b40337
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tuxbot/core/bot.py
View File

@ -107,11 +107,16 @@ class Tux(commands.AutoShardedBot):
return True
if (
search_for(self.config.Servers, message.guild.id, "blacklisted")
search_for(self.config.Users, message.author.id, "blacklisted")
or search_for(
self.config.Channels, message.channel.id, "blacklisted"
)
or search_for(self.config.Users, message.author.id, "blacklisted")
or (
message.guild
and search_for(
self.config.Servers, message.guild.id, "blacklisted"
)
)
):
return True

8
tuxbot/core/utils/functions/prefix.py
View File

@ -1,22 +1,24 @@
from typing import List
from typing import List, Union
import discord
from tuxbot.core.config import search_for
def get_prefixes(tux, guild: discord.Guild) -> List[str]:
def get_prefixes(tux, guild: Union[discord.Guild, None]) -> List[str]:
"""Get custom prefixes for one guild.
Parameters
----------
tux:Tux
The bot instance.
guild:discord.Guild
guild:Union[discord.Guild, None]
The required guild prefixes.
Returns
-------
List[str]
List of all prefixes.
"""
if not guild:
return []
return search_for(tux.config.Servers, guild.id, "prefixes", [])