view: s/threaded/nested/ in view

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

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 7454acbba153bc80f86ae09f4c931c36bb007a5b..ad94977a244693c9531403780b733d9997f738f2 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -104,9 +104,8 @@ EOF
 sub in_reply_to {
        my ($hdr) = @_;
        my %mid = map { $_ => 1 } $hdr->header_raw('Message-ID');
-       my @refs = ($hdr->header_raw('References'),
-                       $hdr->header_raw('In-Reply-To'));
-       @refs = ((join(' ', @refs)) =~ /<([^>]+)>/g);
+       my @refs = (($hdr->header_raw('References') || '') =~ /<([^>]+)>/g);
+       push(@refs, (($hdr->header_raw('In-Reply-To') || '') =~ /<([^>]+)>/g));
        while (defined(my $irt = pop @refs)) {
                next if $mid{"<$irt>"};
                return $irt;
@@ -187,17 +186,17 @@ sub index_entry {
                $rv .= "\t[relevance $pct->{$mid_raw}%]";
                $hr = 1;
        } elsif ($mapping) {
-               my $threaded = 'threaded';
+               my $nested = 'nested';
                my $flat = 'flat';
                my $end = '';
                if ($ctx->{flat}) {
                        $hr = 1;
                        $flat = "<b>$flat</b>";
                } else {
-                       $threaded = "<b>$threaded</b>";
+                       $nested = "<b>$nested</b>";
                }
                $rv .= "\t[<a\nhref=\"${mhref}T/#u\">$flat</a>";
-               $rv .= "|<a\nhref=\"${mhref}t/#u\">$threaded</a>]";
+               $rv .= "|<a\nhref=\"${mhref}t/#u\">$nested</a>]";
                $rv .= " <a\nhref=#r$id>$ctx->{s_nr}</a>";
        } else {
                $hr = $ctx->{-hr};
@@ -371,7 +370,7 @@ sub thread_html {
        $ctx->{mapping} = {};
        $ctx->{s_nr} = "$nr+ messages in thread";
 
-       my $rootset = thread_results($msgs);
+       my $rootset = thread_results($msgs, $srch);
 
        # reduce hash lookups in pre_thread->skel_dump
        my $inbox = $ctx->{-inbox};
@@ -608,7 +607,7 @@ sub thread_skel {
        # reduce hash lookups in skel_dump
        my $ibx = $ctx->{-inbox};
        $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
-       walk_thread(thread_results($sres), $ctx, *skel_dump);
+       walk_thread(thread_results($sres, $srch), $ctx, *skel_dump);
 
        $ctx->{parent_msg} = $parent;
 }
@@ -737,9 +736,9 @@ sub msg_timestamp {
 }
 
 sub thread_results {
-       my ($msgs) = @_;
+       my ($msgs, $srch) = @_;
        require PublicInbox::SearchThread;
-       PublicInbox::SearchThread::thread($msgs, *sort_ts);
+       PublicInbox::SearchThread::thread($msgs, *sort_ts, $srch);
 }
 
 sub missing_thread {
@@ -1001,7 +1000,7 @@ sub index_topics {
        my $nr = scalar @{$sres->{msgs}};
        if ($nr) {
                $sres = load_results($srch, $sres);
-               walk_thread(thread_results($sres), $ctx, *acc_topic);
+               walk_thread(thread_results($sres, $srch), $ctx, *acc_topic);
        }
        $ctx->{-next_o} = $off+ $nr;
        $ctx->{-cur_o} = $off;