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

Restore missing "$keyword is $result" when triggering factoid without $ref_from

Browse Source
This commit is contained in:
Pragmatic Software 2013-10-14 17:22:06 +00:00
parent a4def7d653
commit aeec4fb2f5
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PBot/Factoids.pm
View File

@ -119,7 +119,7 @@ sub export_factoids {
print FILE '<script type="text/javascript" src="js/jquery-latest.js"></script>' . "\n"; print FILE '<script type="text/javascript" src="js/jquery-latest.js"></script>' . "\n";
print FILE '<script type="text/javascript" src="js/jquery.tablesorter.js"></script>' . "\n"; print FILE '<script type="text/javascript" src="js/jquery.tablesorter.js"></script>' . "\n";
print FILE "</head>\n<body><i>Last updated at $time</i>\n"; print FILE "</head>\n<body><i>Last updated at $time</i>\n";
print FILE "<hr><h2>Candide's factoids</h2>\n<hr>\n"; print FILE "<hr><h2>Candide's factoids</h2>\n";
my $i = 0; my $i = 0;
my $table_id = 1; my $table_id = 1;
@ -488,7 +488,11 @@ sub interpreter {
return $ref_from . "$keyword is $result"; return $ref_from . "$keyword is $result";
} }
} else { } else {
if($result =~ m/^\/say/i || $result =~ m/^\/me/i || $result =~ m/^\/msg/i) {
return $result; return $result;
} else {
return "$keyword is $result";
}
} }
} elsif($self->factoids->hash->{$channel}->{$keyword}->{type} eq 'regex') { } elsif($self->factoids->hash->{$channel}->{$keyword}->{type} eq 'regex') {
$result = eval { $result = eval {

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 => 452, BUILD_REVISION => 453,
BUILD_DATE => "2013-10-14", BUILD_DATE => "2013-10-14",
}; };