]> jfr.im git - erebus.git/blobdiff - erebus.py
add msg(...) on Channel objects, passthru to Bot.msg()
[erebus.git] / erebus.py
index d0d41a713a6222b1f17d489ce6ef97750e4aa55d..2783bd5a32d4846cf64089203bb4122b8e623141 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -5,15 +5,18 @@
 
 #TODO: tons
 
-import os, sys, select, MySQLdb, MySQLdb.cursors
+import os, sys, select, MySQLdb, MySQLdb.cursors, time, random
 import bot, config, ctlmod
 
 class Erebus(object):
+       APIVERSION = 1
+       RELEASE = 0
+
        bots = {}
        fds = {}
-       mods = {}
        numhandlers = {}
        msghandlers = {}
+       chanhandlers = {}
        users = {}
        chans = {}
 
@@ -38,10 +41,12 @@ class Erebus(object):
                                self.glevel = -1
                        else:
                                c = main.db.cursor()
-                               c.execute("SELECT level FROM users WHERE auth = %s", (self.auth,))
-                               row = c.fetchone()
-                               if row is not None:
-                                       self.glevel = row['level']
+                               if c.execute("SELECT level FROM users WHERE auth = %s", (self.auth,)):
+                                       row = c.fetchone()
+                                       if row is not None:
+                                               self.glevel = row['level']
+                                       else:
+                                               self.glevel = 0
                                else:
                                        self.glevel = 0
                        return self.glevel
@@ -50,6 +55,9 @@ class Erebus(object):
                        self.chans.append(chan)
                def part(self, chan):
                        self.chans.remove(chan)
+               def quit(self):
+                       for chan in self.chans:
+                               self.chans.remove(chan)
 
                def __str__(self): return self.nick
                def __repr__(self): return "<User %r (%d)>" % (self.nick,self.glevel)
@@ -65,14 +73,19 @@ class Erebus(object):
                        self.ops = []
 
                        c = main.db.cursor()
-                       c.execute("SELECT user, level FROM chusers WHERE chan = %s", (self.name,))
-                       row = c.fetchone()
-                       while row is not None:
-                               self.levels[row['user']] = row['level']
+                       if c.execute("SELECT user, level FROM chusers WHERE chan = %s", (self.name,)):
                                row = c.fetchone()
+                               while row is not None:
+                                       self.levels[row['user']] = row['level']
+                                       row = c.fetchone()
 
 
+               def msg(self, *args, **kwargs):
+                       self.bot.msg(self.name, *args, **kwargs)
+
                def levelof(self, auth):
+                       if auth is None:
+                               return 0
                        auth = auth.lower()
                        if auth in self.levels:
                                return self.levels[auth]
@@ -83,8 +96,11 @@ class Erebus(object):
                        auth = auth.lower()
                        if savetodb:
                                c = main.db.cursor()
-                               c.execute("REPLACE INTO chusers (chan, user, level) VALUES (%s, %s, %s)", (self.name, auth, level))
-                       self.levels[auth] = level
+                               if c.execute("REPLACE INTO chusers (chan, user, level) VALUES (%s, %s, %s)", (self.name, auth, level)):
+                                       self.levels[auth] = level
+                                       return True
+                               else:
+                                       return False
 
                def userjoin(self, user, level=None):
                        if user not in self.users: self.users.append(user)
@@ -107,8 +123,9 @@ class Erebus(object):
                def __str__(self): return self.name
                def __repr__(self): return "<Channel %r>" % (self.name)
 
-       def __init__(self, trigger):
-               self.trigger = trigger
+       def __init__(self, cfg):
+               self.cfg = cfg
+               self.trigger = cfg.trigger
                if os.name == "posix":
                        self.potype = "poll"
                        self.po = select.poll()
@@ -116,9 +133,9 @@ class Erebus(object):
                        self.potype = "select"
                        self.fdlist = []
 
-       def newbot(self, nick, user, bind, server, port, realname):
+       def newbot(self, nick, user, bind, authname, authpass, server, port, realname):
                if bind is None: bind = ''
-               obj = bot.Bot(self, nick, user, bind, server, port, realname)
+               obj = bot.Bot(self, nick, user, bind, authname, authpass, server, port, realname)
                self.bots[nick.lower()] = obj
 
        def newfd(self, obj, fileno):
@@ -133,18 +150,18 @@ class Erebus(object):
        def fd(self, fileno): #get Bot() by fd/fileno
                return self.fds[fileno]
        def randbot(self): #get Bot() randomly
-               for b in self.bots.itervalues(): return b #TODO
+               return self.bots[random.choice(self.bots.keys())]
 
-       def user(self, nick, justjoined=False):
-               nick = nick.lower()
+       def user(self, _nick, justjoined=False):
+               nick = _nick.lower()
                if nick in self.users:
                        return self.users[nick]
                else:
-                       user = self.User(nick)
+                       user = self.User(_nick)
                        self.users[nick] = user
 
                        if justjoined:
-                               self.randbot().conn.send("WHO %s %%ant,2" % (nick))
+                               self.randbot().conn.send("WHO %s n%%ant,2" % (nick))
 
                        return user
        def channel(self, name): #get Channel() by name
@@ -169,6 +186,9 @@ class Erebus(object):
                        if bot.conn.state == 0:
                                bot.connect()
 
+       def module(self, name):
+               return ctlmod.modules[name]
+
        #bind functions
        def hook(self, word, handler):
                try:
@@ -196,6 +216,18 @@ class Erebus(object):
        def getnumhook(self, word):
                return self.numhandlers[word]
 
+       def hookchan(self, chan, handler):
+               try:
+                       self.chanhandlers[chan].append(handler)
+               except:
+                       self.chanhandlers[chan] = [handler]
+       def unhookchan(self, chan, handler):
+               if chan in self.chanhandlers and handler in self.chanhandlers[chan]:
+                       self.chanhandlers[chan].remove(handler)
+       def haschanhook(self, chan):
+               return chan in self.chanhandlers and len(self.chanhandlers[chan]) != 0
+       def getchanhook(self, chan):
+               return self.chanhandlers[chan]
 
 
 class MyCursor(MySQLdb.cursors.DictCursor):
@@ -205,23 +237,20 @@ class MyCursor(MySQLdb.cursors.DictCursor):
                        super(self.__class__, self).execute(*args, **kwargs)
                except MySQLdb.MySQLError as e:
                        print "[SQL] [!] MySQL error! %r" % (e)
-                       try:
-                               dbsetup()
-                               super(self.__class__, self).execute(*args, **kwargs)
-                       except MySQLdb.MySQLError as e:
-                               print "[SQL] [!!!] DOUBLE MySQL error! %r" % (e)
-                               print "* [!!!] Giving up."
-                               sys.exit()
+                       dbsetup()
+                       return False
+               return True
 
 
 def dbsetup():
+       main.db = None
        main.db = MySQLdb.connect(host=cfg.dbhost, user=cfg.dbuser, passwd=cfg.dbpass, db=cfg.dbname, cursorclass=MyCursor)
 
 def setup():
        global cfg, main
 
        cfg = config.Config('bot.config')
-       main = Erebus(cfg.trigger)
+       main = Erebus(cfg)
 
        autoloads = [mod for mod, yes in cfg.items('autoloads') if int(yes) == 1]
        for mod in autoloads:
@@ -230,11 +259,11 @@ def setup():
 
        dbsetup()
        c = main.db.cursor()
-       c.execute("SELECT nick, user, bind FROM bots WHERE active = 1")
-       rows = c.fetchall()
-       c.close()
-       for row in rows:
-               main.newbot(row['nick'], row['user'], row['bind'], cfg.host, cfg.port, cfg.realname)
+       if c.execute("SELECT nick, user, bind, authname, authpass FROM bots WHERE active = 1"):
+               rows = c.fetchall()
+               c.close()
+               for row in rows:
+                       main.newbot(row['nick'], row['user'], row['bind'], row['authname'], row['authpass'], cfg.host, cfg.port, cfg.realname)
        main.connectall()
 
 def loop():