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 diff --git a/view/text_widget.go b/view/text_widget.go index 7aa94eb8..09f92df4 100644 --- a/view/text_widget.go +++ b/view/text_widget.go @@ -1,6 +1,8 @@ package view import ( + "strings" + "github.com/rivo/tview" "github.com/wtfutil/wtf/cfg" "github.com/wtfutil/wtf/wtf" @@ -36,7 +38,7 @@ func (widget *TextWidget) Redraw(data func() (string, string, bool)) { widget.View.Clear() widget.View.SetWrap(wrap) widget.View.SetTitle(widget.ContextualTitle(title)) - widget.View.SetText(content) + widget.View.SetText(strings.TrimSpace(content)) }) }