From 2ac67528156e58f77fcd665b366bc4e44060ebbd1eaf383a97c193b30c93e72a Mon Sep 17 00:00:00 2001
From: Nicholas Johnson <nick@nicksphere.ch>
Date: Sat, 30 Apr 2022 00:00:00 +0000
Subject: Clean up Atom feed templates

---
 layouts/index.atom.xml        | 18 +++++++++---------
 layouts/index.gemini_atom.xml |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'layouts')

diff --git a/layouts/index.atom.xml b/layouts/index.atom.xml
index b2ff567..2f89537 100644
--- a/layouts/index.atom.xml
+++ b/layouts/index.atom.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
+    <id>{{ .Permalink }}</id>
     <title>{{ .Site.Title }}</title>
+    <updated>{{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>
     <link href="{{ .Permalink }}atom.xml" rel="self">
-    <link href="{{ .Permalink }}">{{ if not .Date.IsZero }}
-    <updated>{{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>{{ end }}
-    <id>{{ .Permalink }}</id>
+    <link href="{{ .Permalink }}" rel="alternate">
     <author>
         <name>{{ .Site.Author.name }}</name>
         <email>{{ .Site.Author.email }}</email>
     </author>
-    <generator>Hugo -- gohugo.io</generator>{{ range first .Site.Config.Services.RSS.Limit .Site.RegularPages }}
+    <generator>Hugo -- gohugo.io</generator>
+    <rights type="html">{{ .Site.Copyright }} {{ .Site.Params.beginCopyrightYear }}-{{ now.Format "2006" }} {{ .Site.Author.name }}</rights>
+    <subtitle>{{ .Site.Params.Description }}</subtitle>{{ range first .Site.Config.Services.RSS.Limit .Site.RegularPages }}
     <entry>
-        <title type="html">{{ .Title }}></title>
-        <link href="{{ .Permalink }}">
         <id>{{ .Permalink }}</id>
+        <title type="html">{{ .Title }}></title>
         <updated>{{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>
-        {{- if .Content }}
-        <content type="html"><{{ .Content }}</content>
-        {{- end }}
+        <link href="{{ .Permalink }}">
+        <content type="html">{{ .Content }}</content>
     </entry>{{ end }}
 </feed>
diff --git a/layouts/index.gemini_atom.xml b/layouts/index.gemini_atom.xml
index c52f632..3c04d35 100644
--- a/layouts/index.gemini_atom.xml
+++ b/layouts/index.gemini_atom.xml
@@ -4,7 +4,7 @@
     <title>{{ .Site.Title }}</title>
     <updated>{{ .Date.Format "2006-01-02T15:04:05Z" | safeHTML }}</updated>
     <link href="{{ replace .Permalink "https://" "gemini://" | safeURL }}atom.xml" rel="self">
-    <link href="{{ replace .Permalink "https://" "gemini://" | safeURL }}" rel="alternate">{{ if not .Date.IsZero }}{{ end }}
+    <link href="{{ replace .Permalink "https://" "gemini://" | safeURL }}" rel="alternate">
     <author>
         <name>{{ .Site.Author.name }}</name>
         <email>{{ .Site.Author.email }}</email>
-- 
cgit v1.2.3