GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-12-17 23:52:49 +01:00
Code Issues Projects Releases Wiki Activity

automode: refactor to send only one MODE per channel (#275)

Browse Source
This commit is contained in:
James Lu 2016-07-12 21:53:15 -07:00
parent 80d7be8c7d
commit 76554dccd1
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
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): def match(irc, channel, uid=None):
""" """
Automode matcher engine. Automode matcher engine.
""" """
@ -216,17 +216,22 @@ def match(irc, channel, uid):
# Check every mask defined in the channel ACL. # Check every mask defined in the channel ACL.
outgoing_modes = [] outgoing_modes = []
for mask, modes in dbentry.items():
if irc.matchHost(mask, uid):
# User matched a mask. Filter the mode list given to only those that are valid
# prefix mode characters.
outgoing_modes += [('+'+mode, uid) for mode in modes if mode in irc.prefixmodes]
log.debug("(%s) automode: Filtered mode list of %s to %s (protocol:%s)",
irc.name, modes, outgoing_modes, irc.protoname)
# If the Automode bot is missing, send the mode through the PyLink server. # If a UID is given, match that. Otherwise, match all users in the given channel.
if modebot_uid not in irc.users: uids = [uid] if uid else irc.channels[channel].users
modebot_uid = irc.sid
for mask, modes in dbentry.items():
for uid in uids:
if irc.matchHost(mask, uid):
# User matched a mask. Filter the mode list given to only those that are valid
# prefix mode characters.
outgoing_modes += [('+'+mode, uid) for mode in modes if mode in irc.prefixmodes]
log.debug("(%s) automode: Filtered mode list of %s to %s (protocol:%s)",
irc.name, modes, outgoing_modes, irc.protoname)
# If the Automode bot is missing, send the mode through the PyLink server.
if modebot_uid not in irc.users:
modebot_uid = irc.sid
irc.proto.mode(modebot_uid, channel, outgoing_modes) irc.proto.mode(modebot_uid, channel, outgoing_modes)
@ -245,8 +250,7 @@ def syncacc(irc, source, args):
reply(irc, "Error: Invalid arguments given. Needs 1: channel.") reply(irc, "Error: Invalid arguments given. Needs 1: channel.")
return return
for user in irc.channels[channel].users: match(irc, channel)
match(irc, channel, user)
reply(irc, 'Done.') reply(irc, 'Done.')
@ -284,10 +288,8 @@ def handle_join(irc, source, command, args):
ACL. ACL.
""" """
channel = irc.toLower(args['channel']) channel = irc.toLower(args['channel'])
match(irc, channel, source)
# Iterate over all the joining UIDs:
for uid in args['users']:
match(irc, channel, uid)
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
utils.add_hook(handle_join, 'PYLINK_SERVICE_JOIN') # And the version for service bots utils.add_hook(handle_join, 'PYLINK_SERVICE_JOIN') # And the version for service bots