From 59c8dac851c6bf0d3da90028e029f54b672f2287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= <fred@miniflux.net>
Date: Tue, 17 Mar 2020 20:22:02 -0700
Subject: [PATCH] Display Feed URL on shared page instead of user feed entries

---
 storage/entry.go               | 2 +-
 storage/entry_query_builder.go | 2 +-
 template/html/entry.html       | 6 +++++-
 template/views.go              | 8 ++++++--
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/storage/entry.go b/storage/entry.go
index f0fa64bc..ba52be21 100644
--- a/storage/entry.go
+++ b/storage/entry.go
@@ -363,7 +363,7 @@ func (s *Storage) GetEntryShareCode(userID int64, entryID int64) (shareCode stri
 		return
 	}
 
-	shareCode = crypto.GenerateRandomStringHex(16)
+	shareCode = crypto.GenerateRandomStringHex(20)
 
 	query = `UPDATE entries SET share_code = $1 WHERE user_id=$2 AND id=$3`
 	result, err := s.db.Exec(query, shareCode, userID, entryID)
diff --git a/storage/entry_query_builder.go b/storage/entry_query_builder.go
index cf547a22..2136cf05 100644
--- a/storage/entry_query_builder.go
+++ b/storage/entry_query_builder.go
@@ -128,7 +128,7 @@ func (e *EntryQueryBuilder) WithoutStatus(status string) *EntryQueryBuilder {
 	return e
 }
 
-// WithShareCode set the entry hash.
+// WithShareCode set the entry share code.
 func (e *EntryQueryBuilder) WithShareCode(shareCode string) *EntryQueryBuilder {
 	e.conditions = append(e.conditions, fmt.Sprintf("e.share_code = $%d", len(e.args)+1))
 	e.args = append(e.args, shareCode)
diff --git a/template/html/entry.html b/template/html/entry.html
index 3ff2cdb5..0456342a 100644
--- a/template/html/entry.html
+++ b/template/html/entry.html
@@ -72,7 +72,11 @@
                 {{ if and .user (ne .entry.Feed.Icon.IconID 0) }}
                     <img src="{{ route "icon" "iconID" .entry.Feed.Icon.IconID }}" width="16" height="16" loading="lazy" alt="{{ .entry.Feed.Title }}">
                 {{ end }}
-                <a href="{{ route "feedEntries" "feedID" .entry.Feed.ID }}">{{ .entry.Feed.Title }}</a>
+                {{ if .user }}
+                    <a href="{{ route "feedEntries" "feedID" .entry.Feed.ID }}">{{ .entry.Feed.Title }}</a>
+                {{ else }}
+                    <a href="{{ .entry.Feed.SiteURL | safeURL }}">{{ .entry.Feed.Title }}</a>
+                {{ end }}
             </span>
             {{ if .entry.Author }}
                 <span class="entry-author">
diff --git a/template/views.go b/template/views.go
index 70753ef2..d31b0c60 100644
--- a/template/views.go
+++ b/template/views.go
@@ -719,7 +719,11 @@ var templateViewsMap = map[string]string{
                 {{ if and .user (ne .entry.Feed.Icon.IconID 0) }}
                     <img src="{{ route "icon" "iconID" .entry.Feed.Icon.IconID }}" width="16" height="16" loading="lazy" alt="{{ .entry.Feed.Title }}">
                 {{ end }}
-                <a href="{{ route "feedEntries" "feedID" .entry.Feed.ID }}">{{ .entry.Feed.Title }}</a>
+                {{ if .user }}
+                    <a href="{{ route "feedEntries" "feedID" .entry.Feed.ID }}">{{ .entry.Feed.Title }}</a>
+                {{ else }}
+                    <a href="{{ .entry.Feed.SiteURL | safeURL }}">{{ .entry.Feed.Title }}</a>
+                {{ end }}
             </span>
             {{ if .entry.Author }}
                 <span class="entry-author">
@@ -1448,7 +1452,7 @@ var templateViewsMapChecksums = map[string]string{
 	"edit_category":       "b1c0b38f1b714c5d884edcd61e5b5295a5f1c8b71c469b35391e4dcc97cc6d36",
 	"edit_feed":           "cc0b5dbb73f81398410958b41771ed38246bc7ae4bd548228f0d48c49a598c2a",
 	"edit_user":           "c692db9de1a084c57b93e95a14b041d39bf489846cbb91fc982a62b72b77062a",
-	"entry":               "ef9cd8bb99c561023c1dcea1dbd7f90c4cdc195ed70e2ed9c88213fec875d770",
+	"entry":               "25c2781b7a42725f38a7dd0795a90647db515e19893671dc10900eeda2282419",
 	"feed_entries":        "9c70b82f55e4b311eff20be1641733612e3c1b406ce8010861e4c417d97b6dcc",
 	"feeds":               "ec7d3fa96735bd8422ba69ef0927dcccddc1cc51327e0271f0312d3f881c64fd",
 	"history_entries":     "87e17d39de70eb3fdbc4000326283be610928758eae7924e4b08dcb446f3b6a9",