Merge pull request #3180 from owid/image-filename-escaping

🐛 fix double uriEncoding of gdocs og:image URLs
owid · Feb 8, 2024 · 26fa7b8 · 26fa7b8
2 parents a9497ba + cdfef18
commit 26fa7b8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 15 deletions.
diff --git a/packages/@ourworldindata/utils/src/image.ts b/packages/@ourworldindata/utils/src/image.ts
@@ -3,12 +3,7 @@ Common utlities for deriving properties from image metadata.
 */
 
 import { traverseEnrichedBlocks } from "./Util.js"
-import {
-    OwidGdoc,
-    OwidGdocType,
-    IMAGES_DIRECTORY,
-    ImageMetadata,
-} from "@ourworldindata/types"
+import { OwidGdoc, OwidGdocType, ImageMetadata } from "@ourworldindata/types"
 import { match, P } from "ts-pattern"
 
 export function getSizes(
@@ -51,12 +46,6 @@ export function getFilenameAsPng(filename: ImageMetadata["filename"]): string {
     return `${getFilenameWithoutExtension(filename)}.png`
 }
 
-/**
- * example-image.png -> https://ourworldindata.org/uploads/published/example-image.png
- */
-export const filenameToUrl = (filename: string, baseUrl: string): string =>
-    new URL(`${IMAGES_DIRECTORY}${getFilenameAsPng(filename)}`, baseUrl).href
-
 export type SourceProps = {
     media: string | undefined
     srcSet: string

diff --git a/packages/@ourworldindata/utils/src/index.ts b/packages/@ourworldindata/utils/src/index.ts
@@ -365,7 +365,6 @@ export {
     type SourceProps,
     generateSourceProps,
     getFeaturedImageFilename,
-    filenameToUrl,
 } from "./image.js"
 
 export { Tippy, TippyIfInteractive } from "./Tippy.js"

diff --git a/site/gdocs/OwidGdocPage.tsx b/site/gdocs/OwidGdocPage.tsx
@@ -9,10 +9,10 @@ import {
     OwidGdoc as OwidGdocUnionType,
     SiteFooterContext,
     OwidGdocType,
-    filenameToUrl,
 } from "@ourworldindata/utils"
 import { DebugProvider } from "./DebugContext.js"
 import { match, P } from "ts-pattern"
+import { IMAGES_DIRECTORY } from "@ourworldindata/types"
 
 declare global {
     interface Window {
@@ -75,7 +75,7 @@ export default function OwidGdocPage({
                 imageUrl={
                     // uriEncoding is taken care of inside the Head component
                     featuredImageFilename
-                        ? filenameToUrl(featuredImageFilename, baseUrl)
+                        ? `${baseUrl}${IMAGES_DIRECTORY}${featuredImageFilename}`
                         : undefined
                 }
                 baseUrl={baseUrl}