From 827683ab59131ec38ed7cfa268bcaa6dc77d1412 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@miniflux.net>
Date: Wed, 13 Dec 2017 20:16:15 -0800
Subject: Make sure that item URL are absolute

---
 reader/json/json.go        |  6 ++++++
 reader/json/parser_test.go | 25 +++++++++++++++++++++++++
 2 files changed, 31 insertions(+)

(limited to 'reader/json')

diff --git a/reader/json/json.go b/reader/json/json.go
index 5924916..ad92068 100644
--- a/reader/json/json.go
+++ b/reader/json/json.go
@@ -13,6 +13,7 @@ import (
 	"github.com/miniflux/miniflux/model"
 	"github.com/miniflux/miniflux/reader/date"
 	"github.com/miniflux/miniflux/reader/sanitizer"
+	"github.com/miniflux/miniflux/url"
 )
 
 type jsonFeed struct {
@@ -66,6 +67,11 @@ func (j *jsonFeed) Transform() *model.Feed {
 
 	for _, item := range j.Items {
 		entry := item.Transform()
+		entryURL, err := url.AbsoluteURL(feed.SiteURL, entry.URL)
+		if err == nil {
+			entry.URL = entryURL
+		}
+
 		if entry.Author == "" {
 			entry.Author = j.GetAuthor()
 		}
diff --git a/reader/json/parser_test.go b/reader/json/parser_test.go
index e6fa9ed..a3d5b5b 100644
--- a/reader/json/parser_test.go
+++ b/reader/json/parser_test.go
@@ -174,6 +174,31 @@ func TestParsePodcast(t *testing.T) {
 	}
 }
 
+func TestParseFeedWithRelativeURL(t *testing.T) {
+	data := `{
+		"version": "https://jsonfeed.org/version/1",
+		"title": "Example",
+		"home_page_url": "https://example.org/",
+		"feed_url": "https://example.org/feed.json",
+		"items": [
+			{
+				"id": "2347259",
+				"url": "something.html",
+				"date_published": "2016-02-09T14:22:00-07:00"
+			}
+		]
+	}`
+
+	feed, err := Parse(bytes.NewBufferString(data))
+	if err != nil {
+		t.Error(err)
+	}
+
+	if feed.Entries[0].URL != "https://example.org/something.html" {
+		t.Errorf("Incorrect entry URL, got: %s", feed.Entries[0].URL)
+	}
+}
+
 func TestParseAuthor(t *testing.T) {
 	data := `{
 		"version": "https://jsonfeed.org/version/1",
-- 
cgit v1.2.3