Add backward compatibility for old taxonomy API

6 files changed, 204 insertions, 12 deletions

diff --git a/layouts/index.atom.xml b/layouts/index.atom.xml
index d31c3fd..f65c1fe 100644
--- a/layouts/index.atom.xml
+++ b/layouts/index.atom.xml
@@ -1,3 +1,35 @@
+{{/* Deprecate site.Author.name in favor of site.Params.author.name */}}
+{{- $authorName := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .name }}
+      {{- $authorName = . }}
+    {{- end }}
+  {{- else }}
+    {{- $authorName  = . }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.name }}
+    {{- $authorName = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }}
+  {{- end }}
+{{- end }}
+
+{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}}
+{{- $authorEmail := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .email }}
+      {{- $authorEmail = . }}
+    {{- end }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.email }}
+    {{- $authorEmail = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }}
+  {{- end }}
+{{- end -}}
+
 {{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" | safeHTML }}
 <feed xmlns="http://www.w3.org/2005/Atom">
     <id>{{ .Permalink }}</id>
@@ -6,8 +38,8 @@
     <link href="{{ .Permalink }}atom.xml" rel="self" />
     <link href="{{ .Permalink }}" rel="alternate" />
     <author>
-        <name>{{ .Site.Params.author.name }}</name>
-        {{- with .Site.Params.author.email }}
+        <name>{{ $authorName }}</name>
+        {{- with $authorEmail }}
         <email>{{ . }}</email>{{ end }}
     </author>
     <generator>Hugo -- gohugo.io</generator>
diff --git a/layouts/index.gemini_atom.xml b/layouts/index.gemini_atom.xml
index 014cfdb..fc0a12a 100644
--- a/layouts/index.gemini_atom.xml
+++ b/layouts/index.gemini_atom.xml
@@ -1,3 +1,35 @@
+{{/* Deprecate site.Author.name in favor of site.Params.author.name */}}
+{{- $authorName := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .name }}
+      {{- $authorName = . }}
+    {{- end }}
+  {{- else }}
+    {{- $authorName  = . }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.name }}
+    {{- $authorName = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }}
+  {{- end }}
+{{- end }}
+
+{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}}
+{{- $authorEmail := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .email }}
+      {{- $authorEmail = . }}
+    {{- end }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.email }}
+    {{- $authorEmail = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }}
+  {{- end }}
+{{- end -}}
+
 {{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" | safeHTML }}
 <feed xmlns="http://www.w3.org/2005/Atom">
     <id>{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" }}</id>
@@ -6,8 +38,8 @@
     <link href="{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "atom.xml" | safeURL }}" rel="self" />
     <link href="{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}" rel="alternate" />
     <author>
-        <name>{{ .Site.Params.author.name }}</name>
-        {{- with .Site.Params.author.email }}
+        <name>{{ $authorName }}</name>
+        {{- with $authorEmail }}
         <email>{{ . }}</email>{{ end }}
     </author>
     <generator>Hugo -- gohugo.io</generator>
diff --git a/layouts/taxonomy/taxonomy.atom.xml b/layouts/taxonomy/taxonomy.atom.xml
index 5749d56..50d72fa 100644
--- a/layouts/taxonomy/taxonomy.atom.xml
+++ b/layouts/taxonomy/taxonomy.atom.xml
@@ -1,3 +1,35 @@
+{{/* Deprecate site.Author.name in favor of site.Params.author.name */}}
+{{- $authorName := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .name }}
+      {{- $authorName = . }}
+    {{- end }}
+  {{- else }}
+    {{- $authorName  = . }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.name }}
+    {{- $authorName = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }}
+  {{- end }}
+{{- end }}
+
+{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}}
+{{- $authorEmail := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .email }}
+      {{- $authorEmail = . }}
+    {{- end }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.email }}
+    {{- $authorEmail = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }}
+  {{- end }}
+{{- end -}}
+
 {{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" | safeHTML }}
 <feed xmlns="http://www.w3.org/2005/Atom">
     <id>{{ .Permalink }}</id>
@@ -6,8 +38,8 @@
     <link href="{{ .Permalink }}atom.xml" rel="self" />
     <link href="{{ .Permalink }}" rel="alternate" />
     <author>
-        <name>{{ .Site.Params.author.name }}</name>
-        {{- with .Site.Params.author.email }}
+        <name>{{ $authorName }}</name>
+        {{- with $authorEmail }}
         <email>{{ . }}</email>{{ end }}
     </author>
     <generator>Hugo -- gohugo.io</generator>
diff --git a/layouts/taxonomy/taxonomy.gemini_atom.xml b/layouts/taxonomy/taxonomy.gemini_atom.xml
index a3db9a2..098cc4f 100644
--- a/layouts/taxonomy/taxonomy.gemini_atom.xml
+++ b/layouts/taxonomy/taxonomy.gemini_atom.xml
@@ -1,3 +1,35 @@
+{{/* Deprecate site.Author.name in favor of site.Params.author.name */}}
+{{- $authorName := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .name }}
+      {{- $authorName = . }}
+    {{- end }}
+  {{- else }}
+    {{- $authorName  = . }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.name }}
+    {{- $authorName = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }}
+  {{- end }}
+{{- end }}
+
+{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}}
+{{- $authorEmail := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .email }}
+      {{- $authorEmail = . }}
+    {{- end }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.email }}
+    {{- $authorEmail = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }}
+  {{- end }}
+{{- end -}}
+
 {{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" | safeHTML }}
 <feed xmlns="http://www.w3.org/2005/Atom">
     <id>{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" }}</id>
@@ -6,8 +38,8 @@
     <link href="{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "atom.xml" | safeURL }}" rel="self" />
     <link href="{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}" rel="alternate" />
     <author>
-        <name>{{ .Site.Params.author.name }}</name>
-        {{- with .Site.Params.author.email }}
+        <name>{{ $authorName }}</name>
+        {{- with $authorEmail }}
         <email>{{ . }}</email>{{ end }}
     </author>
     <generator>Hugo -- gohugo.io</generator>
diff --git a/layouts/term/term.atom.xml b/layouts/term/term.atom.xml
index 5749d56..50d72fa 100644
--- a/layouts/term/term.atom.xml
+++ b/layouts/term/term.atom.xml
@@ -1,3 +1,35 @@
+{{/* Deprecate site.Author.name in favor of site.Params.author.name */}}
+{{- $authorName := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .name }}
+      {{- $authorName = . }}
+    {{- end }}
+  {{- else }}
+    {{- $authorName  = . }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.name }}
+    {{- $authorName = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }}
+  {{- end }}
+{{- end }}
+
+{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}}
+{{- $authorEmail := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .email }}
+      {{- $authorEmail = . }}
+    {{- end }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.email }}
+    {{- $authorEmail = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }}
+  {{- end }}
+{{- end -}}
+
 {{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" | safeHTML }}
 <feed xmlns="http://www.w3.org/2005/Atom">
     <id>{{ .Permalink }}</id>
@@ -6,8 +38,8 @@
     <link href="{{ .Permalink }}atom.xml" rel="self" />
     <link href="{{ .Permalink }}" rel="alternate" />
     <author>
-        <name>{{ .Site.Params.author.name }}</name>
-        {{- with .Site.Params.author.email }}
+        <name>{{ $authorName }}</name>
+        {{- with $authorEmail }}
         <email>{{ . }}</email>{{ end }}
     </author>
     <generator>Hugo -- gohugo.io</generator>
diff --git a/layouts/term/term.gemini_atom.xml b/layouts/term/term.gemini_atom.xml
index a3db9a2..a4826bc 100644
--- a/layouts/term/term.gemini_atom.xml
+++ b/layouts/term/term.gemini_atom.xml
@@ -1,3 +1,35 @@
+{{/*Deprecate site.Author.name in favor of site.Params.author.name */}}
+{{- $authorName := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .name }}
+      {{- $authorName = . }}
+    {{- end }}
+  {{- else }}
+    {{- $authorName  = . }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.name }}
+    {{- $authorName = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.name instead." }}
+  {{- end }}
+{{- end }}
+
+{{- /* Deprecate site.Author.email in favor of site.Params.author.email */}}
+{{- $authorEmail := "" }}
+{{- with site.Params.author }}
+  {{- if reflect.IsMap . }}
+    {{- with .email }}
+      {{- $authorEmail = . }}
+    {{- end }}
+  {{- end }}
+{{- else }}
+  {{- with site.Author.email }}
+    {{- $authorEmail = . }}
+    {{- warnf "The author key in site configuration is deprecated. Use params.author.email instead." }}
+  {{- end }}
+{{- end -}}
+
 {{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" | safeHTML }}
 <feed xmlns="http://www.w3.org/2005/Atom">
     <id>{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" }}</id>
@@ -6,8 +38,8 @@
     <link href="{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "atom.xml" | safeURL }}" rel="self" />
     <link href="{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}" rel="alternate" />
     <author>
-        <name>{{ .Site.Params.author.name }}</name>
-        {{- with .Site.Params.author.email }}
+        <name>{{ $authorName }}</name>
+        {{- with $authorEmail }}
         <email>{{ . }}</email>{{ end }}
     </author>
     <generator>Hugo -- gohugo.io</generator>