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 da5c1d304f89143a2fedc79e1649c4d521f4ad13..1e23c439660e6d91f3a10986552dba4ff942fed1 100644 (file)
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -23,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\.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 {
@@ -92,9 +92,10 @@ 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/|t)\z!o) {
-               my ($inbox, $mid) = ($1, $2);
-               r301($ctx, $inbox, $mid, 't/#u');
+       } 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);
@@ -235,14 +236,14 @@ 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) = @_;
+       my ($ctx, $flat) = @_;
        searcher($ctx) or return need_search($ctx);
+       $ctx->{flat} = $flat;
        require PublicInbox::View;
        PublicInbox::View::thread_html($ctx);
 }
@@ -400,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);
@@ -416,6 +417,7 @@ 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);