diff --git a/reader/rdf/parser_test.go b/reader/rdf/parser_test.go
index 52c11a5f..392b9871 100644
--- a/reader/rdf/parser_test.go
+++ b/reader/rdf/parser_test.go
@@ -322,6 +322,61 @@ func TestParseItemWithoutLink(t *testing.T) {
}
}
+func TestParseItemWithDublicCoreDate(t *testing.T) {
+ data := `
+
+
+ Example
+ http://example.org
+
+
+ -
+ Title
+ Test
+ http://example.org/test.html
+ Tester
+ 2018-04-10T05:00:00+00:00
+
+ `
+
+ feed, err := Parse(bytes.NewBufferString(data))
+ if err != nil {
+ t.Error(err)
+ }
+
+ expectedDate := time.Date(2018, time.April, 10, 5, 0, 0, 0, time.UTC)
+ if !feed.Entries[0].Date.Equal(expectedDate) {
+ t.Errorf("Incorrect entry date, got: %v, want: %v", feed.Entries[0].Date, expectedDate)
+ }
+}
+
+func TestParseItemWithoutDate(t *testing.T) {
+ data := `
+
+
+ Example
+ http://example.org
+
+
+ -
+ Title
+ Test
+ http://example.org/test.html
+
+ `
+
+ feed, err := Parse(bytes.NewBufferString(data))
+ if err != nil {
+ t.Error(err)
+ }
+
+ expectedDate := time.Now().In(time.Local)
+ diff := expectedDate.Sub(feed.Entries[0].Date)
+ if diff > time.Second {
+ t.Errorf("Incorrect entry date, got: %v", diff)
+ }
+}
+
func TestParseInvalidXml(t *testing.T) {
data := `garbage`
_, err := Parse(bytes.NewBufferString(data))
diff --git a/reader/rdf/rdf.go b/reader/rdf/rdf.go
index d9f34036..44ff0afc 100644
--- a/reader/rdf/rdf.go
+++ b/reader/rdf/rdf.go
@@ -10,7 +10,9 @@ import (
"time"
"github.com/miniflux/miniflux/crypto"
+ "github.com/miniflux/miniflux/logger"
"github.com/miniflux/miniflux/model"
+ "github.com/miniflux/miniflux/reader/date"
"github.com/miniflux/miniflux/reader/sanitizer"
"github.com/miniflux/miniflux/url"
)
@@ -54,6 +56,7 @@ type rdfItem struct {
Link string `xml:"link"`
Description string `xml:"description"`
Creator string `xml:"creator"`
+ Date string `xml:"date"`
}
func (r *rdfItem) Transform() *model.Entry {
@@ -63,10 +66,24 @@ func (r *rdfItem) Transform() *model.Entry {
entry.URL = r.Link
entry.Content = r.Description
entry.Hash = getHash(r)
- entry.Date = time.Now()
+ entry.Date = getDate(r)
return entry
}
+func getDate(r *rdfItem) time.Time {
+ if r.Date != "" {
+ result, err := date.Parse(r.Date)
+ if err != nil {
+ logger.Error("rdf: %v", err)
+ return time.Now()
+ }
+
+ return result
+ }
+
+ return time.Now()
+}
+
func getHash(r *rdfItem) string {
value := r.Link
if value == "" {