view: thread_skel: drop constant tpfx parameter

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

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 040604b08b926552aa797725e3960bebeeacb0ee..b86c7bda1de4f2f8ae3fa04d3fb558e24e2520e8 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -40,11 +40,7 @@ sub msg_html_i {
                # fake an EOF if generating the footer fails;
                # we want to at least show the message if something
                # here crashes:
-               eval {
-                       my $hdr = delete($ctx->{hdr});
-                       '<pre>' . html_footer($hdr, 1, $ctx) .
-                       '</pre>' . msg_reply($ctx, $hdr)
-               };
+               eval { html_footer($ctx) };
        } else {
                undef
        }
@@ -113,7 +109,7 @@ sub msg_html_more {
 }
 
 # /$INBOX/$MESSAGE_ID/#R
-sub msg_reply {
+sub msg_reply ($$) {
        my ($ctx, $hdr) = @_;
        my $se_url =
         'https://kernel.org/pub/software/scm/git/docs/git-send-email.html';
@@ -723,32 +719,34 @@ sub _msg_html_prepare {
        $rv .= "\n";
 }
 
-sub thread_skel {
-       my ($skel, $ctx, $hdr, $tpfx) = @_;
+sub SKEL_EXPAND () {
+       qq(expand[<a\nhref="T/#u">flat</a>) .
+               qq(|<a\nhref="t/#u">nested</a>]  ) .
+               qq(<a\nhref="t.mbox.gz">mbox.gz</a>  ) .
+               qq(<a\nhref="t.atom">Atom feed</a>);
+}
+
+sub thread_skel ($$$) {
+       my ($skel, $ctx, $hdr) = @_;
        my $mid = mids($hdr)->[0];
        my $ibx = $ctx->{-inbox};
        my ($nr, $msgs) = $ibx->over->get_thread($mid);
-       my $expand = qq(expand[<a\nhref="${tpfx}T/#u">flat</a>) .
-                       qq(|<a\nhref="${tpfx}t/#u">nested</a>]  ) .
-                       qq(<a\nhref="${tpfx}t.mbox.gz">mbox.gz</a>  ) .
-                       qq(<a\nhref="${tpfx}t.atom">Atom feed</a>);
-
        my $parent = in_reply_to($hdr);
        $$skel .= "\n<b>Thread overview: </b>";
        if ($nr <= 1) {
                if (defined $parent) {
-                       $$skel .= "$expand\n ";
-                       $$skel .= ghost_parent("$tpfx../", $parent) . "\n";
+                       $$skel .= SKEL_EXPAND."\n ";
+                       $$skel .= ghost_parent('../', $parent) . "\n";
                } else {
-                       $$skel .= "[no followups] $expand\n";
+                       $$skel .= '[no followups] '.SKEL_EXPAND."\n";
                }
                $ctx->{next_msg} = undef;
                $ctx->{parent_msg} = $parent;
                return;
        }
 
-       $$skel .= "$nr+ messages / $expand";
-       $$skel .= qq!  <a\nhref="#b">top</a>\n!;
+       $$skel .= $nr;
+       $$skel .= '+ messages / '.SKEL_EXPAND.qq!  <a\nhref="#b">top</a>\n!;
 
        # nb: mutt only shows the first Subject in the index pane
        # when multiple Subject: headers are present, so we follow suit:
@@ -800,17 +798,17 @@ sub _parent_headers {
        $rv;
 }
 
+# returns a string buffer via ->getline
 sub html_footer {
-       my ($hdr, $standalone, $ctx, $rhref) = @_;
-
-       my $ibx = $ctx->{-inbox} if $ctx;
+       my ($ctx) = @_;
+       my $ibx = $ctx->{-inbox};
+       my $hdr = delete $ctx->{hdr};
        my $upfx = '../';
-       my $tpfx = '';
-       my $skel = $standalone ? " <a\nhref=\"$upfx\">index</a>" : '';
-       my $irt = '';
-       if ($skel && $ibx->over) {
+       my $skel = " <a\nhref=\"$upfx\">index</a>";
+       my $rv = '<pre>';
+       if ($ibx->over) {
                $skel .= "\n";
-               thread_skel(\$skel, $ctx, $hdr, $tpfx);
+               thread_skel(\$skel, $ctx, $hdr);
                my ($next, $prev);
                my $parent = '       ';
                $next = $prev = '    ';
@@ -839,13 +837,12 @@ sub html_footer {
                } elsif ($u) { # unlikely
                        $parent = " <a\nhref=\"$u\"\nrel=prev>parent</a>";
                }
-               $irt = "$next $prev$parent ";
-       } else {
-               $irt = '';
+               $rv .= "$next $prev$parent ";
        }
-       $rhref ||= '#R';
-       $irt .= qq(<a\nhref="$rhref">reply</a>);
-       $irt .= $skel;
+       $rv .= qq(<a\nhref="#R">reply</a>);
+       $rv .= $skel;
+       $rv .= '</pre>';
+       $rv .= msg_reply($ctx, $hdr);
 }
 
 sub linkify_ref_no_over {