No ext_urls

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

diff --git a/lib/PublicInbox/WwwAtomStream.pm b/lib/PublicInbox/WwwAtomStream.pm
index 3b5b133a5ec0b707b0b123a6d3e842138c8fa865..737cc6cbb1f0e1932a32acb360a99095152d5941 100644 (file)
--- a/lib/PublicInbox/WwwAtomStream.pm
+++ b/lib/PublicInbox/WwwAtomStream.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Atom body stream for HTTP responses
@@ -8,14 +8,15 @@ use strict;
 use parent 'PublicInbox::GzipFilter';
 
 use POSIX qw(strftime);
-use Digest::SHA qw(sha1_hex);
+use PublicInbox::SHA qw(sha1_hex);
 use PublicInbox::Address;
 use PublicInbox::Hval qw(ascii_html mid_href);
 use PublicInbox::MsgTime qw(msg_timestamp);
 
 sub new {
        my ($class, $ctx, $cb) = @_;
-       $ctx->{feed_base_url} = $ctx->{-inbox}->base_url($ctx->{env});
+       $ctx->{feed_base_url} = $ctx->{ibx}->base_url($ctx->{env});
+       $ctx->{-spfx} = $ctx->{feed_base_url} if $ctx->{ibx}->{coderepo};
        $ctx->{cb} = $cb || \&PublicInbox::GzipFilter::close;
        $ctx->{emit_header} = 1;
        bless $ctx, $class;
@@ -28,24 +29,25 @@ sub async_next ($) {
                if (my $smsg = $ctx->{smsg} = $ctx->{cb}->($ctx)) {
                        $ctx->smsg_blob($smsg);
                } else {
-                       $ctx->{http_out}->write($ctx->translate('</feed>'));
+                       $ctx->write('</feed>');
                        $ctx->close;
                }
        };
        warn "E: $@" if $@;
 }
 
-sub async_eml { # ->{async_eml} for async_blob_cb
+sub async_eml { # for async_blob_cb
        my ($ctx, $eml) = @_;
        my $smsg = delete $ctx->{smsg};
-       $ctx->{http_out}->write($ctx->translate(feed_entry($ctx, $smsg, $eml)))
+       $smsg->{mid} // $smsg->populate($eml);
+       $ctx->write(feed_entry($ctx, $smsg, $eml));
 }
 
 sub response {
-       my ($class, $ctx, $code, $cb) = @_;
+       my ($class, $ctx, $cb) = @_;
        my $res_hdr = [ 'Content-Type' => 'application/atom+xml' ];
        $class->new($ctx, $cb);
-       $ctx->psgi_response($code, $res_hdr, \&async_next, \&async_eml);
+       $ctx->psgi_response(200, $res_hdr);
 }
 
 # called once for each message by PSGI server
@@ -53,7 +55,7 @@ sub getline {
        my ($self) = @_;
        my $cb = $self->{cb} or return;
        while (my $smsg = $cb->($self)) {
-               my $eml = $self->{-inbox}->smsg_eml($smsg) or next;
+               my $eml = $self->{ibx}->smsg_eml($smsg) or next;
                return $self->translate(feed_entry($self, $smsg, $eml));
        }
        delete $self->{cb};
@@ -82,7 +84,7 @@ sub to_uuid ($) {
 
 sub atom_header {
        my ($ctx, $title) = @_;
-       my $ibx = $ctx->{-inbox};
+       my $ibx = $ctx->{ibx};
        my $base_url = $ctx->{feed_base_url};
        my $search_q = $ctx->{search_query};
        my $self_url = $base_url;
@@ -100,7 +102,11 @@ sub atom_header {
        } else {
                $title = title_tag($ibx->description);
                $self_url .= 'new.atom';
-               $page_id = "mailto:$ibx->{-primary_address}";
+               if (defined(my $addr = $ibx->{-primary_address})) {
+                       $page_id = "mailto:$addr";
+               } else {
+                       $page_id = to_uuid($self_url);
+               }
        }
        qq(<?xml version="1.0" encoding="us-ascii"?>\n) .
        qq(<feed\nxmlns="http://www.w3.org/2005/Atom"\n) .
@@ -116,9 +122,8 @@ sub atom_header {
 # returns undef or string
 sub feed_entry {
        my ($ctx, $smsg, $eml) = @_;
-       my $hdr = $eml->header_obj;
        my $mid = $smsg->{mid};
-       my $irt = PublicInbox::View::in_reply_to($hdr);
+       my $irt = PublicInbox::View::in_reply_to($eml);
        my $uuid = to_uuid($mid);
        my $base = $ctx->{feed_base_url};
        if (defined $irt) {
@@ -130,38 +135,36 @@ sub feed_entry {
                $irt = '';
        }
        my $href = $base . mid_href($mid) . '/';
-       my $updated = feed_updated(msg_timestamp($hdr));
+       my $updated = feed_updated(msg_timestamp($eml));
 
-       my $title = $hdr->header('Subject');
+       my $title = $eml->header('Subject');
        $title = '(no subject)' unless defined $title && $title ne '';
        $title = title_tag($title);
 
-       my $from = $hdr->header('From') or return;
+       my $from = $eml->header('From') // $eml->header('Sender') //
+               $ctx->{ibx}->{-primary_address};
        my ($email) = PublicInbox::Address::emails($from);
-       my $name = join(', ',PublicInbox::Address::names($from));
-       $name = ascii_html($name);
-       $email = ascii_html($email);
+       my $name = ascii_html(join(', ', PublicInbox::Address::names($from)));
+       $email = ascii_html($email // $ctx->{ibx}->{-primary_address});
 
-       my $s = '';
-       if (delete $ctx->{emit_header}) {
-               $s .= atom_header($ctx, $title);
-       }
-       $s .= "<entry><author><name>$name</name><email>$email</email>" .
+       print { $ctx->zfh }
+               (delete($ctx->{emit_header}) ? atom_header($ctx, $title) : ''),
+               "<entry><author><name>$name</name><email>$email</email>" .
                "</author>$title$updated" .
-               qq(<link\nhref="$href"/>).
+               qq(<link\nhref="$href"/>) .
                "<id>$uuid</id>$irt" .
                qq{<content\ntype="xhtml">} .
                qq{<div\nxmlns="http://www.w3.org/1999/xhtml">} .
                qq(<pre\nstyle="white-space:pre-wrap">);
-       $ctx->{obuf} = \$s;
        $ctx->{mhref} = $href;
-       PublicInbox::View::multipart_text_as_html($eml, $ctx);
-       delete $ctx->{obuf};
-       $s .= '</pre></div></content></entry>';
+       $ctx->{changed_href} = "${href}#related";
+       $eml->each_part(\&PublicInbox::View::add_text_body, $ctx, 1);
+       '</pre></div></content></entry>';
 }
 
 sub feed_updated {
-       '<updated>' . strftime('%Y-%m-%dT%H:%M:%SZ', gmtime(@_)) . '</updated>';
+       my ($t) = @_;
+       '<updated>' . strftime('%Y-%m-%dT%H:%M:%SZ', gmtime($t)) . '</updated>';
 }
 
 1;