add !AUTH command to do another WHO

[erebus.git] / modules / control.py

diff --git a/modules/control.py b/modules/control.py
index 8e17b10b129404be6682a8e63f15919bf7be97ba..0584353afc38b9c82b247569f202d0b8ab521567 100644 (file)
--- a/modules/control.py
+++ b/modules/control.py
@@ -17,12 +17,13 @@ modstart = lib.modstart
 modstop = lib.modstop
 
 # module code
-import sys
+import sys, os
 import ctlmod
 from collections import deque
 
 
-@lib.hook(needchan=False, glevel=lib.MANAGER)
+@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:
@@ -32,6 +33,7 @@ def die(bot, user, chan, realtarget, *args):
        os._exit(0)
 
 @lib.hook(needchan=False, glevel=lib.MANAGER)
+@lib.help("<mod>", "loads a module")
 @lib.argsEQ(1)
 def modload(bot, user, chan, realtarget, *args):
        okay = ctlmod.load(bot.parent, args[0])
@@ -41,6 +43,7 @@ def modload(bot, user, chan, realtarget, *args):
                bot.msg(user, "Error loading %s: %r" % (args[0], okay))
 
 @lib.hook(needchan=False, glevel=lib.MANAGER)
+@lib.help("<mod>", "unloads a module")
 @lib.argsEQ(1)
 def modunload(bot, user, chan, realtarget, *args):
        okay = ctlmod.unload(bot.parent, args[0])
@@ -50,6 +53,7 @@ def modunload(bot, user, chan, realtarget, *args):
                bot.msg(user, "Error unloading %s: %r" % (args[0], okay))
 
 @lib.hook(needchan=False, glevel=lib.MANAGER)
+@lib.help("<mod>", "reloads a module")
 @lib.argsEQ(1)
 def modreload(bot, user, chan, realtarget, *args):
        okay = ctlmod.reloadmod(bot.parent, args[0])
@@ -59,40 +63,65 @@ def modreload(bot, user, chan, realtarget, *args):
                bot.msg(user, "Error occurred: %r" % (okay))
 
 @lib.hook(needchan=False, glevel=lib.STAFF)
+@lib.help(None, "list loaded modules")
 @lib.argsEQ(0)
 def modlist(bot, user, chan, realtarget, *args):
        mods = ctlmod.modules
        for mod in mods.itervalues():
-               bot.msg(user, "- %s %r" % (mod.__name__, mod))
+               bot.msg(user, "- %s (%s)" % (mod.__name__, mod.__file__))
        bot.msg(user, "Done.")
 
-@lib.hook(cmd='whoami', needchan=False)
-def whoami(bot, user, chan, realtarget, *args):
+def _whois(user, chan, showglevel=True, showclevel=True):
        if not user.isauthed():
-               bot.msg(user, "You are not authed.")
-               return
+               return "not authed."
 
        fillers = {'auth': user.auth}
-       fmt = "You are %(auth)s"
+       fmt = "%(auth)s"
 
-       if user.glevel >= 1:
-               fillers['glevel'] = user.glevel
-               fmt += " (global access: %(glevel)s)"
+       if showglevel and user.glevel >= 1:
+                       fillers['glevel'] = user.glevel
+                       fmt += " (global access: %(glevel)s)"
+       elif user.glevel >= 1:
+               fmt += " (staff)"
        else:
                fmt += " (not staff)"
 
-       if chan is not None and chan.levelof(user.auth) >= 1:
-               fillers['clevel'] = chan.levelof(user.auth)
-               fmt += " (channel access: %(clevel)s)"
+       if showclevel and chan is not None:
+               if chan.levelof(user.auth) >= 1:
+                       fillers['clevel'] = chan.levelof(user.auth)
+                       fmt += " (channel access: %(clevel)s)"
+               else:
+                       fmt += " (not a channel user)"
+       return fmt % fillers
+
+@lib.hook(needchan=False)
+@lib.help("<user>", "shows who someone is")
+@lib.argsEQ(1)
+def whois(bot, user, chan, realtarget, *args):
+       target = bot.parent.user(args[0], create=False)
+       if target is None:
+               bot.msg(user, "I don't know %s." % (args[0]))
        else:
-               fmt += " (not a channel user)"
-       bot.msg(user, fmt % fillers)
+               bot.msg(user, "%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)
+@lib.help(None, "shows who you are")
+def whoami(bot, user, chan, realtarget, *args):
+       bot.msg(user, "You are %s" % (_whois(user, chan)))
+
+@lib.hook(needchan=False)
+@lib.help(None, "tries to read your auth and access level again")
+def auth(bot, user, chan, realtarget, *args):
+       bot.msg(user, "Okay, give me a second.")
+       bot.conn.send("WHO %s n%%ant,2" % (user))
 
 @lib.hook(needchan=False, glevel=1)
+@lib.help(None, "displays length of each msgqueue")
 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("[regular|slow]", "clears both or a specific msgqueue")
 def qclear(bot, user, chan, realtarget, *args):
        if len(args) == 0:
                bot.msgqueue = deque()