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

Add strictnamespace registry key

Browse Source
This commit is contained in:
Pragmatic Software 2018-05-12 02:52:52 -07:00
parent dd520e0346
commit 81dcc3bee1
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PBot/DualIndexHashObject.pm
View File

@ -175,7 +175,7 @@ sub find_index {
} }
sub levenshtein_matches { sub levenshtein_matches {
my ($self, $primary_index_key, $secondary_index_key, $distance) = @_; my ($self, $primary_index_key, $secondary_index_key, $distance, $strictnamespace) = @_;
my $comma = ''; my $comma = '';
my $result = ""; my $result = "";
@ -207,6 +207,10 @@ sub levenshtein_matches {
$header = "[$index1] "; $header = "[$index1] ";
$header = "[global channel] " if $header eq "[.*] "; $header = "[global channel] " if $header eq "[.*] ";
if ($strictnamespace) {
next unless $index1 eq '.*' or $index1 eq $primary;
}
foreach my $index2 (sort keys %{ $self->hash->{$index1} }) { foreach my $index2 (sort keys %{ $self->hash->{$index1} }) {
my $distance_result = fastdistance($secondary_index_key, $index2); my $distance_result = fastdistance($secondary_index_key, $index2);
my $length = (length($secondary_index_key) > length($index2)) ? length $secondary_index_key : length $index2; my $length = (length($secondary_index_key) > length($index2)) ? length $secondary_index_key : length $index2;

8
PBot/FactoidCommands.pm
View File

@ -1356,12 +1356,12 @@ sub factfind {
$regex .= ($arguments =~ m/\w$/) ? '\b' : '\B'; $regex .= ($arguments =~ m/\w$/) ? '\b' : '\B';
foreach my $chan (sort keys %{ $factoids }) { foreach my $chan (sort keys %{ $factoids }) {
next if defined $channel and $chan !~ /$channel/i; next if defined $channel and $chan !~ /^$channel$/i;
foreach my $trigger (sort keys %{ $factoids->{$chan} }) { foreach my $trigger (sort keys %{ $factoids->{$chan} }) {
if($factoids->{$chan}->{$trigger}->{type} eq 'text' or $factoids->{$chan}->{$trigger}->{type} eq 'regex') { if($factoids->{$chan}->{$trigger}->{type} eq 'text' or $factoids->{$chan}->{$trigger}->{type} eq 'regex') {
if($factoids->{$chan}->{$trigger}->{owner} =~ /$owner/i if($factoids->{$chan}->{$trigger}->{owner} =~ /^$owner$/i
&& $factoids->{$chan}->{$trigger}->{ref_user} =~ /$refby/i && $factoids->{$chan}->{$trigger}->{ref_user} =~ /^$refby$/i
&& (exists $factoids->{$chan}->{$trigger}->{edited_by} ? $factoids->{$chan}->{$trigger}->{edited_by} =~ /$editby/i : 1)) { && (exists $factoids->{$chan}->{$trigger}->{edited_by} ? $factoids->{$chan}->{$trigger}->{edited_by} =~ /^$editby$/i : 1)) {
next if($arguments ne "" && $factoids->{$chan}->{$trigger}->{action} !~ /$regex/i && $trigger !~ /$regex/i); next if($arguments ne "" && $factoids->{$chan}->{$trigger}->{action} !~ /$regex/i && $trigger !~ /$regex/i);
$i++; $i++;

20
PBot/Factoids.pm
View File

@ -792,6 +792,12 @@ sub interpreter {
$stuff->{from} = lc $stuff->{from}; $stuff->{from} = lc $stuff->{from};
my $strictnamespace = $self->{pbot}->{registry}->get_value($stuff->{from}, 'strictnamespace');
if (not defined $strictnamespace) {
$strictnamespace = $self->{pbot}->{registry}->get_value('general', 'strictnamespace');
}
# search for factoid against global channel and current channel (from unless ref_from is defined) # search for factoid against global channel and current channel (from unless ref_from is defined)
my $original_keyword = $stuff->{keyword}; my $original_keyword = $stuff->{keyword};
#$self->{pbot}->{logger}->log("calling find_factoid in Factoids.pm, interpreter() to search for factoid against global/current\n"); #$self->{pbot}->{logger}->log("calling find_factoid in Factoids.pm, interpreter() to search for factoid against global/current\n");
@ -849,7 +855,15 @@ sub interpreter {
# 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 undef if length $stuff->{arguments} and not $self->{pbot}->{nicklist}->is_present($stuff->{from}, $stuff->{arguments}); return undef if length $stuff->{arguments} and not $self->{pbot}->{nicklist}->is_present($stuff->{from}, $stuff->{arguments});
my $matches = $self->{commands}->factfind($stuff->{from}, $stuff->{nick}, $stuff->{user}, $stuff->{host}, quotemeta $original_keyword); my $namespace = $strictnamespace ? $stuff->{from} : '.*';
$namespace = '.*' if $namespace !~ /^#/;
my $namespace_regex = $namespace;
if ($strictnamespace) {
$namespace_regex = "(?:" . (quotemeta $namespace) . '|\\.\\*)';
}
my $matches = $self->{commands}->factfind($stuff->{from}, $stuff->{nick}, $stuff->{user}, $stuff->{host}, quotemeta($original_keyword) . " -channel $namespace_regex");
# found factfind matches # found factfind matches
if ($matches !~ m/^No factoids/) { if ($matches !~ m/^No factoids/) {
@ -857,8 +871,8 @@ sub interpreter {
return "No such factoid '$original_keyword'; $matches"; return "No such factoid '$original_keyword'; $matches";
} }
# otherwise find levenshtein closest matches from all channels # otherwise find levenshtein closest matches
$matches = $self->{factoids}->levenshtein_matches('.*', lc $original_keyword); $matches = $self->{factoids}->levenshtein_matches($namespace, lc $original_keyword, 0.50, $strictnamespace);
# don't say anything if nothing similiar was found # don't say anything if nothing similiar was found
return undef if $matches eq 'none'; return undef if $matches eq 'none';