GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-02-25 09:50:39 +01:00
Code Issues Projects Releases Wiki Activity

opercmds: show failed kills in 'masskill' due to claim

Browse Source
This commit is contained in:
James Lu 2017-08-07 00:18:36 -07:00
parent 6dc41ca15a
commit 8b4e73e0ed
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/opercmds.py
View File

@ -185,7 +185,7 @@ def masskill(irc, source, args, use_regex=False):
args = masskill_parser.parse_args(args) args = masskill_parser.parse_args(args)
reason = ' '.join(args.reason) reason = ' '.join(args.reason)
results = 0 results = killed = 0
userlist_func = irc.match_all_re if use_regex else irc.match_all userlist_func = irc.match_all_re if use_regex else irc.match_all
for uid in userlist_func(args.banmask): for uid in userlist_func(args.banmask):
@ -211,6 +211,10 @@ def masskill(irc, source, args, use_regex=False):
except: except:
log.exception('(%s) Failed to send process massban hook; some kickbans may have not ' log.exception('(%s) Failed to send process massban hook; some kickbans may have not '
'been sent to plugins / relay networks!', irc.name) 'been sent to plugins / relay networks!', irc.name)
killed += 1
else:
irc.reply("Not kicking \x02%s\x02 from \x02%s\x02 because you don't have CLAIM access. If this is "
"another network's channel, ask them to op you first!" % (userobj.nick, channel))
else: else:
if args.akill: # TODO: configurable length via strings such as "2w3d5h6m3s" - though month and minute clash this way? if args.akill: # TODO: configurable length via strings such as "2w3d5h6m3s" - though month and minute clash this way?
if not (userobj.realhost or userobj.ip): if not (userobj.realhost or userobj.ip):
@ -225,10 +229,10 @@ def masskill(irc, source, args, use_regex=False):
except: except:
log.exception('(%s) Failed to send process massban hook; some kickbans may have not ' log.exception('(%s) Failed to send process massban hook; some kickbans may have not '
'been sent to plugins / relay networks!', irc.name) 'been sent to plugins / relay networks!', irc.name)
killed += 1
results += 1 results += 1
else: else:
irc.reply('Masskilled %s users.' % results) irc.reply('Masskilled %s/%s users.' % (killed, results))
utils.add_cmd(masskill, aliases=('mkill',)) utils.add_cmd(masskill, aliases=('mkill',))
@utils.add_cmd @utils.add_cmd