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

factoids: added comments explaining namespace handling

Browse Source
This commit is contained in:
Pragmatic Software 2011-01-30 03:55:09 +00:00
parent 805832d977
commit e4019895d3
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
PBot/Factoids.pm
View File

@ -205,15 +205,18 @@ sub interpreter {
$from = lc $from; $from = lc $from;
$ref_from = "" if not defined $ref_from; $ref_from = "" if not defined $ref_from;
# search for factoid against global channel and current channel (from)
my $original_keyword = $keyword; my $original_keyword = $keyword;
($channel, $keyword) = $self->find_factoid($from, $keyword, $arguments); ($channel, $keyword) = $self->find_factoid($from, $keyword, $arguments);
# if no match found, attempt to call factoid from another channel if it exists there
if(not defined $keyword) { if(not defined $keyword) {
my $chans = ""; my $chans = "";
my $comma = ""; my $comma = "";
my $found = 0; my $found = 0;
my ($fwd_chan, $fwd_trig); my ($fwd_chan, $fwd_trig);
# build string of which channels contain the keyword, keeping track of the last one and count
foreach my $chan (keys %{ $self->factoids->hash }) { foreach my $chan (keys %{ $self->factoids->hash }) {
foreach my $trig (keys %{ $self->factoids->hash->{$chan} }) { foreach my $trig (keys %{ $self->factoids->hash->{$chan} }) {
if(lc $trig eq lc $original_keyword) { if(lc $trig eq lc $original_keyword) {
@ -227,18 +230,22 @@ sub interpreter {
} }
} }
# if multiple channels have this keyword, then ask user to disambiguate
if($found > 1) { if($found > 1) {
return $ref_from . "Ambiguous keyword '$original_keyword' exists in multiple locations (use 'fact <location> <keyword>' to choose one): $chans"; return $ref_from . "Ambiguous keyword '$original_keyword' exists in multiple locations (use 'fact <location> <keyword>' to choose one): $chans";
} }
# if there's just one other channel that has this keyword, trigger that instance
elsif($found == 1) { elsif($found == 1) {
$pbot->logger->log("Found '$original_keyword' as '$fwd_trig' in [$fwd_chan]\n"); $pbot->logger->log("Found '$original_keyword' as '$fwd_trig' in [$fwd_chan]\n");
return $ref_from . $pbot->factoids->interpreter($fwd_chan, $nick, $user, $host, $count, $fwd_trig, $arguments, undef, "[$fwd_chan] "); return $ref_from . $pbot->factoids->interpreter($fwd_chan, $nick, $user, $host, $count, $fwd_trig, $arguments, undef, "[$fwd_chan] ");
} else { }
# otherwise keyword hasn't been found, display similiar matches for all channels
else {
# if a non-nick argument was supplied, e.g., a sentence using the bot's nick, don't say anything # if a non-nick argument was supplied, e.g., a sentence using the bot's nick, don't say anything
return "" if $arguments !~ /^[^.+-, ]{1,20}$/; return "" if $arguments !~ /^[^.+-, ]{1,20}$/;
# if keyword hasn't been found, display similiar matches for all channels # find matches from all channels
my $matches = $self->factoids->levenshtein_matches('.*', lc $original_keyword); my $matches = $self->factoids->levenshtein_matches('.*', lc $original_keyword);
# don't say anything if nothing similiar was found # don't say anything if nothing similiar was found

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 => 284, BUILD_REVISION => 285,
BUILD_DATE => "2011-01-29", BUILD_DATE => "2011-01-29",
}; };