Nomchy/discord.js
1
0
Fork 0
mirror of https://github.com/discordjs/discord.js.git synced 2026-03-09 16:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

proper fix for #1685 (#1805)

Browse Source 
* Update WebSocketConnection.js

* Update WebSocketConnection.js

* Update WebSocketConnection.js

* Update RESTManager.js
This commit is contained in:
Gus Caplan
2017-08-19 20:14:49 -07:00
committed by Pascal
parent b79722a77b
commit af75e43900
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/client/rest/RESTManager.js
View File

@@ -16,8 +16,8 @@ class RESTManager {
}
destroy() {
for (const handlerID in this.handlers) {
this.handlers[handlerID].destroy();
for (const handler of Object.values(this.handlers)) {
if (handler.destroy) handler.destroy();
}
}

10
src/client/websocket/WebSocketConnection.js
View File

@@ -81,8 +81,8 @@ class WebSocketConnection extends EventEmitter {
*/
this.ratelimit = {
queue: [],
remaining: 120,
resetTime: -1,
remaining: 60,
resetTimer: null,
};
this.connect(gateway);
@@ -190,10 +190,10 @@ class WebSocketConnection extends EventEmitter {
if (this.ratelimit.remaining === 0) return;
if (this.ratelimit.queue.length === 0) return;
if (this.ratelimit.remaining === 120) {
this.ratelimit.resetTimer = setTimeout(() => {
this.ratelimit.remaining = 120;
this.ratelimit.resetTimer = this.client.setTimeout(() => {
this.ratelimit.remaining = 60;
this.processQueue();
}, 120e3); // eslint-disable-line
}, 120e3);
}
while (this.ratelimit.remaining > 0) {
const item = this.ratelimit.queue.shift();