Merge remote-tracking branch 'ntay/sendfile-original-name' into indev

This commit is contained in:
abalabahaha
2016-01-24 16:15:28 -08:00
4 changed files with 38 additions and 6 deletions

View File

@@ -203,7 +203,13 @@ export default class Client extends EventEmitter {
}
// def sendFile
sendFile(where, attachment, name = "image.png", callback = (/*err, m*/) => { }) {
sendFile(where, attachment, name, callback = (/*err, m*/) => { }) {
if (typeof name === "function") {
// name is the callback
callback = name;
name = undefined; // Will get resolved into original filename in internal
}
return this.internal.sendFile(where, attachment, name)
.then(dataCallback(callback), errorCallback(callback));
}