trivia bugfix

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index fe9be344525fa60a2a7bbdd47f53eb382f3a7236..f043b96c699ab573b4a50d97446daf828554e63a 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -3,8 +3,6 @@
 # Erebus IRC bot - Author: John Runyon
 # "Bot" and "BotConnection" classes (handling a specific "arm")
 
-#TODO: error checking
-
 import socket, sys
 
 #bots = {'erebus': bot.Bot(nick='Erebus', user='erebus', bind='', server='irc.quakenet.org', port=6667, realname='Erebus')}
@@ -93,7 +91,15 @@ class Bot(object):
                                self.parent.user(nick).quit()
                                del self.parent.users[nick.lower()]
 
-               elif pieces[1] == "MODE": #TODO
+               elif pieces[1] == "NICK":
+                       oldnick = pieces[0].split('!')[0][1:]
+                       newnick = pieces[2][1:]
+                       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
 
        
@@ -120,7 +126,7 @@ class Bot(object):
                                                pieces.pop(1)
 
                else: # message was sent to a channel
-                       chan = self.parent.channel(target) #TODO check if bot's on channel --- in Erebus.channel() maybe?
+                       chan = self.parent.channel(target)
                        try:
                                if msg[0] == '*': # message may be addressed to bot by "*BOTNICK" trigger?
                                        if pieces[0][1:].lower() == self.nick.lower():
@@ -170,8 +176,6 @@ class Bot(object):
        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 = ''
@@ -181,6 +185,8 @@ class BotConnection(object):
                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))
@@ -200,17 +206,17 @@ class BotConnection(object):
        #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]