@ecency/render-helper 2.3.15 → 2.3.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecency/render-helper",
-  "version": "2.3.15",
+  "version": "2.3.17",
   "description": "Markdown+Html Render helper",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/helper.ts

@@ -27,13 +27,29 @@ export function extractYtStartTime(url:string):string {
     return '';
   }
 }
+export function sanitizePermlink(permlink: string): string {
+  if (!permlink || typeof permlink !== 'string') {
+    return ''
+  }
+
+  const [withoutQuery] = permlink.split('?')
+  const [cleaned] = withoutQuery.split('#')
+
+  return cleaned
+}
+
 export function isValidPermlink(permlink: string): boolean {
+  const sanitized = sanitizePermlink(permlink)
+
+  if (!sanitized) {
+    return false
+  }
+
   // Should not contain image extensions, query params, or fragments
-  const isImage = /\.(jpg|jpeg|png|webp|gif|svg)$/i.test(permlink);
-  const hasSpecialChars = /[?#]/.test(permlink);
-  const isCleanFormat = /^[a-z0-9-]+$/.test(permlink); // Hive standard
+  const isImage = /\.(jpg|jpeg|png|webp|gif|svg)$/i.test(sanitized)
+  const isCleanFormat = /^[a-z0-9-]+$/.test(sanitized) // Hive standard
 
-  return isCleanFormat && !isImage && !hasSpecialChars;
+  return isCleanFormat && !isImage
 }
 
 // Reference: https://en.wikipedia.org/wiki/Domain_Name_System#Domain_name_syntax

package/src/markdown-2-html.spec.ts

@@ -424,7 +424,7 @@ describe('Markdown2Html', () => {
         last_update: '2019-05-10T09:15:21',
         body: '[![](https://img.3speakcontent.online/xrhjxocx/post.png?v2)](https://3speak.online/watch?v=wehmoen/xrhjxocx)'
       }
-      const expected = '<p dir=\"auto\"><a class="markdown-video-link markdown-video-link-speak" data-embed-src="https://3speak.online/embed?v=wehmoen/xrhjxocx"><img class="no-replace video-thumbnail" itemprop="image" src="https://images.ecency.com/p/2ufhwNgM3qHKBGVeU2TMMqPBjdB17MRuf4Q7vGrmGMtTn6yFtvW3Lt9t5v1c3so7UFhWDYh9B.png?format=match&amp;mode=fit" loading="eager" fetchpriority="high" /><span class="markdown-video-play"></span></a></p>'
+      const expected = '<p dir=\"auto\"><a class="markdown-video-link markdown-video-link-speak" data-embed-src="https://3speak.tv/embed?v=wehmoen/xrhjxocx"><img class="no-replace video-thumbnail" itemprop="image" src="https://images.ecency.com/p/2ufhwNgM3qHKBGVeU2TMMqPBjdB17MRuf4Q7vGrmGMtTn6yFtvW3Lt9t5v1c3so7UFhWDYh9B.png?format=match&amp;mode=fit" loading="eager" fetchpriority="high" /><span class="markdown-video-play"></span></a></p>'
 
       expect(markdown2Html(input)).toBe(expected)
     })
@@ -436,7 +436,7 @@ describe('Markdown2Html', () => {
         last_update: '2029-05-10T09:15:21',
         body: '[![](https://img.3speakcontent.co/blnmdkjt/post.png)](https://3speak.co/watch?v=theycallmedan/blnmdkjt) [Watch on 3Speak](https://3speak.co/watch?v=theycallmedan/blnmdkjt)'
       }
-      const expected = '<p dir=\"auto\"><a class="markdown-video-link markdown-video-link-speak" data-embed-src="https://3speak.co/embed?v=theycallmedan/blnmdkjt"><img class="no-replace video-thumbnail" itemprop="image" src="https://images.ecency.com/p/CQdwDW6BZfWWtctopKyTJuDRdBH4KXwm9ijE6sZXe5MveWF3nUu4zXXBFUau8NS.png?format=match&amp;mode=fit" loading="eager" fetchpriority="high" /><span class="markdown-video-play"></span></a> <a class="markdown-external-link" data-href="https://3speak.co/watch?v=theycallmedan/blnmdkjt">Watch on 3Speak</a></p>'
+      const expected = '<p dir=\"auto\"><a class="markdown-video-link markdown-video-link-speak" data-embed-src="https://3speak.tv/embed?v=theycallmedan/blnmdkjt"><img class="no-replace video-thumbnail" itemprop="image" src="https://images.ecency.com/p/CQdwDW6BZfWWtctopKyTJuDRdBH4KXwm9ijE6sZXe5MveWF3nUu4zXXBFUau8NS.png?format=match&amp;mode=fit" loading="eager" fetchpriority="high" /><span class="markdown-video-play"></span></a> <a class="markdown-external-link" data-href="https://3speak.co/watch?v=theycallmedan/blnmdkjt">Watch on 3Speak</a></p>'
 
       expect(markdown2Html(input)).toBe(expected)
     })
@@ -501,6 +501,30 @@ describe('Markdown2Html', () => {
       expect(markdown2Html(input)).toBe(expected)
     })
 
+    it('32c - Should handle whitelisted post links with referral parameters', () => {
+      const input = {
+        author: 'foo33437',
+        permlink: 'bar32437',
+        last_update: '2019-05-10T09:15:21',
+        body: 'Read related post: [Weekly Sacrament of Confession? | 3 Misconducts to Avoid!](https://ecency.com/hive-148441/@artgirl/weekly-sacrament-of-confession-or?referral=artgirl)'
+      }
+      const expected = '<p dir=\"auto\">Read related post: <a class=\"markdown-post-link\" data-href=\"https://ecency.com/hive-148441/@artgirl/weekly-sacrament-of-confession-or?referral=artgirl\" data-is-inline=\"true\" data-tag=\"hive-148441\" data-author=\"artgirl\" data-permlink=\"weekly-sacrament-of-confession-or\">Weekly Sacrament of Confession? | 3 Misconducts to Avoid!</a></p>'
+
+      expect(markdown2Html(input)).toBe(expected)
+    })
+
+    it('32b - Should treat titled Hive links as non-inline', () => {
+      const input = {
+        author: 'foo33436',
+        permlink: 'bar32436',
+        last_update: '2019-05-10T09:15:21',
+        body: '[Waves mobile app](https://ecency.com/hive-125125/@ecency/waves-mobile-app-update-explore "https://ecency.com/hive-125125/@ecency/waves-mobile-app-update-explore")'
+      }
+      const expected = '<p dir=\"auto\"><a title=\"https://ecency.com/hive-125125/@ecency/waves-mobile-app-update-explore\" class=\"markdown-post-link\" data-href=\"https://ecency.com/hive-125125/@ecency/waves-mobile-app-update-explore\" data-is-inline=\"false\" data-tag=\"hive-125125\" data-author=\"ecency\" data-permlink=\"waves-mobile-app-update-explore\">Waves mobile app</a></p>'
+
+      expect(markdown2Html(input)).toBe(expected)
+    })
+
     it('33- Should handle whitelisted user links', () => {
       const input = {
         author: 'foo334352',
@@ -910,7 +934,7 @@ describe('Markdown2Html', () => {
         last_update: '2019-05-10T09:15:21',
         body: 'direct link https://ecency.com/@ecency/faq?history'
       }
-      const expected = '<p dir=\"auto\">direct link <a href=\"https://ecency.com/@ecency/faq?history\" class=\"markdown-post-link\">https://ecency.com/@ecency/faq?history</a></p>'
+      const expected = '<p dir=\"auto\">direct link <a class=\"markdown-post-link\" data-href=\"https://ecency.com/@ecency/faq?history\" data-is-inline=\"false\" data-tag=\"post\" data-author=\"ecency\" data-permlink=\"faq\">@ecency/faq</a></p>'
 
       expect(markdown2Html(input)).toBe(expected)
     })
@@ -922,7 +946,7 @@ describe('Markdown2Html', () => {
         last_update: '2019-05-10T09:15:21',
         body: 'direct link https://ecency.com/@ecency/posts?q=games'
       }
-      const expected = '<p dir=\"auto\">direct link <a href=\"https://ecency.com/@ecency/posts?q=games\" class=\"markdown-profile-link\">https://ecency.com/@ecency/posts?q=games</a></p>'
+      const expected = '<p dir=\"auto\">direct link <a href=\"https://ecency.com/@ecency/posts?q=games\" class=\"markdown-profile-link\">@ecency/posts?q=games</a></p>'
 
       expect(markdown2Html(input)).toBe(expected)
     })

package/src/methods/a.method.ts

@@ -30,7 +30,7 @@ import {
 import { getSerializedInnerHTML } from './get-inner-html.method'
 import { proxifyImageSrc } from '../proxify-image-src'
 import { removeChildNodes } from './remove-child-nodes.method'
-import { extractYtStartTime, isValidPermlink, isValidUsername } from '../helper'
+import { extractYtStartTime, isValidPermlink, isValidUsername, sanitizePermlink } from '../helper'
 import { createImageHTML } from "./img.method";
 
 const normalizeValue = (value?: string | null): string => (value ? value.trim() : '')
@@ -124,7 +124,7 @@ export function a(el: HTMLElement | null, forApp: boolean, webp: boolean): void
 
     const tag = postMatch[2]
     const author = postMatch[3].replace('@', '')
-    const permlink = postMatch[4]
+    const permlink = sanitizePermlink(postMatch[4])
 
     if (!isValidPermlink(permlink)) return;
 
@@ -212,7 +212,7 @@ export function a(el: HTMLElement | null, forApp: boolean, webp: boolean): void
 
       el.setAttribute('class', 'markdown-post-link')
       const author = tpostMatch[2].replace('@', '')
-      const permlink = tpostMatch[3]
+      const permlink = sanitizePermlink(tpostMatch[3])
 
       if (!isValidPermlink(permlink)) return;
 
@@ -291,7 +291,7 @@ export function a(el: HTMLElement | null, forApp: boolean, webp: boolean): void
       const tag = 'post'
 
       const author = cpostMatch[1].replace('@', '')
-      const permlink = cpostMatch[2]
+      const permlink = sanitizePermlink(cpostMatch[2])
 
       if (!isValidPermlink(permlink)) return;
 
@@ -397,7 +397,7 @@ export function a(el: HTMLElement | null, forApp: boolean, webp: boolean): void
 
     const tag = 'ccc'
     const author = cccMatch[2].replace('@', '')
-    const permlink = cccMatch[3]
+    const permlink = sanitizePermlink(cccMatch[3])
 
     if (!isValidPermlink(permlink)) return;
 
@@ -690,9 +690,9 @@ export function a(el: HTMLElement | null, forApp: boolean, webp: boolean): void
     const imgEls = el.getElementsByTagName('img')
     if (imgEls.length === 1 || el.textContent.trim() === href) {
       const e = SPEAK_REGEX.exec(href)
-      // e[1] = tld , e[3] = embed address
-      if (e[1] && e[3]) {
-        const videoHref = `https://3speak.${e[1]}/embed?v=${e[3]}`
+      // e[1] / e[2] = tld , e[3] = embed address
+      if ((e[1] || e[2]) && e[3]) {
+        const videoHref = `https://3speak.tv/embed?v=${e[3]}`
         el.setAttribute('class', 'markdown-video-link markdown-video-link-speak')
         el.removeAttribute('href')
         el.setAttribute('data-embed-src', videoHref)

package/src/methods/iframe.method.ts

@@ -40,7 +40,11 @@ export function iframe(el: HTMLElement | null): void {
 
   // 3Speak
   if (src.match(SPEAK_EMBED_REGEX)) {
-    const s = `${src}&autoplay=true`;
+    const normalizedSrc = src.replace(/3speak\.[a-z]+/i, '3speak.tv');
+    const hasAutoplay = /[?&]autoplay=/.test(normalizedSrc);
+    const s = hasAutoplay
+      ? normalizedSrc
+      : `${normalizedSrc}${normalizedSrc.includes('?') ? '&' : '?'}autoplay=true`;
     el.setAttribute('src', s);
     return;
   }

package/src/methods/linkify.method.ts

@@ -1,6 +1,6 @@
 import { IMG_REGEX, SECTION_LIST } from '../consts'
 import { proxifyImageSrc } from '../proxify-image-src'
-import { isValidPermlink, isValidUsername } from "../helper";
+import { isValidPermlink, isValidUsername, sanitizePermlink } from "../helper";
 import { createImageHTML } from "./img.method";
 
 export function linkify(content: string, forApp: boolean, webp: boolean): string {
@@ -35,7 +35,7 @@ export function linkify(content: string, forApp: boolean, webp: boolean): string
   content = content.replace(
     /((^|\s)(\/|)@[\w.\d-]+)\/(\S+)/gi, (match, u, p1, p2, p3) => {
       const uu = u.trim().toLowerCase().replace('/@', '').replace('@', '');
-      const permlink = p3;
+      const permlink = sanitizePermlink(p3);
       if (!isValidPermlink(permlink)) return match;
 
       if (SECTION_LIST.some(v => p3.includes(v))) {

package/src/methods/text.method.ts

@@ -1,5 +1,5 @@
 import { IMG_REGEX, YOUTUBE_REGEX, WHITE_LIST, DOMParser, POST_REGEX  } from '../consts'
-import { extractYtStartTime, isValidPermlink, isValidUsername } from '../helper'
+import { extractYtStartTime, isValidPermlink, isValidUsername, sanitizePermlink } from '../helper'
 import { proxifyImageSrc } from '../proxify-image-src'
 import { linkify } from './linkify.method'
 import {createImageHTML} from "./img.method";
@@ -62,7 +62,7 @@ export function text(node: HTMLElement | null, forApp: boolean, webp: boolean):
     if (postMatch && WHITE_LIST.includes(postMatch[1].replace(/www./,''))) {
       const tag = postMatch[2]
       const author = postMatch[3].replace('@', '')
-      const permlink = postMatch[4]
+      const permlink = sanitizePermlink(postMatch[4])
 
       if (!isValidUsername(author)) return
       if (!isValidPermlink(permlink)) return