thread: prevent hidden threads in /$INBOX/ landing page

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

diff --git a/lib/PublicInbox/SearchThread.pm b/lib/PublicInbox/SearchThread.pm
index 2966907a9d4b3678a47a1b931b2f2287a17db161..450a06f43bc86f6266d32811e6efd507ffe94c7a 100644 (file)
--- a/lib/PublicInbox/SearchThread.pm
+++ b/lib/PublicInbox/SearchThread.pm
@@ -22,14 +22,15 @@ use strict;
 use warnings;
 
 sub thread {
-       my ($messages, $ordersub) = @_;
+       my ($messages, $ordersub, $ibx) = @_;
        my $id_table = {};
        _add_message($id_table, $_) foreach @$messages;
        my $rootset = [ grep {
-               !delete($_->{parent}) && $_->visible } values %$id_table ];
+                       !delete($_->{parent}) && $_->visible($ibx)
+               } values %$id_table ];
        $id_table = undef;
        $rootset = $ordersub->($rootset);
-       $_->order_children($ordersub) for @$rootset;
+       $_->order_children($ordersub, $ibx) for @$rootset;
        $rootset;
 }
 
@@ -75,7 +76,9 @@ sub _add_message ($$) {
 
        # C. Set the parent of this message to be the last element in
        # References.
-       $prev->add_child($this) if defined $prev;
+       if (defined $prev && !$this->has_descendent($prev)) { # would loop
+               $prev->add_child($this);
+       }
 }
 
 package PublicInbox::SearchThread::Msg;
@@ -129,20 +132,21 @@ sub has_descendent {
 # Do not show/keep ghosts iff they have no children.  Sometimes
 # a ghost Message-ID is the result of a long header line
 # being folded/mangled by a MUA, and not a missing message.
-sub visible ($) {
-       my ($self) = @_;
-       $self->{smsg} || scalar values %{$self->{children}};
+sub visible ($$) {
+       my ($self, $ibx) = @_;
+       ($self->{smsg} ||= eval { $ibx->smsg_by_mid($self->{id}) }) ||
+        (scalar values %{$self->{children}});
 }
 
 sub order_children {
-       my ($cur, $ordersub) = @_;
+       my ($cur, $ordersub, $ibx) = @_;
 
        my %seen = ($cur => 1); # self-referential loop prevention
        my @q = ($cur);
        while (defined($cur = shift @q)) {
                my $c = $cur->{children}; # The hashref here...
 
-               $c = [ grep { !$seen{$_}++ && visible($_) } values %$c ];
+               $c = [ grep { !$seen{$_}++ && visible($_, $ibx) } values %$c ];
                $c = $ordersub->($c) if scalar @$c > 1;
                $cur->{children} = $c; # ...becomes an arrayref
                push @q, @$c;