fix nil pointer error in GofeedConvert

1 files changed, 8 insertions, 13 deletions

diff --git a/core/structs.go b/core/structs.go
index 6270de8..49c8ee6 100644
--- a/core/structs.go
+++ b/core/structs.go
@@ -64,15 +64,10 @@ func GofeedConvert(f *gofeed.Feed, title string) (*Feed, error) {
 	} else {
 		new.Title = f.Title
 	}
-	new.Updated = *f.UpdatedParsed
-	var err error
-	new.Link, err = url.ParseRequestURI(f.Link)
-	if err != nil {
-		return nil, err
-	}
-	new.FeedLink, err = url.ParseRequestURI(f.FeedLink)
-	if err != nil {
-		return nil, err
+	if f.UpdatedParsed != nil {
+		new.Updated = *f.UpdatedParsed
+	} else if f.PublishedParsed != nil {
+		new.Updated = *f.PublishedParsed
 	}
 	new.Link = f.Link
 	new.FeedLink = f.FeedLink
@@ -81,10 +76,10 @@ func GofeedConvert(f *gofeed.Feed, title string) (*Feed, error) {
 		item := &Item{}
 		item.Title = v.Title
 		item.Content = v.Content
-		item.Published = *v.PublishedParsed
-		item.Link, err = url.ParseRequestURI(f.FeedLink)
-		if err != nil {
-			return nil, err
+		if v.UpdatedParsed != nil {
+			item.Published = *v.UpdatedParsed
+		} else if v.PublishedParsed != nil {
+			item.Published = *v.PublishedParsed
 		}
 		item.Link = f.FeedLink