From 2ac7b6feb6fab3c8ebfa78837f977e269178b932 Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Sat, 26 Aug 2017 04:06:36 -0700 Subject: [PATCH] Exclude "Why would I want to do that to myself?" from specific commands --- PBot/Interpreter.pm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/PBot/Interpreter.pm b/PBot/Interpreter.pm index 42784ed4..7c97b6b5 100644 --- a/PBot/Interpreter.pm +++ b/PBot/Interpreter.pm @@ -204,26 +204,26 @@ sub interpret { $tonick = $nick if defined $tonick and $tonick eq 'me'; - if ($keyword !~ /^(factadd|add|factfind|find|factshow|show|forget|factdel|factset|factchange|change|msg|tell|cc|eval|u|udict|ud|actiontrigger|urban|perl)/) { + if ($keyword !~ /^(factrem|forget|factdel|factadd|add|factfind|find|factshow|show|forget|factdel|factset|factchange|change|msg|tell|cc|eval|u|udict|ud|actiontrigger|urban|perl)/) { $keyword =~ s/(\w+)([?!.]+)$/$1/; $arguments =~ s/(?{pbot}->{registry}->get_value('irc', 'botnick'); + my $botnick = $self->{pbot}->{registry}->get_value('irc', 'botnick'); - if (defined $arguments && ($arguments =~ m/^(your|him|her|its|it|them|their)(self|selves)$/i || $arguments =~ m/^$botnick$/i)) { - my $delay = (rand 10) + 8; - my $message = { - nick => $nick, user => $user, host => $host, command => $command, checkflood => 1, - message => "$nick: Why would I want to do that to myself?" - }; - $self->add_message_to_output_queue($from, $message, $delay); - $delay = duration($delay); - $self->{pbot}->{logger}->log("Final result ($delay delay) [$message->{message}]\n"); - return undef; + if (defined $arguments && ($arguments =~ m/^(your|him|her|its|it|them|their)(self|selves)$/i || $arguments =~ m/^$botnick$/i)) { + my $delay = (rand 10) + 8; + my $message = { + nick => $nick, user => $user, host => $host, command => $command, checkflood => 1, + message => "$nick: Why would I want to do that to myself?" + }; + $self->add_message_to_output_queue($from, $message, $delay); + $delay = duration($delay); + $self->{pbot}->{logger}->log("Final result ($delay delay) [$message->{message}]\n"); + return undef; + } } if(not defined $keyword) {