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

relay: fix variable confusion when managing service bots

Browse Source 
We should be checking for service bot presence locally, and applying changes on the *remote* network.
This commit is contained in:
James Lu 2018-05-09 21:32:02 -07:00
parent 0c19b3719e
commit f3c2149d7a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/relay.py
View File

@ -702,6 +702,9 @@ def relay_joins(irc, channel, users, ts, targetirc=None, **kwargs):
to that specific network. to that specific network.
""" """
log.debug('(%s) relay.relay_joins: called on %r with users %r, targetirc=%s', irc.name, channel,
['%s/%s' % (user, irc.get_friendly_name(user)) for user in users], targetirc)
if ts < 750000: if ts < 750000:
current_ts = int(time.time()) current_ts = int(time.time())
log.debug('(%s) relay: resetting too low TS value of %s on %s to %s', irc.name, ts, users, current_ts) log.debug('(%s) relay: resetting too low TS value of %s on %s to %s', irc.name, ts, users, current_ts)
@ -731,9 +734,9 @@ def relay_joins(irc, channel, users, ts, targetirc=None, **kwargs):
continue continue
# Join the service bot on the remote channel persistently. # Join the service bot on the remote channel persistently.
rsbot = remoteirc.get_service_bot(u) sbot = irc.get_service_bot(user)
if rsbot: if sbot:
rsbot.add_persistent_channel(irc, 'relay', channel, try_join=False) sbot.add_persistent_channel(remoteirc, 'relay', remotechan, try_join=False)
if (remotechan not in remoteirc.channels) or u not in remoteirc.channels[remotechan].users: if (remotechan not in remoteirc.channels) or u not in remoteirc.channels[remotechan].users:
# Note: only join users if they aren't already joined. This prevents op floods # Note: only join users if they aren't already joined. This prevents op floods
@ -828,10 +831,10 @@ def relay_part(irc, *args, **kwargs):
return return
# Remove any persistent channel entries from the remote end. # Remove any persistent channel entries from the remote end.
rsbot = remoteirc.get_service_bot(remoteuser) sbot = irc.get_service_bot(user)
if rsbot: if sbot:
try: try:
sbot.remove_persistent_channel(irc, 'relay', channel, try_part=False) sbot.remove_persistent_channel(remoteirc, 'relay', remotechan, try_part=False)
except KeyError: except KeyError:
pass pass