GitHub/dbot
3
0
Fork 1
mirror of https://github.com/reality/dbot.git synced 2025-01-26 20:14:32 +01:00
Code Issues Projects Releases Wiki Activity

clikill spares SASL-authenticated users from match kills

Browse Source
This commit is contained in:
Scritches 2018-05-01 16:47:25 -04:00
parent bbfc4c18a6
commit d544dcf017
3 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/kill_namespam/kill_namespam.js
View File

@ -18,6 +18,15 @@ var kill_namespam = function(dbot) {
if(event.message.match('▶')) { if(event.message.match('▶')) {
var matchedPattern = _.find(this.config.cliconn_patterns, function(p) { return event.message.match(p); }) var matchedPattern = _.find(this.config.cliconn_patterns, function(p) { return event.message.match(p); })
if(matchedPattern) { if(matchedPattern) {
var nick = event.message.split(' ')[2];
dbot.api.nickserv.getUserHost(event.server, nick, function(host) {
var userIsAuthenticated = host && host.startsWith('tripsit/');
if (userIsAuthenticated) {
event.reply(dbot.t('clikill_spared', {
'user': nick,
'pattern': matchedPattern
}));
} else {
var ip = event.message.split(' ')[1] var ip = event.message.split(' ')[1]
// Alternatively you can just do dbot.api.kick.kill(event.server, event.user, message); // Alternatively you can just do dbot.api.kick.kill(event.server, event.user, message);
@ -31,6 +40,8 @@ var kill_namespam = function(dbot) {
dbot.api.report.notify('autokill', event.server, event.rUser, dbot.api.report.notify('autokill', event.server, event.rUser,
dbot.config.servers[event.server].admin_channel, msg, ip, ip); dbot.config.servers[event.server].admin_channel, msg, ip, ip);
} }
}, true);
}
} }
} }

3
modules/kill_namespam/strings.json
View File

@ -7,5 +7,8 @@
}, },
"clikill_act": { "clikill_act": {
"en": "Added K-Line for {ip}, due to matching pattern: /{pattern}/" "en": "Added K-Line for {ip}, due to matching pattern: /{pattern}/"
},
"clikill_spared": {
"en": "{user} spared from clikill matched pattern: /{pattern}/"
} }
} }

6
modules/nickserv/nickserv.js
View File

@ -26,12 +26,15 @@ var nickserv = function(dbot) {
}.bind(this), 6000); }.bind(this), 6000);
}, },
'getUserHost': function(server, nick, callback) { 'getUserHost': function(server, nick, callback, skipFallback) {
if(!_.has(this.userStack, server)) this.userStack[server] = {}; if(!_.has(this.userStack, server)) this.userStack[server] = {};
this.userStack[server][nick] = callback; this.userStack[server][nick] = callback;
dbot.instance.connections[server].send('USERHOST ' + nick); dbot.instance.connections[server].send('USERHOST ' + nick);
setTimeout(function() { setTimeout(function() {
if(_.has(this.userStack[server], nick)) { if(_.has(this.userStack[server], nick)) {
if (skipFallback) {
callback(false);
} else {
dbot.instance.connections[server].send('WHOWAS ' + nick + ' 1'); dbot.instance.connections[server].send('WHOWAS ' + nick + ' 1');
setTimeout(function() { setTimeout(function() {
if(_.has(this.userStack[server], nick)) { if(_.has(this.userStack[server], nick)) {
@ -39,6 +42,7 @@ var nickserv = function(dbot) {
} }
}.bind(this), 2000); }.bind(this), 2000);
} }
}
}.bind(this), 4000); }.bind(this), 4000);
} }
}; };