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

fix response parsing (#2614)

Browse Source 
* fix response parsing

* rfc: better parseResponse function
This commit is contained in:
Will Nelson
2018-06-20 15:11:47 -07:00
committed by Crawl
parent 99a9a813d7
commit 594363a05e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/rest/handlers/RequestHandler.js
View File

@@ -1,5 +1,11 @@
const DiscordAPIError = require('../DiscordAPIError'); const DiscordAPIError = require('../DiscordAPIError');
const { Events: { RATE_LIMIT } } = require('../../util/Constants'); const { Events: { RATE_LIMIT }, browser } = require('../../util/Constants');
function parseResponse(res) {
if (res.headers.get('content-type').startsWith('application/json')) return res.json();
if (browser) return res.blob();
return res.buffer();
}
class RequestHandler { class RequestHandler {
constructor(manager, handler) { constructor(manager, handler) {
@@ -77,7 +83,7 @@ class RequestHandler {
} }
if (res.ok) { if (res.ok) {
res.json().then(item.resolve, item.reject); parseResponse(res).then(item.resolve, item.reject);
finish(); finish();
return; return;
} }
@@ -95,7 +101,7 @@ class RequestHandler {
finish(1e3 + this.client.options.restTimeOffset); finish(1e3 + this.client.options.restTimeOffset);
} }
} else { } else {
res.json().then(data => { parseResponse(res).then(data => {
item.reject(res.status >= 400 && res.status < 500 ? item.reject(res.status >= 400 && res.status < 500 ?
new DiscordAPIError(item.path, data, item.method) : res); new DiscordAPIError(item.path, data, item.method) : res);
}, item.reject); }, item.reject);