matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

[commands] Cooldowns don't trigger due to user usage error.

Browse Source 
Fixes #325
This commit is contained in:
Rapptz 2016-09-08 07:13:22 -04:00
parent b7ffbca0c7
commit b0509a6910
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -331,6 +331,12 @@ class Command:
if not self.can_run(ctx): if not self.can_run(ctx):
raise CheckFailure('The check functions for command {0.qualified_name} failed.'.format(self)) raise CheckFailure('The check functions for command {0.qualified_name} failed.'.format(self))
@asyncio.coroutine
def prepare(self, ctx):
ctx.command = self
self._verify_checks(ctx)
yield from self._parse_arguments(ctx)
if self._buckets.valid: if self._buckets.valid:
bucket = self._buckets.get_bucket(ctx) bucket = self._buckets.get_bucket(ctx)
retry_after = bucket.is_rate_limited() retry_after = bucket.is_rate_limited()
@ -351,9 +357,7 @@ class Command:
@asyncio.coroutine @asyncio.coroutine
def invoke(self, ctx): def invoke(self, ctx):
ctx.command = self yield from self.prepare(ctx)
self._verify_checks(ctx)
yield from self._parse_arguments(ctx)
# terminate the invoked_subcommand chain. # terminate the invoked_subcommand chain.
# since we're in a regular command (and not a group) then # since we're in a regular command (and not a group) then
@ -580,9 +584,7 @@ class Group(GroupMixin, Command):
def invoke(self, ctx): def invoke(self, ctx):
early_invoke = not self.invoke_without_command early_invoke = not self.invoke_without_command
if early_invoke: if early_invoke:
ctx.command = self yield from self.prepare(ctx)
self._verify_checks(ctx)
yield from self._parse_arguments(ctx)
view = ctx.view view = ctx.view
previous = view.index previous = view.index
@ -604,11 +606,7 @@ class Group(GroupMixin, Command):
# undo the trigger parsing # undo the trigger parsing
view.index = previous view.index = previous
view.previous = previous view.previous = previous
ctx.command = self yield from super().invoke(ctx)
self._verify_checks(ctx)
yield from self._parse_arguments(ctx)
injected = inject_context(ctx, self.callback)
yield from injected(*ctx.args, **ctx.kwargs)
# Decorators # Decorators