From: John Runyon <redacted>
Date: Sat, 23 Mar 2024 07:37:57 +0000 (-0600)
Subject: use new bind_bot, make sure the bot-on-channel sends the replies
X-Git-Url: https://jfr.im/git/erebus.git/commitdiff_plain/9f7914d5eafe22dd3feb7e7033d8e1eda6a287bf

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

diff --git a/modules/eval.py b/modules/eval.py
index 3930b6d..c32797a 100644
--- a/modules/eval.py
+++ b/modules/eval.py
@@ -34,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)
@@ -46,26 +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:
 		proc = subprocess.Popen(' '.join(args), shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, close_fds=True)
 	except Exception:
-		bot.msg(replyto, "Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
+		replyto.msg("Error: %s %s" % (sys.exc_info()[0], sys.exc_info()[1]))
 	else:
 		for line in proc.stdout:
-			bot.msg(replyto, line.decode('utf-8', 'surrogateescape'))
+			replyto.msg(line.decode('utf-8', 'surrogateescape'))
 
 @lib.hook('exception', needchan=False, glevel=lib.OWNER)
 @lib.help(None, "cause an exception")