X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/fd07173df3e9070bac1a0cf79c729f14c781d799..a28e2ae95b1012933a01f3fa992d9f6954f82346:/modules/help.py

diff --git a/modules/help.py b/modules/help.py
index 770a0fb..fc0dfe5 100644
--- a/modules/help.py
+++ b/modules/help.py
@@ -6,7 +6,7 @@
 modinfo = {
 	'author': 'Erebus Team',
 	'license': 'public domain',
-	'compatible': [1,2],
+	'compatible': [0],
 	'depends': [],
 	'softdeps': [],
 }
@@ -14,7 +14,12 @@ modinfo = {
 # preamble
 import modlib
 lib = modlib.modlib(__name__)
-modstart = lib.modstart
+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(needchan=False)(lib.help("<command>", "describes a command")(help))
+	return lib.modstart(parent, *args, **kwargs)
 modstop = lib.modstop
 
 # module code
@@ -76,9 +81,9 @@ class HelpLine(object):
 
 	def __str__(self):
 		if self.admin:
-			ret = "%-35s(%3s) - %-10s - " % (self.cmd+' '+self.syntax, self.glevel, self.module)
+			ret = "%-25s(%3s) - %-10s - " % (self.cmd+' '+self.syntax, self.glevel, self.module)
 		else:
-			ret = "%-40s - " % (self.cmd+' '+self.syntax)
+			ret = "%-30s - " % (self.cmd+' '+self.syntax)
 		if self.clevel != 0:
 			ret += "(%s) " % (lib.clevs[self.clevel])
 		ret += str(self.shorthelp)
@@ -107,7 +112,6 @@ def _genhelp(bot, user, chan, realtarget, *args):
 			filepath = arg
 			if minlevel != maxlevel:
 				minlevel = maxlevel
-	print "%r %r %r %r" % (module, minlevel, maxlevel, filepath)
 	for level in range(minlevel, maxlevel+1):
 		if '%d' in filepath:
 			filename = filepath % (level)
@@ -115,7 +119,7 @@ def _genhelp(bot, user, chan, realtarget, *args):
 			filename = filepath
 		fo = open(filename, 'w')
 		lines = []
-		for func in helps.itervalues():
+		for func in helps.values():
 			if module is not None and func.module != module:
 					continue
 			lines += _mkhelp(level, func)
@@ -134,8 +138,8 @@ def genhelp(bot, user, chan, realtarget, *args):
 		return
 	bot.msg(user, "Help written.")
 
-@lib.hook(needchan=False)
-@lib.help("<command>", "describes a command")
+#@lib.hook(needchan=False)
+#@lib.help("<command>", "describes a command")
 @lib.argsGE(1)
 def help(bot, user, chan, realtarget, *args):
 	cmd = str(' '.join(args)).lower()
@@ -144,7 +148,6 @@ def help(bot, user, chan, realtarget, *args):
 		bot.slowmsg(user, str(HelpLine(func.cmd[0], func.syntax, func.shorthelp, (user.glevel > 0), func.reqglevel, func.module, func.reqclevel)))
 		for line in func.longhelps:
 			bot.slowmsg(user, "  %s" % (line))
-		bot.slowmsg(user, "End of help for %s." % (func.cmd[0]))
 		if len(func.cmd) > 1:
 			bot.slowmsg(user, "  Aliases: %s" % (' '.join(func.cmd[1:])))
 	else:
@@ -153,7 +156,7 @@ def help(bot, user, chan, realtarget, *args):
 @lib.hook(needchan=False)
 @lib.help(None, "provides command list")
 def showcommands(bot, user, chan, realtarget, *args):
-	if bool(int(bot.parent.cfg.get('help', 'autogen', default=0))):
+	if bot.parent.cfg.getboolean('help', 'autogen'):
 		try:
 			_genhelp(bot, user, chan, realtarget, *args)
 		except: pass
@@ -171,13 +174,12 @@ def showcommands(bot, user, chan, realtarget, *args):
 	else:
 		bot.msg(user, "I don't know where help is. Sorry. Contact my owner.")
 
-"""#DISABLED
-@lib.hook(needchan=False)
-@lib.help('[@<module>|<command>]', 'lists commands or describes a command', 'with @<module>, lists all commands in <module>')
-def help(bot, user, chan, realtarget, *args):
+#@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):
 	if len(args) == 0: # list commands
 		lines = []
-		for func in helps.itervalues():
+		for func in helps.values():
 			lines += _mkhelp(user, func)
 		for line in sorted(lines):
 			bot.slowmsg(user, str(line))
@@ -185,7 +187,7 @@ def help(bot, user, chan, realtarget, *args):
 	elif args[0].startswith("@"):
 		lines = []
 		mod = args[0][1:].lower()
-		for func in helps.itervalues():
+		for func in helps.values():
 			if func.module == mod:
 				lines += _mkhelp(user, func)
 		for line in sorted(lines):
@@ -195,7 +197,7 @@ def help(bot, user, chan, realtarget, *args):
 		cmd = str(' '.join(args)).lower()
 		if cmd in cmds and user.glevel >= cmds[cmd].reqglevel:
 			func = cmds[cmd]
-			bot.slowmsg(user, str(HelpLine(func.cmd[0], func.syntax, func.shorthelp, (user.glevel > 0), func.reqglevel, func.module)))
+			bot.slowmsg(user, str(HelpLine(func.cmd[0], func.syntax, func.shorthelp, (user.glevel > 0), func.reqglevel, func.module, func.reqclevel)))
 			for line in func.longhelps:
 				bot.slowmsg(user, "  %s" % (line))
 			bot.slowmsg(user, "End of help for %s." % (func.cmd[0]))
@@ -204,5 +206,3 @@ def help(bot, user, chan, realtarget, *args):
 				bot.slowmsg(user, "  Aliases: %s" % (' '.join(func.cmd[1:])))
 		else:
 			bot.slowmsg(user, "No help found for %s" % (cmd))
-"""
-pass