- my $self = shift;
- _add_message($self, $_) foreach @{$self->{messages}};
- $self->{rootset} = [
- grep { !$_->{parent} } values %{$self->{id_table}} ];
- delete $self->{id_table};
-}
-
-sub _get_cont_for_id ($$) {
- my ($self, $mid) = @_;
- $self->{id_table}{$mid} ||= PublicInbox::SearchThread::Msg->new($mid);
+ my ($msgs, $ordersub, $ctx) = @_;
+
+ # A. put all current $msgs (non-ghosts) into %id_table
+ my %id_table = map {;
+ # this delete saves around 4K across 1K messages
+ # TODO: move this to a more appropriate place, breaks tests
+ # if we do it during psgi_cull
+ delete $_->{num};
+
+ $_->{mid} => PublicInbox::SearchThread::Msg::cast($_);
+ } @$msgs;
+
+ # 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
+ # always 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)
+ _set_parent(\%id_table, $_) for sort { $a->{ds} <=> $b->{ds} } @$msgs;
+ my $ibx = $ctx->{ibx};
+ my $rootset = [ grep {
+ !delete($_->{parent}) && $_->visible($ibx)
+ } values %id_table ];
+ $rootset = $ordersub->($rootset);
+ $_->order_children($ordersub, $ctx) for @$rootset;
+ $rootset;