view: do not shorten top-level messages in thread view

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

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 6cb340b0df9206c2490c265df2313caded4c0ec1..9ca4a6a419ab49e1b1c488783d880b36df5fe92f 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -117,7 +117,7 @@ sub index_entry {
        my $mhref = "${path}$href/";
 
        # show full message if it's our root message
-       if ($root_anchor ne $id) {
+       if ($root_anchor ne $id || ($level != 0 && !$ctx->{flat})) {
                $fhref = "${path}$href/f/";
                $more_ref = \$more;
        }
@@ -410,7 +410,7 @@ sub headers_to_html_header {
        my $mid = $header_obj->header('Message-ID');
        $mid = PublicInbox::Hval->new_msgid($mid);
        foreach my $h (qw(From To Cc Subject Date)) {
-               my $v = $mime->header($h);
+               my $v = $header_obj->header($h);
                defined($v) && ($v ne '') or next;
                $v = PublicInbox::Hval->new_oneline($v);
 
@@ -434,7 +434,12 @@ sub headers_to_html_header {
        $rv .= "(<a\nhref=\"${upfx}raw\">raw</a>)\n";
        my $atom;
        if ($srch) {
-               $rv .= "<a\nhref=\"${upfx}t/\">References: [expand]</a>\n";
+               if ($header_obj->header('In-Reply-To') ||
+                   $header_obj->header('References')) {
+                       $rv .= "<a\nhref=\"${upfx}t/#u\">" .
+                               "References: [expand]</a>\n";
+               }
+
                $atom = qq{<link\nrel=alternate\ntitle="Atom feed"\n} .
                        qq!href="${upfx}t.atom"\ntype="application/atom+xml"/>!;
        } else {