From bd27ff76d6a2dcf9b7b26d59626d3c9d1b322475 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Sat, 19 Dec 2020 13:36:53 +0000
Subject: [PATCH] Commit metatag changes

---
 config/metatag.metatag_defaults.global.yml       | 16 +++++++++-------
 config/metatag.metatag_defaults.node.yml         |  8 +++++++-
 config/metatag.metatag_defaults.node__post.yml   |  1 -
 config/metatag.metatag_defaults.node__talk.yml   |  1 -
 .../metatag.metatag_defaults.taxonomy_term.yml   |  4 ++--
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/config/metatag.metatag_defaults.global.yml b/config/metatag.metatag_defaults.global.yml
index f702180..94e2da0 100644
--- a/config/metatag.metatag_defaults.global.yml
+++ b/config/metatag.metatag_defaults.global.yml
@@ -7,17 +7,19 @@ _core:
 id: global
 label: Global
 tags:
-  title: '[current-page:title] | [site:name] - [site:slogan]'
-  shortlink: 'https://opdavi.es[current-page:url:path]'
+  shortlink: '[current-page:url:unaliased]'
   canonical_url: '[current-page:url]'
+  title: '[current-page:title] | [site:name] - [site:slogan]'
   image_src: 'https://www.oliverdavies.uk/sites/default/files/images/me-precedent.jpg'
-  og_image: 'https://www.oliverdavies.uk/sites/default/files/images/me-precedent.jpg'
+  profile_username: opdavies
   og_title: '[current-page:title]'
+  og_image: 'https://www.oliverdavies.uk/sites/default/files/images/me-precedent.jpg'
+  og_url: '[current-page:url:absolute]'
   og_site_name: '[site:name]'
+  twitter_cards_creator_id: '24857701'
+  twitter_cards_site: '@opdavies'
+  twitter_cards_page_url: '[current-page:url]'
   twitter_cards_site_id: '24857701'
   twitter_cards_type: summary
-  twitter_cards_title: '[current-page:title]'
+  twitter_cards_title: '[current-page:title] - [site:name]'
   twitter_cards_creator: '@opdavies'
-  twitter_cards_page_url: '[current-page:url]'
-  twitter_cards_site: '@opdavies'
-  twitter_cards_creator_id: '24857701'
diff --git a/config/metatag.metatag_defaults.node.yml b/config/metatag.metatag_defaults.node.yml
index 4387d9e..244c685 100644
--- a/config/metatag.metatag_defaults.node.yml
+++ b/config/metatag.metatag_defaults.node.yml
@@ -7,6 +7,12 @@ _core:
 id: node
 label: Content
 tags:
-  title: '[node:title] | [site:name]'
   description: '[node:summary]'
+  abstract: '[node:summary]'
   canonical_url: '[node:url]'
+  title: '[node:title] | [site:name] - [site:slogan]'
+  og_type: article
+  article_published_time: '[node:changed:custom:c]'
+  og_updated_time: '[node:changed:custom:c]'
+  twitter_cards_title: '[node:title] | [site:name]'
+  twitter_cards_description: '[node:summary]'
diff --git a/config/metatag.metatag_defaults.node__post.yml b/config/metatag.metatag_defaults.node__post.yml
index d4bb080..0cdf899 100644
--- a/config/metatag.metatag_defaults.node__post.yml
+++ b/config/metatag.metatag_defaults.node__post.yml
@@ -6,4 +6,3 @@ id: node__post
 label: 'Content: Blog post'
 tags:
   description: '[node:field_excerpt]'
-  title: '[node:title]'
diff --git a/config/metatag.metatag_defaults.node__talk.yml b/config/metatag.metatag_defaults.node__talk.yml
index 804e216..17ae339 100644
--- a/config/metatag.metatag_defaults.node__talk.yml
+++ b/config/metatag.metatag_defaults.node__talk.yml
@@ -6,4 +6,3 @@ id: node__talk
 label: 'Content: Talk'
 tags:
   description: '[node:field_excerpt]'
-  title: '[node:title]'
diff --git a/config/metatag.metatag_defaults.taxonomy_term.yml b/config/metatag.metatag_defaults.taxonomy_term.yml
index f224f08..51a507a 100644
--- a/config/metatag.metatag_defaults.taxonomy_term.yml
+++ b/config/metatag.metatag_defaults.taxonomy_term.yml
@@ -7,6 +7,6 @@ _core:
 id: taxonomy_term
 label: 'Taxonomy term'
 tags:
-  canonical_url: '[term:url]'
   description: '[term:description]'
-  title: '[term:name] | [site:name]'
+  canonical_url: '[term:url]'
+  title: '[term:name] | [site:name] - [site:slogan]'