bookmarks: set canonical link to original source

ooloth · Dec 23, 2024 · 45c21ac · 45c21ac
1 parent bac176b
commit 45c21ac
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/layouts/Base.astro b/src/layouts/Base.astro
@@ -8,15 +8,16 @@ import { getTILs } from '../utils/tils'
 import { getBookmarks } from '../utils/bookmarks'
 
 export type BaseProps = {
+  canonicalUrl?: string
   description?: string
   ogImage?: string
   title?: string
 }
 
 type Props = BaseProps
 
-const { description, ogImage, title } = Astro.props
-const { pathname } = Astro.url
+const { canonicalUrl, description, ogImage, title } = Astro.props
+const { href, pathname } = Astro.url
 
 const posts = await getPosts()
 const tils = await getTILs()
@@ -144,7 +145,7 @@ const socialImage = ogImage
     <title>{pageTitleWithSuffix}</title>
     <meta name="description" content={pageDescription} />
     <meta name="author" content={site.author.name} />
-    <link rel="canonical" href={Astro.url.href} />
+    <link rel="canonical" href={canonicalUrl || href} />
     <link rel="sitemap" href="/sitemap.xml" />
 
     <!-- Open Graph (see: https://ogp.me) -->

diff --git a/src/layouts/Main.astro b/src/layouts/Main.astro
@@ -5,10 +5,10 @@ import Base, { type BaseProps } from './Base.astro'
 
 type Props = BaseProps
 
-const { description, title, ogImage } = Astro.props
+const { description, title, ogImage, canonicalUrl } = Astro.props
 ---
 
-<Base title={title} description={description} ogImage={ogImage}>
+<Base title={title} description={description} ogImage={ogImage} canonicalUrl={canonicalUrl}>
   <div class="flex flex-col flex-1">
     <Header />
 

diff --git a/src/layouts/Writing.astro b/src/layouts/Writing.astro
@@ -29,7 +29,7 @@ const isDraft = isPathnameInCollection(pathname, drafts)
 // const tags = cleanTags(entry.data.tags)
 ---
 
-<Main title={title} description={entry.data.description} ogImage={entry.data.ogImage}>
+<Main canonicalUrl={entry.data.source} description={entry.data.description} ogImage={entry.data.ogImage} title={title}>
   <div class="mx-auto max-w-2xl">
     <header class="markdown">
       {