From 763d4cb8e0a8a226007aec276dc3009a031ce4b0 Mon Sep 17 00:00:00 2001
From: Hadley Wickham <h.wickham@gmail.com>
Date: Sun, 26 May 2024 09:05:30 -0500
Subject: [PATCH] Tidy up open graph metadata in head.html

---
 R/render.R                   | 14 ++++++++++----
 inst/BS5/templates/head.html | 29 +++++++----------------------
 2 files changed, 17 insertions(+), 26 deletions(-)

diff --git a/R/render.R b/R/render.R
index d3c07ca69..6185576ff 100644
--- a/R/render.R
+++ b/R/render.R
@@ -136,8 +136,10 @@ data_open_graph <- function(pkg = ".", call = caller_env()) {
   pkg <- as_pkgdown(pkg)
   og <- config_pluck_list(pkg, "template.opengraph", default = list())
   og <- check_open_graph(og, pkgdown_config_path(pkg) %||% "_pkgdown.yml", call = call)
-  if (is.null(og$image) && !is.null(find_logo(pkg$src_path))) {
-    og$image <- list(src = path_file(find_logo(pkg$src_path)))
+
+  logo <- find_logo(pkg$src_path)
+  if (is.null(og$image) && !is.null(logo)) {
+    og$image <- list(src = path_file(logo))
   }
   if (!is.null(og$image) && !grepl("^http", og$image$src)) {
     site_url <- config_pluck(pkg, "url", default = "/")
@@ -148,8 +150,12 @@ data_open_graph <- function(pkg = ".", call = caller_env()) {
     og$image$src <- paste0(site_url, og$image$src)
   }
 
-  og$twitter$creator <- og$twitter$creator %||% og$twitter$site
-  og$twitter$site <- og$twitter$site %||% og$twitter$creator
+  if (!is.null(og$twitter)) {
+    og$twitter$card <- og$twitter$card %||% "summary"
+    og$twitter$creator <- og$twitter$creator %||% og$twitter$site
+    og$twitter$site <- og$twitter$site %||% og$twitter$creator
+  }
+
   og
 }
 
diff --git a/inst/BS5/templates/head.html b/inst/BS5/templates/head.html
index 183609b52..49a070aaa 100644
--- a/inst/BS5/templates/head.html
+++ b/inst/BS5/templates/head.html
@@ -1,11 +1,6 @@
 <meta charset="utf-8">
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-{{#opengraph}}
-{{#description}}
-<meta name="description" content="{{.}}" />
-{{/description}}
-{{/opengraph}}
 <title>{{{pagetitle}}} • {{#site}}{{title}}{{/site}}</title>
 
 {{#has_favicons}}
@@ -49,27 +44,17 @@
 <meta property="og:title" content="{{{pagetitle}}}" />
 {{#opengraph}}
 {{#description}}
-<meta property="og:description" content="{{.}}" />
+  <meta name="description" content="{{.}}" />
+  <meta property="og:description" content="{{.}}" />
 {{/description}}
 {{#image}}
-<meta property="og:image" content="{{{src}}}" />
-{{#alt}}
-<meta property="og:image:alt" content="{{{.}}}" />
-{{/alt}}
+  <meta property="og:image" content="{{{src}}}" />
+  {{#alt}}<meta property="og:image:alt" content="{{{.}}}" />{{/alt}}
 {{/image}}
 {{#twitter}}
-{{#card}}
-<meta name="twitter:card" content="{{{.}}}" />
-{{/card}}
-{{^card}}
-<meta name="twitter:card" content="summary" />
-{{/card}}
-{{#creator}}
-<meta name="twitter:creator" content="{{{.}}}" />
-{{/creator}}
-{{#site}}
-<meta name="twitter:site" content="{{{.}}}" />
-{{/site}}
+  {{#card}}<meta name="twitter:card" content="{{{.}}}" />{{/card}}
+  {{#creator}}<meta name="twitter:creator" content="{{{.}}}" />{{/creator}}
+  {{#site}}<meta name="twitter:site" content="{{{.}}}" />{{/site}}
 {{/twitter}}
 {{/opengraph}}