X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/c0eee1b4d5047e32c615f7e02e05e2233a1b92af..b9c6eb1d457efe531333ab32818ca5de2bc696e3:/erebus.py

diff --git a/erebus.py b/erebus.py
index c1ac5d0..34a4ef1 100644
--- a/erebus.py
+++ b/erebus.py
@@ -3,8 +3,6 @@
 # Erebus IRC bot - Author: John Runyon
 # main startup code
 
-#TODO: tons
-
 import os, sys, select, MySQLdb, MySQLdb.cursors, time, random
 import bot, config, ctlmod
 
@@ -28,6 +26,9 @@ class Erebus(object):
 
 			self.chans = []
 
+		def msg(self, *args, **kwargs):
+			main.randbot.msg(self, *args, **kwargs)
+
 		def isauthed(self):
 			return self.auth is not None
 
@@ -58,6 +59,8 @@ class Erebus(object):
 		def quit(self):
 			for chan in self.chans:
 				self.chans.remove(chan)
+		def nickchange(self, newnick):
+			self.nick = newnick
 
 		def __str__(self): return self.nick
 		def __repr__(self): return "<User %r (%d)>" % (self.nick,self.glevel)
@@ -80,6 +83,9 @@ class Erebus(object):
 					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
@@ -130,9 +136,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):
@@ -229,11 +235,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 "%05.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 "%05.3f [SQL] [!] MySQL error! %r" % (time.time() % 100000, e)
 			dbsetup()
 			return False
 		return True
@@ -251,16 +257,15 @@ def setup():
 
 	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()
 	c = main.db.cursor()
-	if c.execute("SELECT nick, user, bind FROM bots WHERE active = 1"):
+	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'], cfg.host, cfg.port, cfg.realname)
+			main.newbot(row['nick'], row['user'], row['bind'], row['authname'], row['authpass'], cfg.host, cfg.port, cfg.realname)
 	main.connectall()
 
 def loop():