fix: rss feed

fix: rss feed

fix: rss feed

fix: rss feed

fix: rss feed

Author: devmegablaster

pkg/jatt.go

@@ -14,7 +14,7 @@ import (
 
 type Jatt struct {
 	reader   *reader.Reader
-	rss      *rss.Rss
+	rss      *rss.RssSvc
 	renderer *renderer.Renderer
 	writer   *writer.Writer
 }
@@ -32,8 +32,8 @@ func (j *Jatt) Run() {
 	timeStart := time.Now()
 
 	files := j.reader.Read()
-	feed := j.rss.GenerateFeed(files)
 	renderedFiles := j.renderer.Render(files)
+	feed := j.rss.GenerateFeed(files, renderedFiles)
 	j.writer.WriteFiles(renderedFiles)
 	j.writer.WriteRSSFeed(feed)
 	j.writer.CopyStatic()

pkg/renderer/renderer.go

@@ -23,6 +23,7 @@ type Renderer struct {
 type RenderedFile struct {
 	Name        string
 	Html        []byte
+	ContentHtml []byte
 	FrontMatter reader.FrontMatter
 }
 
@@ -61,6 +62,7 @@ func (r *Renderer) Render(files []reader.File) []RenderedFile {
 		renderedFiles = append(renderedFiles, RenderedFile{
 			Name:        file.Name,
 			Html:        buf.Bytes(),
+			ContentHtml: html,
 			FrontMatter: file.FrontMatter,
 		})
 

pkg/rss/rss.go

@@ -7,55 +7,90 @@ import (
 
 	"github.com/devmegablaster/jatt/internal/config"
 	"github.com/devmegablaster/jatt/pkg/reader"
+	"github.com/devmegablaster/jatt/pkg/renderer"
 	"github.com/devmegablaster/jatt/pkg/styles"
 )
 
-type Rss struct {
+type RssSvc struct {
 	cfg config.JattConfig
 }
 
-func New(cfg config.JattConfig) *Rss {
-	return &Rss{
+func New(cfg config.JattConfig) *RssSvc {
+	return &RssSvc{
 		cfg: cfg,
 	}
 }
 
-type Feed struct {
-	Title       string               `xml:"title"`
-	Description string               `xml:"description"`
-	Link        string               `xml:"link"`
-	PubDate     time.Time            `xml:"pubDate"`
-	Items       []reader.ListingItem `xml:"item"`
+type Rss struct {
+	XMLName xml.Name `xml:"rss"`
+	Version string   `xml:"version,attr"`
+	Channel Channel  `xml:"channel"`
+}
+
+type Channel struct {
+	Title       string    `xml:"title"`
+	Description string    `xml:"description"`
+	Link        string    `xml:"link"`
+	PubDate     time.Time `xml:"pubDate"`
+	Items       []Item    `xml:"item"`
+}
+
+type Item struct {
+	Title       string    `xml:"title"`
+	Link        string    `xml:"link"`
+	Description string    `xml:"description"`
+	PubDate     time.Time `xml:"pubDate"`
+	Content     string    `xml:"content:encoded"`
 }
 
-func (r *Rss) GenerateFeed(files []reader.File) []byte {
-	posts := []reader.ListingItem{}
+func (r *RssSvc) GenerateFeed(files []reader.File, renderedFiles []renderer.RenderedFile) []byte {
+	posts := []Item{}
 
 	for _, file := range files {
 		if file.FrontMatter.Draft {
 			continue
 		}
 
 		if file.FrontMatter.Layout == "listing" {
-			for _, item := range file.Listing {
-				posts = append(posts, item)
+			for index, item := range file.Listing {
+				t, err := time.Parse("2006-01-02", item.Date)
+				if err != nil {
+					t = time.Now()
+					fmt.Println(styles.ErrorStyle.Render("Error parsing date"))
+					fmt.Println(styles.ErrorStyle.Render(err.Error()))
+				}
+
+				posts = append(posts, Item{
+					Title:       item.Title,
+					Link:        item.URL,
+					Description: item.Description,
+					PubDate:     t,
+					Content:     string(renderedFiles[index].ContentHtml),
+				})
 			}
 		}
 	}
 
-	feed := Feed{
+	channel := Channel{
 		Title:       r.cfg.SiteConfig.Title,
 		Description: r.cfg.SiteConfig.Description,
 		Link:        r.cfg.SiteConfig.BaseURL,
 		PubDate:     time.Now(),
 		Items:       posts,
 	}
 
+	feed := Rss{
+		Version: "2.0",
+		Channel: channel,
+	}
+
 	enc, err := xml.MarshalIndent(&feed, "", "  ")
 	if err != nil {
 		fmt.Println(styles.ErrorStyle.Render("Error generating RSS feed"))
 	}
 
+	enc = []byte(xml.Header + string(enc))
+
 	fmt.Println(styles.DebugStyle.Render("Generated RSS feed"))
 
 	return enc