add checking for sql errors

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index 2a4dd14e14c2cc5d0225d0d4e551baf0fbb55315..2c214c746a4b35729d14dab22b9c14bab13cb55a 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -1,5 +1,4 @@
 #!/usr/bin/python
-# -*- coding: latin-1 -*-
 
 # Erebus IRC bot - Author: John Runyon
 # "Bot" and "BotConnection" classes (handling a specific "arm")
@@ -16,23 +15,11 @@ class Bot(object):
                self.user = user
                self.realname = realname
 
-               self.chans = []
-
-               chcurs = self.parent.db.cursor()
-               chcurs.execute("SELECT chname FROM chans WHERE bot = %s AND active = 1", (self.nick,))
-               chans = chcurs.fetchall()
-               chcurs.close()
-
-               for chrow in chans:
-                       uscurs = self.parent.db.cursor()
-                       uscurs.execute("SELECT user, level FROM chusers WHERE chan = %s", (chrow['chname'],))
-                       usrow = uscurs.fetchone()
-                       levels = {}
-                       while usrow is not None:
-                               levels[usrow['user']] = -usrow['level']
-                               usrow = uscurs.fetchone()
-                       uscurs.close()
-                       self.chans.append(self.parent.newchannel(self, chrow['chname'], levels))
+               curs = self.parent.db.cursor()
+               if curs.execute("SELECT chname FROM chans WHERE bot = %s AND active = 1", (self.nick,)):
+                       chansres = curs.fetchall()
+                       curs.close()
+                       self.chans = [self.parent.newchannel(self, row['chname']) for row in chansres]
 
                self.conn = BotConnection(self, bind, server, port)
        def connect(self):
@@ -73,8 +60,7 @@ class Bot(object):
                        qt = pieces[3]
                        nick = pieces[4]
                        auth = pieces[5]
-                       if auth != '0':
-                               self.parent.user(nick).authed(auth)
+                       self.parent.user(nick).authed(auth)
 
                elif pieces[1] == "JOIN":
                        nick = pieces[0].split('!')[0][1:]
@@ -101,7 +87,8 @@ class Bot(object):
                                chanword = pieces[1]
                                if chanword[0] == '#':
                                        chan = self.parent.channel(chanword)
-                                       pieces.pop(1)
+                                       if chan is not None: #if chan is still none, there's no bot on "chanword", and chanword is used as a parameter.
+                                               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?
@@ -121,17 +108,14 @@ class Bot(object):
                        for callback in self.parent.gethook(cmd):
                                if chan is None and callback.needchan:
                                        self.msg(user, "You need to specify a channel for that command.")
-                                       continue
-                               if user.glevel >= callback.reqglevel:
-                                       #TODO TODO TODO check reqclevel
+                               elif user.glevel >= callback.reqglevel and (not callback.needchan or chan.levelof(user.auth) >= callback.reqclevel):
                                        cbret = callback(self, user, chan, target, *pieces[1:])
                                        if cbret is NotImplemented:
                                                self.msg(user, "Command not implemented.")
-                                       continue
-               else:
-                       self.msg(user, "No such command, or you don't have access.")
 
        def msg(self, target, msg):
+               if target is None or msg is None: return
+
                if isinstance(target, self.parent.User): self.conn.send("NOTICE %s :%s" % (target.nick, msg))
                elif isinstance(target, self.parent.Channel): self.conn.send("PRIVMSG %s :%s" % (target.name, msg))
                elif isinstance(target, basestring):