handle nick-taken

[erebus.git] / erebus.py

diff --git a/erebus.py b/erebus.py
index c03c98053d0577093b2fe6da39cf34342baf9dd9..7588838494f5b314c85f5af9629991419a582aaa 100644 (file)
--- a/erebus.py
+++ b/erebus.py
@@ -27,7 +27,11 @@ class Erebus(object):
                        self.chans = []
 
                def msg(self, *args, **kwargs):
-                       main.randbot.msg(self, *args, **kwargs)
+                       main.randbot().msg(self, *args, **kwargs)
+               def slowmsg(self, *args, **kwargs):
+                       main.randbot().slowmsg(self, *args, **kwargs)
+               def fastmsg(self, *args, **kwargs):
+                       main.randbot().fastmsg(self, *args, **kwargs)
 
                def isauthed(self):
                        return self.auth is not None
@@ -53,13 +57,15 @@ class Erebus(object):
                        return self.glevel
 
                def join(self, chan):
-                       self.chans.append(chan)
+                       if chan not in self.chans: self.chans.append(chan)
                def part(self, chan):
-                       self.chans.remove(chan)
-               def quit(self):
-                       for chan in self.chans:
+                       try:
                                self.chans.remove(chan)
-               def nick(self, newnick):
+                       except: pass
+                       return len(self.chans) == 0
+               def quit(self):
+                       pass
+               def nickchange(self, newnick):
                        self.nick = newnick
 
                def __str__(self): return self.nick
@@ -84,7 +90,11 @@ class Erebus(object):
 
 
                def msg(self, *args, **kwargs):
-                       self.bot.msg(self.name, *args, **kwargs)
+                       self.bot.msg(self, *args, **kwargs)
+               def slowmsg(self, *args, **kwargs):
+                       self.bot.slowmsg(self, *args, **kwargs)
+               def fastmsg(self, *args, **kwargs):
+                       self.bot.fastmsg(self, *args, **kwargs)
 
                def levelof(self, auth):
                        if auth is None:
@@ -155,18 +165,20 @@ class Erebus(object):
        def randbot(self): #get Bot() randomly
                return self.bots[random.choice(self.bots.keys())]
 
-       def user(self, _nick, justjoined=False):
+       def user(self, _nick, justjoined=False, create=True):
                nick = _nick.lower()
                if nick in self.users:
                        return self.users[nick]
-               else:
+               elif create:
                        user = self.User(_nick)
                        self.users[nick] = user
 
                        if justjoined:
-                               self.randbot().conn.send("WHO %s n%%ant,2" % (nick))
+                               self.randbot().conn.send("WHO %s n%%ant,1" % (nick))
 
                        return user
+               else:
+                       return None
        def channel(self, name): #get Channel() by name
                if name.lower() in self.chans:
                        return self.chans[name.lower()]
@@ -235,11 +247,11 @@ class Erebus(object):
 
 class MyCursor(MySQLdb.cursors.DictCursor):
        def execute(self, *args, **kwargs):
-               print "[SQL] [#] MyCursor.execute(self, %s, %s)" % (', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in kwargs]))
+               print "%09.3f [SQL] [#] MyCursor.execute(self, %s, %s)" % (time.time() % 100000, ', '.join([repr(i) for i in args]), ', '.join([str(key)+"="+repr(kwargs[key]) for key in kwargs]))
                try:
                        super(self.__class__, self).execute(*args, **kwargs)
                except MySQLdb.MySQLError as e:
-                       print "[SQL] [!] MySQL error! %r" % (e)
+                       print "%09.3f [SQL] [!] MySQL error! %r" % (time.time() % 100000, e)
                        dbsetup()
                        return False
                return True
@@ -253,11 +265,15 @@ def setup():
        global cfg, main
 
        cfg = config.Config('bot.config')
+
+       pidfile = open(cfg.pidfile, 'w')
+       pidfile.write(str(os.getpid()))
+       pidfile.close()
+
        main = Erebus(cfg)
 
        autoloads = [mod for mod, yes in cfg.items('autoloads') if int(yes) == 1]
        for mod in autoloads:
-               print "Loading %s" % (mod)
                ctlmod.load(main, mod)
 
        dbsetup()
@@ -276,5 +292,9 @@ def loop():
                        main.fd(fileno).parse(line)
 
 if __name__ == '__main__':
+       try: os.rename('logfile', 'oldlogs/%s' % (time.time()))
+       except: pass
+       sys.stdout = open('logfile', 'w', 1)
+       sys.stderr = sys.stdout
        setup()
        while True: loop()