X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/e80bf7dea4805958e3f3aee02d6a82afea645176..dcb94ddca201b098020742aa70b79d14d183b854:/erebus.py?ds=sidebyside

diff --git a/erebus.py b/erebus.py
index ef45b79..b237347 100644
--- a/erebus.py
+++ b/erebus.py
@@ -59,7 +59,7 @@ class Erebus(object):
 		def quit(self):
 			for chan in self.chans:
 				self.chans.remove(chan)
-		def nick(self, newnick):
+		def nickchange(self, newnick):
 			self.nick = newnick
 
 		def __str__(self): return self.nick
@@ -153,7 +153,7 @@ class Erebus(object):
 	def fd(self, fileno): #get Bot() by fd/fileno
 		return self.fds[fileno]
 	def randbot(self): #get Bot() randomly
-		return random.choice(self.bots)
+		return self.bots[random.choice(self.bots.keys())]
 
 	def user(self, _nick, justjoined=False):
 		nick = _nick.lower()
@@ -257,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()