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

relay: fix joining users on initializeChannel

Browse Source
This commit is contained in:
James Lu 2015-07-13 21:46:05 -07:00
parent 235f169e54
commit c5298e3931
1 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
plugins/relay.py
View File

@ -70,6 +70,15 @@ def exportDB(scheduler):
with open(dbname, 'wb') as f: with open(dbname, 'wb') as f:
pickle.dump(db, f, protocol=4) pickle.dump(db, f, protocol=4)
def getPrefixModes(irc, remoteirc, channel, user):
modes = ''
for pmode in ('owner', 'admin', 'op', 'halfop', 'voice'):
if pmode not in remoteirc.cmodes: # Mode not supported by IRCd
continue
if user in irc.channels[channel].prefixmodes[pmode+'s']:
modes += remoteirc.cmodes[pmode]
return modes
def findRelay(chanpair): def findRelay(chanpair):
if chanpair in db: # This chanpair is a shared channel; others link to it if chanpair in db: # This chanpair is a shared channel; others link to it
return chanpair return chanpair
@ -90,20 +99,31 @@ def findRemoteChan(remotenetname, query):
return link[1] return link[1]
def initializeChannel(irc, channel): def initializeChannel(irc, channel):
# We're initializing a relay that already exists. This can be done at
# ENDBURST, or on the LINK command.
irc.proto.joinClient(irc, irc.pseudoclient.uid, channel) irc.proto.joinClient(irc, irc.pseudoclient.uid, channel)
c = irc.channels[channel] c = irc.channels[channel]
relay = findRelay((irc.name, channel)) relay = findRelay((irc.name, channel))
if relay is None: log.debug('(%s) initializeChannel being called on %s', irc.name, channel)
return log.debug('(%s) initializeChannel: relay pair found to be %s', irc.name, relay)
users = c.users.copy() if relay:
for link in db[relay]['links']: all_links = db[relay]['links'].copy()
try: all_links.update((relay,))
log.debug('(%s) initializeChannel: all_links: %s', irc.name, all_links)
for link in all_links:
remotenet, remotechan = link remotenet, remotechan = link
users.update(utils.networkobjects[remotechan].channels[remotechan].users) if remotenet == irc.name:
except KeyError: continue
pass remoteirc = utils.networkobjects[remotenet]
log.debug('(%s) relay users: %s', irc, users) rc = remoteirc.channels[remotechan]
relayJoins(irc, channel, users, c.ts, c.modes) for user in remoteirc.channels[remotechan].users:
if not utils.isInternalClient(remoteirc, user):
log.debug('(%s) initializeChannel: should be joining %s/%s to %s', irc.name, user, remotenet, channel)
remoteuser = relayusers[(remotenet, user)][irc.name]
irc.proto.joinClient(irc, remoteuser, channel)
log.debug('(%s) initializeChannel: relay users: %s', irc.name, c.users)
relayJoins(irc, channel, c.users, c.ts, c.modes)
def handle_join(irc, numeric, command, args): def handle_join(irc, numeric, command, args):
channel = args['channel'] channel = args['channel']
@ -146,7 +166,7 @@ def relayJoins(irc, channel, users, ts, modes):
for user in users: for user in users:
try: try:
if irc.users[user].remote: if irc.users[user].remote:
# Is the .remote atrribute set? If so, don't relay already # Is the .remote attribute set? If so, don't relay already
# relayed clients; that'll trigger an endless loop! # relayed clients; that'll trigger an endless loop!
continue continue
except AttributeError: # Nope, it isn't. except AttributeError: # Nope, it isn't.
@ -197,16 +217,11 @@ def relayJoins(irc, channel, users, ts, modes):
relayusers[(irc.name, userobj.uid)][remoteirc.name] = u relayusers[(irc.name, userobj.uid)][remoteirc.name] = u
remoteirc.users[u].remote = irc.name remoteirc.users[u].remote = irc.name
remotechan = findRemoteChan(remoteirc.name, (irc.name, channel)) remotechan = findRemoteChan(remoteirc.name, (irc.name, channel))
if remotechan is None:
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 = '' prefix = getPrefixModes(irc, remoteirc, channel, user)
for pmode in ('owner', 'admin', 'op', 'halfop', 'voice'):
if pmode not in remoteirc.cmodes: # Mode isn't supported by IRCd
continue
# If the user is in the respective list for the prefix
# mode (e.g. the op list)
if user in irc.channels[channel].prefixmodes[pmode+'s']:
prefix += remoteirc.cmodes[pmode]
remoteirc.proto.sjoinServer(remoteirc, sid, remotechan, [(prefix, u)], ts=ts) remoteirc.proto.sjoinServer(remoteirc, sid, remotechan, [(prefix, u)], ts=ts)
else: else:
remoteirc.proto.joinClient(remoteirc, u, remotechan) remoteirc.proto.joinClient(remoteirc, u, remotechan)