direct addressing with multiple nicks

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

diff --git a/src/Factoids/Norm.pl b/src/Factoids/Norm.pl
index d58d4eda6ff9069d8adf1486cd7e625a876495b5..a3870d7cfc0d7ab79b1f7aad28bbd59f4f0d314e 100644 (file)
--- a/src/Factoids/Norm.pl
+++ b/src/Factoids/Norm.pl
@@ -86,12 +86,13 @@ sub switchPerson {
        s/(^|\W)you\'?re(\W|$)/$1you are$2/ig;
 
        if ($addressed) {
+           my $mynick = $conn->nick();
            # 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;
        }
     }