* 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 37f918104602f2ffd25a78a94e6a49185be4309f..93fc65302d45b8c2da0ea345154d09b2cd093882 100644 (file)
--- 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 fb69ebffed122dbe3f0c020bf3e1ae44fa732101..38f65a083db6d8c534d9716887cdc629c953a236 100644 (file)
--- 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) {
        }
     }