control - allow whois by auth

[erebus.git] / modules / control.py

diff --git a/modules/control.py b/modules/control.py
index cfc4ce643e837bde1ef52b787bfa49f56807c932..c1e246b2b5ab6116c63cfc7f75d9e485e9a405ce 100644 (file)
--- a/modules/control.py
+++ b/modules/control.py
@@ -6,8 +6,9 @@
 modinfo = {
        'author': 'Erebus Team',
        'license': 'public domain',
-       'compatible': [1],
+       'compatible': [1,2],
        'depends': [],
+       'softdeps': ['help'],
 }
 
 # preamble
@@ -43,9 +44,13 @@ 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)
+@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:
+               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]))
@@ -67,8 +72,8 @@ def modreload(bot, user, chan, realtarget, *args):
 @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))
+       for modname, mod in mods.iteritems():
+               bot.msg(user, "- %s (%s) [%s]" % ((modname, mod.__file__, ', '.join(ctlmod.dependents[modname]))))
        bot.msg(user, "Done.")
 
 def _whois(user, chan, showglevel=True, showclevel=True):
@@ -98,7 +103,11 @@ def _whois(user, chan, showglevel=True, showclevel=True):
 @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)
+       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:
@@ -109,6 +118,12 @@ def whois(bot, user, chan, realtarget, *args):
 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):