@ecency/render-helper 2.2.15 → 2.2.18

package/lib/types/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/lib/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAAiC;AACjC,6DAA0C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,oDAAiC;AACjC,6DAA0C"}

package/package.json

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

package/src/consts/index.ts

@@ -1,4 +1,5 @@
 export * from './white-list.const'
+export * from './section-list.const'
 export * from './regexes.const'
 export * from './allowed-attributes.const'
 export * from './dom-parser.const'

package/src/consts/regexes.const.ts

@@ -8,7 +8,7 @@ export const MENTION_REGEX = /^https?:\/\/(.*)\/(@[\w.\d-]+)$/i
 export const TOPIC_REGEX = /^https?:\/\/(.*)\/(trending|hot|created|promoted|muted|payout)\/(.*)$/i
 export const INTERNAL_MENTION_REGEX = /^\/@[\w.\d-]+$/i
 export const INTERNAL_TOPIC_REGEX = /^\/(trending|hot|created|promoted|muted|payout)\/(.*)$/i
-export const INTERNAL_POST_TAG_REGEX = /\/(.*)\/(@[\w.\d-]+)\/(.*)/i
+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 = /(?:youtube.com\/(?:[^\/]+\/.+\/|(?:v|e(?:mbed)?)\/|.*[?&]v=)|youtu.be\/)([^"&?\/\s]{11})/g
@@ -39,4 +39,5 @@ export const BRAND_NEW_TUBE_REGEX = /^https:\/\/brandnewtube\.com\/embed\/[a-z0-
 export const LOOM_REGEX = /^(https?:)?\/\/www.loom.com\/share\/(.*)/i
 export const LOOM_EMBED_REGEX = /^(https?:)?\/\/www.loom.com\/embed\/(.*)/i
 export const AUREAL_EMBED_REGEX = /^(https?:\/\/)?(www\.)?(?:aureal-embed)\.web\.app\/([0-9]+)/i
-export const ENTITY_REGEX = /&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-fA-F]{1,6});/ig;
+export const ENTITY_REGEX = /&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-fA-F]{1,6});/ig
+export const SECTION_REGEX = /\B(\#[\da-zA-Z-_]+\b)(?!;)/i

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

@@ -0,0 +1,15 @@
+export const SECTION_LIST = [
+  'wallet',
+  'feed',
+  'followers',
+  'following',
+  'points',
+  'communities',
+  'posts',
+  'blog',
+  'comments',
+  'replies',
+  'settings',
+  'engine',
+  'permissions'
+]

package/src/helper.ts

@@ -15,13 +15,15 @@ export function makeEntryCacheKey(entry: any): string {
 }
 
 export function extractYtStartTime(url:string):string {
-  const urlObj = new URL(url);
-  const params = new URLSearchParams(urlObj.search);
-  if(params.has('t')){
-    return '' + parseInt(params.get('t')); //parsing is important as sometimes t is famated '123s';
-  }else if (params.has('start')){
-    return params.get('start');
+  try {
+    const urlObj = new URL(url);
+    const params = new URLSearchParams(urlObj.search);
+    if(params.has('t')){
+      return '' + parseInt(params.get('t')); //parsing is important as sometimes t is famated '123s';
+    }else if (params.has('start')){
+      return params.get('start');
+    } 
+  } catch (error) {
+    return '';
   }
-
-  return '';
 }

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

@@ -644,7 +644,7 @@ describe('Markdown2Html', () => {
       expect(markdown2Html(input)).toBe(expected)
     })
 
-    it('43- Should handle dtube iframe', () => {
+    it('43 - Should handle dtube iframe', () => {
       const input = {
         author: 'foo343',
         permlink: 'bar343',
@@ -656,7 +656,7 @@ describe('Markdown2Html', () => {
       expect(markdown2Html(input)).toBe(expected)
     })
 
-    it('44- Should handle vimm iframe', () => {
+    it('44 - Should handle vimm iframe', () => {
       const input = {
         author: 'foo344',
         permlink: 'bar344',
@@ -680,7 +680,7 @@ describe('Markdown2Html', () => {
       expect(markdown2Html(input)).toBe(expected)
     })
 
-    it('46- Should handle copied md links', () => {
+    it('46 - Should handle copied md links', () => {
       const input = {
         author: 'foo346',
         permlink: 'bar346',
@@ -692,7 +692,7 @@ describe('Markdown2Html', () => {
       expect(markdown2Html(input)).toBe(expected)
     })
 
-    it('47- Should handle internal links', () => {
+    it('47 - Should handle internal links', () => {
       const input = {
         author: 'foo347',
         permlink: 'bar347',
@@ -902,10 +902,10 @@ describe('Markdown2Html', () => {
       expect(markdown2Html(input, false)).toBe(expected)
     })
 
-    it('65- Should handle youtube.com/embed videos', () => {
+    it('65 - Should handle youtube.com/embed videos', () => {
       const input = {
-        author: 'foo329',
-        permlink: 'bar329',
+        author: 'foo365',
+        permlink: 'bar365',
         last_update: '2019-05-10T09:15:21',
         body: 'https://www.youtube.com/embed/UuyS7YAkECA?start=295&autoplay=1'
       }
@@ -913,6 +913,42 @@ describe('Markdown2Html', () => {
 
       expect(markdown2Html(input)).toBe(expected)
     })
+
+    it('66 - Should handle internal links with params', () => {
+      const input = {
+        author: 'foo366',
+        permlink: 'bar366',
+        last_update: '2019-05-10T09:15:21',
+        body: 'direct link https://ecency.com/@ecency/faq?history'
+      }
+      const expected = '<p>direct link <a class=\"markdown-post-link\" data-tag=\"post\" data-author=\"ecency\" data-permlink=\"faq?history\">@ecency/faq?history</a></p>'
+
+      expect(markdown2Html(input)).toBe(expected)
+    })
+
+    it('67 - Should handle section links with params', () => {
+      const input = {
+        author: 'foo367',
+        permlink: 'bar367',
+        last_update: '2019-05-10T09:15:21',
+        body: 'direct link https://ecency.com/@ecency/posts?q=games'
+      }
+      const expected = '<p>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)
+    })
+
+    it('68 - Should handle section links', () => {
+      const input = {
+        author: 'foo368',
+        permlink: 'bar368',
+        last_update: '2019-05-10T09:15:21',
+        body: 'this is link [What is HIVE](#WhatHive) and locatino ## 1 <a data-id="WhatHive"></a>What is HIVE?'
+      }
+      const expected = '<p>this is link <a href=\"#WhatHive\" class=\"markdown-internal-link\">What is HIVE</a> and locatino ## 1 <a data-id=\"WhatHive\"></a>What is HIVE?</p>'
+
+      expect(markdown2Html(input, false)).toBe(expected)
+    })
   })
 
   describe("Rumble support", () => {

package/src/methods/a.method.ts

@@ -23,7 +23,9 @@ import {
   RUMBLE_REGEX,
   BRIGHTEON_REGEX,
   DOMParser,
-  LOOM_REGEX
+  LOOM_REGEX,
+  SECTION_REGEX,
+  SECTION_LIST
 } from '../consts'
 import { getSerializedInnerHTML } from './get-inner-html.method'
 import { proxifyImageSrc } from '../proxify-image-src'
@@ -139,9 +141,10 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
   // If a tagged post and profile section links
   const tpostMatch = href.match(INTERNAL_POST_TAG_REGEX)
   if (
-    (tpostMatch && WHITE_LIST.includes(tpostMatch[1].substring(1))) || (tpostMatch && tpostMatch.length === 4 && tpostMatch[1].indexOf('/') !== 0)
+    (tpostMatch && tpostMatch.length === 4 && WHITE_LIST.some(v => tpostMatch[1].includes(v))) || (tpostMatch && tpostMatch.length === 4 && tpostMatch[1].indexOf('/') == 0)
   ) {
-    if (['wallet', 'feed', 'followers', 'following', 'points', 'communities', 'posts', 'blog', 'comments', 'replies', 'settings', 'engine'].includes(tpostMatch[3])) {
+    // check if permlink is section or section with params ?q=xyz
+    if (SECTION_LIST.some(v => tpostMatch[3].includes(v))) {
       el.setAttribute('class', 'markdown-profile-link')
       const author = tpostMatch[2].replace('@', '').toLowerCase()
       const section = tpostMatch[3]
@@ -158,13 +161,18 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
       }
       return
     } else {
-      el.setAttribute('class', 'markdown-post-link')
-
+      // check if domain is not whitelist and does contain dot (not tag e.g. `/ecency`)
+      if (tpostMatch[1] && tpostMatch[1].includes('.') && !WHITE_LIST.some(v => tpostMatch[1].includes(v))) {
+        return
+      }
       let tag = 'post'
-      if (!WHITE_LIST.includes(tpostMatch[1].substring(1))) {
+      // check if tag does exist and doesn't include dot likely word/tag
+      if (tpostMatch[1] && !tpostMatch[1].includes('.')) {
         [, tag] = tpostMatch
+        tag = tag.replace('/', '')
       }
 
+      el.setAttribute('class', 'markdown-post-link')
       const author = tpostMatch[2].replace('@', '')
       const permlink = tpostMatch[3]
       if (el.textContent === href) {
@@ -210,7 +218,7 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
   if (
     (cpostMatch && cpostMatch.length === 3 && cpostMatch[1].indexOf('@') === 0)
   ) {
-    if (['wallet', 'feed', 'followers', 'following', 'points', 'communities', 'posts', 'blog', 'comments', 'replies', 'settings', 'engine'].includes(cpostMatch[2])) {
+    if (SECTION_LIST.some(v => cpostMatch[2].includes(v))) {
       el.setAttribute('class', 'markdown-profile-link')
       const author = cpostMatch[1].replace('@', '').toLowerCase()
       const section = cpostMatch[2]
@@ -699,12 +707,12 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
     }
     el.removeAttribute('href')
   } else {
-    const externalRegex =/(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;
-    if(externalRegex.test(href)) {
+    const matchS = href.match(SECTION_REGEX)
+    if(matchS) {
+      el.setAttribute('class', 'markdown-internal-link');
+    } else {
       el.setAttribute('target', '_blank');
       el.setAttribute('rel', 'noopener');
-    } else {
-      el.setAttribute('class', 'markdown-internal-link')
     }
   }
 }

package/src/methods/linkify.method.ts

@@ -1,4 +1,4 @@
-import { IMG_REGEX } from '../consts'
+import { IMG_REGEX, SECTION_LIST } from '../consts'
 import { proxifyImageSrc } from '../proxify-image-src'
 
 export function linkify(content: string, forApp: boolean, webp: boolean): string {
@@ -34,7 +34,7 @@ export function linkify(content: string, forApp: boolean, webp: boolean): string
     /((^|\s)(\/|)@[\w.\d-]+)\/(\S+)/gi, (match, u, p1, p2, p3) => {
       const uu = u.trim().toLowerCase().replace('/@','').replace('@','');
       const perm = p3;
-      if (['wallet', 'feed', 'followers', 'following', 'points', 'communities', 'posts', 'blog', 'comments', 'replies', 'settings', 'engine'].includes(p3)) {
+      if (SECTION_LIST.some(v => p3.includes(v))) {
         const attrs = forApp ? `https://ecency.com/@${uu}/${perm}` : `href="/@${uu}/${perm}"`
         return ` <a class="markdown-profile-link" ${attrs}>@${uu}/${perm}</a>`
       } else {