GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-05-06 06:37:22 +02:00
Code Issues Projects Releases Wiki Activity

relay: remove references to deprecated irc.proto

Browse Source
This commit is contained in:
James Lu 2018-05-09 22:44:17 -07:00
parent 3120fa5396
commit 64a98120bf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/relay.py
View File

@ -84,7 +84,7 @@ def die(irc=None):
# 1) SQUIT every relay subserver. # 1) SQUIT every relay subserver.
for server, sobj in ircobj.servers.copy().items(): for server, sobj in ircobj.servers.copy().items():
if hasattr(sobj, 'remote'): if hasattr(sobj, 'remote'):
ircobj.proto.squit(ircobj.sid, server, text="Relay plugin unloaded.") ircobj.squit(ircobj.sid, server, text="Relay plugin unloaded.")
# 2) Clear our internal servers and users caches. # 2) Clear our internal servers and users caches.
relayservers.clear() relayservers.clear()
@ -758,7 +758,7 @@ def relay_joins(irc, channel, users, ts, targetirc=None, **kwargs):
ts = irc.channels[channel].ts ts = irc.channels[channel].ts
prefixes = get_prefix_modes(irc, remoteirc, channel, user) prefixes = get_prefix_modes(irc, remoteirc, channel, user)
# proto.sjoin() takes its users as a list of (prefix mode characters, UID) pairs. # sjoin() takes its users as a list of (prefix mode characters, UID) pairs.
userpair = (prefixes, u) userpair = (prefixes, u)
queued_users.append(userpair) queued_users.append(userpair)
@ -1971,7 +1971,7 @@ def handle_disconnect(irc, numeric, command, args):
except KeyError: except KeyError:
return return
else: else:
remoteirc.proto.squit(remoteirc.sid, rsid, text='Relay network lost connection.') remoteirc.squit(remoteirc.sid, rsid, text='Relay network lost connection.')
if irc.name in relayservers[name]: if irc.name in relayservers[name]:
del relayservers[name][irc.name] del relayservers[name][irc.name]