view: reduce parameters for html_footer

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

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index d8a008c7ffe01bf29862c65a3664e8a04a4b4afc..0eb20ae0d7f7f8bc2d1ba103ae70ee151614f72a 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';
@@ -385,7 +381,8 @@ sub _th_index_lite {
        $rv .= $pad ."<a\nhref=#r$id>$s_s, $s_c; $ctx->{s_nr}</a>\n";
 }
 
-sub walk_thread {
+# non-recursive thread walker
+sub walk_thread ($$$) {
        my ($rootset, $ctx, $cb) = @_;
        my @q = map { (0, $_, -1) } @$rootset;
        while (@q) {
@@ -398,7 +395,7 @@ sub walk_thread {
        }
 }
 
-sub pre_thread  {
+sub pre_thread  { # walk_thread callback
        my ($ctx, $level, $node, $idx) = @_;
        $ctx->{mapping}->{$node->{id}} = [ '', $node, $idx, $level ];
        skel_dump($ctx, $level, $node);
@@ -478,7 +475,7 @@ sub thread_html {
 
        # reduce hash lookups in pre_thread->skel_dump
        $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
-       walk_thread($rootset, $ctx, *pre_thread);
+       walk_thread($rootset, $ctx, \&pre_thread);
 
        $skel .= '</pre>';
        return stream_thread($rootset, $ctx) unless $ctx->{flat};
@@ -761,7 +758,7 @@ sub thread_skel {
 
        # reduce hash lookups in skel_dump
        $ctx->{-obfs_ibx} = $ibx->{obfuscate} ? $ibx : undef;
-       walk_thread(thread_results($ctx, $msgs), $ctx, *skel_dump);
+       walk_thread(thread_results($ctx, $msgs), $ctx, \&skel_dump);
 
        $ctx->{parent_msg} = $parent;
 }
@@ -799,17 +796,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 = '    ';
@@ -838,13 +835,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 {
@@ -912,7 +908,7 @@ sub thread_results {
        if (defined($mid) && scalar(@$rootset) > 1) {
                $ctx->{root_idx} = -1;
                my $nr = scalar @$msgs;
-               walk_thread($rootset, $ctx, *find_mid_root);
+               walk_thread($rootset, $ctx, \&find_mid_root);
                my $idx = $ctx->{found_mid_at};
                if (defined($idx) && $idx != 0) {
                        my $tip = splice(@$rootset, $idx, 1);
@@ -949,7 +945,7 @@ sub dedupe_subject {
        $omit;
 }
 
-sub skel_dump {
+sub skel_dump { # walk_thread callback
        my ($ctx, $level, $node) = @_;
        my $smsg = $node->{smsg} or return _skel_ghost($ctx, $level, $node);
 
@@ -1065,7 +1061,7 @@ sub sort_ds {
 
 # accumulate recent topics if search is supported
 # returns 200 if done, 404 if not
-sub acc_topic {
+sub acc_topic { # walk_thread callback
        my ($ctx, $level, $node) = @_;
        my $mid = $node->{id};
        my $x = $node->{smsg} || $ctx->{-inbox}->smsg_by_mid($mid);
@@ -1231,9 +1227,9 @@ sub index_topics {
        my ($ctx) = @_;
        my $msgs = paginate_recent($ctx, 200); # 200 is our window
        if (@$msgs) {
-               walk_thread(thread_results($ctx, $msgs), $ctx, *acc_topic);
+               walk_thread(thread_results($ctx, $msgs), $ctx, \&acc_topic);
        }
-       PublicInbox::WwwStream->response($ctx, dump_topics($ctx), *index_nav);
+       PublicInbox::WwwStream->response($ctx, dump_topics($ctx), \&index_nav);
 }
 
 sub thread_adj_level {