From 2796526310244fcfa8cf23d920bbc90eafb41679 Mon Sep 17 00:00:00 2001
From: Rohan Kumar <seirdy@seirdy.one>
Date: Wed, 29 Nov 2023 06:45:53 -0800
Subject: [PATCH] More caching of partials (+ fix a typo)

---
 layouts/partials/footer.html                  |  2 +-
 layouts/partials/interact.html                |  2 ++
 layouts/partials/post-meta/post-meta.html     |  2 +-
 layouts/partials/syndication.html             |  2 --
 layouts/partials/webmentions/webmentions.html | 12 ++++--------
 layouts/shortcodes/indieweb-author.html       |  2 +-
 6 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 87bbd2e..5b72496 100644
--- a/layouts/partials/footer.html
+++ b/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>
diff --git a/layouts/partials/interact.html b/layouts/partials/interact.html
index 5a2fbe5..110c474 100644
--- a/layouts/partials/interact.html
+++ b/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>
diff --git a/layouts/partials/post-meta/post-meta.html b/layouts/partials/post-meta/post-meta.html
index c8eae2d..d729554 100644
--- a/layouts/partials/post-meta/post-meta.html
+++ b/layouts/partials/post-meta/post-meta.html
@@ -25,7 +25,7 @@
 <p>
 {{- end }}
 {{ if $needsList }}<li>{{ 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 {{ 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 }}
diff --git a/layouts/partials/syndication.html b/layouts/partials/syndication.html
index a9a499e..1a44d08 100644
--- a/layouts/partials/syndication.html
+++ b/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 -}}
diff --git a/layouts/partials/webmentions/webmentions.html b/layouts/partials/webmentions/webmentions.html
index 45eedca..c1b2ef8 100644
--- a/layouts/partials/webmentions/webmentions.html
+++ b/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 -}}
diff --git a/layouts/shortcodes/indieweb-author.html b/layouts/shortcodes/indieweb-author.html
index 2350676..518bdea 100644
--- a/layouts/shortcodes/indieweb-author.html
+++ b/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 */ -}}