Fix: Fix rate limit handling

sevenc-nanashi · Apr 29, 2024 · b967129 · b967129
1 parent 173cf9b
commit b967129
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/backend/lib/discord_request.rb b/backend/lib/discord_request.rb
@@ -57,14 +57,16 @@ def request(method, path, **options)
       HTTP.request(method, "https://discord.com/api/v10#{path}", **options)
 
     if response.headers["X-RateLimit-Remaining"]
-      @@ratelimits[response.headers["X-RateLimit-Bucket"]] = {
+      @@ratelimits[path] = {
         remaining: response.headers["X-RateLimit-Remaining"].to_i,
         reset: response.headers["X-RateLimit-Reset"].to_f
       }
     end
     if response.status == 429
-      sleep(response.headers["Retry-After"].to_i / 1000.0)
-      request(method, path, **options)
+      retry_after = response.parse["retry_after"]
+      Rails.logger.warn("Rate limited, waiting for #{retry_after}s")
+      sleep(retry_after)
+      return request(method, path, **options)
     end
 
     unless response.status.success?