diff --git a/src/feed/json.go b/src/feed/json.go index fd8c08c..5af1684 100644 --- a/src/feed/json.go +++ b/src/feed/json.go @@ -41,15 +41,15 @@ func ParseJSON(data io.Reader) (*Feed, error) { } dstfeed := &Feed{ - Title: srcfeed.Title, + Title: srcfeed.Title, SiteURL: srcfeed.SiteURL, } for _, srcitem := range srcfeed.Items { dstfeed.Items = append(dstfeed.Items, Item{ - GUID: srcitem.ID, - Date: dateParse(firstNonEmpty(srcitem.DatePublished, srcitem.DateModified)), - URL: srcitem.URL, - Title: srcitem.Title, + GUID: srcitem.ID, + Date: dateParse(firstNonEmpty(srcitem.DatePublished, srcitem.DateModified)), + URL: srcitem.URL, + Title: srcitem.Title, Content: firstNonEmpty(srcitem.HTML, srcitem.Text, srcitem.Summary), }) } diff --git a/src/feed/json_test.go b/src/feed/json_test.go index 7cd52fb..9957398 100644 --- a/src/feed/json_test.go +++ b/src/feed/json_test.go @@ -26,7 +26,7 @@ func TestJSONFeed(t *testing.T) { ] }`)) want := &Feed{ - Title: "My Example Feed", + Title: "My Example Feed", SiteURL: "https://example.org/", Items: []Item{ {GUID: "2", Content: "This is a second item.", URL: "https://example.org/second-item"}, diff --git a/src/feed/models.go b/src/feed/models.go index 9b89620..dfcaaf4 100644 --- a/src/feed/models.go +++ b/src/feed/models.go @@ -9,12 +9,12 @@ type Feed struct { } type Item struct { - GUID string - Date time.Time - URL string + GUID string + Date time.Time + URL string Title string - Content string - ImageURL string + Content string + ImageURL string PodcastURL string } diff --git a/src/feed/rdf_test.go b/src/feed/rdf_test.go index 97761fe..97ff7b1 100644 --- a/src/feed/rdf_test.go +++ b/src/feed/rdf_test.go @@ -38,7 +38,7 @@ func TestRDFFeed(t *testing.T) { `)) want := &Feed{ - Title: "Mozilla Dot Org", + Title: "Mozilla Dot Org", SiteURL: "http://www.mozilla.org", Items: []Item{ {GUID: "http://www.mozilla.org/status/", URL: "http://www.mozilla.org/status/", Title: "New Status Updates"}, diff --git a/src/feed/rss_test.go b/src/feed/rss_test.go index 2050b2c..cad4d14 100644 --- a/src/feed/rss_test.go +++ b/src/feed/rss_test.go @@ -30,19 +30,19 @@ func TestRSSFeed(t *testing.T) { `)) want := &Feed{ - Title: "Scripting News", + Title: "Scripting News", SiteURL: "http://www.scripting.com/", Items: []Item{ { - GUID: "http://www.scripting.com/one/", - URL: "http://www.scripting.com/one/", - Title: "Title 1", + GUID: "http://www.scripting.com/one/", + URL: "http://www.scripting.com/one/", + Title: "Title 1", Content: "Description 1", }, { - GUID: "http://www.scripting.com/two/", - URL: "http://www.scripting.com/two/", - Title: "Title 2", + GUID: "http://www.scripting.com/two/", + URL: "http://www.scripting.com/two/", + Title: "Title 2", Content: "Description 2", }, },