From d771d66d8fc296eb48a2a44459c60d3c1cf84ba1 Mon Sep 17 00:00:00 2001 From: Pragmatic Software Date: Mon, 9 Oct 2017 19:35:11 -0700 Subject: [PATCH] fact_find no longer treats some aliases as regex when they alias a built-in command --- PBot/Factoids.pm | 7 +++---- PBot/Interpreter.pm | 3 --- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/PBot/Factoids.pm b/PBot/Factoids.pm index ab10a872..9dd13af3 100644 --- a/PBot/Factoids.pm +++ b/PBot/Factoids.pm @@ -278,13 +278,12 @@ sub find_factoid { $self->{pbot}->{logger}->log("from: $from\n") if $debug; - my $string = $keyword . (defined $arguments ? " $arguments" : ""); - - $self->{pbot}->{logger}->log("string: $string\n") if $debug; - my @result = eval { my @results; for (my $depth = 0; $depth < 5; $depth++) { + my $string = $keyword . (defined $arguments ? " $arguments" : ""); + $self->{pbot}->{logger}->log("string: $string\n") if $debug; + return undef if $self->{pbot}->{commands}->exists($keyword); # check factoids foreach my $channel (sort keys %{ $self->{factoids}->hash }) { if($exact_channel) { diff --git a/PBot/Interpreter.pm b/PBot/Interpreter.pm index a50a81ba..d5c512d4 100644 --- a/PBot/Interpreter.pm +++ b/PBot/Interpreter.pm @@ -515,9 +515,6 @@ sub paste_ixio { my %post = ('f:1' => $text); my $response = $ua->post("http://ix.io", \%post); - use Data::Dumper; - print Dumper $response; - if(not $response->is_success) { return "error pasting: " . $response->status_line; }