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

relay: sync modes on initializeChannel as well

Browse Source
This commit is contained in:
James Lu 2015-07-13 22:42:50 -07:00
parent c11dc769cf
commit 1cbcec1001
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/relay.py
View File

@ -111,6 +111,7 @@ def initializeChannel(irc, channel):
all_links.update((relay,)) all_links.update((relay,))
log.debug('(%s) initializeChannel: all_links: %s', irc.name, all_links) log.debug('(%s) initializeChannel: all_links: %s', irc.name, all_links)
for link in all_links: for link in all_links:
modes = []
remotenet, remotechan = link remotenet, remotechan = link
if remotenet == irc.name: if remotenet == irc.name:
continue continue
@ -121,6 +122,13 @@ def initializeChannel(irc, channel):
log.debug('(%s) initializeChannel: should be joining %s/%s to %s', irc.name, user, remotenet, channel) log.debug('(%s) initializeChannel: should be joining %s/%s to %s', irc.name, user, remotenet, channel)
remoteuser = relayusers[(remotenet, user)][irc.name] remoteuser = relayusers[(remotenet, user)][irc.name]
irc.proto.joinClient(irc, remoteuser, channel) irc.proto.joinClient(irc, remoteuser, channel)
for m in getPrefixModes(remoteirc, irc, remotechan, user):
mpair = ('+%s' % m, remoteuser)
modes.append(mpair)
if modes:
sid = relayservers[remotenet][irc.name]
irc.proto.modeServer(irc, sid, channel, modes, ts=rc.ts)
log.debug('(%s) initializeChannel: syncing modes %r', irc.name, modes)
log.debug('(%s) initializeChannel: relay users: %s', irc.name, c.users) log.debug('(%s) initializeChannel: relay users: %s', irc.name, c.users)
relayJoins(irc, channel, c.users, c.ts, c.modes) relayJoins(irc, channel, c.users, c.ts, c.modes)
@ -221,8 +229,8 @@ def relayJoins(irc, channel, users, ts, modes):
continue continue
if not remoteirc.servers[sid].has_bursted: if not remoteirc.servers[sid].has_bursted:
# TODO: join users in batches with SJOIN, not one by one. # TODO: join users in batches with SJOIN, not one by one.
prefix = getPrefixModes(irc, remoteirc, channel, user) prefixes = getPrefixModes(irc, remoteirc, channel, user)
remoteirc.proto.sjoinServer(remoteirc, sid, remotechan, [(prefix, u)], ts=ts) remoteirc.proto.sjoinServer(remoteirc, sid, remotechan, [(prefixes, u)], ts=ts)
else: else:
remoteirc.proto.joinClient(remoteirc, u, remotechan) remoteirc.proto.joinClient(remoteirc, u, remotechan)