misc fixes

[erebus.git] / modules / control.py

diff --git a/modules/control.py b/modules/control.py
index fab46f6a1d1df57cec1719d28dc96e4e606317b5..aac0257b06907af5ba2e0b1e154aa3fc8b39f6cf 100644 (file)
--- a/modules/control.py
+++ b/modules/control.py
@@ -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]))
@@ -92,8 +100,9 @@ def _whois(user, chan, showglevel=True, showclevel=True):
                fmt += " (not staff)"
 
        if showclevel and chan is not None:
-               if chan.levelof(user.auth) >= 1:
-                       fillers['clevel'] = chan.levelof(user.auth)
+               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)"