take a few more things literally

[infobot.git] / src / Factoids / Norm.pl

diff --git a/src/Factoids/Norm.pl b/src/Factoids/Norm.pl
index 7aba3d297cb20ac62ad0bc023c2935b608285442..980936c41b9ba72df64707f863f5914078adac3f 100644 (file)
--- a/src/Factoids/Norm.pl
+++ b/src/Factoids/Norm.pl
@@ -4,7 +4,7 @@
 #   Version: 1997
 #
 
-# todo:
+# TODO:
 # use strict;
 
 sub normquery {
@@ -28,7 +28,7 @@ sub normquery {
        s/,?\s*(pretty )*please\??\s*$/\?/i;
 
        # what country is ...
-       if ($in =~ 
+       if ($in =~
            s/wh(at|ich)\s+(add?res?s|country|place|net (suffix|domain))/wh$1 /ig) {
            if ((length($in) == 2) && ($in !~ /^\./)) {
                $in = '.'.$in;
@@ -86,12 +86,14 @@ sub switchPerson {
        s/(^|\W)you\'?re(\W|$)/$1you are$2/ig;
 
        if ($addressed) {
+           my $mynick = 'UNDEF';
+           $mynick = $conn->nick() if ($conn);
            # is it safe to remove $in from here, too?
-           $in =~ s/yourself/$param{'ircNick'}/i;
-           $in =~ s/(^|\W)are you(\W|$)/$1is $param{'ircNick'}$2/ig;
-           $in =~ s/(^|\W)you are(\W|$)/$1$param{'ircNick'} is$2/ig;
-           $in =~ s/(^|\W)you(\W|$)/$1$param{'ircNick'}$2/ig;
-           $in =~ s/(^|\W)your(\W|$)/$1$param{'ircNick'}\'s$2/ig;
+           $in =~ s/yourself/$mynick/i;
+           $in =~ s/(^|\W)are you(\W|$)/$1is $mynick$2/ig;
+           $in =~ s/(^|\W)you are(\W|$)/$1$mynick is$2/ig;
+           $in =~ s/(^|\W)you(\W|$)/$1$mynick$2/ig;
+           $in =~ s/(^|\W)your(\W|$)/$1$mynick\'s$2/ig;
        }
     }