X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/4477123de1254afa80243f7f9eab62c5cbf7b786..8cf693989d9794d5310b66d179651dbc584a4e19:/modules/help.py

diff --git a/modules/help.py b/modules/help.py
index 8e13a2b..9c66731 100644
--- a/modules/help.py
+++ b/modules/help.py
@@ -19,7 +19,7 @@ def modstart(parent, *args, **kwargs):
 	if parent.cfg.getboolean('erebus', 'nofakelag'):
 		lib.hook('help', needchan=False)(lib.help('[@<module>|<command>]', 'lists commands or describes a command', 'with @<module>, lists all commands in <module>')(help_nolag))
 	else:
-		lib.hook('help', needchan=False)(lib.help("<command>", "describes a command")(help))
+		lib.hook('help', needchan=False)(lib.help("<command>", "describes a command", "see also: showcommands")(help))
 	return lib.modstart(parent, *args, **kwargs)
 modstop = lib.modstop
 
@@ -136,7 +136,7 @@ def _genhelp(bot, user, chan, realtarget, *args):
 	return True
 
 @lib.hook(glevel=1, needchan=False)
-@lib.help("[@<module>] [#<exact_level>] [+<max_level>] [-<min_level>] [./<filename>]", "generates help file", "arguments are all optional and may be specified in any order", "default file: ./help/<module><level>.txt, with module blank if not supplied", "filename can also contain %(@)s, %(#)s, %(+)s, %(-)s", "for module, current (single) level, max and min level, respectively")
+@lib.help("[@<module>] [#<exact_level>] [+<max_level>] [-<min_level>] [./<filename>]", "generates help file", "arguments are all optional and may be specified in any order", "default file: ./<module><level>.txt, with module blank if not supplied. will always be under help/", "filename can also contain %(@)s, %(#)s, %(+)s, %(-)s", "for module, current (single) level, max and min level, respectively")
 def genhelp(bot, user, chan, realtarget, *args):
 	try:
 		_genhelp(bot, user, chan, realtarget, *args)
@@ -145,10 +145,14 @@ def genhelp(bot, user, chan, realtarget, *args):
 		return
 	bot.msg(user, "Help written.")
 
+# This is hooked in modstart
 #@lib.hook(needchan=False)
 #@lib.help("<command>", "describes a command")
-@lib.argsGE(1)
 def help(bot, user, chan, realtarget, *args):
+	if len(args) == 0:
+		bot.msg(user, "Usage: %sHELP <command>" % bot.parent.trigger)
+		return showcommands(bot, user, chan, realtarget, *args)
+
 	cmd = str(' '.join(args)).lower()
 	if cmd in cmds and user.glevel >= cmds[cmd].reqglevel:
 		func = cmds[cmd]
@@ -169,18 +173,13 @@ def showcommands(bot, user, chan, realtarget, *args):
 		except: pass
 
 	url = bot.parent.cfg.get('help', 'url', default=None)
-	if url is None:
-		try:
-			import urllib2
-			myip = urllib2.urlopen("https://api.ipify.org").read()
-			url = "http://%s/help/%%d.txt (maybe)" % (myip)
-		except: url = None
 	if url is not None:
 		url = url % (user.glevel)
-		bot.msg(user, "Help is at: %s" % (url))
+		bot.msg(user, "Command list is at: %s" % (url))
 	else:
-		bot.msg(user, "I don't know where help is. Sorry. Contact my owner.")
+		bot.msg(user, "I don't know where help is. Sorry. Contact my owner and tell him to set in the config file [help] url = .")
 
+# This is hooked in modstart
 #@lib.hook(needchan=False)
 #@lib.help('[@<module>|<command>]', 'lists commands or describes a command', 'with @<module>, lists all commands in <module>')
 def help_nolag(bot, user, chan, realtarget, *args):