Update to new Slack webhook auth (version 0.1.0 of node-slackr)

.gitignore

@@ -0,0 +1,27 @@
+# Logs
+logs
+*.log
+
+# Runtime data
+pids
+*.pid
+*.seed
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directory
+# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
+node_modules

README.md

@@ -21,15 +21,15 @@ var session = new Session({
   token: token,
   devChannel: '#bottest',
   webhookClient: {
-    token: 'xxxxxxxxxxxxxxxxxxxx',
+    webhookUrl: 'xxxxxxxxxxxxxxxxxxxx',
     team: 'tumblr',
     username: 'ghbot',
     icon_url: 'http://michaelsharman.com/static/images/github_metro.png'
   }
 });
 ```
 
-All the data in the webhook client can be used but the only required ones are token and team.
+All the data in the webhook client can be used but the only required one is webhookUrl. The webhookUrl is the value specified on Incoming Webhooks page of your Slack team. 
 
 The other option seen in this session instantiation is the dev channel. With this the bot will ignore anything in
 that channel unless `NODE_ENV=development` is set. In which case it will only listen to that channel.

lib/session.js

@@ -6,6 +6,7 @@ var _         = require('lodash');
 var Slack     = require('node-slackr');
 var request   = require('request');
 var WebSocket = require('ws');
+var Q         = require('q');
 
 var Channel = require('./channel');
 var Event   = require('./event');
@@ -43,14 +44,19 @@ function Session(token, options) {
 
   this.messageHandlers = [];
 
+  this._connectPromise = Q.defer();
   request.get(url, function(err, response, body) {
     if (err) {
+      this._connectPromise.reject(err);
       throw('error:', err);
     }
 
     var data = JSON.parse(body);
 
     this.data = data;
+
+    // Note that we could resolve here, but we don't, since 
+    // we want the websocket to connect.
   }.bind(this));
 
   this._channelMessagePings = {};
@@ -226,6 +232,14 @@ Session.prototype = {
   sendMessage: function(msg) {
     msg = formatMessage(msg);
 
+    if (msg.channel) {
+        // slack now expects an id for the channel, rather than a name
+        var known = this.channelData(msg.channel);
+        if (known) {
+            msg.channel = known.id;
+        }
+    }
+
     if (msg.attachments && this.webhookClient) {
       this.webhookClient.notify(msg);
 
@@ -268,6 +282,10 @@ Session.prototype = {
     this.ws = new WebSocket(data.url);
 
     this.ws.on('message', this.gotMessage);
+
+    this.ws.on('open', function () {
+        this._connectPromise.resolve(this);
+    }.bind(this));
   },
 
   get webhookClient() {
@@ -279,11 +297,15 @@ Session.prototype = {
       this._webhookClient = client;
     } else {
       var options = _.clone(client);
-      delete options.team;
-      delete options.token;
-
-      this._webhookClient = new Slack(client.team, client.token, options);
+      var hook = options.webhookUrl;
+      delete options.webhookUrl;
+      
+      this._webhookClient = new Slack(hook, options);
     }
+  },
+
+  get connected() {
+    return this._connectPromise.promise;
   }
 };
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "slackr-bot",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "API for using the slack RTM interface",
   "main": "index.js",
   "scripts": {
@@ -17,9 +17,10 @@
   "author": "Tal Atlas <[email protected]> (http://tal.by/)",
   "license": "MIT",
   "dependencies": {
-    "node-slackr": "0.0.4",
+    "node-slackr": "0.1.0",
     "lodash": "^2.4.1",
     "request": "^2.47.0",
-    "ws": "^0.6.3"
+    "ws": "^0.6.3",
+    "q": "1.4.1"
   }
 }