feat: fix social media image url

madcampos · Sep 26, 2024 · 55208d3 · 55208d3
1 parent 0d934da
commit 55208d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/components/HtmlHead.astro b/src/components/HtmlHead.astro
@@ -37,11 +37,12 @@ const {
 	hasFeed = false
 } = Astro.props;
 
-const fullUrl = new URL(url, new URL(GLOBALS.url, Astro.site)).toString();
+const baseUrl = new URL(GLOBALS.url, Astro.site).toString();
+const fullUrl = new URL(url, baseUrl).toString();
 
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 const socialImageAlt = imageAlt ?? GLOBALS.logoAltText!.micro;
-const socialImage = join([GLOBALS.url, image ?? defaultSocialImage.src], { trailingSlash: false });
+const socialImage = join([baseUrl, image ?? defaultSocialImage.src], { trailingSlash: false });
 ---
 <head>
 	<meta charset="utf-8" />

diff --git a/src/utils/path.ts b/src/utils/path.ts
@@ -10,16 +10,16 @@ export function join(paths: string[], options?: Partial<JoinOptions>) {
 		...options
 	};
 
-	const joinedPath = paths.join(opts.separator).replaceAll(`${opts.separator}${opts.separator}`, opts.separator);
+	const joinedPath = paths.join(opts.separator).replaceAll(new RegExp(`(?<!:)${opts.separator}{2,}`, 'giu'), opts.separator);
 
 	let normalizedPath = joinedPath;
 
 	switch (opts.trailingSlash) {
 		case true:
-			normalizedPath = `${joinedPath}${opts.separator}`.replaceAll(`${opts.separator}${opts.separator}`, opts.separator);
+			normalizedPath = `${joinedPath}${opts.separator}`.replaceAll(new RegExp(`(?<!:)${opts.separator}{2,}`, 'giu'), opts.separator);
 			break;
 		case false:
-			normalizedPath = joinedPath.replace(new RegExp(`${opts.separator}$`, 'u'), '');
+			normalizedPath = joinedPath.replace(new RegExp(`${opts.separator}$`, 'iu'), '');
 			break;
 		default:
 	}