@ecency/render-helper 2.5.0 → 2.5.2

package/dist/node/index.cjs

@@ -83,13 +83,13 @@ var SECTION_LIST = [
 // src/consts/regexes.const.ts
 var IMG_REGEX = /(https?:\/\/.*\.(?:tiff?|jpe?g|gif|png|svg|ico|heic|webp|arw))(.*)/gim;
 var IPFS_REGEX = /^https?:\/\/[^/]+\/(ip[fn]s)\/([^/?#]+)/gim;
-var POST_REGEX = /^https?:\/\/(.*)\/(.*)\/(@[\w.\d-]+)\/(.*)/i;
+var POST_REGEX = /^https?:\/\/([^/]+)\/([^/]+)\/(@[\w.\d-]+)\/(.+)$/i;
 var CCC_REGEX = /^https?:\/\/(.*)\/ccc\/([\w.\d-]+)\/(.*)/i;
 var MENTION_REGEX = /^https?:\/\/(.*)\/(@[\w.\d-]+)$/i;
 var TOPIC_REGEX = /^https?:\/\/(.*)\/(trending|hot|created|promoted|muted|payout)\/(.*)$/i;
 var INTERNAL_MENTION_REGEX = /^\/@[\w.\d-]+$/i;
 var INTERNAL_TOPIC_REGEX = /^\/(trending|hot|created|promoted|muted|payout)\/(.*)$/i;
-var INTERNAL_POST_TAG_REGEX = /(.*)\/(@[\w.\d-]+)\/(.*)/i;
+var INTERNAL_POST_TAG_REGEX = /^(.+?)\/(@[\w.\d-]+)\/(.*)$/i;
 var INTERNAL_POST_REGEX = /^\/(@[\w.\d-]+)\/(.*)$/i;
 var CUSTOM_COMMUNITY_REGEX = /^https?:\/\/(.*)\/c\/(hive-\d+)(.*)/i;
 var YOUTUBE_REGEX = /(?:youtube\.com\/(?:[^\/]+\/.+\/|(?:v|e(?:mbed)?)\/|shorts\/|.*[?&]v=)|youtu\.be\/)([^"&?\/\s]{11})/i;
@@ -327,6 +327,81 @@ function createDoc(html) {
 function makeEntryCacheKey(entry) {
   return `${entry.author}-${entry.permlink}-${entry.last_update}-${entry.updated}`;
 }
+function stripHtmlTags(s) {
+  const n = s.length;
+  let out = "";
+  let i = 0;
+  while (i < n) {
+    const lt = s.indexOf("<", i);
+    if (lt < 0) {
+      out += s.slice(i);
+      break;
+    }
+    out += s.slice(i, lt);
+    const gt = s.indexOf(">", lt + 1);
+    if (gt < 0) {
+      out += s.slice(lt);
+      break;
+    }
+    if (gt === lt + 1) {
+      out += s.slice(lt, gt + 1);
+      i = gt + 1;
+      continue;
+    }
+    i = gt + 1;
+  }
+  return out;
+}
+function trimTrailingSlash(s) {
+  let end = s.length;
+  while (end > 0 && s.charCodeAt(end - 1) === 47) end--;
+  return s.slice(0, end);
+}
+function stripQueryString(s) {
+  const q = s.indexOf("?");
+  return q >= 0 && q < s.length - 1 ? s.slice(0, q) : s;
+}
+function isHtmlWhitespace(c) {
+  return c === 32 || c === 9 || c === 10 || c === 13 || c === 12;
+}
+function moveBlockClosingTagOutOfParagraph(html, blockTags) {
+  const n = html.length;
+  let out = "";
+  let i = 0;
+  while (i < n) {
+    const pStart = html.indexOf("</p>", i);
+    if (pStart < 0) {
+      out += html.slice(i);
+      break;
+    }
+    if (pStart === i || html.charCodeAt(pStart - 1) !== 62) {
+      out += html.slice(i, pStart + 4);
+      i = pStart + 4;
+      continue;
+    }
+    const closingStart = html.lastIndexOf("</", pStart - 2);
+    if (closingStart < i) {
+      out += html.slice(i, pStart + 4);
+      i = pStart + 4;
+      continue;
+    }
+    const tagName = html.slice(closingStart + 2, pStart - 1).toLowerCase();
+    if (!blockTags.has(tagName)) {
+      out += html.slice(i, pStart + 4);
+      i = pStart + 4;
+      continue;
+    }
+    let k = closingStart;
+    while (k > i && isHtmlWhitespace(html.charCodeAt(k - 1))) k--;
+    if (k - 4 >= i && html.slice(k - 4, k).toLowerCase() === "<br>") {
+      k -= 4;
+      while (k > i && isHtmlWhitespace(html.charCodeAt(k - 1))) k--;
+    }
+    out += html.slice(i, k) + "</p>" + html.slice(closingStart, pStart);
+    i = pStart + 4;
+  }
+  return out;
+}
 function extractYtStartTime(url) {
   try {
     const urlObj = new URL(url);
@@ -413,7 +488,7 @@ function sanitizeHtml(html) {
     }
   });
 }
-var proxyBase = "https://images.ecency.com";
+var proxyBase = "https://i.ecency.com";
 var urlHashCache = new lruCache.LRUCache({ max: 500 });
 function getUrlHash(url) {
   const cached = urlHashCache.get(url);
@@ -456,6 +531,9 @@ function proxifyImageSrc(url, width = 0, height = 0, _format = "match") {
   if (url.indexOf("https://steemitimages.com/") === 0 && url.indexOf("https://steemitimages.com/D") !== 0) {
     return url.replace("https://steemitimages.com", proxyBase);
   }
+  if (url.indexOf("https://images.ecency.com/") === 0) {
+    return url.replace("https://images.ecency.com", proxyBase);
+  }
   const realUrl = getLatestUrl(url);
   const pHash = extractPHash(realUrl);
   const options = {
@@ -525,7 +603,7 @@ function img(el, state) {
   }
   const cls = el.getAttribute("class") || "";
   const shouldReplace = !cls.includes("no-replace");
-  const base = getProxyBase().replace(/\/+$/, "");
+  const base = trimTrailingSlash(getProxyBase());
   const hasAlreadyProxied = src.startsWith(`${base}/p/`) || src.startsWith(`${base}/u/`) || new RegExp(`^${base.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}/\\d+x\\d+/`).test(src);
   if (shouldReplace && !hasAlreadyProxied) {
     const proxified = proxifyImageSrc(decodedSrc);
@@ -550,7 +628,7 @@ function img(el, state) {
 function createImageHTML(src, isLCP) {
   const proxified = proxifyImageSrc(src);
   if (!proxified) return "";
-  const base = getProxyBase().replace(/\/+$/, "");
+  const base = trimTrailingSlash(getProxyBase());
   const isAlreadyProxied = src.startsWith(`${base}/u/`) || new RegExp(`^${base.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}/\\d+x\\d+/`).test(src);
   const srcset = isAlreadyProxied ? "" : buildSrcSet(src);
   const loading = isLCP ? "eager" : "lazy";
@@ -584,7 +662,8 @@ var matchesHref = (href, value) => {
   return normalizeValue(value) === normalizedHref;
 };
 var normalizeDisplayText = (text2) => {
-  return text2.trim().replace(/^https?:\/\/(www\.)?(ecency\.com|peakd\.com|hive\.blog)/i, "").replace(/^\/+/, "").split("?")[0].replace(/#@.*$/i, "").replace(/\/+$/, "").toLowerCase();
+  const beforeTrailingSlash = text2.trim().replace(/^https?:\/\/(www\.)?(ecency\.com|peakd\.com|hive\.blog)/i, "").replace(/^\/+/, "").split("?")[0].replace(/#@.*$/i, "");
+  return trimTrailingSlash(beforeTrailingSlash).toLowerCase();
 };
 var getInlineMeta = (el, href, author, permlink, communityTag) => {
   const textMatches = matchesHref(href, el.textContent);
@@ -1153,8 +1232,8 @@ function a(el, forApp, parentDomain = "ecency.com", seoContext, renderOptions) {
     TWITTER_REGEX.lastIndex = 0;
     const e = TWITTER_REGEX.exec(href);
     if (e) {
-      const url = e[0].replace(/(<([^>]+)>)/gi, "");
-      const author = e[1].replace(/(<([^>]+)>)/gi, "");
+      const url = stripHtmlTags(e[0]);
+      const author = stripHtmlTags(e[1]);
       const blockquote = el.ownerDocument.createElement("blockquote");
       blockquote.setAttribute("class", "twitter-tweet");
       const p2 = el.ownerDocument.createElement("p");
@@ -1230,8 +1309,7 @@ function iframe(el, parentDomain = "ecency.com", forApp = false) {
     return;
   }
   if (src.match(YOUTUBE_EMBED_REGEX)) {
-    const s = src.replace(/\?.+$/, "");
-    el.setAttribute("src", s);
+    el.setAttribute("src", stripQueryString(src));
     return;
   }
   if (src.match(BITCHUTE_REGEX)) {
@@ -1412,7 +1490,7 @@ function linkify(content, forApp, renderOptions) {
       const preceedings = (preceeding1 || "") + (preceeding2 || "");
       if (userLower.indexOf("/") === -1 && isValidUsername(user)) {
         if (!forApp) {
-          const avatarSrc = `https://images.ecency.com/u/${userLower}/avatar/small`;
+          const avatarSrc = `${getProxyBase()}/u/${userLower}/avatar/small`;
           const html = `${preceedings}<a class="er-author er-author-link" href="/@${userLower}"><img class="er-author-link-image" src="${avatarSrc}" alt="${userLower}"/><span class="er-author-link-content"><span class="er-author-link-label">Hive account</span><span>@${userLower}</span></span></a>`;
           const placeholder = `\u200C${authorPlaceholders.length}\u200C`;
           authorPlaceholders.push({ placeholder, html });
@@ -1626,16 +1704,16 @@ if (typeof window === "undefined") {
   loadLolight().catch(() => {
   });
 }
+var BLOCK_TAGS_ALTERNATION = "center|div|table|figure|section|article|aside|header|footer|nav|main";
+var BLOCK_TAGS_SET = new Set(BLOCK_TAGS_ALTERNATION.split("|"));
 function fixBlockLevelTagsInParagraphs(html) {
-  const blockTags = "center|div|table|figure|section|article|aside|header|footer|nav|main";
-  const openingPattern = new RegExp(`<p>(<(?:${blockTags})(?:\\s[^>]*)?>)<\\/p>`, "gi");
+  const openingPattern = new RegExp(`<p>(<(?:${BLOCK_TAGS_ALTERNATION})(?:\\s[^>]*)?>)<\\/p>`, "gi");
   html = html.replace(openingPattern, "$1");
-  const closingPattern = new RegExp(`<p>(<\\/(?:${blockTags})>)<\\/p>`, "gi");
+  const closingPattern = new RegExp(`<p>(<\\/(?:${BLOCK_TAGS_ALTERNATION})>)<\\/p>`, "gi");
   html = html.replace(closingPattern, "$1");
-  const startPattern = new RegExp(`<p>(<(?:${blockTags})(?:\\s[^>]*)?>)(?:<br>)?\\s*`, "gi");
+  const startPattern = new RegExp(`<p>(<(?:${BLOCK_TAGS_ALTERNATION})(?:\\s[^>]*)?>)(?:<br>)?\\s*`, "gi");
   html = html.replace(startPattern, "$1<p>");
-  const endPattern = new RegExp(`\\s*(?:<br>)?\\s*(<\\/(?:${blockTags})>)<\\/p>`, "gi");
-  html = html.replace(endPattern, "</p>$1");
+  html = moveBlockClosingTagOutOfParagraph(html, BLOCK_TAGS_SET);
   html = html.replace(/<p>\s*<\/p>/g, "");
   html = html.replace(/<p><br>\s*<\/p>/g, "");
   return html;
@@ -1974,7 +2052,7 @@ function postBodySummary(entryBody, length = 200, platform = "web") {
       text2 = text2.split(placeholder).join(entity);
     });
   }
-  text2 = text2.replace(/(<([^>]+)>)/gi, "").replace(/\r?\n|\r/g, " ").replace(/(?:https?|ftp):\/\/[\n\S]+/g, "").trim().replace(/ +(?= )/g, "");
+  text2 = stripHtmlTags(text2).replace(/\r?\n|\r/g, " ").replace(/(?:https?|ftp):\/\/[\n\S]+/g, "").trim().replace(/ {2,}/g, " ");
   if (length > 0) {
     text2 = joint(text2.split(" "), length);
   }