Georg/dbot
1
0
Fork 0
forked from GitHub/dbot
Code Issues Pull Requests Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Luke Slater 2015-01-29 21:42:09 +00:00
parent 79a607ba1b
commit 57b6b1b7ee
1 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/report/api.js
View File

@ -51,11 +51,13 @@ console.log('removing ' + uPart);
var offlineOps = {}; var offlineOps = {};
async.each(ops, function(op, done) { async.each(ops, function(op, done) {
dbot.api.users.isOnline(server, cName, op, function(err, user, online) { dbot.api.users.isOnline(server, cName, op, function(err, user, online) {
if(user) {
if(!err && !online) offlineOps[op] = user; if(!err && !online) offlineOps[op] = user;
if(user.currentNick !== op) { if(user.currentNick !== op) {
ops = _.without(ops, op); ops = _.without(ops, op);
ops.push(user.currentNick); ops.push(user.currentNick);
} }
}
done(); done();
}); });
}, function() { }, function() {
@ -92,31 +94,12 @@ console.log('removing ' + uPart);
} }
}, this); }, this);
ops = _.pluck(ops, 'name'); ops = _.pluck(ops, 'name');
dbot.api.users.resolveChannel(server, cName, function(channel) {
if(channel) {
var perOps = channel.op;
if(this.config.notifyVoice) perOps = _.union(perOps, channel.voice);
this.db.read('nunsubs', cName + '.' + server, function(err, nunsubs) {
async.eachSeries(ops, function(nick, next) {
dbot.api.users.resolveUser(server, nick, function(user) {
if(nunsubs && _.include(nunsubs.users, user.id)) {
ops = _.without(ops, user.currentNick);
}
next();
});
}, function() {
message = this.internalAPI.formatNotify(type, server, message = this.internalAPI.formatNotify(type, server,
user, cName, message); user, cName, message);
this.internalAPI.notify(server, ops, message); this.internalAPI.notify(server, ops, message);
if(_.has(this.config.chan_redirs, cName)) { if(_.has(this.config.chan_redirs, cName)) {
dbot.say(server, this.config.chan_redirs[cName], message); dbot.say(server, this.config.chan_redirs[cName], message);
} }
}.bind(this));
}.bind(this));
}
}.bind(this));
} }
}, },