lycaknight/glance
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: add detailed mode flag to fix RSS logic conflict

Browse source
This commit is contained in:
ssrtw 2024-06-12 03:28:43 +00:00
parent b83bf9bc09
commit d3e3667405
2 changed files with 28 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/feed/rss.go
View file

@ -49,6 +49,7 @@ type RSSFeedRequest struct {
HideCategories bool `yaml:"hide-categories"`
HideDescription bool `yaml:"hide-description"`
ItemLinkPrefix string `yaml:"item-link-prefix"`
IsDetailed bool
}
type RSSFeedItems []RSSFeedItem
@ -107,6 +108,7 @@ func getItemsFromRSSFeedTask(request RSSFeedRequest) ([]RSSFeedItem, error) {
}
}
if request.IsDetailed {
if !request.HideDescription && item.Description != "" {
description, _ := limitStringLength(item.Description, 1000)
description = sanitizeFeedDescription(description)
@ -136,6 +138,7 @@ func getItemsFromRSSFeedTask(request RSSFeedRequest) ([]RSSFeedItem, error) {
rssItem.Categories = categories
}
}
if request.Title != "" {
rssItem.ChannelName = request.Title

5
internal/widget/rss.go
View file

@ -39,10 +39,9 @@ func (widget *RSS) Initialize() error {
widget.CardHeight = 0
}
if widget.Style != "detailed-list" {
if widget.Style == "detailed-list" {
for i := range widget.FeedRequests {
widget.FeedRequests[i].HideCategories = true
widget.FeedRequests[i].HideDescription = true
widget.FeedRequests[i].IsDetailed = true
}
}