GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-26 04:32:51 +01:00
Code Issues Projects Releases Wiki Activity

automode: fix join handler, make match() take multiple users instead of one

Browse Source
This commit is contained in:
James Lu 2016-07-12 21:57:25 -07:00
parent 76554dccd1
commit 6598d56400
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/automode.py
View File

@ -204,7 +204,7 @@ def save(irc, source, args):
reply(irc, 'Done.') reply(irc, 'Done.')
modebot.add_cmd(save) modebot.add_cmd(save)
def match(irc, channel, uid=None): def match(irc, channel, uids=None):
""" """
Automode matcher engine. Automode matcher engine.
""" """
@ -217,8 +217,8 @@ def match(irc, channel, uid=None):
# Check every mask defined in the channel ACL. # Check every mask defined in the channel ACL.
outgoing_modes = [] outgoing_modes = []
# If a UID is given, match that. Otherwise, match all users in the given channel. # If UIDs are given, match those. Otherwise, match all users in the given channel.
uids = [uid] if uid else irc.channels[channel].users uids = uids or irc.channels[channel].users
for mask, modes in dbentry.items(): for mask, modes in dbentry.items():
for uid in uids: for uid in uids:
@ -288,7 +288,7 @@ def handle_join(irc, source, command, args):
ACL. ACL.
""" """
channel = irc.toLower(args['channel']) channel = irc.toLower(args['channel'])
match(irc, channel, source) match(irc, channel, args['users'])
utils.add_hook(handle_join, 'JOIN') utils.add_hook(handle_join, 'JOIN')
utils.add_hook(handle_join, 'PYLINK_RELAY_JOIN') # Handle the relay version of join utils.add_hook(handle_join, 'PYLINK_RELAY_JOIN') # Handle the relay version of join
@ -299,7 +299,7 @@ def handle_services_login(irc, source, command, args):
Handles services login change, to trigger Automode matching.""" Handles services login change, to trigger Automode matching."""
for channel in irc.users[source].channels: for channel in irc.users[source].channels:
# Look at all the users' channels for any possible changes. # Look at all the users' channels for any possible changes.
match(irc, channel, source) match(irc, channel, [source])
utils.add_hook(handle_services_login, 'CLIENT_SERVICES_LOGIN') utils.add_hook(handle_services_login, 'CLIENT_SERVICES_LOGIN')
utils.add_hook(handle_services_login, 'PYLINK_RELAY_SERVICES_LOGIN') utils.add_hook(handle_services_login, 'PYLINK_RELAY_SERVICES_LOGIN')