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

Merge pull request #677 from Scritches/master

Browse Source 
'kick' and 'kill_namespam' module changes
This commit is contained in:
Luke Slater 2018-05-16 10:34:38 +01:00 committed by GitHub
commit ab6cb80ea2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 795 additions and 711 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

234
modules/kick/commands.js
View File

@ -1,10 +1,10 @@
var _ = require('underscore')._, var _ = require('underscore')._,
uuid = require('node-uuid'); uuid = require('node-uuid');
var commands = function(dbot) { var commands = function (dbot) {
var commands = { var commands = {
/*** Kick Management ***/ /*** Kick Management ***/
'~quiet': function(event) { '~quiet': function (event) {
var server = event.server, var server = event.server,
quieter = event.rUser, quieter = event.rUser,
duration = event.input[1], duration = event.input[1],
@ -12,12 +12,12 @@ var commands = function(dbot) {
quietee = event.input[3].trim(), quietee = event.input[3].trim(),
reason = event.input[4] || "N/A"; reason = event.input[4] || "N/A";
this.api.quietUser(server, quieter, duration, channel, quietee, reason, function(response) { this.api.quietUser(server, quieter, duration, channel, quietee, reason, function (response) {
event.reply(response); event.reply(response);
}); });
}, },
'~timeout': function(event) { '~timeout': function (event) {
var server = event.server, var server = event.server,
quieter = event.rUser, quieter = event.rUser,
duration = this.config.timeoutTime, duration = this.config.timeoutTime,
@ -27,46 +27,50 @@ var commands = function(dbot) {
reason += ' #timeout'; reason += ' #timeout';
dbot.api.users.resolveUser(server, quietee, function(err, user) { dbot.api.users.resolveUser(server, quietee, function (err, user) {
if(!err && user) { if (!err && user) {
if(!_.has(this.recentTimeouts, user.id)) { if (!_.has(this.recentTimeouts, user.id)) {
this.recentTimeouts[user.id] = 0; this.recentTimeouts[user.id] = 0;
} }
this.recentTimeouts[user.id] += 1; this.recentTimeouts[user.id] += 1;
setTimeout(function() { setTimeout(function () {
this.recentTimeouts[user.id] -= 1; this.recentTimeouts[user.id] -= 1;
if(this.recentTimeouts[user.id] == 0) { if (this.recentTimeouts[user.id] == 0) {
delete this.recentTimeouts[user.id]; delete this.recentTimeouts[user.id];
} }
}.bind(this), 3600000); }
.bind(this), 3600000);
if(this.recentTimeouts[user.id] == 3) { if (this.recentTimeouts[user.id] == 3) {
duration = null; duration = null;
reason += ' #permatimeout'; reason += ' #permatimeout';
dbot.say(event.server, dbot.config.servers[event.server].admin_channel, quietee + ' has been given three timeouts in the last hour, and so has been quieted indefinitely in '+channel+'. Please review.'); dbot.say(event.server, dbot.config.servers[event.server].admin_channel, quietee + ' has been given three timeouts in the last hour, and so has been quieted indefinitely in ' + channel + '. Please review.');
} }
this.api.quietUser(server, quieter, duration, channel, quietee, reason, function(response) { this.api.quietUser(server, quieter, duration, channel, quietee, reason, function (response) {
event.reply(response); event.reply(response);
}); });
} }
}.bind(this)); }
.bind(this));
}, },
'~unquiet': function(event) { '~unquiet': function (event) {
var server = event.server, var server = event.server,
quieter = event.user, quieter = event.user,
channel = (event.input[1] || event.channel.name).trim(), channel = (event.input[1] || event.channel.name).trim(),
quietee = event.input[2].trim(); quietee = event.input[2].trim();
if(_.has(this.hosts[server], quietee)) { if (_.has(this.hosts[server], quietee)) {
if(_.include(this.config.quietBans, channel)) { if (_.include(this.config.quietBans, channel)) {
this.api.unban(server, this.hosts[server][quietee], channel); this.api.unban(server, this.hosts[server][quietee], channel);
} else { } else {
this.api.unquiet(server, this.hosts[server][quietee], channel); this.api.unquiet(server, this.hosts[server][quietee], channel);
} }
event.reply(dbot.t('unquieted', { 'quietee': quietee })); event.reply(dbot.t('unquieted', {
'quietee': quietee
}));
dbot.api.report.notify('unquiet', server, event.rUser, channel, dbot.api.report.notify('unquiet', server, event.rUser, channel,
dbot.t('unquiet_notify', { dbot.t('unquiet_notify', {
'unquieter': quieter, 'unquieter': quieter,
@ -75,14 +79,14 @@ var commands = function(dbot) {
} }
}, },
'~ckick': function(event) { '~ckick': function (event) {
var server = event.server, var server = event.server,
kicker = event.user, kicker = event.user,
kickee = event.input[2], kickee = event.input[2],
channel = event.input[1], channel = event.input[1],
reason = event.input[3]; reason = event.input[3];
if(_.isUndefined(channel)) { if (_.isUndefined(channel)) {
channel = event.channel.name; channel = event.channel.name;
} }
channel = channel.trim(); channel = channel.trim();
@ -97,8 +101,9 @@ var commands = function(dbot) {
}, },
// Kick and ban from all channels on the network. // Kick and ban from all channels on the network.
'~nban': function(event) { '~nban': function (event) {
if(!event.input) return; if (!event.input)
return;
var server = event.server, var server = event.server,
banner = event.user, banner = event.user,
@ -109,27 +114,32 @@ var commands = function(dbot) {
channels = _.keys(dbot.instance.connections[server].channels), channels = _.keys(dbot.instance.connections[server].channels),
network = event.server; network = event.server;
if(this.config.network_name[event.server]) { if (this.config.network_name[event.server]) {
network = this.config.network_name[event.server]; network = this.config.network_name[event.server];
} }
dbot.api.nickserv.getUserHost(event.server, banee, function(host) { dbot.api.nickserv.getUserHost(event.server, banee, function (host) {
// Add host record entry // Add host record entry
if(host) { if (host) {
if((reason.match('#line') || reason.match('#specialk') || reason.match('#kline')) && _.include(dbot.access.moderator(), event.rUser.primaryNick)) { var didKill = false;
if ((reason.match('#line') || reason.match('#specialk') || reason.match('#kline')) && _.include(dbot.access.moderator(), event.rUser.primaryNick)) {
didKill = true;
var t = ' !P '; var t = ' !P ';
if(timeout) { if (timeout) {
t = ' !T ' + (timeout * 60); t = ' !T ' + (timeout * 60);
} }
dbot.say(event.server, 'operserv', 'akill add '+banee + t + banee + ' banned by ' + banner + ': ' + reason); dbot.say(event.server, 'operserv', 'akill add ' + banee + t + banee + ' banned by ' + banner + ': ' + reason);
} }
// Do not ban if user was killed - redundant
if(!didKill) {
// Ban from current channel first // Ban from current channel first
this.api.ban(server, host, event.channel); this.api.ban(server, host, event.channel);
this.api.kick(server, banee, event.channel, reason + this.api.kick(server, banee, event.channel, reason +
' (network-wide ban)'); ' (network-wide ban)');
channels = _.without(channels, event.channel); channels = _.without(channels, event.channel);
if(!_.isUndefined(adminChannel)) { if (!_.isUndefined(adminChannel)) {
channels = _.without(channels, adminChannel); channels = _.without(channels, adminChannel);
} else { } else {
adminChannel = event.channel.name; adminChannel = event.channel.name;
@ -137,26 +147,30 @@ var commands = function(dbot) {
// Ban the user from all channels // Ban the user from all channels
var i = 0; var i = 0;
var banChannel = function(channels) { var banChannel = function (channels) {
if(i >= channels.length) return; if (i >= channels.length)
return;
var channel = channels[i]; var channel = channels[i];
this.api.ban(server, host, channel); this.api.ban(server, host, channel);
this.api.kick(server, banee, channel, reason + this.api.kick(server, banee, channel, reason +
' (network-wide ban)'); ' (network-wide ban)');
i++; banChannel(channels); i++;
}.bind(this);
banChannel(channels); banChannel(channels);
}
.bind(this);
banChannel(channels);
}
this.hosts[event.server][banee] = host; this.hosts[event.server][banee] = host;
// Create notify string // Create notify string
if(!_.isUndefined(timeout)) { if (!_.isUndefined(timeout)) {
timeout = timeout.trim(); timeout = timeout.trim();
var msTimeout = new Date(new Date().getTime() + (parseFloat(timeout) * 3600000)); var msTimeout = new Date(new Date().getTime() + (parseFloat(timeout) * 3600000));
if(_.has(dbot.modules, 'remind')) { if (_.has(dbot.modules, 'remind')) {
msTimeout = dbot.api.remind.parseTime(timeout); msTimeout = dbot.api.remind.parseTime(timeout);
if(!msTimeout) { if (!msTimeout) {
return event.reply('Invalid time. Remember you must give e.g. 5m now.'); return event.reply('Invalid time. Remember you must give e.g. 5m now.');
} }
timeout = timeout.replace(/([\d]+)d/, '$1 days').replace(/([\d]+)h/, '$1 hours ').replace(/([\d]+)m/, '$1 minutes ').replace(/([\d]+)s/, '$1 seconds').trim(); timeout = timeout.replace(/([\d]+)d/, '$1 days').replace(/([\d]+)h/, '$1 hours ').replace(/([\d]+)m/, '$1 minutes ').replace(/([\d]+)s/, '$1 seconds').trim();
@ -164,9 +178,13 @@ var commands = function(dbot) {
timeout += ' hours'; timeout += ' hours';
} }
if(!_.has(this.tempBans, event.server)) this.tempBans[event.server] = {}; // Do not schedule unbans if the user was killed as no ban was put in place
if(!didKill) {
if (!_.has(this.tempBans, event.server))
this.tempBans[event.server] = {};
this.tempBans[event.server][banee] = msTimeout; this.tempBans[event.server][banee] = msTimeout;
this.internalAPI.addTempBan(event.server, banee, msTimeout); this.internalAPI.addTempBan(event.server, banee, msTimeout);
}
var notifyString = dbot.t('tbanned', { var notifyString = dbot.t('tbanned', {
'network': network, 'network': network,
@ -187,7 +205,7 @@ var commands = function(dbot) {
} }
// Add db entry documenting ban // Add db entry documenting ban
if(this.config.document_bans) { if (this.config.document_bans) {
var id = uuid.v4(); var id = uuid.v4();
var banRecord = { var banRecord = {
'id': id, 'id': id,
@ -198,11 +216,11 @@ var commands = function(dbot) {
'host': host, 'host': host,
'reason': reason 'reason': reason
}; };
this.db.save('nbans', id, banRecord, function() {}); this.db.save('nbans', id, banRecord, function () {});
} }
// Notify moderators, banee // Notify moderators, banee
if(!_.isUndefined(adminChannel)) { if (!_.isUndefined(adminChannel)) {
channels = _.without(channels, adminChannel); channels = _.without(channels, adminChannel);
} else { } else {
adminChannel = event.channel.name; adminChannel = event.channel.name;
@ -211,7 +229,7 @@ var commands = function(dbot) {
dbot.api.report.notify('ban', server, event.rUser, adminChannel, notifyString, false, banee); dbot.api.report.notify('ban', server, event.rUser, adminChannel, notifyString, false, banee);
dbot.say(event.server, adminChannel, notifyString); dbot.say(event.server, adminChannel, notifyString);
if(!_.isUndefined(timeout)) { if (!_.isUndefined(timeout)) {
dbot.say(event.server, banee, dbot.t('tbanned_notify', { dbot.say(event.server, banee, dbot.t('tbanned_notify', {
'network': network, 'network': network,
'banner': banner, 'banner': banner,
@ -232,19 +250,24 @@ var commands = function(dbot) {
// err // err
dbot.say(event.server, 'NickServ', 'FREEZE ' + banee + ' ON ' + reason); dbot.say(event.server, 'NickServ', 'FREEZE ' + banee + ' ON ' + reason);
} else { } else {
event.reply(dbot.t('no_user', { 'user': banee })); event.reply(dbot.t('no_user', {
'user': banee
}));
} }
}.bind(this)); }
.bind(this));
}, },
'~nunban': function(event) { '~nunban': function (event) {
var unbanee = event.params[1], var unbanee = event.params[1],
host = event.params[2] || undefined, host = event.params[2] || undefined,
unbanner = event.rUser; unbanner = event.rUser;
this.api.networkUnban(event.server, unbanee, unbanner, host, function(err) { this.api.networkUnban(event.server, unbanee, unbanner, host, function (err) {
if(err) { if (err) {
event.reply(dbot.t('nunban_error', { 'unbanee': unbanee })); event.reply(dbot.t('nunban_error', {
'unbanee': unbanee
}));
} }
}); });
}, },
@ -253,16 +276,16 @@ var commands = function(dbot) {
// Give the number of times a given user has been kicked and has kicked // Give the number of times a given user has been kicked and has kicked
// other people. // other people.
'~kickcount': function(event) { '~kickcount': function (event) {
var username = event.params[1]; var username = event.params[1];
if(!_.has(dbot.db.kicks, username)) { if (!_.has(dbot.db.kicks, username)) {
var kicks = '0'; var kicks = '0';
} else { } else {
var kicks = dbot.db.kicks[username]; var kicks = dbot.db.kicks[username];
} }
if(!_.has(dbot.db.kickers, username)) { if (!_.has(dbot.db.kickers, username)) {
var kicked = '0'; var kicked = '0';
} else { } else {
var kicked = dbot.db.kickers[username]; var kicked = dbot.db.kickers[username];
@ -277,17 +300,19 @@ var commands = function(dbot) {
// Output a list of the people who have been kicked the most and those // Output a list of the people who have been kicked the most and those
// who have kicked other people the most. // who have kicked other people the most.
'~kickstats': function(event) { '~kickstats': function (event) {
var orderedKickLeague = function(list, topWhat) { var orderedKickLeague = function (list, topWhat) {
var kickArr = _.chain(list) var kickArr = _.chain(list)
.pairs() .pairs()
.sortBy(function(kick) { return kick[1] }) .sortBy(function (kick) {
return kick[1]
})
.reverse() .reverse()
.first(10) .first(10)
.value(); .value();
var kickString = "Top " + topWhat + ": "; var kickString = "Top " + topWhat + ": ";
for(var i=0;i<kickArr.length;i++) { for (var i = 0; i < kickArr.length; i++) {
kickString += kickArr[i][0] + " (" + kickArr[i][1] + "), "; kickString += kickArr[i][0] + " (" + kickArr[i][1] + "), ";
} }
@ -298,28 +323,34 @@ var commands = function(dbot) {
event.reply(orderedKickLeague(dbot.db.kickers, 'Kickers')); event.reply(orderedKickLeague(dbot.db.kickers, 'Kickers'));
}, },
'~votequiet': function(event) { '~votequiet': function (event) {
var target = event.input[1], var target = event.input[1],
reason = event.input[2]; reason = event.input[2];
if(_.has(event.channel.nicks, target)) { if (_.has(event.channel.nicks, target)) {
dbot.api.users.resolveUser(event.server, target, function(err, user) { dbot.api.users.resolveUser(event.server, target, function (err, user) {
if(!err && user) { if (!err && user) {
if(_.include(dbot.access.power_user(), user.primaryNick) || target == dbot.config.name) { if (_.include(dbot.access.power_user(), user.primaryNick) || target == dbot.config.name) {
return event.reply('User is immune to votequiet.'); return event.reply('User is immune to votequiet.');
} }
if(!_.has(this.voteQuiets, user.id)) { if (!_.has(this.voteQuiets, user.id)) {
this.voteQuiets[user.id] = { 'user': user.id, 'reason': reason, 'channel': event.channel, 'yes': [event.rUser.primaryNick], 'no': [] }; this.voteQuiets[user.id] = {
'user': user.id,
'reason': reason,
'channel': event.channel,
'yes': [event.rUser.primaryNick],
'no': []
};
event.reply(event.user + ' has started a vote to quiet ' + target + ' for "' + reason + '." Type either "~voteyes ' + target + '" or "~voteno ' + target + '" in the next 90 seconds.'); event.reply(event.user + ' has started a vote to quiet ' + target + ' for "' + reason + '." Type either "~voteyes ' + target + '" or "~voteno ' + target + '" in the next 90 seconds.');
this.voteQuiets[user.id].timer = setTimeout(function() { this.voteQuiets[user.id].timer = setTimeout(function () {
var vq = this.voteQuiets[user.id]; var vq = this.voteQuiets[user.id];
vq.spent = true; vq.spent = true;
if(vq.yes.length >= 3 && vq.no.length < 2) { if (vq.yes.length >= 3 && vq.no.length < 2) {
event.reply('Attempt to quiet ' + target + ' succeeded. Count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').'); event.reply('Attempt to quiet ' + target + ' succeeded. Count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').');
this.api.quietUser(event.server, event.rUser, '10m', event.channel, target, reason + '[votequiet]', function(response) { this.api.quietUser(event.server, event.rUser, '10m', event.channel, target, reason + '[votequiet]', function (response) {
clearTimeout(vq.timer); clearTimeout(vq.timer);
event.reply(response); event.reply(response);
}); });
@ -329,35 +360,38 @@ var commands = function(dbot) {
var nString = 'A votequiet was attempted on ' + target + ' in ' + event.channel + '. It was initiated by ' + event.rUser.primaryNick + '. ' + var nString = 'A votequiet was attempted on ' + target + ' in ' + event.channel + '. It was initiated by ' + event.rUser.primaryNick + '. ' +
vq.yes.join(', ') + ' voted yes (' + vq.yes.length + '). '; vq.yes.join(', ') + ' voted yes (' + vq.yes.length + '). ';
if(vq.no.length > 0) { if (vq.no.length > 0) {
nString += vq.no.join(', ') + ' voted no (' + vq.no.length + ').' nString += vq.no.join(', ') + ' voted no (' + vq.no.length + ').'
} }
dbot.api.report.notify('votequiet', event.server, event.rUser, event.channel, nString, false, target); dbot.api.report.notify('votequiet', event.server, event.rUser, event.channel, nString, false, target);
setTimeout(function() { setTimeout(function () {
delete this.voteQuiets[user.id]; delete this.voteQuiets[user.id];
}.bind(this), 600000); }
}.bind(this), 90000); .bind(this), 600000);
}
.bind(this), 90000);
} else { } else {
if(this.voteQuiets[user.id].spent) { if (this.voteQuiets[user.id].spent) {
event.reply('A votequiet attempt has already been made on this user in the last 10 minutes.'); event.reply('A votequiet attempt has already been made on this user in the last 10 minutes.');
} else { } else {
var vq = this.voteQuiets[user.id] var vq = this.voteQuiets[user.id]
if(!_.include(vq.yes, event.rUser.primaryNick)) { if (!_.include(vq.yes, event.rUser.primaryNick)) {
vq.yes.push(event.rUser.primaryNick); vq.yes.push(event.rUser.primaryNick);
event.reply('There is already a votequiet attempt active for this user, adding yes vote to existing poll.'); event.reply('There is already a votequiet attempt active for this user, adding yes vote to existing poll.');
event.reply('Voted yes on votequiet for ' + target + '. New count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').'); event.reply('Voted yes on votequiet for ' + target + '. New count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').');
if(vq.yes.length == 4) { if (vq.yes.length == 4) {
event.reply('Attempt to quiet ' + target + ' succeeded. Count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').'); event.reply('Attempt to quiet ' + target + ' succeeded. Count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').');
this.api.quietUser(event.server, event.rUser, '10m', event.channel, target, reason + '[votequiet]', function(response) { this.api.quietUser(event.server, event.rUser, '10m', event.channel, target, reason + '[votequiet]', function (response) {
clearTimeout(vq.timer); clearTimeout(vq.timer);
vq.spent = true; vq.spent = true;
setTimeout(function() { setTimeout(function () {
delete this.voteQuiets[user.id]; delete this.voteQuiets[user.id];
}.bind(this), 600000); }
.bind(this), 600000);
event.reply(response); event.reply(response);
}); });
} }
@ -369,37 +403,39 @@ var commands = function(dbot) {
} else { } else {
event.reply('Target does not seem to be in the channel.'); event.reply('Target does not seem to be in the channel.');
} }
}.bind(this)); }
.bind(this));
} else { } else {
event.reply('Target does not seem to be in the channel.'); event.reply('Target does not seem to be in the channel.');
} }
}, },
'~voteyes': function(event) { '~voteyes': function (event) {
var target = event.params[1]; var target = event.params[1];
dbot.api.users.resolveUser(event.server, target, function(err, user) { dbot.api.users.resolveUser(event.server, target, function (err, user) {
if(!err && user) { if (!err && user) {
if(user.id == event.rUser.id) { if (user.id == event.rUser.id) {
return event.reply('You cannot vote on your own silencing. Be good.'); return event.reply('You cannot vote on your own silencing. Be good.');
} }
if(_.has(this.voteQuiets, user.id) && !this.voteQuiets[user.id].spent) { if (_.has(this.voteQuiets, user.id) && !this.voteQuiets[user.id].spent) {
var vq = this.voteQuiets[user.id]; var vq = this.voteQuiets[user.id];
if(event.channel != vq.channel) { if (event.channel != vq.channel) {
return event.reply('Vote must be in ' + vq.channel); return event.reply('Vote must be in ' + vq.channel);
} }
if(!_.include(vq.yes, event.rUser.primaryNick) && !_.include(vq.no, event.rUser.primaryNick)) { if (!_.include(vq.yes, event.rUser.primaryNick) && !_.include(vq.no, event.rUser.primaryNick)) {
vq.yes.push(event.rUser.primaryNick); vq.yes.push(event.rUser.primaryNick);
event.reply('Voted yes on votequiet for ' + target + '. New count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').'); event.reply('Voted yes on votequiet for ' + target + '. New count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').');
if(vq.yes.length == 4) { if (vq.yes.length == 4) {
event.reply('Attempt to quiet ' + target + ' succeeded. Count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').'); event.reply('Attempt to quiet ' + target + ' succeeded. Count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').');
this.api.quietUser(event.server, event.rUser, '10m', event.channel, target, vq.reason + '[votequiet]', function(response) { this.api.quietUser(event.server, event.rUser, '10m', event.channel, target, vq.reason + '[votequiet]', function (response) {
clearTimeout(vq.timer); clearTimeout(vq.timer);
vq.spent = true; vq.spent = true;
setTimeout(function() { setTimeout(function () {
delete this.voteQuiets[user.id]; delete this.voteQuiets[user.id];
}.bind(this), 600000); }
.bind(this), 600000);
event.reply(response); event.reply(response);
}); });
} }
@ -412,23 +448,24 @@ var commands = function(dbot) {
} else { } else {
event.reply('No idea who that is m8'); event.reply('No idea who that is m8');
} }
}.bind(this)); }
.bind(this));
}, },
'~voteno': function(event) { '~voteno': function (event) {
var target = event.params[1]; var target = event.params[1];
dbot.api.users.resolveUser(event.server, target, function(err, user) { dbot.api.users.resolveUser(event.server, target, function (err, user) {
if(!err && user) { if (!err && user) {
if(user.id == event.rUser.id) { if (user.id == event.rUser.id) {
return event.reply('You cannot vote on your own silencing. Be good.'); return event.reply('You cannot vote on your own silencing. Be good.');
} }
if(_.has(this.voteQuiets, user.id) && !this.voteQuiets[user.id].spent) { if (_.has(this.voteQuiets, user.id) && !this.voteQuiets[user.id].spent) {
var vq = this.voteQuiets[user.id]; var vq = this.voteQuiets[user.id];
if(event.channel != vq.channel) { if (event.channel != vq.channel) {
return event.reply('Vote must be in ' + vq.channel); return event.reply('Vote must be in ' + vq.channel);
} }
if(!_.include(vq.yes, event.rUser.primaryNick) && !_.include(vq.no, event.rUser.primaryNick)) { if (!_.include(vq.yes, event.rUser.primaryNick) && !_.include(vq.no, event.rUser.primaryNick)) {
vq.no.push(event.rUser.primaryNick); vq.no.push(event.rUser.primaryNick);
event.reply('Voted no on votequiet for ' + target + '. New count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').'); event.reply('Voted no on votequiet for ' + target + '. New count: Yes (' + vq.yes.length + '). No (' + vq.no.length + ').');
} else { } else {
@ -440,11 +477,12 @@ var commands = function(dbot) {
} else { } else {
event.reply('No idea who that is m8'); event.reply('No idea who that is m8');
} }
}.bind(this)); }
.bind(this));
} }
}; };
_.each(commands, function(command) { _.each(commands, function (command) {
command.access = 'moderator'; command.access = 'moderator';
}); });
@ -469,6 +507,6 @@ var commands = function(dbot) {
return commands; return commands;
}; };
exports.fetch = function(dbot) { exports.fetch = function (dbot) {
return commands(dbot); return commands(dbot);
}; };

152
modules/kick/kick.js
View File

@ -1,58 +1,58 @@
var _ = require('underscore')._; var _ = require('underscore')._;
var kick = function(dbot) { var kick = function (dbot) {
if(!_.has(dbot.db, 'recentTimeouts')) { if (!_.has(dbot.db, 'recentTimeouts')) {
dbot.db.recentTimeouts = {}; dbot.db.recentTimeouts = {};
} }
this.recentTimeouts = dbot.db.recentTimeouts; this.recentTimeouts = dbot.db.recentTimeouts;
this.api = { this.api = {
'ban': function(server, host, channel) { 'ban': function (server, host, channel) {
dbot.instance.connections[server].send('MODE ' + channel + ' +b *!*@' + host); dbot.instance.connections[server].send('MODE ' + channel + ' +b *!*@' + host);
}, },
'quiet': function(server, host, channel) { 'quiet': function (server, host, channel) {
dbot.instance.connections[server].send('MODE ' + channel + ' +q *!*@' + host); dbot.instance.connections[server].send('MODE ' + channel + ' +q *!*@' + host);
}, },
'unquiet': function(server, host, channel) { 'unquiet': function (server, host, channel) {
dbot.instance.connections[server].send('MODE ' + channel + ' -q *!*@' + host); dbot.instance.connections[server].send('MODE ' + channel + ' -q *!*@' + host);
}, },
'devoice': function(server, nick, channel) { 'devoice': function (server, nick, channel) {
dbot.instance.connections[server].send('MODE ' + channel + ' -v ' +nick); dbot.instance.connections[server].send('MODE ' + channel + ' -v ' + nick);
}, },
'voice': function(server, nick, channel) { 'voice': function (server, nick, channel) {
dbot.instance.connections[server].send('MODE ' + channel + ' +v ' +nick); dbot.instance.connections[server].send('MODE ' + channel + ' +v ' + nick);
}, },
'kick': function(server, user, channel, msg) { 'kick': function (server, user, channel, msg) {
dbot.instance.connections[server].send('KICK ' + channel + ' ' + user + ' :' + msg); dbot.instance.connections[server].send('KICK ' + channel + ' ' + user + ' :' + msg);
}, },
'kill': function(server, user, reason) { 'kill': function (server, user, reason) {
dbot.instance.connections[server].send('kill ' + user + ' ' + reason); dbot.instance.connections[server].send('kill ' + user + ' ' + reason);
}, },
'unban': function(server, host, channel) { 'unban': function (server, host, channel) {
// TODO: Wrest control from chanserv // TODO: Wrest control from chanserv
//dbot.say(server, this.config.chanserv, 'unban ' + channel + ' *!*@' + host); //dbot.say(server, this.config.chanserv, 'unban ' + channel + ' *!*@' + host);
dbot.instance.connections[server].send('MODE ' + channel + ' -b *!*@' + host); dbot.instance.connections[server].send('MODE ' + channel + ' -b *!*@' + host);
}, },
'quietUser': function(server, quieter, duration, channel, quietee, reason, callback) { 'quietUser': function (server, quieter, duration, channel, quietee, reason, callback) {
dbot.api.nickserv.getUserHost(server, quietee, function(host) { dbot.api.nickserv.getUserHost(server, quietee, function (host) {
// Add host record entry // Add host record entry
if(host) { if (host) {
this.hosts[server][quietee] = host; this.hosts[server][quietee] = host;
if(!_.isUndefined(duration) && !_.isNull(duration)) { if (!_.isUndefined(duration) && !_.isNull(duration)) {
duration = duration.trim(); duration = duration.trim();
var msTimeout = new Date(new Date().getTime() + (parseFloat(duration) * 60000)); var msTimeout = new Date(new Date().getTime() + (parseFloat(duration) * 60000));
if(_.has(dbot.modules, 'remind')) { if (_.has(dbot.modules, 'remind')) {
msTimeout = dbot.api.remind.parseTime(duration); msTimeout = dbot.api.remind.parseTime(duration);
if(!msTimeout) { if (!msTimeout) {
return callback('Invalid time. Remember you must give e.g. 5m now.'); return callback('Invalid time. Remember you must give e.g. 5m now.');
} }
duration = duration.replace(/([\d]+)d/, '$1 years').replace(/([\d]+)d/, '$1 days').replace(/([\d]+)h/, '$1 hours ').replace(/([\d]+)m/, '$1 minutes ').replace(/([\d]+)s/, '$1 seconds').trim(); duration = duration.replace(/([\d]+)d/, '$1 years').replace(/([\d]+)d/, '$1 days').replace(/([\d]+)h/, '$1 hours ').replace(/([\d]+)m/, '$1 minutes ').replace(/([\d]+)s/, '$1 seconds').trim();
@ -61,16 +61,16 @@ var kick = function(dbot) {
} }
var vStatus = dbot.instance.connections[server].channels[channel].nicks[quietee].voice; var vStatus = dbot.instance.connections[server].channels[channel].nicks[quietee].voice;
dbot.api.timers.addTimeout(msTimeout, function() { dbot.api.timers.addTimeout(msTimeout, function () {
if(_.has(this.hosts[server], quietee)) { if (_.has(this.hosts[server], quietee)) {
if(_.include(this.config.quietBans, channel)) { if (_.include(this.config.quietBans, channel)) {
this.api.unban(server, this.hosts[server][quietee], channel); this.api.unban(server, this.hosts[server][quietee], channel);
this.api.voice(server, quietee, channel); this.api.voice(server, quietee, channel);
} else { } else {
this.api.unquiet(server, this.hosts[server][quietee], channel); this.api.unquiet(server, this.hosts[server][quietee], channel);
} }
dbot.api.users.resolveUser(server, dbot.config.name, function(err, user) { dbot.api.users.resolveUser(server, dbot.config.name, function (err, user) {
dbot.api.report.notify('unquiet', server, user, channel, dbot.api.report.notify('unquiet', server, user, channel,
dbot.t('unquiet_notify', { dbot.t('unquiet_notify', {
'unquieter': dbot.config.name, 'unquieter': dbot.config.name,
@ -78,7 +78,8 @@ var kick = function(dbot) {
}), false, quietee); }), false, quietee);
}); });
} }
}.bind(this)); }
.bind(this));
callback(dbot.t('tquieted', { callback(dbot.t('tquieted', {
'quietee': quietee, 'quietee': quietee,
'minutes': duration 'minutes': duration
@ -89,10 +90,11 @@ var kick = function(dbot) {
'quieter': quieter.primaryNick, 'quieter': quieter.primaryNick,
'quietee': quietee, 'quietee': quietee,
'reason': reason 'reason': reason
}), false, quietee }), false, quietee);
);
} else { } else {
callback(dbot.t('quieted', { 'quietee': quietee })); callback(dbot.t('quieted', {
'quietee': quietee
}));
dbot.api.report.notify('quiet', server, quieter.primaryNick, channel, dbot.api.report.notify('quiet', server, quieter.primaryNick, channel,
dbot.t('quiet_notify', { dbot.t('quiet_notify', {
'quieter': quieter.primaryNick, 'quieter': quieter.primaryNick,
@ -103,37 +105,40 @@ var kick = function(dbot) {
this.api.devoice(server, quietee, channel); this.api.devoice(server, quietee, channel);
if(_.include(this.config.quietBans, channel)) { if (_.include(this.config.quietBans, channel)) {
this.api.ban(server, this.hosts[server][quietee], channel); this.api.ban(server, this.hosts[server][quietee], channel);
} else { } else {
this.api.quiet(server, host, channel); this.api.quiet(server, host, channel);
} }
if(reason.indexOf('#warn') !== -1) { if (reason.indexOf('#warn') !== -1) {
dbot.api.warning.warn(server, quieter, quietee, dbot.api.warning.warn(server, quieter, quietee,
'Quieted in ' + channel + ' for ' + reason, channel, 'Quieted in ' + channel + ' for ' + reason, channel,
function() {}); function () {});
} }
} else { } else {
event.reply(dbot.t('no_user', { 'user': quietee })); event.reply(dbot.t('no_user', {
'user': quietee
}));
} }
}.bind(this)); }
.bind(this));
}, },
'networkUnban': function(server, unbanee, unbanner, manualHost, callback) { 'networkUnban': function (server, unbanee, unbanner, manualHost, callback) {
var channels = dbot.config.servers[server].channels, var channels = dbot.config.servers[server].channels,
network = this.config.network_name[server] || server, network = this.config.network_name[server] || server,
adminChannel = dbot.config.servers[server].admin_channel; adminChannel = dbot.config.servers[server].admin_channel;
if(!_.isUndefined(manualHost)) { if (!_.isUndefined(manualHost)) {
this.hosts[server][unbanee] = manualHost; this.hosts[server][unbanee] = manualHost;
} }
if(_.has(this.hosts, server) && _.has(this.hosts[server], unbanee) && _.isString(this.hosts[server][unbanee])) { if (_.has(this.hosts, server) && _.has(this.hosts[server], unbanee) && _.isString(this.hosts[server][unbanee])) {
var host = this.hosts[server][unbanee]; var host = this.hosts[server][unbanee];
// Notify Staff // Notify Staff
if(_.isUndefined(adminChannel)) { if (_.isUndefined(adminChannel)) {
adminChannel = event.channel.name; adminChannel = event.channel.name;
} }
@ -155,63 +160,73 @@ var kick = function(dbot) {
// Unban // Unban
var i = 0; var i = 0;
var unbanChannel = function(channels) { var unbanChannel = function (channels) {
if(i >= channels.length) return; if (i >= channels.length)
return;
var channel = channels[i]; var channel = channels[i];
this.api.unban(server, host, channel); this.api.unban(server, host, channel);
setTimeout(function() { setTimeout(function () {
i++; unbanChannel(channels); i++;
unbanChannel(channels);
}, 1000); }, 1000);
}.bind(this); }
.bind(this);
unbanChannel(channels); unbanChannel(channels);
dbot.say(server, 'NickServ', 'FREEZE ' + unbanee + ' OFF'); dbot.say(server, 'NickServ', 'FREEZE ' + unbanee + ' OFF');
callback(null); // Success callback(null); // Success
} else { } else {
// Attempt to look up the host on-the-fly // Attempt to look up the host on-the-fly
dbot.api.nickserv.getUserHost(server, unbanee, unbanner, function(host) { dbot.api.nickserv.getUserHost(server, unbanee, unbanner, function (host) {
if(host) { if (host) {
if(!_.has(this.hosts, server)) this.hosts[server] = {}; if (!_.has(this.hosts, server))
this.hosts[server] = {};
this.hosts[server][unbanee] = host; this.hosts[server][unbanee] = host;
this.api.networkUnban(server, unbanee, unbanner); this.api.networkUnban(server, unbanee, unbanner);
} else { } else {
callback(true); // No host could be found callback(true); // No host could be found
} }
}.bind(this)); }
.bind(this));
} }
} }
}; };
this.internalAPI = { this.internalAPI = {
'addTempBan': function(server, banee, timeout) { 'addTempBan': function (server, banee, timeout) {
dbot.api.users.resolveUser(server, dbot.config.name, function(err, bot) { dbot.api.users.resolveUser(server, dbot.config.name, function (err, bot) {
dbot.api.timers.addTimeout(timeout, function() { dbot.api.timers.addTimeout(timeout, function () {
this.api.networkUnban(server, banee, bot, undefined, function(err) {}); this.api.networkUnban(server, banee, bot, undefined, function (err) {});
delete this.tempBans[server][banee]; delete this.tempBans[server][banee];
}.bind(this)); }
}.bind(this)); .bind(this));
}.bind(this) }
.bind(this));
}
.bind(this)
}; };
this.listener = function(event) { this.listener = function (event) {
if(event.kickee == dbot.config.name) { if (event.kickee == dbot.config.name) {
dbot.instance.join(event, event.channel.name); dbot.instance.join(event, event.channel.name);
event.reply(dbot.t('kicked_dbot', { 'botname': dbot.config.name })); event.reply(dbot.t('kicked_dbot', {
'botname': dbot.config.name
}));
dbot.db.kicks[dbot.config.name] += 1; dbot.db.kicks[dbot.config.name] += 1;
} else { } else {
if(!_.has(dbot.db.kicks, event.kickee)) { if (!_.has(dbot.db.kicks, event.kickee)) {
dbot.db.kicks[event.kickee] = 1; dbot.db.kicks[event.kickee] = 1;
} else { } else {
dbot.db.kicks[event.kickee] += 1; dbot.db.kicks[event.kickee] += 1;
} }
if(!_.has(dbot.db.kickers, event.user)) { if (!_.has(dbot.db.kickers, event.user)) {
dbot.db.kickers[event.user] = 1; dbot.db.kickers[event.user] = 1;
} else { } else {
dbot.db.kickers[event.user] += 1; dbot.db.kickers[event.user] += 1;
} }
if(!this.config.countSilently) { if (!this.config.countSilently) {
event.reply(event.kickee + '-- (' + dbot.t('user_kicks', { event.reply(event.kickee + '-- (' + dbot.t('user_kicks', {
'user': event.kickee, 'user': event.kickee,
'kicks': dbot.db.kicks[event.kickee], 'kicks': dbot.db.kicks[event.kickee],
@ -219,34 +234,37 @@ var kick = function(dbot) {
}) + ')'); }) + ')');
} }
} }
}.bind(this); }
.bind(this);
this.on = 'KICK'; this.on = 'KICK';
this.onLoad = function() { this.onLoad = function () {
if(!_.has(dbot.db, 'hosts')) { if (!_.has(dbot.db, 'hosts')) {
dbot.db.hosts = {}; dbot.db.hosts = {};
_.each(dbot.config.servers, function(v, k) { _.each(dbot.config.servers, function (v, k) {
dbot.db.hosts[k] = {}; dbot.db.hosts[k] = {};
}, this); }, this);
} }
if(!_.has(dbot.db, 'tempBans')) dbot.db.tempBans = {}; if (!_.has(dbot.db, 'tempBans'))
dbot.db.tempBans = {};
this.hosts = dbot.db.hosts; this.hosts = dbot.db.hosts;
this.tempBans = dbot.db.tempBans; this.tempBans = dbot.db.tempBans;
this.voteQuiets = {}; this.voteQuiets = {};
_.each(this.tempBans, function(bans, server) { _.each(this.tempBans, function (bans, server) {
_.each(bans, function(timeout, nick) { _.each(bans, function (timeout, nick) {
timeout = new Date(timeout); timeout = new Date(timeout);
this.internalAPI.addTempBan(server, nick, timeout); this.internalAPI.addTempBan(server, nick, timeout);
}, this); }, this);
}, this); }, this);
if(_.has(dbot.modules, 'web')) { if (_.has(dbot.modules, 'web')) {
dbot.api.web.addIndexLink('/bans', 'Ban List'); dbot.api.web.addIndexLink('/bans', 'Ban List');
} }
}.bind(this); }
.bind(this);
}; };
exports.fetch = function(dbot) { exports.fetch = function (dbot) {
return new kick(dbot); return new kick(dbot);
}; };

24
modules/kick/pages.js
View File

@ -1,19 +1,21 @@
var _ = require('underscore')._; var _ = require('underscore')._;
var pages = function(dbot) { var pages = function (dbot) {
return { return {
'/bans': function(req, res) { '/bans': function (req, res) {
res.render('servers', { res.render('servers', {
'servers': _.keys(dbot.config.servers) 'servers': _.keys(dbot.config.servers)
}); });
}, },
'/underbans': function(req, res) { '/underbans': function (req, res) {
this.db.search('nbans', { 'server': server }, function(ban) { this.db.search('nbans', {
if(ban.reason.match('#underban')) { 'server': server
}, function (ban) {
if (ban.reason.match('#underban')) {
bans.push(ban); bans.push(ban);
} }
}, function() { }, function () {
res.render('bans', { res.render('bans', {
'server': server, 'server': server,
'bans': bans 'bans': bans
@ -21,13 +23,15 @@ var pages = function(dbot) {
}); });
}, },
'/bans/:server': function(req, res) { '/bans/:server': function (req, res) {
var server = req.params.server, var server = req.params.server,
bans = []; bans = [];
this.db.search('nbans', { 'server': server }, function(ban) { this.db.search('nbans', {
'server': server
}, function (ban) {
bans.push(ban); bans.push(ban);
}, function() { }, function () {
res.render('bans', { res.render('bans', {
'server': server, 'server': server,
'bans': bans 'bans': bans
@ -37,6 +41,6 @@ var pages = function(dbot) {
} }
}; };
exports.fetch = function(dbot) { exports.fetch = function (dbot) {
return pages(dbot); return pages(dbot);
}; };

3
modules/kill_namespam/config.json
View File

@ -6,5 +6,6 @@
"________ ______" "________ ______"
], ],
"cliconn_channel": "#dnsbl", "cliconn_channel": "#dnsbl",
"cliconn_patterns": [] "cliconn_patterns": [],
"exempt_channels": []
} }

49
modules/kill_namespam/kill_namespam.js
View File

@ -12,7 +12,10 @@ var kill_namespam = function(dbot) {
dbot.modules.admin.internalAPI.saveConfig(); dbot.modules.admin.internalAPI.saveConfig();
}.bind(this); }.bind(this);
this.matchedKill = {};
this.listener = function(event) { this.listener = function(event) {
if(event.action == 'PRIVMSG') {
// Here we listen for atropos // Here we listen for atropos
if(event.channel == this.config.cliconn_channel) { if(event.channel == this.config.cliconn_channel) {
if(event.message.match('▶')) { if(event.message.match('▶')) {
@ -28,18 +31,15 @@ var kill_namespam = function(dbot) {
'pattern': matchedPattern 'pattern': matchedPattern
})); }));
} else { } else {
var ip = event.message.split(' ')[1] if(!this.matchedKill[host]) {
// Defer killing this connection until after they join a non-exempted channel
// Alternatively you can just do dbot.api.kick.kill(event.server, event.user, message); this.matchedKill[host] = {
dbot.say(event.server, 'operserv', 'akill add *@'+ ip +' !P Naughty Nelly Auto-kill v6.2. Matched pattern: /'+ matchedPattern +'/'); ip: event.message.split(' ')[1],
server: event.server,
var msg = dbot.t('clikill_act', { matchedPattern: matchedPattern,
'ip': ip, rUser: event.rUser
'pattern': matchedPattern };
}); }
event.reply(msg);
dbot.api.report.notify('autokill', event.server, event.rUser,
dbot.config.servers[event.server].admin_channel, msg, ip, ip);
} }
}, true); }, true);
} }
@ -87,8 +87,31 @@ var kill_namespam = function(dbot) {
dbot.api.report.notify('spam', event.server, event.user, event.channel, message, event.host, event.user); dbot.api.report.notify('spam', event.server, event.user, event.channel, message, event.host, event.user);
} }
} else if (event.action == 'JOIN') {
if(this.matchedKill[event.host]) {
if(this.config.exempt_channels.indexOf(event.channel) == -1) {
var kill = this.matchedKill[event.host];
delete this.matchedKill[event.host];
// Alternatively you can just do dbot.api.kick.kill(event.server, event.user, message);
dbot.say(event.server, 'operserv', 'akill add *@'+ kill.ip +' !P Naughty Nelly Auto-kill v6.2. Matched pattern: /'+ kill.matchedPattern +'/');
var msg = dbot.t('clikill_act', {
'ip': kill.ip,
'pattern': kill.matchedPattern
});
dbot.api.report.notify('autokill', kill.server, kill.rUser,
dbot.config.servers[kill.server].admin_channel, msg, kill.ip, kill.ip);
}
}
} else if (event.action == 'QUIT') {
if(this.matchedKill[event.host]) {
delete this.matchedKill[event.host];
}
}
}.bind(this); }.bind(this);
this.on = 'PRIVMSG'; this.on = ['PRIVMSG', 'JOIN', 'QUIT'];
this.commands = { this.commands = {
'~add_spamkill': function(event) { '~add_spamkill': function(event) {