From 7f144fbe174fe62dd97d634d8d1edd6f3131a3de Mon Sep 17 00:00:00 2001
From: Will Faught <willfaught@users.noreply.github.com>
Date: Sat, 23 Sep 2023 15:41:58 -0700
Subject: [PATCH] Clean up, random fixes for Atom, RSS

---
 layouts/_default/list.atom.xml | 189 +++++++++++++++++----------------
 layouts/_default/rss.xml       |  28 +++--
 2 files changed, 109 insertions(+), 108 deletions(-)

diff --git a/layouts/_default/list.atom.xml b/layouts/_default/list.atom.xml
index 663356df..a1e24ae6 100644
--- a/layouts/_default/list.atom.xml
+++ b/layouts/_default/list.atom.xml
@@ -1,36 +1,52 @@
 {{ $page := . }}
 
 {{ $authors := $page.Param "paige.feed.atom.authors" }}
-{{ $lang := site.LanguageCode | default site.Language.Lang }}
+{{ $format := "2006-01-02T15:04:05Z07:00" }}
+{{ $html := $page.AlternativeOutputFormats.Get "html" }}
+{{ $id := "" }}
+{{ $ids := dict }}
+{{ $language := site.LanguageCode | default site.Language.Lang }}
 {{ $limit := site.Config.Services.RSS.Limit }}
 {{ $pagetitle := $page.Title | markdownify }}
-{{ $rights := site.Copyright }}
+{{ $rights := site.Copyright | markdownify }}
 {{ $sitetitle := site.Title | markdownify }}
 {{ $subpages := (cond $page.IsHome site $page).RegularPages }}
-{{ $subtitle := $page.Description }}
+{{ $subtitle := $page.Description | markdownify }}
 {{ $title := "" }}
-{{ $updated := site.LastChange }}
+{{ $updated := site.LastChange.Format $format }}
+
+{{ if $page.Params.id }}
+    {{ $id = $page.Params.id }}
+{{ else if not $page.Date.IsZero }}
+    {{ $id = printf "tag:%s,%s:%s" (urls.Parse site.BaseURL).Host (.Date.Format "2006-01-02") (.Date.Format $format) }}
+{{ else }}
+    {{ $id = $page.Permalink }}
+{{ end }}
+
+{{ $subpages = where $subpages "Params.paige.feed.hide_page" "ne" true }}
+
+{{ if ge $limit 0 }}
+    {{ $subpages = $subpages | first $limit }}
+{{ end }}
 
 {{ if and $pagetitle $sitetitle }}
     {{ if $page.IsHome }}
-        {{ $title = $pagetitle | safeHTML }}
+        {{ $title = $pagetitle }}
     {{ else }}
-        {{ $title = printf "%s · %s" $pagetitle $sitetitle | safeHTML }}
+        {{ $title = printf "%s · %s" $pagetitle $sitetitle }}
     {{ end }}
 {{ else if $pagetitle }}
-    {{ $title = $pagetitle | safeHTML }}
+    {{ $title = $pagetitle }}
 {{ else if $sitetitle }}
-    {{ $title = $sitetitle | safeHTML }}
+    {{ $title = $sitetitle }}
 {{ end }}
 
-{{ $subpages = where $subpages "Params.paige.feed.hide_page" "ne" true }}
-
-{{ if ge $limit 0 }}
-    {{ $subpages = $subpages | first $limit }}
+{{ if not $title }}
+    {{ warnf "layouts/_default/list.atom.xml: Page %s does not have a title" $page.RelPermalink }}
 {{ end }}
 
 {{ printf "<?xml version=\"1.0\" encoding=\"utf-8\"?>" | safeHTML }}
-<feed xmlns="http://www.w3.org/2005/Atom" {{ with $lang }} xml:lang="{{ . }}" {{ end }}>
+<feed xmlns="http://www.w3.org/2005/Atom" {{ with $language }} xml:lang="{{ . }}" {{ end }}>
     {{ range $authors }}
         <author>
             {{ with .email }}
@@ -47,87 +63,59 @@
         </author>
     {{ end }}
 
-    {{ $id := "" }}
-
-    {{ if .Params.id }}
-        {{ $id = .Params.id }}
-    {{ else if not $page.Date.IsZero }}
-        {{ $id = printf "tag:%s,%s:%s" (urls.Parse site.BaseURL).Host (.Date.Format "2006-01-02") (.Date.Format "2006-01-02T15:04:05Z07:00") }}
-    {{ else }}
-        {{ $id = .Permalink }}
-    {{ end }}
-
     <id>{{ $id }}</id>
-    {{ printf `<link href="%s" rel="self" type="application/atom+xml"/>` ($page.Permalink | safeURL) | safeHTML }}
 
-    {{ with $page.AlternativeOutputFormats.Get "html" }}
-        {{ printf `<link href="%s" rel="alternate" type="%s"/>` (.Permalink | safeURL) .MediaType | safeHTML }}
+    {{ range $page.OutputFormats }}
+        {{ $rel := cond (eq .Permalink $page.Permalink) "self" .Rel }}
+
+        {{ printf `<link href="%s" rel="%s" type="%s"/>` .Permalink $rel .MediaType | safeHTML }}
     {{ end }}
 
     {{ range $t := $page.Translations }}
         {{ range .OutputFormats }}
-            {{ if eq .Rel "alternate" }}
-                {{ printf `<link href="%s" hreflang="%s" rel="alternate" type="%s"/>` (.Permalink | safeURL) $t.Lang .MediaType | safeHTML }}
-            {{ end }}
+            {{ printf `<link href="%s" hreflang="%s" rel="%s" type="%s"/>` .Permalink $t.Lang .Rel .MediaType | safeHTML }}
         {{ end }}
     {{ end }}
 
     {{ with $rights }}
-        <rights type="html">{{ printf "<![CDATA[%s]]>" (. | markdownify) | safeHTML }}</rights>
+        <rights type="html">{{ printf "<![CDATA[%s]]>" . | safeHTML }}</rights>
     {{ end }}
 
     {{ with $subtitle }}
-        <subtitle type="html">{{ printf "<![CDATA[%s]]>" (. | markdownify) | safeHTML}}</subtitle>
-    {{ end }}
-
-    {{ if not $title }}
-        {{ warnf "layouts/_default/list.atom.xml: Page %s does not have a title" $page.RelPermalink }}
+        <subtitle type="html">{{ printf "<![CDATA[%s]]>" . | safeHTML}}</subtitle>
     {{ end }}
 
-    {{ printf `<title type="html"><![CDATA[%s]]></title>` ($title | markdownify) | safeHTML }}
-    <updated>{{ $updated.Format "2006-01-02T15:04:05Z07:00" }}</updated>
-
-    {{ $ids := dict }}
+    {{ printf `<title type="html"><![CDATA[%s]]></title>` $title | safeHTML }}
+    <updated>{{ $updated }}</updated>
 
     {{ range $subpage := $subpages }}
         <entry>
-            {{ with partial "paige/authors.html" . }}
-                {{ range . }}
-                    <author>
-                        {{ with .email }}
-                            <email>{{ . }}</email>
-                        {{ end }}
-
-                        {{ with .name }}
-                            <name>{{ . }}</name>
-                        {{ end }}
-
-                        {{ with .url }}
-                            <uri>{{ . }}</uri>
-                        {{ end }}
-                    </author>
-                {{ end }}
-            {{ end }}
-
             {{ $content := .Content }}
+            {{ $id := "" }}
+            {{ $paramlink := and .Params.link (not (.Param "paige.feed.link_to_page")) | not | not }}
+            {{ $published := cond (not .PublishDate.IsZero) (.PublishDate.Format $format) "" }}
+            {{ $rights := site.Copyright | markdownify }}
+            {{ $summary := .Description | markdownify }}
+            {{ $title := .Title | markdownify }}
+            {{ $updated := .Lastmod.Format $format }}
 
-            {{ if $content }}
-                {{ if and .Params.link (not (.Param "paige.feed.link_to_page")) }}
-                    {{ $link := or (.Param "paige.feed.page_link" | markdownify) "⏎" }}
-                    {{ $footer := printf `<p><a href="%s" title="%s">%s</a></p>` .Permalink .Title $link }}
+            {{ $link := cond $paramlink .Params.link .Permalink }}
 
-                    {{ $content = print $content $footer }}
-                {{ end }}
+            {{ if and $content $paramlink }}
+                {{ $link := or (.Param "paige.feed.page_link" | markdownify) "⏎" }}
+                {{ $footer := printf `<p><a href="%s" title="%s">%s</a></p>` .Permalink .Title $link }}
 
-                <content type="html">{{ printf "<![CDATA[%s]]>" $content | safeHTML }}</content>
+                {{ $content = print $content $footer }}
             {{ end }}
 
-            {{ $id := "" }}
+            {{ if not $content }}
+                {{ $content = .Description | markdownify}}
+            {{ end }}
 
             {{ if .Params.id }}
                 {{ $id = .Params.id }}
             {{ else if not .Date.IsZero }}
-                {{ $id = printf "tag:%s,%s:%s" (urls.Parse site.BaseURL).Host (.Date.Format "2006-01-02") (.Date.Format "2006-01-02T15:04:05Z07:00") }}
+                {{ $id = printf "tag:%s,%s:%s" (urls.Parse site.BaseURL).Host (.Date.Format "2006-01-02") (.Date.Format $format) }}
             {{ else }}
                 {{ $id = .RelPermalink }}
             {{ end }}
@@ -137,51 +125,66 @@
             {{ end }}
 
             {{ $ids = merge (dict $id .RelPermalink) $ids }}
-            <id>{{ $id }}</id>
 
-            {{ range .OutputFormats }}
-                {{ if eq .Rel "alternate" }}
-                    {{ printf `<link href="%s" rel="alternate" type="%s"/>` (.Permalink | safeURL) .MediaType | safeHTML }}
-                {{ end }}
+            {{ if not $title }}
+                {{ warnf "layouts/_default/list.atom.xml: Page %s does not have a title" .RelPermalink }}
             {{ end }}
 
-            {{ range $t := .Translations }}
-                {{ range .OutputFormats }}
-                    {{ if eq .Rel "alternate" }}
-                        {{ printf `<link href="%s" hreflang="%s" rel="alternate" type="%s"/>` (.Permalink | safeURL) $t.Lang .MediaType | safeHTML }}
-                    {{ end }}
-                {{ end }}
+            {{ if .Lastmod.IsZero }}
+                {{ warnf "layouts/_default/list.atom.xml: Page %s does not have a modified date" .RelPermalink }}
             {{ end }}
 
-            {{ if and .Params.link (not (.Param "paige.feed.link_to_page")) }}
-                <link href="{{ .Params.link | safeURL }}" rel="alternate" type="text/html"/>
-            {{ else }}
-                <link href="{{ .Permalink | safeURL }}" rel="alternate" type="text/html"/>
+            {{ with partial "paige/authors.html" . }}
+                {{ range . }}
+                    <author>
+                        {{ with .email }}
+                            <email>{{ . }}</email>
+                        {{ end }}
+
+                        {{ with .name }}
+                            <name>{{ . }}</name>
+                        {{ end }}
+
+                        {{ with .url }}
+                            <uri>{{ . }}</uri>
+                        {{ end }}
+                    </author>
+                {{ end }}
             {{ end }}
 
-            {{ if not .PublishDate.IsZero }}
-                <published>{{ .PublishDate.Format "2006-01-02T15:04:05Z07:00" }}</published>
+            {{ with $content }}
+                <content type="html">{{ printf "<![CDATA[%s]]>" . | safeHTML }}</content>
             {{ end }}
 
-            {{ with site.Copyright }}
-                <rights type="html">{{ printf "<![CDATA[%s]]>" (. | markdownify) | safeHTML }}</rights>
+            <id>{{ $id }}</id>
+
+            {{ range $page.OutputFormats }}
+                {{ $rel := cond (eq .Permalink $page.Permalink) "self" .Rel }}
+
+                {{ printf `<link href="%s" rel="%s" type="%s"/>` .Permalink $rel .MediaType | safeHTML }}
             {{ end }}
 
-            {{ with .Description }}
-                <summary type="html">{{ printf "<![CDATA[%s]]>" (. | markdownify) | safeHTML }}</summary>
+            {{ range $t := $page.Translations }}
+                {{ range .OutputFormats }}
+                    {{ printf `<link href="%s" hreflang="%s" rel="%s" type="%s"/>` .Permalink $t.Lang .Rel .MediaType | safeHTML }}
+                {{ end }}
             {{ end }}
 
-            {{ if not .Title }}
-                {{ warnf "layouts/_default/list.atom.xml: %s: Page %s does not have a title" .RelPermalink }}
+            {{ with $published }}
+                <published>{{ . }}</published>
             {{ end }}
 
-            {{ printf `<title type="html"><![CDATA[%s]]></title>` (.Title | markdownify) | safeHTML }}
+            {{ with $rights }}
+                <rights type="html">{{ printf "<![CDATA[%s]]>" . | safeHTML }}</rights>
+            {{ end }}
 
-            {{ if .Lastmod.IsZero }}
-                {{ warnf "layouts/_default/list.atom.xml: Page %s does not have a modified date" .RelPermalink }}
+            {{ with $summary }}
+                <summary type="html">{{ printf "<![CDATA[%s]]>" . | safeHTML }}</summary>
             {{ end }}
 
-            <updated>{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}</updated>
+            {{ printf `<title type="html"><![CDATA[%s]]></title>` $title | safeHTML }}
+
+            <updated>{{ $updated }}</updated>
         </entry>
     {{ end }}
 </feed>
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index d9ac9ac2..37097db6 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -7,7 +7,7 @@
 {{ $html := $page.AlternativeOutputFormats.Get "html" }}
 {{ $language := site.LanguageCode | default site.Language.Lang }}
 {{ $limit := site.Config.Services.RSS.Limit }}
-{{ $link := $page.Permalink }}
+{{ $link := ($page.AlternativeOutputFormats.Get "html").Permalink }}
 {{ $managingeditor := $page.Param "paige.feed.rss.managing_editor" }}
 {{ $pagetitle := $page.Title | markdownify | plainify }}
 {{ $sitetitle := site.Title | markdownify | plainify }}
@@ -17,6 +17,12 @@
 
 {{ $lastbuilddate := (partial "paige/changed.html" $page).Format $format }}
 
+{{ $subpages = where $subpages "Params.paige.feed.hide_page" "ne" true }}
+
+{{ if ge $limit 0 }}
+    {{ $subpages = $subpages | first $limit }}
+{{ end }}
+
 {{ if and $pagetitle $sitetitle }}
     {{ if $page.IsHome }}
         {{ $title = $pagetitle }}
@@ -29,14 +35,8 @@
     {{ $title = $sitetitle }}
 {{ end }}
 
-{{ $subpages = where $subpages "Params.paige.feed.hide_page" "ne" true }}
-
-{{ if ge $limit 0 }}
-    {{ $subpages = $subpages | first $limit }}
-{{ end }}
-
 {{ printf "<?xml version=\"1.0\" encoding=\"utf-8\"?>" | safeHTML }}
-<rss version="2.0">
+<rss version="2.0" {{ with $language }} xml:lang="{{ . }}" {{ end }}>
     <channel>
         {{ with $copyright }}
             <copyright>{{ . }}</copyright>
@@ -87,13 +87,11 @@
                     {{ end }}
                 {{ end }}
 
-                {{ if $description }}
-                    {{ if $paramlink }}
-                        {{ $pagelink := or (.Param "paige.feed.page_link" | markdownify) "⏎" }}
-                        {{ $footer := printf `<p><a href="%s" title="%s">%s</a></p>` .Permalink $title $pagelink }}
+                {{ if and $description $paramlink }}
+                    {{ $pagelink := or (.Param "paige.feed.page_link" | markdownify) "⏎" }}
+                    {{ $footer := printf `<p><a href="%s" title="%s">%s</a></p>` .Permalink $title $pagelink }}
 
-                        {{ $description = print $description $footer }}
-                    {{ end }}
+                    {{ $description = print $description $footer }}
                 {{ end }}
 
                 {{ if not $description }}
@@ -109,7 +107,7 @@
                 {{ else if not .Date.IsZero }}
                     {{ $guid = printf "tag:%s,%s:%s" (urls.Parse site.BaseURL).Host (.Date.Format "2006-01-02") (.Date.Format "2006-01-02T15:04:05Z07:00") }}
                 {{ else }}
-                    {{ $guid = .RelPermalink }}
+                    {{ $guid = .Permalink }}
                     {{ $permalink = false }}
                 {{ end }}