From 716bb6da5e03448f19aeb7a820684038652da98d Mon Sep 17 00:00:00 2001 From: James Lu Date: Mon, 7 Aug 2017 17:24:44 -0700 Subject: [PATCH] opercmds: exempt service bots from masskill/massban --- plugins/opercmds.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/plugins/opercmds.py b/plugins/opercmds.py index a558880..4174c4b 100644 --- a/plugins/opercmds.py +++ b/plugins/opercmds.py @@ -130,6 +130,9 @@ def massban(irc, source, args, use_regex=False): if irc.is_oper(uid) and not args.include_opers: irc.reply('Skipping banning \x02%s\x02 because they are opered.' % irc.users[uid].nick) continue + elif irc.get_service_bot(uid): + irc.reply('Skipping banning \x02%s\x02 because it is a service client.' % irc.users[uid].nick) + continue # Remove the target's access before banning them. bans = [('-%s' % irc.cmodes[prefix], uid) for prefix in irc.channels[args.channel].get_prefix_modes(uid) if prefix in irc.cmodes] @@ -228,6 +231,9 @@ def masskill(irc, source, args, use_regex=False): if irc.is_oper(uid) and not args.include_opers: irc.reply('Skipping killing \x02%s\x02 because they are opered.' % userobj.nick) continue + elif irc.get_service_bot(uid): + irc.reply('Skipping killing \x02%s\x02 because it is a service client.' % userobj.nick) + continue relay = world.plugins.get('relay') if relay and hasattr(userobj, 'remote'):