3
0
mirror of https://github.com/jlu5/PyLink.git synced 2024-11-27 21:19:31 +01:00

hybrid: Reorder a little, send EOB right after sending SERVER

This commit is contained in:
Daniel Oaks 2016-03-30 11:38:03 +10:00
parent c4608fb891
commit c71010f1b0

View File

@ -98,6 +98,9 @@ class HybridProtocol(TS6BaseProtocol):
f('SERVER %s 0 :%s' % (self.irc.serverdata["hostname"], f('SERVER %s 0 :%s' % (self.irc.serverdata["hostname"],
self.irc.serverdata.get('serverdesc') or self.irc.botdata['serverdesc'])) self.irc.serverdata.get('serverdesc') or self.irc.botdata['serverdesc']))
# send endburst now
self.irc.send(':%s EOB' % (self.irc.sid,))
def spawnClient(self, nick, ident='null', host='null', realhost=None, modes=set(), def spawnClient(self, nick, ident='null', host='null', realhost=None, modes=set(),
server=None, ip='0.0.0.0', realname=None, ts=None, opertype=None, server=None, ip='0.0.0.0', realname=None, ts=None, opertype=None,
manipulatable=False): manipulatable=False):
@ -260,12 +263,6 @@ class HybridProtocol(TS6BaseProtocol):
self.irc.callHooks([uid, 'CLIENT_OPERED', {'text': 'IRC_Operator'}]) self.irc.callHooks([uid, 'CLIENT_OPERED', {'text': 'IRC_Operator'}])
return {'uid': uid, 'ts': ts, 'nick': nick, 'realname': realname, 'host': host, 'ident': ident, 'ip': ip} return {'uid': uid, 'ts': ts, 'nick': nick, 'realname': realname, 'host': host, 'ident': ident, 'ip': ip}
def handle_svstag(self, numeric, command, args):
tag = args[2]
if tag in ['313']:
return
raise Exception('COULD NOT PARSE SVSTAG: {} {} {}'.format(numeric, command, args))
def handle_join(self, numeric, command, args): def handle_join(self, numeric, command, args):
"""Handles incoming channel JOINs.""" """Handles incoming channel JOINs."""
# parameters: channelTS, channel, '+' (a plus sign) # parameters: channelTS, channel, '+' (a plus sign)
@ -352,10 +349,6 @@ class HybridProtocol(TS6BaseProtocol):
log.debug('(%s) Set self.irc.lastping.', self.irc.name) log.debug('(%s) Set self.irc.lastping.', self.irc.name)
self.irc.lastping = time.time() self.irc.lastping = time.time()
def handle_endburst(self, numeric, command, args):
self.irc.send(':%s EOB' % (self.irc.sid,))
pass
def handle_mode(self, numeric, command, args): def handle_mode(self, numeric, command, args):
# <- :0UYAAAAAD MODE 0UYAAAAAD :-i # <- :0UYAAAAAD MODE 0UYAAAAAD :-i
target = args[0] target = args[0]
@ -381,6 +374,15 @@ class HybridProtocol(TS6BaseProtocol):
return {'target': channel, 'modes': changedmodes, 'ts': ts, return {'target': channel, 'modes': changedmodes, 'ts': ts,
'oldchan': oldobj} 'oldchan': oldobj}
def handle_svstag(self, numeric, command, args):
tag = args[2]
if tag in ['313']:
return
raise Exception('COULD NOT PARSE SVSTAG: {} {} {}'.format(numeric, command, args))
def handle_endburst(self, numeric, command, args):
pass
# empty handlers # empty handlers
# TODO: there's a better way to do this # TODO: there's a better way to do this
def handle_globops(self, numeric, command, args): def handle_globops(self, numeric, command, args):