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: oops, multiple STATUSMSG prefixes should pick the lowest, not highest (#570)

Browse Source 
This behaviour really isn't consistent across IRCds though...
- Unreal, Hybrid, and charybdis mangle messages at the server side to use the lowest prefix
- InspIRCd throws a "No such nick/channel" error
- Nefarious silently drops messages with multiple prefixes?
This commit is contained in:
James Lu 2018-02-18 22:24:16 -08:00
parent 37be73d39c
commit 4a01948647
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/relay.py
View File

@ -1329,14 +1329,14 @@ def handle_part(irc, numeric, command, args):
utils.add_hook(handle_part, 'PART')
def _get_highest_prefix(prefixes):
def _get_lowest_prefix(prefixes):
if not prefixes:
return ''
for prefix in 'qyaohv':
for prefix in 'vhoayq':
if prefix in prefixes:
return prefix
else:
log.warning('relay._get_highest_prefix: unknown prefixes string %r', prefixes)
log.warning('relay._get_lowest_prefix: unknown prefixes string %r', prefixes)
return ''
def handle_messages(irc, numeric, command, args):
@ -1397,10 +1397,10 @@ def handle_messages(irc, numeric, command, args):
return
# This bit of filtering exists because some IRCds let you do /msg ~@#channel
# and such, despite its redundancy. (This is equivalent to ~#channel AFAIK)
highest_msgprefix = _get_highest_prefix(msgprefixes)
highest_msgprefix = remoteirc.prefixmodes.get(highest_msgprefix, '')
real_target = highest_msgprefix + real_target
# and such, despite its redundancy. (This is equivalent to @#channel AFAIK)
lowest_msgprefix = _get_lowest_prefix(msgprefixes)
lowest_msgprefix = remoteirc.prefixmodes.get(lowest_msgprefix, '')
real_target = lowest_msgprefix + real_target
user = get_remote_user(irc, remoteirc, numeric, spawn_if_missing=False)