From de907bfa1d8a8ba2c4627a31f7d6794d9d37dad9 Mon Sep 17 00:00:00 2001
From: Brandon Rozek <brozek@brandonrozek.com>
Date: Fri, 20 Jan 2023 12:32:11 -0500
Subject: [PATCH] Fixing up feeds

---
 assets/css/pretty-feed-v3.xsl   | 2 +-
 layouts/_default/list.atom.atom | 4 +---
 layouts/_default/rss.xml        | 8 ++++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/assets/css/pretty-feed-v3.xsl b/assets/css/pretty-feed-v3.xsl
index c8daa6f..976598a 100644
--- a/assets/css/pretty-feed-v3.xsl
+++ b/assets/css/pretty-feed-v3.xsl
@@ -100,7 +100,7 @@ This file is in BETA. Please test and contribute to the discussion:
               </xsl:attribute>
               <img>
                 <xsl:attribute name="src">
-                  <xsl:value-of select="/rss/channel/image"/>
+                  <xsl:value-of select="/rss/channel/image/url"/>
                 </xsl:attribute>
                 <xsl:attribute name="title">
                   <xsl:value-of select="/rss/channel/title"/>
diff --git a/layouts/_default/list.atom.atom b/layouts/_default/list.atom.atom
index 1e74a2c..0b5d808 100644
--- a/layouts/_default/list.atom.atom
+++ b/layouts/_default/list.atom.atom
@@ -15,14 +15,12 @@
       xml:base="{{ .Permalink }}">
     <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} | {{ end }}{{ .Site.Title }}{{ end }}</title>
     <id>{{ .Permalink }}</id>
-    <image>{{ .Site.BaseURL }}img/{{ .Site.Params.avatar }}</image>
-    <description>{{ .Description }}</description>
     <generator uri="https://gohugo.io">Hugo</generator>
     <author>
       <uri>{{ .Site.BaseURL }}</uri>
       {{ with .Site.Author.name }}<name>{{.}}</name>{{end}}
     </author>
-    <updated>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</updated>
+    <updated>{{ now.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>
     {{ with .OutputFormats.Get "Atom" }}
 	{{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}
     {{ end }}
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index 6fde91e..f44386c 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -12,7 +12,11 @@
   <channel>
     <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} | {{ end }}{{ .Site.Title }}{{ end }}</title>
     <link>{{ .Permalink }}</link>
-    <image>{{ .Site.BaseURL }}img/{{ .Site.Params.avatar }}</image>
+    <image>
+      <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} | {{ end }}{{ .Site.Title }}{{ end }}</title>
+      <link>{{ .Permalink }}</link>
+      <url>{{ .Site.BaseURL }}img/{{ .Site.Params.avatar }}</url>
+    </image>
     <description>{{ .Description }}</description>
     <generator>Hugo -- gohugo.io</generator>{{ with .Site.LanguageCode }}
     <language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
@@ -30,7 +34,7 @@
       <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
       {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
       <guid>{{ .Permalink }}</guid>
-      {{ printf `<description type="html"><![CDATA[%s]]></description>` .Content | safeHTML }}
+      {{ printf `<description><![CDATA[%s]]></description>` .Content | safeHTML }}
       {{ range .Param "tags" }}<category>{{ . }}</category>
       {{ end }}
     </item>