GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-11-20 02:49:49 +01:00
Code Issues Projects Releases Wiki Activity

Factoids now ignore arguments that do not look like a nick if the factoid doesn't take an argument -- fixes factoid triggers on sentences with bot's name; find_factoid searches global channel if $from is not a channel

Browse Source
This commit is contained in:
Pragmatic Software 2010-06-30 04:58:22 +00:00
parent 5f5cd6ec08
commit 9fa3b865e9
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PBot/Factoids.pm
View File

@ -158,7 +158,7 @@ sub export_factoids {
sub find_factoid { sub find_factoid {
my ($self, $from, $keyword, $arguments, $exact_channel, $exact_trigger) = @_; my ($self, $from, $keyword, $arguments, $exact_channel, $exact_trigger) = @_;
$from = '.*' if not defined $from; $from = '.*' if not defined $from or $from !~ /^#/;
my $string = "$keyword" . (defined $arguments ? " $arguments" : ""); my $string = "$keyword" . (defined $arguments ? " $arguments" : "");
@ -296,9 +296,7 @@ sub interpreter {
$result =~ s/^/\/say $arguments: $keyword is / unless (defined $tonick); $result =~ s/^/\/say $arguments: $keyword is / unless (defined $tonick);
} }
} else { } else {
if($result !~ /^\/.+? /) { return undef;
$result =~ s/^/\/say $keyword is / unless (defined $tonick);
}
} }
} }
} else { } else {

2
PBot/VERSION.pm
View File

@ -13,7 +13,7 @@ use warnings;
# These are set automatically by the build/commit script # These are set automatically by the build/commit script
use constant { use constant {
BUILD_NAME => "PBot", BUILD_NAME => "PBot",
BUILD_REVISION => 219, BUILD_REVISION => 220,
BUILD_DATE => "2010-06-29", BUILD_DATE => "2010-06-29",
}; };