X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/b091071713e832e6c007e57b49d68e2a3b54f0ed..b4e3e62e5e48277e34e40da4f9b79b4291fabce3:/modules/control.py diff --git a/modules/control.py b/modules/control.py index c9838c6..34018fc 100644 --- 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,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("", "unloads a module") +@lib.help(" [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: @@ -72,7 +73,7 @@ def modreload(bot, user, chan, realtarget, *args): def modlist(bot, user, chan, realtarget, *args): mods = ctlmod.modules for modname, mod in mods.iteritems(): - bot.msg(user, "- %s (%s) %r" % ((modname, mod.__file__, ctlmod.dependents[modname]))) + 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): @@ -99,10 +100,14 @@ def _whois(user, chan, showglevel=True, showclevel=True): return fmt % fillers @lib.hook(needchan=False) -@lib.help("", "shows who someone is") +@lib.help("", "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: