Fixed header

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index 94a12abfe67d63d33b814d6cf09ccc13dd78106b..44181f4f293bb8b4f8037a45e96eee5ce03ae40f 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -15,23 +15,12 @@ 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()
+               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):
@@ -88,10 +77,10 @@ class Bot(object):
                        
        def parsemsg(self, user, target, msg):
                chan = None
-               try:
-                       triggerused = msg[0] == self.parent.trigger
-               except IndexError: # Fix if you feel like it /BiohZn
-                       triggerused = False
+               if len(msg) == 0:
+                       return
+
+               triggerused = msg[0] == self.parent.trigger
                if triggerused: msg = msg[1:]
                pieces = msg.split()
 
@@ -100,7 +89,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?
@@ -120,15 +110,12 @@ 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.")
+                       self.msg(user, "No such command.")
 
        def msg(self, target, msg):
                if isinstance(target, self.parent.User): self.conn.send("NOTICE %s :%s" % (target.nick, msg))
@@ -180,7 +167,7 @@ class BotConnection(object):
 
        #TODO: rewrite send() to queue
        def send(self, line):
-               print self.parent.nick, '[O]', line
+               print self.parent.nick, '[O]', str(line)
                self.write(line)
 
        def write(self, line):