From 7b61e2f369e6ca227facdebeecd9f3822e7e99de Mon Sep 17 00:00:00 2001
From: George Cushen <gcushen@users.noreply.github.com>
Date: Wed, 1 Nov 2023 18:37:33 +0000
Subject: [PATCH] modules: namespace Core module

Hugo does not namespace modules by default, leading to conflicts. Hence, load partials from a namespaced sub-folder to prevent conflicts with similarly named files in other modules.
---
 modules/wowchemy-plugin-reveal/go.mod         |  4 +--
 .../layouts/slides/baseof.html                |  4 +--
 modules/wowchemy-seo/go.mod                   |  4 +--
 .../wowchemy-seo/layouts/index.webmanifest    |  4 +--
 .../layouts/partials/jsonld/article.html      |  6 ++--
 .../layouts/partials/jsonld/business.html     |  2 +-
 .../layouts/partials/jsonld/event.html        |  4 +--
 .../layouts/partials/seo_tags.html            | 31 ++++++++++++++-----
 8 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/modules/wowchemy-plugin-reveal/go.mod b/modules/wowchemy-plugin-reveal/go.mod
index e17730d8..ad167e82 100644
--- a/modules/wowchemy-plugin-reveal/go.mod
+++ b/modules/wowchemy-plugin-reveal/go.mod
@@ -2,6 +2,4 @@ module github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-plugin-reveal
 
 go 1.15
 
-require (
-	github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-core v0.1.0
-)
+require github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-core v0.2.1-0.20231101183355-53a94b591ea8
diff --git a/modules/wowchemy-plugin-reveal/layouts/slides/baseof.html b/modules/wowchemy-plugin-reveal/layouts/slides/baseof.html
index 6c7deafe..02f64e10 100644
--- a/modules/wowchemy-plugin-reveal/layouts/slides/baseof.html
+++ b/modules/wowchemy-plugin-reveal/layouts/slides/baseof.html
@@ -16,8 +16,8 @@
     <link rel="manifest" href="{{ .RelPermalink }}">
   {{ end }}
 
-  <link rel="icon" type="image/png" href="{{(partial "functions/get_icon" 32).RelPermalink}}">
-  <link rel="apple-touch-icon" type="image/png" href="{{(partial "functions/get_icon" 192).RelPermalink}}">
+  <link rel="icon" type="image/png" href="{{(partial "wowchemy-core/functions/get_icon" 32).RelPermalink}}">
+  <link rel="apple-touch-icon" type="image/png" href="{{(partial "wowchemy-core/functions/get_icon" 192).RelPermalink}}">
 
   <link rel="canonical" href="{{ .Permalink }}">
 
diff --git a/modules/wowchemy-seo/go.mod b/modules/wowchemy-seo/go.mod
index 4c60a7e6..f60f026b 100644
--- a/modules/wowchemy-seo/go.mod
+++ b/modules/wowchemy-seo/go.mod
@@ -2,6 +2,4 @@ module github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-seo
 
 go 1.15
 
-require (
-	github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-core v0.1.0
-)
+require github.com/wowchemy/wowchemy-hugo-themes/modules/wowchemy-core v0.2.1-0.20231101183355-53a94b591ea8
diff --git a/modules/wowchemy-seo/layouts/index.webmanifest b/modules/wowchemy-seo/layouts/index.webmanifest
index 0d30abc5..2b2b2ae1 100644
--- a/modules/wowchemy-seo/layouts/index.webmanifest
+++ b/modules/wowchemy-seo/layouts/index.webmanifest
@@ -7,11 +7,11 @@
   "theme_color": "{{ $theme_color }}",
   "background_color": "{{ $theme_color }}",
   "icons": [{
-    "src": "{{ (partial "functions/get_icon" 192).RelPermalink }}",
+    "src": "{{ (partial "wowchemy-core/functions/get_icon" 192).RelPermalink }}",
     "sizes": "192x192",
     "type": "image/png"
     }, {
-    "src": "{{ (partial "functions/get_icon" 512).RelPermalink }}",
+    "src": "{{ (partial "wowchemy-core/functions/get_icon" 512).RelPermalink }}",
     "sizes": "512x512",
     "type": "image/png"
      }],
diff --git a/modules/wowchemy-seo/layouts/partials/jsonld/article.html b/modules/wowchemy-seo/layouts/partials/jsonld/article.html
index 188a0bee..e77c42c7 100644
--- a/modules/wowchemy-seo/layouts/partials/jsonld/article.html
+++ b/modules/wowchemy-seo/layouts/partials/jsonld/article.html
@@ -1,6 +1,6 @@
 {{- $page := .page }}
 {{ $summary := .summary }}
-{{ $featured_image := partial "functions/get_featured_image.html" $page }}
+{{ $featured_image := partial "wowchemy-core/functions/get_featured_image.html" $page }}
 
 {{/* Get schema type. */}}
 {{ $schema := "Article" }}
@@ -8,9 +8,9 @@
   {{ $schema = "BlogPosting" }}
 {{ end }}
 
-{{ $author := partial "functions/get_author_name" $page }}
+{{ $author := partial "wowchemy-core/functions/get_author_name" $page }}
 {{ $publisher := site.Params.marketing.seo.org_name | default site.Title }}
-{{ $logo_url := partial "functions/get_logo_url" $page -}}
+{{ $logo_url := partial "wowchemy-core/functions/get_logo_url" $page -}}
 
 <script type="application/ld+json">
 {
diff --git a/modules/wowchemy-seo/layouts/partials/jsonld/business.html b/modules/wowchemy-seo/layouts/partials/jsonld/business.html
index 3e96f437..773b2d0d 100644
--- a/modules/wowchemy-seo/layouts/partials/jsonld/business.html
+++ b/modules/wowchemy-seo/layouts/partials/jsonld/business.html
@@ -5,7 +5,7 @@
   "@type": {{site.Params.marketing.seo.site_type | default site.Params.marketing.seo.site_type}},
   "@id": {{site.BaseURL}},
   "name": {{site.Params.marketing.seo.org_name | default site.Title}},
-  "logo": {{ partial "functions/get_logo_url" . }},
+  "logo": {{ partial "wowchemy-core/functions/get_logo_url" . }},
   {{with $sharing_image}}"image": {{.Permalink}},{{end}}
   {{ if (eq site.Params.marketing.seo.site_type "LocalBusiness") | and site.Params.marketing.seo.coordinates }}
   "geo": {
diff --git a/modules/wowchemy-seo/layouts/partials/jsonld/event.html b/modules/wowchemy-seo/layouts/partials/jsonld/event.html
index 02299b98..982161d0 100644
--- a/modules/wowchemy-seo/layouts/partials/jsonld/event.html
+++ b/modules/wowchemy-seo/layouts/partials/jsonld/event.html
@@ -1,7 +1,7 @@
 {{ $page := .page }}
 {{ $summary := .summary }}
-{{ $featured_image := partial "functions/get_featured_image.html" $page }}
-{{ $author := partial "functions/get_author_name" $page }}
+{{ $featured_image := partial "wowchemy-core/functions/get_featured_image.html" $page }}
+{{ $author := partial "wowchemy-core/functions/get_author_name" $page }}
 
 <script type="application/ld+json">
 {
diff --git a/modules/wowchemy-seo/layouts/partials/seo_tags.html b/modules/wowchemy-seo/layouts/partials/seo_tags.html
index 546bbfc6..821bd4c7 100644
--- a/modules/wowchemy-seo/layouts/partials/seo_tags.html
+++ b/modules/wowchemy-seo/layouts/partials/seo_tags.html
@@ -6,10 +6,11 @@
 {{- end -}}
 
 {{/* Attempt to load superuser (the main site author). */}}
+{{ $superuser := index (first 1 (where (where site.Pages "Section" "authors") "Params.superuser" true)) 0 }}
 {{ $superuser_name := "" }}
 {{ $superuser_username := "" }}
 {{ $superuser_role := "" }}
-{{ range first 1 (where (where site.Pages "Section" "authors") "Params.superuser" true) }}
+{{ with $superuser }}
   {{ $superuser_name = .Title }}
   {{ $superuser_username = path.Base .File.Dir }}
   {{ $superuser_role = .Params.role }}
@@ -50,15 +51,15 @@
 {{ end }}
 
 {{/* Progressive Web App (PWA) Icon */}}
-<link rel="icon" type="image/png" href="{{ (partial "functions/get_icon" 32).RelPermalink }}" />
-<link rel="apple-touch-icon" type="image/png" href="{{ (partial "functions/get_icon" 180).RelPermalink }}" />
+<link rel="icon" type="image/png" href="{{ (partial "wowchemy-core/functions/get_icon" 32).RelPermalink }}" />
+<link rel="apple-touch-icon" type="image/png" href="{{ (partial "wowchemy-core/functions/get_icon" 180).RelPermalink }}" />
 {{ $theme_color := ($scr.Get "primary") | default site.Params.appearance.primary_color | default "#fff" }}
 <meta name="theme-color" content="{{ $theme_color }}" />
 
 {{/* Get page image for social sharing. */}}
 {{ $sharing_image := resources.GetMatch (path.Join "media" "sharing.*") }}
 {{/* Search for an image "*featured*" in post folder */}}
-{{ $featured_image := partial "functions/get_featured_image.html" . }}
+{{ $featured_image := partial "wowchemy-core/functions/get_featured_image.html" . }}
 {{ $avatar_image := (.Resources.ByType "image").GetMatch "avatar*" }}
 {{ $has_logo := fileExists "assets/media/logo.png" | or (fileExists "assets/media/logo.svg") }}
 {{ $og_image := "" }}
@@ -72,15 +73,15 @@
 {{ else if $sharing_image }}
   {{ $og_image = $sharing_image.Permalink }}
 {{ else if $has_logo }}
-  {{ $og_image = (partial "functions/get_logo" (dict "constraint" "fit" "size" 300)).Permalink }}
+  {{ $og_image = (partial "wowchemy-core/functions/get_logo" (dict "constraint" "fit" "size" 300)).Permalink }}
   {{ $twitter_card = "summary" }}
 {{ else }}
-  {{ $og_image = (partial "functions/get_icon" 512).Permalink }}
+  {{ $og_image = (partial "wowchemy-core/functions/get_icon" 512).Permalink }}
   {{ $twitter_card = "summary" }}
 {{ end }}
 {{ $scr.Set "og_image" $og_image }}{{/* Set `og_image` globally for `rss.xml`. */}}
 
-{{ $title := partial "functions/get_page_title" . }}
+{{ $title := partial "wowchemy-core/functions/get_page_title" . }}
 
 {{/* Twitter metadata. */}}
 <meta property="twitter:card" content="{{ $twitter_card }}" />
@@ -93,6 +94,22 @@
 {{- end -}}
 
 {{/* Open Graph metadata. */}}
+{{ $site_type := lower (site.Params.marketing.seo.site_type | default "Person") }}
+{{ $og_type := "website" }}
+{{ if .IsHome }}
+  {{ if eq $site_type "person" }}
+    {{ $og_type = "profile" }}
+    {{ with $superuser.Params.first_name }}<meta property="profile:first_name" content="{{ . }}">{{end}}
+    {{ with $superuser.Params.last_name }}<meta property="profile:last_name" content="{{ . }}">{{end}}
+  {{ else }}
+    {{ $og_type = "website" }}
+  {{ end }}
+{{ else if .IsPage | and (in (slice "post" "publication" "project" "book") .Type ) }}
+  {{ $og_type = "article" }}
+{{ else }}
+  {{ $og_type = "website" }}
+{{ end }}
+<meta property="og:type" content="{{ $og_type }}" />
 <meta property="og:site_name" content="{{ site.Title }}" />
 <meta property="og:url" content="{{ .Permalink }}" />
 <meta property="og:title" content="{{ $title }}" />