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

relay: use the new Irc.getFullNetworkName() where applicable

Browse Source
This commit is contained in:
James Lu 2017-02-18 13:33:35 -08:00
parent b3161d6d5d
commit 3c98ef172e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/relay.py
View File

@ -222,8 +222,7 @@ def spawn_relay_server(irc, remoteirc):
suffix = suffix.strip('.') suffix = suffix.strip('.')
sid = irc.proto.spawnServer('%s.%s' % (remoteirc.name, suffix), sid = irc.proto.spawnServer('%s.%s' % (remoteirc.name, suffix),
desc="PyLink Relay network - %s" % desc="PyLink Relay network - %s" %
(remoteirc.serverdata.get('netname')\ (remoteirc.getFullNetworkName()), endburst_delay=3)
or remoteirc.name), endburst_delay=3)
except (RuntimeError, ValueError): # Network not initialized yet, or a server name conflict. except (RuntimeError, ValueError): # Network not initialized yet, or a server name conflict.
log.exception('(%s) Failed to spawn server for %r (possible jupe?):', log.exception('(%s) Failed to spawn server for %r (possible jupe?):',
irc.name, remoteirc.name) irc.name, remoteirc.name)
@ -870,7 +869,7 @@ def handle_relay_whois(irc, source, command, args):
homenet, uid = origuser homenet, uid = origuser
realirc = world.networkobjects[homenet] realirc = world.networkobjects[homenet]
realuser = realirc.users[uid] realuser = realirc.users[uid]
netname = realirc.serverdata.get('netname', homenet) netname = realirc.getFullNetworkName()
wreply(320, ":is a remote user connected via PyLink Relay. Home network: %s; " wreply(320, ":is a remote user connected via PyLink Relay. Home network: %s; "
"Home nick: %s" % (netname, realuser.nick)) "Home nick: %s" % (netname, realuser.nick))