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

p10: refactor message() to send @%+#channel messages correctly

Browse Source
This commit is contained in:
James Lu 2017-12-21 01:12:48 -08:00
parent 63f3cdaea8
commit 2cc1195ff9
1 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
protocols/p10.py
View File

@ -409,12 +409,44 @@ class P10Protocol(IRCS2SProtocol):
def knock(self, numeric, target, text): def knock(self, numeric, target, text):
raise NotImplementedError('KNOCK is not supported on P10.') raise NotImplementedError('KNOCK is not supported on P10.')
def message(self, numeric, target, text): def message(self, source, target, text, _notice=False):
"""Sends a PRIVMSG from a PyLink client.""" """Sends a PRIVMSG from a PyLink client or server."""
if not self.is_internal_client(numeric): if (not self.is_internal_client(source)) and \
raise LookupError('No such PyLink client exists.') (not self.is_internal_server(source)):
raise LookupError('No such PyLink client/server exists.')
self._send_with_prefix(numeric, 'P %s :%s' % (target, text)) token = 'O' if _notice else 'P'
stripped_target = target.lstrip(''.join(self.prefixmodes.values()))
if self.is_channel(stripped_target):
msgprefixes = target.split('#', 1)[0]
# Note: Only NOTICEs to @#channel are actually supported by P10 via
# WALLCHOPS/WALLHOPS/WALLVOICES. For us it's better to convert
# PRIVMSGs to these notices instead of dropping them.
# WALL* commands use this syntax:
# <- ABAAA WC #magichouse :@ test
# <- ABAAA WH #magichouse :% test
# <- ABAAA WV #magichouse :+ test
# An oddity with the protocol mandates that we send the target prefix
# in the message. As a side effect, the @/%/+ is actually added to the
# final text the client sees.
# This does however make parsing slightly easier.
if '@' in msgprefixes:
token = 'WC'
text = '@ ' + text
elif '%' in msgprefixes:
token = 'WH'
text = '% ' + text
elif '+' in msgprefixes:
token = 'WV'
text = '+ ' + text
target = stripped_target
self._send_with_prefix(source, '%s %s :%s' % (token, target, text))
def notice(self, source, target, text):
"""Sends a NOTICE from a PyLink client or server."""
self.message(source, target, text, _notice=True)
def mode(self, numeric, target, modes, ts=None): def mode(self, numeric, target, modes, ts=None):
"""Sends mode changes from a PyLink client/server.""" """Sends mode changes from a PyLink client/server."""
@ -481,14 +513,6 @@ class P10Protocol(IRCS2SProtocol):
# <- AB 311 AyAAA GL ~gl nefarious.midnight.vpn * :realname # <- AB 311 AyAAA GL ~gl nefarious.midnight.vpn * :realname
self._send_with_prefix(source, '%s %s %s' % (numeric, target, text)) self._send_with_prefix(source, '%s %s %s' % (numeric, target, text))
def notice(self, numeric, target, text):
"""Sends a NOTICE from a PyLink client or server."""
if (not self.is_internal_client(numeric)) and \
(not self.is_internal_server(numeric)):
raise LookupError('No such PyLink client/server exists.')
self._send_with_prefix(numeric, 'O %s :%s' % (target, text))
def part(self, client, channel, reason=None): def part(self, client, channel, reason=None):
"""Sends a part from a PyLink client.""" """Sends a part from a PyLink client."""