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

switch to node-fetch (#2587)

Browse Source 
* switch to node-fetch

* remove useless var declaration

* remove method uppercasing

* rework concurrency

* Revert "rework concurrency"

This reverts commit ef6aa2697e.

* fix headers
This commit is contained in:
Will Nelson
2018-06-19 11:10:55 -07:00
committed by Crawl
parent 791f58e130
commit 5e011dbc11
7 changed files with 70 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/DataResolver.js
View File

@@ -1,6 +1,6 @@
const path = require('path');
const fs = require('fs');
const snekfetch = require('snekfetch');
const fetch = require('node-fetch');
const Util = require('../util/Util');
const { Error: DiscordError, TypeError } = require('../errors');
const { browser } = require('../util/Constants');
@@ -83,13 +83,13 @@ class DataResolver {
* @returns {Promise<Buffer>}
*/
static resolveFile(resource) {
if (resource instanceof Buffer) return Promise.resolve(resource);
if (!browser && resource instanceof Buffer) return Promise.resolve(resource);
if (browser && resource instanceof ArrayBuffer) return Promise.resolve(Util.convertToBuffer(resource));
if (typeof resource === 'string') {
if (/^https?:\/\//.test(resource)) {
return snekfetch.get(resource).then(res => res.body instanceof Buffer ? res.body : Buffer.from(res.text));
} else {
return fetch(resource).then(res => browser ? res.blob() : res.buffer());
} else if (!browser) {
return new Promise((resolve, reject) => {
const file = browser ? resource : path.resolve(resource);
fs.stat(file, (err, stats) => {