More caching of partials (+ fix a typo)

Should improve article previews in some readers. This also entailed
swapping out angle-brackets in one description to avoid errors.

Makefile

@@ -130,7 +130,7 @@ xhtmlize: hugo
 	sh scripts/xhtmlize.sh $(OUTPUT_DIR)
 
 .PHONY: copy-to-xhtml
-copy-to-xhtml: xhtmlize
+copy-to-xhtml:
 	find $(OUTPUT_DIR) -type f -name "*.html" | grep -v 'resume/index.html' | xargs -n1 sh scripts/copy-file-to-xhtml.sh
 
 .PHONY: deploy-html
@@ -147,8 +147,7 @@ deploy: deploy-html deploy-gemini
 .PHONY: .prepare-deploy
 .prepare-deploy:
 	@$(MAKE) clean
-	@$(MAKE) HUGO_FLAGS='--gc --ignoreCache' hugo
+	@$(MAKE) HUGO_FLAGS='--gc --ignoreCache' xhtmlize
-	@$(MAKE) xhtmlize
 
 # deploy steps need to happen one at a time
 .PHONY: deploy-prod
@@ -188,6 +187,7 @@ lint-and-deploy-staging:
 
 .PHONY: deploy-envs
 deploy-envs:
-	@$(MAKE) -j1 HUGO_FLAGS='' USER=seirdy@envs.net WWW_ROOT=/home/seirdy/public_html GEMINI_ROOT=/home/seirdy/public_gemini HUGO_BASEURL='https://envs.net/~seirdy/' OUTPUT_DIR=public_envs .prepare-deploy copy-to-xhtml
+	@$(MAKE) HUGO_FLAGS='--gc --ignoreCache' USER=seirdy@envs.net WWW_ROOT=/home/seirdy/public_html GEMINI_ROOT=/home/seirdy/public_gemini HUGO_BASEURL='https://envs.net/~seirdy/' OUTPUT_DIR=public_envs xhtmlize
+	@$(MAKE) HUGO_FLAGS='--gc --ignoreCache' USER=seirdy@envs.net WWW_ROOT=/home/seirdy/public_html GEMINI_ROOT=/home/seirdy/public_gemini HUGO_BASEURL='https://envs.net/~seirdy/' OUTPUT_DIR=public_envs copy-to-xhtml
 	@$(MAKE) HUGO_FLAGS='' USER=seirdy@envs.net WWW_ROOT=/home/seirdy/public_html GEMINI_ROOT=/home/seirdy/public_gemini HUGO_BASEURL='https://envs.net/~seirdy/' OUTPUT_DIR=public_envs html-validate validate-html validate-json validate-feeds
 	@$(MAKE) SSHFLAGS='-o KexAlgorithms=curve25519-sha256@libssh.org' HUGO_FLAGS='' USER=seirdy@envs.net WWW_ROOT=/home/seirdy/public_html GEMINI_ROOT=/home/seirdy/public_gemini HUGO_BASEURL='https://envs.net/~seirdy/' OUTPUT_DIR=public_envs deploy

content/posts/spoiler-element.md

@@ -1,6 +1,6 @@
 ---
 title: "Proposal: an HTML element for spoilers"
-description: "An informal proposal for dedicated elements for spoiler tags in HTML: use-cases, syntax, semantics, recommended UA behavior, and comparisons with <details>."
+description: "An informal proposal for dedicated elements for spoiler tags in HTML: use-cases, syntax, semantics, recommended UA behavior, and comparisons with “details”"
 date: 2023-11-12T13:48:00-08:00
 outputs:
     - html

layouts/_default/list.atom.xml

@@ -40,6 +40,7 @@
 	<webfeeds:cover>{{ $atomLogo.Permalink }}</webfeeds:cover>
 	<logo>{{ $atomLogo.Permalink }}</logo>
 	<webfeeds:accentColor>191919</webfeeds:accentColor>
+	<webfeeds:related layout="card" target="browser" />
 	<sy:updatePeriod>{{ $period }}</sy:updatePeriod>
 	<sy:updateFrequency>2</sy:updateFrequency>
   <author>
@@ -52,7 +53,7 @@
   </author>
 	<admin:errorReportsTo rdf:resource="mailto:{{ .Site.Author.email }}" />
 	<link rel="license" type="application/rdf+xml" href="https://creativecommons.org/licenses/by-sa/4.0/rdf" />
-  <updated>{{ now.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>
+  <updated>{{ site.LastChange.UTC.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>
 	<generator uri="https://gohugo.io/" version="{{ .Site.Hugo.Version }}">Hugo {{ .Site.Hugo.Version }}</generator>
   <id>{{ .Permalink }}</id>
   {{ range $pages -}}
@@ -61,8 +62,8 @@
 		<title>{{ .Title }}</title>
 		<link rel="alternate" type="text/html" href="{{ .Permalink }}" />
 		<id>{{ .Permalink }}</id>
-		<published>{{ .Date.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</published>
+		<published>{{ .Date.UTC.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</published>
-		<updated>{{ .Lastmod.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>
+		<updated>{{ .Lastmod.UTC.Format "2006-01-02T15:04:05-07:00" | safeHTML }}</updated>
 		<author><name>{{ .Site.Author.name }}</name><uri>https://seirdy.one/</uri></author>
 		<rights>CC-BY-SA 4.0</rights>
 		<link rel="license" type="application/rdf+xml" href="https://creativecommons.org/licenses/by-sa/4.0/rdf" />
@@ -82,6 +83,9 @@
 		{{- $image = resources.Get (printf "/p/%s" . ) | resources.Fingerprint "md5" -}}
 		{{- end -}}
 		<media:thumbnail url="{{ $image.Permalink }}" width="{{ $image.Width }}" height="{{ $image.Height }}" />
+		{{ with .Description -}}
+		<summary type="text">{{ . }}</summary>
+		{{- end }}
 		<content type="xhtml" xml:base="{{ .Permalink }}">
 			<div xmlns="http://www.w3.org/1999/xhtml">
 					{{- if .Params.replyURI -}}

layouts/_default/rss.xml

@@ -33,7 +33,7 @@
     <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 }}
+    <lastBuildDate>{{ .Date.UTC.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 />" .Permalink .MediaType | safeHTML }}
     {{ end }}
@@ -42,7 +42,7 @@
 			{{- .Page.Scratch.Set "codeIndex" 1 -}}
       <title>{{ .Title }}</title>
       <link>{{ .Permalink }}</link>
-      <pubDate>{{ .Date.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
+      <pubDate>{{ .Date.UTC.Format "Mon, 02 Jan 2006 15:04:05 -0700" | safeHTML }}</pubDate>
       {{ with .Site.Author.email }}<author>{{.}}{{ with $.Site.Author.name }} ({{.}}){{end}}</author>{{end}}
       <guid>{{ .Permalink }}</guid>
       <description xml:base="{{ .Permalink }}">{{- .Content | replaceRE `(?: )?(?:item(type|scope|prop|id|ref)="[^"]*"|class="language-figure")` "" | replaceRE `<meta content="true" ?/>` "" | html -}}</description>

layouts/_default/sitemap.xml

@@ -4,7 +4,7 @@
 	{{- if not .Params.private -}}
 	<url>
 		<loc>{{ .Permalink }}</loc>
-		<lastmod>{{ safeHTML ( .Lastmod.Format "2006-01-02T15:04:05-07:00" ) }}</lastmod>{{ with .Sitemap.ChangeFreq }}
+		<lastmod>{{ safeHTML ( .Lastmod.UTC.Format "2006-01-02T15:04:05-07:00" ) }}</lastmod>{{ with .Sitemap.ChangeFreq }}
 		<changefreq>{{ . }}</changefreq>{{ end }}{{ if ge .Sitemap.Priority 0.0 }}
 		<priority>{{ .Sitemap.Priority }}</priority>{{ end }}
 	</url>

layouts/about/list.html

@@ -21,9 +21,9 @@
 					</a>
 				</h3>
 				<p>
-					Posted <time itemprop="datePublished" class="dt-published published" datetime="{{ .Date.Format "2006-01-02 15:04:05Z07:00" }}">{{ .Date.Format "2006-01-02 15:04" }}</time>
+					Posted <time itemprop="datePublished" class="dt-published published" datetime="{{ .Date.UTC.Format "2006-01-02 15:04:05Z07:00" }}">{{ .Date.UTC.Format "2006-01-02 15:04" }}</time>
 					{{- if gt (sub .Lastmod.Unix .Date.Unix) 3600 -}}
-						, updated <time{{ if not (.Params.evergreen) }} itemprop="dateModified" class="dt-updated updated"{{ end }} datetime="{{ .Lastmod.Format "2006-01-02 15:04:05Z07:00" }}">{{ .Lastmod.Format "2006-01-02 15:04" }}</time>
+						, updated <time{{ if not (.Params.evergreen) }} itemprop="dateModified" class="dt-updated updated"{{ end }} datetime="{{ .Lastmod.UTC.Format "2006-01-02 15:04:05Z07:00" }}">{{ .Lastmod.UTC.Format "2006-01-02 15:04" }}</time>
 				{{- end }}
 				</p>
 				<div>

layouts/index.gmi

@@ -3,7 +3,7 @@
 ## Gemlog posts
 {{ range (where .Site.RegularPages "Section" "posts") }}
 {{- if .OutputFormats.Get "gemtext" }}
-=> {{replace .Permalink "/gemini" "" 1}} {{ .Date.Format "2006-01-02" }}: {{.Title | safeHTML}}{{ end }}{{ end }}
+=> {{replace .Permalink "/gemini" "" 1}} {{ .Date.UTC.Format "2006-01-02" }}: {{.Title | safeHTML}}{{ end }}{{ end }}
 
 => posts/index.xml RSS feed
 

layouts/meta/list.html

@@ -21,9 +21,9 @@
 					</a>
 				</h3>
 				<p>
-					Posted <time itemprop="datePublished" class="dt-published published" datetime="{{ .Date.Format "2006-01-02 15:04:05Z07:00" }}">{{ .Date.Format "2006-01-02 15:04" }}</time>
+					Posted <time itemprop="datePublished" class="dt-published published" datetime="{{ .Date.UTC.Format "2006-01-02 15:04:05Z07:00" }}">{{ .Date.UTC.Format "2006-01-02 15:04" }}</time>
 					{{- if gt (sub .Lastmod.Unix .Date.Unix) 3600 -}}
-						, updated <time{{ if not (.Params.evergreen) }} itemprop="dateModified" class="dt-updated updated"{{ end }} datetime="{{ .Lastmod.Format "2006-01-02 15:04:05Z07:00" }}">{{ .Lastmod.Format "2006-01-02 15:04" }}</time>
+						, updated <time{{ if not (.Params.evergreen) }} itemprop="dateModified" class="dt-updated updated"{{ end }} datetime="{{ .Lastmod.UTC.Format "2006-01-02 15:04:05Z07:00" }}">{{ .Lastmod.UTC.Format "2006-01-02 15:04" }}</time>
 				{{- end }}
 				</p>
 				<div>

layouts/partials/footer.html

@@ -2,7 +2,7 @@
 <footer>
 	{{ partial "breadcrumblist.html" . }}
 	<p>
-	Copyright <time itemprop="copyrightYear" datetime="{{now.Year}}">{{now.Year}}</time> {{ partial "indieweb-author.html" -}}
+	Copyright <time itemprop="copyrightYear" datetime="{{now.Year}}">{{now.Year}}</time> {{ partialCached "indieweb-author.html" . -}}
 	</p>
 	<nav aria-label="site info">
 		<ul>

layouts/partials/head.html

@@ -48,10 +48,10 @@
 	<meta name="author" content="{{ .Site.Author.name }}" />
 	<meta property="article:author" content="{{ .Site.Author.name }}" />
 	{{ if and (gt .Date 0) (not .Params.evergreen) -}}
-	<meta property="article:published_time" content="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}" />
+	<meta property="article:published_time" content="{{ .Date.UTC.Format "2006-01-02T15:04:05Z07:00" }}" />
 	{{ end -}}
 	{{ if lt .Date .Lastmod -}}
-	<meta property="article:modified_time" content="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}" />
+	<meta property="article:modified_time" content="{{ .Lastmod.UTC.Format "2006-01-02T15:04:05Z07:00" }}" />
 	{{- end -}}
 	<!--the Tor Browser's safest setting disables SVGs but still downloads them to avoid fingerprinting-->
 	{{ if not (in site.BaseURL ".onion") -}}

layouts/partials/interact.html

@@ -2,6 +2,8 @@
 <footer>
 <h2 id="interact" tabindex="-1">Interact</h2>
 <p>You can interact by <a href="#webmentions">sending webmentions</a> or by visiting a syndicated copy of this post.</p>
+{{ with .Params.syndicatedCopies }}
 {{- partial "syndication.html" . -}}
+{{- end -}}
 {{- partial "webmentions/webmentions.html" . -}}
 </footer>

layouts/partials/post-meta/post-meta.html

@@ -25,11 +25,11 @@
 <p>
 {{- end }}
 {{ if $needsList }}<li>{{ end }}
-{{- $action }} <time{{ if not (.Params.evergreen) }} itemprop="dateCreated datePublished" class="dt-published published"{{ end }} datetime="{{ .Date.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Date.Format "2006-01-02" }}</time> by {{ partial "indieweb-author.html" -}}{{ if not $shortMeta }} on his <a rel="canonical" itemprop="url" class="u-url url" href="{{ .Site.Params.CanonicalBaseURL }}{{ $canonicalRelPermalink }}">Website</a>{{- with .OutputFormats.Get "gemtext" -}}{{- printf " " -}}and <a rel="syndication" class="u-syndication" href="{{ $gemini }}">Gemini capsule</a>{{ end }}{{- end -}}.
+{{- $action }} <time{{ if not (.Params.evergreen) }} itemprop="dateCreated datePublished" class="dt-published published"{{ end }} datetime="{{ .Date.UTC.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Date.UTC.Format "2006-01-02" }}</time> by {{ partialCached "indieweb-author.html" . -}}{{ if not $shortMeta }} on his <a rel="canonical" itemprop="url" class="u-url url" href="{{ .Site.Params.CanonicalBaseURL }}{{ $canonicalRelPermalink }}">Website</a>{{- with .OutputFormats.Get "gemtext" -}}{{- printf " " -}}and <a rel="syndication" class="u-syndication" href="{{ $gemini }}">Gemini capsule</a>{{ end }}{{- end -}}.
 {{ if $needsList }}</li>{{ end }}
 			{{- if gt (sub .Lastmod.Unix .Date.Unix) 900 -}}
 {{ if $needsList }}<li>{{ end }}
-			Last updated <time itemprop="dateModified" class="dt-updated updated" datetime="{{ .Lastmod.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Lastmod.Format "2006-01-02" }}</time>.{{ if not $shortMeta }} <a href="{{ $logURL }}">Changelog</a>{{ end }}
+			Last updated <time itemprop="dateModified" class="dt-updated updated" datetime="{{ .Lastmod.UTC.Format "2006-01-02T15:04:05Z07:00" }}">{{ .Lastmod.UTC.Format "2006-01-02" }}</time>.{{ if not $shortMeta }} <a href="{{ $logURL }}">Changelog</a>{{ end }}
 {{ if $needsList }}</li>{{ end }}
 			{{- end -}}
 			{{- if not $isNotes -}}

layouts/partials/posts.html

@@ -19,9 +19,9 @@
 					</a>
 				</h3>
 				<p>
-					Posted <time itemprop="datePublished" class="dt-published published" datetime="{{ .Date.Format "2006-01-02 15:04:05Z07:00" }}">{{ .Date.Format "2006-01-02" }}</time>
+					Posted <time itemprop="datePublished" class="dt-published published" datetime="{{ .Date.UTC.Format "2006-01-02 15:04:05Z07:00" }}">{{ .Date.UTC.Format "2006-01-02" }}</time>
 					{{- if lt .Date .Lastmod -}}
-						, updated <time{{ if not (.Params.evergreen) }} itemprop="dateModified" class="dt-updated updated"{{ end }} datetime="{{ .Lastmod.Format "2006-01-02 15:04:05Z07:00" }}">{{ .Lastmod.Format "2006-01-02" }}</time>
+						, updated <time{{ if not (.Params.evergreen) }} itemprop="dateModified" class="dt-updated updated"{{ end }} datetime="{{ .Lastmod.UTC.Format "2006-01-02 15:04:05Z07:00" }}">{{ .Lastmod.UTC.Format "2006-01-02" }}</time>
 					{{- end }}
 					</p>
 

layouts/partials/syndication.html

@@ -1,4 +1,3 @@
-{{ with .Params.syndicatedCopies }}
 <h3>Syndication</h3>
 <p>This post has been syndicated to:</p>
 <ul>
@@ -12,4 +11,3 @@
 	</li>
 {{- end -}}
 </ul>
-{{- end -}}

layouts/partials/webmentions/webmentions.html

@@ -13,14 +13,10 @@
 	{{- /* We can't just use a simple "where" function because we need to ignore URL anchors/query-params when making a comparison: https://discourse.gohugo.io/t/add-like-comparison-operator-to-the-where-function/42013/4 */ -}}
 	{{- $webmentions := slice -}}
 	{{- range partialCached "webmentions/all-webmentions.html" . -}}
-		{{- if in $targets .target -}}
+		{{- $u := urls.Parse .target -}}
+		{{- $trimmedTarget := printf `https://%s%s` $u.Hostname $u.Path -}}
+		{{- if in $targets $trimmedTarget -}}
 			{{ $webmentions = $webmentions | append . }}
-		{{- else -}}
-			{{- $u := urls.Parse .target -}}
-			{{- $trimmedTarget := printf `https://%s%s` $u.Hostname $u.Path -}}
-			{{- if in $targets $trimmedTarget -}}
-				{{ $webmentions = $webmentions | append . }}
-			{{- end -}}
 		{{- end -}}
 	{{- end -}}
 {{- /* Render webmentions if they exist */ -}}
@@ -40,7 +36,7 @@
 			{{- if findRE "@Seirdy" $webmention.title -}}
 				{{- $title = $title | replaceRE `^@Seirdy@pleroma.envs.net(\n| )?` "" -}}
 				{{- /* Mastodon webmentions may include the author in the title followed by a colon; this is redundant. */ -}}
-				{{- if and (isset $webmention "author_name") (findRE `@` $webmention.source) (not (findRE "^https://bridg.gy" $webmention.source)) -}}
+				{{- if and (isset $webmention "author_name") (findRE `@` $webmention.source) (not (findRE "^https://brid.gy" $webmention.source)) -}}
 					{{ $title = $title | replaceRE `^[^:]{0,20}: ?` "" | replaceRE `^"@Seirdy@pleroma.envs.net ?` `"` }}
 				{{- end -}}
 			{{- end -}}

layouts/posts/single.gmi

@@ -2,9 +2,9 @@
 
 {{ $lastmod := .Lastmod -}}
 {{ if lt .Date $lastmod -}}
-Originally posted {{ .Date.Format "2006-01-02" }}. Last updated {{ .Lastmod.Format "2006-01-02" }}.
+Originally posted {{ .Date.UTC.Format "2006-01-02" }}. Last updated {{ .Lastmod.UTC.Format "2006-01-02" }}.
 {{ else -}}
-Posted {{ .Date.Format "2006-01-02" }}.
+Posted {{ .Date.UTC.Format "2006-01-02" }}.
 {{ end }}
 {{ trim (readFile (replace $.File.Path ".md" ".gmi")) "\n" | safeHTML }}
 

layouts/shortcodes/build-info.html

@@ -5,7 +5,7 @@
 {{- end -}}
 <p>
 	This site was last built on
-	<time datetime="{{ $now.Format "2006-01-02T15:04:05-07:00" | safeHTML }}">{{ $now.Format "2006-01-02 15:04:05-07:00" | safeHTML }}</time>
+	<time datetime="{{ $now.UTC.Format "2006-01-02T15:04:05-07:00" | safeHTML }}">{{ $now.UTC.Format "2006-01-02 15:04:05-07:00" | safeHTML }}</time>
 	by
 	<a href="https://github.com/gohugoio/hugo/tree/{{ .Site.Hugo.CommitHash }}">Hugo {{ .Site.Hugo.Version }}</a>
 	{{ $buildCtx }}.

layouts/shortcodes/indieweb-author.html

@@ -22,6 +22,6 @@
 	(btw this is all made of <span> cuz it is supposed to be inline)
 --><span itemprop="author copyrightHolder" itemscope="" itemtype="https://schema.org/Person" itemid="https://seirdy.one/#seirdy" class="h-card p-author author vcard">
 	<a itemprop="url" href="https://seirdy.one/" rel="author me home cc:attributionURL" class="u-url u-uid url" property="cc:attributionName">
-		{{ partial "indieweb-icon.html" -}} <span itemprop="name" class="p-name fn n">
+		{{ partialCached "indieweb-icon.html" . -}} <span itemprop="name" class="p-name fn n">
 			<span itemprop="givenName" class="p-given-name given-name">Rohan</span> “<span itemprop="additionalName" class="p-additional-name additional-name">Seirdy</span>” <span itemprop="familyName" class="p-family-name family-name">Kumar</span></span></a>
 </span>{{- /* no line break */ -}}