GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-01-23 18:54:05 +01:00
Code Issues Projects Releases Wiki Activity

opercmds: fix wrong counting in 'masskill' if a user gets kicked from multiple channels

Browse Source
This commit is contained in:
James Lu 2017-08-07 16:55:00 -07:00
parent 7266f09879
commit 1597c78089
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/opercmds.py
View File

@ -205,6 +205,8 @@ def masskill(irc, source, args, use_regex=False):
results = killed = 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
seen_users = set()
for uid in userlist_func(args.banmask): for uid in userlist_func(args.banmask):
userobj = irc.users[uid] userobj = irc.users[uid]
@ -228,7 +230,9 @@ 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
if uid not in seen_users: # Don't count users multiple times on different channels
killed += 1
else: else:
irc.reply("Not kicking \x02%s\x02 from \x02%s\x02 because you don't have CLAIM access. If this is " 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 someone to op you or use the --force-kb option." % (userobj.nick, channel)) "another network's channel, ask someone to op you or use the --force-kb option." % (userobj.nick, channel))
@ -248,6 +252,7 @@ def masskill(irc, source, args, use_regex=False):
'been sent to plugins / relay networks!', irc.name) 'been sent to plugins / relay networks!', irc.name)
killed += 1 killed += 1
results += 1 results += 1
seen_users.add(uid)
else: else:
irc.reply('Masskilled %s/%s users.' % (killed, results)) irc.reply('Masskilled %s/%s users.' % (killed, results))
utils.add_cmd(masskill, aliases=('mkill',)) utils.add_cmd(masskill, aliases=('mkill',))