glanceapp/glance
1
1
Fork 0
mirror of https://github.com/glanceapp/glance.git synced 2024-12-15 09:34:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats 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"` HideCategories bool `yaml:"hide-categories"`
HideDescription bool `yaml:"hide-description"` HideDescription bool `yaml:"hide-description"`
ItemLinkPrefix string `yaml:"item-link-prefix"` ItemLinkPrefix string `yaml:"item-link-prefix"`
IsDetailed bool
} }
type RSSFeedItems []RSSFeedItem type RSSFeedItems []RSSFeedItem
@ -107,6 +108,7 @@ func getItemsFromRSSFeedTask(request RSSFeedRequest) ([]RSSFeedItem, error) {
} }
} }
if request.IsDetailed {
if !request.HideDescription && item.Description != "" { if !request.HideDescription && item.Description != "" {
description, _ := limitStringLength(item.Description, 1000) description, _ := limitStringLength(item.Description, 1000)
description = sanitizeFeedDescription(description) description = sanitizeFeedDescription(description)
@ -136,6 +138,7 @@ func getItemsFromRSSFeedTask(request RSSFeedRequest) ([]RSSFeedItem, error) {
rssItem.Categories = categories rssItem.Categories = categories
} }
}
if request.Title != "" { if request.Title != "" {
rssItem.ChannelName = 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 widget.CardHeight = 0
} }
if widget.Style != "detailed-list" { if widget.Style == "detailed-list" {
for i := range widget.FeedRequests { for i := range widget.FeedRequests {
widget.FeedRequests[i].HideCategories = true widget.FeedRequests[i].IsDetailed = true
widget.FeedRequests[i].HideDescription = true
} }
} }