mirror of
https://github.com/Mikaela/Limnoria.git
synced 2024-11-23 19:19:32 +01:00
Added support for PASS command on connect.
This commit is contained in:
parent
d625b56eae
commit
66236e1f34
@ -267,9 +267,10 @@ class Irc(object):
|
|||||||
_nickSetters = set(('001', '002', '003', '004', '250', '251', '252', '254',
|
_nickSetters = set(('001', '002', '003', '004', '250', '251', '252', '254',
|
||||||
'255', '265', '266', '372', '375', '376', '333', '353',
|
'255', '265', '266', '372', '375', '376', '333', '353',
|
||||||
'332', '366'))
|
'332', '366'))
|
||||||
def __init__(self, nick, user='', ident='', callbacks=None):
|
def __init__(self, nick, user='', ident='', password='', callbacks=None):
|
||||||
world.ircs.append(self)
|
world.ircs.append(self)
|
||||||
self.nick = nick
|
self.nick = nick
|
||||||
|
self.password = password
|
||||||
self.prefix = ''
|
self.prefix = ''
|
||||||
self.user = user or nick # Default to nick if user isn't provided.
|
self.user = user or nick # Default to nick if user isn't provided.
|
||||||
self.ident = ident or nick # Ditto.
|
self.ident = ident or nick # Ditto.
|
||||||
@ -277,25 +278,30 @@ class Irc(object):
|
|||||||
self.callbacks = []
|
self.callbacks = []
|
||||||
else:
|
else:
|
||||||
self.callbacks = callbacks
|
self.callbacks = callbacks
|
||||||
self._nickmods = copy.copy(conf.nickmods)
|
|
||||||
self.state = IrcState()
|
self.state = IrcState()
|
||||||
self.queue = IrcMsgQueue()
|
self.queue = IrcMsgQueue()
|
||||||
|
self._nickmods = copy.copy(conf.nickmods)
|
||||||
|
self.lastTake = 0
|
||||||
self.fastqueue = queue()
|
self.fastqueue = queue()
|
||||||
self.lastping = time.time()
|
self.lastping = time.time()
|
||||||
self.outstandingPongs = set()
|
self.outstandingPongs = set()
|
||||||
self.lastTake = 0
|
|
||||||
self.driver = None # The driver should set this later.
|
self.driver = None # The driver should set this later.
|
||||||
self.queue.enqueue(ircmsgs.user(self.user, self.ident))
|
if self.password:
|
||||||
|
self.queue.enqueue(ircmsgs.password(self.password))
|
||||||
self.queue.enqueue(ircmsgs.nick(self.nick))
|
self.queue.enqueue(ircmsgs.nick(self.nick))
|
||||||
|
self.queue.enqueue(ircmsgs.user(self.ident, self.user))
|
||||||
|
|
||||||
def reset(self):
|
def reset(self):
|
||||||
self._nickmods = copy.copy(conf.nickmods)
|
self._nickmods = copy.copy(conf.nickmods)
|
||||||
self.state.reset()
|
self.state.reset()
|
||||||
self.queue.reset()
|
self.queue.reset()
|
||||||
|
self.lastping = time.time()
|
||||||
self.outstandingPings = set()
|
self.outstandingPings = set()
|
||||||
self.fastqueue = queue()
|
self.fastqueue = queue()
|
||||||
self.queue.enqueue(ircmsgs.user(self.user, self.ident))
|
if self.password:
|
||||||
|
self.queue.enqueue(ircmsgs.password(self.password))
|
||||||
self.queue.enqueue(ircmsgs.nick(self.nick))
|
self.queue.enqueue(ircmsgs.nick(self.nick))
|
||||||
|
self.queue.enqueue(ircmsgs.user(self.ident, self.user))
|
||||||
for callback in self.callbacks:
|
for callback in self.callbacks:
|
||||||
callback.reset()
|
callback.reset()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user