Combine two replaceRE ops into one

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>