lei: improve handling of Message-ID-less draft messages

[public-inbox.git] / lib / PublicInbox / LeiSearch.pm

diff --git a/lib/PublicInbox/LeiSearch.pm b/lib/PublicInbox/LeiSearch.pm
index 360a37e5ce1649db06467c9e257bfbf8a014f7ba..148aa18510546f603ef9fa6b98790ea8fa4925fe 100644 (file)
--- a/lib/PublicInbox/LeiSearch.pm
+++ b/lib/PublicInbox/LeiSearch.pm
@@ -27,18 +27,25 @@ sub msg_keywords {
        wantarray ? sort(keys(%$kw)) : $kw;
 }
 
+# lookup keywords+labels for external messages
 sub xsmsg_vmd {
-       my ($self, $smsg) = @_;
+       my ($self, $smsg, $want_label) = @_;
        return if $smsg->{kw};
        my $xdb = $self->xdb; # set {nshard};
-       my %kw;
+       my (%kw, %L, $doc, $x);
        $kw{flagged} = 1 if delete($smsg->{lei_q_tt_flagged});
        my @num = $self->over->blob_exists($smsg->{blob});
        for my $num (@num) { # there should only be one...
-               my $kw = xap_terms('K', $xdb, num2docid($self, $num));
-               %kw = (%kw, %$kw);
+               $doc = $xdb->get_document(num2docid($self, $num));
+               $x = xap_terms('K', $doc);
+               %kw = (%kw, %$x);
+               if ($want_label) { # JSON/JMAP only
+                       $x = xap_terms('L', $doc);
+                       %L = (%L, %$x);
+               }
        }
        $smsg->{kw} = [ sort keys %kw ] if scalar(keys(%kw));
+       $smsg->{L} = [ sort keys %L ] if scalar(keys(%L));
 }
 
 # when a message has no Message-IDs at all, this is needed for
@@ -51,7 +58,7 @@ sub content_key ($) {
                        qw(Message-ID X-Alt-Message-ID Resent-Message-ID));
        unless (@$mids) {
                $eml->{-lei_fake_mid} = $mids->[0] =
-                               PublicInbox::Import::digest2mid($dig, $eml);
+                               PublicInbox::Import::digest2mid($dig, $eml, 0);
        }
        ($chash, $mids);
 }
@@ -63,7 +70,10 @@ sub _cmp_1st { # git->cat_async callback
        }
 }
 
-sub xoids_for { # returns { OID => docid } mapping for $eml matches
+# returns { OID => num } mapping for $eml matches
+# The `num' hash value only makes sense from LeiSearch itself
+# and is nonsense from the PublicInbox::LeiALE subclass
+sub xoids_for {
        my ($self, $eml, $min) = @_;
        my ($chash, $mids) = content_key($eml);
        my @overs = ($self->over // $self->overs_all);
@@ -90,11 +100,34 @@ sub xoids_for { # returns { OID => docid } mapping for $eml matches
 
 # returns true if $eml is indexed by lei/store and keywords don't match
 sub kw_changed {
-       my ($self, $eml, $new_kw_sorted) = @_;
-       my $xoids = xoids_for($self, $eml, 1) // return;
-       my ($num) = values %$xoids;
-       my @cur_kw = msg_keywords($self, $num);
+       my ($self, $eml, $new_kw_sorted, $docids) = @_;
+       my $xoids = xoids_for($self, $eml) // return;
+       $docids //= [];
+       @$docids = sort { $a <=> $b } values %$xoids;
+       my @cur_kw = msg_keywords($self, $docids->[0]);
        join("\0", @$new_kw_sorted) eq join("\0", @cur_kw) ? 0 : 1;
 }
 
+sub all_terms {
+       my ($self, $pfx) = @_;
+       my $xdb = $self->xdb;
+       my $cur = $xdb->allterms_begin($pfx);
+       my $end = $xdb->allterms_end($pfx);
+       my %ret;
+       for (; $cur != $end; $cur++) {
+               my $tn = $cur->get_termname;
+               index($tn, $pfx) == 0 and
+                       $ret{substr($tn, length($pfx))} = undef;
+       }
+       wantarray ? (sort keys %ret) : \%ret;
+}
+
+sub qparse_new {
+       my ($self) = @_;
+       my $qp = $self->SUPER::qparse_new; # PublicInbox::Search
+       $qp->add_boolean_prefix('kw', 'K');
+       $qp->add_boolean_prefix('L', 'L');
+       $qp
+}
+
 1;