Fix privacy setting not respected during image detection in client

stackernews · Sep 25, 2023 · 7868f37 · 7868f37
1 parent f6bd04f
commit 7868f37
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 9 deletions.
diff --git a/components/image.js b/components/image.js
diff --git a/components/text.js b/components/text.js
@@ -69,7 +69,7 @@ export default memo(function Text ({ topLevel, noFragments, nofollow, imgproxyUr
 
   const HeadingWrapper = (props) => Heading({ topLevel, slugger, noFragments, ...props })
 
-  const imgUrlCache = useImgUrlCache(children)
+  const imgUrlCache = useImgUrlCache(children, imgproxyUrls)
 
   return (
     <div className={styles.text}>
@@ -110,7 +110,9 @@ export default memo(function Text ({ topLevel, noFragments, nofollow, imgproxyUr
 
             if (imgUrlCache[href] === IMG_CACHE_STATES.LOADED) {
               const url = IMGPROXY_URL_REGEXP.test(href) ? decodeOriginalUrl(href) : href
-              const srcSet = imgproxyUrls ? imgproxyUrls[url] : undefined
+              // if `srcSet` is undefined, it means there image was not processed by worker yet
+              // if `srcSet` is null, image was processed but this specific url was not detected as an image by the worker
+              const srcSet = imgproxyUrls ? (imgproxyUrls[url] || null) : undefined
               return <ZoomableImage topLevel={topLevel} srcSet={srcSet} {...props} src={href} />
             }
 
@@ -136,7 +138,9 @@ export default memo(function Text ({ topLevel, noFragments, nofollow, imgproxyUr
           },
           img: ({ node, src, ...props }) => {
             const url = IMGPROXY_URL_REGEXP.test(src) ? decodeOriginalUrl(src) : src
-            const srcSet = imgproxyUrls ? imgproxyUrls[url] : undefined
+            // if `srcSet` is undefined, it means there image was not processed by worker yet
+            // if `srcSet` is null, image was processed but this specific url was not detected as an image by the worker
+            const srcSet = imgproxyUrls ? (imgproxyUrls[url] || null) : undefined
             return <ZoomableImage topLevel={topLevel} srcSet={srcSet} src={src} {...props} />
           }
         }}