@ecency/render-helper 2.3.14 → 2.3.16

package/package.json

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

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,18 @@ describe('Markdown2Html', () => {
       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',

package/src/methods/a.method.ts

@@ -33,6 +33,27 @@ import { removeChildNodes } from './remove-child-nodes.method'
 import { extractYtStartTime, isValidPermlink, isValidUsername } from '../helper'
 import { createImageHTML } from "./img.method";
 
+const normalizeValue = (value?: string | null): string => (value ? value.trim() : '')
+
+const matchesHref = (href: string, value?: string | null): boolean => {
+  const normalizedHref = normalizeValue(href)
+  if (!normalizedHref) {
+    return false
+  }
+
+  return normalizeValue(value) === normalizedHref
+}
+
+const getInlineMeta = (el: HTMLElement, href: string) => {
+  const textMatches = matchesHref(href, el.textContent)
+  const titleMatches = matchesHref(href, el.getAttribute('title'))
+
+  return {
+    textMatches,
+    nonInline: textMatches || titleMatches
+  }
+}
+
 
 export function a(el: HTMLElement | null, forApp: boolean, webp: boolean): void {
   if (!el || !el.parentNode) {
@@ -107,11 +128,11 @@ export function a(el: HTMLElement | null, forApp: boolean, webp: boolean): void
 
     if (!isValidPermlink(permlink)) return;
 
-    let isInline = true;
-    if (el.textContent === href) {
+    const inlineMeta = getInlineMeta(el, href)
+    if (inlineMeta.textMatches) {
       el.textContent = `@${author}/${permlink}`
-      isInline = false;
     }
+    const isInline = !inlineMeta.nonInline
     if (forApp) {
       el.removeAttribute('href')
 
@@ -195,11 +216,11 @@ export function a(el: HTMLElement | null, forApp: boolean, webp: boolean): void
 
       if (!isValidPermlink(permlink)) return;
 
-      let isInline = true;
-      if (el.textContent === href) {
+      const inlineMeta = getInlineMeta(el, href)
+      if (inlineMeta.textMatches) {
         el.textContent = `@${author}/${permlink}`
-        isInline = false;
       }
+      const isInline = !inlineMeta.nonInline
       if (forApp) {
         el.removeAttribute('href')
 
@@ -274,12 +295,12 @@ export function a(el: HTMLElement | null, forApp: boolean, webp: boolean): void
 
       if (!isValidPermlink(permlink)) return;
 
-      let isInline = true;
+      const inlineMeta = getInlineMeta(el, href)
 
-      if (el.textContent === href) {
+      if (inlineMeta.textMatches) {
         el.textContent = `@${author}/${permlink}`
-        isInline = false;
       }
+      const isInline = !inlineMeta.nonInline
       if (forApp) {
         el.removeAttribute('href')
 
@@ -380,12 +401,12 @@ export function a(el: HTMLElement | null, forApp: boolean, webp: boolean): void
 
     if (!isValidPermlink(permlink)) return;
 
-    let isInline = true;
+    const inlineMeta = getInlineMeta(el, href)
 
-    if (el.textContent === href) {
+    if (inlineMeta.textMatches) {
       el.textContent = `@${author}/${permlink}`
-      isInline = false;
     }
+    const isInline = !inlineMeta.nonInline
     if (forApp) {
       el.removeAttribute('href')
 
@@ -669,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;
   }