Improve v8 ratelimit handling (#1256)

abalabahaha · Aug 19, 2021 · c31685e · c31685e
1 parent 1e4d78a
commit c31685e
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/lib/rest/RequestHandler.js b/lib/rest/RequestHandler.js
@@ -267,15 +267,7 @@ class RequestHandler {
 
                         this.ratelimits[route].remaining = resp.headers["x-ratelimit-remaining"] === undefined ? 1 : +resp.headers["x-ratelimit-remaining"] || 0;
 
-                        let retryAfter = parseInt(resp.headers["retry-after"]);
-                        // Discord breaks RFC here, using milliseconds instead of seconds (╯°□°）╯︵ ┻━┻
-                        // This is the unofficial Discord dev-recommended way of detecting that
-                        if(retryAfter && (typeof resp.headers["via"] !== "string" || !resp.headers["via"].includes("1.1 google"))) {
-                            retryAfter *= 1000;
-                            if(retryAfter >= 1000 * 1000) {
-                                this._client.emit("warn", `Excessive Retry-After interval detected (Retry-After: ${resp.headers["retry-after"]} * 1000, Via: ${resp.headers["via"]})`);
-                            }
-                        }
+                        const retryAfter = parseInt(resp.headers["x-ratelimit-reset-after"] || resp.headers["retry-after"]) * 1000;
                         if(retryAfter >= 0) {
                             if(resp.headers["x-ratelimit-global"]) {
                                 this.globalBlock = true;