From: dondelelcaro <dondelelcaro@c11ca15a-4712-0410-83d8-924469b57eb5>
Date: Wed, 14 Jun 2006 01:53:36 +0000 (+0000)
Subject:  * Remove merge detrius from Reply.pl; stop breaking on 'you are'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=748d5127824d8a9de7d6fd59d6dbb05607cc107a;p=infobot.git

 * Remove merge detrius from Reply.pl; stop breaking on 'you are'
   factoids. {thanks to stew}
 * Remove double lexical definition in CommandStubs.pl



git-svn-id: https://svn.code.sf.net/p/infobot/code/branches/don/dpkg@1292 c11ca15a-4712-0410-83d8-924469b57eb5
---

diff --git a/src/CommandStubs.pl b/src/CommandStubs.pl
index 37f9181..93fc653 100644
--- a/src/CommandStubs.pl
+++ b/src/CommandStubs.pl
@@ -772,7 +772,7 @@ sub textstats_main {
 	    }
 	}
 
-	my $topstr = '';
+	$topstr = '';
 	if (scalar @top) {
 	    $topstr = '.  Top '.scalar(@top).': '.join(', ', @top);
 	}
diff --git a/src/Factoids/Reply.pl b/src/Factoids/Reply.pl
index fb69ebf..38f65a0 100644
--- a/src/Factoids/Reply.pl
+++ b/src/Factoids/Reply.pl
@@ -125,13 +125,7 @@ sub getReply {
 		$reply = "$lhs $mhs $result";
 	    }
 
-	    if ($reply =~ s/^\Q$who\E is/you are/i) {
-		# fix the person.
-	    } else {
-		if ($reply =~ /^you are / or $reply =~ / you are /) {
-		    return if ($addressed);
-		}
-	    }
+	    $reply =~ s/^\Q$who\E is/you are/i) {
 	}
     }