GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-01-24 11:14:07 +01:00
Code Issues Projects Releases Wiki Activity

relay: fix potential irc.channels KeyErrors in get_prefix_modes and handle_join

Browse Source
This commit is contained in:
James Lu 2017-09-02 21:35:03 -07:00
parent afd4558531
commit 0136ac9e41
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/relay.py
View File

@ -206,7 +206,7 @@ def get_prefix_modes(irc, remoteirc, channel, user, mlist=None):
""" """
modes = '' modes = ''
if user in irc.channels[channel].users: if channel in irc.channels and user in irc.channels[channel].users:
# Iterate over the the prefix modes for relay supported by the remote IRCd. # Iterate over the the prefix modes for relay supported by the remote IRCd.
# Note: reverse the order so prefix modes are bursted in their traditional order # Note: reverse the order so prefix modes are bursted in their traditional order
# (e.g. owner before op before halfop). TODO: SJOIN modes should probably be # (e.g. owner before op before halfop). TODO: SJOIN modes should probably be
@ -1072,7 +1072,7 @@ def handle_join(irc, numeric, command, args):
users = set(args['users']) users = set(args['users'])
claim_passed = check_claim(irc, channel, numeric) claim_passed = check_claim(irc, channel, numeric)
current_chandata = irc.channels[channel] current_chandata = irc.channels.get(channel)
chandata = args.get('channeldata') chandata = args.get('channeldata')
log.debug('(%s) relay.handle_join: claim for %s on %s: %s', irc.name, numeric, channel, claim_passed) log.debug('(%s) relay.handle_join: claim for %s on %s: %s', irc.name, numeric, channel, claim_passed)
log.debug('(%s) relay.handle_join: old channel data %s', irc.name, chandata) log.debug('(%s) relay.handle_join: old channel data %s', irc.name, chandata)
@ -1092,7 +1092,11 @@ def handle_join(irc, numeric, command, args):
except KeyError: except KeyError:
# User was never in channel. Treat their mode list as empty. # User was never in channel. Treat their mode list as empty.
oldmodes = set() oldmodes = set()
newmodes = set()
if current_chandata is not None:
newmodes = set(current_chandata.get_prefix_modes(user)) newmodes = set(current_chandata.get_prefix_modes(user))
modediff = newmodes - oldmodes modediff = newmodes - oldmodes
log.debug('(%s) relay.handle_join: mode diff for %s on %s: %s oldmodes=%s newmodes=%s', log.debug('(%s) relay.handle_join: mode diff for %s on %s: %s oldmodes=%s newmodes=%s',
irc.name, user, channel, modediff, oldmodes, newmodes) irc.name, user, channel, modediff, oldmodes, newmodes)