Fixed bug in chat.PostDirectMessage. Refactored ._send function.

philliphenslee · Nov 4, 2015 · 33961c4 · 33961c4
1 parent 84c7525
commit 33961c4
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 20 deletions.
diff --git a/lib/index.js b/lib/index.js
@@ -13,7 +13,7 @@ var _ = require('lodash');
 var util = require('util');
 var WebSocket = require('ws');
 
-var attachment = require('./slack/attachment');
+var Attachment = require('./slack/attachment');
 var Cache = require('./cache');
 var errors = require('./errors');
 var logging = require('./logging');
@@ -73,7 +73,7 @@ util.inherits(SmartSlack, EventEmitter);
  * @returns {object} Attachment The attachment instance
  */
 SmartSlack.prototype.createAttachment = function (text) {
-    return new attachment(text);
+    return new Attachment(text);
 };
 
 /**
@@ -168,7 +168,7 @@ SmartSlack.prototype.sendToChannel = function (channel, text, callback) {
         return callback(new Error(errors.missing_required_arg));
     }
     if (channel.match(/^([C]0)/)) {
-        return this._send(channel, text);
+        return this.send(channel, text);
     }
     return this._sendToType(slack.types.CHANNEL, channel, text, callback);
 };
@@ -186,7 +186,7 @@ SmartSlack.prototype.sendToGroup = function (group, text, callback) {
         return callback(new Error(errors.missing_required_arg));
     }
     if (group.match(/^([G]0)/)) {
-        return this._send(group, text);
+        return this.send(group, text);
     }
     return this._sendToType(slack.types.GROUP, group, text, callback);
 };
@@ -204,7 +204,7 @@ SmartSlack.prototype.sendToUser = function (user, text, callback) {
         return callback(new Error(errors.missing_required_arg));
     }
     if (user.match(/^([D]0)/)) {
-        return this._send(user, text);
+        return this.send(user, text);
     }
     return this._sendToType(slack.types.USER, user, text, callback);
 };
@@ -381,7 +381,7 @@ SmartSlack.prototype._reconnect = function () {
  * @param {string} text The message text
  * @access private
  */
-SmartSlack.prototype._send = function (channel, text) {
+SmartSlack.prototype.send = function (channel, text) {
     var _this = this;
     var message;
     var data;
@@ -447,7 +447,7 @@ SmartSlack.prototype._sendToType = function (slackType, typeName, text, callback
     }
 
     if (entityId) {
-        return this._send(entityId, text);
+        return this.send(entityId, text);
     }
     callback(new TypeError(errors.invalid_entity_type));
 };

diff --git a/lib/slack/chat.js b/lib/slack/chat.js
@@ -29,14 +29,14 @@ function deleteMessage(timestamp, channel, callback) {
     });
 }
 /**
- * Post API message to a user by username
- * @param user {string} user The user id
+ * Post API message to a entity by email, username, or channel
+ * @param entity {string} entity The entity
  * @param text {string} message The message text
  * @param {object} options Optional message options
  * @param {function} callback(err,result)
  */
-function postDirectMessage(user, text, options, callback) {
-    var channel = '';
+function postDirectMessage(entity, text, options, callback) {
+    var channel;
 
     callback = (_.isFunction(callback)) ? callback : _.noop;
 
@@ -45,16 +45,22 @@ function postDirectMessage(user, text, options, callback) {
         options = null;
     }
 
-    if (!_.isString(user) && !_.isString(text)) {
+    if (!_.isString(entity) && !_.isString(text)) {
         return callback(new Error(errors.missing_required_arg), null);
     }
 
-    users.getImChannel(user, function (err, result) {
-        if (err) {
-            return callback(err);
-        }
-        channel = result;
-    });
+    if (entity.match(/^D0[0-9A-Z]{7}/)) {
+        channel = entity;
+    }
+
+    if (!channel) {
+        users.getImChannel(entity, function (err, result) {
+            if (err) {
+                return callback(err);
+            }
+            channel = result;
+        });
+    }
 
     text = common.escape(text);
 

diff --git a/test/index.spec.js b/test/index.spec.js
@@ -268,11 +268,11 @@ describe('SmartSlack', function () {
         });
     });
 
-    describe('#_send', function () {
+    describe('#send', function () {
 
         it('exists as method on SmartSlack', function (done) {
             var slackClient = new SmartSlack(mockopts);
-            expect(typeof slackClient._send).to.equal('function');
+            expect(typeof slackClient.send).to.equal('function');
             done();
         });
     });