use 5.008;
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/';
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/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
our $ATTACH_RE = qr!(\d[\.\d]*)-([[:alnum:]][\w\.-]+[[:alnum:]])!i;
sub new {
sub call {
my ($self, $env) = @_;
- my $cgi = Plack::Request->new($env);
- my $ctx = { cgi => $cgi, env => $env, www => $self,
- pi_config => $self->{pi_config} };
+ my $ctx = { env => $env, www => $self, pi_config => $self->{pi_config} };
# we don't care about multi-value
my %qp = map {
- (split('=', $_, 2))
+ my ($k, $v) = split('=', $_, 2);
+ $v = '' unless defined $v;
+ $v =~ tr/+/ /;
+ ($k, $v)
} split(/[&;]/, uri_unescape($env->{QUERY_STRING}));
$ctx->{qp} = \%qp;
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;
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) {
+ } 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);
+ r301($ctx, $inbox, $mid, '#R');
+
} elsif ($path_info =~ m!$INBOX_RE/$MID_RE/f/?\z!o) {
r301($ctx, $1, $2);
if (defined $obj) {
$ctx->{git_dir} = $obj->{mainrepo};
$ctx->{git} = $obj->git;
- # for PublicInbox::HTTP::weaken_task:
- $ctx->{cgi}->{env}->{'pi-httpd.inbox'} = $obj;
$ctx->{-inbox} = $obj;
$ctx->{inbox} = $inbox;
return;
# generation and link things intended for nntp:// to https?://,
# so try to infer links and redirect them to the appropriate
# list URL.
- $self->news_www->call($ctx->{cgi}->{env});
+ $self->news_www->call($ctx->{env});
}
# returns undef if valid, array ref response if invalid
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) = @_;
require PublicInbox::Feed;
my $srch = searcher($ctx);
- footer($ctx);
if ($ctx->{env}->{QUERY_STRING} =~ /(?:\A|[&;])q=/) {
require PublicInbox::SearchView;
PublicInbox::SearchView::sres_top_html($ctx);
# 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
my $x = mid2blob($ctx) or return r404($ctx);
require PublicInbox::View;
- my $foot = footer($ctx);
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) ] ];
-}
-
-# /$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);
}
# /$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 {
$val;
}
-sub footer {
- my ($ctx) = @_;
- return '' unless $ctx;
- my $obj = $ctx->{-inbox} or return '';
-
- # auto-generate a footer
- chomp(my $desc = $obj->description);
-
- my $urls;
- my @urls = @{$obj->cloneurl};
- my %seen = map { $_ => 1 } @urls;
- my $cgi = $ctx->{cgi};
- my $http = $cgi->base->as_string . $obj->{name};
- $seen{$http} or unshift @urls, $http;
- 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>);
- } else {
- $urls = "URLs for <a\nhref=\"" . $ssoma_url .
- qq(">ssoma</a> or <b>git clone --mirror</b>\n) .
- join("\n", map { "\tgit clone --mirror $_" } @urls);
- }
-
- my $addr = $obj->{-primary_address};
- $ctx->{footer} = join("\n",
- '- ' . $desc,
- "A <a\nhref=\"" .
- PublicInbox::Hval::prurl($ctx->{cgi}->{env}, PI_URL) .
- '">public-inbox</a>, ' .
- 'anybody may post in plain-text (not HTML):',
- $addr,
- $urls
- );
-}
-
# search support is optional, returns undef if Xapian is not installed
# or not configured for the given GIT_DIR
sub searcher {
sub get_thread_atom {
my ($ctx) = @_;
searcher($ctx) or return need_search($ctx);
- $ctx->{self_url} = $ctx->{cgi}->uri->as_string;
require PublicInbox::Feed;
PublicInbox::Feed::generate_thread_atom($ctx);
}
} elsif ($path_info =~ m!$INBOX_RE/(\S+/\S+)/f\z!o) {
r301($ctx, $1, $2);
} else {
- $self->news_www->call($ctx->{cgi}->{env});
+ $self->news_www->call($ctx->{env});
}
}
sub r301 {
my ($ctx, $inbox, $mid, $suffix) = @_;
- my $cgi = $ctx->{cgi};
my $obj = $ctx->{-inbox};
unless ($obj) {
my $r404 = invalid_inbox($ctx->{www}, $ctx, $inbox);
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);
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:
'f/' eq $e and return get_mid_html($ctx);
-
- 'R/' eq $e and return get_reply_html($ctx);
r404($ctx);
}