From 268997acf2df14b855187446a313905cd45089d6 Mon Sep 17 00:00:00 2001
From: Will Faught <willfaught@users.noreply.github.com>
Date: Thu, 6 Feb 2025 22:48:18 -0800
Subject: [PATCH] Remove uses of safeURL

---
 layouts/partials/paige/links.html       | 18 +++++++++---------
 layouts/partials/paige/list-item.html   |  4 ++--
 layouts/partials/paige/page-footer.html |  4 ++--
 layouts/partials/paige/page-header.html |  4 ++--
 layouts/partials/paige/site-header.html |  6 +++---
 layouts/partials/paige/tag-a.html       |  2 +-
 layouts/partials/paige/tag-iframe.html  |  2 +-
 layouts/partials/paige/tag-link.html    |  2 +-
 layouts/partials/paige/tag-script.html  |  2 +-
 9 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/layouts/partials/paige/links.html b/layouts/partials/paige/links.html
index 540d63f1..6ad0a148 100644
--- a/layouts/partials/paige/links.html
+++ b/layouts/partials/paige/links.html
@@ -1,35 +1,35 @@
 {{ $page := . }}
 
 {{ if fileExists "static/apple-touch-icon.png" }}
-    <link href="{{ relLangURL `apple-touch-icon.png` | safeURL }}" rel="apple-touch-icon" sizes="180x180">
+    <link href="{{ relLangURL `apple-touch-icon.png` }}" rel="apple-touch-icon" sizes="180x180">
 {{ end }}
 
 {{ if fileExists "static/favicon.ico" }}
-    <link href="{{ relLangURL `favicon.ico` | safeURL }}" rel="shortcut icon">
+    <link href="{{ relLangURL `favicon.ico` }}" rel="shortcut icon">
 {{ end }}
 
 {{ if fileExists "static/favicon.png" }}
-    <link href="{{ relLangURL `favicon.png` | safeURL }}" rel="icon" type="image/png">
+    <link href="{{ relLangURL `favicon.png` }}" rel="icon" type="image/png">
 {{ end }}
 
 {{ if fileExists "static/favicon.svg" }}
-    <link href="{{ relLangURL `favicon.svg` | safeURL }}" rel="icon" type="image/svg+xml">
+    <link href="{{ relLangURL `favicon.svg` }}" rel="icon" type="image/svg+xml">
 {{ end }}
 
 {{ if fileExists "static/favicon-16x16.png" }}
-    <link href="{{ relLangURL `favicon-16x16.png` | safeURL }}" rel="icon" sizes="16x16" type="image/png">
+    <link href="{{ relLangURL `favicon-16x16.png` }}" rel="icon" sizes="16x16" type="image/png">
 {{ end }}
 
 {{ if fileExists "static/favicon-32x32.png" }}
-    <link href="{{ relLangURL `favicon-32x32.png` | safeURL }}" rel="icon" sizes="32x32" type="image/png">
+    <link href="{{ relLangURL `favicon-32x32.png` }}" rel="icon" sizes="32x32" type="image/png">
 {{ end }}
 
 {{ if fileExists "static/safari-pinned-tab.svg" }}
-    <link color="{{ $page.Param `paige.color` | default `#0d6efd` }}" href="{{ relLangURL `safari-pinned-tab.svg` | safeURL }}" rel="mask-icon">
+    <link color="{{ $page.Param `paige.color` | default `#0d6efd` }}" href="{{ relLangURL `safari-pinned-tab.svg` }}" rel="mask-icon">
 {{ end }}
 
 {{ if fileExists "assets/site.webmanifest" }}
-    <link href="{{ (resources.Get `site.webmanifest` | resources.ExecuteAsTemplate `site.webmanifest` .).RelPermalink | safeURL }}" rel="manifest">
+    <link href="{{ (resources.Get `site.webmanifest` | resources.ExecuteAsTemplate `site.webmanifest` .).RelPermalink }}" rel="manifest">
 {{ end }}
 
 {{ $color := $page.Param "paige.color" | default "#0d6efd" }}
@@ -45,5 +45,5 @@
 {{ end }}
 
 {{ range $page.AlternativeOutputFormats }}
-    {{ printf `<link href="%s" rel="%s" type="%s">` (.Permalink | safeURL) .Rel .MediaType | safeHTML }}
+    {{ printf `<link href="%s" rel="%s" type="%s">` .Permalink .Rel .MediaType | safeHTML }}
 {{ end }}
diff --git a/layouts/partials/paige/list-item.html b/layouts/partials/paige/list-item.html
index 869997e3..6bbae048 100644
--- a/layouts/partials/paige/list-item.html
+++ b/layouts/partials/paige/list-item.html
@@ -68,11 +68,11 @@
                 {{- if $normal -}}
                     {{- if gt $i 0 }} · {{ end -}}
 
-                    <a class="link-secondary paige-keyword paige-keyword-{{ $kind }}" href="{{ .RelPermalink | safeURL }}">{{ .LinkTitle }}</a>
+                    <a class="link-secondary paige-keyword paige-keyword-{{ $kind }}" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
                 {{- else -}}
                     {{- if gt $i 0 }} {{ end -}}
 
-                    <a class="badge paige-keyword paige-keyword-{{ $kind }} text-bg-secondary text-decoration-none" href="{{ .RelPermalink | safeURL }}">{{ .LinkTitle }}</a>
+                    <a class="badge paige-keyword paige-keyword-{{ $kind }} text-bg-secondary text-decoration-none" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
                 {{- end -}}
             {{- end }}
         </p>
diff --git a/layouts/partials/paige/page-footer.html b/layouts/partials/paige/page-footer.html
index 753387b9..1f65108b 100644
--- a/layouts/partials/paige/page-footer.html
+++ b/layouts/partials/paige/page-footer.html
@@ -27,13 +27,13 @@
             <div id="paige-file">
                 {{ with $edit }}
                     <div class="paige-row-narrow text-center text-secondary" id="paige-edit">
-                        <a class="link-secondary" href="{{ . | safeURL }}">{{ i18n "paige_edit_this_page" }}</a>
+                        <a class="link-secondary" href="{{ . }}">{{ i18n "paige_edit_this_page" }}</a>
                     </div>
                 {{ end }}
 
                 {{ with $history }}
                     <div class="paige-row-narrow text-center text-secondary" id="paige-history">
-                        <a class="link-secondary" href="{{ . | safeURL }}">{{ i18n "paige_edit_history" }}</a>
+                        <a class="link-secondary" href="{{ . }}">{{ i18n "paige_edit_history" }}</a>
                     </div>
                 {{ end }}
             </div>
diff --git a/layouts/partials/paige/page-header.html b/layouts/partials/paige/page-header.html
index dc84f970..d049d5b2 100644
--- a/layouts/partials/paige/page-header.html
+++ b/layouts/partials/paige/page-header.html
@@ -50,11 +50,11 @@
                                 {{- if $normal -}}
                                     {{- if gt $i 0 }} · {{ end -}}
 
-                                    <a class="link-secondary paige-keyword paige-keyword-{{ $kind }}" href="{{ .RelPermalink | safeURL }}" {{ if $microdata }} itemprop="keywords" {{ end }}>{{ .LinkTitle }}</a>
+                                    <a class="link-secondary paige-keyword paige-keyword-{{ $kind }}" href="{{ .RelPermalink }}" {{ if $microdata }} itemprop="keywords" {{ end }}>{{ .LinkTitle }}</a>
                                 {{- else -}}
                                     {{- if gt $i 0 }} {{ end -}}
 
-                                    <a class="badge paige-keyword paige-keyword-{{ $kind }} text-bg-secondary text-decoration-none" href="{{ .RelPermalink | safeURL }}" {{ if $microdata }} itemprop="keywords" {{ end }}>{{ .LinkTitle }}</a>
+                                    <a class="badge paige-keyword paige-keyword-{{ $kind }} text-bg-secondary text-decoration-none" href="{{ .RelPermalink }}" {{ if $microdata }} itemprop="keywords" {{ end }}>{{ .LinkTitle }}</a>
                                 {{- end -}}
                             {{- end }}
                         </p>
diff --git a/layouts/partials/paige/site-header.html b/layouts/partials/paige/site-header.html
index 85bab927..aeb3c785 100644
--- a/layouts/partials/paige/site-header.html
+++ b/layouts/partials/paige/site-header.html
@@ -60,7 +60,7 @@
                             {{ $active := or $home $menu $section }}
 
                             <li class="nav-item {{ if .Children }} dropdown {{ end }}">
-                                <a {{ if $active }} aria-current="page" {{ end }} {{ if .Children }} aria-expanded="false" {{ end }} class="{{ if $active }} active {{ if $links }} fw-bold text-body {{ end }} {{ end }} {{ if .Params.paige.disabled }} disabled {{ end }} nav-link {{ if .Children }} dropdown-toggle {{ end }} {{ if $links }} text-decoration-underline {{ end }}" {{ if .Children }} data-bs-toggle="dropdown" {{ end }} href="{{ if not .Children -}} {{- .URL | safeURL -}} {{- end }}" {{ if .Children }} role="button" {{ end }} {{ if not .Children }} {{ with partial "paige/func-target.html" (dict "page" $page "url" .URL) }} target="{{ . }}" {{ end }} {{ end }}>{{ .Name | markdownify }}</a>
+                                <a {{ if $active }} aria-current="page" {{ end }} {{ if .Children }} aria-expanded="false" {{ end }} class="{{ if $active }} active {{ if $links }} fw-bold text-body {{ end }} {{ end }} {{ if .Params.paige.disabled }} disabled {{ end }} nav-link {{ if .Children }} dropdown-toggle {{ end }} {{ if $links }} text-decoration-underline {{ end }}" {{ if .Children }} data-bs-toggle="dropdown" {{ end }} href="{{ if not .Children -}} {{- .URL -}} {{- end }}" {{ if .Children }} role="button" {{ end }} {{ if not .Children }} {{ with partial "paige/func-target.html" (dict "page" $page "url" .URL) }} target="{{ . }}" {{ end }} {{ end }}>{{ .Name | markdownify }}</a>
 
                                 {{ with .Children }}
                                     <ul class="dropdown-menu">
@@ -78,7 +78,7 @@
                                             {{ end }}
 
                                             <li>
-                                                <a class="{{ if .Params.paige.disabled }} disabled {{ end }} dropdown-item" href="{{ .URL | safeURL }}" {{ with partial "paige/func-target.html" (dict "page" $page "url" .URL) }} target="{{ . }}" {{ end }}>{{ .Name | markdownify }}</a>
+                                                <a class="{{ if .Params.paige.disabled }} disabled {{ end }} dropdown-item" href="{{ .URL }}" {{ with partial "paige/func-target.html" (dict "page" $page "url" .URL) }} target="{{ . }}" {{ end }}>{{ .Name | markdownify }}</a>
                                             </li>
 
                                             {{ if .Params.paige.divider_below }}
@@ -130,7 +130,7 @@
                             {{ $active := or $home $menu $section }}
 
                             <li class="nav-item">
-                                <a {{ if $active }} aria-current="page" {{ end }} class="{{ if $active }} active {{ if $links }} fw-bold text-body {{ end }} {{ end }} nav-link {{ if $links }} text-decoration-underline {{ end }}" href="{{ .RelPermalink | safeURL }}" {{ with partial "paige/func-target.html" (dict "page" $page "url" .RelPermalink) }} target="{{ . }}" {{ end }}>{{ .LinkTitle }}</a>
+                                <a {{ if $active }} aria-current="page" {{ end }} class="{{ if $active }} active {{ if $links }} fw-bold text-body {{ end }} {{ end }} nav-link {{ if $links }} text-decoration-underline {{ end }}" href="{{ .RelPermalink }}" {{ with partial "paige/func-target.html" (dict "page" $page "url" .RelPermalink) }} target="{{ . }}" {{ end }}>{{ .LinkTitle }}</a>
                             </li>
                         {{ end }}
                     </ul>
diff --git a/layouts/partials/paige/tag-a.html b/layouts/partials/paige/tag-a.html
index 237686d2..22cbf717 100644
--- a/layouts/partials/paige/tag-a.html
+++ b/layouts/partials/paige/tag-a.html
@@ -8,4 +8,4 @@
 
 {{ $target := partial "paige/func-target.html" (dict "page" $page "url" $href) }}
 
-<a {{ with $class }} class="{{ . }}" {{ end }} {{ with $href }} href="{{ . | safeURL }}" {{ end }} {{ with $style }} style="{{ . | safeCSS }}" {{ end }} {{ with $target }} target="{{ . }}" {{ end }}>{{ $content }}</a>
+<a {{ with $class }} class="{{ . }}" {{ end }} {{ with $href }} href="{{ . }}" {{ end }} {{ with $style }} style="{{ . | safeCSS }}" {{ end }} {{ with $target }} target="{{ . }}" {{ end }}>{{ $content }}</a>
diff --git a/layouts/partials/paige/tag-iframe.html b/layouts/partials/paige/tag-iframe.html
index 314c3093..ca42942e 100644
--- a/layouts/partials/paige/tag-iframe.html
+++ b/layouts/partials/paige/tag-iframe.html
@@ -5,4 +5,4 @@
 {{ $src := $params.src }}
 {{ $title := $params.title }}
 
-<iframe {{ if $fullscreen }} allowfullscreen {{ end }} {{ with $policy }} referrerpolicy="{{ . }}" {{ end }} {{ with $src }} src="{{ . | safeURL }}" {{ end }} {{ with $title }} title="{{ . }}" {{ end }}></iframe>
+<iframe {{ if $fullscreen }} allowfullscreen {{ end }} {{ with $policy }} referrerpolicy="{{ . }}" {{ end }} {{ with $src }} src="{{ . }}" {{ end }} {{ with $title }} title="{{ . }}" {{ end }}></iframe>
diff --git a/layouts/partials/paige/tag-link.html b/layouts/partials/paige/tag-link.html
index 50c40207..391f41c4 100644
--- a/layouts/partials/paige/tag-link.html
+++ b/layouts/partials/paige/tag-link.html
@@ -38,4 +38,4 @@
     {{ $href = relLangURL $href }}
 {{ end }}
 
-<link {{ with $origin }} crossorigin="{{ . }}" {{ end }} href="{{ $href | safeURL }}" {{ with $integrity }} integrity="{{ . }}" {{ end }} {{ with $policy }} referrerpolicy="{{ . }}" {{ end }} rel="stylesheet">
+<link {{ with $origin }} crossorigin="{{ . }}" {{ end }} href="{{ $href }}" {{ with $integrity }} integrity="{{ . }}" {{ end }} {{ with $policy }} referrerpolicy="{{ . }}" {{ end }} rel="stylesheet">
diff --git a/layouts/partials/paige/tag-script.html b/layouts/partials/paige/tag-script.html
index dbcda128..e668f0b8 100644
--- a/layouts/partials/paige/tag-script.html
+++ b/layouts/partials/paige/tag-script.html
@@ -22,4 +22,4 @@
     {{ $src = relLangURL $src }}
 {{ end }}
 
-<script {{ with $origin }} crossorigin="{{ . }}" {{ end }} {{ with $defer }} defer {{ end }} integrity="{{ $integrity }}" {{ with $onload }} onload="{{ . }}" {{ end }} {{ with $policy }} referrerpolicy="{{ . }}" {{ end }} src="{{ $src | safeURL }}" {{ with $type }} {{ printf `type="%v"` . | safeHTMLAttr }} {{ end }}></script>
+<script {{ with $origin }} crossorigin="{{ . }}" {{ end }} {{ with $defer }} defer {{ end }} integrity="{{ $integrity }}" {{ with $onload }} onload="{{ . }}" {{ end }} {{ with $policy }} referrerpolicy="{{ . }}" {{ end }} src="{{ $src }}" {{ with $type }} {{ printf `type="%v"` . | safeHTMLAttr }} {{ end }}></script>