use new bind_bot, make sure the bot-on-channel sends the replies

[erebus.git] / modules / eval.py

diff --git a/modules/eval.py b/modules/eval.py
index 698b226463a8dd372013fb30adf0065b9fc7d455..c32797aab768b624ce10a54435e6843aca1cc41f 100644 (file)
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -19,9 +19,12 @@ modstart = lib.modstart
 modstop = lib.modstop
 
 # module code
-import os
+import subprocess
 import sys
 
+# import these to make life easier using this module
+import os
+import ctlmod
 
 def module(name):
        return lib.mod(name)
@@ -31,11 +34,11 @@ def module(name):
 @lib.argsGE(1)
 def cmd_eval(bot, user, chan, realtarget, *args):
        if chan is not None: replyto = chan
-       else: replyto = user
+       else: replyto = user.bind_bot(bot)
 
        try: ret = eval(' '.join(args))
-       except Exception: bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
-       else: bot.msg(replyto, "Done: %r" % (ret,))
+       except Exception: replyto.msg("Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
+       else: replyto.msg("Done: %r" % (ret,))
 
 
 @lib.hook('exec', needchan=False, wantchan=True, glevel=lib.OWNER)
@@ -43,24 +46,26 @@ def cmd_eval(bot, user, chan, realtarget, *args):
 @lib.argsGE(1)
 def cmd_exec(bot, user, chan, realtarget, *args):
        if chan is not None: replyto = chan
-       else: replyto = user
+       else: replyto = user.bind_bot(bot)
 
        try: exec(' '.join(args))
-       except Exception: bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
-       else: bot.msg(replyto, "Done.")
+       except Exception: replyto.msg("Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
+       else: replyto.msg("Done.")
 
 @lib.hook(needchan=False, wantchan=True, glevel=lib.OWNER)
 @lib.help('<command line>', 'think os.system')
 @lib.argsGE(1)
 def system(bot, user, chan, realtarget, *args):
        if chan is not None: replyto = chan
-       else: replyto = user
+       else: replyto = user.bind_bot(bot)
 
-       try: prochandle = os.popen(' '.join(args))
-       except Exception: bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
+       try:
+               proc = subprocess.Popen(' '.join(args), shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True)
+       except Exception:
+               replyto.msg("Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
        else:
-               for line in prochandle:
-                       bot.msg(replyto, line)
+               for line in proc.stdout:
+                       replyto.msg(line.decode('utf-8', 'surrogateescape'))
 
 @lib.hook('exception', needchan=False, glevel=lib.OWNER)
 @lib.help(None, "cause an exception")