Added simple Redis storage

.gitignore

@@ -8,3 +8,4 @@ examples/db_slackbutton_slashcommand/
 examples/db_team_bot/
 .DS_Store
 */.DS_Store
+.env

examples/demo_bot.js

@@ -23,7 +23,7 @@ This bot demonstrates many of the core features of Botkit:
 
   Run your bot from the command line:
 
-    token=<MY TOKEN> node team_bot.js
+    token=<MY TOKEN> node demo_bot.js
 
 # USE THE BOT:
 
@@ -63,6 +63,7 @@ if (!process.env.token) {
 
 var controller = Botkit.slackbot({
  debug: false,
+ log: false
 });
 
 controller.spawn({

lib/CoreBot.js

@@ -2,7 +2,7 @@
 /* It expects to receive messages via the botkit.receiveMessage function */
 /* These messages are expected to match Slack's message format. */
 var mustache = require('mustache');
-var simple_storage = require(__dirname+'/simple_storage.js');
+var simple_storage = require(__dirname+'/storage/simple_storage.js');
 
 function Botkit(configuration) {
 
@@ -601,7 +601,7 @@ function Botkit(configuration) {
       },
       save: function(channel,cb) {
         botkit.log('Warning: using temporary storage. Data will be lost when process restarts.')
-        if (user.id) {
+        if (channel.id) {
           botkit.memory_store['channels'][channel.id] = channel;
           cb(null,channel.id);
         } else {
@@ -625,11 +625,13 @@ function Botkit(configuration) {
   }
 
   botkit.log = function() {
+    if (configuration.log || configuration.log === undefined) { //default to true
       var args=[];
       for (var k = 0; k < arguments.length; k++) {
         args.push(arguments[k]);
       }
       console.log.apply(null,args);
+    }
   }
 
   botkit.hears = function(keywords,events,cb) {
@@ -640,14 +642,16 @@ function Botkit(configuration) {
       events = events.split(/\,/g);
     }
 
+    var match;
     for (var k = 0; k < keywords.length; k++) {
       var keyword = keywords[k];
       for (var e = 0; e < events.length; e++) {
         (function(keyword) {
           botkit.on(events[e],function(bot,message) {
             if (message.text) {
-              if (message.text.match(new RegExp(keyword,'i'))) {
+              if (match = message.text.match(new RegExp(keyword,'i'))) {
                 botkit.debug("I HEARD ",keyword);
+                message.match = match;
                 cb.apply(this,[bot,message]);
                 return false;
               }
@@ -715,6 +719,12 @@ function Botkit(configuration) {
     }
   }
 
+  botkit.shutdown = function() {
+    if (botkit.tickInterval) {
+      clearInterval(botkit.tickInterval);
+    }
+  }
+
   botkit.startTask = function(bot,message,cb) {
 
 

lib/SlackBot.js

@@ -25,6 +25,7 @@ function Slackbot(configuration) {
     } else {
       slack_botkit.config.clientId = slack_app_config.clientId;
       slack_botkit.config.clientSecret = slack_app_config.clientSecret;
+      if (slack_app_config.redirectUri) slack_botkit.config.redirectUri = slack_app_config.redirectUri;;
       if (typeof(slack_app_config.scopes)=='string') {
         slack_botkit.config.scopes = slack_app_config.scopes.split(/\,/);
       } else {
@@ -89,7 +90,7 @@ function Slackbot(configuration) {
 
             res.status(200);
 
-            var bot = botkit.spawn(team);
+            var bot = slack_botkit.spawn(team);
 
             bot.team_info = team;
             bot.res = res;
@@ -124,7 +125,7 @@ function Slackbot(configuration) {
 
             res.status(200);
 
-            var bot = botkit.spawn(team);
+            var bot = slack_botkit.spawn(team);
             bot.res = res;
             bot.team_info = team;
 
@@ -194,8 +195,8 @@ function Slackbot(configuration) {
     if (team_id) {
       url = url + "&team=" + team_id;
     }
-    if (slack_botkit.config.redirect_uri) {
-      url = url + "&redirect_uri="+redirect_uri;
+    if (slack_botkit.config.redirectUri) {
+      url = url + "&redirect_uri="+slack_botkit.config.redirectUri;
     }
 
     return url;
@@ -260,11 +261,15 @@ function Slackbot(configuration) {
       var code = req.query.code;
       var state = req.query.state;
 
-      oauth_access({
+      var opts = {
         client_id: slack_botkit.config.clientId,
         client_secret: slack_botkit.config.clientSecret,
         code: code
-      },function(err,auth) {
+      };
+
+      if (slack_botkit.config.redirectUri) opts.redirect_uri = slack_botkit.config.redirectUri;
+
+      oauth_access(opts,function(err,auth) {
 
         if (err) {
           if (callback) {

lib/Slackbot_worker.js

@@ -50,7 +50,6 @@ module.exports = function(botkit,config) {
   }
 
   bot.closeRTM = function() {
-
     if (bot.rtm) {
       bot.rtm.close();
     }

lib/storage/mongo_storage.js

@@ -0,0 +1,61 @@
+var db = require('monk'); //https://www.npmjs.com/package/monk
+
+module.exports = function(config) {
+
+  if (!config && !config.mongo_uri) throw new Error('Need to provide mongo address.');
+  /* Your mongo_uri will look something like
+  'mongodb://test:test@ds037145.mongolab.com:37145/slack-bot-test'
+  or 'localhost/mydb,192.168.1.1' */
+
+  var teams_db = db(config.mongo_uri).get('teams');
+  var users_db = db(config.mongo_uri).get('users');
+  var channels_db = db(config.mongo_uri).get('channels');
+
+  var unwrapFromList = function(cb) {
+    return function(err, data) {
+      if (err) {
+        cb(err, data);
+      } else {
+        cb(err, data[0]);
+      }
+    };
+  };
+
+  var storage = {
+    teams: {
+      get: function(team_id, cb) {
+        teams_db.find({id: team_id}, unwrapFromList(cb));
+      },
+      save: function(team_data, cb) {
+        teams_db.findAndModify({id: team_data.id}, team_data, {upsert: true, new: true}, cb);
+      },
+      all: function(cb) {
+        teams_db.find({}, cb);
+      }
+    },
+    users: {
+      get: function(user_id, cb) {
+        users_db.find({id: user_id}, unwrapFromList(cb));
+      },
+      save: function(user_data, cb) {
+        users_db.findAndModify({id: user_data.id}, user_data, {upsert: true, new: true}, cb);
+      },
+      all: function(cb) {
+        users_db.find({}, cb);
+      }
+    },
+    channels: {
+      get: function(channel_id, cb) {
+        channels_db.find({id: channel_id}, unwrapFromList(cb));
+      },
+      save: function(channel_data, cb) {
+        channels_db.findAndModify({id: channel_data.id}, channel_data, {upsert: true, new: true}, cb);
+      },
+      all: function(cb) {
+        channels_db.find({}, cb);
+      }
+    }
+  };
+
+  return storage;
+};

lib/storage/redis_storage.js

@@ -0,0 +1,63 @@
+var redis = require('redis');
+
+/*
+ * All optionnals
+ *
+ * config = {
+ *  namespace: namespace,
+ *  host: host,
+ *  port: port
+ * }
+ */
+module.exports = function(config) {
+  config = config || {};
+  config.namespace = config.namespace || 'botkit:store';
+
+  var storage = {},
+    client = redis.createClient(config), // could pass specific redis config here
+    methods = config.methods || ['teams', 'users', 'channels'];
+
+  // Implements required API methods
+  for (var i = 0; i < methods.length; i++) {
+    storage[methods[i]] = function(hash) {
+      return {
+        get: function(id,cb) {
+          client.hget(config.namespace + ':' + hash, id, function (err, res) {
+            cb(err, JSON.parse(res));
+          });
+        },
+        save: function(object,cb) {
+          if (!object.id) // Silently catch this error?
+            return cb(new Error('The given object must have an id property'), {});
+
+          client.hset(config.namespace + ':' + hash, object.id, JSON.stringify(object), cb);
+        },
+        all: function(cb, options) {
+          client.hgetall(config.namespace + ':' + hash, function (err, res) {
+            if (err)
+              return cb(err, {});
+
+            if (null === res)
+              return cb(err, res);
+
+            var parsed;
+            var array = [];
+
+            for (var i in res) {
+              parsed = JSON.parse(res[i]);
+              res[i] = parsed;
+              array.push(parsed);
+            }
+
+            cb(err, options && options.type === 'object' ? res : array);
+          });
+        },
+        allById: function(cb) {
+          this.all(cb, {type: 'object'});
+        }
+      }
+    }(methods[i]);
+  }
+
+  return storage;
+};