GitHub/PyLink
3
0
Fork 0
mirror of https://github.com/jlu5/PyLink.git synced 2025-02-25 18:00:39 +01:00
Code Issues Projects Releases Wiki Activity

pr/insp: fix some bugs in spawnClient

Browse Source
This commit is contained in:
James Lu 2015-07-07 17:46:56 -07:00
parent 7fb60c1ffa
commit a177a58ae7
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
protocols/inspircd.py
View File

@ -26,7 +26,7 @@ def _sendFromServer(irc, sid, msg):
def _sendFromUser(irc, numeric, msg): def _sendFromUser(irc, numeric, msg):
irc.send(':%s %s' % (numeric, msg)) irc.send(':%s %s' % (numeric, msg))
def spawnClient(irc, nick, ident='null', host='null', realhost=None, modes=[], def spawnClient(irc, nick, ident='null', host='null', realhost=None, modes=set(),
server=None, ip='0.0.0.0', realname=None): server=None, ip='0.0.0.0', realname=None):
server = server or irc.sid server = server or irc.sid
if not utils.isInternalServer(irc, server): if not utils.isInternalServer(irc, server):
@ -39,10 +39,7 @@ def spawnClient(irc, nick, ident='null', host='null', realhost=None, modes=[],
ts = int(time.time()) ts = int(time.time())
realname = realname or conf['bot']['realname'] realname = realname or conf['bot']['realname']
realhost = realhost or host realhost = realhost or host
if modes: raw_modes = utils.joinModes(modes)
raw_modes = utils.joinModes(modes)
else:
raw_modes = '+'
if not utils.isNick(nick): if not utils.isNick(nick):
raise ValueError('Invalid nickname %r.' % nick) raise ValueError('Invalid nickname %r.' % nick)
_sendFromServer(irc, server, "UID {uid} {ts} {nick} {realhost} {host} {ident} {ip}" _sendFromServer(irc, server, "UID {uid} {ts} {nick} {realhost} {host} {ident} {ip}"
@ -147,7 +144,7 @@ def connect(irc):
f(':%s BURST %s' % (irc.sid, ts)) f(':%s BURST %s' % (irc.sid, ts))
nick = conf['bot'].get('nick') or 'PyLink' nick = conf['bot'].get('nick') or 'PyLink'
ident = conf['bot'].get('ident') or 'pylink' ident = conf['bot'].get('ident') or 'pylink'
irc.pseudoclient = spawnClient(irc, nick, ident, host, modes={("+o", None)}) irc.pseudoclient = spawnClient(irc, nick, ident, host, modes={("o", None)})
f(':%s ENDBURST' % (irc.sid)) f(':%s ENDBURST' % (irc.sid))
for chan in irc.serverdata['channels']: for chan in irc.serverdata['channels']:
joinClient(irc, irc.pseudoclient.uid, chan) joinClient(irc, irc.pseudoclient.uid, chan)
@ -480,7 +477,7 @@ def handle_topic(irc, numeric, command, args):
channel = args[0].lower() channel = args[0].lower()
topic = args[1] topic = args[1]
ts = int(time.time()) ts = int(time.time())
setter = utils.nickToUid(irc, numeric) setter = irc.users[numeric].nick
irc.channels[channel].topic = topic irc.channels[channel].topic = topic
return {'channel': channel, 'setter': setter, 'ts': ts, 'topic': topic} return {'channel': channel, 'setter': setter, 'ts': ts, 'topic': topic}