mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-06-07 12:18:59 +00:00
Code Issues Projects Releases Wiki Activity

[commands] Use get_role where appropriate in role decorators

Browse Source
This commit is contained in:
James Hilton-Balfe 2023-04-18 05:11:39 +01:00 committed by GitHub
parent ab287e71b8
commit fdf03d4bca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
discord/ext/commands/core.py
View File

@ -2036,7 +2036,7 @@ def has_role(item: Union[int, str], /) -> Check[Any]:
# ctx.guild is None doesn't narrow ctx.author to Member # ctx.guild is None doesn't narrow ctx.author to Member
if isinstance(item, int): if isinstance(item, int):
role = discord.utils.get(ctx.author.roles, id=item) # type: ignore role = ctx.author.get_role(item) # type: ignore
else: else:
role = discord.utils.get(ctx.author.roles, name=item) # type: ignore role = discord.utils.get(ctx.author.roles, name=item) # type: ignore
if role is None: if role is None:
@ -2083,8 +2083,12 @@ def has_any_role(*items: Union[int, str]) -> Callable[[T], T]:
raise NoPrivateMessage() raise NoPrivateMessage()
# ctx.guild is None doesn't narrow ctx.author to Member # ctx.guild is None doesn't narrow ctx.author to Member
getter = functools.partial(discord.utils.get, ctx.author.roles) if any(
if any(getter(id=item) is not None if isinstance(item, int) else getter(name=item) is not None for item in items): ctx.author.get_role(item) is not None
if isinstance(item, int)
else discord.utils.get(ctx.author.roles, name=item) is not None
for item in items
):
return True return True
raise MissingAnyRole(list(items)) raise MissingAnyRole(list(items))
@ -2113,11 +2117,10 @@ def bot_has_role(item: int, /) -> Callable[[T], T]:
if ctx.guild is None: if ctx.guild is None:
raise NoPrivateMessage() raise NoPrivateMessage()
me = ctx.me
if isinstance(item, int): if isinstance(item, int):
role = discord.utils.get(me.roles, id=item) role = ctx.me.get_role(item)
else: else:
role = discord.utils.get(me.roles, name=item) role = discord.utils.get(ctx.me.roles, name=item)
if role is None: if role is None:
raise BotMissingRole(item) raise BotMissingRole(item)
return True return True
@ -2144,8 +2147,10 @@ def bot_has_any_role(*items: int) -> Callable[[T], T]:
raise NoPrivateMessage() raise NoPrivateMessage()
me = ctx.me me = ctx.me
getter = functools.partial(discord.utils.get, me.roles) if any(
if any(getter(id=item) is not None if isinstance(item, int) else getter(name=item) is not None for item in items): me.get_role(item) is not None if isinstance(item, int) else discord.utils.get(me.roles, name=item) is not None
for item in items
):
return True return True
raise BotMissingAnyRole(list(items)) raise BotMissingAnyRole(list(items))