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 88d4f6f099bc1a8629f73c9a8db6d888811cb4a5..984268e9e013acdd829b42a5cc5011f2189f4ac5 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\.mbox(?:\.gz)?|t\.atom|raw|)!;
 our $ATTACH_RE = qr!(\d[\.\d]*)-([[:alnum:]][\w\.-]+[[:alnum:]])!i;
 
 sub new {
@@ -40,10 +41,21 @@ sub run {
 sub call {
        my ($self, $env) = @_;
        my $cgi = Plack::Request->new($env);
-       my $ctx = {cgi => $cgi, pi_config => $self->{pi_config}, www => $self};
-       my $path_info = $cgi->path_info;
+       my $ctx = { cgi => $cgi, env => $env, www => $self,
+               pi_config => $self->{pi_config} };
+
+       # we don't care about multi-value
+       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;
+
+       my $path_info = $env->{PATH_INFO};
+       my $method = $env->{REQUEST_METHOD};
 
-       my $method = $cgi->method;
        if ($method eq 'POST' &&
                 $path_info =~ m!$INBOX_RE/(git-upload-pack)\z!) {
                my $path = $2;
@@ -79,10 +91,13 @@ 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) {
-               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);
+               r301($ctx, $inbox, $mid, '#R');
 
        } elsif ($path_info =~ m!$INBOX_RE/$MID_RE/f/?\z!o) {
                r301($ctx, $1, $2);
@@ -180,7 +195,7 @@ sub get_index {
        require PublicInbox::Feed;
        my $srch = searcher($ctx);
        footer($ctx);
-       if (defined $ctx->{cgi}->param('q')) {
+       if ($ctx->{env}->{QUERY_STRING} =~ /(?:\A|[&;])q=/) {
                require PublicInbox::SearchView;
                PublicInbox::SearchView::sres_top_html($ctx);
        } else {
@@ -191,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
@@ -215,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/
@@ -255,6 +255,7 @@ sub footer {
 
        # auto-generate a footer
        chomp(my $desc = $obj->description);
+       $desc = PublicInbox::Hval::ascii_html($desc);
 
        my $urls;
        my @urls = @{$obj->cloneurl};
@@ -262,7 +263,7 @@ sub footer {
        my $cgi = $ctx->{cgi};
        my $http = $cgi->base->as_string . $obj->{name};
        $seen{$http} or unshift @urls, $http;
-       my $ssoma_url = PublicInbox::Hval::prurl($cgi->{env}, SSOMA_URL);
+       my $ssoma_url = PublicInbox::Hval::prurl($ctx->{env}, SSOMA_URL);
        if (scalar(@urls) == 1) {
                $urls = "URL for <a\nhref=\"" . $ssoma_url .
                        qq(">ssoma</a> or <b>git clone --mirror $urls[0]</b>);
@@ -394,7 +395,7 @@ sub r301 {
                $obj = $ctx->{-inbox};
        }
        my $url = $obj->base_url($cgi);
-       my $qs = $cgi->env->{QUERY_STRING};
+       my $qs = $ctx->{env}->{QUERY_STRING};
        $url .= (uri_escape_utf8($mid) . '/') if (defined $mid);
        $url .= $suffix if (defined $suffix);
        $url .= "?$qs" if $qs ne '';
@@ -418,8 +419,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);
 }