fixed excerpt and moderator hooks

Author: appinteractive

server/hooks/create-excerpt.js

@@ -21,19 +21,14 @@ module.exports = function (options = {}) { // eslint-disable-line no-unused-vars
     try {
       /* eslint no-use-before-define: 0 */  // --> OFF
       const content = sanitizeHtml(hook.data[options.field], sanitizeOptions)
-      .replace(/\<br\>|\<\/br\>|\<\/ br\>|\<br\>|\<br\\\>/ig, "\n")
-      .replace(/\<p\>\<br\>\<\/p\>/ig, ' ')
+      .replace(/\<br\s*\>|\<br\s*\/\>/ig, "\n")
       .replace(/(\ ){2,}/ig, ' ')
       .trim();
       hook.data[`${options.field}Excerpt`] = trunc(content, options.length, {
         ignoreTags: ['img', 'script', 'iframe']
       }).html;
     } catch (err) {
-      if (hook.data.teaserImg) {
-        hook.data[`${options.field}Excerpt`] = '-----';
-      } else {
-        throw new Error('Text content needed!');
-      }
+      throw new Error('Text content needed!');
     }
     hook.data[options.field] = hook.data[options.field]
       .replace(/(\ ){2,}/ig, ' ')

server/hooks/is-moderator-boolean.js

@@ -1,7 +1,7 @@
 // Check if user is moderator
 module.exports = () => hook => {
-  if(!hook.params || !hook.params.user || !['admin','moderator'].includes(hook.params.user.role)) {
+  if(!hook.params || !hook.params.user) {
     return false;
   }
-  return true;
+  return ['admin', 'moderator'].includes(hook.params.user.role);
 };

server/services/organizations/organizations.hooks.js

@@ -43,7 +43,7 @@ module.exports = {
       ),
       associateCurrentUser(),
       createSlug({ field: 'name' }),
-      createExcerpt({ field: 'description '}),
+      createExcerpt({ field: 'description' }),
       saveRemoteImages(['logo', 'coverImg'])
     ],
     update: [
@@ -56,7 +56,7 @@ module.exports = {
         restrictToOwner()
       ),
       createSlug({ field: 'name', overwrite: true }),
-      createExcerpt({ field: 'description '}),
+      createExcerpt({ field: 'description' }),
       saveRemoteImages(['logo', 'coverImg'])
     ],
     patch: [