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

clientbot: implement preliminary message tags parsing

Browse Source 
Untested so far...
This commit is contained in:
James Lu 2016-12-16 22:27:41 -08:00
parent 7e37a90c80
commit cbc7f438d2
2 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes.py
View File

@ -1409,7 +1409,8 @@ class Protocol():
'uplink': uplink, 'nicks': affected_nicks, 'serverdata': serverdata, 'uplink': uplink, 'nicks': affected_nicks, 'serverdata': serverdata,
'channeldata': old_channels} 'channeldata': old_channels}
def parseCapabilities(self, args): @staticmethod
def parseCapabilities(args, fallback=''):
""" """
Parses a string of capabilities in the 005 / RPL_ISUPPORT format. Parses a string of capabilities in the 005 / RPL_ISUPPORT format.
""" """
@ -1424,7 +1425,7 @@ class Protocol():
key, value = cap.split('=', 1) key, value = cap.split('=', 1)
except ValueError: except ValueError:
key = cap key = cap
value = '' value = fallback
caps[key] = value caps[key] = value
return caps return caps

29
protocols/clientbot.py
View File

@ -332,9 +332,36 @@ class ClientbotWrapperProtocol(Protocol):
return idsource return idsource
@staticmethod
def parseMessageTags(data):
"""
Parses a message with IRC v3.2 message tags, as described at http://ircv3.net/specs/core/message-tags-3.2.html
"""
# Example query:
# @aaa=bbb;ccc;example.com/ddd=eee :nick!ident@host.com PRIVMSG me :Hello
if data[0].startswith('@'):
tagdata = data[0].lstrip('@').split(';')
for tag in tagdata:
tag = tag.replace(r'\s', ' ')
tag = tag.replace(r'\\', '\\')
tag = tag.replace(r'\r', '\r')
tag = tag.replace(r'\n', '\n')
tag = tag.replace(r'\:', ';')
results = self.parseCapabilities(tagdata, fallback=None)
log.debug('(%s) parsed message tags %s', self.irc.name, results)
return results
return {}
def handle_events(self, data): def handle_events(self, data):
"""Event handler for the RFC1459/2812 (clientbot) protocol.""" """Event handler for the RFC1459/2812 (clientbot) protocol."""
data = data.split(" ") data = data.split(" ")
tags = self.parseMessageTags(data)
if tags:
# If we have tags, split off the first argument.
data = data[1:]
try: try:
args = self.parsePrefixedArgs(data) args = self.parsePrefixedArgs(data)
sender = args[0] sender = args[0]
@ -348,7 +375,7 @@ class ClientbotWrapperProtocol(Protocol):
command = args[0] command = args[0]
args = args[1:] args = args[1:]
else: else:
# PyLink as a services framework expects UIDs and SIDs for everythiung. Since we connect # PyLink as a services framework expects UIDs and SIDs for everything. Since we connect
# as a bot here, there's no explicit user introduction, so we're going to generate # as a bot here, there's no explicit user introduction, so we're going to generate
# pseudo-uids and pseudo-sids as we see prefixes. # pseudo-uids and pseudo-sids as we see prefixes.
if '!' not in sender: if '!' not in sender: