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

fix: WebhookClient should handle ratelimits properly

Browse Source
This commit is contained in:
Isabella
2018-08-21 11:12:02 -05:00
parent dc8cf08de9
commit 4ee3cf0b55
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/client/rest/RequestHandlers/Sequential.js
View File

@@ -66,14 +66,14 @@ class SequentialRequestHandler extends RequestHandler {
if (err) {
if (err.status === 429) {
this.queue.unshift(item);
this.restManager.client.setTimeout(() => {
this.client.setTimeout(() => {
this.globalLimit = false;
resolve();
}, Number(res.headers['retry-after']) + this.restManager.client.options.restTimeOffset);
}, Number(res.headers['retry-after']) + this.client.options.restTimeOffset);
if (res.headers['x-ratelimit-global']) this.globalLimit = true;
} else if (err.status >= 500 && err.status < 600) {
this.queue.unshift(item);
this.restManager.client.setTimeout(resolve, 1e3 + this.restManager.client.options.restTimeOffset);
this.client.setTimeout(resolve, 1e3 + this.client.options.restTimeOffset);
} else {
item.reject(err.status >= 400 && err.status < 500 ?
new DiscordAPIError(res.request.path, res.body, res.request.method) : err);
@@ -101,9 +101,9 @@ class SequentialRequestHandler extends RequestHandler {
method: item.request.method,
});
}
this.restManager.client.setTimeout(
this.client.setTimeout(
() => resolve(data),
this.requestResetTime - Date.now() + this.timeDifference + this.restManager.client.options.restTimeOffset
this.requestResetTime - Date.now() + this.timeDifference + this.client.options.restTimeOffset
);
} else {
resolve(data);

4
src/structures/Webhook.js
View File

@@ -1,3 +1,4 @@
const EventEmitter = require('events');
const path = require('path');
const Util = require('../util/Util');
const Attachment = require('./Attachment');
@@ -6,8 +7,9 @@ const RichEmbed = require('./RichEmbed');
/**
* Represents a webhook.
*/
class Webhook {
class Webhook extends EventEmitter {
constructor(client, dataOrID, token) {
super();
if (client) {
/**
* The client that instantiated the webhook