mirrors/discord.py
1
0
Fork 0
mirror of https://github.com/Rapptz/discord.py.git synced 2025-04-21 16:24:14 +00:00
Code Issues Projects Releases Wiki Activity

[commands] Ensure that Context.command is the command in Command.can_run

Browse Source 
Previously, Context.command was not guaranteed to be the actual command
being checked if it can run. This could be troublesome when
implementing help commands or when using the default help command.

This new change allows at least for the guarantee that Context.command
to be technically correct in Command.can_run.
This commit is contained in:
Rapptz 2017-06-21 02:27:16 -04:00
parent c23ef9e8a4
commit 3618f51f97
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -640,26 +640,32 @@ class Command:
A boolean indicating if the command can be invoked.
"""
if not (yield from ctx.bot.can_run(ctx)):
raise CheckFailure('The global check functions for command {0.qualified_name} failed.'.format(self))
original = ctx.command
ctx.command = self
cog = self.instance
if cog is not None:
try:
local_check = getattr(cog, '_{0.__class__.__name__}__local_check'.format(cog))
except AttributeError:
pass
else:
ret = yield from discord.utils.maybe_coroutine(local_check, ctx)
if not ret:
return False
try:
if not (yield from ctx.bot.can_run(ctx)):
raise CheckFailure('The global check functions for command {0.qualified_name} failed.'.format(self))
predicates = self.checks
if not predicates:
# since we have no checks, then we just return True.
return True
cog = self.instance
if cog is not None:
try:
local_check = getattr(cog, '_{0.__class__.__name__}__local_check'.format(cog))
except AttributeError:
pass
else:
ret = yield from discord.utils.maybe_coroutine(local_check, ctx)
if not ret:
return False
return (yield from discord.utils.async_all(predicate(ctx) for predicate in predicates))
predicates = self.checks
if not predicates:
# since we have no checks, then we just return True.
return True
return (yield from discord.utils.async_all(predicate(ctx) for predicate in predicates))
finally:
ctx.command = original
class GroupMixin:
"""A mixin that implements common functionality for classes that behave