From a6ae1efab1e148a2fa47bd0790ce839a68124a2a Mon Sep 17 00:00:00 2001
From: willstocks <43744514+willstocks@users.noreply.github.com>
Date: Mon, 16 Mar 2020 11:05:35 +0000
Subject: [PATCH] Twitter card + OG markup fixes

Remove Twitter card title, description and image (twitter cards fall back to OG markup for these elements).
Fix og:image url for non-home content
Conditionally show twitter:site tag
---
 layouts/partials/head.html | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index d32fd87..ea517ec 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -28,11 +28,10 @@
 
 <!-- Twitter Card -->
 <meta name="twitter:card" content="summary" />
-<meta name="twitter:title" content="{{ if .IsHome }}{{ $.Site.Title }}{{ else }}{{ .Title }} :: {{ $.Site.Title }} {{ end }}" />
-<meta name="twitter:description" content="{{ if .IsHome }}{{ $.Site.Params.Subtitle }}{{ else }}{{ .Summary | plainify }}{{ end }}" />
-<meta name="twitter:site" content="{{ .Permalink }}" />
-<meta name="twitter:creator" content="{{ if .IsHome }}{{ $.Site.Owner }}{{ else }}{{ .Params.Author }}{{ end }}" />
-<meta name="twitter:image" content="{{ if .IsHome }}{{ $.Site.Params.favicon | absURL }}{{else}}{{ .Params.Cover | absURL }}{{ end }}">
+{{ if (isset .Params "twitterSite") | or (eq .Params.twitterSite "") }}
+  <meta name="twitter:site" content="{{ $.Site.siteTwitter }}" />
+{{ end }}
+<meta name="twitter:creator" content="{{ if .IsHome }}{{ $.Site.twitterOwner }}{{ else }}{{ .Params.Author }}{{ end }}" />
 
 <!-- OG data -->
 <meta property="og:locale" content="{{ $.Site.Language.Lang }}" />
@@ -41,7 +40,7 @@
 <meta property="og:description" content="{{ if .IsHome }}{{ $.Site.Params.Subtitle }}{{ else }}{{ .Summary | plainify }}{{ end }}" />
 <meta property="og:url" content="{{ .Permalink }}" />
 <meta property="og:site_name" content="{{ .Title }}" />
-<meta property="og:image" content="{{ if .IsHome }}{{ $.Site.Params.favicon | absURL }}{{else}}{{ with .Params.Cover }}{{ . | absURL }}{{ end }}">
+<meta property="og:image" content="{{ if .IsHome }}{{ $.Site.Params.favicon | absURL }}{{else}}{{ .Params.Cover | absURL }}{{ end }}">
 <meta property="og:image:width" content="2048">
 <meta property="og:image:height" content="1024">
 {{ range .Params.categories }}