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

sendFile via URL

Browse Source
This commit is contained in:
abalabahaha
2016-01-29 21:45:03 -08:00
parent 35c800cc8f
commit dad570a4ec
4 changed files with 49 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Client/InternalClient.js
View File

@@ -583,16 +583,18 @@ var InternalClient = (function () {
// fs.createReadStream()'s have .path that give the path. Not sure about other streams though.
name = require("path").basename(_file.path);
} else {
name = "image.png"; // Just have to go with default filenames.
name = "default.png"; // Just have to go with default filenames.
}
}
return this.resolver.resolveChannel(where).then(function (channel) {
return _this15.apiRequest("post", _Constants.Endpoints.CHANNEL_MESSAGES(channel.id), true, null, {
name: name,
file: _this15.resolver.resolveFile(_file)
}).then(function (res) {
return channel.messages.add(new _StructuresMessage2["default"](res, channel, _this15.client));
return _this15.resolver.resolveFile(_file).then(function (file) {
return _this15.apiRequest("post", _Constants.Endpoints.CHANNEL_MESSAGES(channel.id), true, null, {
name: name,
file: file
}).then(function (res) {
return channel.messages.add(new _StructuresMessage2["default"](res, channel, _this15.client));
});
});
});
};

20
lib/Client/Resolver/Resolver.js
View File

@@ -11,6 +11,10 @@ var _fs = require("fs");
var _fs2 = _interopRequireDefault(_fs);
var _superagent = require("superagent");
var _superagent2 = _interopRequireDefault(_superagent);
var _StructuresUser = require("../../Structures/User");
var _StructuresUser2 = _interopRequireDefault(_StructuresUser);
@@ -130,9 +134,21 @@ var Resolver = (function () {
Resolver.prototype.resolveFile = function resolveFile(resource) {
if (typeof resource === "string" || resource instanceof String) {
return _fs2["default"].createReadStream(resource);
if (/^http(s):\/\//.test(resource)) {
return new Promise(function (resolve, reject) {
_superagent2["default"].get(resource).end(function (err, res) {
if (err) {
reject(err);
} else {
resolve(res.body);
}
});
});
} else {
return Promise.resolve(resource);
}
}
return resource;
return Promise.resolve(resource);
};
Resolver.prototype.resolveMentions = function resolveMentions(resource) {