@ecency/render-helper 2.2.0 → 2.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecency/render-helper",
-  "version": "2.2.0",
+  "version": "2.2.4",
   "description": "Markdown+Html Render helper",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -59,7 +59,7 @@
   "dependencies": {
     "he": "^1.2.0",
     "lolight": "^1.4.0",
-    "lru-cache": "^5.1.1",
+    "lru-cache": "^6.0.0",
     "multihashes": "0.4.13",
     "path": "^0.12.7",
     "querystring": "^0.2.0",

package/src/consts/regexes.const.ts

@@ -38,3 +38,4 @@ export const TWITCH_EMBED_REGEX = /^(https?:)?\/\/player.twitch.tv\/.*/i
 export const BRAND_NEW_TUBE_REGEX = /^https:\/\/brandnewtube\.com\/embed\/[a-z0-9]+$/i
 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

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

@@ -805,6 +805,18 @@ describe('Markdown2Html', () => {
       const expected = '<p><strong>It\'s a Secret, But is it good to have secrets?</strong><br /><a data-tag=\"hive-123046\" data-author=\"ecotrain\" data-permlink=\"ecotrain-question-of-the-week-season-5-1tie-up-post-it-s-a-secret-but-is-it-good-to-have-secrets\" class=\"markdown-post-link\">/@ecotrain/ecotrain-question-of-the-week-season-5-1tie-up-post-it-s-a-secret-but-is-it-good-to-have-secrets</a></p>'
       expect(markdown2Html(input)).toBe(expected)
     })
+
+    it('59 - Should handle Aureal iframe', () => {
+      const input = {
+        author: 'foo359',
+        permlink: 'bar359',
+        last_update: '2021-10-23T09:15:21',
+        body: 'this is link <iframe loading="lazy" src="https://aureal-embed.web.app/535939" width="100%" height="200" frameborder="0" data-rocket-lazyload="fitvidscompatible" class="lazyloaded" data-ll-status="loaded"></iframe>'
+      }
+      const expected = '<p>this is link <iframe src=\"https://aureal-embed.web.app/535939\" frameborder=\"0\" class=\"lazyloaded\"></iframe></p>'
+
+      expect(markdown2Html(input)).toBe(expected)
+    })
   })
 
   describe("Rumble support", () => {
@@ -832,7 +844,7 @@ describe('Markdown2Html', () => {
       expect(markdown2Html(input)).toBe(expected)
     })
 
-    // The following canot be done: Convert URLs to the video page like this one
+    // The following cannot be done: Convert URLs to the video page like this one
     // (https://rumble.com/vkhkzl-helping-my-girls-to-cool-down-in-the-heat.html)
     // to its corresponding embedded URL (https://rumble.com/embed/vhveub/?pub=4).
     // The relationship seems to be governed by a table.

package/src/methods/a.method.ts

@@ -138,7 +138,7 @@ export function a(el: HTMLElement, forApp: boolean, webp: boolean): void {
   if (
     (tpostMatch && WHITE_LIST.includes(tpostMatch[1].substring(1))) || (tpostMatch && tpostMatch.length === 4 && tpostMatch[1].indexOf('/') !== 0)
   ) {
-    if (['wallet', 'feed', 'followers', 'following', 'points', 'communities', 'posts', 'blog', 'comments', 'replies', 'settings'].includes(tpostMatch[3])) {
+    if (['wallet', 'feed', 'followers', 'following', 'points', 'communities', 'posts', 'blog', 'comments', 'replies', 'settings', 'engine'].includes(tpostMatch[3])) {
       el.setAttribute('class', 'markdown-profile-link')
       const author = tpostMatch[2].replace('@', '').toLowerCase()
       const section = tpostMatch[3]
@@ -205,7 +205,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'].includes(cpostMatch[2])) {
+    if (['wallet', 'feed', 'followers', 'following', 'points', 'communities', 'posts', 'blog', 'comments', 'replies', 'settings', 'engine'].includes(cpostMatch[2])) {
       el.setAttribute('class', 'markdown-profile-link')
       const author = cpostMatch[1].replace('@', '').toLowerCase()
       const section = cpostMatch[2]

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

@@ -1,22 +1,23 @@
 export function cleanReply(s: string): string {
   return (s ? s.split('\n')
-    .filter(item => item.includes('Posted using [Partiko') === false)
-    .filter(item => item.includes('Posted using [Dapplr') === false)
-    .filter(item => item.includes('Posted Using [LeoFinance') === false)
-    .filter(item => item.includes('Posted via [neoxian') === false)
-    .filter(item => item.includes('Posted with [STEMGeeks') === false)
-    .filter(item => item.includes('Posted using [Bilpcoin') === false)    
-    .filter(item => item.includes('<center><sub>[Posted Using Aeneas.Blog') === false)
-    .filter(item => item.includes('<center><sub>Posted via [proofofbrain.io') === false)
-    .filter(item => item.includes('<center>Posted on [HypnoChain') === false)
-    .filter(item => item.includes('<center><sub>Posted via [weedcash.network') === false)
-    .filter(item => item.includes('<center>Posted on [NaturalMedicine.io') === false)
-    .filter(item => item.includes('<center><sub>Posted via [MusicForLife.io') === false)
-    .filter(item => item.includes('If the truvvl embed is unsupported by your current frontend, click this link to view this story') === false)
-    .filter(item => item.includes('<center><em>Posted from Truvvl') === false)
-    .filter(item => item.includes('View this post <a href="https://travelfeed.io/') === false)
-    .filter(item => item.includes('Read this post on TravelFeed.io for the best experience') === false)
-    .filter(item => item.includes('Posted via <a href="https://www.dporn.co/"') === false)
+    .filter(item => item.toLowerCase().includes('posted using [partiko') === false)
+    .filter(item => item.toLowerCase().includes('posted using [dapplr') === false)
+    .filter(item => item.toLowerCase().includes('posted using [leofinance') === false)
+    .filter(item => item.toLowerCase().includes('posted via [neoxian') === false)
+    .filter(item => item.toLowerCase().includes('posted with [stemgeeks') === false)
+    .filter(item => item.toLowerCase().includes('posted using [bilpcoin') === false)    
+    .filter(item => item.toLowerCase().includes('<center><sub>[posted using aeneas.blog') === false)
+    .filter(item => item.toLowerCase().includes('<center><sub>posted via [proofofbrain.io') === false)
+    .filter(item => item.toLowerCase().includes('<center>posted on [hypnochain') === false)
+    .filter(item => item.toLowerCase().includes('<center><sub>posted via [weedcash.network') === false)
+    .filter(item => item.toLowerCase().includes('<center>posted on [naturalmedicine.io') === false)
+    .filter(item => item.toLowerCase().includes('<center><sub>posted via [musicforlife.io') === false)
+    .filter(item => item.toLowerCase().includes('if the truvvl embed is unsupported by your current frontend, click this link to view this story') === false)
+    .filter(item => item.toLowerCase().includes('<center><em>posted from truvvl') === false)
+    .filter(item => item.toLowerCase().includes('view this post <a href="https://travelfeed.io/') === false)
+    .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)
     .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/iframe.method.ts

@@ -1,4 +1,4 @@
-import { ARCH_REGEX, DAPPLR_REGEX, LBRY_REGEX, TRUVVL_REGEX, ODYSEE_REGEX, BITCHUTE_REGEX, RUMBLE_REGEX, BRIGHTEON_REGEX, VIMEO_EMBED_REGEX, SPEAK_EMBED_REGEX, VIMM_EMBED_REGEX, D_TUBE_EMBED_REGEX, SPOTIFY_EMBED_REGEX, SOUNDCLOUD_EMBED_REGEX, TWITCH_EMBED_REGEX, YOUTUBE_EMBED_REGEX, BRAND_NEW_TUBE_REGEX, LOOM_EMBED_REGEX } from '../consts'
+import { ARCH_REGEX, DAPPLR_REGEX, LBRY_REGEX, TRUVVL_REGEX, ODYSEE_REGEX, BITCHUTE_REGEX, RUMBLE_REGEX, BRIGHTEON_REGEX, VIMEO_EMBED_REGEX, SPEAK_EMBED_REGEX, VIMM_EMBED_REGEX, D_TUBE_EMBED_REGEX, SPOTIFY_EMBED_REGEX, SOUNDCLOUD_EMBED_REGEX, TWITCH_EMBED_REGEX, YOUTUBE_EMBED_REGEX, BRAND_NEW_TUBE_REGEX, LOOM_EMBED_REGEX, AUREAL_EMBED_REGEX } from '../consts'
 
 export function iframe(el: HTMLElement): void {
   const src = el.getAttribute('src')
@@ -145,6 +145,13 @@ export function iframe(el: HTMLElement): void {
     return;
   }
 
+  // Aureal
+  if (src.match(AUREAL_EMBED_REGEX)) {
+    el.setAttribute('src', src)
+    el.setAttribute('frameborder', '0')
+    return;
+  }
+
   const replaceNode = el.ownerDocument.createElement('div')
   replaceNode.setAttribute('class', 'unsupported-iframe')
   replaceNode.textContent = `(Unsupported ${src})`

package/src/methods/markdown-to-html.method.ts

@@ -24,6 +24,20 @@ export function markdownToHTML(input: string, forApp: boolean, webp: boolean): s
       return str
     }
   }).use(linkify)
+  md.core.ruler.enable([
+    'abbr'
+  ]);
+  md.block.ruler.enable([
+    'footnote',
+    'deflist'
+  ]);
+  md.inline.ruler.enable([
+    'footnote_inline',
+    'ins',
+    'mark',
+    'sub',
+    'sup'
+  ]);
   const XMLSerializer = new xmldom.XMLSerializer()
 
   if (!input) {

package/src/post-body-summary.ts

@@ -2,26 +2,29 @@ import he from 'he'
 import { makeEntryCacheKey } from './helper'
 import { cacheGet, cacheSet } from './cache'
 import { Entry } from './types'
+import { cleanReply } from './methods'
 
-const lolight = require('lolight')
 const { Remarkable } = require('remarkable')
+const { linkify } = require('remarkable/linkify')
 
 const joint = (arr: string[], limit = 200) => {
   let result = '';
-  for (let i = 0; i < arr.length; i++) {
-    // join array with space separator
-    if (result) {
-      result += " ";
-    }
-    // break with length reaches limit
-    if (result.length > limit) {
-      break;
-    } else {
-      // make sure last join doesn't break the limit too much
-      if ((result + arr[i]).length < limit + 10) {
-        result += arr[i];
-      } else {
+  if (arr) {
+    for (let i = 0; i < arr.length; i++) {
+      // join array with space separator
+      if (result) {
+        result += " ";
+      }
+      // break with length reaches limit
+      if (result.length > limit) {
         break;
+      } else {
+        // make sure last join doesn't break the limit too much
+        if ((result + arr[i]).length < limit + 10) {
+          result += arr[i];
+        } else {
+          break;
+        }
       }
     }
   }
@@ -32,23 +35,35 @@ function postBodySummary(entryBody: string, length?: number): string {
   if (!entryBody) {
     return ''
   }
+  entryBody = cleanReply(entryBody)
 
-  const md = new Remarkable({
+  const mdd = new Remarkable({
     html: true,
     breaks: true,
-    highlight: function (str: string) {
-      try {
-        const tokens = lolight.tok(str);
-        return tokens.map(
-          (token: string[]) => `<span class="ll-${token[0]}">${token[1]}</span>`
-        ).join('')
-      } catch (err) { console.error(err) }
+    typographer: false,
+  }).use(linkify)
+  mdd.core.ruler.enable([
+    'abbr'
+  ]);
+  mdd.block.ruler.enable([
+    'footnote',
+    'deflist'
+  ]);
+  mdd.inline.ruler.enable([
+    'footnote_inline',
+    'ins',
+    'mark',
+    'sub',
+    'sup'
+  ]);
 
-      return str
-    }
-  })
   // Convert markdown to html
-  let text = md.render(entryBody)
+  let text = '';
+  try {
+    text = mdd.render(entryBody)
+  } catch (err) {
+    console.log(err)
+  }
 
   text = text
     .replace(/(<([^>]+)>)/gi, '') // Remove html tags
@@ -62,7 +77,9 @@ function postBodySummary(entryBody: string, length?: number): string {
     text = joint(text.split(' '), length)
   }
 
-  text = he.decode(text) // decode html entities
+  if (text) {
+    text = he.decode(text) // decode html entities  
+  }
 
   return text
 }