From 908cb6946b28e760429562b30681689163ff01c0 Mon Sep 17 00:00:00 2001
From: Cell <1024@lruihao.cn>
Date: Fri, 18 Nov 2022 12:58:02 +0800
Subject: [PATCH] :bug: Fix: escape hashtag character `#` in tag and category
 (#245)

---
 CHANGELOG.md                              |  1 +
 assets/css/_page/_home.scss               |  5 +++++
 assets/css/_partials/_single/_footer.scss |  7 +++++++
 layouts/_default/summary.html             | 11 ++++++-----
 layouts/partials/function/path.html       |  3 ++-
 layouts/partials/single/footer.html       |  9 +++++----
 layouts/posts/single.html                 |  2 +-
 layouts/taxonomy/terms.html               |  8 ++++----
 8 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e0fca22f..78e14408 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ All notable changes to this project will be documented in this file.
 - :bento: Fix: update webfonts for fontawesome 6.2.0 (@NicoDreamzZ[#228](https://github.com/hugo-fixit/FixIt/pull/228))
 - :bug: Fix: image shortcode/plugin lose the support for svg type files ([#210](https://github.com/hugo-fixit/FixIt/issues/210))
 - :bug: Fix: can't keep the static table of the contents in front of the post
+- :bug: Fix: escape hashtag character `#` in tag and category ([#245](https://github.com/hugo-fixit/FixIt/issues/245))
 - :lipstick: Style: refactor css style
 - :lipstick: Style: update home page stylesheet
 - :wrench: Chore(deps-dev):
diff --git a/assets/css/_page/_home.scss b/assets/css/_page/_home.scss
index 99f26f3b..67452f0e 100644
--- a/assets/css/_page/_home.scss
+++ b/assets/css/_page/_home.scss
@@ -177,6 +177,11 @@
         padding: 0;
 
         @include link(true, true);
+        
+        .post-tag:not(:last-child)::after {
+          content: ',';
+          margin-right: 0.25rem;
+        }
       }
     }
   }
diff --git a/assets/css/_partials/_single/_footer.scss b/assets/css/_partials/_single/_footer.scss
index 7f119327..3c98b1f7 100644
--- a/assets/css/_partials/_single/_footer.scss
+++ b/assets/css/_partials/_single/_footer.scss
@@ -73,6 +73,13 @@
     * {
       display: inline;
     }
+
+    @include link(true, true);
+
+    .post-tag:not(:last-child)::after {
+      content: ',';
+      margin-right: 0.25rem;
+    }
   }
 
   .post-nav {
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index f10e8a99..1a7871fe 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -43,7 +43,7 @@
     {{- $categories := slice -}}
     {{- range .Params.categories -}}
       {{- $category := partialCached "function/path.html" . . | printf "/categories/%v" | $.Site.GetPage -}}
-      {{- $categories = $categories | append (printf `<a href="%v">%v %v</a>` $category.RelPermalink (dict "Class" "fa-regular fa-folder fa-fw" | partial "plugin/icon.html") $category.Title) -}}
+      {{- $categories = $categories | append (printf `<a href="%v">%v %v</a>` (replace $category.RelPermalink "#" "%23") (dict "Class" "fa-regular fa-folder fa-fw" | partial "plugin/icon.html") $category.Title) -}}
     {{- end -}}
     {{- with delimit $categories "&ensp;" -}}
       &nbsp;<span class="post-category">
@@ -66,11 +66,12 @@
     <a href="{{ .RelPermalink }}">{{ T "readMore" }}</a>
     {{- with .Params.tags -}}
       <div class="post-tags">
-        {{- dict "Class" "fa-solid fa-tags fa-fw" | partial "plugin/icon.html" -}}&nbsp;
-        {{- range $index, $value := . -}}
-          {{- if gt $index 0 }},&nbsp;{{ end -}}
+        {{- dict "Class" "fa-solid fa-tags fa-fw me-1" | partial "plugin/icon.html" -}}
+        {{- range $value := . -}}
           {{- $tag := partialCached "function/path.html" $value $value | printf "/tags/%v" | $.Site.GetPage -}}
-          <a href="{{ $tag.RelPermalink }}">{{ $tag.Title }}</a>
+          {{- with $tag -}}
+            <a href='{{ replace .RelPermalink "#" "%23" }}' class="post-tag">{{ .Title }}</a>
+          {{- end -}}
         {{- end -}}
       </div>
     {{- end -}}
diff --git a/layouts/partials/function/path.html b/layouts/partials/function/path.html
index ece426fe..0a5efd19 100644
--- a/layouts/partials/function/path.html
+++ b/layouts/partials/function/path.html
@@ -1,3 +1,4 @@
 {{- /* https://discourse.gohugo.io/t/how-decode-urls-in-hugo/7549/4 */ -}}
-{{- $URL := . | urlize | urls.Parse -}}
+{{- /* https://github.com/hugo-fixit/FixIt/issues/245 */ -}}
+{{- $URL := . | urlize | urlquery | urls.Parse -}}
 {{- return $URL.Path -}}
diff --git a/layouts/partials/single/footer.html b/layouts/partials/single/footer.html
index c11314af..f9d5f879 100644
--- a/layouts/partials/single/footer.html
+++ b/layouts/partials/single/footer.html
@@ -59,11 +59,12 @@
   <div class="post-info-more">
     <section class="post-tags">
       {{- with .Params.tags -}}
-        {{- dict "Class" "fa-solid fa-tags fa-fw" | partial "plugin/icon.html" -}}&nbsp;
-        {{- range $index, $value := . -}}
-          {{- if gt $index 0 }},&nbsp;{{ end -}}
+        {{- dict "Class" "fa-solid fa-tags fa-fw me-1" | partial "plugin/icon.html" -}}
+        {{- range $value := . -}}
           {{- $tag := partialCached "function/path.html" $value $value | printf "/tags/%v" | $.Site.GetPage -}}
-          <a href="{{ $tag.RelPermalink }}">{{ $tag.Title }}</a>
+          {{- with $tag -}}
+            <a href='{{ replace .RelPermalink "#" "%23" }}' class="post-tag">{{ .Title }}</a>
+          {{- end -}}
         {{- end -}}
       {{- end -}}
     </section>
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index 31c37db8..6496253d 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -52,7 +52,7 @@
         {{- $categories := slice -}}
         {{- range .Params.categories -}}
           {{- $category := partialCached "function/path.html" . . | printf "/categories/%v" | $.Site.GetPage -}}
-          {{- $categories = $categories | append (printf `<a href="%v">%v %v</a>` $category.RelPermalink (dict "Class" "fa-regular fa-folder fa-fw" | partial "plugin/icon.html") $category.Title) -}}
+          {{- $categories = $categories | append (printf `<a href="%v">%v %v</a>` (replace $category.RelPermalink "#" "%23") (dict "Class" "fa-regular fa-folder fa-fw" | partial "plugin/icon.html") $category.Title) -}}
         {{- end -}}
         {{- with delimit $categories "&ensp;" }}
           <span class="post-category">
diff --git a/layouts/taxonomy/terms.html b/layouts/taxonomy/terms.html
index ce101715..30d39109 100644
--- a/layouts/taxonomy/terms.html
+++ b/layouts/taxonomy/terms.html
@@ -24,7 +24,7 @@
           <div class="card-item">
             <div class="card-item-wrapper">
               <h3 class="card-item-title">
-                <a href="{{ .RelPermalink }}">
+                <a href='{{ replace .RelPermalink "#" "%23" }}'>
                   {{ dict "Class" "fa-regular fa-folder fa-fw" | partial "plugin/icon.html" }}
                   {{ .Page.Title }}&nbsp;<sup>{{- len $pages -}}</sup>
                 </a>
@@ -36,7 +36,7 @@
               {{- end -}}
               {{- if gt (len $pages) 5 -}}
                 <span class="more-post">
-                  <a href="{{ .RelPermalink }}" class="more-single-link">{{ T "more" }} >></a>
+                  <a href='{{ replace .RelPermalink "#" "%23" }}' class="more-single-link">{{ T "more" }} >></a>
                 </span>
               {{- end -}}
             </div>
@@ -57,11 +57,11 @@
           {{- range $tags -}}
             {{- $grade := math.Min (math.Floor (div (sub .Count 1) $baseGrade)) 10 -}}
             {{- $fontSize := add $minFont (mul $grade $baseFont) -}}
-            <a href="{{ .Page.RelPermalink }}" class="tag-cloud-{{ $grade }}" style="--tag-font: {{ $fontSize }}px">{{ .Page.Title }} <sup>{{ .Count }}</sup></a>
+            <a href='{{ replace .Page.RelPermalink "#" "%23" }}' class="tag-cloud-{{ $grade }}" style="--tag-font: {{ $fontSize }}px">{{ .Page.Title }} <sup>{{ .Count }}</sup></a>
           {{- end -}}
         {{- else -}}
           {{- range $.Site.Taxonomies.tags.ByCount -}}
-            <a href="{{ .Page.RelPermalink }}">{{ .Page.Title }} <sup>{{ .Count }}</sup></a>
+            <a href='{{ replace .Page.RelPermalink "#" "%23" }}'>{{ .Page.Title }} <sup>{{ .Count }}</sup></a>
           {{- end -}}
         {{- end -}}
       </div>