www_stream: add response wrapper sub

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

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index e211cd6d5fcf45091b94b9b75fad8c9d963642bf..c4509bd95649ae2f8caa31c26600ef5b1bb0d2bf 100644 (file)
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -15,6 +15,7 @@ use strict;
 use warnings;
 use Plack::Request;
 use PublicInbox::Config;
+use PublicInbox::Hval;
 use URI::Escape qw(uri_escape_utf8 uri_unescape);
 use constant SSOMA_URL => '//ssoma.public-inbox.org/';
 use constant PI_URL => '//public-inbox.org/';
@@ -22,7 +23,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 {
@@ -45,7 +46,10 @@ sub call {
 
        # we don't care about multi-value
        my %qp = map {
-               (split('=', $_, 2))
+               my ($k, $v) = split('=', $_, 2);
+               $v = '' unless defined $v;
+               $v =~ tr/+/ /;
+               ($k, $v)
        } split(/[&;]/, uri_unescape($env->{QUERY_STRING}));
        $ctx->{qp} = \%qp;
 
@@ -71,7 +75,8 @@ sub call {
                invalid_inbox($self, $ctx, $1) || get_index($ctx);
        } elsif ($path_info =~ m!$INBOX_RE/(?:atom\.xml|new\.atom)\z!o) {
                invalid_inbox($self, $ctx, $1) || get_atom($ctx);
-
+       } elsif ($path_info =~ m!$INBOX_RE/new\.html\z!o) {
+               invalid_inbox($self, $ctx, $1) || get_new($ctx);
        } elsif ($path_info =~ m!$INBOX_RE/
                                ($PublicInbox::GitHTTPBackend::ANY)\z!ox) {
                my $path = $2;
@@ -87,11 +92,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);
 
@@ -182,6 +191,13 @@ sub get_atom {
        PublicInbox::Feed::generate($ctx);
 }
 
+# /$INBOX/new.html                     -> HTML only
+sub get_new {
+       my ($ctx) = @_;
+       require PublicInbox::Feed;
+       PublicInbox::Feed::new_html($ctx);
+}
+
 # /$INBOX/?r=$GIT_COMMIT                 -> HTML only
 sub get_index {
        my ($ctx) = @_;
@@ -199,9 +215,7 @@ sub get_index {
 # just returns a string ref for the blob in the current ctx
 sub mid2blob {
        my ($ctx) = @_;
-       require PublicInbox::MID;
-       my $path = PublicInbox::MID::mid2path($ctx->{mid});
-       $ctx->{git}->cat_file("HEAD:$path");
+       $ctx->{-inbox}->msg_by_mid($ctx->{mid});
 }
 
 # /$INBOX/$MESSAGE_ID/raw                    -> raw mbox
@@ -222,31 +236,16 @@ sub get_mid_html {
        require Email::MIME;
        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/
 sub get_thread {
        my ($ctx, $flat) = @_;
-       my $srch = searcher($ctx) or return need_search($ctx);
-       require PublicInbox::View;
-       my $foot = footer($ctx);
+       searcher($ctx) or return need_search($ctx);
        $ctx->{flat} = $flat;
-       PublicInbox::View::thread_html($ctx, $foot, $srch);
+       require PublicInbox::View;
+       PublicInbox::View::thread_html($ctx);
 }
 
 sub ctx_get {
@@ -263,6 +262,7 @@ sub footer {
 
        # auto-generate a footer
        chomp(my $desc = $obj->description);
+       $desc = PublicInbox::Hval::ascii_html($desc);
 
        my $urls;
        my @urls = @{$obj->cloneurl};
@@ -417,17 +417,15 @@ sub msg_page {
        my $ret;
        $ret = invalid_inbox_mid($self, $ctx, $inbox, $mid) and return $ret;
        '' eq $e and return get_mid_html($ctx);
+       'T/' eq $e and return get_thread($ctx, 1);
        't/' eq $e and return get_thread($ctx);
        't.atom' eq $e and return get_thread_atom($ctx);
        't.mbox' eq $e and return get_thread_mbox($ctx);
        't.mbox.gz' eq $e and return get_thread_mbox($ctx, '.gz');
-       'T/' eq $e and return get_thread($ctx, 1);
        'raw' eq $e and return get_mid_txt($ctx);
 
        # 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);
 }