package PublicInbox::Feed;
use strict;
use warnings;
-use Email::Address;
use Email::MIME;
use Date::Parse qw(strptime);
use PublicInbox::Hval qw/ascii_html/;
use PublicInbox::Git;
use PublicInbox::View;
use PublicInbox::MID qw/mid_clean mid2path/;
+use PublicInbox::Address;
use POSIX qw/strftime/;
use constant {
DATEFMT => '%Y-%m-%dT%H:%M:%SZ', # Atom standard
sub _no_thread {
my ($cb) = @_;
- my $fh = $cb->([404, ['Content-Type' => 'text/plain']]);
- $fh->write("No feed found for thread\n");
- $fh->close;
+ $cb->([404, ['Content-Type', 'text/plain'],
+ ["No feed found for thread\n"]]);
}
sub end_feed {
my ($fh) = @_;
- Email::Address->purge_cache;
$fh->write('</feed>');
$fh->close;
}
end_feed($fh);
}
-sub emit_html_index {
- my ($res, $ctx) = @_;
- my $feed_opts = get_feedopts($ctx);
- my $fh = $res->([200,['Content-Type'=>'text/html; charset=UTF-8']]);
-
- my $max = $ctx->{max} || MAX_PER_PAGE;
+sub _html_index_top {
+ my ($feed_opts, $srch) = @_;
my $title = ascii_html($feed_opts->{description} || '');
- my ($footer, $param, $last);
- my $state = { ctx => $ctx, seen => {}, anchor_idx => 0, fh => $fh };
- my $srch = $ctx->{srch};
-
my $top = "<b>$title</b> (<a\nhref=\"new.atom\">Atom feed</a>)";
-
if ($srch) {
$top = qq{<form\naction=""><pre>$top} .
qq{ <input\nname=q\ntype=text />} .
$top = '<pre>' . $top . "\n";
}
- $fh->write("<html><head><title>$title</title>" .
- "<link\nrel=alternate\ntitle=\"Atom feed\"\n".
- "href=\"new.atom\"\ntype=\"application/atom+xml\"/>" .
- PublicInbox::Hval::STYLE .
- "</head><body>$top");
+ "<html><head><title>$title</title>" .
+ "<link\nrel=alternate\ntitle=\"Atom feed\"\n".
+ "href=\"new.atom\"\ntype=\"application/atom+xml\"/>" .
+ PublicInbox::Hval::STYLE .
+ "</head><body>$top";
+}
+
+sub emit_html_index {
+ my ($res, $ctx) = @_;
+ my $feed_opts = get_feedopts($ctx);
+ my $fh = $res->([200,['Content-Type'=>'text/html; charset=UTF-8']]);
+
+ my $max = $ctx->{max} || MAX_PER_PAGE;
+
+ my ($footer, $param, $last);
+ my $state = { ctx => $ctx, seen => {}, anchor_idx => 0, fh => $fh };
+ my $srch = $ctx->{srch};
+ $fh->write(_html_index_top($feed_opts, $srch));
# if the 'r' query parameter is given, it is a legacy permalink
# which we must continue supporting:
- my $cgi = $ctx->{cgi};
- if ($cgi && !$cgi->param('r') && $srch) {
+ my $qp = $ctx->{qp};
+ if ($qp && !$qp->{r} && $srch) {
$state->{srch} = $srch;
$last = PublicInbox::View::emit_index_topics($state);
$param = 'o';
$last = emit_index_nosrch($ctx, $state);
$param = 'r';
}
- $footer = nav_footer($cgi, $last, $feed_opts, $state, $param);
+ $footer = nav_footer($ctx, $last, $feed_opts, $state, $param);
if ($footer) {
my $list_footer = $ctx->{footer};
$footer .= "\n\n" . $list_footer if $list_footer;
PublicInbox::View::index_entry($mime, 0, $state);
1;
});
- Email::Address->purge_cache;
$last;
}
sub nav_footer {
- my ($cgi, $last, $feed_opts, $state, $param) = @_;
- $cgi or return '';
- my $old_r = $cgi->param($param);
+ my ($ctx, $last, $feed_opts, $state, $param) = @_;
+ my $qp = $ctx->{qp} or return '';
+ my $old_r = $qp->{$param};
my $head = ' ';
my $next = ' ';
my $first = $state->{first};
$next = qq!<a\nhref="?$param=$last"\nrel=next>next</a>!;
}
if ($old_r) {
- $head = $cgi->path_info;
+ $head = $ctx->{env}->{PATH_INFO};
$head = qq!<a\nhref="$head">head</a>!;
}
my $atom = "<a\nhref=\"$feed_opts->{atomurl}\">Atom feed</a>";
my $addmsg = qr!^:000000 100644 \S+ \S+ A\t(${hex}{2}/${hex}{38})$!;
my $delmsg = qr!^:100644 000000 \S+ \S+ D\t(${hex}{2}/${hex}{38})$!;
my $refhex = qr/(?:HEAD|${hex}{4,40})(?:~\d+)?/;
- my $cgi = $ctx->{cgi};
+ my $qp = $ctx->{qp};
# revision ranges may be specified
my $range = 'HEAD';
- my $r = $cgi->param('r') if $cgi;
+ my $r = $qp->{r} if $qp;
if ($r && ($r =~ /\A(?:$refhex\.\.)?$refhex\z/o)) {
$range = $r;
}
$title = title_tag($title);
my $from = $header_obj->header('From') or return 0;
- my @from = Email::Address->parse($from) or return 0;
- my $name = ascii_html($from[0]->name);
- my $email = $from[0]->address;
+ my ($email) = PublicInbox::Address::emails($from);
+ my $name = PublicInbox::Address::from_name($from);
+ $name = ascii_html($name);
$email = ascii_html($email);
if (delete $feed_opts->{emit_header}) {