@ecency/render-helper 2.4.11 → 2.4.13

package/dist/browser/index.js

@@ -4,7 +4,7 @@ import multihash from 'multihashes';
 import querystring from 'querystring';
 import { Remarkable } from 'remarkable';
 import { linkify as linkify$1 } from 'remarkable/linkify';
-import he from 'he';
+import he2 from 'he';
 import * as htmlparser2 from 'htmlparser2';
 import * as domSerializerModule from 'dom-serializer';
 import { LRUCache } from 'lru-cache';
@@ -1401,7 +1401,7 @@ function markdownToHTML(input, forApp, webp, parentDomain = "ecency.com") {
       traverse(doc, forApp, 0, webp, { firstImageFound: false }, parentDomain);
       output = serializer.serializeToString(doc);
     } catch (fallbackError) {
-      const escapedContent = he.encode(output || md.render(input));
+      const escapedContent = he2.encode(output || md.render(input));
       output = `<p dir="auto">${escapedContent}</p>`;
     }
   }
@@ -1441,8 +1441,6 @@ function markdown2Html(obj, forApp = true, webp = false, parentDomain = "ecency.
   cacheSet(key, res);
   return res;
 }
-
-// src/catch-post-image.ts
 var gifLinkRegex = /\.(gif)$/i;
 function isGifLink(link) {
   return gifLinkRegex.test(link);
@@ -1459,12 +1457,20 @@ function getImage(entry, width = 0, height = 0, format = "match") {
     }
   }
   if (meta && typeof meta.image === "string" && meta.image.length > 0) {
-    if (isGifLink(meta.image)) {
-      return proxifyImageSrc(meta.image, 0, 0, format);
+    const decodedImage = he2.decode(meta.image);
+    if (isGifLink(decodedImage)) {
+      return proxifyImageSrc(decodedImage, 0, 0, format);
     }
-    return proxifyImageSrc(meta.image, width, height, format);
+    return proxifyImageSrc(decodedImage, width, height, format);
   }
   if (meta && meta.image && !!meta.image.length && meta.image[0]) {
+    if (typeof meta.image[0] === "string") {
+      const decodedImage = he2.decode(meta.image[0]);
+      if (isGifLink(decodedImage)) {
+        return proxifyImageSrc(decodedImage, 0, 0, format);
+      }
+      return proxifyImageSrc(decodedImage, width, height, format);
+    }
     if (isGifLink(meta.image[0])) {
       return proxifyImageSrc(meta.image[0], 0, 0, format);
     }
@@ -1481,20 +1487,34 @@ function getImage(entry, width = 0, height = 0, format = "match") {
     if (!src) {
       return null;
     }
-    if (isGifLink(src)) {
-      return proxifyImageSrc(src, 0, 0, format);
+    const decodedSrc = he2.decode(src);
+    if (isGifLink(decodedSrc)) {
+      return proxifyImageSrc(decodedSrc, 0, 0, format);
     }
-    return proxifyImageSrc(src, width, height, format);
+    return proxifyImageSrc(decodedSrc, width, height, format);
   }
   return null;
 }
 function catchPostImage(obj, width = 0, height = 0, format = "match") {
   if (typeof obj === "string") {
-    const entryWrapper = {
-      body: obj,
-      json_metadata: "{}"
-    };
-    return getImage(entryWrapper, width, height, format);
+    const html = markdown2Html(obj);
+    const doc = createDoc(html);
+    if (!doc) {
+      return null;
+    }
+    const imgEls = doc.getElementsByTagName("img");
+    if (imgEls.length >= 1) {
+      const src = imgEls[0].getAttribute("src");
+      if (!src) {
+        return null;
+      }
+      const decodedSrc = he2.decode(src);
+      if (isGifLink(decodedSrc)) {
+        return proxifyImageSrc(decodedSrc, 0, 0, format);
+      }
+      return proxifyImageSrc(decodedSrc, width, height, format);
+    }
+    return null;
   }
   const key = `${makeEntryCacheKey(obj)}-${width}x${height}-${format}`;
   const item = cacheGet(key);
@@ -1581,7 +1601,7 @@ function postBodySummary(entryBody, length = 200, platform = "web") {
     text2 = joint(text2.split(" "), length);
   }
   if (text2) {
-    text2 = he.decode(text2);
+    text2 = he2.decode(text2);
   }
   return text2;
 }