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 75361980609624a0a162c85b8a882896bd74b144..c32797aab768b624ce10a54435e6843aca1cc41f 100644 (file)
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -1,4 +1,5 @@
 # Erebus IRC bot - Author: Erebus Team
+# vim: fileencoding=utf-8
 # !EVAL and !EXEC commands
 # This file is released into the public domain; see http://unlicense.org/
 
@@ -6,8 +7,9 @@
 modinfo = {
        'author': 'Erebus Team',
        'license': 'public domain',
-       'compatible': [1],
+       'compatible': [0],
        'depends': [],
+       'softdeps': ['help'],
 }
 
 # preamble
@@ -17,25 +19,71 @@ modstart = lib.modstart
 modstop = lib.modstop
 
 # module code
+import subprocess
 import sys
 
-@lib.hook('eval', needchan=False, glevel=lib.MANAGER)
+# import these to make life easier using this module
+import os
+import ctlmod
+
+def module(name):
+       return lib.mod(name)
+
+@lib.hook('eval', needchan=False, wantchan=True, glevel=lib.OWNER)
+@lib.help("<python>", "eval")
 @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: 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, glevel=lib.MANAGER)
+@lib.hook('exec', needchan=False, wantchan=True, glevel=lib.OWNER)
+@lib.help("<python>", "exec")
 @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: 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.bind_bot(bot)
+
+       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 proc.stdout:
+                       replyto.msg(line.decode('utf-8', 'surrogateescape'))
+
+@lib.hook('exception', needchan=False, glevel=lib.OWNER)
+@lib.help(None, "cause an exception")
+def cmd_exception(*args, **kwargs):
+       raise Exception()
+
+@lib.hook(needchan=False, wantchan=True, glevel=lib.ADMIN)
+@lib.help("<nick> <message>", "inject a line as though it came from <nick>", "note that this injects lines, not commands", "ex: INJECT DimeCadmium !WHOAMI")
+def inject(bot, user, chan, realtarget, *args):
+       targetuser = bot.parent.user(args[0], create=False)
+       if targetuser is None:
+               bot.msg(user, "User is unknown.")
+               return
+       if targetuser.glevel > user.glevel:
+               bot.msg(user, "That user has a higher access level than you.")
+               return
 
-       try: exec ' '.join(args)
-       except: bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
-       else: bot.msg(replyto, "Done.")
+       if chan is not None:
+               bot.parsemsg(bot.parent.user(args[0], create=False), str(chan), ' '.join(args[1:]))
+       else:
+               bot.parsemsg(bot.parent.user(args[0], create=False), str(bot), ' '.join(args[1:]))