From 9a366ffeb9912e75b3ed422086a078b90442425e Mon Sep 17 00:00:00 2001 From: Ying Fan Chong Date: Fri, 2 Oct 2020 20:35:20 +0800 Subject: [PATCH] Fix sorting for feed without published date --- modules/feedreader/widget.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/feedreader/widget.go b/modules/feedreader/widget.go index 33e17af3..af33ac0e 100644 --- a/modules/feedreader/widget.go +++ b/modules/feedreader/widget.go @@ -58,7 +58,7 @@ func getShowText(feedItem *FeedItem, showType ShowType) string { returnValue = feedItem.item.Link case SHOW_CONTENT: text, _ := html2text.FromString(feedItem.item.Content, html2text.Options{PrettyTables: true}) - returnValue = feedItem.item.Title + "\n" + strings.TrimSpace(text) + returnValue = strings.TrimSpace(feedItem.item.Title + "\n" + strings.TrimSpace(text)) } return returnValue } @@ -192,7 +192,9 @@ func (widget *Widget) content() (string, string, bool) { // feedItems are sorted by published date func (widget *Widget) sort(feedItems []*FeedItem) []*FeedItem { sort.Slice(feedItems, func(i, j int) bool { - return feedItems[i].item.PublishedParsed.After(*feedItems[j].item.PublishedParsed) + return feedItems[i].item.PublishedParsed != nil && + feedItems[j].item.PublishedParsed != nil && + feedItems[i].item.PublishedParsed.After(*feedItems[j].item.PublishedParsed) }) return feedItems