From 54f85c3bebeffbe6305a7f9e013b98d7840ab592 Mon Sep 17 00:00:00 2001
From: Alan Orth <alan.orth@gmail.com>
Date: Fri, 4 Dec 2020 14:09:27 +0200
Subject: [PATCH] layouts/_default/single.html: Fix for images in the page
 bundle

---
 layouts/_default/single.html | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index b144e33..d069ecc 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -7,18 +7,28 @@
   "@type": "BlogPosting",
   {{- /* Google recommends the headline be no more than 110 characters */}}
   "headline": {{ substr .Title 0 110 }},
-  {{- with .Params.images -}}{{ range first 1 . }}
+  {{- with .Params.images -}}{{- range first 1 . -}}
+  {{/* try to get the image from the page bundle */}}
+  {{- with $.Page.Resources.GetMatch (printf "*%s*" .) }}
   "image": {
     "@type": "ImageObject",
-    "url": {{ . | absURL }}
+    "url": {{ .Permalink }},
+    "height": "{{ .Height }}",
+    "width": "{{ .Width }}"
+  {{/* otherwise, get the image from static */}}
+  {{- else }}
+  "image": {
+    "@type": "ImageObject",
+    {{- $image := . -}}
     {{- /* Don't try to get imageConfig if image param is not local */ -}}
     {{- if not (or (hasPrefix . "http://") (hasPrefix . "https://")) -}}
-    {{- with (imageConfig (printf "/static/%s" .)) -}}
-    ,
+    {{- with (imageConfig (printf "/static/%s" .)) }}
+    "url": {{ $image | absURL }},
     "height": "{{ .Height }}",
     "width": "{{ .Width }}"
     {{- end -}}
-    {{ end }}
+    {{- end -}}
+  {{ end }}
   },
   {{- end -}}{{ end }}
   "url": {{ printf "%s" .Permalink }},