diff --git a/lib/Client.js b/lib/Client.js index 798921293..19f45dd46 100644 --- a/lib/Client.js +++ b/lib/Client.js @@ -302,16 +302,30 @@ var Client = (function () { }); }); } + }, { + key: "reply", + value: function reply(destination, message) { + var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, msg) {} : arguments[2]; + + var self = this; + + return new Promise(function (response, reject) { + + var user = destination.sender; + self.sendMessage(destination, message, callback, user + ", ").then(response)["catch"](reject); + }); + } }, { key: "sendMessage", value: function sendMessage(destination, message) { var callback = arguments.length <= 2 || arguments[2] === undefined ? function (err, msg) {} : arguments[2]; + var premessage = arguments.length <= 3 || arguments[3] === undefined ? "" : arguments[3]; var self = this; return new Promise(function (resolve, reject) { - message = resolveMessage(message); + message = premessage + resolveMessage(message); var mentions = resolveMentions(); destination = resolveDestination(destination); diff --git a/src/Client.js b/src/Client.js index f4f1ddbaa..867510574 100644 --- a/src/Client.js +++ b/src/Client.js @@ -336,14 +336,27 @@ class Client { }); } + + reply(destination, message, callback = function(err, msg){}){ + + var self = this; + + return new Promise(function(response, reject){ + + var user = destination.sender; + self.sendMessage(destination, message, callback, user + ", ").then(response).catch(reject); + + }); + + } - sendMessage(destination, message, callback = function (err, msg) { }) { + sendMessage(destination, message, callback = function (err, msg) { }, premessage = "") { var self = this; return new Promise(function (resolve, reject) { - message = resolveMessage(message); + message = premessage + resolveMessage(message); var mentions = resolveMentions(); destination = resolveDestination(destination); diff --git a/test/bot.js b/test/bot.js index 59e4783c3..881d9f0fc 100644 --- a/test/bot.js +++ b/test/bot.js @@ -17,7 +17,8 @@ mybot.on("ready", function () { mybot.on("message", function (msg) { if(msg.content === "pmme"){ - mybot.sendMessage(msg.channel, "You know what "+msg.sender+"? NO"); + console.log("yes we found it!"); + mybot.reply(msg, "You know what "+msg.sender+"? NO"); } });