X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FWwwAtomStream.pm;h=83984d37e1813525f621a72afe9a09dc67079706;hb=3c39f9c942a6975245fda878e9b957d8d3367662;hp=6d3a93649b29162a42d6892ced17ab256a366425;hpb=13d83f3b0c4a80c99c3c14fc81206e72cda8583a;p=public-inbox.git

diff --git a/lib/PublicInbox/WwwAtomStream.pm b/lib/PublicInbox/WwwAtomStream.pm
index 6d3a9364..83984d37 100644
--- a/lib/PublicInbox/WwwAtomStream.pm
+++ b/lib/PublicInbox/WwwAtomStream.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2016-2019 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 #
 # Atom body stream for which yields getline+close methods
@@ -53,6 +53,15 @@ sub title_tag {
 	"<title$type>$title</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(<?xml version="1.0" encoding="us-ascii"?>\n) .
 	qq(<feed\nxmlns="http://www.w3.org/2005/Atom"\n) .
@@ -80,19 +93,10 @@ sub atom_header {
 	qq(<link\nrel="alternate"\ntype="text/html") .
 		qq(\nhref="$base_url"/>) .
 	qq(<link\nrel="self"\nhref="$self_url"/>) .
-	qq(<id>mailto:$ibx->{-primary_address}</id>) .
+	qq(<id>$page_id</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) = @_;
@@ -101,10 +105,10 @@ sub feed_entry {
 	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(<thr:in-reply-to\nref="$irt_uuid"\n).
 			qq(href="$base$irt/"/>);