diff options
author | Frédéric Guillot <fred@miniflux.net> | 2019-12-22 17:47:56 -0800 |
---|---|---|
committer | Frédéric Guillot <fred@miniflux.net> | 2019-12-22 18:03:04 -0800 |
commit | cfb6ddfcea3e387a7141d4c65099d2f08bc1732b (patch) | |
tree | c7d0b01d660a5bc7f6683689bf87ca8d4cac1d26 | |
parent | 8e1ed8bef3b65cb75c476ebafc1492fea97754d5 (diff) |
Add support for Atom 'replies' link relation
Show comments URL for Atom feeds as per RFC 4685.
See https://tools.ietf.org/html/rfc4685#section-4
Note that only the first link with type "text/html" is taken into consideration.
-rw-r--r-- | reader/atom/atom.go | 11 | ||||
-rw-r--r-- | reader/atom/parser_test.go | 48 |
2 files changed, 59 insertions, 0 deletions
diff --git a/reader/atom/atom.go b/reader/atom/atom.go index 517b43d..677f69a 100644 --- a/reader/atom/atom.go +++ b/reader/atom/atom.go @@ -99,6 +99,7 @@ func (a *atomEntry) Transform() *model.Entry { entry.Content = getContent(a) entry.Title = getTitle(a) entry.Enclosures = getEnclosures(a) + entry.CommentsURL = getRelationURLWithType(a.Links, "replies", "text/html") return entry } @@ -126,6 +127,16 @@ func getRelationURL(links []atomLink, relation string) string { return "" } +func getRelationURLWithType(links []atomLink, relation, contentType string) string { + for _, link := range links { + if strings.ToLower(link.Rel) == relation && strings.ToLower(link.Type) == contentType { + return strings.TrimSpace(link.URL) + } + } + + return "" +} + func getDate(a *atomEntry) time.Time { // Note: The published date represents the original creation date for YouTube feeds. // Example: diff --git a/reader/atom/parser_test.go b/reader/atom/parser_test.go index 37ab32e..8fcf7d0 100644 --- a/reader/atom/parser_test.go +++ b/reader/atom/parser_test.go @@ -65,6 +65,10 @@ func TestParseAtomSample(t *testing.T) { t.Errorf("Incorrect entry URL, got: %s", feed.Entries[0].URL) } + if feed.Entries[0].CommentsURL != "" { + t.Errorf("Incorrect entry Comments URL, got: %s", feed.Entries[0].CommentsURL) + } + if feed.Entries[0].Title != "Atom-Powered Robots Run Amok" { t.Errorf("Incorrect entry title, got: %s", feed.Entries[0].Title) } @@ -729,3 +733,47 @@ A website: http://example.org/</media:description> } } } + +func TestParseRepliesLinkRelation(t *testing.T) { + data := `<?xml version="1.0" encoding="utf-8"?> + <feed xmlns="http://www.w3.org/2005/Atom" + xmlns:thr="http://purl.org/syndication/thread/1.0"> + <id>http://www.example.org/myfeed</id> + <title>My Example Feed</title> + <updated>2005-07-28T12:00:00Z</updated> + <link href="http://www.example.org/myfeed" /> + <author><name>James</name></author> + <entry> + <id>tag:entries.com,2005:1</id> + <title>My original entry</title> + <updated>2006-03-01T12:12:12Z</updated> + <link href="http://www.example.org/entries/1" /> + <link rel="replies" + type="application/atom+xml" + href="http://www.example.org/mycommentsfeed.xml" + thr:count="10" thr:updated="2005-07-28T12:10:00Z" /> + <link rel="replies" + type="text/html" + href="http://www.example.org/comments.html" + thr:count="10" thr:updated="2005-07-28T12:10:00Z" /> + <summary>This is my original entry</summary> + </entry> + </feed>` + + feed, err := Parse(bytes.NewBufferString(data)) + if err != nil { + t.Fatal(err) + } + + if len(feed.Entries) != 1 { + t.Errorf("Incorrect number of entries, got: %d", len(feed.Entries)) + } + + if feed.Entries[0].URL != "http://www.example.org/entries/1" { + t.Errorf("Incorrect entry URL, got: %s", feed.Entries[0].URL) + } + + if feed.Entries[0].CommentsURL != "http://www.example.org/comments.html" { + t.Errorf("Incorrect entry comments URL, got: %s", feed.Entries[0].CommentsURL) + } +} |