userinfo - add function/command to delete

[erebus.git] / modules / control.py

diff --git a/modules/control.py b/modules/control.py
index 74e0a66d4b1b54a6dc124d6f1941260dd0106909..10aa908b5aa3c4a63dbc6d8feba110f3ec1b7b62 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
@@ -25,10 +26,11 @@ from collections import deque
 @lib.hook(('die','restart'), needchan=False, glevel=lib.MANAGER)
 @lib.help(None, "stops the bot")
 def die(bot, user, chan, realtarget, *args):
+       quitmsg = ' '.join(args)
        for botitem in bot.parent.bots.itervalues():
                for chan in botitem.chans:
-                       chan.fastmsg("Bot is restarting! %s" % ' '.join(args))
-               bot.conn.send("QUIT :Restarting.")
+                       chan.fastmsg("Bot is restarting! %s" % (quitmsg))
+               bot.conn.send("QUIT :Restarting. %s" % (quitmsg))
        sys.exit(0)
        os._exit(0)
 
@@ -43,7 +45,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 +100,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)))
@@ -124,7 +130,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: