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

relay: catch PRIVMSG/NOTICE sent from servers, and relay them via the PyLink client instead of erroring

Browse Source
This commit is contained in:
James Lu 2015-11-26 22:51:19 -08:00
parent a7f5068bd8
commit 3df0a24232
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/relay.py
View File

@ -707,6 +707,18 @@ def handle_messages(irc, numeric, command, args):
target = args['target'] target = args['target']
text = args['text'] text = args['text']
if utils.isInternalClient(irc, numeric) and utils.isInternalClient(irc, target): if utils.isInternalClient(irc, numeric) and utils.isInternalClient(irc, target):
# Drop attempted PMs between internal clients (this shouldn't happen,
# but whatever).
return
elif numeric in irc.servers:
# Sender is a server? This shouldn't be allowed, except for some truly
# special cases... We'll route these through the main PyLink client,
# tagging the message with the sender name.
text = '[from %s] %s' % (irc.servers[numeric].name, text)
numeric = irc.pseudoclient.uid
elif numeric not in irc.users:
# Sender didn't pass the check above, AND isn't a user.
log.debug('(%s) relay: Unknown message sender %s.', numeric)
return return
relay = getRelay((irc.name, target)) relay = getRelay((irc.name, target))
remoteusers = relayusers[(irc.name, numeric)] remoteusers = relayusers[(irc.name, numeric)]