bugfixes

[erebus.git] / modules / control.py

diff --git a/modules/control.py b/modules/control.py
index 29b3da6d0053ddf421b48047d1435defb1c771f2..91b0efffffc94cd95b7b889401aff1903a6118a8 100644 (file)
--- a/modules/control.py
+++ b/modules/control.py
@@ -6,7 +6,7 @@
 modinfo = {
        'author': 'Erebus Team',
        'license': 'public domain',
-       'compatible': [1,2],
+       'compatible': [2],
        'depends': [],
        'softdeps': ['help'],
 }
@@ -99,17 +99,21 @@ def _whois(user, chan, showglevel=True, showclevel=True):
                        fmt += " (not a channel user)"
        return fmt % fillers
 
-@lib.hook(needchan=False)
-@lib.help("<user>", "shows who someone is")
+@lib.hook(needchan=False, wantchan=True)
+@lib.help("<user|#auth>", "shows who someone is")
 @lib.argsEQ(1)
 def whois(bot, user, chan, realtarget, *args):
-       target = bot.parent.user(args[0], create=False)
+       name = args[0]
+       if name.startswith("#"):
+               target = bot.parent.User(name, name[1:])
+       else:
+               target = bot.parent.user(name, create=False)
        if target is None:
                bot.msg(user, "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))))
 
-@lib.hook(needchan=False)
+@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)))
@@ -125,7 +129,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(needchan=False, glevel=lib.ADMIN)
+@lib.hook(('qclear','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: