X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/e4255e706c1531dee26437dd5a1301003dfc01c3..ea3cbbdcb2e72cb0e0c8886a27e58893bc632ce9:/modules/eval.py

diff --git a/modules/eval.py b/modules/eval.py
index ff65cea..3e06472 100644
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -1,6 +1,10 @@
+# Erebus IRC bot - Author: Erebus Team
+# !EVAL and !EXEC commands
+# This file is released into the public domain; see http://unlicense.org/
+
 # module info
 modinfo = {
-	'author': 'John Runyon (DimeCadmium)',
+	'author': 'Erebus Team',
 	'license': 'public domain',
 	'compatible': [1],
 	'depends': [],
@@ -14,17 +18,36 @@ modstop = lib.modstop
 
 # module code
 import sys
+import ctlmod
+
+
+def module(name):
+	return lib.mod(name)
 
+@lib.hook('eval', needchan=False, glevel=lib.MANAGER)
+@lib.help("<python>", "eval")
+@lib.argsGE(1)
+def cmd_eval(bot, user, chan, realtarget, *args):
+	if chan is not None and realtarget == chan.name: replyto = chan
+	else: replyto = user
 
-@lib.hook('eval')
-def cmd_eval(bot, user, chan, *args):
 	try: ret = eval(' '.join(args))
-	except: bot.msg(chan, "Error (%s): %s" % (sys.exc_info()[0], sys.exc_info()[1]))
-	else: bot.msg(chan, "Done: %r" % (ret))
+	except Exception: bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
+	else: bot.msg(replyto, "Done: %r" % (ret,))
 
 
-@lib.hook('exec')
-def cmd_exec(bot, user, chan, *args):
+@lib.hook('exec', needchan=False, glevel=lib.MANAGER)
+@lib.help("<python>", "exec")
+@lib.argsGE(1)
+def cmd_exec(bot, user, chan, realtarget, *args):
+	if chan is not None and realtarget == chan.name: replyto = chan
+	else: replyto = user
+
 	try: exec ' '.join(args)
-	except: bot.msg(chan, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
-	else: bot.msg(chan, "Done.")
+	except Exception: bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
+	else: bot.msg(replyto, "Done.")
+
+@lib.hook('exception', needchan=False, glevel=lib.OWNER)
+@lib.help(None, "cause an exception")
+def cmd_exception(*args, **kwargs):
+	raise Exception()