mirror of
https://github.com/glanceapp/glance.git
synced 2026-10-16 05:27:32 +02:00
Fix post and channel relative URLs in RSS widget
This commit is contained in:
1 parent
fe7f5cc015
commit
698db7126f
1 file changed
+14
-2
@@ -244,11 +244,23 @@ func (widget *rssWidget) fetchItemsFromFeedTask(request rssFeedRequest) ([]rssFe
|
||||
|
||||
items := make(rssFeedItemList, 0, len(feed.Items))
|
||||
|
||||
feedURL := strings.TrimRight(feed.Link, "/")
|
||||
if feedURL == "" {
|
||||
parsed, err := url.Parse(request.URL)
|
||||
if err != nil {
|
||||
parsed = &url.URL{}
|
||||
}
|
||||
parsed.Path = ""
|
||||
parsed.RawQuery = ""
|
||||
parsed.Fragment = ""
|
||||
feedURL = parsed.String()
|
||||
}
|
||||
|
||||
for i := range feed.Items {
|
||||
item := feed.Items[i]
|
||||
|
||||
rssItem := rssFeedItem{
|
||||
ChannelURL: feed.Link,
|
||||
ChannelURL: feedURL,
|
||||
}
|
||||
|
||||
if request.ItemLinkPrefix != "" {
|
||||
@@ -257,7 +269,7 @@ func (widget *rssWidget) fetchItemsFromFeedTask(request rssFeedRequest) ([]rssFe
|
||||
rssItem.Link = item.Link
|
||||
} else {
|
||||
parsedUrl, err := url.Parse(feed.Link)
|
||||
if err != nil {
|
||||
if err != nil || feed.Link == "/" {
|
||||
parsedUrl, err = url.Parse(request.URL)
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user