GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-01 09:19:23 +01:00
Code Issues Projects Releases Wiki Activity

relay: Only spawn clients if they share a channel, and quit them when they leave all shared channels

Browse Source 
Closes #50.
This commit is contained in:
James Lu 2015-07-16 12:25:09 -07:00
parent 40fd9e37a0
commit cf32461d8e
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/relay.py
View File

@ -174,9 +174,9 @@ def initializeChannel(irc, channel):
if remotenet == irc.name: if remotenet == irc.name:
continue continue
remoteirc = utils.networkobjects[remotenet] remoteirc = utils.networkobjects[remotenet]
if not remoteirc.connected:
continue # They aren't connected, don't bother!
rc = remoteirc.channels[remotechan] rc = remoteirc.channels[remotechan]
if not (remoteirc.connected and findRemoteChan(remoteirc, irc, remotechan)):
continue # They aren't connected, don't bother!
for user in remoteirc.channels[remotechan].users: for user in remoteirc.channels[remotechan].users:
# Don't spawn our pseudoclients again. # Don't spawn our pseudoclients again.
if not utils.isInternalClient(remoteirc, user): if not utils.isInternalClient(remoteirc, user):
@ -237,10 +237,13 @@ utils.add_hook(handle_nick, 'NICK')
def handle_part(irc, numeric, command, args): def handle_part(irc, numeric, command, args):
channel = args['channel'] channel = args['channel']
text = args['text'] text = args['text']
for netname, user in relayusers[(irc.name, numeric)].items(): for netname, user in relayusers.copy()[(irc.name, numeric)].items():
remoteirc = utils.networkobjects[netname] remoteirc = utils.networkobjects[netname]
remotechan = findRemoteChan(irc, remoteirc, channel) remotechan = findRemoteChan(irc, remoteirc, channel)
remoteirc.proto.partClient(remoteirc, user, remotechan, text) remoteirc.proto.partClient(remoteirc, user, remotechan, text)
if not remoteirc.users[user].channels:
remoteirc.proto.quitClient(remoteirc, user, 'Left all shared channels.')
del relayusers[(irc.name, numeric)][remoteirc.name]
utils.add_hook(handle_part, 'PART') utils.add_hook(handle_part, 'PART')
def handle_privmsg(irc, numeric, command, args): def handle_privmsg(irc, numeric, command, args):
@ -466,9 +469,13 @@ def relayJoins(irc, channel, users, ts, modes):
if name == irc.name: if name == irc.name:
# Don't relay things to their source network... # Don't relay things to their source network...
continue continue
u = getRemoteUser(irc, remoteirc, user)
remotechan = findRemoteChan(irc, remoteirc, channel) remotechan = findRemoteChan(irc, remoteirc, channel)
if remotechan is None or u is None: if remotechan is None:
# If there is no link on our network for the user, don't
# bother spawning it.
continue
u = getRemoteUser(irc, remoteirc, user)
if u is None:
continue continue
ts = irc.channels[channel].ts ts = irc.channels[channel].ts
# TODO: join users in batches with SJOIN, not one by one. # TODO: join users in batches with SJOIN, not one by one.
@ -491,6 +498,9 @@ def relayPart(irc, channel, user):
if remotechan is None: if remotechan is None:
continue continue
remoteirc.proto.partClient(remoteirc, remoteuser, remotechan, 'Channel delinked.') remoteirc.proto.partClient(remoteirc, remoteuser, remotechan, 'Channel delinked.')
if not remoteirc.users[remoteuser].channels:
remoteirc.proto.quitClient(remoteirc, remoteuser, 'Left all shared channels.')
del relayusers[(irc.name, user)][remoteirc.name]
def removeChannel(irc, channel): def removeChannel(irc, channel):
if channel not in map(str.lower, irc.serverdata['channels']): if channel not in map(str.lower, irc.serverdata['channels']):