GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-27 13:09:23 +01:00
Code Issues Projects Releases Wiki Activity

opercmds: migrate to irc.match_all()

Browse Source
This commit is contained in:
James Lu 2017-08-06 17:56:27 -07:00
parent cbb3c88e11
commit cb36e29b92
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plugins/opercmds.py
View File

@ -41,24 +41,18 @@ def checkban(irc, source, args):
args = checkban_parser.parse_args(args) args = checkban_parser.parse_args(args)
if not args.target: if not args.target:
# No hostmask was given, return a list of matched users. # No hostmask was given, return a list of matched users.
results = 0 results = 0
# Process the --channel argument if it exists. This is just a lazy wrapper around the
# $and and $channel exttargets, but it's mostly to convenience users.
if args.channel:
args.banmask = "$and:(%s+$channel:%s)" % (args.banmask, args.channel)
irc.reply("Checking for hosts that match \x02%s\x02:" % args.banmask, private=True) irc.reply("Checking for hosts that match \x02%s\x02:" % args.banmask, private=True)
for uid, userobj in irc.users.copy().items(): for uid in irc.match_all(args.banmask, channel=args.channel):
if irc.match_host(args.banmask, uid): if results < args.maxresults:
if results < args.maxresults: userobj = irc.users[uid]
s = "\x02%s\x02 (%s@%s) [%s] {\x02%s\x02}" % (userobj.nick, userobj.ident, s = "\x02%s\x02 (%s@%s) [%s] {\x02%s\x02}" % (userobj.nick, userobj.ident,
userobj.host, userobj.realname, irc.get_friendly_name(irc.get_server(uid))) userobj.host, userobj.realname, irc.get_friendly_name(irc.get_server(uid)))
# Always reply in private to prevent information leaks. # Always reply in private to prevent information leaks.
irc.reply(s, private=True) irc.reply(s, private=True)
results += 1 results += 1
else: else:
if results: if results:
irc.reply("\x02%s\x02 out of \x02%s\x02 results shown." % irc.reply("\x02%s\x02 out of \x02%s\x02 results shown." %