X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/931c88a4c3ec73d24c53baa4e8464bcb2e51b3b6..e659feb5010053f05070be17ecfef36e9ee138ba:/modules/eval.py?ds=sidebyside

diff --git a/modules/eval.py b/modules/eval.py
index 830600c..7536198 100644
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -1,9 +1,10 @@
-# Erebus IRC bot - Author: John Runyon
+# 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': [],
@@ -18,16 +19,23 @@ modstop = lib.modstop
 # module code
 import sys
 
+@lib.hook('eval', needchan=False, glevel=lib.MANAGER)
+@lib.argsGE(1)
+def cmd_eval(bot, user, chan, realtarget, *args):
+	if chan is not None: replyto = chan
+	else: replyto = user
 
-@lib.hook('eval', lib.MANAGER)
-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: bot.msg(replyto, "Error (%s): %s" % (sys.exc_info()[0], sys.exc_info()[1]))
+	else: bot.msg(replyto, "Done: %r" % (ret))
 
 
-@lib.hook('exec', lib.MANAGER)
-def cmd_exec(bot, user, chan, *args):
+@lib.hook('exec', needchan=False, glevel=lib.MANAGER)
+@lib.argsGE(1)
+def cmd_exec(bot, user, chan, realtarget, *args):
+	if chan is not None: 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: bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
+	else: bot.msg(replyto, "Done.")