This commit is contained in:
reality 2014-10-03 20:42:41 +00:00
parent d0aab89435
commit a7ccb5ff14

View File

@ -76,60 +76,72 @@ var atheme = function(dbot) {
this.commands['~chanmode'].regex = [/^chanmode (\+.)/, 2]; this.commands['~chanmode'].regex = [/^chanmode (\+.)/, 2];
this.listener = function(event) { this.listener = function(event) {
if(event.user === 'ChanServ') { if(event.action === 'NOTICE') {
var flags = event.params.match(/(\d+)\s+([^ ]+)\s+(\+\w+)\s+\((\#[\w\.]+)\)/), if(event.user === 'ChanServ') {
end = event.params.match(/end of \u0002(\#[\w\.]+)\u0002 flags listing/i); var flags = event.params.match(/(\d+)\s+([^ ]+)\s+(\+\w+)\s+\((\#[\w\.]+)\)/),
end = event.params.match(/end of \u0002(\#[\w\.]+)\u0002 flags listing/i);
if(flags && _.has(this.flagStack[event.server], flags[4])) { if(flags && _.has(this.flagStack[event.server], flags[4])) {
this.flagStack[event.server][flags[4]].flags[flags[2]] = flags[3]; this.flagStack[event.server][flags[4]].flags[flags[2]] = flags[3];
} else if(end) { } else if(end) {
if(_.has(this.flagStack[event.server], end[1])) { if(_.has(this.flagStack[event.server], end[1])) {
// Parse wildcard hostmasks to nicks // Parse wildcard hostmasks to nicks
var allFlags = this.flagStack[event.server][end[1]].flags, var allFlags = this.flagStack[event.server][end[1]].flags,
hostMasks = {}; hostMasks = {};
_.each(allFlags, function(f, u) { // TODO: combine to one loop _.each(allFlags, function(f, u) { // TODO: combine to one loop
if(u.indexOf('*!*@') !== -1) { if(u.indexOf('*!*@') !== -1) {
hostMasks[u] = f; hostMasks[u] = f;
delete allFlags[u]; delete allFlags[u];
} }
});
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];
});
done();
}); });
}.bind(this), function() {
console.log('DONE');
_.each(this.flagStack[event.server][end[1]].callbacks, function(callback) {
callback(null, this.flagStack[event.server][end[1]].flags);
}.bind(this));
delete this.flagStack[event.server][end[1]];
}.bind(this));
}
}
} else if(event.user === 'HostServ') {
_.each(this.hostStack[event.server], function(el, mask) {
if(event.params.match(mask)) {
var user = event.params.match(/- ([^ ]+)/),
end = event.params.match(/matches for pattern/);
if(user) { async.each(_.keys(hostMasks), function(hostMask, done) {
this.hostStack[event.server][mask].users.push(user[1]); this.api.getVHosts(event.server, hostMask.split('@')[1], function(err, users) {
} else if(end) { _.each(users, function(user) {
_.each(this.hostStack[event.server][mask].callbacks, function(callback) { allFlags[user] = hostMasks[hostMask];
callback(null, this.hostStack[event.server][mask].users); });
}, this); done();
delete this.hostStack[event.server][mask]; });
}.bind(this), function() {
console.log('DONE');
_.each(this.flagStack[event.server][end[1]].callbacks, function(callback) {
callback(null, this.flagStack[event.server][end[1]].flags);
}.bind(this));
delete this.flagStack[event.server][end[1]];
}.bind(this));
} }
} }
}, this); } else if(event.user === 'HostServ') {
_.each(this.hostStack[event.server], function(el, mask) {
if(event.params.match(mask)) {
var user = event.params.match(/- ([^ ]+)/),
end = event.params.match(/matches for pattern/);
if(user) {
this.hostStack[event.server][mask].users.push(user[1]);
} else if(end) {
_.each(this.hostStack[event.server][mask].callbacks, function(callback) {
callback(null, this.hostStack[event.server][mask].users);
}, this);
delete this.hostStack[event.server][mask];
}
}
}, this);
}
} else { // PRIVMSG
var akill = event.message.match(/([^ ]+) AKILL:ADD: ([^ ]+) \(reason: (.+)(\) )\(duration: ([^,)]+)/);
if(event.channel === '#services' && akill) {
var channel = dbot.config.servers[server].admin_channel;
dbot.api.report.notify('ban', 'tripsit', akill[1], channel, dbot.t('akill', {
'host': akill[2],
'reason': akill[3],
'duration': akill[4]
}));
}
} }
}.bind(this); }.bind(this);
this.on = 'NOTICE'; this.on = ['NOTICE', 'PRIVMSG'];
}; };
exports.fetch = function(dbot) { exports.fetch = function(dbot) {