aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Johnson <mail@nicholasjohnson.ch>2024-08-16 00:00:00 +0000
committerNicholas Johnson <mail@nicholasjohnson.ch>2024-08-17 00:00:00 +0000
commit469317350742db76dec3ebd42a6e8631b3549a4fc44175895ea0e7518280669f (patch)
tree337ee7c17d233ff6d37ad08f33e3049bb24b7a95beb5f8657b7ab6ea2fc801ab
parent5a7dae6f0166c21e3e45f0e92c173445894618b6a0dc380c76f87abc71bf04cd (diff)
downloadhugo-theme-journal-469317350742db76dec3ebd42a6e8631b3549a4fc44175895ea0e7518280669f.tar.gz
hugo-theme-journal-469317350742db76dec3ebd42a6e8631b3549a4fc44175895ea0e7518280669f.zip
Combine two replaceRE ops into one
-rw-r--r--layouts/index.gemini_atom.xml10
-rw-r--r--layouts/taxonomy/taxonomy.gemini_atom.xml10
-rw-r--r--layouts/term/term.gemini_atom.xml10
3 files changed, 15 insertions, 15 deletions
diff --git a/layouts/index.gemini_atom.xml b/layouts/index.gemini_atom.xml
index 62a0a09..754b0f8 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 `^https://` "gemini://" | replaceRE `index.gmi$` "" }}</id>
+ <id>{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" }}</id>
<title>{{ .Site.Title }}</title>
<updated>{{ .Date.UTC.Format "2006-01-02T15:04:05Z" | safeHTML }}</updated>
- <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `index.gmi$` "atom.xml" | safeURL }}" rel="self" />
- <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" />
+ <link href="{{ .Permalink | replaceRE `^https://(.*)/index.gmi$` "gemini://$1/atom.xml" | safeURL }}" rel="self" />
+ <link href="{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" | safeURL }}" rel="alternate" />
{{- with $authorName }}
<author>
<name>{{ . }}</name>
@@ -47,9 +47,9 @@
<rights type="html">{{ replace .Site.Copyright "{currentYear}" (now.UTC.Format "2006") }}</rights>
<subtitle>{{ .Site.Params.Description }}</subtitle>{{ range first .Site.Config.Services.RSS.Limit .Site.RegularPages }}
<entry>
- <id>{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `index.gmi$` "" | safeURL }}</id>
+ <id>{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" | safeURL }}</id>
<title>{{ .Title }}</title>
<updated>{{ .Date.UTC.Format "2006-01-02T15:04:05Z" | safeHTML }}</updated>
- <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" />
+ <link href="{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" | safeURL }}" rel="alternate" />
</entry>{{ end }}
</feed>
diff --git a/layouts/taxonomy/taxonomy.gemini_atom.xml b/layouts/taxonomy/taxonomy.gemini_atom.xml
index 77de32c..6bd32ff 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 `^https://` "gemini://" | replaceRE `index.gmi$` "" }}</id>
+ <id>{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" }}</id>
<title>{{ .Site.Title }}</title>
<updated>{{ .Date.UTC.Format "2006-01-02T15:04:05Z" | safeHTML }}</updated>
- <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `index.gmi$` "atom.xml" | safeURL }}" rel="self" />
- <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" />
+ <link href="{{ .Permalink | replaceRE `^https://(.*)/index.gmi$` "gemini://$1/atom.xml" | safeURL }}" rel="self" />
+ <link href="{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" | safeURL }}" rel="alternate" />
{{- with $authorName }}
<author>
<name>{{ . }}</name>
@@ -47,9 +47,9 @@
<rights type="html">{{ replace .Site.Copyright "{currentYear}" (now.UTC.Format "2006") }}</rights>
<subtitle>{{ .Site.Params.Description }}</subtitle>{{ range first .Site.Config.Services.RSS.Limit .Data.Pages }}
<entry>
- <id>{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `index.gmi$` "" | safeURL }}</id>
+ <id>{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" | safeURL }}</id>
<title>{{ .Title }}</title>
<updated>{{ .Date.UTC.Format "2006-01-02T15:04:05Z" | safeHTML }}</updated>
- <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" />
+ <link href="{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" | safeURL }}" rel="alternate" />
</entry>{{ end }}
</feed>
diff --git a/layouts/term/term.gemini_atom.xml b/layouts/term/term.gemini_atom.xml
index d5539f1..a5d3dad 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 `^https://` "gemini://" | replaceRE `index.gmi$` "" }}</id>
+ <id>{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" }}</id>
<title>{{ .Site.Title }}</title>
<updated>{{ .Date.UTC.Format "2006-01-02T15:04:05Z" | safeHTML }}</updated>
- <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `index.gmi$` "atom.xml" | safeURL }}" rel="self" />
- <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" />
+ <link href="{{ .Permalink | replaceRE `^https://(.*)/index.gmi$` "gemini://$1/atom.xml" | safeURL }}" rel="self" />
+ <link href="{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" | safeURL }}" rel="alternate" />
{{- with $authorName }}
<author>
<name>{{ . }}</name>
@@ -47,9 +47,9 @@
<rights type="html">{{ replace .Site.Copyright "{currentYear}" (now.UTC.Format "2006") }}</rights>
<subtitle>{{ .Site.Params.Description }}</subtitle>{{ range first .Site.Config.Services.RSS.Limit .Data.Pages }}
<entry>
- <id>{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `index.gmi$` "" | safeURL }}</id>
+ <id>{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" | safeURL }}</id>
<title>{{ .Title }}</title>
<updated>{{ .Date.UTC.Format "2006-01-02T15:04:05Z" | safeHTML }}</updated>
- <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `index.gmi$` "" | safeURL }}" rel="alternate" />
+ <link href="{{ .Permalink | replaceRE `^https://(.*)index.gmi$` "gemini://$1" | safeURL }}" rel="alternate" />
</entry>{{ end }}
</feed>