command can use nickserv [#421]

modules/command/api.js

@@ -17,22 +17,24 @@ var api = function(dbot) {
         /**
          * Does the user have the correct access level to use the command?
          */
-        'hasAccess': function(user, command) {
+        'hasAccess': function(server, user, command, callback) {
-            var access = true;
             var accessNeeded = dbot.commands[command].access;
 
-            if(accessNeeded == 'admin') {
+            if(accessNeeded == 'admin' || accessNeeded == 'moderator') {
-                if(!_.include(dbot.config.admins, user)) {
+                if(!_.include(dbot.config[accessNeeded + 's'], user)) { // lol
-                    access = false;
+                    callback(false);
-                }
+                } else {
-            } else if(accessNeeded == 'moderator') {
+                    if(_.has(dbot.modules, 'nickserv') && this.config.useNickserv == true) {
-                if(!_.include(dbot.config.moderators, user) && 
+                        dbot.api.nickserv.auth(server, user, function(result) {
-                        !_.include(dbot.config.admins, user)) {
+                            callback(result);
-                    access = false;
+                        });
+                    } else {
+                        callback(true);
                     }
                 }
-
+            } else {
-            return access;
+                callback(true);
+            }
         },
 
         /**

modules/command/command.js

@@ -24,9 +24,10 @@ var command = function(dbot) {
         if(this.api.isBanned(event.user, commandName)) {
             event.reply(dbot.t('command_ban', {'user': event.user})); 
         } else {
+            this.api.hasAccess(event.server, event.user, commandName, function(result) {
+                if(result) {
                     if(!this.api.isIgnoring(event.user, commandName) && 
                             !this.api.isIgnoring(event.channel, commandName) &&
-                    this.api.hasAccess(event.user, commandName) &&
                             dbot.commands[commandName].disabled !== true) {
                         if(this.api.applyRegex(commandName, event)) {
                             try {
@@ -56,6 +57,8 @@ var command = function(dbot) {
                         }
                     }
                 }
+            }.bind(this));
+        }
     }.bind(this);
     this.on = 'PRIVMSG';
 };

modules/command/config.json

@@ -1,5 +1,6 @@
 {
     "ignorable": false,
     "help": "http://github.com/reality/depressionbot/blob/master/modules/command/README.md",
+    "useNickserv": false,
     "dbKeys": [ "ignores", "bans" ]
 }

modules/nickserv/nickserv.js

@@ -18,6 +18,7 @@ var nickserv = function(dbot) {
             statusRegex = this.config.servers[event.server].matcher,
             acceptableState = this.config.servers[event.server].acceptableState;
 
+
         if(event.user == nickserv) {
             var info = event.params.match(statusRegex);
             if(info && _.has(this.authStack, event.server)) {