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

Optional sendFile name callback and remove extra logic

Browse Source
This commit is contained in:
Nicholas Tay
2016-01-25 10:35:44 +11:00
parent 47f35a942c
commit 3a8f1ddbf9
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Client/Client.js
View File

@@ -209,7 +209,11 @@ var Client = (function (_EventEmitter) {
Client.prototype.sendFile = function sendFile(where, attachment, name) { Client.prototype.sendFile = function sendFile(where, attachment, name) {
var callback = arguments.length <= 3 || arguments[3] === undefined ? function () /*err, m*/{} : arguments[3]; var callback = arguments.length <= 3 || arguments[3] === undefined ? function () /*err, m*/{} : arguments[3];
name = name ? name : require('path').basename(attachment); 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)); return this.internal.sendFile(where, attachment, name).then(dataCallback(callback), errorCallback(callback));
}; };

8
src/Client/Client.js
View File

@@ -191,8 +191,12 @@ export default class Client extends EventEmitter {
// def sendFile // def sendFile
sendFile(where, attachment, name, callback = (/*err, m*/) => { }) { sendFile(where, attachment, name, callback = (/*err, m*/) => { }) {
name = name ? name : require('path').basename(attachment); 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) return this.internal.sendFile(where, attachment, name)
.then(dataCallback(callback), errorCallback(callback)); .then(dataCallback(callback), errorCallback(callback));
} }