X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwAtomStream.pm;h=d142a469c68b382331462c24ad0947e6c7184e8b;hb=256d049b7ac24f40bb1df691fe014853b75bf491;hp=fd861d45b549586962aed303760322a2b07887aa;hpb=9bd675d33ad1e49bd2ebe12a1d216216e61380de;p=public-inbox.git
diff --git a/lib/PublicInbox/WwwAtomStream.pm b/lib/PublicInbox/WwwAtomStream.pm
index fd861d45..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;
@@ -53,6 +53,15 @@ sub title_tag {
"
$title";
}
+sub to_uuid ($) {
+ my ($any) = @_;
+ utf8::encode($any); # really screwed up In-Reply-To fields exist
+ $any = sha1_hex($any);
+ my $h = '[a-f0-9]';
+ my (@uuid5) = ($any =~ m!\A($h{8})($h{4})($h{4})($h{4})($h{12})!o);
+ 'urn:uuid:' . join('-', @uuid5);
+}
+
sub atom_header {
my ($ctx, $title) = @_;
my $ibx = $ctx->{-inbox};
@@ -60,18 +69,22 @@ sub atom_header {
my $search_q = $ctx->{search_query};
my $self_url = $base_url;
my $mid = $ctx->{mid};
+ my $page_id;
if (defined $mid) { # per-thread
$self_url .= mid_escape($mid).'/t.atom';
+ $page_id = to_uuid("t\n".$mid)
} elsif (defined $search_q) {
my $query = $search_q->{'q'};
$title = title_tag("$query - search results");
$base_url .= '?' . $search_q->qs_html(x => undef);
$self_url .= '?' . $search_q->qs_html;
+ $page_id = to_uuid("q\n".$query);
} else {
$title = title_tag($ibx->description);
$self_url .= 'new.atom';
+ $page_id = "mailto:$ibx->{-primary_address}";
}
- my $mtime = (stat($ibx->{mainrepo}))[9] || time;
+ my $mtime = (stat($ibx->{inboxdir}))[9] || time;
qq(\n) .
qq() .
qq() .
- qq(mailto:$ibx->{-primary_address}) .
+ qq($page_id) .
feed_updated(gmtime($mtime));
}
-sub mid2uuid ($) {
- my ($mid) = @_;
- utf8::encode($mid); # really screwed up In-Reply-To fields exist
- $mid = sha1_hex($mid);
- my $h = '[a-f0-9]';
- my (@uuid5) = ($mid =~ m!\A($h{8})($h{4})($h{4})($h{4})($h{12})!o);
- 'urn:uuid:' . join('-', @uuid5);
-}
-
# returns undef or string
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 = mid2uuid($mid);
+ my $uuid = to_uuid($mid);
my $base = $ctx->{feed_base_url};
if (defined $irt) {
- my $irt_uuid = mid2uuid($irt);
+ my $irt_uuid = to_uuid($irt);
$irt = mid_escape($irt);
$irt = qq();
@@ -136,9 +140,11 @@ sub feed_entry {
"$uuid$irt" .
qq{} .
qq{} .
- qq(
) .
- PublicInbox::View::multipart_text_as_html($mime, $href, $ctx) .
- '
';
+ qq();
+ $ctx->{obuf} = \$s;
+ PublicInbox::View::multipart_text_as_html($mime, $href, $ctx);
+ delete $ctx->{obuf};
+ $s .= '
';
}
sub feed_updated {