Added !MODLOAD, !MODUNLOAD, !MODRELOAD

[erebus.git] / bot.py

diff --git a/bot.py b/bot.py
index a57b0d439e4b69b67aa7d5223b0fe2d3668069cd..0f2c7e6e782541d35ed09c3438cb30fbb084c4fd 100644 (file)
--- a/bot.py
+++ b/bot.py
@@ -9,12 +9,29 @@ import socket, sys
 
 #bots = {'erebus': bot.Bot(nick='Erebus', user='erebus', bind='', server='irc.quakenet.org', port=6667, realname='Erebus')}
 class Bot(object):
-       def __init__(self, parent, nick, user, bind, server, port, realname, chans):
+       def __init__(self, parent, nick, user, bind, server, port, realname):
                self.parent = parent
                self.nick = nick
                self.user = user
                self.realname = realname
-               self.chans = chans
+
+               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))
 
                self.conn = BotConnection(self, bind, server, port)
        def connect(self):
@@ -22,26 +39,20 @@ class Bot(object):
                        self.parent.newfd(self, self.conn.socket.fileno())
 
        def getdata(self):
-               for line in self.conn.read():
-                       print self.nick, '[I]', line
-
-                       if not self.conn.registered():
-                               pieces = line.split()
-
-                               if pieces[0] == "PING":
-                                       self.conn.send("PONG %s" % (pieces[1]))
-
-                               elif pieces[1] == "001":
-                                       self.conn.registered(True)
-                                       for c in self.chans:
-                                               self.join(c)
+               return self.conn.read()
 
-                       else:
-                               self.parse(line)
        def parse(self, line):
                pieces = line.split()
 
-               if pieces[1] == "PRIVMSG":
+               if not self.conn.registered() and pieces[0] == "NOTICE":
+                               self.conn.register()
+
+               elif pieces[1] == "001":
+                       self.conn.registered(True)
+                       for c in self.chans:
+                               self.join(c.name)
+
+               elif pieces[1] == "PRIVMSG":
                        nick = pieces[0].split('!')[0][1:]
                        user = self.parent.user(nick)
                        target = pieces[2]
@@ -60,13 +71,14 @@ class Bot(object):
 
                elif pieces[1] == "JOIN":
                        nick = pieces[0].split('!')[0][1:]
-                       user = self.parent.user(nick)
                        chan = self.parent.channel(pieces[2])
 
                        if nick == self.nick:
                                self.conn.send("WHO %s %%ant,1" % (chan))
                        else:
-                               pass #TODO TODO TODO add to common chans!
+                               user = self.parent.user(nick, justjoined=True)
+                               chan.userjoin(user)
+                               user.join(chan)
                        
        def parsemsg(self, user, target, msg):
                chan = None
@@ -75,10 +87,11 @@ class Bot(object):
                pieces = msg.split()
 
                if target == self.nick:
-                       chanword = pieces[1]
-                       if chanword[0] == '#':
-                               chan = self.parent.channel(chanword)
-                               pieces.pop(1)
+                       if len(pieces) > 1:
+                               chanword = pieces[1]
+                               if chanword[0] == '#':
+                                       chan = self.parent.channel(chanword)
+                                       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?
@@ -91,15 +104,16 @@ class Bot(object):
 
                cmd = pieces[0].lower()
 
-               print "%r %r %r %r" % (cmd, user, target, msg)
-
                if self.parent.hashook(cmd):
                        callback = self.parent.gethook(cmd)
                        if chan is None and callback.needchan:
                                self.msg(user, "You need to specify a channel for that command.")
                                return
-                       if user.glevel >= callback.reqglevel: #TODO TODO TODO check reqclevel
-                               callback(self, user, chan, *pieces[1:])
+                       if user.glevel >= callback.reqglevel:
+                               #TODO TODO TODO check reqclevel
+                               cbret = callback(self, user, chan, target, *pieces[1:])
+                               if cbret is NotImplemented:
+                                       self.msg(user, "Command not implemented.")
                                return
 
                self.msg(user, "No such command, or you don't have access.")
@@ -140,9 +154,12 @@ class BotConnection(object):
                self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
                self.socket.bind((self.bind, 0))
                self.socket.connect((self.server, self.port))
-               self.send("NICK %s" % (self.parent.nick))
-               self.send("USER %s 0 * :%s" % (self.parent.user, self.parent.realname))
-               self.state = 1
+               return True
+       def register(self):
+               if self.state == 0:
+                       self.send("NICK %s" % (self.parent.nick))
+                       self.send("USER %s 0 * :%s" % (self.parent.user, self.parent.realname))
+                       self.state = 1
                return True
 
        def registered(self, done=False):
@@ -163,6 +180,7 @@ class BotConnection(object):
 
                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]