Merge pull request #476 from barefootstache/475-bug-opengraph-partial

Fix opengraph partial ld+json never activated
chipzoller · Sep 23, 2024 · c7cc97c · c7cc97c
2 parents 174847b + ec1894a
commit c7cc97c
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -258,6 +258,7 @@ These options set global values that some pages or all pages in the site use by
 | showRelatedInSidebar       | boolean                     | no                  |
 | footerLogo                 | string                      | N/A                 |
 | enableSearch               | boolean                     | N/A                 |
+| blogDir                    | string                      | no                  |
 
 ### Page Parameters
 

diff --git a/exampleSite/config/_default/params.toml b/exampleSite/config/_default/params.toml
@@ -102,6 +102,9 @@ languageMenuName = "🌐"
 # Enable or disable comments globally. Default to true.
 # comments = false
 
+# Activate meta ld+json for blog
+blogDir = "post"
+
 # Enable or disable Utterances (https://github.com/utterance/utterances) Github Issue-Based Commenting
 # utterances = true  # Run the utterances script in the single.html layout to load https://utteranc.es comments
 # utterancesRepo = "GHUsername/Repository.Name" # Utterances is enabled when this param is set

diff --git a/layouts/partials/opengraph.html b/layouts/partials/opengraph.html
@@ -59,20 +59,46 @@
 <meta property="og:title" content="{{ $title }}" />
 <meta property="og:description" content="{{ $summary }}" />
 <meta property="og:image" content="{{ $image }}" />
-{{- $keywords := "" }}
+{{- $mergedKeywords := slice }}
 {{- with $s.keywords }}
-  {{- $keywords = delimit $s.keywords "," }}
+  {{- range . }}
+    {{- $mergedKeywords = $mergedKeywords | append . }}
+  {{- end }}
 {{- end }}
 {{- with $p.keywords }}
-  {{- $keywords = delimit . "," }}
+  {{- range . }}
+    {{- $mergedKeywords = $mergedKeywords | append . }}
+  {{- end }}
+{{- end }}
+{{- with $s.tags }}
+  {{- range . }}
+    {{- $mergedKeywords = $mergedKeywords | append . }}
+  {{- end }}
 {{- end }}
-{{- with $keywords }}
-  <meta name="keywords" content="{{ $keywords }}" />
+{{- with $p.tags }}
+  {{- range . }}
+    {{- $mergedKeywords = $mergedKeywords | append . }}
+  {{- end }}
+{{- end }}
+{{- $mergedKeywordsString := delimit $mergedKeywords "," }}
+{{- with $mergedKeywordsString }}
+  <meta name="keywords" content="{{ $mergedKeywordsString }}" />
 {{- end }}
 {{- if eq .Section $s.blogDir -}}
   {{- $date := ( .Date.Format "2006-02-01") -}}
   {{- $date := (time .Date) }}
   {{- $lastMod := (time .Lastmod) }}
+  {{- $categories := slice }}
+  {{- with $s.categories }}
+    {{- range . }}
+      {{- $categories = $categories | append . }}
+    {{- end }}
+  {{- end }}
+  {{- with $p.categories }}
+    {{- range . }}
+      {{- $categories = $categories | append . }}
+    {{- end }}
+  {{- end }}
   <script type="application/ld+json">
     {
       "@context": "http://schema.org",
@@ -84,6 +110,10 @@
       "url": "{{ $permalink }}",
       "datePublished": {{ $date  }},
       "dateModified": {{ $lastMod }},
+      "keywords": {{ $mergedKeywords }},
+      {{- with $categories }}
+        "articleSection": {{ $categories }},
+      {{- end }}
       "author": {
         "@type": "Person",
         "name": "{{ $author }}"