diff options
| author | Nicholas Johnson <mail@nicholasjohnson.ch> | 2024-08-16 00:00:00 +0000 |
|---|---|---|
| committer | Nicholas Johnson <mail@nicholasjohnson.ch> | 2024-08-16 00:00:00 +0000 |
| commit | 94f31cc92f7bd3a965801c1b4bcf4e45c4b3e0fd667fbdcdb328196fd4bb05f0 (patch) | |
| tree | 29eb4009fe80d211905d079c76c146dc007ba6125164034d508a5868e0df4f27 | |
| parent | 5922472635a618dc24ee98c990037ad34ba98b5b60077aa246fbb52ecbc58c49 (diff) | |
Substitute replace with replaceRE for correctness
| -rw-r--r-- | layouts/index.gemini_atom.xml | 10 | ||||
| -rw-r--r-- | layouts/taxonomy/taxonomy.gemini_atom.xml | 10 | ||||
| -rw-r--r-- | layouts/term/term.gemini_atom.xml | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/layouts/index.gemini_atom.xml b/layouts/index.gemini_atom.xml index 3b99fcf..cc9d9f7 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>{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" }}</id> + <id>{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `(?m)index.gmi$` "" }}</id> <title>{{ .Site.Title }}</title> <updated>{{ .Date.UTC.Format "2006-01-02T15:04:05Z" | safeHTML }}</updated> - <link href="{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "atom.xml" | safeURL }}" rel="self" /> - <link href="{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}" rel="alternate" /> + <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `(?m)index.gmi$` "atom.xml" | safeURL }}" rel="self" /> + <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `(?m)index.gmi$` "" | 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>{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}</id> + <id>{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}</id> <title>{{ .Title }}</title> <updated>{{ .Date.UTC.Format "2006-01-02T15:04:05Z" | safeHTML }}</updated> - <link href="{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}" rel="alternate" /> + <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}" rel="alternate" /> </entry>{{ end }} </feed> diff --git a/layouts/taxonomy/taxonomy.gemini_atom.xml b/layouts/taxonomy/taxonomy.gemini_atom.xml index 52bd9f7..36df6d6 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>{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" }}</id> + <id>{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `(?m)index.gmi$` "" }}</id> <title>{{ .Site.Title }}</title> <updated>{{ .Date.UTC.Format "2006-01-02T15:04:05Z" | safeHTML }}</updated> - <link href="{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "atom.xml" | safeURL }}" rel="self" /> - <link href="{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}" rel="alternate" /> + <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `(?m)index.gmi$` "atom.xml" | safeURL }}" rel="self" /> + <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `(?m)index.gmi$` "" | 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>{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}</id> + <id>{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}</id> <title>{{ .Title }}</title> <updated>{{ .Date.UTC.Format "2006-01-02T15:04:05Z" | safeHTML }}</updated> - <link href="{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}" rel="alternate" /> + <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}" rel="alternate" /> </entry>{{ end }} </feed> diff --git a/layouts/term/term.gemini_atom.xml b/layouts/term/term.gemini_atom.xml index 1323308..aecb3fd 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>{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" }}</id> + <id>{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `(?m)index.gmi$` "" }}</id> <title>{{ .Site.Title }}</title> <updated>{{ .Date.UTC.Format "2006-01-02T15:04:05Z" | safeHTML }}</updated> - <link href="{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "atom.xml" | safeURL }}" rel="self" /> - <link href="{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}" rel="alternate" /> + <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `(?m)index.gmi$` "atom.xml" | safeURL }}" rel="self" /> + <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `(?m)index.gmi$` "" | 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>{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}</id> + <id>{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}</id> <title>{{ .Title }}</title> <updated>{{ .Date.UTC.Format "2006-01-02T15:04:05Z" | safeHTML }}</updated> - <link href="{{ replace .Permalink "https://" "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}" rel="alternate" /> + <link href="{{ .Permalink | replaceRE `^https://` "gemini://" | replaceRE `(?m)index.gmi$` "" | safeURL }}" rel="alternate" /> </entry>{{ end }} </feed> |