From 3b77b61bf662efe71c7f75e73a2d6fae0e3c8c8b74b05f036809b0913785a432 Mon Sep 17 00:00:00 2001
From: Nicholas Johnson <mail@nicholasjohnson.ch>
Date: Fri, 8 Nov 2024 00:00:00 +0000
Subject: Replace replaceRE with TrimSuffix for readability

---
 layouts/_default/single.gmi               | 2 +-
 layouts/index.gemini_atom.xml             | 8 ++++----
 layouts/partials/metadata.gmi             | 2 +-
 layouts/taxonomy/taxonomy.gemini_atom.xml | 8 ++++----
 layouts/taxonomy/taxonomy.gmi             | 4 ++--
 layouts/term/term.gemini_atom.xml         | 8 ++++----
 layouts/term/term.gmi                     | 2 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/layouts/_default/single.gmi b/layouts/_default/single.gmi
index 29c740e..a2f517d 100644
--- a/layouts/_default/single.gmi
+++ b/layouts/_default/single.gmi
@@ -1,6 +1,6 @@
 {{ define "main" -}}
 {{ $emoji := cond (.Page.Params.showlinkemoji | default true) (emojify ":link: ") "" -}}
-=> {{ .Site.Home.RelPermalink | replaceRE `index.gmi$` "" }} {{ emojify ":link:" }} {{ i18n "returnHome" -}}
+=> {{ .Site.Home.RelPermalink | strings.TrimSuffix "index.gmi" }} {{ emojify ":link:" }} {{ i18n "returnHome" -}}
 
 {{ if (.Page.Params.pageinfo | default true) }}
 
diff --git a/layouts/index.gemini_atom.xml b/layouts/index.gemini_atom.xml
index 6eb6b8e..446f9f8 100644
--- a/layouts/index.gemini_atom.xml
+++ b/layouts/index.gemini_atom.xml
@@ -32,11 +32,11 @@
 
 {{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" | safeHTML }}
 <feed xmlns="http://www.w3.org/2005/Atom">
-    <id>{{ .Permalink | replaceRE `index.gmi$` "" }}</id>
+    <id>{{ .Permalink | strings.TrimSuffix "index.gmi" }}</id>
     <title>{{ .Site.Title }}</title>
     <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated>
     <link href="{{ .Permalink | replaceRE `index.gmi$` "atom.xml" | safeURL }}" rel="self" />
-    <link href="{{ .Permalink | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" />
+    <link href="{{ .Permalink | strings.TrimSuffix "index.gmi" | safeURL }}" rel="alternate" />
     {{- with $authorName }}
     <author>
         <name>{{ . }}</name>
@@ -47,9 +47,9 @@
     <rights type="html">{{ replace .Site.Copyright "{currentYear}" (now.Format "2006") }}</rights>
     <subtitle>{{ .Site.Params.Description }}</subtitle>{{ range first .Site.Config.Services.RSS.Limit .Site.RegularPages }}
     <entry>
-        <id>{{ .Permalink | replaceRE `index.gmi$` "" }}</id>
+        <id>{{ .Permalink | strings.TrimSuffix "index.gmi" }}</id>
         <title>{{ .Title }}</title>
         <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated>
-        <link href="{{ .Permalink | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" />
+        <link href="{{ .Permalink | strings.TrimSuffix "index.gmi" | safeURL }}" rel="alternate" />
     </entry>{{ end }}
 </feed>
diff --git a/layouts/partials/metadata.gmi b/layouts/partials/metadata.gmi
index 7f897c3..04749d9 100644
--- a/layouts/partials/metadata.gmi
+++ b/layouts/partials/metadata.gmi
@@ -1,2 +1,2 @@
 {{ partial "pageinfo.gmi" . }}
-=> {{ .RelPermalink | replaceRE `index.gmi$` "" }} {{ emojify ":link:" }} {{ .Title }}
\ No newline at end of file
+=> {{ .RelPermalink | strings.TrimSuffix "index.gmi" }} {{ emojify ":link:" }} {{ .Title }}
\ No newline at end of file
diff --git a/layouts/taxonomy/taxonomy.gemini_atom.xml b/layouts/taxonomy/taxonomy.gemini_atom.xml
index 588294b..76431e3 100644
--- a/layouts/taxonomy/taxonomy.gemini_atom.xml
+++ b/layouts/taxonomy/taxonomy.gemini_atom.xml
@@ -32,11 +32,11 @@
 
 {{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" | safeHTML }}
 <feed xmlns="http://www.w3.org/2005/Atom">
-    <id>{{ .Permalink | replaceRE `index.gmi$` "" }}</id>
+    <id>{{ .Permalink | strings.TrimSuffix "index.gmi" }}</id>
     <title>{{ .Site.Title }}</title>
     <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated>
     <link href="{{ .Permalink | replaceRE `index.gmi$` "atom.xml" | safeURL }}" rel="self" />
-    <link href="{{ .Permalink | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" />
+    <link href="{{ .Permalink | strings.TrimSuffix "index.gmi" | safeURL }}" rel="alternate" />
     {{- with $authorName }}
     <author>
         <name>{{ . }}</name>
@@ -47,9 +47,9 @@
     <rights type="html">{{ replace .Site.Copyright "{currentYear}" (now.Format "2006") }}</rights>
     <subtitle>{{ .Site.Params.Description }}</subtitle>{{ range first .Site.Config.Services.RSS.Limit .Data.Pages }}
     <entry>
-        <id>{{ .Permalink | replaceRE `index.gmi$` "" }}</id>
+        <id>{{ .Permalink | strings.TrimSuffix "index.gmi" }}</id>
         <title>{{ .Title }}</title>
         <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated>
-        <link href="{{ .Permalink | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" />
+        <link href="{{ .Permalink | strings.TrimSuffix "index.gmi" | safeURL }}" rel="alternate" />
     </entry>{{ end }}
 </feed>
diff --git a/layouts/taxonomy/taxonomy.gmi b/layouts/taxonomy/taxonomy.gmi
index 02ff4a4..a889b37 100644
--- a/layouts/taxonomy/taxonomy.gmi
+++ b/layouts/taxonomy/taxonomy.gmi
@@ -1,5 +1,5 @@
 {{ define "main" -}}
-=> {{ .Site.Home.RelPermalink | replaceRE `index.gmi$` "" }} {{ emojify ":link:" }} {{ i18n "returnHome" }}
+=> {{ .Site.Home.RelPermalink | strings.TrimSuffix "index.gmi" }} {{ emojify ":link:" }} {{ i18n "returnHome" }}
 
 
 # {{ .Type | humanize }}
@@ -12,6 +12,6 @@
 
 ## {{ i18n "list" }}
 {{ range .Data.Pages }}
-=> {{ .RelPermalink | replaceRE `index.gmi$` "" }} {{ emojify ":link:" }} {{ .Title -}}
+=> {{ .RelPermalink | strings.TrimSuffix "index.gmi" }} {{ emojify ":link:" }} {{ .Title -}}
 {{ end -}}
 {{ end }}
\ No newline at end of file
diff --git a/layouts/term/term.gemini_atom.xml b/layouts/term/term.gemini_atom.xml
index ec6859f..287bcc4 100644
--- a/layouts/term/term.gemini_atom.xml
+++ b/layouts/term/term.gemini_atom.xml
@@ -32,11 +32,11 @@
 
 {{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" | safeHTML }}
 <feed xmlns="http://www.w3.org/2005/Atom">
-    <id>{{ .Permalink | replaceRE `index.gmi$` "" }}</id>
+    <id>{{ .Permalink | strings.TrimSuffix "index.gmi" }}</id>
     <title>{{ .Site.Title }}</title>
     <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated>
     <link href="{{ .Permalink | replaceRE `index.gmi$` "atom.xml" | safeURL }}" rel="self" />
-    <link href="{{ .Permalink | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" />
+    <link href="{{ .Permalink | strings.TrimSuffix "index.gmi" | safeURL }}" rel="alternate" />
     {{- with $authorName }}
     <author>
         <name>{{ . }}</name>
@@ -47,9 +47,9 @@
     <rights type="html">{{ replace .Site.Copyright "{currentYear}" (now.Format "2006") }}</rights>
     <subtitle>{{ .Site.Params.Description }}</subtitle>{{ range first .Site.Config.Services.RSS.Limit .Data.Pages }}
     <entry>
-        <id>{{ .Permalink | replaceRE `index.gmi$` "" }}</id>
+        <id>{{ .Permalink | strings.TrimSuffix "index.gmi" }}</id>
         <title>{{ .Title }}</title>
         <updated>{{ .Date.Format "2006-01-02T15:04:05-0700" | safeHTML }}</updated>
-        <link href="{{ .Permalink | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" />
+        <link href="{{ .Permalink | strings.TrimSuffix "index.gmi" | safeURL }}" rel="alternate" />
     </entry>{{ end }}
 </feed>
diff --git a/layouts/term/term.gmi b/layouts/term/term.gmi
index d3c5a2a..b2c7bcb 100644
--- a/layouts/term/term.gmi
+++ b/layouts/term/term.gmi
@@ -1,5 +1,5 @@
 {{ define "main" -}}
-=> {{ .Site.Home.RelPermalink | replaceRE `index.gmi$` "" }} {{ emojify ":link:" }} {{ i18n "returnHome" }}
+=> {{ .Site.Home.RelPermalink | strings.TrimSuffix "index.gmi" }} {{ emojify ":link:" }} {{ i18n "returnHome" }}
 
 
 # {{ .Type | singularize | humanize }} "{{ .Title }}"
-- 
cgit v1.2.3