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

Added filenamesand fixed sendMessage error handling

Browse Source
This commit is contained in:
hydrabolt
2015-08-26 13:14:20 +01:00
parent 206f8cfe1f
commit 20b970ee9d
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Client.js
View File

@@ -532,7 +532,8 @@ var Client = (function () {
}, { }, {
key: "sendFile", key: "sendFile",
value: function sendFile(destination, file) { value: function sendFile(destination, file) {
var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, msg) {} : arguments[2]; var fileName = arguments.length <= 2 || arguments[2] === undefined ? "image.png" : arguments[2];
var callback = arguments.length <= 3 || arguments[3] === undefined ? function (err, msg) {} : arguments[3];
var self = this; var self = this;
@@ -542,6 +543,7 @@ var Client = (function () {
if (typeof file === "string" || file instanceof String) { if (typeof file === "string" || file instanceof String) {
fstream = fs.createReadStream(file); fstream = fs.createReadStream(file);
fileName = file;
} else { } else {
fstream = file; fstream = file;
} }
@@ -570,7 +572,12 @@ var Client = (function () {
message = premessage + resolveMessage(message); message = premessage + resolveMessage(message);
var mentions = resolveMentions(); var mentions = resolveMentions();
self.resolveDestination(destination).then(send)["catch"](reject); self.resolveDestination(destination).then(send)["catch"](error);
function error(err) {
callback(err);
reject(err);
}
function send(destination) { function send(destination) {

10
src/Client.js
View File

@@ -544,7 +544,7 @@ class Client {
} }
sendFile(destination, file, callback = function (err, msg) { }) { sendFile(destination, file, fileName = "image.png", callback = function (err, msg) { }) {
var self = this; var self = this;
@@ -554,6 +554,7 @@ class Client {
if (typeof file === "string" || file instanceof String) { if (typeof file === "string" || file instanceof String) {
fstream = fs.createReadStream(file); fstream = fs.createReadStream(file);
fileName = file;
} else { } else {
fstream = file; fstream = file;
} }
@@ -582,7 +583,12 @@ class Client {
message = premessage + resolveMessage(message); message = premessage + resolveMessage(message);
var mentions = resolveMentions(); var mentions = resolveMentions();
self.resolveDestination(destination).then(send).catch(reject); self.resolveDestination(destination).then(send).catch(error);
function error(err){
callback(err);
reject(err);
}
function send(destination) { function send(destination) {