Merge remote-tracking branch 'origin/master' into develop

Author: appinteractive

Dockerfile

@@ -18,7 +18,7 @@ ENV API_PORT=3030
 # start the application in a autohealing cluster
 # NOTE: quick fix for server issues, restart api when reaching max of 300 MB Memory Usage (happens in conjunction with 100% CPU Usage)
 # TODO: find better way of dealing with that issue
-CMD NODE_ENV=production pm2 start server/index.js -n api --attach --max-memory-restart 300M
+CMD NODE_ENV=production pm2 start server/index.js -n api --attach --max-memory-restart 1024M
 # CMD NODE_ENV=production pm2 start server/index.js -n api -i 2 --attach
 # as we have issues with pm2 currently in conjunction with nuxt, we use the standard approach here
 # CMD NODE_ENV=production node server/index.js

server/hooks/create-excerpt.js

@@ -12,7 +12,7 @@ const sanitizeOptions = {
   allowedAttributes: {
     a: ['href', 'class', 'target', 'data-*' , 'contenteditable'],
     span: ['contenteditable', 'class', 'data-*']
-  },
+  }
 };
 
 module.exports = function (options = {}) { // eslint-disable-line no-unused-vars
@@ -36,10 +36,6 @@ module.exports = function (options = {}) { // eslint-disable-line no-unused-vars
       // we do need to compare the strings to decide if we really need to trim
       const contentBefore = trunc(content, 9999999999);
       const contentTruncated = trunc(contentSanitized, options.length);
-      hook.app.debug('contentBefore');
-      hook.app.debug(contentBefore.text.length);
-      hook.app.debug('contentTruncated');
-      hook.app.debug(contentTruncated.text.length);
 
       // save meta key hasMore to indecate if there is more text then in the excerpt
       const hasMore = contentBefore.text.length > (contentTruncated.text.length + 20);
@@ -48,6 +44,7 @@ module.exports = function (options = {}) { // eslint-disable-line no-unused-vars
       // set excerpt
       setByDot(hook.data, `${options.field}Excerpt`, hasMore ? contentTruncated.html : content.replace(/(\ ){2,}/ig, ' '))
     } catch (err) {
+      hook.app.error(err);
       throw new Error(err);
     }
     // trim content

server/services/comments/comments.hooks.js

@@ -24,7 +24,7 @@ const userSchema = {
     childField: '_id',
     query: {
       $limit: 1,
-      $select: ['_id', 'name', 'slug', 'avatar', 'lastActiveAt', 'thumbnails']
+      $select: ['_id', 'name', 'slug', 'avatar', 'lastActiveAt', 'termsAndConditionsAccepted', 'thumbnails']
     }
   }
 };

server/services/contributions/contributions.hooks.js

@@ -31,7 +31,7 @@ const userSchema = {
     childField: '_id',
     query: {
       $limit: 1,
-      $select: ['_id', 'name', 'slug', 'avatar', 'lastActiveAt', 'thumbnails']
+      $select: ['_id', 'name', 'slug', 'avatar', 'lastActiveAt', 'termsAndConditionsAccepted', 'thumbnails']
     }
   }
 };

server/services/notifications/notifications.hooks.js

@@ -23,7 +23,7 @@ const commentSchema = {
       childField: '_id',
       query: {
         $limit: 1,
-        $select: ['_id', 'name', 'slug', 'avatar', 'lastActiveAt', 'thumbnails']
+        $select: ['_id', 'name', 'slug', 'avatar', 'lastActiveAt', 'termsAndConditionsAccepted', 'thumbnails']
       }
     }
   }
@@ -49,7 +49,7 @@ const userSchema = {
     childField: '_id',
     query: {
       $limit: 1,
-      $select: ['_id', 'name', 'slug', 'avatar', 'lastActiveAt', 'thumbnails']
+      $select: ['_id', 'name', 'slug', 'avatar', 'lastActiveAt', 'termsAndConditionsAccepted', 'thumbnails']
     }
   }
 };

server/services/organizations/organizations.hooks.js

@@ -37,7 +37,7 @@ const reviewerSchema = {
     childField: '_id',
     query: {
       $limit: 1,
-      $select: ['_id', 'name', 'slug', 'avatar', 'lastActiveAt', 'thumbnails']
+      $select: ['_id', 'name', 'slug', 'avatar', 'lastActiveAt', 'termsAndConditionsAccepted', 'thumbnails']
     }
   }
 };