strapi-plugin-comments 2.0.0-beta.5 → 2.0.0-rc.2

package/server/controllers/utils/parsers.js

@@ -0,0 +1,19 @@
+'use strict'
+
+module.exports = {
+    flatInput(relation, query) {
+        return {
+            query: {
+              ...query,
+              $or: [{ removed: { $null: true } }, { removed: false }],
+              related: relation,
+            },
+            populate: {
+              threadOf: {
+                populate: { authorUser: true },
+              },
+            },
+          };
+    },
+  
+};

package/server/graphql/index.js

@@ -0,0 +1,26 @@
+'use strict'
+
+const getTypes = require('./types');
+const getQueries = require('./queries');
+const getMutations = require('./mutations');
+const getResolversConfig = require('./resolvers-config');
+const { getModelUid } = require('../services/utils/functions');
+
+module.exports = () => {
+	const extensionService = strapi.plugin('graphql').service('extension');
+
+	extensionService.shadowCRUD(getModelUid('comment')).disable();
+	extensionService.shadowCRUD(getModelUid('comment-report')).disable();
+
+	extensionService.use(({ nexus }) => {
+		const types = getTypes({ strapi, nexus });
+		const queries = getQueries({ strapi, nexus });
+		const mutations = getMutations({ strapi, nexus });
+		const resolversConfig = getResolversConfig({ strapi });
+
+		return {
+			types: [types, queries, mutations],
+			resolversConfig,
+		}
+	});
+}

package/server/graphql/mutations/createAbuseReport.js

@@ -0,0 +1,25 @@
+'use strict'
+
+const { getPluginService } = require('../../utils/functions');
+
+module.exports = ({ nexus }) => {
+	const { nonNull } = nexus;
+
+	return {
+		type: nonNull('Report'),
+		args: {
+			input: nonNull('CreateReport'),
+		},
+		async resolve(obj, args, ctx) {
+			const { input } = args;
+			const { state: { user } = {} } = ctx;
+			const { commentId, relation, ...body } = input;
+			try {
+				return await getPluginService('client')
+					.reportAbuse(commentId, relation, body, user);
+			} catch(e) {
+				throw new Error(e);
+			}
+		},
+	};
+}

package/server/graphql/mutations/createComment.js

@@ -0,0 +1,25 @@
+'use strict'
+
+const { getPluginService } = require('../../utils/functions');
+
+module.exports = ({ nexus }) => {
+	const { nonNull } = nexus;
+
+	return {
+		type: nonNull('CommentSingle'),
+		args: {
+			input: nonNull('CreateComment'),
+		},
+		async resolve(obj, args, ctx) {
+			const { input } = args;
+			const { state: { user } = {} } = ctx;
+			const { relation, ...body } = input;
+			try {
+				return await getPluginService('client')
+					.create(relation, body, user);
+			} catch(e) {
+				throw new Error(e);
+			}
+		},
+	};
+}

package/server/graphql/mutations/index.js

@@ -0,0 +1,21 @@
+'use strict'
+
+module.exports = (context) => {
+	const mutations = {
+		createComment: require('./createComment'),
+		updateComment: require('./updateComment'),
+		removeComment: require('./removeComment'),
+		createAbuseReport: require('./createAbuseReport'),
+	};
+
+  return context.nexus.extendType({
+    type: 'Mutation',
+		definition(t) {
+			for (const [name, configFactory] of Object.entries(mutations)) {
+				const config = configFactory(context);
+
+				t.field(name, config);
+			}
+    },
+  });
+};

package/server/graphql/mutations/removeComment.js

@@ -0,0 +1,25 @@
+'use strict'
+
+const { getPluginService } = require('../../utils/functions');
+
+module.exports = ({ nexus }) => {
+	const { nonNull } = nexus;
+
+	return {
+		type: nonNull('CommentSingle'),
+		args: {
+			input: nonNull('RemoveComment'),
+		},
+		async resolve(obj, args, ctx) {
+			const { input } = args;
+			const { state: { user } = {} } = ctx;
+			const { id, relation, author } = input;
+			try {
+				return await getPluginService('client')
+					.markAsRemoved(id, relation, author?.id, user);
+			} catch(e) {
+				throw new Error(e);
+			}
+		},
+	};
+}

package/server/graphql/mutations/updateComment.js

@@ -0,0 +1,25 @@
+'use strict'
+
+const { getPluginService } = require('../../utils/functions');
+
+module.exports = ({ nexus }) => {
+	const { nonNull } = nexus;
+
+	return {
+		type: nonNull('CommentSingle'),
+		args: {
+			input: nonNull('UpdateComment'),
+		},
+		async resolve(obj, args, ctx) {
+			const { input } = args;
+			const { state: { user } = {} } = ctx;
+			const { id, relation, ...body } = input;
+			try {
+				return await getPluginService('client')
+					.update(id, relation, body, user);
+			} catch(e) {
+				throw new Error(e);
+			}
+		},
+	};
+}

package/server/graphql/queries/findAllFlat.js

@@ -0,0 +1,29 @@
+'use strict'
+
+const contentType = require('../../../content-types/comment');
+const { flatInput } = require('../../controllers/utils/parsers');
+const { getPluginService } = require('../../utils/functions');
+
+module.exports = ({ strapi, nexus }) => {
+	const { nonNull, list, stringArg } = nexus;
+	const { service: getService } = strapi.plugin('graphql');
+	const { args } = getService('internals');
+
+	return {
+		type: nonNull(list('CommentSingle')),
+		args: {
+			relation: nonNull(stringArg()),
+			filters: getPluginService('gql').buildContentTypeFilters(contentType),
+			pagination: args.PaginationArg,
+			sort: args.SortArg,
+		},
+		async resolve(obj, args) {
+			const { relation, filters } = args;
+			return await getPluginService('common')
+				.findAllFlat(flatInput(
+					relation, 
+					getPluginService('gql').graphQLFiltersToStrapiQuery(filters, contentType)
+				), undefined);
+		},
+	};
+}

package/server/graphql/queries/findAllInHierarchy.js

@@ -0,0 +1,31 @@
+'use strict'
+
+const contentType = require('../../../content-types/comment');
+const { flatInput } = require('../../controllers/utils/parsers');
+const { getPluginService } = require('../../utils/functions');
+
+module.exports = ({ strapi, nexus }) => {
+	const { nonNull, list, stringArg } = nexus;
+	const { service: getService } = strapi.plugin('graphql');
+	const { args } = getService('internals');
+
+	return {
+		type: nonNull(list('CommentNested')),
+		args: {
+			relation: nonNull(stringArg()),
+			// filters: filtersArg,
+			sort: args.SortArg,
+		},
+		async resolve(obj, args) {
+			const { relation, filters } = args;
+			return await getPluginService('common')
+				.findAllInHierarchy({
+					...flatInput(
+						relation, 
+						getPluginService('gql').graphQLFiltersToStrapiQuery(filters, contentType)
+					),
+					dropBlockedThreads: true,
+				});
+		},
+	};
+}

package/server/graphql/queries/index.js

@@ -0,0 +1,19 @@
+'use strict'
+
+module.exports = (context) => {
+	const queries = {
+		findAllFlat: require('./findAllFlat'),
+		findAllInHierarchy: require('./findAllInHierarchy'),
+	};
+
+  return context.nexus.extendType({
+    type: 'Query',
+		definition(t) {
+			for (const [name, configFactory] of Object.entries(queries)) {
+				const config = configFactory(context);
+
+				t.field(name, config);
+			}
+    },
+  });
+};

package/server/graphql/resolvers-config.js

@@ -0,0 +1,15 @@
+'use strict'
+
+const { getPluginService } = require("../utils/functions");
+
+module.exports = () => {
+	const auth = getPluginService('common').getConfig('gql.auth', false);
+	return {
+		'Query.findAllFlat': { auth },
+		'Query.findAllInHierarchy': { auth },
+		'Mutation.createComment': { auth },
+		'Mutation.updateComment': { auth },
+		'Mutation.removeComment': { auth },
+		'Mutation.createAbuseReport': { auth },
+	};
+};

package/server/graphql/types/comment-author.js

@@ -0,0 +1,9 @@
+module.exports = ({ nexus }) => nexus.objectType({
+  name: "CommentAuthor",
+  definition(t) {
+    t.id("id")
+    t.nonNull.string("name")
+    t.string("email")
+    t.string("avatar")
+  }
+})

package/server/graphql/types/comment-nested.js

@@ -0,0 +1,15 @@
+module.exports = ({ nexus }) => nexus.objectType({
+  name: "CommentNested",
+  definition(t) {
+    t.id("id")
+    t.nonNull.string("content")
+    t.boolean("blocked")
+    t.boolean("blockedThread")
+    t.string("approvalStatus")
+    t.field("threadOf", { type: 'CommentSingle' })
+    t.list.field("children", { type: 'CommentNested' })
+    t.field("author", { type: 'CommentAuthor' })
+    t.string("createdAt")
+    t.string("updatedAt")
+  }
+})

package/server/graphql/types/comment.js

@@ -0,0 +1,15 @@
+module.exports = ({ nexus }) => nexus.objectType({
+  name: "CommentSingle",
+  definition(t) {
+    t.id("id")
+    t.nonNull.string("content")
+    t.boolean("blocked")
+    t.boolean("blockedThread")
+    t.boolean("removed")
+    t.string("approvalStatus")
+    t.field("threadOf", { type: 'CommentSingle' })
+    t.field("author", { type: 'CommentAuthor' })
+    t.string("createdAt")
+    t.string("updatedAt")
+  }
+})

package/server/graphql/types/create-comment-author.js

@@ -0,0 +1,9 @@
+module.exports = ({ nexus }) => nexus.inputObjectType({
+  name: "CreateCommentAuthor",
+  definition(t) {
+    t.nonNull.id("id")
+    t.nonNull.string("name")
+    t.string("email")
+    t.string("avatar")
+  }
+})

package/server/graphql/types/create-comment.js

@@ -0,0 +1,9 @@
+module.exports = ({ nexus }) => nexus.inputObjectType({
+  name: "CreateComment",
+  definition(t) {
+    t.nonNull.string("content")
+    t.nonNull.string("relation")
+    t.id("threadOf")
+    t.field("author", { type: 'CreateCommentAuthor' })
+  }
+})

package/server/graphql/types/create-report.js

@@ -0,0 +1,9 @@
+module.exports = ({ nexus }) => nexus.inputObjectType({
+  name: "CreateReport",
+  definition(t) {
+    t.id("commentId")
+    t.nonNull.string("relation")
+    t.nonNull.string("content")
+    t.field("reason", { type: 'ReportReason' })
+  }
+})

package/server/graphql/types/id.js

@@ -0,0 +1,24 @@
+const { isNumber, parseInt } = require('lodash');
+const { Kind } = require('graphql');
+
+module.exports = ({ nexus }) => nexus.scalarType({
+  name: "Id",
+  asNexusMethod: 'id',
+  description: 'Id as string or int',
+  parseValue(value) {
+    const parsedValue = parseInt(value);
+    if (isNumber(parsedValue)) {
+      return parsedValue;
+    }
+    return value;
+  },
+  serialize(value) {
+    return value;
+  },
+  parseLiteral(ast) {
+    if ([Kind.INT, Kind.STRING].includes(ast.kind)) {
+      return ast.value;
+    }
+    return null
+  },
+})

package/server/graphql/types/identify-comment-author.js

@@ -0,0 +1,6 @@
+module.exports = ({ nexus }) => nexus.inputObjectType({
+  name: "IdentifyCommentAuthor",
+  definition(t) {
+    t.nonNull.id("id")
+  }
+})

package/server/graphql/types/index.js

@@ -0,0 +1,16 @@
+const typesFactories = [
+	require('./id'),
+	require('./comment'),
+	require('./comment-nested'),
+	require('./comment-author'),
+	require('./create-comment'),
+	require('./create-comment-author'),
+	require('./update-comment'),
+	require('./remove-comment'),
+	require('./identify-comment-author'),
+	require('./report'),
+	require('./report-reason'),
+	require('./create-report'),
+];
+
+module.exports = context => typesFactories.map(factory => factory(context));

package/server/graphql/types/remove-comment.js

@@ -0,0 +1,8 @@
+module.exports = ({ nexus }) => nexus.inputObjectType({
+  name: "RemoveComment",
+  definition(t) {
+    t.id("id")
+    t.nonNull.string("relation")
+    t.field("author", { type: 'IdentifyCommentAuthor' })
+  }
+})

package/server/graphql/types/report-reason.js

@@ -0,0 +1,10 @@
+const { getPluginService } = require("../../utils/functions");
+
+
+module.exports = ({ nexus }) => nexus.enumType({
+  name: "ReportReason",
+  description: 'Reason of abuse report',
+  members: {
+    ...getPluginService('common').getConfig('reportReasons', {})
+  },
+})

package/server/graphql/types/report.js

@@ -0,0 +1,11 @@
+module.exports = ({ nexus }) => nexus.objectType({
+  name: "Report",
+  definition(t) {
+    t.id("id")
+    t.nonNull.string("content")
+    t.field("reason", { type: 'ReportReason' })
+    t.field("related", { type: 'CommentSingle' })
+    t.string("createdAt")
+    t.string("updatedAt")
+  }
+})

package/server/graphql/types/update-comment.js

@@ -0,0 +1,9 @@
+module.exports = ({ nexus }) => nexus.inputObjectType({
+  name: "UpdateComment",
+  definition(t) {
+    t.id("id")
+    t.nonNull.string("content")
+    t.nonNull.string("relation")
+    t.field("author", { type: 'IdentifyCommentAuthor' })
+  }
+})

package/server/register.js

@@ -1,5 +1,7 @@
 'use strict';
 
 module.exports = ({ strapi }) => {
-  // registeration phase
+  if (strapi.plugin('graphql')) {
+    require('./graphql')({ strapi });
+  }
 };

package/server/services/admin.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const { getPluginService, parseParams } = require('./../utils/functions');
-const { isEmpty, isNil } = require('lodash');
+const { isEmpty, isNil, isNumber, parseInt } = require('lodash');
 const PluginError = require('./../utils/error');
 const {
     getModelUid,
@@ -88,12 +88,13 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
             .map(_ => filterOurResolvedReports(this.getCommonService().sanitizeCommentEntity(_)))
             .map(_ => this.getCommonService().mergeRelatedEntityTo(_, relatedEntities));
 
+        const pageCount = Math.floor(total / pageSize);
         return {
             result,
             pagination: {
                 page: page,
                 pageSize: pageSize,
-                pageCount: Math.floor(total / pageSize) + 1,
+                pageCount: total % pageSize === 0 ? pageCount : pageCount + 1,
                 total,
             },
         };
@@ -116,19 +117,24 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
             }
         };
 
-        const entity = await strapi.db.query(getModelUid('comment')).findOne({ 
-            where: {
-                id,
-            },
+        const defaultPopulate = {
             populate: {
                 authorUser: true,
                 threadOf: {
                     populate: { 
+                        authorUser: true,
                         ...reportsPopulation
                     },
                 },
                 ...reportsPopulation,
             },
+        }
+
+        const entity = await strapi.db.query(getModelUid('comment')).findOne({ 
+            where: {
+                id,
+            },
+            ...defaultPopulate,
         });
 
         if (!entity){
@@ -136,7 +142,8 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
         }
 
         const [relatedUid, relatedStringId] = getRelatedGroups(entity.related);
-        const relatedId = parseInt(relatedStringId, 10);
+        const parsedRelatedId = parseInt(relatedStringId);
+        const relatedId = isNumber(parsedRelatedId) ? parsedRelatedId : relatedStringId;
         const relatedEntity = await strapi.db.query(relatedUid).findOne({ 
             where: { id: relatedId }
         }).then(_ => ({
@@ -157,21 +164,18 @@ const { APPROVAL_STATUS, REGEX } = require('./../utils/constants')
                     threadOf: levelThreadId,
                     related: entity.related,
                 },
-                populate: {
-                    ...reportsPopulation,
-                },
+                ...defaultPopulate,
                 startingFromId: levelThreadId,
                 isAdmin: true
             }, false);
-
-        const selectedEntity = this.getCommonService().sanitizeCommentEntity(entity);
+        const selectedEntity = this.getCommonService().sanitizeCommentEntity({
+            ...entity,
+            threadOf: entity.threadOf || null,
+        });
         
         return {
             entity: relatedEntity,
-            selected: {
-                ...selectedEntity,
-                threadOf: selectedEntity.threadOf ? selectedEntity.threadOf : null,
-            },
+            selected: selectedEntity,
             level: entitiesOnSameLevel,
         };
     },