www: stop generating /$MESSAGE_ID/f/ links

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

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 54cbf23c545a31afa7b52fbfcd8bb3acadfc07b9..096bff9d5c10c3850d1ba7bbb2c3329e487639de 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -8,7 +8,7 @@ use warnings;
 use Email::Address;
 use Email::MIME;
 use Date::Parse qw(strptime);
-use PublicInbox::Hval;
+use PublicInbox::Hval qw/ascii_html/;
 use PublicInbox::Git;
 use PublicInbox::View;
 use PublicInbox::MID qw/mid_clean mid2path/;
@@ -18,9 +18,6 @@ use constant {
        MAX_PER_PAGE => 25, # this needs to be tunable
 };
 
-use Encode qw/find_encoding/;
-my $enc_utf8 = find_encoding('UTF-8');
-
 # main function
 sub generate {
        my ($ctx) = @_;
@@ -41,8 +38,9 @@ sub generate_html_index {
 
 sub title_tag {
        my ($title) = @_;
+       $title =~ tr/\t\n / /s; # squeeze spaces
        # try to avoid the type attribute in title:
-       $title = PublicInbox::Hval->new_oneline($title)->as_html;
+       $title = ascii_html($title);
        my $type = index($title, '&') >= 0 ? "\ntype=\"html\"" : '';
        "<title$type>$title</title>";
 }
@@ -113,16 +111,15 @@ sub emit_atom_thread {
 }
 
 sub emit_html_index {
-       my ($cb, $ctx) = @_;
-       my $fh = $cb->([200,['Content-Type'=>'text/html; charset=UTF-8']]);
+       my ($res, $ctx) = @_;
+       my $fh = $res->([200,['Content-Type'=>'text/html; charset=UTF-8']]);
 
        my $max = $ctx->{max} || MAX_PER_PAGE;
        my $feed_opts = get_feedopts($ctx);
 
-       my $title = $feed_opts->{description} || '';
-       $title = PublicInbox::Hval->new_oneline($title)->as_html;
+       my $title = ascii_html($feed_opts->{description} || '');
        my ($footer, $param, $last);
-       my $state = { ctx => $ctx, seen => {}, anchor_idx => 0 };
+       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>)";
@@ -147,10 +144,10 @@ sub emit_html_index {
        my $cgi = $ctx->{cgi};
        if ($cgi && !$cgi->param('r') && $srch) {
                $state->{srch} = $srch;
-               $last = PublicInbox::View::emit_index_topics($state, $fh);
+               $last = PublicInbox::View::emit_index_topics($state);
                $param = 'o';
        } else {
-               $last = emit_index_nosrch($ctx, $state, $fh);
+               $last = emit_index_nosrch($ctx, $state);
                $param = 'r';
        }
        $footer = nav_footer($cgi, $last, $feed_opts, $state, $param);
@@ -164,14 +161,14 @@ sub emit_html_index {
 }
 
 sub emit_index_nosrch {
-       my ($ctx, $state, $fh) = @_;
+       my ($ctx, $state) = @_;
        my $git = $ctx->{git} ||= PublicInbox::Git->new($ctx->{git_dir});
        my (undef, $last) = each_recent_blob($ctx, sub {
                my ($path, $commit, $ts, $u, $subj) = @_;
                $state->{first} ||= $commit;
 
                my $mime = do_cat_mail($git, $path) or return 0;
-               PublicInbox::View::index_entry($fh, $mime, 0, $state);
+               PublicInbox::View::index_entry($mime, 0, $state);
                1;
        });
        Email::Address->purge_cache;
@@ -298,11 +295,6 @@ sub get_feedopts {
        \%rv;
 }
 
-sub mime_header {
-       my ($mime, $name) = @_;
-       PublicInbox::Hval->new_oneline($mime->header($name))->raw;
-}
-
 sub feed_updated {
        my ($date, $ts) = @_;
        my @t = eval { strptime($date) } if defined $date;
@@ -320,25 +312,26 @@ sub add_to_feed {
        my $midurl = $feed_opts->{midurl};
 
        my $header_obj = $mime->header_obj;
-       my $mid = $header_obj->header('Message-ID');
+       my $mid = $header_obj->header_raw('Message-ID');
        defined $mid or return 0;
        $mid = PublicInbox::Hval->new_msgid($mid);
        my $href = $mid->as_href;
-       my $content = PublicInbox::View->feed_entry($mime, "$midurl$href/f/");
+       my $content = PublicInbox::View->feed_entry($mime);
        defined($content) or return 0;
        $mime = undef;
 
        my $date = $header_obj->header('Date');
        my $updated = feed_updated($date);
 
-       my $title = mime_header($header_obj, 'Subject') or return 0;
+       my $title = $header_obj->header('Subject');
+       defined $title or return 0;
        $title = title_tag($title);
 
-       my $from = mime_header($header_obj, 'From') or return 0;
+       my $from = $header_obj->header('From') or return 0;
        my @from = Email::Address->parse($from) or return 0;
-       my $name = PublicInbox::Hval->new_oneline($from[0]->name)->as_html;
+       my $name = ascii_html($from[0]->name);
        my $email = $from[0]->address;
-       $email = PublicInbox::Hval->new_oneline($email)->as_html;
+       $email = ascii_html($email);
 
        if (delete $feed_opts->{emit_header}) {
                $fh->write(atom_header($feed_opts, $title) . $updated);