help - call showcommands if needed; dont expose IP

diff --git a/modules/help.py b/modules/help.py
index 74def560a0efe570b57d952052fbb8afa651b6c2..9c66731ea286136320333c6942145393e66de7aa 100644 (file)
--- a/modules/help.py
+++ b/modules/help.py
@@ -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):