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

relay_cb: fix UnboundLocalError when kicking a service bot

Browse Source
This commit is contained in:
James Lu 2016-09-24 12:19:56 -07:00
parent b9d8ec5039
commit 7d20b70d33
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/relay_clientbot.py
View File

@ -93,7 +93,7 @@ def cb_relay_core(irc, source, command, args):
# HACK: service bots are global and lack the relay state we look for. # HACK: service bots are global and lack the relay state we look for.
# just pretend the message comes from the current network. # just pretend the message comes from the current network.
log.debug('(%s) relay_cb_core: Overriding network origin to local (source=%s)', irc.name, source) log.debug('(%s) relay_cb_core: Overriding network origin to local (source=%s)', irc.name, source)
netname = irc.name sourcenet = irc.name
else: else:
# Get the original client that the relay client source was meant for. # Get the original client that the relay client source was meant for.
log.debug('(%s) relay_cb_core: Trying to find original sender (user) for %s', irc.name, source) log.debug('(%s) relay_cb_core: Trying to find original sender (user) for %s', irc.name, source)
@ -107,12 +107,12 @@ def cb_relay_core(irc, source, command, args):
return return
log.debug('(%s) relay_cb_core: Original sender found as %s', irc.name, origuser) log.debug('(%s) relay_cb_core: Original sender found as %s', irc.name, origuser)
netname = origuser[0] sourcenet = origuser[0]
try: # Try to get the full network name try: # Try to get the full network name
netname = conf.conf['servers'][netname]['netname'] netname = conf.conf['servers'][sourcenet]['netname']
except KeyError: except KeyError:
pass netname = sourcenet
# Figure out where the message is destined to. # Figure out where the message is destined to.
target = args.get('channel') or args.get('target') target = args.get('channel') or args.get('target')
@ -151,7 +151,7 @@ def cb_relay_core(irc, source, command, args):
if 'channel' in args: if 'channel' in args:
# Display the real channel instead of the local name, if applicable # Display the real channel instead of the local name, if applicable
args['local_channel'] = args['channel'] args['local_channel'] = args['channel']
args['channel'] = relay.getRemoteChan(irc, world.networkobjects[origuser[0]], args['channel']) args['channel'] = relay.getRemoteChan(irc, world.networkobjects[sourcenet], args['channel'])
log.debug('(%s) relay_clientbot: coersing $channel from %s to %s', irc.name, args['local_channel'], args['channel']) log.debug('(%s) relay_clientbot: coersing $channel from %s to %s', irc.name, args['local_channel'], args['channel'])
for target in targets: for target in targets: