X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/b319b8372739fb7637c66e3a4c1063c121736c5d..3fb492b93ae9566279a6b1619b0054468b42b741:/modules/control.py

diff --git a/modules/control.py b/modules/control.py
index 0584353..c1e246b 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,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 (%s)" % (mod.__name__, mod.__file__))
+	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: