control - show ignored status in whois

[erebus.git] / modules / control.py

diff --git a/modules/control.py b/modules/control.py
index fab46f6a1d1df57cec1719d28dc96e4e606317b5..27d3798f37ca74304a95b0ed7ecfd154da8d2581 100644 (file)
--- a/modules/control.py
+++ b/modules/control.py
@@ -31,7 +31,6 @@ def die(bot, user, chan, realtarget, *args):
        for botitem in bot.parent.bots.values():
                bot.conn.send("QUIT :Restarting. %s" % (quitmsg))
        sys.exit(0)
-       os._exit(0)
 
 @lib.hook(needchan=False, glevel=lib.MANAGER)
 @lib.help("<mod>", "loads a module")
@@ -47,10 +46,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 +64,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 +79,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.items():
+       for modname, mod in sorted(mods.items()):
                bot.msg(user, "- %s (%s) [%s]" % ((modname, mod.__file__, ', '.join(ctlmod.dependents[modname]))))
        bot.msg(user, "Done.")
 
@@ -84,16 +91,19 @@ def _whois(user, chan, showglevel=True, showclevel=True):
        fmt = "%(auth)s"
 
        if showglevel and user.glevel >= 1:
-                       fillers['glevel'] = user.glevel
-                       fmt += " (global access: %(glevel)s)"
+               fillers['glevel'] = user.glevel
+               fmt += " (global access: %(glevel)s)"
        elif user.glevel >= 1:
                fmt += " (staff)"
+       elif user.glevel <= -2:
+               fmt += " (ignored)"
        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)"
@@ -145,19 +155,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:]))