elif pieces[1] == "PART":
nick = pieces[0].split('!')[0][1:]
chan = self.parent.channel(pieces[2])
-
+
if nick != self.nick:
self.parent.user(nick).part(chan)
chan.userpart(self.parent.user(nick))
elif pieces[1] == "NICK":
oldnick = pieces[0].split('!')[0][1:]
newnick = pieces[2][1:]
- self.parent.users[newnick.lower()] = self.parent.users[oldnick.lower()]
- del self.parent.users[oldnick.lower()]
- self.parent.user(newnick).nick(newnick)
+ if newnick.lower() != oldnick.lower():
+ self.parent.users[newnick.lower()] = self.parent.users[oldnick.lower()]
+ del self.parent.users[oldnick.lower()]
+ self.parent.users[newnick.lower()].nickchange(newnick)
elif pieces[1] == "MODE": #TODO parse for ops/voices (at least)
pass
-
+
def parsemsg(self, user, target, msg):
chan = None
if len(msg) == 0:
def __repr__(self): return "<Bot %r>" % (self.nick)
class BotConnection(object):
- state = 0 # 0=disconnected, 1=registering, 2=connected
-
def __init__(self, parent, bind, server, port):
self.parent = parent
self.buffer = ''
self.server = server
self.port = int(port)
+ self.state = 0 # 0=disconnected, 1=registering, 2=connected
+
def connect(self):
self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.socket.bind((self.bind, 0))
#TODO: rewrite send() to queue
def send(self, line):
print self.parent.nick, '[O]', str(line)
- self.write(line)
+ self._write(line)
- def write(self, line):
+ def _write(self, line):
self.socket.sendall(line+"\r\n")
def read(self):
self.buffer += self.socket.recv(8192)
lines = []
- while '\r\n' in self.buffer:
- pieces = self.buffer.split('\r\n', 1)
+ while "\r\n" in self.buffer:
+ pieces = self.buffer.split("\r\n", 1)
print self.parent.nick, '[I]', pieces[0]
lines.append(pieces[0])
self.buffer = pieces[1]