Skip to content

Fix rate limiter window reset and usage timing in GatewayRatelimiter #10213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions discord/gateway.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,15 @@ def get_delay(self) -> float:

if current > self.window + self.per:
self.remaining = self.max

if self.remaining == self.max:
self.window = current

if self.remaining == 0:
return self.per - (current - self.window)
return max(0.0, self.per - (current - self.window))

self.remaining -= 1

if self.remaining == self.max - 1:
self.window = current
return 0.0

async def block(self) -> None:
Expand Down
Loading