fix: regex of external links and hosting

Use `replace` instead of `replaceRE` to prevent some regular special symbols in the string from causing replacement failures, e.g. https://music.163.com/song?id=1409276662 (`?`)
reuixiy · Jan 14, 2020 · ca47e40 · ca47e40
1 parent 8918a4b
commit ca47e40
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/layouts/partials/components/content.html b/layouts/partials/components/content.html
@@ -148,7 +148,7 @@
                 {{- $url := replaceRE `<(img) src="/?([^":]+)` `$2` . -}}
                 {{- $prefix := replaceRE `(<(img) src=")/?([^":]+)` `$1` . -}}
                 {{- $replacement := (printf `%s%s%s` $prefix $hostURL $url) -}}
-                {{- $Content := ($.Scratch.Get "Content") | replaceRE . $replacement | safeHTML -}}
+                {{- $Content := replace ($.Scratch.Get "Content") . $replacement | safeHTML -}}
                 {{- $.Scratch.Set "Content" $Content -}}
             {{- end -}}
         {{- end -}}
@@ -166,7 +166,7 @@
                 {{- $url := replaceRE `<(video) src="/?([^":]+)` `$2` . -}}
                 {{- $prefix := replaceRE `(<(video) src=")/?([^":]+)` `$1` . -}}
                 {{- $replacement := (printf `%s%s%s` $prefix $hostURL $url) -}}
-                {{- $Content := ($.Scratch.Get "Content") | replaceRE . $replacement | safeHTML -}}
+                {{- $Content := replace ($.Scratch.Get "Content") . $replacement | safeHTML -}}
                 {{- $.Scratch.Set "Content" $Content -}}
             {{- end -}}
         {{- end -}}

diff --git a/layouts/partials/components/markdownify.html b/layouts/partials/components/markdownify.html
@@ -59,7 +59,7 @@
             {{- if eq (substr . 9 4) "http" -}}
                 {{- $raw := replaceRE `(<a href="[^"]+")` `$1` . -}}
                 {{- $replacement := printf `%s target="_blank" rel="noopener"` $raw -}}
-                {{- $Content := ($Deliver.Scratch.Get "Content") | replaceRE . $replacement | safeHTML -}}
+                {{- $Content := replace ($Deliver.Scratch.Get "Content") . $replacement | safeHTML -}}
                 {{- $Deliver.Scratch.Set "Content" $Content -}}
             {{- end -}}
         {{- end -}}