X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwAtomStream.pm;h=d142a469c68b382331462c24ad0947e6c7184e8b;hb=256d049b7ac24f40bb1df691fe014853b75bf491;hp=83984d37e1813525f621a72afe9a09dc67079706;hpb=fece7fca6aeac74410a813cffcb0da338017d0ed;p=public-inbox.git
diff --git a/lib/PublicInbox/WwwAtomStream.pm b/lib/PublicInbox/WwwAtomStream.pm
index 83984d37..d142a469 100644
--- a/lib/PublicInbox/WwwAtomStream.pm
+++ b/lib/PublicInbox/WwwAtomStream.pm
@@ -13,7 +13,7 @@ use POSIX qw(strftime);
use Digest::SHA qw(sha1_hex);
use PublicInbox::Address;
use PublicInbox::Hval qw(ascii_html);
-use PublicInbox::MID qw/mid_clean mid_escape/;
+use PublicInbox::MID qw(mid_escape);
use PublicInbox::MsgTime qw(msg_timestamp);
# called by PSGI server after getline:
@@ -23,7 +23,7 @@ sub new {
my ($class, $ctx, $cb) = @_;
$ctx->{emit_header} = 1;
$ctx->{feed_base_url} = $ctx->{-inbox}->base_url($ctx->{env});
- bless { cb => $cb || *close, ctx => $ctx }, $class;
+ bless { cb => $cb || \&close, ctx => $ctx }, $class;
}
sub response {
@@ -36,7 +36,7 @@ sub response {
sub getline {
my ($self) = @_;
if (my $middle = $self->{cb}) {
- my $smsg = $middle->();
+ my $smsg = $middle->($self->{ctx});
return feed_entry($self, $smsg) if $smsg;
}
delete $self->{cb} ? '' : undef;
@@ -101,9 +101,9 @@ sub atom_header {
sub feed_entry {
my ($self, $smsg) = @_;
my $ctx = $self->{ctx};
- my $mime = $smsg->{mime};
+ my $mid = $smsg->mid; # may extract Message-ID from {mime}
+ my $mime = delete $smsg->{mime};
my $hdr = $mime->header_obj;
- my $mid = $smsg->mid;
my $irt = PublicInbox::View::in_reply_to($hdr);
my $uuid = to_uuid($mid);
my $base = $ctx->{feed_base_url};
@@ -140,9 +140,11 @@ sub feed_entry {
") .
- PublicInbox::View::multipart_text_as_html($mime, $href, $ctx) .
- '
); + $ctx->{obuf} = \$s; + PublicInbox::View::multipart_text_as_html($mime, $href, $ctx); + delete $ctx->{obuf}; + $s .= ''; } sub feed_updated {