fix quoted URL generation in feeds

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

diff --git a/lib/PublicInbox/Feed.pm b/lib/PublicInbox/Feed.pm
index 4671323cc1bd74b48a07c905b9065d889d28bcc9..93ee80bbef27b51b88099889c416dc36798dff6a 100644 (file)
--- a/lib/PublicInbox/Feed.pm
+++ b/lib/PublicInbox/Feed.pm
@@ -32,7 +32,8 @@ sub generate {
 
        local $ENV{GIT_DIR} = $args->{git_dir};
        my $feed_opts = get_feedopts($args);
-
+       my $addr = $feed_opts->{address};
+       $addr = $addr->[0] if ref($addr);
        my $feed = XML::Atom::SimpleFeed->new(
                title => $feed_opts->{description} || "unnamed feed",
                link => $feed_opts->{url} || "http://example.com/",
@@ -41,7 +42,7 @@ sub generate {
                        href => $feed_opts->{atomurl} ||
                                "http://example.com/atom.xml",
                },
-               id => $feed_opts->{address} || 'public-inbox@example.com',
+               id => $addr || 'public-inbox@example.com',
                updated => POSIX::strftime(DATEFMT, gmtime),
        );
 
@@ -200,9 +201,13 @@ sub get_feedopts {
        my $listname = $args->{listname};
        my $cgi = $args->{cgi};
        my %rv;
+       if (open my $fh, '<', "$args->{git_dir}/description") {
+               chomp($rv{description} = <$fh>);
+               close $fh;
+       }
 
        if ($pi_config && defined $listname && length $listname) {
-               foreach my $key (qw(description address)) {
+               foreach my $key (qw(address)) {
                        $rv{$key} = $pi_config->get($listname, $key) || "";
                }
        }
@@ -257,11 +262,13 @@ sub add_to_feed {
        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 $mid = utf8_header($mime, "Message-ID") or return 0;
-       $mid =~ s/\A<//; $mid =~ s/>\z//;
+       # FIXME: refactor
+       my (undef, $href) = PublicInbox::View::trim_message_id($mid);
+
+       my $content = PublicInbox::View->as_feed_entry($mime,
+                                                       "$fullurl$href.html");
+       defined($content) or return 0;
 
        my $subject = utf8_header($mime, "Subject") || "";
        length($subject) or return 0;
@@ -274,7 +281,6 @@ sub add_to_feed {
        my $email = $from[0]->address;
        defined $email or $email = "";
 
-       my $url = $midurl . uri_escape($mid);
        my $date = utf8_header($mime, "Date");
        $date or return 0;
        $date = feed_date($date) or return 0;
@@ -283,7 +289,7 @@ sub add_to_feed {
                title => $subject,
                updated => $date,
                content => { type => "html", content => $content },
-               link => $url,
+               link => $midurl . $href,
                id => $add,
        );
        1;
@@ -298,7 +304,7 @@ sub dump_html_line {
                my $mid = utf8_header($simple, "Message-ID");
                $mid =~ s/\A<//;
                $mid =~ s/>\z//;
-               my $url = $args->[1] . uri_escape($mid);
+               my $url = $args->[1] . xs_html(uri_escape($mid));
                my $from = utf8_header($simple, "From");
                my @from = Email::Address->parse($from);
                $from = $from[0]->name;