🐛 remove SVG handling for og:image

owid · Dec 12, 2024 · db524fb · db524fb
1 parent c2edb20
commit db524fb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/packages/@ourworldindata/utils/src/image.ts b/packages/@ourworldindata/utils/src/image.ts
@@ -120,13 +120,8 @@ export function getFeaturedImageFilename(gdoc: OwidGdoc): string | undefined {
                 },
             },
             (match) => {
-                const featuredImageSlug = match.content["featured-image"]
-                if (!featuredImageSlug) return undefined
-                // Social media platforms don't support SVG's for og:image, in which case, use the fallback PNG that the baker generates
-                // TODO: remove this and add an error if an author tries to use an SVG as a featured image
-                return getFilenameExtension(featuredImageSlug) === "svg"
-                    ? getFilenameAsPng(featuredImageSlug)
-                    : featuredImageSlug
+                const featuredImageFilename = match.content["featured-image"]
+                return featuredImageFilename
             }
         )
         .with({ content: { type: OwidGdocType.DataInsight } }, (gdoc) => {

diff --git a/site/gdocs/OwidGdocPage.tsx b/site/gdocs/OwidGdocPage.tsx
@@ -10,6 +10,7 @@ import {
     SiteFooterContext,
     OwidGdocType,
     spansToUnformattedPlainText,
+    get,
 } from "@ourworldindata/utils"
 import { getCanonicalUrl, getPageTitle } from "@ourworldindata/components"
 import { DebugProvider } from "./DebugContext.js"
@@ -100,8 +101,15 @@ export default function OwidGdocPage({
     ) {
         imageUrl = `${baseUrl}/${ARCHVED_THUMBNAIL_FILENAME}`
     } else if (featuredImageFilename) {
-        // A hard-coded variant that doesn't need to know the image's width
-        imageUrl = `${CLOUDFLARE_IMAGES_URL}/${featuredImageFilename}/public`
+        const cloudflareId = get(gdoc, [
+            "imageMetadata",
+            featuredImageFilename,
+            "cloudflareId",
+        ])
+        if (cloudflareId) {
+            // "public" is a hard-coded variant that doesn't need to know the image's width
+            imageUrl = `${CLOUDFLARE_IMAGES_URL}/${cloudflareId}/public`
+        }
     }
 
     return (