From dbb5e74184eb8bdfdc94e1817bb0313713c0d143 Mon Sep 17 00:00:00 2001
From: Butterscotch! <bscotchvanilla@gmail.com>
Date: Mon, 18 Nov 2024 01:25:19 -0500
Subject: [PATCH] Provide proper canonical URLs

---
 src/_data/metadata.js           |  3 ++-
 src/_includes/layouts/embed.njk | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/_data/metadata.js b/src/_data/metadata.js
index f270c82..0648f79 100644
--- a/src/_data/metadata.js
+++ b/src/_data/metadata.js
@@ -7,5 +7,6 @@ export default {
         name: "Butterscotch!",
         url: "https://bscotch.ca/"
     },
-    image: "/img/avatar.png"
+    image: "/img/avatar.png",
+    manifest: "/site.webmanifest"
 }
diff --git a/src/_includes/layouts/embed.njk b/src/_includes/layouts/embed.njk
index a33063a..30e97a8 100644
--- a/src/_includes/layouts/embed.njk
+++ b/src/_includes/layouts/embed.njk
@@ -1,7 +1,7 @@
 <meta property="og:locale" content="en_US">
 
-<link rel="canonical" href="{{ page.url | url }}">
-<meta property="og:url" content="{{ page.url | url }}">
+<link rel="canonical" href="{{ page.url | htmlBaseUrl(metadata.url) }}">
+<meta property="og:url" content="{{ page.url | htmlBaseUrl(metadata.url) }}">
 
 <meta property="og:site_name" content="{{ metadata.title }}">
 
@@ -11,8 +11,8 @@
 <meta name="description" content="{{ description or metadata.description }}">
 <meta property="og:description" content="{{ description or metadata.description }}">
 
-<meta property="og:image" content="{{ image or metadata.image | url }}">
-<meta property="twitter:image" content="{{ image or metadata.image | url }}">
+<meta property="og:image" content="{{ image or metadata.image }}">
+<meta property="twitter:image" content="{{ image or metadata.image }}">
 
 <meta property="og:type" content="website">
 <meta name="twitter:card" content="summary">
@@ -21,4 +21,4 @@
 <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
 <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
 
-<link rel="manifest" href="/site.webmanifest">
+<link rel="manifest" href="{{ manifest or metadata.manifest }}">