@ecency/render-helper 2.2.4 → 2.2.5

package/package.json

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

package/src/consts/allowed-attributes.const.ts

@@ -15,7 +15,8 @@ export const ALLOWED_ATTRIBUTES: XSSWhiteList = {
     'data-video-href',
     'data-proposal',
     'class',
-    'title'
+    'title',
+    'data-id'
   ],
   'img': ['src', 'alt', 'class'],
   'span': ['class'],

package/src/consts/regexes.const.ts

@@ -12,7 +12,7 @@ export const INTERNAL_POST_TAG_REGEX = /\/(.*)\/(@[\w.\d-]+)\/(.*)/i
 export const INTERNAL_POST_REGEX = /^\/(@[\w.\d-]+)\/(.*)$/i
 export const CUSTOM_COMMUNITY_REGEX = /^https?:\/\/(.*)\/c\/(hive-\d+)(.*)/i
 export const YOUTUBE_REGEX = /(?:https?:\/\/)?(?:www\.)?(?:youtube\.com\/watch\?v=|youtu\.be\/)([^& \n<]+)(?:[^ \n<]+)?/g
-export const YOUTUBE_EMBED_REGEX = /^(https?:)?\/\/www.youtube.com\/embed\/.*/i
+export const YOUTUBE_EMBED_REGEX = /^(https?:)?\/\/www.youtube.com\/(embed|shorts)\/.*/i
 export const VIMEO_REGEX = /(https?:\/\/)?(www\.)?(?:vimeo)\.com.*(?:videos|video|channels|)\/([\d]+)/i
 export const VIMEO_EMBED_REGEX = /https:\/\/player\.vimeo\.com\/video\/([0-9]+)/
 export const BITCHUTE_REGEX = /^(?:https?:\/\/)?(?:www\.)?bitchute.com\/(?:video|embed)\/([a-z0-9]+)/i

package/src/consts/white-list.const.ts

@@ -22,5 +22,7 @@ export const WHITE_LIST = [
   'naturalmedicine.io',
   'bilpcoin.com',
   'stemgeeks.net',
-  'hiveblockexplorer.com'
+  'hiveblockexplorer.com',
+  'proofofbrain.blog',
+  'liketu.com',
 ]

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

@@ -428,14 +428,14 @@ describe('Markdown2Html', () => {
       expect(markdown2Html(input)).toBe(expected)
     })
 
-    it('28- Should handle peakd post links', () => {
+    it('28 - Should handle peakd post links', () => {
       const input = {
         author: 'foo3343',
         permlink: 'bar3243',
         last_update: '2019-05-10T09:15:21',
         body: 'https://peakd.com/@demo/tests'
       }
-      const expected = '<p><a class="markdown-post-link" data-tag="post" data-author="demo" data-permlink="tests">/@demo/tests</a></p>'
+      const expected = '<p><a class=\"markdown-post-link\" data-tag=\"post\" data-author=\"demo\" data-permlink=\"tests\">@demo/tests</a></p>'
 
       expect(markdown2Html(input)).toBe(expected)
     })
@@ -663,7 +663,7 @@ describe('Markdown2Html', () => {
         last_update: '2019-05-10T09:15:21',
         body: '[click here](https://peakd.com/@praetoria-cartel/wallet) direct link https://peakd.com/@praetoria-cartel/posts'
       }
-      const expected = '<p><a href="https://ecency.com/@praetoria-cartel/wallet" class="markdown-profile-link">click here</a> direct link <a href="https://ecency.com/@praetoria-cartel/posts" class="markdown-profile-link">/@praetoria-cartel/posts</a></p>'
+      const expected = '<p><a href=\"https://ecency.com/@praetoria-cartel/wallet\" class=\"markdown-profile-link\">click here</a> direct link <a href=\"https://ecency.com/@praetoria-cartel/posts\" class=\"markdown-profile-link\">@praetoria-cartel/posts</a></p>'
 
       expect(markdown2Html(input)).toBe(expected)
     })
@@ -675,12 +675,12 @@ describe('Markdown2Html', () => {
         last_update: '2019-05-10T09:15:21',
         body: 'for history refer to this fine post /@offgridlife/proofofbrain-golden-rule-do-to-others-what-you-want-them-to-do-to-you and while you are in the community'
       }
-      const expected = '<p><span>for history refer to this fine post <a class=\"markdown-post-link\" data-author=\"offgridlife\" data-tag=\"post\" data-permlink=\"proofofbrain-golden-rule-do-to-others-what-you-want-them-to-do-to-you\">/@offgridlife/proofofbrain-golden-rule-do-to-others-what-you-want-them-to-do-to-you</a> and while you are in the community</span></p>'
+      const expected = '<p><span>for history refer to this fine post <a class=\"markdown-post-link\" data-author=\"offgridlife\" data-tag=\"post\" data-permlink=\"proofofbrain-golden-rule-do-to-others-what-you-want-them-to-do-to-you\">@offgridlife/proofofbrain-golden-rule-do-to-others-what-you-want-them-to-do-to-you</a> and while you are in the community</span></p>'
 
       expect(markdown2Html(input)).toBe(expected)
     })
 
-    it('47 - Should handle Bitchute links', () => {
+    it('48 - Should handle Bitchute links', () => {
       const input = {
         author: 'foo347',
         permlink: 'bar347',
@@ -817,6 +817,54 @@ describe('Markdown2Html', () => {
 
       expect(markdown2Html(input)).toBe(expected)
     })
+
+    it('60 - Should username with permlink', () => {
+      const input = {
+        author: 'foo360',
+        permlink: 'bar360',
+        last_update: '2021-10-23T09:15:21',
+        body: 'this is link @demo/test for internal'
+      }
+      const expected = '<p><span>this is link <a class=\"markdown-post-link\" data-author=\"demo\" data-tag=\"post\" data-permlink=\"test\">@demo/test</a> for internal</span></p>'
+
+      expect(markdown2Html(input)).toBe(expected)
+    })
+
+    it('61 - Should username with permlink with slash', () => {
+      const input = {
+        author: 'foo361',
+        permlink: 'bar361',
+        last_update: '2021-10-23T09:15:21',
+        body: 'this is link /@demo/test for internal'
+      }
+      const expected = '<p><span>this is link <a class=\"markdown-post-link\" data-author=\"demo\" data-tag=\"post\" data-permlink=\"test\">@demo/test</a> for internal</span></p>'
+
+      expect(markdown2Html(input)).toBe(expected)
+    })
+
+    it('62 - Should username with permlink new line', () => {
+      const input = {
+        author: 'foo362',
+        permlink: 'bar362',
+        last_update: '2021-10-23T09:15:21',
+        body: '@demo/test for internal'
+      }
+      const expected = '<p><span> <a class=\"markdown-post-link\" data-author=\"demo\" data-tag=\"post\" data-permlink=\"test\">@demo/test</a> for internal</span></p>'
+
+      expect(markdown2Html(input)).toBe(expected)
+    })
+
+    it('63 - Should username with permlink with slash new line', () => {
+      const input = {
+        author: 'foo363',
+        permlink: 'bar363',
+        last_update: '2021-10-23T09:15:21',
+        body: '/@demo/test for internal'
+      }
+      const expected = '<p><span> <a class=\"markdown-post-link\" data-author=\"demo\" data-tag=\"post\" data-permlink=\"test\">@demo/test</a> for internal</span></p>'
+
+      expect(markdown2Html(input)).toBe(expected)
+    })
   })
 
   describe("Rumble support", () => {

package/src/methods/a.method.ts

@@ -119,16 +119,18 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
   if (mentionMatch && WHITE_LIST.includes(mentionMatch[1].replace(/www./,'')) && mentionMatch.length === 3) {
     el.setAttribute('class', 'markdown-author-link')
     const author = mentionMatch[2].replace('@', '').toLowerCase()
-    if (el.textContent === href) {
-      el.textContent = `@${author}`
-    }
-    if (forApp) {
-      el.removeAttribute('href')
-
-      el.setAttribute('data-author', author)
-    } else {
-      const h = `/@${author}`
-      el.setAttribute('href', h)
+    if (author.indexOf('/')===-1) {
+      if (el.textContent === href) {
+        el.textContent = `@${author}`
+      }
+      if (forApp) {
+        el.removeAttribute('href')
+  
+        el.setAttribute('data-author', author)
+      } else {
+        const h = `/@${author}`
+        el.setAttribute('href', h)
+      }
     }
     return
   }
@@ -144,13 +146,13 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
       const section = tpostMatch[3]
 
       if (el.textContent === href) {
-        el.textContent = `/@${author}/${section}`
+        el.textContent = `@${author}/${section}`
       }
       if (forApp) {
         const ha = `https://ecency.com/@${author}/${section}`
         el.setAttribute('href', ha)
       } else {
-        const h = `/@${author}/${section}`
+        const h = `@${author}/${section}`
         el.setAttribute('href', h)
       }
       return
@@ -165,7 +167,7 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
       const author = tpostMatch[2].replace('@', '')
       const permlink = tpostMatch[3]
       if (el.textContent === href) {
-        el.textContent = `/@${author}/${permlink}`
+        el.textContent = `@${author}/${permlink}`
       }
       if (forApp) {
         el.removeAttribute('href')
@@ -186,16 +188,18 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
   if (imentionMatch) {
     el.setAttribute('class', 'markdown-author-link')
     const author = imentionMatch[0].replace('/@', '').toLowerCase()
-    if (el.textContent === href) {
-      el.textContent = `@${author}`
-    }
-    if (forApp) {
-      el.removeAttribute('href')
+    if (author.indexOf('/')===-1) {
+      if (el.textContent === href) {
+        el.textContent = `@${author}`
+      }
+      if (forApp) {
+        el.removeAttribute('href')
 
-      el.setAttribute('data-author', author)
-    } else {
-      const h = `/@${author}`
-      el.setAttribute('href', h)
+        el.setAttribute('data-author', author)
+      } else {
+        const h = `/@${author}`
+        el.setAttribute('href', h)
+      }
     }
     return
   }
@@ -662,7 +666,12 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
     el.setAttribute('data-href', href)
     el.removeAttribute('href')
   } else {
-    el.setAttribute('target', '_blank')
-    el.setAttribute('rel', 'noopener')
+    const externalRegex =/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;
+    if(externalRegex.test(href)) {
+      el.setAttribute('target', '_blank');
+      el.setAttribute('rel', 'noopener');
+    } else {
+      el.setAttribute('class', 'markdown-internal-link')
+    }
   }
 }

package/src/methods/clean-reply.method.ts

@@ -18,6 +18,8 @@ export function cleanReply(s: string): string {
     .filter(item => item.toLowerCase().includes('read this post on travelfeed.io for the best experience') === false)
     .filter(item => item.toLowerCase().includes('posted via <a href="https://www.dporn.co/"') === false)
     .filter(item => item.toLowerCase().includes('▶️ [watch on 3speak](https://3speak') === false)
+    .filter(item => item.toLowerCase().includes('<sup><sub>Posted via [inji.com]') === false)
+    .filter(item => item.toLowerCase().includes('view this post on [Liketu]') === false)
     .join('\n') : '')
     .replace('Posted via <a href="https://d.buzz" data-link="promote-link">D.Buzz</a>', '')
     .replace('<div class="pull-right"><a href="/@hive.engage">![](https://i.imgur.com/XsrNmcl.png)</a></div>', '')

package/src/methods/linkify.method.ts

@@ -16,22 +16,26 @@ export function linkify(content: string, forApp: boolean, webp: boolean): string
 
   // User mentions
   content = content.replace(
-    /(^|[^a-zA-Z0-9_!#$%&*@＠/]|(^|[^a-zA-Z0-9_+~.-/]))[@＠]([a-z][-.a-z\d]+[a-z\d])/gi,
+    /(^|[^a-zA-Z0-9_!#$%&*@＠/]|(^|[^a-zA-Z0-9_+~.-/]))[@＠]([a-z][-.a-z\d^/]+[a-z\d])/gi,
     (match, preceeding1, preceeding2, user) => {
       const userLower = user.toLowerCase()
       const preceedings = (preceeding1 || '') + (preceeding2 || '')
-
-      const attrs = forApp ? `data-author="${userLower}"` : `href="/@${userLower}"`
-      return `${preceedings}<a class="markdown-author-link" ${attrs}>@${user}</a>`
+      if (userLower.indexOf('/')===-1) {
+        const attrs = forApp ? `data-author="${userLower}"` : `href="/@${userLower}"`
+        return `${preceedings}<a class="markdown-author-link" ${attrs}>@${user}</a>`  
+      } else {
+        return match
+      }
     }
   )
 
   // internal links
   content = content.replace(
-    /(\s\/@[\w.\d-]+)\/(\S+)/gi, (match, u, p) => {
-      const uu = u.trim().toLowerCase().replace('/@','');
-      const attrs = forApp ? `data-author="${uu}" data-tag="post" data-permlink="${p.trim()}"` : `href="/post/@${uu}/${p.trim()}"`
-      return ` <a class="markdown-post-link" ${attrs}>/@${uu}/${p.trim()}</a>`  
+    /((^|\s)(\/|)@[\w.\d-]+)\/(\S+)/gi, (match, u, p1, p2, p3) => {
+      const uu = u.trim().toLowerCase().replace('/@','').replace('@','');
+      const perm = p3;
+      const attrs = forApp ? `data-author="${uu}" data-tag="post" data-permlink="${perm}"` : `href="/post/@${uu}/${perm}"`
+      return ` <a class="markdown-post-link" ${attrs}>@${uu}/${perm}</a>`  
     }
   )