www_stream: fix search for new.html endpoint

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

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index b4f80d1d470bb991be73372d3bc36312f01c4128..140cfeedbec1ca8bee1e8ae330406183dc36d93f 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, '') .
@@ -51,24 +51,38 @@ sub msg_reply {
        my ($ctx, $hdr) = @_;
        my $se_url =
         'https://kernel.org/pub/software/scm/git/docs/git-send-email.html';
+       my $p_url =
+        'https://en.wikipedia.org/wiki/Posting_style#Interleaved_style';
 
        my ($arg, $link) = mailto_arg_link($hdr);
        push @$arg, '/path/to/YOUR_REPLY';
+       $arg = join(" \\\n    ", '', @$arg);
+       <<EOF
+<pre
+id=R>You may reply publically to <a
+href=#t>this message</a> via
+plain-text email using any one of the following methods:
 
-       "<pre\nid=R>".
-       "You may reply publically to <a\nhref=#t>this message</a> via\n".
-       "plain-text email using any one of the following methods:\n\n" .
-       "* Save the following mbox file, import it into your mail client,\n" .
-       "  and reply-to-all from there: <a\nhref=raw>mbox</a>\n\n" .
-       "* Reply to all the recipients using the <b>--to</b>, <b>--cc</b>,\n" .
-       "  and <b>--in-reply-to</b> switches of git-send-email(1):\n\n" .
-       "  git send-email \\\n    " .
-       join(" \\\n    ", @$arg ). "\n\n" .
-       qq(  <a\nhref="$se_url">$se_url</a>\n\n) .
-       "* If your mail client supports setting the <b>In-Reply-To</b>" .
-       " header\n  via mailto: links, try the " .
-       qq(<a\nhref="$link">mailto: link</a>\n) .
-       '</pre>';
+* Save the following mbox file, import it into your mail client,
+  and reply-to-all from there: <a
+href=raw>mbox</a>
+
+  Avoid top-posting and favor interleaved quoting:
+  <a
+href="$p_url">$p_url</a>
+
+* Reply to all the recipients using the <b>--to</b>, <b>--cc</b>,
+  and <b>--in-reply-to</b> switches of git-send-email(1):
+
+  git send-email$arg
+
+  <a
+href="$se_url">$se_url</a>
+
+* If your mail client supports setting the <b>In-Reply-To</b> header
+  via mailto: links, try the <a
+href="$link">mailto: link</a></pre>
+EOF
 }
 
 sub in_reply_to {
@@ -111,9 +125,10 @@ sub index_entry {
        my $root_anchor = $ctx->{root_anchor} || '';
        my $irt = in_reply_to($hdr);
 
-       my $rv = '<b>'.ascii_html($subj).'</b>';
-       $rv = "<u\nid=u>$rv</u>" if $root_anchor eq $id_m;
-       $rv .= "\n";
+       my $rv = "<a\nhref=#e$id\nid=m$id>*</a> ";
+       $subj = '<b>'.ascii_html($subj).'</b>';
+       $subj = "<u\nid=u>$subj</u>" if $root_anchor eq $id_m;
+       $rv .= $subj . "\n";
        $rv .= _th_index_lite($mid_raw, $irt, $id, $ctx);
        my @tocc;
        foreach my $f (qw(To Cc)) {
@@ -123,8 +138,8 @@ sub index_entry {
        $rv .= "From: "._hdr_names($hdr, 'From').' @ '._msg_date($hdr)." UTC";
        my $upfx = $ctx->{-upfx};
        my $mhref = $upfx . $mid->as_href . '/';
-       $rv .= qq{ (<a\nhref="$mhref/">permalink</a> / };
-       $rv .= qq{<a\nhref="$mhref/raw">raw</a>)\n};
+       $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};
@@ -227,8 +242,7 @@ sub _th_index_lite {
                        $rv .= $pad . $mapping->{$nn->messageid}->[1];
                }
        }
-       $rv .= "<a\nhref=#e$id\nid=m$id>_</a> ";
-       $rv .= "<a\nhref=#r$id>$s_s, $s_c; $ctx->{s_nr}</a>\n";
+       $rv .= $pad ."<a\nhref=#r$id>$s_s, $s_c; $ctx->{s_nr}</a>\n";
 }
 
 sub walk_thread {
@@ -278,7 +292,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;
@@ -297,7 +311,6 @@ sub stream_thread ($$) {
                $ctx = undef;
                $ret;
        });
-       [ 200, ['Content-Type', 'text/html; charset=UTF-8'], $body ];
 }
 
 sub thread_html {
@@ -339,7 +352,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));
@@ -352,7 +365,6 @@ sub thread_html {
                $msgs = undef;
                '</pre>'.$skel;
        });
-       [ 200, ['Content-Type', 'text/html; charset=UTF-8'], $body ];
 }
 
 sub multipart_text_as_html {