www: implement hybrid flat+thread conversation view

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

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index f88894a0d02810d51c2926a8ba9915bec256c306..984268e9e013acdd829b42a5cc5011f2189f4ac5 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/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
+our $END_RE = qr!(t/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
 our $ATTACH_RE = qr!(\d[\.\d]*)-([[:alnum:]][\w\.-]+[[:alnum:]])!i;
 
 sub new {
@@ -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;
@@ -90,10 +91,9 @@ 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)\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/(?:T|T/|t)\z!o) {
+               my ($inbox, $mid) = ($1, $2);
+               r301($ctx, $inbox, $mid, 't/#u');
 
        } elsif ($path_info =~ m!$INBOX_RE/$MID_RE/R/?\z!o) {
                my ($inbox, $mid) = ($1, $2);
@@ -206,9 +206,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