From b0fe89402f587633282a030d97fd95368c6e1de5 Mon Sep 17 00:00:00 2001
From: Hans van Luttikhuizen-Ross <pindab0ter@me.com>
Date: Fri, 5 Apr 2024 19:18:26 +0200
Subject: [PATCH] Improve RSS feed

---
 hugo.toml                      | 87 ++++++++++++++++++----------------
 layouts/_default/index.rss.xml | 68 ++++++++++++++++++++++++++
 layouts/_default/index.xml     | 67 --------------------------
 3 files changed, 113 insertions(+), 109 deletions(-)
 create mode 100644 layouts/_default/index.rss.xml
 delete mode 100644 layouts/_default/index.xml

diff --git a/hugo.toml b/hugo.toml
index ac14d4b..8d5ae15 100644
--- a/hugo.toml
+++ b/hugo.toml
@@ -1,7 +1,6 @@
 baseURL = 'https://hansvl.nl/'
 languageCode = 'en-uk'
-title = 'Hans van Luttikhuizen-Ross'
-author = 'Hans van Luttikhuizen-Ross'
+title = 'Hans'
 
 pluralizelisttitles = false
 paginate = 10
@@ -16,46 +15,50 @@ CanonifyURLs = true
   series = "series"
   tag = "tags"
 
-[Params]
-    favicon = "favicon.ico"
-    titleImage = 'images/profile.jpg'
-    showPrevNextPostNavigation = true
-    showRecentPostsOnIndex = true
-
-# Favicons config
-# Get your favicons from https://realfavicongenerator.net/
-[Params.favicons]
-  appleTouchIcon = '/apple-touch-icon.png'
-  icon32 = '/favicon-32x32.png'
-  icon16 = '/favicon-16x16.png'
-  manifest = '/site.webmanifest'
-  maskIcon = '/safari-pinned-tab.svg'
-  msApplicationTileColor = '#5bbad5'
-  themeColor = '#2B2B2B'
-
-# Umami configuration
-# https://umami.is/docs/install
-[Params.umami]
-  enabled = true
-  websiteId = "88d855a7-4414-40a9-b228-1107ef60aca8"
-  jsLocation = "https://analytics.umami.is/script.js"
-
-# Plausible configuration
-[Params.plausible]
-  enabled = false
-  domain = "hansvl.nl"
-  jsLocation = "https://plausible.io/js/plausible.js"
-
-# h-card configuration
-# fullName is mandatory
-[Params.hcard]
-  avatar = "images/profile.jpg"
-  fullName = "Hans van Luttikhuizen-Ross"
-  nickname = "pindab0ter"
-  showLocation = true
-  city = "Arnhem"
-  region = "Gelderland"
-  country = "The Netherlands"
+[params]
+  favicon = "favicon.ico"
+  titleImage = 'images/profile.jpg'
+  showPrevNextPostNavigation = true
+  showRecentPostsOnIndex = true
+
+  [params.author]
+    name = 'Hans van Luttikhuizen-Ross'
+    email = 'contact@hansvl.nl'
+
+  # Favicons config
+  # Get your favicons from https://realfavicongenerator.net/
+  [params.favicons]
+    appleTouchIcon = 'apple-touch-icon.png'
+    icon32 = 'favicon-32x32.png'
+    icon16 = 'favicon-16x16.png'
+    manifest = 'site.webmanifest'
+    maskIcon = 'safari-pinned-tab.svg'
+    msApplicationTileColor = '#5bbad5'
+    themeColor = '#2B2B2B'
+
+  # Umami configuration
+  # https://umami.is/docs/install
+  [params.umami]
+    enabled = true
+    websiteId = "88d855a7-4414-40a9-b228-1107ef60aca8"
+    jsLocation = "https://analytics.umami.is/script.js"
+
+  # Plausible configuration
+  [params.plausible]
+    enabled = false
+    domain = "hansvl.nl"
+    jsLocation = "https://plausible.io/js/plausible.js"
+
+  # h-card configuration
+  # fullName is mandatory
+  [params.hcard]
+    avatar = "images/profile.jpg"
+    fullName = "Hans van Luttikhuizen-Ross"
+    nickname = "pindab0ter"
+    showLocation = true
+    city = "Arnhem"
+    region = "Gelderland"
+    country = "The Netherlands"
 
 # Social icons to be displayed on the front page
 [[menu.social]]
diff --git a/layouts/_default/index.rss.xml b/layouts/_default/index.rss.xml
new file mode 100644
index 0000000..e9e1531
--- /dev/null
+++ b/layouts/_default/index.rss.xml
@@ -0,0 +1,68 @@
+{{- $baseurl := .Site.BaseURL -}}
+{{- $pctx := . -}}
+{{- if .IsHome -}}{{ $pctx = .Site }}{{- end -}}
+{{- $pages := slice -}}
+{{- if or $.IsHome $.IsSection -}}
+{{- $pages = $pctx.RegularPages -}}
+{{- else -}}
+{{- $pages = $pctx.Pages -}}
+{{- end -}}
+{{- $limit := .Site.Config.Services.RSS.Limit -}}
+{{- if ge $limit 1 -}}
+{{- $pages = $pages | first $limit -}}
+{{- end -}}
+{{- printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
+  <channel>
+    <title>{{ .Site.Title }}</title>
+    <link>{{ .Permalink }}</link>
+    <description>Recent posts on {{ .Site.Title }}</description>
+    {{ with .Site.LanguageCode }}<language>{{.}}</language>{{end}}
+    {{ with .Site.Copyright }}<copyright>{{.}}</copyright>{{end}}
+    <category>Software Development</category>
+    {{ with .Site.Params.favicons.appleTouchIcon }}
+      <image>
+        <url>{{ $.Site.BaseURL }}{{ . }}</url>
+        <title>{{ $.Title }}</title>
+        <link>{{ $.Permalink }}</link>
+      </image>
+    {{ end }}
+    <generator>Hugo -- gohugo.io</generator>
+    {{ with .Site.Params.author.email }}<managingEditor>{{.}}{{ with $.Site.Params.author.name }} ({{.}}){{end}}</managingEditor>{{end}}
+    {{ with .Site.Params.author.email }}<webMaster>{{.}}{{ with $.Site.Params.author.name }} ({{.}}){{end}}</webMaster>{{end}}
+    {{- with .OutputFormats.Get "RSS" -}}{{ printf "<atom:link href=%q rel=\"self\" type=%q />" .Permalink .MediaType | safeHTML }}{{- end -}}
+    {{ range $pages }}
+      {{ if eq .Type "blog" }}
+        <item>
+          <title>{{ .Title }}</title>
+          <link>{{ .Permalink }}</link>
+          {{ if not .Date.IsZero }}<pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>{{ end }}
+          {{ if and (not (.Lastmod.IsZero)) (not (eq .Date .Lastmod)) }}<lastBuildDate>{{ .Lastmod.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
+          {{ with .Site.Params.author.name }}<author>{{.}}</author>{{end}}
+
+          {{ $content := .Content }}
+          <!-- relative images/URLs do not work in some feed readers. Thanks, Peter. See render-image.html -->
+          {{ $content = replaceRE `a href="(#.*?)"` (printf "%s%s%s" "a href=\"" .RelPermalink "$1\"") $content }}
+          {{ $content = replaceRE `a href="^../(.*?)"` (printf "%s%s%s" "a href=\"" .RelPermalink "../$1\"") $content }}
+          {{ $content = replaceRE `a href="/(.*?)"` (printf "%s%s%s" "a href=\"" $baseurl "$1\"") $content }}
+
+          <!-- Remove heading anchor links -->
+          {{ $content = replaceRE `(?s:<a[^>]*?class="link".*?<\/a>)` "" ($content | safeHTML) }}
+
+          <description>
+              {{- `<![CDATA[ ` | safeHTML -}}
+              {{- if and (.Params.cover) (not (in .Params.cover.src "http")) -}}
+              {{- $image := .Resources.GetMatch .Params.cover.src -}}
+                <p><img align="left" hspace="5" style="margin-bottom: 1rem;" src="{{- ($image.Resize "x550").Permalink -}}"/></p>
+              {{- else if (in .Params.cover.src "http") -}}
+                <p><img align="left" hspace="5" style="margin-bottom: 1rem;" src="{{ .Params.cover.src }}"/></p>
+              {{- end -}}
+              {{ $content | safeHTML }}
+              ]]>
+          </description>
+
+        </item>
+      {{ end }}
+    {{ end }}
+  </channel>
+</rss>
\ No newline at end of file
diff --git a/layouts/_default/index.xml b/layouts/_default/index.xml
deleted file mode 100644
index 4a22afd..0000000
--- a/layouts/_default/index.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-{{- $baseurl := .Site.BaseURL -}}
-{{- $pctx := . -}}
-{{- if .IsHome -}}{{ $pctx = .Site }}{{- end -}}
-{{- $pages := slice -}}
-{{- if or $.IsHome $.IsSection -}}
-{{- $pages = $pctx.RegularPages -}}
-{{- else -}}
-{{- $pages = $pctx.Pages -}}
-{{- end -}}
-{{- $limit := .Site.Config.Services.RSS.Limit -}}
-{{- if ge $limit 1 -}}
-{{- $pages = $pages | first $limit -}}
-{{- end -}}
-{{- printf "<?xml version=\"1.0\" encoding=\"utf-8\" standalone=\"yes\"?>" | safeHTML }}
-<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
-  <channel>
-    <title>{{ if eq  .Title  .Site.Title }}{{ .Site.Title }}{{ else }}{{ with .Title }}{{.}} on {{ end }}{{ .Site.Title }}{{ end }}</title>
-    <link>{{ .RelPermalink }}</link>
-    <description>Recent content {{ if ne  .Title  .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description>
-    <generator>Hugo -- gohugo.io</generator>{{ with .Site.LanguageCode }}
-    <language>{{.}}</language>{{end}}{{ with .Site.Author.email }}
-    <managingEditor>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</managingEditor>{{end}}{{ with .Site.Author.email }}
-    <webMaster>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</webMaster>{{end}}{{ with .Site.Copyright }}
-    <copyright>{{.}}</copyright>{{end}}{{ if not .Date.IsZero }}
-    <lastBuildDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</lastBuildDate>{{ end }}
-    {{- with .OutputFormats.Get "RSS" -}}
-      {{ printf "<atom:link href=%q rel=\"self\" type=%q />" .RelPermalink .MediaType | safeHTML }}
-    {{- end -}}
-    {{ range $pages }}
-      {{ if eq .Type "blog" }}
-        <item>
-          <title>{{ .Title }}</title>
-          <link>{{ .RelPermalink }}</link>
-          <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>{{ .RelPermalink }}</guid>
-
-          {{ $content := .Content }}
-          <!-- relative images/URLs do not work in some feed readers. Thanks, Peter. See render-image.html -->
-          {{ $content = replaceRE `a href="(#.*?)"` (printf "%s%s%s" "a href=\"" .RelPermalink "$1\"") $content }}
-          {{ $content = replaceRE `a href="^../(.*?)"` (printf "%s%s%s" "a href=\"" .RelPermalink "../$1\"") $content }}
-          {{ $content = replaceRE `a href="/(.*?)"` (printf "%s%s%s" "a href=\"" $baseurl "$1\"") $content }}
-
-          <!-- Remove heading anchor links -->
-          {{ $content = replaceRE `(?s:<a[^>]*?class="link".*?<\/a>)` "" ($content | safeHTML) }}
-
-          <description>
-              {{ `<![CDATA[ ` | safeHTML }}
-              {{ if and (.Params.cover) (not (in .Params.cover.src "http")) }}
-              {{ $image := .Resources.GetMatch .Params.cover.src -}}
-                <p>
-                  <img align="left" hspace="5" src="{{ ($image.Resize "x550").RelPermalink }}"/>
-                </p>
-              {{- else if (in .Params.cover.src "http") -}}
-                <p>
-                  <img align="left" hspace="5" src="{{ .Params.cover.src }}"/>
-                </p>
-              {{- end -}}
-              {{ $content | safeHTML }}
-              ]]>
-          </description>
-
-        </item>
-      {{ end }}
-    {{ end }}
-  </channel>
-</rss>
\ No newline at end of file