www: support $MESSAGE_ID/R/ endpoint for replies

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

diff --git a/lib/PublicInbox/WWW.pm b/lib/PublicInbox/WWW.pm
index 411db16f4eaffaaee7f788b0fb356d3751884ffd..1f28df20fbcae79a0461a4003834a1d9671b0500 100644 (file)
--- a/lib/PublicInbox/WWW.pm
+++ b/lib/PublicInbox/WWW.pm
@@ -18,19 +18,27 @@ use URI::Escape qw(uri_escape_utf8 uri_unescape);
 use constant SSOMA_URL => 'http://ssoma.public-inbox.org/';
 use constant PI_URL => 'http://public-inbox.org/';
 require PublicInbox::Git;
+use PublicInbox::GitHTTPBackend;
 our $LISTNAME_RE = qr!\A/([\w\.\-]+)!;
 our $MID_RE = qr!([^/]+)!;
-our $END_RE = qr!(f/|T/|t/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
+our $END_RE = qr!(f/|T/|t/|R/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
 our $pi_config;
 
 sub run {
        my ($cgi, $method) = @_;
        $pi_config ||= PublicInbox::Config->new;
        my $ctx = { cgi => $cgi, pi_config => $pi_config };
-       if ($method !~ /\AGET|HEAD\z/) {
+       my $path_info = $cgi->path_info;
+
+       if ($method eq 'POST' &&
+                $path_info =~ m!$LISTNAME_RE/(git-upload-pack)\z!) {
+               my $path = $2;
+               return (invalid_list($ctx, $1) ||
+                       serve_git($cgi, $ctx->{git}, $path));
+       }
+       elsif ($method !~ /\AGET|HEAD\z/) {
                return r(405, 'Method Not Allowed');
        }
-       my $path_info = $cgi->path_info;
 
        # top-level indices and feeds
        if ($path_info eq '/') {
@@ -42,12 +50,18 @@ sub run {
        } elsif ($path_info =~ m!$LISTNAME_RE/(?:atom\.xml|new\.atom)\z!o) {
                invalid_list($ctx, $1) || get_atom($ctx);
 
+       } elsif ($path_info =~ m!$LISTNAME_RE/
+                               ($PublicInbox::GitHTTPBackend::ANY)\z!ox) {
+               my $path = $2;
+               invalid_list($ctx, $1) || serve_git($cgi, $ctx->{git}, $path);
        } elsif ($path_info =~ m!$LISTNAME_RE/$MID_RE/$END_RE\z!o) {
                msg_page($ctx, $1, $2, $3);
 
        # in case people leave off the trailing slash:
-       } elsif ($path_info =~ m!$LISTNAME_RE/$MID_RE/(f|T|t)\z!o) {
-               r301($ctx, $1, $2, $3 eq 't' ? 't/#u' : $3);
+       } elsif ($path_info =~ m!$LISTNAME_RE/$MID_RE/(f|T|t|R)\z!o) {
+               my ($listname, $mid, $suffix) = ($1, $2, $3);
+               $suffix .= $suffix =~ /\A[tT]\z/ ? '/#u' : '/';
+               r301($ctx, $listname, $mid, $suffix);
 
        # convenience redirects order matters
        } elsif ($path_info =~ m!$LISTNAME_RE/([^/]{2,})\z!o) {
@@ -186,6 +200,19 @@ sub get_full_html {
          [ PublicInbox::View::msg_html($ctx, $mime, undef, $foot)] ];
 }
 
+# /$LISTNAME/$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)] ];
+}
+
 # /$LISTNAME/$MESSAGE_ID/t/
 sub get_thread {
        my ($ctx, $flat) = @_;
@@ -230,15 +257,19 @@ sub footer {
 
        my $urls = try_cat("$git_dir/cloneurl");
        my @urls = split(/\r?\n/, $urls || '');
-       my $nurls = scalar @urls;
-       if ($nurls == 0) {
-               $urls = '($GIT_DIR/cloneurl missing)';
-       } elsif ($nurls == 1) {
-               $urls = "git URL for <a\nhref=\"" . SSOMA_URL .
-                       '">ssoma</a>: ' . $urls[0];
+       my %seen = map { $_ => 1 } @urls;
+       my $cgi = $ctx->{cgi};
+       my $http = (ref($cgi) eq 'CGI') ? $cgi->url(-base) . "/$listname" :
+                       $cgi->base->as_string . $listname;
+       $seen{$http} or unshift @urls, $http;
+       if (scalar(@urls) == 1) {
+               $urls = "URL for <a\nhref=\"" . SSOMA_URL .
+                       qq(">ssoma</a> or <b>git clone --mirror \$URL</b> :) .
+                       $urls[0];
        } else {
-               $urls = "git URLs for <a\nhref=\"" . SSOMA_URL .
-                       "\">ssoma</a>:\n" . join("\n", map { "\t$_" } @urls);
+               $urls = "URLs for <a\nhref=\"" . SSOMA_URL .
+                       qq(">ssoma</a> or <b>git clone --mirror \$URL</b>\n) .
+                       join("\n", map { "\t$_" } @urls);
        }
 
        my $addr = $pi_config->get($listname, 'address');
@@ -389,8 +420,14 @@ sub msg_page {
                'T/' eq $e and return get_thread($ctx, 1);
                'raw' eq $e and return get_mid_txt($ctx);
                'f/' eq $e and return get_full_html($ctx);
+               'R/' eq $e and return get_reply_html($ctx);
        }
        r404($ctx);
 }
 
+sub serve_git {
+       my ($cgi, $git, $path) = @_;
+       PublicInbox::GitHTTPBackend::serve($cgi, $git, $path);
+}
+
 1;