more work on trivia

[erebus.git] / modules / eval.py

diff --git a/modules/eval.py b/modules/eval.py
index ff65ceabcb6fc1655896450e409e0978cb7ff1c4..e516464355c51446baac414e5124bf7e41dabfc6 100644 (file)
--- 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,27 @@ modstop = lib.modstop
 
 # module code
 import sys
+import ctlmod
 
+@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')
-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 SystemExit: raise
+       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', 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
 
-@lib.hook('exec')
-def cmd_exec(bot, user, chan, *args):
        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 SystemExit: raise
+       except: bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
+       else: bot.msg(replyto, "Done.")