Merge pull request #339 from korosuke613/fix-ogp

fix: ogp path
korosuke613 · Oct 1, 2023 · 61bed97 · 61bed97
2 parents bb77efe + ad69c54
commit 61bed97
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/src/pages/posts/[...slug].astro b/src/pages/posts/[...slug].astro
@@ -2,7 +2,6 @@
 import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
 
-import * as path from 'node:path';
 import { ContentPost } from '@/partials/ContentPost';
 import Base from '@/templates/Base.astro';
 import { AppConfig } from '@/utils/AppConfig';
@@ -39,7 +38,7 @@ const filePath = `src/content/posts/${entry.id}`;
 const histories = await getCommitHistories(filePath);
 
 const ogpUrl = entry.data.imgSrc
-  ? path.join('https://korosuke613.dev/', entry.data.imgSrc)
+  ? new URL(entry.data.imgSrc, 'https://korosuke613.dev/').toString()
   : undefined;
 ---
 

diff --git a/src/pages/posts/dormitory_introduction.astro b/src/pages/posts/dormitory_introduction.astro
@@ -68,10 +68,10 @@ const similars = getSimilarPosts(
 const filePath = 'src/pages/posts/dormitory_introduction.astro';
 const histories = await getCommitHistories(filePath);
 
-const ogpUrl = path.join(
-  'https://korosuke613.dev/',
+const ogpUrl = new URL(
   Static.DormitoryIntroduction.data.imgSrc!,
-);
+  'https://korosuke613.dev/',
+).toString();
 ---
 
 <Base

diff --git a/src/templates/Base.astro b/src/templates/Base.astro
@@ -27,7 +27,10 @@ const twitterCardType = Astro.props.head.ogpUrl
   : 'summary';
 const ogpUrl = Astro.props.head.ogpUrl
   ? Astro.props.head.ogpUrl
-  : path.join('https://korosuke613.dev/', 'assets/images/my_icon_2.png');
+  : new URL(
+      'assets/images/my_icon_2.png',
+      'https://korosuke613.dev/',
+    ).toString();
 
 const rssLink = path.join(AppConfig.base, 'rss.xml');
 const faviconLink = path.join(AppConfig.base, 'favicon.ico');