Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-12-24 19:52:54 +01:00
Code Issues Projects Releases Wiki Activity

Hopefully got the prefix thing right.

Browse Source
This commit is contained in:
Jeremy Fincher 2003-08-29 08:09:09 +00:00
parent feff6f77ce
commit b29da50397
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/irclib.py
View File

@ -456,19 +456,16 @@ class Irc(object):
self.nick = msg.args[0] self.nick = msg.args[0]
(nick, user, domain) = ircutils.splitHostmask(msg.prefix) (nick, user, domain) = ircutils.splitHostmask(msg.prefix)
self.prefix = '%s!%s@%s' % (self.nick, user, domain) self.prefix = '%s!%s@%s' % (self.nick, user, domain)
elif msg.command in self._nickSetters:
#debug.printf('msg.command in self._nickSetters')
newnick = msg.args[0]
if self.nick != newnick:
debug.printf('Hmm...self.nick != newnick. Odd.')
self.nick = newnick
# Respond to PING requests. # Respond to PING requests.
elif msg.command == 'PING': if msg.command == 'PING':
self.sendMsg(ircmsgs.pong(msg.args[0])) self.sendMsg(ircmsgs.pong(msg.args[0]))
if msg.command == 'PONG':
self.outstandingPing = False
# Send new nicks on 433 # Send new nicks on 433
elif msg.command == '433' or msg.command == '432': if msg.command == '433' or msg.command == '432':
self.sendMsg(ircmsgs.nick(self._nickmods.pop(0) % self.nick)) self.sendMsg(ircmsgs.nick(self._nickmods.pop(0) % self.nick))
if msg.nick == self.nick: if msg.nick == self.nick:
self.prefix = msg.prefix
if ircdb.users.hasUser(self.nick): if ircdb.users.hasUser(self.nick):
u = ircdb.users.getUser(self.nick) u = ircdb.users.getUser(self.nick)
if not u.hasHostmask(msg.prefix): if not u.hasHostmask(msg.prefix):
@ -479,17 +476,18 @@ class Irc(object):
hostmasks=[msg.prefix]) hostmasks=[msg.prefix])
ircdb.users.setUser(self.nick, u) ircdb.users.setUser(self.nick, u)
atexit.register(lambda: catch(ircdb.users.delUser(self.nick))) atexit.register(lambda: catch(ircdb.users.delUser(self.nick)))
elif msg.command == 'PONG': if msg.command == 'ERROR':
self.outstandingPing = False
elif msg.command == 'ERROR':
if msg.args[0].startswith('Closing Link'): if msg.args[0].startswith('Closing Link'):
if hasattr(self.driver, 'scheduleReconnect'): if hasattr(self.driver, 'scheduleReconnect'):
self.driver.scheduleReconnect() self.driver.scheduleReconnect()
if self.driver: if self.driver:
self.driver.die() self.driver.die()
elif msg.command == 'PRIVMSG': if msg.command in self._nickSetters:
if msg.nick == self.nick: #debug.printf('msg.command in self._nickSetters')
self.prefix = msg.prefix newnick = msg.args[0]
if self.nick != newnick:
debug.printf('Hmm...self.nick != newnick. Odd.')
self.nick = newnick
# Now update the IrcState object. # Now update the IrcState object.
try: try:
self.state.addMsg(self, msg) self.state.addMsg(self, msg)