@ecency/render-helper 2.2.0 → 2.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecency/render-helper",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "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/methods/clean-reply.method.ts

@@ -17,6 +17,7 @@ export function cleanReply(s: string): string {
     .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.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/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
 }