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

[commands] Use edited timestamp if provided for cooldown timing

Browse Source
This commit is contained in:
Rapptz 2020-08-25 23:15:26 -04:00
parent 1f4f010e51
commit 4203e7a5a8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -764,7 +764,8 @@ class Command(_BaseCommand):
def _prepare_cooldowns(self, ctx): def _prepare_cooldowns(self, ctx):
if self._buckets.valid: if self._buckets.valid:
current = ctx.message.created_at.replace(tzinfo=datetime.timezone.utc).timestamp() dt = ctx.message.edited_at or ctx.message.created_at
current = dt.replace(tzinfo=datetime.timezone.utc).timestamp()
bucket = self._buckets.get_bucket(ctx.message, current) bucket = self._buckets.get_bucket(ctx.message, current)
retry_after = bucket.update_rate_limit(current) retry_after = bucket.update_rate_limit(current)
if retry_after: if retry_after:
@ -805,7 +806,8 @@ class Command(_BaseCommand):
return False return False
bucket = self._buckets.get_bucket(ctx.message) bucket = self._buckets.get_bucket(ctx.message)
current = ctx.message.created_at.replace(tzinfo=datetime.timezone.utc).timestamp() dt = ctx.message.edited_at or ctx.message.created_at
current = dt.replace(tzinfo=datetime.timezone.utc).timestamp()
return bucket.get_tokens(current) == 0 return bucket.get_tokens(current) == 0
def reset_cooldown(self, ctx): def reset_cooldown(self, ctx):
@ -838,7 +840,8 @@ class Command(_BaseCommand):
""" """
if self._buckets.valid: if self._buckets.valid:
bucket = self._buckets.get_bucket(ctx.message) bucket = self._buckets.get_bucket(ctx.message)
current = ctx.message.created_at.replace(tzinfo=datetime.timezone.utc).timestamp() dt = ctx.message.edited_at or ctx.message.created_at
current = dt.replace(tzinfo=datetime.timezone.utc).timestamp()
return bucket.get_retry_after(current) return bucket.get_retry_after(current)
return 0.0 return 0.0