X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/ceb04489cf63ef87dd228968f96eb8972e3ac22e..124f114c3d208d9cdd3d0717978689890db73657:/modules/eval.py?ds=sidebyside

diff --git a/modules/eval.py b/modules/eval.py
index 7536198..d248b53 100644
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -18,24 +18,31 @@ modstop = lib.modstop
 
 # module code
 import sys
+import ctlmod
+
+
+def module(name):
+	return lib.parent.module(name)
 
 @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
+	if realtarget == chan.name: replyto = chan
 	else: replyto = user
 
 	try: ret = eval(' '.join(args))
+	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))
+	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
+	if realtarget == chan.name: replyto = chan
 	else: replyto = user
 
 	try: exec ' '.join(args)
+	except SystemExit: raise
 	except: bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
 	else: bot.msg(replyto, "Done.")