www_stream: add response wrapper sub

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

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 22d725009366b79e596f11da1752c6ab648a9eee..27dd15541a34eed0e4b9c0bd6eaf45f5c8013274 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -27,7 +27,7 @@ sub msg_html {
        my ($ctx, $mime, $footer) = @_;
        my $hdr = $mime->header_obj;
        my $tip = _msg_html_prepare($hdr, $ctx);
-       PublicInbox::WwwStream->new($ctx, sub {
+       PublicInbox::WwwStream->response($ctx, 200, sub {
                my ($nr, undef) = @_;
                if ($nr == 1) {
                        $tip . multipart_text_as_html($mime, '') .
@@ -49,7 +49,8 @@ sub msg_html {
 # /$INBOX/$MESSAGE_ID/#R
 sub msg_reply {
        my ($ctx, $hdr) = @_;
-       my $se_url = 'https://git-htmldocs.bogomips.org/git-send-email.html';
+       my $se_url =
+        'https://kernel.org/pub/software/scm/git/docs/git-send-email.html';
 
        my ($arg, $link) = mailto_arg_link($hdr);
        push @$arg, '/path/to/YOUR_REPLY';
@@ -128,7 +129,7 @@ sub index_entry {
 
        my $mapping = $ctx->{mapping};
        if (!$mapping && $irt) {
-               my $mirt = PublicInbox::Hval->msgid($irt);
+               my $mirt = PublicInbox::Hval->new_msgid($irt);
                my $href = $upfx . $mirt->as_href . '/';
                my $html = $mirt->as_html;
                $rv .= qq(In-Reply-To: &lt;<a\nhref="$href/">$html</a>&gt;\n)
@@ -156,7 +157,7 @@ sub index_entry {
                }
                $rv .= " / [<a\nhref=\"${mhref}T/#u\">$flat</a>";
                $rv .= "|<a\nhref=\"${mhref}t/#u\">$threaded</a>]";
-               $rv .= " / <a\nhref=#r$id>thread overview</a>";
+               $rv .= " / <a\nhref=#r$id>$ctx->{s_nr}</a>";
        }
 
        $rv .= $more ? "\n\n" : "\n";
@@ -226,7 +227,8 @@ sub _th_index_lite {
                        $rv .= $pad . $mapping->{$nn->messageid}->[1];
                }
        }
-       $rv .= "<a\nhref=#e$id\nid=m$id>_</a> <a\nhref=#r$id>$s_s, $s_c</a>\n";
+       $rv .= "<a\nhref=#e$id\nid=m$id>_</a> ";
+       $rv .= "<a\nhref=#r$id>$s_s, $s_c; $ctx->{s_nr}</a>\n";
 }
 
 sub walk_thread {
@@ -276,7 +278,7 @@ sub stream_thread ($$) {
        $mime = Email::MIME->new($mime);
        $ctx->{-title_html} = ascii_html($mime->header('Subject'));
        $ctx->{-html_tip} = thread_index_entry($ctx, $level, $mime);
-       my $body = PublicInbox::WwwStream->new($ctx, sub {
+       PublicInbox::WwwStream->response($ctx, 200, sub {
                return unless $ctx;
                while (@q) {
                        $level = shift @q;
@@ -295,7 +297,6 @@ sub stream_thread ($$) {
                $ctx = undef;
                $ret;
        });
-       [ 200, ['Content-Type', 'text/html; charset=UTF-8'], $body ];
 }
 
 sub thread_html {
@@ -319,6 +320,7 @@ sub thread_html {
        $ctx->{root_anchor} = anchor_for($mid);
        $ctx->{seen} = {};
        $ctx->{mapping} = {};
+       $ctx->{s_nr} = "$nr+ messages in thread";
 
        my $th = thread_results($msgs);
        walk_thread($th, $ctx, *pre_thread);
@@ -336,7 +338,7 @@ sub thread_html {
        $ctx->{-title_html} = ascii_html($mime->header('Subject'));
        $ctx->{-html_tip} = '<pre>'.index_entry($mime, $ctx, scalar @$msgs);
        $mime = undef;
-       my $body = PublicInbox::WwwStream->new($ctx, sub {
+       PublicInbox::WwwStream->response($ctx, 200, sub {
                return unless $msgs;
                while ($mime = shift @$msgs) {
                        $mid = mid_clean(mid_mime($mime));
@@ -349,7 +351,6 @@ sub thread_html {
                $msgs = undef;
                '</pre>'.$skel;
        });
-       [ 200, ['Content-Type', 'text/html; charset=UTF-8'], $body ];
 }
 
 sub multipart_text_as_html {