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

Straightened out some IrcState inconsistencies.

Browse Source
This commit is contained in:
Jeremy Fincher 2003-03-31 09:23:32 +00:00
parent 2bb3189d54
commit c700f3c6e5
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/irclib.py
View File

@ -92,7 +92,7 @@ class IrcCallback(object):
class IrcMsgQueue(object): class IrcMsgQueue(object):
"""Class for a queue of IrcMsgs. Eventually, it should be smart. """Class for a queue of IrcMsgs. Eventually, it should be smart.
""" """
#__slots__ = ('msgs', 'queue') __slots__ = ('msgs', 'queue')
def __init__(self): def __init__(self):
self.reset() self.reset()
@ -125,7 +125,7 @@ class IrcMsgQueue(object):
# status of various modes (especially ops/halfops/voices) in channels, etc. # status of various modes (especially ops/halfops/voices) in channels, etc.
### ###
class Channel(object): class Channel(object):
#__slots__ = ('users', 'ops', 'halfops', 'voices') __slots__ = ('users', 'ops', 'halfops', 'voices', 'topic')
def __init__(self): def __init__(self):
self.topic = '' self.topic = ''
self.users = set() self.users = set()
@ -142,7 +142,7 @@ class Channel(object):
class IrcState(object): class IrcState(object):
"""Maintains state of the Irc connection. Should also become smarter. """Maintains state of the Irc connection. Should also become smarter.
""" """
#__slots__ = ('history', 'nicksToHostmasks', 'channels') __slots__ = ('history', 'nicksToHostmasks', 'channels')
def __init__(self): def __init__(self):
self.reset() self.reset()
@ -151,13 +151,6 @@ class IrcState(object):
self.nicksToHostmasks = {} self.nicksToHostmasks = {}
self.channels = {} self.channels = {}
# def __getstate__(self):
# return [getattr(self, s) for s in self.__slots__]
#
# def __setstate__(self, state):
# for (name, value) in zipiter(self.__slots__, state):
# setattr(name, value)
def copy(self): def copy(self):
ret = self.__class__() ret = self.__class__()
ret.history = copy.copy(self.history) ret.history = copy.copy(self.history)
@ -169,7 +162,7 @@ class IrcState(object):
if len(self.history) > conf.minHistory + 10: if len(self.history) > conf.minHistory + 10:
del self.history[:10] del self.history[:10]
self.history.append(msg) self.history.append(msg)
if ircutils.isUserHostmask(msg.prefix): if ircutils.isUserHostmask(msg.prefix) and not msg.command == 'NICK':
self.nicksToHostmasks[msg.nick] = msg.prefix self.nicksToHostmasks[msg.nick] = msg.prefix
if msg.command == '352': # Response to a WHO command. if msg.command == '352': # Response to a WHO command.
(nick, user, host) = (msg.args[2], msg.args[5], msg.args[3]) (nick, user, host) = (msg.args[2], msg.args[5], msg.args[3])
@ -226,9 +219,16 @@ class IrcState(object):
chan.topic = msg.args[2] chan.topic = msg.args[2]
elif msg.command == 'NICK': elif msg.command == 'NICK':
newNick = msg.args[0] newNick = msg.args[0]
try:
del self.nicksToHostmasks[msg.nick]
newHostmask = ircutils.joinHostmask(newNick,msg.user,msg.host)
self.nicksToHostmasks[newNick] = newHostmask
except KeyError:
debug.printf('%s not in nicksToHostmask' % msg.nick)
for channel in self.channels.itervalues(): for channel in self.channels.itervalues():
chan = self.channels[channel] for s in (channel.users, channel.ops,
for s in (chan.users, chan.ops, chan.halfops, chan.voices): channel.halfops, channel.voices):
#debug.printf(s)
if msg.nick in s: if msg.nick in s:
s.remove(msg.nick) s.remove(msg.nick)
s.add(newNick) s.add(newNick)