X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/0af282c622f97b4e58def8da064a6548f37f8f55..c889fbb1f64a7eac7de813eb24326139c58c7b18:/erebus.py

diff --git a/erebus.py b/erebus.py
index 94e9c3a..b237347 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
@@ -251,8 +257,14 @@ 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)
+		print "Loading %s ... " % (mod),
+		modstatus = ctlmod.load(main, mod)
+		if not modstatus:
+			print str(modstatus)
+		elif modstatus == True:
+			print "OK"
+		else:
+			print modstatus
 
 	dbsetup()
 	c = main.db.cursor()