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

Allow wild-card in recall/grab text

Browse Source 
Do not iterate through weak links when looking for also-known-as
This commit is contained in:
Pragmatic Software 2015-09-03 20:49:06 -07:00
parent 8e1f008f9b
commit 675760289c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PBot/MessageHistory_SQLite.pm
View File

@ -512,6 +512,7 @@ sub get_message_context {
$regex .= ($text =~ m/^\w/) ? '\b' : '\B';
$regex .= quotemeta $text;
$regex .= ($text =~ m/\w$/) ? '\b' : '\B';
$regex =~ s/\\\*/.*?/g;
$messages_count = eval {
my $sth;
@ -641,6 +642,7 @@ sub recall_message_by_text {
$regex .= ($text =~ m/^\w/) ? '\b' : '\B';
$regex .= quotemeta $text;
$regex .= ($text =~ m/\w$/) ? '\b' : '\B';
$regex =~ s/\\\*/.*?/g;
my $messages;
@ -1067,8 +1069,9 @@ sub get_also_known_as {
my $rows = $sth->fetchall_arrayref({});
foreach my $row (@$rows) {
next if $row->{type} == $self->{alias_type}->{WEAK};
$ids{$row->{alias}} = { id => $id, type => $row->{type} };
$self->{pbot}->{logger}->log("[$id] Adding $row->{alias} -> $id [type $row->{type}]\n") if $debug;
$self->{pbot}->{logger}->log("[$id] 1) Adding $row->{alias} -> $id [type $row->{type}]\n") if $debug;
}
my %seen_id;
@ -1086,9 +1089,10 @@ sub get_also_known_as {
foreach my $row (@$rows) {
next if exists $ids{$row->{id}};
next if $row->{type} == $self->{alias_type}->{WEAK};
$ids{$row->{id}} = { id => $id, type => $row->{type} };
$new_aliases++;
$self->{pbot}->{logger}->log("[$id] Adding $row->{id} -> $id [type $row->{type}]\n") if $debug;
$self->{pbot}->{logger}->log("[$id] 2) Adding $row->{id} -> $id [type $row->{type}]\n") if $debug;
}
}
last if not $new_aliases;