added better excerpts

Author: appinteractive

.gitignore

@@ -32,6 +32,7 @@ node_modules
 .project
 .classpath
 .c9/
+.vscode
 *.launch
 .settings/
 *.sublime-workspace

package.json

@@ -95,6 +95,7 @@
     "serve-favicon": "~2.4.5",
     "shortid": "~2.2.8",
     "slug": "~0.9.1",
+    "trunc-html": "^1.1.2",
     "winston": "~3.0.0-rc1"
   },
   "devDependencies": {

server/hooks/create-excerpt.js

@@ -1,7 +1,8 @@
 /* eslint-disable */
 
 // https://github.com/yangsibai/node-html-excerpt
-const excerpt = require('html-excerpt');
+// const excerpt = require('html-excerpt');
+const trunc = require('trunc-html');
 
 module.exports = function (options = {}) { // eslint-disable-line no-unused-vars
   return function (hook) {
@@ -10,9 +11,17 @@ module.exports = function (options = {}) { // eslint-disable-line no-unused-vars
     }
     /* eslint no-use-before-define: 0 */  // --> OFF
     const content = hook.data.content
-      .replace(/\<br\>|\<\/br\>|\<\/ br\>|\<\/(strong|b|h[1-6])>/ig, "\n")
-      .replace(/(<([^>]+)>)/ig, '');
-    hook.data.contentExcerpt = excerpt.text(content, 120, '...');
+      .replace(/\<br\>|\<\/br\>|\<\/ br\>|\<br\>|\<br\\\>|\<p\>|\<\/p\>/ig, "\n")
+      .replace(/\<(strong|b|i|blockquote|pre|em|u|h[1-6])>|\<\/(strong|b|i|blockquote|pre|em|u|h[1-6])>/ig, '')
+      .replace(/\<p\>\<br\>\<\/p\>/ig, ' ')
+      .replace(/(\ )[2,]/ig, ' ')
+      .trim();
+    hook.data.contentExcerpt = trunc(content, 120, {
+      ignoreTags: ['img', 'script']
+    }).html;
+
+    hook.data.content = hook.data.content
+      .replace(/(\ )[2,]/ig, ' ')
     return Promise.resolve(hook);
   };
 };

yarn.lock

@@ -279,6 +279,14 @@ assign-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
 
+[email protected]:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/assignment/-/assignment-2.0.0.tgz#ffd17b21bf5d6b22e777b989681a815456a3dd3e"
+
+[email protected]:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/assignment/-/assignment-2.2.0.tgz#f5b5bc2d160d69986e8700cd38f567c0aabe101e"
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -2269,6 +2277,10 @@ hawk@~6.0.2:
     hoek "4.x.x"
     sntp "2.x.x"
 
+[email protected]:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-0.5.0.tgz#2c05ffaef90b68e860f3fd2b54ef580989277ee2"
+
 [email protected]:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
@@ -2456,6 +2468,13 @@ inquirer@^3.0.6:
     strip-ansi "^4.0.0"
     through "^2.3.6"
 
+[email protected]:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/insane/-/insane-2.6.1.tgz#c7dcae7b51c20346883b71078fad6ce0483c198f"
+  dependencies:
+    assignment "2.0.0"
+    he "0.5.0"
+
 interpret@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
@@ -4783,6 +4802,18 @@ triple-beam@^1.0.1:
   dependencies:
     glob "^6.0.4"
 
+trunc-html@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/trunc-html/-/trunc-html-1.1.2.tgz#1e97d51f67d470b67662b1a670e6d0ea7a8edafe"
+  dependencies:
+    assignment "2.2.0"
+    insane "2.6.1"
+    trunc-text "1.0.1"
+
+[email protected]:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/trunc-text/-/trunc-text-1.0.1.tgz#58f876d8ac59b224b79834bb478b8656e69622b5"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"