t push:wq

:Merge branch 'betterusers' of github.com:reality/dbot into betterusers

jsbot

@@ -1 +1 @@
-Subproject commit 606d0cdcddfda9d7328cfa0b65bb4a3079d77d9e
+Subproject commit 139a3aad5a8b5c71dfe43fdc3f04d29d8b4104df

modules/atheme/atheme.js

@@ -51,7 +51,7 @@ var atheme = function(dbot) {
                     });
                     delete this.hostStack[server][mask];
                 }
-            }.bind(this), 2000);
+            }.bind(this), 5000);
         }
     };
 
@@ -95,8 +95,7 @@ var atheme = function(dbot) {
                                 delete allFlags[u];
                             }
                         });
-
-                        async.each(_.keys(hostMasks), function(hostMask, done) {
+			async.each(_.keys(hostMasks), function(hostMask, done) {
                             this.api.getVHosts(event.server, hostMask.split('@')[1], function(err, users) {
                                 _.each(users, function(user) {
                                     allFlags[user] = hostMasks[hostMask];
@@ -109,7 +108,7 @@ var atheme = function(dbot) {
                                 callback(null, this.flagStack[event.server][end[1]].flags);
                             }.bind(this));
                             delete this.flagStack[event.server][end[1]];
-                        }.bind(this));
+			}.bind(this));
                     }
                 }
             } else if(event.user === 'HostServ') {

modules/radio/config.json

@@ -1,5 +1,5 @@
 {
-    "stream": "http://tripsit.fm:8000",
-    "announce": [ { "server": "tripsit", "name": "#tripbot" } ],
+    "stream": "http://radio.tripsit.me:8000/tripradio",
+    "announce": [ { "server": "tripsit", "name": "#drugs" } ],
     "outputPrefix": "\u00033radio\u000f"
 }

modules/report/api.js

@@ -35,12 +35,14 @@ var api = function(dbot) {
                                         return k;
                                    }
                                }.bind(this));
-
+		ops = _.without(ops, undefined);
+console.log(ops);
                     this.db.read('nunsubs', cName + '.' + server, function(err, nunsubs) {
                         if(nunsubs) {
                             _.each(nunsubs.users, function(user) {
                                 var uPart = user.split('.')[0];
                                 if(_.include(ops, uPart)) {
+console.log('removing ' + uPart);
                                     ops = _.without(ops, uPart);
                                 }
                             });

modules/report/report.js

@@ -10,6 +10,7 @@ var report = function(dbot) {
     this.internalAPI = {
         'notify': function(server, users, message) {
             async.eachSeries(users, function(nick, next) {
+console.log('sending msg to ' + nick);
                 setTimeout(function() {
                     dbot.say(server, nick, message);
                     next();

modules/users/api.js

@@ -66,6 +66,9 @@ var api = function(dbot) {
         }
     };
 
+    api['getUserAliases'].external = true;
+    api['getUserAliases'].extMap = [ 'id', 'callback' ];
+
     return api;
 };