inbox: base_url method takes PSGI env hashref instead

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

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index f1f4abd5f86d517383683bb67fc989fdcd3f0c0e..1e23c439660e6d91f3a10986552dba4ff942fed1 100644 (file)
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -48,6 +48,7 @@ sub call {
        my %qp = map {
                my ($k, $v) = split('=', $_, 2);
                $v = '' unless defined $v;
+               $v =~ tr/+/ /;
                ($k, $v)
        } split(/[&;]/, uri_unescape($env->{QUERY_STRING}));
        $ctx->{qp} = \%qp;
@@ -74,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;
@@ -189,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) = @_;
@@ -227,18 +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) ];
+       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 {
@@ -394,7 +401,7 @@ sub r301 {
                return $r404 if $r404;
                $obj = $ctx->{-inbox};
        }
-       my $url = $obj->base_url($cgi);
+       my $url = $obj->base_url($ctx->{env});
        my $qs = $ctx->{env}->{QUERY_STRING};
        $url .= (uri_escape_utf8($mid) . '/') if (defined $mid);
        $url .= $suffix if (defined $suffix);
@@ -410,11 +417,11 @@ 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: