use Email::MIME;
use Email::Address;
use URI::Escape qw/uri_escape/;
-use Encode qw/encode decode/;
+use Encode qw/find_encoding/;
use Encode::MIME::Header;
use CGI qw(escapeHTML);
use POSIX qw(strftime);
use constant DATEFMT => '%Y-%m-%dT%H:%M:%SZ';
use PublicInbox::View;
use Mail::Thread;
+my $enc_utf8 = find_encoding('utf8');
+my $enc_ascii = find_encoding('us-ascii');
+my $enc_mime = find_encoding('MIME-Header');
+
+# FIXME: workaround https://rt.cpan.org/Public/Bug/Display.html?id=22817
# main function
sub generate {
my $top = $args->{top}; # bool
local $ENV{GIT_DIR} = $args->{git_dir};
my $feed_opts = get_feedopts($args);
- my $title = escapeHTML($feed_opts->{description} || "");
+ my $title = xs_html($feed_opts->{description} || "");
my @messages;
each_recent_blob($max, sub {
my $str = `git cat-file blob $_[0]`;
return 0 if $? != 0;
my $simple = Email::Simple->new($str);
+ if ($top && ($simple->header("In-Reply-To") ||
+ $simple->header("References"))) {
+ return 0;
+ }
$simple->body_set(""); # save some memory
push @messages, $simple;
1;
$th->thread;
my @args = (
"<html><head><title>$title</title>" .
- '<link rel=alternate title=Atom.feed href=' .
- $feed_opts->{atomurl} . ' type="application/atom+xml"/>' .
+ '<link rel=alternate title=Atom.feed href="' .
+ $feed_opts->{atomurl} . '" type="application/atom+xml"/>' .
'</head><body><pre>');
push @args, $feed_opts->{midurl};
dump_html_line($_, 0, \@args) for $th->rootset;
}
my $url_base;
if ($cgi) {
- my $cgi_url = $cgi->self_url;
+ my $cgi_url = $cgi->url(-path=>1, -query=>1, -relative=>1);
+ my $base = $cgi->url(-base);
$url_base = $cgi_url;
- $url_base =~ s!/?(?:index|all)\.atom\.xml\z!!;
- $rv{atomurl} = $cgi_url;
+ if ($url_base =~ s!/(?:|(index|all)\.html)?\z!!) {
+ my $ia = $1 || 'index';
+ $rv{atomurl} = "$base$url_base/$ia.atom.xml";
+ } else {
+ $url_base =~ s!/?(?:index|all)\.atom\.xml\z!!;
+ $rv{atomurl} = $base . $cgi_url;
+ $url_base = $base . $url_base; # XXX is this needed?
+ }
} else {
$url_base = "http://example.com";
$rv{atomurl} = "$url_base/index.atom.xml";
}
$rv{url} ||= "$url_base/";
- $rv{midurl} = "$url_base/mid/";
- $rv{fullurl} = "$url_base/full/";
+ $rv{midurl} = "$url_base/m/";
+ $rv{fullurl} = "$url_base/f/";
\%rv;
}
my ($simple, $name) = @_;
my $val = $simple->header($name);
return "" unless defined $val;
- $val =~ tr/\t\r\n / /s;
- encode('utf8', decode('MIME-Header', $val));
+ $val =~ tr/\t\n / /s;
+ $val =~ tr/\r//d;
+ $enc_utf8->encode($enc_mime->decode($val));
}
sub feed_date {
return 0;
}
- my $midurl = $feed_opts->{midurl} || 'http://example.com/mid/';
- my $fullurl = $feed_opts->{fullurl} || 'http://example.com/full/';
+ my $midurl = $feed_opts->{midurl} || 'http://example.com/m/';
+ my $fullurl = $feed_opts->{fullurl} || 'http://example.com/f/';
my $content = PublicInbox::View->as_feed_entry($mime, $fullurl);
defined($content) or return 0;
my @from = Email::Address->parse($from);
$from = $from[0]->name;
(defined($from) && length($from)) or $from = $from[0]->address;
- $from = escapeHTML($from);
- $subj = escapeHTML($subj);
- $args->[0] .= "<a href=$url>`-> $subj</a> $from\n";
+ $from = xs_html($from);
+ $subj = xs_html($subj);
+ $args->[0] .= "<a href=\"$url.html\">$subj</a> $from\n";
} else {
$args->[0] .= "[ Message not available ]\n";
}
dump_html_line($self->next, $level, $args) if $self->next;
}
+sub xs_html {
+ $enc_ascii->encode(escapeHTML($enc_utf8->decode($_[0])),
+ Encode::HTMLCREF);
+}
+
1;