3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-01 01:09:22 +01:00

Merge branch 'master' into devel

Conflicts:
	protocols/ts6_common.py
This commit is contained in:
James Lu 2016-08-01 18:07:34 -07:00
commit d5c5a34467
2 changed files with 2 additions and 2 deletions

View File

@ -198,7 +198,7 @@ class HybridProtocol(TS6Protocol):
def handle_tburst(self, numeric, command, args):
"""Handles incoming topic burst (TBURST) commands."""
# <- :0UY TBURST 1459308205 #testchan 1459309379 dan!~d@localhost :sdf
channel = args[1].lower()
channel = self.irc.toLower(args[1])
ts = args[2]
setter = args[3]
topic = args[-1]

View File

@ -841,7 +841,7 @@ class UnrealProtocol(TS6BaseProtocol):
"""Handles incoming INVITEs."""
# <- :GL INVITE PyLink-devel :#a
target = self._getUid(args[0])
channel = args[1].lower()
channel = self.irc.toLower(args[1])
# We don't actually need to process this; it's just something plugins/hooks can use
return {'target': target, 'channel': channel}