GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-01-23 18:54:05 +01:00
Code Issues Projects Releases Wiki Activity

relay: work on sane fallbacks when a network's SID goes missing (#354)

Browse Source
This commit is contained in:
James Lu 2016-11-07 21:47:53 -08:00
parent b79e693808
commit 4246a3d113
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/relay.py
View File

@ -354,6 +354,10 @@ def spawnRelayUser(irc, remoteirc, user, times_tagged=0):
modes.add((hideoper_mode, None))
rsid = getRemoteSid(remoteirc, irc)
if not rsid:
log.error('(%s) spawnRelayUser: aborting user spawn for %s/%s @ %s (failed to retrieve a '
'working SID).', irc, user, nick, remoteirc.name)
return
try:
showRealIP = conf.conf['relay']['show_ips'] and not \
irc.serverdata.get('relay_no_ips') and not \
@ -696,7 +700,9 @@ def relayJoins(irc, channel, users, ts, burst=True):
# to be set on the joining user.
if burst or len(queued_users) > 1 or queued_users[0][0]:
modes = getSupportedCmodes(irc, remoteirc, channel, irc.channels[channel].modes)
remoteirc.proto.sjoin(getRemoteSid(remoteirc, irc), remotechan, queued_users, ts=ts, modes=modes)
rsid = getRemoteSid(remoteirc, irc)
if rsid:
remoteirc.proto.sjoin(rsid, remotechan, queued_users, ts=ts, modes=modes)
else:
# A regular JOIN only needs the user and the channel. TS, source SID, etc., can all be omitted.
remoteirc.proto.join(queued_users[0][1], remotechan)
@ -1263,6 +1269,7 @@ def handle_kick(irc, source, command, args):
text = "(%s/%s) %s" % (kname, irc.name, args['text'])
except AttributeError:
text = "(<unknown kicker>@%s) %s" % (irc.name, args['text'])
rsid = rsid or remoteirc.sid # Fall back to the main PyLink SID if getRemoteSid() fails
remoteirc.proto.kick(rsid, remotechan, real_target, text)
# If the target isn't on any channels, quit them.
@ -1328,6 +1335,7 @@ def handle_mode(irc, numeric, command, args):
remoteirc.proto.mode(u, remotechan, supported_modes)
else:
rsid = getRemoteSid(remoteirc, irc)
rsid = rsid or remoteirc.sid
remoteirc.proto.mode(rsid, remotechan, supported_modes)
else: # Mode change blocked by CLAIM.
reversed_modes = irc.reverseModes(target, modes, oldobj=oldchan)