From e1d7668a3eec06f5814e95d759c6ba92874c592e Mon Sep 17 00:00:00 2001
From: Daniel Barber <github@danbarber.me>
Date: Fri, 25 Oct 2019 20:54:23 -0400
Subject: [PATCH] Fixing feed validation errors

---
 layouts/index.xml          | 11 ++++++--
 layouts/section/blog.xml   | 51 +++++++++++++++++++-------------------
 layouts/section/photos.xml | 51 +++++++++++++++++++-------------------
 3 files changed, 61 insertions(+), 52 deletions(-)

diff --git a/layouts/index.xml b/layouts/index.xml
index 6cdf3b55..06a3ff34 100644
--- a/layouts/index.xml
+++ b/layouts/index.xml
@@ -3,9 +3,13 @@
 
   <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
   <link href="{{ .Permalink }}" />
-  <id>{{ .Permalink }}"</id>
+  <id>{{ .Permalink }}</id>
   <generator uri="https://gohugo.io">Hugo</generator>
 
+  <author>
+    <name>Daniel Barber</name>
+  </author>
+
   {{ with .Site.Author.email }}
   <author>
     <name>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</name>
@@ -24,8 +28,11 @@
   <entry>
     <title>{{ .Title }}</title>
     <link href="{{ .Permalink }}" />
-    <updated>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</updated>
+    <updated>{{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>
     <id>{{ .Permalink }}</id>
+    <author>
+      <name>Daniel Barber</name>
+    </author>
     <content type="html">{{ .Content | html }}</content>
   </entry>
   {{ end }}
diff --git a/layouts/section/blog.xml b/layouts/section/blog.xml
index 3cf01c16..a63a4787 100644
--- a/layouts/section/blog.xml
+++ b/layouts/section/blog.xml
@@ -1,33 +1,34 @@
 {{ printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>" | safeHTML }}
 <feed xmlns="http://www.w3.org/2005/Atom">
 
-    <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
+  <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
+  <link href="{{ .Permalink }}" />
+  <id>{{ .Permalink }}"</id>
+  <generator uri="https://gohugo.io">Hugo</generator>
+
+  <author>
+    <name>Daniel Barber</name>
+  </author>
+
+  {{ with .Site.Copyright }}
+  <copyright>{{.}}</copyright>
+  {{end}}
+
+  {{ if not .Date.IsZero }}
+  <updated>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</updated>
+  {{ end }}
+
+  {{ range first 20 .Pages }}
+  <entry>
+    <title>{{ .Title }}</title>
     <link href="{{ .Permalink }}" />
-    <id>{{ .Permalink }}"</id>
-    <generator uri="https://gohugo.io">Hugo</generator>
-
-    {{ with .Site.Author.email }}
+    <updated>{{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>
+    <id>{{ .Permalink }}</id>
     <author>
-      <name>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</name>
+      <name>Daniel Barber</name>
     </author>
-    {{end}}
-
-    {{ with .Site.Copyright }}
-    <copyright>{{.}}</copyright>
-    {{end}}
-
-    {{ if not .Date.IsZero }}
-    <updated>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</updated>
-    {{ end }}
-
-    {{ range first 20 .Pages }}
-    <entry>
-      <title>{{ .Title }}</title>
-      <link href="{{ .Permalink }}" />
-      <updated>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</updated>
-      <id>{{ .Permalink }}</id>
-      <content type="html">{{ .Content | html }}</content>
-    </entry>
-    {{ end }}
+    <content type="html">{{ .Content | html }}</content>
+  </entry>
+  {{ end }}
 
 </feed>
diff --git a/layouts/section/photos.xml b/layouts/section/photos.xml
index 3cf01c16..6dfeb211 100644
--- a/layouts/section/photos.xml
+++ b/layouts/section/photos.xml
@@ -1,33 +1,34 @@
 {{ printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\" ?>" | safeHTML }}
 <feed xmlns="http://www.w3.org/2005/Atom">
 
-    <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
+  <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
+  <link href="{{ .Permalink }}" />
+  <id>{{ .Permalink }}</id>
+  <generator uri="https://gohugo.io">Hugo</generator>
+
+  <author>
+    <name>Daniel Barber</name>
+  </author>
+
+  {{ with .Site.Copyright }}
+  <copyright>{{.}}</copyright>
+  {{end}}
+
+  {{ if not .Date.IsZero }}
+  <updated>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</updated>
+  {{ end }}
+
+  {{ range first 20 .Pages }}
+  <entry>
+    <title>{{ .Title }}</title>
     <link href="{{ .Permalink }}" />
-    <id>{{ .Permalink }}"</id>
-    <generator uri="https://gohugo.io">Hugo</generator>
-
-    {{ with .Site.Author.email }}
+    <updated>{{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>
+    <id>{{ .Permalink }}</id>
     <author>
-      <name>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</name>
+      <name>Daniel Barber</name>
     </author>
-    {{end}}
-
-    {{ with .Site.Copyright }}
-    <copyright>{{.}}</copyright>
-    {{end}}
-
-    {{ if not .Date.IsZero }}
-    <updated>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</updated>
-    {{ end }}
-
-    {{ range first 20 .Pages }}
-    <entry>
-      <title>{{ .Title }}</title>
-      <link href="{{ .Permalink }}" />
-      <updated>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</updated>
-      <id>{{ .Permalink }}</id>
-      <content type="html">{{ .Content | html }}</content>
-    </entry>
-    {{ end }}
+    <content type="html">{{ .Content | html }}</content>
+  </entry>
+  {{ end }}
 
 </feed>