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

diff --git a/modules/control.py b/modules/control.py
index db87ec9..0584353 100644
--- a/modules/control.py
+++ b/modules/control.py
@@ -17,12 +17,13 @@ modstart = lib.modstart
 modstop = lib.modstop
 
 # module code
-import sys
+import sys, os
 import ctlmod
 from collections import deque
 
 
-@lib.hook(needchan=False, glevel=lib.MANAGER)
+@lib.hook(('die','restart'), needchan=False, glevel=lib.MANAGER)
+@lib.help(None, "stops the bot")
 def die(bot, user, chan, realtarget, *args):
 	for botitem in bot.parent.bots.itervalues():
 		for chan in botitem.chans:
@@ -32,6 +33,7 @@ def die(bot, user, chan, realtarget, *args):
 	os._exit(0)
 
 @lib.hook(needchan=False, glevel=lib.MANAGER)
+@lib.help("<mod>", "loads a module")
 @lib.argsEQ(1)
 def modload(bot, user, chan, realtarget, *args):
 	okay = ctlmod.load(bot.parent, args[0])
@@ -41,6 +43,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.argsEQ(1)
 def modunload(bot, user, chan, realtarget, *args):
 	okay = ctlmod.unload(bot.parent, args[0])
@@ -50,6 +53,7 @@ def modunload(bot, user, chan, realtarget, *args):
 		bot.msg(user, "Error unloading %s: %r" % (args[0], okay))
 
 @lib.hook(needchan=False, glevel=lib.MANAGER)
+@lib.help("<mod>", "reloads a module")
 @lib.argsEQ(1)
 def modreload(bot, user, chan, realtarget, *args):
 	okay = ctlmod.reloadmod(bot.parent, args[0])
@@ -59,11 +63,12 @@ def modreload(bot, user, chan, realtarget, *args):
 		bot.msg(user, "Error occurred: %r" % (okay))
 
 @lib.hook(needchan=False, glevel=lib.STAFF)
+@lib.help(None, "list loaded modules")
 @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))
+		bot.msg(user, "- %s (%s)" % (mod.__name__, mod.__file__))
 	bot.msg(user, "Done.")
 
 def _whois(user, chan, showglevel=True, showclevel=True):
@@ -90,6 +95,7 @@ def _whois(user, chan, showglevel=True, showclevel=True):
 	return fmt % fillers
 
 @lib.hook(needchan=False)
+@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)
@@ -99,14 +105,23 @@ def whois(bot, user, chan, realtarget, *args):
 		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.help(None, "shows who you are")
 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):
 	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")
 def qclear(bot, user, chan, realtarget, *args):
 	if len(args) == 0:
 		bot.msgqueue = deque()