From b0a6ff9382a857f183319b77f7a352c377da59bd Mon Sep 17 00:00:00 2001
From: timriker <timriker@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Thu, 19 May 2005 06:08:35 +0000
Subject: [PATCH] args in cmd: from dondelelcaro

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@1221 c11ca15a-4712-0410-83d8-924469b57eb5
---
 src/Factoids/Question.pl | 8 ++++----
 src/Factoids/Reply.pl    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Factoids/Question.pl b/src/Factoids/Question.pl
index 4e4c949..1107867 100644
--- a/src/Factoids/Question.pl
+++ b/src/Factoids/Question.pl
@@ -264,7 +264,7 @@ sub factoidArgs {
 	    my $old = $result;
 	    while (1) {
 #		&DEBUG("Q: result => $result (1before)");
-		$result = &substVars($result);
+		$result = &substVars($result,1);
 #		&DEBUG("Q: result => $result (1after)");
 
 		last if ($old eq $result);
@@ -275,17 +275,17 @@ sub factoidArgs {
 	    # hack.
 	    $vals[$i] =~ s/^me$/$who/gi;
 
-	    if (!$done) {
+#	    if (!$done) {
 		&status("factArgs: SARing '$_' to '$vals[$i]'.");
 		$result =~ s/\Q$_\E/$vals[$i]/g;
-	    }
+#	    }
 	    $i++;
 	}
 
 	# nasty hack to get partial &getReply() functionality.
+	$result = &SARit($result);
 	$result =~ s/^\s*<action>\s*(.*)/\cAACTION $1\cA/i;
 	$result =~ s/^\s*<reply>\s*//i;
-	$result = &SARit($result);
 
 # well... lets go through all of them. not advisable if we have like
 # 1000 commands, heh.
diff --git a/src/Factoids/Reply.pl b/src/Factoids/Reply.pl
index 0b1f9d0..d21f0f2 100644
--- a/src/Factoids/Reply.pl
+++ b/src/Factoids/Reply.pl
@@ -149,11 +149,11 @@ sub getReply {
     ###
 
     # don't evaluate if it has factoid arguments.
-    if ($message =~ /^cmd:/i) {
-	&status("Reply: not doing substVars (eval dollar vars)");
-    } else {
+#    if ($message =~ /^cmd:/i) {
+#	&status("Reply: not doing substVars (eval dollar vars)");
+#    } else {
 	$reply = &substVars($reply,1);
-    }
+#    }
 
     $reply;
 }
-- 
2.39.5