From b07a2a6cf5fdf9906d28a7858c3cc9b330b70032 Mon Sep 17 00:00:00 2001
From: Ben Goldsworthy <admin@bengoldsworthy.net>
Date: Sat, 4 Jan 2025 19:45:00 +0100
Subject: [PATCH] refactor: replace deprecated `resources.toCss` and
 `.Site.Author` references

---
 layouts/_default/baseof.html             | 6 +++---
 layouts/_default/rss.xml                 | 6 +++---
 layouts/blog/single.html                 | 6 +++---
 layouts/partials/copying.html            | 2 +-
 layouts/partials/header/site-header.html | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 59e2f84..00e33e0 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -29,10 +29,10 @@
     
     <link href="/css/sanitize.css" rel="stylesheet" />
     {{- $mainStylesheet := resources.Get "css/main.scss" }}
-    {{- $mainStylesheet := $mainStylesheet | resources.ToCSS | resources.Fingerprint }}
+    {{- $mainStylesheet := $mainStylesheet | css.Sass | resources.Fingerprint }}
     <link rel="stylesheet" type="text/css" href="{{ $mainStylesheet.Permalink }}" integrity="{{ $mainStylesheet.Data.Integrity | html }}">
     {{- $printStylesheet := resources.Get "css/print.scss" }}
-    {{- $printStylesheet := $printStylesheet | resources.ToCSS | resources.Fingerprint }}
+    {{- $printStylesheet := $printStylesheet | css.Sass | resources.Fingerprint }}
     <link rel="stylesheet" media="print" href="{{ $printStylesheet.Permalink }}" integrity="{{ $printStylesheet.Data.Integrity | html }}">
     
     {{- if .Param "math" -}}
@@ -58,7 +58,7 @@
     {{- block "footer" . -}}
     <footer class="site-footer">
       <p>
-        By <a href="/">{{ $.Site.Author.name }}</a> | 
+        By <a href="/">{{ $.Site.Params.Author.name }}</a> | 
         <a href="{{ $.Site.Params.codeURL }}{{ $.Site.Params.reportIssueURL }}">Report an Issue</a> | 
         <a href="{{ relref . "privacy-policy" }}">Privacy Policy</a> | 
         <a href="/{{ .Sitemap.Filename }}">Sitemap</a> | 
diff --git a/layouts/_default/rss.xml b/layouts/_default/rss.xml
index 4b0269a..871e41d 100644
--- a/layouts/_default/rss.xml
+++ b/layouts/_default/rss.xml
@@ -17,8 +17,8 @@
     <link>{{ .Permalink }}</link>
     <description>Recent content {{ if ne  .Title  .Site.Title }}{{ with .Title }}in {{.}} {{ end }}{{ end }}on {{ .Site.Title }}</description>
     {{ 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.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 .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" -}}
@@ -29,7 +29,7 @@
       <title>{{ .Title | plainify }}</title>
       <link>{{ .Permalink }}</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}}
+      {{ with .Site.Params.Author.email }}<author>{{.}}{{ with $.Site.Params.Author.name }} ({{.}}){{end}}</author>{{end}}
       <guid>{{ .Permalink }}</guid>
       <description>{{ .Summary | html }}</description>
     </item>
diff --git a/layouts/blog/single.html b/layouts/blog/single.html
index 708e5bd..62016f4 100644
--- a/layouts/blog/single.html
+++ b/layouts/blog/single.html
@@ -134,15 +134,15 @@
           </p>
           <ul>
           {{- range . -}}
-            {{- if ( eq . .Site.Author.name ) -}}
-              <li><p><a class="p-author" itemprop="author" rel="author" href="{{ .Site.Home.Permalink }}">{{ .Site.Author.name }}</a></p></li>
+            {{- if ( eq . .Site.Params.Author.name ) -}}
+              <li><p><a class="p-author" itemprop="author" rel="author" href="{{ .Site.Home.Permalink }}">{{ .Site.Params.Author.name }}</a></p></li>
             {{- else -}}
               <li><p class="p-author" itemprop="author">{{- . -}}</p></li>
             {{- end -}}
           {{- end -}}
           </ul>
         {{- else -}}
-          <a class="p-author" itemprop="author" rel="author" href="{{ .Site.Home.Permalink }}">{{ .Site.Author.name }}</a>
+          <a class="p-author" itemprop="author" rel="author" href="{{ .Site.Home.Permalink }}">{{ .Site.Params.Author.name }}</a>
         {{- end -}}
         </p>
         
diff --git a/layouts/partials/copying.html b/layouts/partials/copying.html
index d6f8795..dc8c891 100644
--- a/layouts/partials/copying.html
+++ b/layouts/partials/copying.html
@@ -1,7 +1,7 @@
 {{ "<!--" | safeHTML }}
    {{ .Site.Title}} - {{ .Site.Params.tagline }}
 
-   This page was created by {{ .Site.Author.name }} <{{ .Site.Author.email }}>.
+   This page was created by {{ fmt.Printf "%s <%s>" .Site.Params.Author.name .Site.Params.Author.email | safeHTML }}.
    The date of creation and last modification should be available within the page
    below.
    
diff --git a/layouts/partials/header/site-header.html b/layouts/partials/header/site-header.html
index a8ac92c..024dd25 100644
--- a/layouts/partials/header/site-header.html
+++ b/layouts/partials/header/site-header.html
@@ -2,7 +2,7 @@
   {{ block "header" . }}
     <h2 class="p-name site-header__title" itemprop="name"><a class="u-url" href="{{ .Site.Home.RelPermalink }}" rel="me author">{{ .Site.Title }}</a></h2>
     <p class="p-note site-header__tagline" itemprop="about">Views my own. Discussion ≠ endorsement. Do try this at home.</p>
-    <p class="site-header__icons">~ <a class="u-email" href="mailto:{{ $.Site.Author.email }}" rel="me">✉️</a> ~ <a class="u-url" href="{{ .Site.Params.codeURL }}" rel="me">🧑‍💻</a> ~ <a class="u-key" href="/{{ .Site.Params.keyfile }}" rel="me">&#128272;</a> ~ <a href="/index.xml" aria-label="{{ .Site.Title }} RSS feed"><img class="feed-icon" alt="RSS feed" src="{{ .Site.Params.feedIcon }}"></a> ~</p>
+    <p class="site-header__icons">~ <a class="u-email" href="mailto:{{ $.Site.Params.Author.email }}" rel="me">✉️</a> ~ <a class="u-url" href="{{ .Site.Params.codeURL }}" rel="me">🧑‍💻</a> ~ <a class="u-key" href="/{{ .Site.Params.keyfile }}" rel="me">&#128272;</a> ~ <a href="/index.xml" aria-label="{{ .Site.Title }} RSS feed"><img class="feed-icon" alt="RSS feed" src="{{ .Site.Params.feedIcon }}"></a> ~</p>
     <nav class="site-header__nav">
       <ul>
         {{ range ( where .Site.Sections.ByTitle "Type" "in" site.Params.mainSections ) }}