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

clientbot: send CAP LS before NICK/USER so that it consistently gets a response before connect

Browse Source 
Previously, SASL was failing on networks like freenode, as the connection completed before a CAP response was received.

(cherry picked from commit 9420f21680)
This commit is contained in:
James Lu 2017-03-03 15:39:28 -08:00
parent df4acbf5d5
commit b14ea4f051
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
protocols/clientbot.py
View File

@ -73,6 +73,8 @@ class ClientbotWrapperProtocol(Protocol):
if sendpass: if sendpass:
f('PASS %s' % sendpass) f('PASS %s' % sendpass)
f('CAP LS 302')
# This is a really gross hack to get the defined NICK/IDENT/HOST/GECOS. # This is a really gross hack to get the defined NICK/IDENT/HOST/GECOS.
# But this connection stuff is done before any of the spawnClient stuff in # But this connection stuff is done before any of the spawnClient stuff in
# services_support fires. # services_support fires.
@ -82,8 +84,6 @@ class ClientbotWrapperProtocol(Protocol):
f('USER %s 8 * :%s' % (ident, # TODO: per net realnames or hostnames aren't implemented yet. f('USER %s 8 * :%s' % (ident, # TODO: per net realnames or hostnames aren't implemented yet.
conf.conf["bot"].get("realname", "PyLink Clientbot"))) conf.conf["bot"].get("realname", "PyLink Clientbot")))
f('CAP LS 302')
# Note: clientbot clients are initialized with umode +i by default # Note: clientbot clients are initialized with umode +i by default
def spawnClient(self, nick, ident='unknown', host='unknown.host', realhost=None, modes={('i', None)}, def spawnClient(self, nick, ident='unknown', host='unknown.host', realhost=None, modes={('i', None)},
server=None, ip='0.0.0.0', realname='', ts=None, opertype=None, server=None, ip='0.0.0.0', realname='', ts=None, opertype=None,