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 17d6de56a18b5b8ccf63b5ecd14a79de513b4f1a..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';
@@ -103,7 +104,7 @@ sub index_entry {
        my $subj = $hdr->header('Subject');
 
        my $mid_raw = mid_clean(mid_mime($mime));
-       my $id = id_compress($mid_raw);
+       my $id = id_compress($mid_raw, 1);
        my $id_m = 'm'.$id;
        my $mid = PublicInbox::Hval->new_msgid($mid_raw);
 
@@ -119,20 +120,23 @@ sub index_entry {
                my $dst = _hdr_names($hdr, $f);
                push @tocc, "$f: $dst" if $dst ne '';
        }
-       my $mapping = $ctx->{mapping};
        $rv .= "From: "._hdr_names($hdr, 'From').' @ '._msg_date($hdr)." UTC";
        my $upfx = $ctx->{-upfx};
-       $rv .= qq{ (<a\nhref="$upfx$mid_raw/">permalink</a> / };
-       $rv .= qq{<a\nhref="$upfx$mid_raw/raw">raw</a>)\n};
+       my $mhref = $upfx . $mid->as_href . '/';
+       $rv .= qq{ (<a\nhref="$mhref/">permalink</a> / };
+       $rv .= qq{<a\nhref="$mhref/raw">raw</a>)\n};
        $rv .= '  '.join('; +', @tocc) . "\n" if @tocc;
+
+       my $mapping = $ctx->{mapping};
        if (!$mapping && $irt) {
-               $rv .= qq(In-Reply-To: &lt;<a\nhref="$upfx$irt/">$irt</a>&gt;\n)
+               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)
        }
        $rv .= "\n";
 
        # scan through all parts, looking for displayable text
-       my $href = $mid->as_href;
-       my $mhref = $ctx->{-upfx}.$href.'/';
        msg_iter($mime, sub { $rv .= add_text_body($mhref, $_[0]) });
 
        # add the footer
@@ -151,8 +155,9 @@ sub index_entry {
                } else {
                        $threaded = "<b>$threaded</b>";
                }
-               $rv .= " [<a\nhref=\"${mhref}t/#u\">$threaded</a>";
-               $rv .= "|<a\nhref=\"${mhref}T/#u\">$flat</a>]";
+               $rv .= " / [<a\nhref=\"${mhref}T/#u\">$flat</a>";
+               $rv .= "|<a\nhref=\"${mhref}t/#u\">$threaded</a>]";
+               $rv .= " / <a\nhref=#r$id>$ctx->{s_nr}</a>";
        }
 
        $rv .= $more ? "\n\n" : "\n";
@@ -222,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 {
@@ -272,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;
@@ -291,7 +297,6 @@ sub stream_thread ($$) {
                $ctx = undef;
                $ret;
        });
-       [ 200, ['Content-Type', 'text/html; charset=UTF-8'], $body ];
 }
 
 sub thread_html {
@@ -315,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);
@@ -332,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));
@@ -345,7 +351,6 @@ sub thread_html {
                $msgs = undef;
                '</pre>'.$skel;
        });
-       [ 200, ['Content-Type', 'text/html; charset=UTF-8'], $body ];
 }
 
 sub multipart_text_as_html {
@@ -495,7 +500,7 @@ sub thread_skel {
        my $mid = mid_clean($hdr->header_raw('Message-ID'));
        my $sres = $srch->get_thread($mid);
        my $nr = $sres->{total};
-       my $expand = qq(<a\nhref="${tpfx}t/#u">expand</a> ) .
+       my $expand = qq(<a\nhref="${tpfx}T/#u">expand</a> ) .
                        qq(/ <a\nhref="${tpfx}t.mbox.gz">mbox.gz</a> ) .
                        qq(/ <a\nhref="${tpfx}t.atom">Atom feed</a>);
 
@@ -866,7 +871,7 @@ sub emit_topics {
                }
 
                $subj = PublicInbox::Hval->new($subj)->as_html;
-               $cur->[1] .= "<a\nhref=\"$mid/t/#u\"><b>$subj</b></a>\n";
+               $cur->[1] .= "<a\nhref=\"$mid/T/#u\"><b>$subj</b></a>\n";
                $ts = fmt_ts($ts);
                my $attr = " $ts UTC";