search: try to fill in ghosts when generating thread skeleton

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

diff --git a/lib/PublicInbox/SearchView.pm b/lib/PublicInbox/SearchView.pm
index 777710e3649148bcfec7f2e552ba9bb1416bdca9..c42cf2d63fa3c9b99c2ce5fc534addffcebe8fd6 100644 (file)
--- a/lib/PublicInbox/SearchView.pm
+++ b/lib/PublicInbox/SearchView.pm
@@ -89,7 +89,8 @@ sub mset_summary {
        my $pfx = ' ' x $pad;
        my $res = \($ctx->{-html_tip});
        my $srch = $ctx->{srch};
-       my $obfs = $ctx->{-inbox}->{obfuscate};
+       my $ibx = $ctx->{-inbox};
+       my $obfs_ibx = $ibx->{obfuscate} ? $ibx : undef;
        foreach my $m ($mset->items) {
                my $rank = sprintf("%${pad}d", $m->get_rank + 1);
                my $pct = $m->get_percent;
@@ -103,9 +104,9 @@ sub mset_summary {
                }
                my $s = ascii_html($smsg->subject);
                my $f = ascii_html($smsg->from_name);
-               if ($obfs) {
-                       obfuscate_addrs($s);
-                       obfuscate_addrs($f);
+               if ($obfs_ibx) {
+                       obfuscate_addrs($obfs_ibx, $s);
+                       obfuscate_addrs($obfs_ibx, $f);
                }
                my $ts = PublicInbox::View::fmt_ts($smsg->ts);
                my $mid = PublicInbox::Hval->new_msgid($smsg->mid)->{href};
@@ -206,7 +207,8 @@ sub sort_relevance {
 sub mset_thread {
        my ($ctx, $mset, $q) = @_;
        my %pct;
-       my $msgs = $ctx->{srch}->retry_reopen(sub { [ map {
+       my $srch = $ctx->{srch};
+       my $msgs = $srch->retry_reopen(sub { [ map {
                my $i = $_;
                my $smsg = PublicInbox::SearchMsg->load_doc($i->get_document);
                $pct{$smsg->mid} = $i->get_percent;
@@ -214,7 +216,8 @@ sub mset_thread {
        } ($mset->items) ]});
        my $r = $q->{r};
        my $rootset = PublicInbox::SearchThread::thread($msgs,
-               $r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ts);
+               $r ? sort_relevance(\%pct) : *PublicInbox::View::sort_ts,
+               $srch);
        my $skel = search_nav_bot($mset, $q). "<pre>";
        my $inbox = $ctx->{-inbox};
        $ctx->{-upfx} = '';