use warnings;
sub thread {
- my ($messages, $ordersub) = @_;
+ my ($msgs, $ordersub, $ctx) = @_;
my $id_table = {};
- _add_message($id_table, $_) foreach @$messages;
+
+ # Sadly, we sort here anyways since the fill-in-the-blanks References:
+ # can be shakier if somebody used In-Reply-To with multiple, disparate
+ # messages. So, take the client Date: into account since we can't
+ # alway determine ordering when somebody uses multiple In-Reply-To.
+ # We'll trust the client Date: header here instead of the Received:
+ # time since this is for display (and not retrieval)
+ _add_message($id_table, $_) for sort { $a->{ds} <=> $b->{ds} } @$msgs;
+ my $ibx = $ctx->{-inbox};
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, $ctx) for @$rootset;
$rootset;
}
my $this = _get_cont_for_id($id_table, $smsg->{mid});
$this->{smsg} = $smsg;
+ # saves around 4K across 1K messages
+ # TODO: move this to a more appropriate place, breaks tests
+ # if we do it during psgi_cull
+ delete $smsg->{num};
+
# B. For each element in the message's References field:
defined(my $refs = $smsg->{references}) or return;
# 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;
# 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, $ctx) = @_;
my %seen = ($cur => 1); # self-referential loop prevention
my @q = ($cur);
+ my $ibx = $ctx->{-inbox};
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;