use image path from conf

fix rebase conflict
umputun · Apr 2, 2022 · 451369b · 451369b
1 parent 9a74639
commit 451369b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/app/api/server.go b/app/api/server.go
@@ -148,8 +148,6 @@ func (s *Server) getFeedCtrl(w http.ResponseWriter, r *http.Request) {
 
 	rss := feed.Rss2{
 		Version:       "2.0",
-		NsItunes:      "http://www.itunes.com/dtds/podcast-1.0.dtd",
-		NsMedia:       "http://search.yahoo.com/mrss/",
 		ItemList:      items,
 		Title:         s.Conf.Feeds[feedName].Title,
 		Description:   s.Conf.Feeds[feedName].Description,
@@ -158,6 +156,7 @@ func (s *Server) getFeedCtrl(w http.ResponseWriter, r *http.Request) {
 		PubDate:       items[0].PubDate,
 		LastBuildDate: time.Now().Format(time.RFC822Z),
 		NsItunes:      "http://www.itunes.com/dtds/podcast-1.0.dtd",
+		NsMedia:       "http://search.yahoo.com/mrss/",
 	}
 
 	// replace link to UI page
@@ -166,10 +165,10 @@ func (s *Server) getFeedCtrl(w http.ResponseWriter, r *http.Request) {
 		rss.Link = baseURL + "/feed/" + feedName
 		if s.Conf.Feeds[feedName].Image != "" {
 			rss.ItunesImage = feed.ItunesImg{
-				URL: baseURL + "/image/" + feedName,
+				URL: baseURL + s.Conf.Feeds[feedName].Image,
 			}
 			rss.MediaThumbnail = feed.MediaThumbnail{
-				URL: baseURL + "/image/" + feedName,
+				URL: baseURL + s.Conf.Feeds[feedName].Image,
 			}
 		}
 	}

diff --git a/app/feed/parser.go b/app/feed/parser.go
@@ -18,16 +18,16 @@ import (
 
 // Rss2 feed
 type Rss2 struct {
-	XMLName       xml.Name `xml:"rss"`
-	Version       string   `xml:"version,attr"`
-	NsItunes      string   `xml:"xmlns:itunes,attr"`
-	NsMedia       string         `xml:"xmlns:media,attr"`
-	Title         string   `xml:"channel>title"`
-	Language      string   `xml:"channel>language"`
-	Link          string   `xml:"channel>link"`
-	Description   string   `xml:"channel>description"`
-	PubDate       string   `xml:"channel>pubDate"`
-	LastBuildDate string   `xml:"channel>lastBuildDate"`
+	XMLName        xml.Name       `xml:"rss"`
+	Version        string         `xml:"version,attr"`
+	NsItunes       string         `xml:"xmlns:itunes,attr"`
+	NsMedia        string         `xml:"xmlns:media,attr"`
+	Title          string         `xml:"channel>title"`
+	Language       string         `xml:"channel>language"`
+	Link           string         `xml:"channel>link"`
+	Description    string         `xml:"channel>description"`
+	PubDate        string         `xml:"channel>pubDate"`
+	LastBuildDate  string         `xml:"channel>lastBuildDate"`
 	ItunesImage    ItunesImg      `xml:"channel>itunes:image"`
 	MediaThumbnail MediaThumbnail `xml:"channel>media:thumbnail"`