X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/363febf1fa2ed7eed3970d52af6844f294441aee..2564f20844e0fdd2354f0cb94599eddc93d6e41a:/modules/control.py

diff --git a/modules/control.py b/modules/control.py
index c4caaf3..5afae81 100644
--- a/modules/control.py
+++ b/modules/control.py
@@ -1,4 +1,5 @@
 # Erebus IRC bot - Author: Erebus Team
+# vim: fileencoding=utf-8
 # Various highly recommended "control" commands.
 # This file is released into the public domain; see http://unlicense.org/
 
@@ -6,7 +7,7 @@
 modinfo = {
 	'author': 'Erebus Team',
 	'license': 'public domain',
-	'compatible': [1,2],
+	'compatible': [0],
 	'depends': [],
 	'softdeps': ['help'],
 }
@@ -26,10 +27,9 @@ from collections import deque
 @lib.hook(('die','restart'), needchan=False, glevel=lib.MANAGER)
 @lib.help(None, "stops the bot")
 def die(bot, user, chan, realtarget, *args):
-	for botitem in bot.parent.bots.itervalues():
-		for chan in botitem.chans:
-			chan.fastmsg("Bot is restarting! %s" % ' '.join(args))
-		bot.conn.send("QUIT :Restarting.")
+	quitmsg = ' '.join(args)
+	for botitem in bot.parent.bots.values():
+		bot.conn.send("QUIT :Restarting. %s" % (quitmsg))
 	sys.exit(0)
 	os._exit(0)
 
@@ -47,10 +47,14 @@ def modload(bot, user, chan, realtarget, *args):
 @lib.help("<mod> [FORCE]", "unloads a module", "will refuse to unload a module which is depended on by others", "unless you specify FORCE.")
 @lib.argsGE(1)
 def modunload(bot, user, chan, realtarget, *args):
+	if not ctlmod.isloaded(args[0]):
+		bot.msg(user, "%s is not loaded" % (args[0]))
+		return
 	if len(ctlmod.dependents[args[0]]) > 0:
 		if len(args) == 1 or args[1].lower() != "force":
 			bot.msg(user, "That module has dependents! Say MODUNLOAD %s FORCE to unload it and any dependents." % (args[0]))
 			return
+
 	okay = ctlmod.unload(bot.parent, args[0])
 	if okay:
 		bot.msg(user, "Unloaded %s" % (args[0]))
@@ -61,6 +65,10 @@ def modunload(bot, user, chan, realtarget, *args):
 @lib.help("<mod>", "reloads a module")
 @lib.argsEQ(1)
 def modreload(bot, user, chan, realtarget, *args):
+	if not ctlmod.isloaded(args[0]):
+		bot.msg(user, "%s is not loaded" % (args[0]))
+		return
+
 	okay = ctlmod.reloadmod(bot.parent, args[0])
 	if okay:
 		bot.msg(user, "Reloaded %s" % (args[0]))
@@ -72,7 +80,7 @@ def modreload(bot, user, chan, realtarget, *args):
 @lib.argsEQ(0)
 def modlist(bot, user, chan, realtarget, *args):
 	mods = ctlmod.modules
-	for modname, mod in mods.iteritems():
+	for modname, mod in mods.items():
 		bot.msg(user, "- %s (%s) [%s]" % ((modname, mod.__file__, ', '.join(ctlmod.dependents[modname]))))
 	bot.msg(user, "Done.")
 
@@ -91,9 +99,10 @@ def _whois(user, chan, showglevel=True, showclevel=True):
 	else:
 		fmt += " (not staff)"
 
-	if showclevel and chan is not None:
-		if chan.levelof(user.auth) >= 1:
-			fillers['clevel'] = chan.levelof(user.auth)
+	if (showclevel or showglevel) and chan is not None:
+		clev = chan.levelof(user.auth)
+		if clev >= 1:
+			fillers['clevel'] = (lib.clevs[clev] if clev < len(lib.clevs) else clev)
 			fmt += " (channel access: %(clevel)s)"
 		else:
 			fmt += " (not a channel user)"
@@ -109,14 +118,14 @@ def whois(bot, user, chan, realtarget, *args):
 	else:
 		target = bot.parent.user(name, create=False)
 	if target is None:
-		bot.msg(user, "I don't know %s." % (args[0]))
+		return  "I don't know %s." % (args[0])
 	else:
-		bot.msg(user, "%s is %s" % (args[0], _whois(target, chan, (user.glevel >= 1), (chan is not None and chan.levelof(user.auth) >= 1))))
+		return "%s is %s" % (args[0], _whois(target, chan, (user.glevel >= 1), (chan is not None and chan.levelof(user.auth) >= 1)))
 
 @lib.hook(needchan=False, wantchan=True)
 @lib.help(None, "shows who you are")
 def whoami(bot, user, chan, realtarget, *args):
-	bot.msg(user, "You are %s" % (_whois(user, chan)))
+	return "You are %s" % (_whois(user, chan))
 
 @lib.hook(needchan=False)
 @lib.help(None, "tries to read your auth and access level again")
@@ -129,8 +138,8 @@ def auth(bot, user, chan, realtarget, *args):
 def qstat(bot, user, chan, realtarget, *args):
 	bot.fastmsg(user, "Regular: %d -- Slow: %d" % (len(bot.msgqueue), len(bot.slowmsgqueue)))
 
-@lib.hook(needchan=False, glevel=lib.ADMIN)
-@lib.help(('qclear','clearq','clearqueue'), "[regular|slow]", "clears both or a specific msgqueue")
+@lib.hook(('qclear','cq','clearq','clearqueue'), needchan=False, glevel=lib.ADMIN)
+@lib.help("[regular|slow]", "clears both or a specific msgqueue")
 def qclear(bot, user, chan, realtarget, *args):
 	if len(args) == 0:
 		bot.msgqueue = deque()