X-Git-Url: https://jfr.im/git/erebus.git/blobdiff_plain/ea3cbbdcb2e72cb0e0c8886a27e58893bc632ce9..662003f2c6a877b3628d3e95f1d9f385cbb27107:/modules/eval.py?ds=sidebyside

diff --git a/modules/eval.py b/modules/eval.py
index 3e06472..77f6a1a 100644
--- 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
@@ -24,11 +26,11 @@ import ctlmod
 def module(name):
 	return lib.mod(name)
 
-@lib.hook('eval', needchan=False, glevel=lib.MANAGER)
+@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 and realtarget == chan.name: replyto = chan
+	if chan is not None: replyto = chan
 	else: replyto = user
 
 	try: ret = eval(' '.join(args))
@@ -36,14 +38,14 @@ def cmd_eval(bot, user, chan, realtarget, *args):
 	else: bot.msg(replyto, "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 and realtarget == chan.name: replyto = chan
+	if chan is not None: replyto = chan
 	else: replyto = user
 
-	try: exec ' '.join(args)
+	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.")
 
@@ -51,3 +53,19 @@ def cmd_exec(bot, user, chan, realtarget, *args):
 @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
+
+	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:]))