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

diff --git a/modules/control.py b/modules/control.py
index a34f795..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/
 
@@ -46,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]))
@@ -60,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]))
@@ -90,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)"
@@ -108,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")
@@ -128,7 +138,7 @@ 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(('qclear','clearq','clearqueue'), needchan=False, glevel=lib.ADMIN)
+@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:
@@ -144,19 +154,3 @@ def qclear(bot, user, chan, realtarget, *args):
 			bot.fastmsg(user, "Syntax: QCLEAR [regular|slow]")
 			return #short-circuit
 		bot.fastmsg(user, "Cleared that msgqueue.")
-
-@lib.hook(needchan=False, wantchan=True, glevel=lib.ADMIN)
-@lib.help("<nick> <message>", "inject a line as though it came from <nick>", "note that this injects lines, not commands", "ex: INJECT DimeCadmium !WHOAMI")
-def inject(bot, user, chan, realtarget, *args):
-	targetuser = bot.parent.user(args[0], create=False)
-	if targetuser is None:
-		bot.msg(user, "User is unknown.")
-		return
-	if targetuser.glevel > user.glevel:
-		bot.msg(user, "That user has a higher access level than you.")
-		return
-
-	if chan is not None:
-		bot.parsemsg(bot.parent.user(args[0], create=False), str(chan), ' '.join(args[1:]))
-	else:
-		bot.parsemsg(bot.parent.user(args[0], create=False), str(bot), ' '.join(args[1:]))