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

Merge branch 'master' into devel

Browse Source
This commit is contained in:
James Lu 2017-04-01 12:42:00 -07:00
commit 4daa94c014
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
protocols/ts6_common.py
View File

@ -144,9 +144,9 @@ class TS6BaseProtocol(IRCS2SProtocol):
reason = 'No reason given' reason = 'No reason given'
# Mangle kick targets for IRCds that require it. # Mangle kick targets for IRCds that require it.
target = self._expandPUID(target) real_target = self._expandPUID(target)
self._send(numeric, 'KICK %s %s :%s' % (channel, target, reason)) self._send(numeric, 'KICK %s %s :%s' % (channel, real_target, reason))
# We can pretend the target left by its own will; all we really care about # We can pretend the target left by its own will; all we really care about
# is that the target gets removed from the channel userlist, and calling # is that the target gets removed from the channel userlist, and calling
@ -382,6 +382,7 @@ class TS6BaseProtocol(IRCS2SProtocol):
except IndexError: except IndexError:
reason = '' reason = ''
log.debug('(%s) Removing kick target %s from %s', self.irc.name, kicked, channel)
self.handle_part(kicked, 'KICK', [channel, reason]) self.handle_part(kicked, 'KICK', [channel, reason])
return {'channel': channel, 'target': kicked, 'text': reason} return {'channel': channel, 'target': kicked, 'text': reason}

11
protocols/unreal.py
View File

@ -223,6 +223,13 @@ class UnrealProtocol(TS6BaseProtocol):
self.irc.applyModes(target, modes) self.irc.applyModes(target, modes)
if utils.isChannel(target): if utils.isChannel(target):
# Make sure we expand any PUIDs when sending outgoing modes...
for idx, mode in enumerate(modes):
if mode[0][-1] in self.irc.prefixmodes:
log.debug('(%s) mode: expanding PUID of mode %s', self.irc.name, str(mode))
modes[idx] = (mode[0], self._expandPUID(mode[1]))
# The MODE command is used for channel mode changes only # The MODE command is used for channel mode changes only
ts = ts or self.irc.channels[self.irc.toLower(target)].ts ts = ts or self.irc.channels[self.irc.toLower(target)].ts
@ -616,7 +623,9 @@ class UnrealProtocol(TS6BaseProtocol):
elif userpair.startswith("'"): elif userpair.startswith("'"):
changedmodes.add(('+I', userpair[1:])) changedmodes.add(('+I', userpair[1:]))
else: else:
r = re.search(r'([^\w]*)(.*)', userpair) # Note: don't be too zealous in matching here or we'll break with nicks
# like "[abcd]".
r = re.search(r'([~*@%+]*)(.*)', userpair)
user = r.group(2) user = r.group(2)
if not user: if not user: