* [PATCH] wwwatomstream: fix per-feed <id>
@ 2019-09-20 2:42 Eric Wong
0 siblings, 0 replies; only message in thread
From: Eric Wong @ 2019-09-20 2:42 UTC (permalink / raw)
To: meta
We were emitting the same "<id>mailto:name@domain</id>" tag
for every feed (but not per-feed entry). This could cause
feed readers to mistake the top (news.atom) feed for other
feeds (search results, or per-thread feeds).
This is technically a breaking change for people relying on
per-thread or per-query feeds, but the only alternative is
to remain broken for anybody trying to follow multiple feeds
off the same inbox.
---
lib/PublicInbox/WwwAtomStream.pm | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/lib/PublicInbox/WwwAtomStream.pm b/lib/PublicInbox/WwwAtomStream.pm
index fd861d45..05659f1f 100644
--- a/lib/PublicInbox/WwwAtomStream.pm
+++ b/lib/PublicInbox/WwwAtomStream.pm
@@ -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,16 +69,20 @@ 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;
@@ -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/"/>);
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2019-09-20 2:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-09-20 2:42 [PATCH] wwwatomstream: fix per-feed <id> Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).