view: msg_html uses getline body to reduce latency

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

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index d26b69c00050879d3fb41949669c310c4417b510..c25deff3117dfe576ec33719b4bc2cc17befbf20 100644 (file)
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -22,7 +22,7 @@ require PublicInbox::Git;
 use PublicInbox::GitHTTPBackend;
 our $INBOX_RE = qr!\A/([\w\.\-]+)!;
 our $MID_RE = qr!([^/]+)!;
-our $END_RE = qr!(T/|t/|R/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
+our $END_RE = qr!(T/|t/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
 our $ATTACH_RE = qr!(\d[\.\d]*)-([[:alnum:]][\w\.-]+[[:alnum:]])!i;
 
 sub new {
@@ -88,11 +88,15 @@ sub call {
                invalid_inbox_mid($self, $ctx, $1, $2) ||
                        get_attach($ctx, $idx, $fn);
        # in case people leave off the trailing slash:
-       } elsif ($path_info =~ m!$INBOX_RE/$MID_RE/(T|t|R)\z!o) {
+       } elsif ($path_info =~ m!$INBOX_RE/$MID_RE/(T|t)\z!o) {
                my ($inbox, $mid, $suffix) = ($1, $2, $3);
                $suffix .= $suffix =~ /\A[tT]\z/ ? '/#u' : '/';
                r301($ctx, $inbox, $mid, $suffix);
 
+       } elsif ($path_info =~ m!$INBOX_RE/$MID_RE/R/?\z!o) {
+               my ($inbox, $mid) = ($1, $2);
+               r301($ctx, $inbox, $mid, '#R');
+
        } elsif ($path_info =~ m!$INBOX_RE/$MID_RE/f/?\z!o) {
                r301($ctx, $1, $2);
 
@@ -224,20 +228,7 @@ sub get_mid_html {
        my $mime = Email::MIME->new($x);
        searcher($ctx);
        [ 200, [ 'Content-Type' => 'text/html; charset=UTF-8' ],
-         [ PublicInbox::View::msg_html($ctx, $mime, $foot) ] ];
-}
-
-# /$INBOX/$MESSAGE_ID/R/                   -> HTML content (fullquotes)
-sub get_reply_html {
-       my ($ctx) = @_;
-       my $x = mid2blob($ctx) or return r404($ctx);
-
-       require PublicInbox::View;
-       my $foot = footer($ctx);
-       require Email::MIME;
-       my $hdr = Email::MIME->new($x)->header_obj;
-       [ 200, [ 'Content-Type' => 'text/html; charset=UTF-8' ],
-         [ PublicInbox::View::msg_reply($ctx, $hdr, $foot)] ];
+         PublicInbox::View::msg_html($ctx, $mime, $foot) ];
 }
 
 # /$INBOX/$MESSAGE_ID/t/
@@ -427,8 +418,6 @@ sub msg_page {
 
        # legacy, but no redirect for compatibility:
        'f/' eq $e and return get_mid_html($ctx);
-
-       'R/' eq $e and return get_reply_html($ctx);
        r404($ctx);
 }