mode parsing bugfix

[erebus.git] / modules / control.py

diff --git a/modules/control.py b/modules/control.py
index 74e0a66d4b1b54a6dc124d6f1941260dd0106909..e00d013d283f186dd05f1da5128e7dc71c7d6c3f 100644 (file)
--- a/modules/control.py
+++ b/modules/control.py
@@ -6,8 +6,9 @@
 modinfo = {
        'author': 'Erebus Team',
        'license': 'public domain',
-       'compatible': [1],
+       'compatible': [2],
        'depends': [],
+       'softdeps': ['help'],
 }
 
 # preamble
@@ -43,7 +44,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.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 len(ctlmod.dependents[args[0]]) > 0:
@@ -98,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 +130,7 @@ 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")
+@lib.help(('qclear','clearq','clearqueue'), "[regular|slow]", "clears both or a specific msgqueue")
 def qclear(bot, user, chan, realtarget, *args):
        if len(args) == 0:
                bot.msgqueue = deque()