strapi-plugin-comments 3.0.0-beta.1 → 3.0.1

package/dist/server/index.mjs

@@ -205,7 +205,7 @@ const getModelUid = (strapi2, name) => {
 const getDefaultAuthorPopulate = (strapi2) => {
   const strapiUserTypeUid = "plugin::users-permissions.user";
   const allowedTypes = ["media", "relation"];
-  const { attributes } = strapi2.contentTypes[strapiUserTypeUid] || {};
+  const { attributes } = strapi2.contentType(strapiUserTypeUid) ?? { attributes: {} };
   const relationTypes = Object.keys(attributes)?.filter(
     (key) => allowedTypes.includes(attributes[key]?.type)
   );
@@ -1038,7 +1038,7 @@ lodash.exports;
     }
     var runInContext = function runInContext2(context) {
       context = context == null ? root : _2.defaults(root.Object(), context, _2.pick(root, contextProps));
-      var Array2 = context.Array, Date2 = context.Date, Error2 = context.Error, Function2 = context.Function, Math2 = context.Math, Object2 = context.Object, RegExp2 = context.RegExp, String2 = context.String, TypeError2 = context.TypeError;
+      var Array2 = context.Array, Date = context.Date, Error2 = context.Error, Function2 = context.Function, Math2 = context.Math, Object2 = context.Object, RegExp2 = context.RegExp, String2 = context.String, TypeError2 = context.TypeError;
       var arrayProto = Array2.prototype, funcProto = Function2.prototype, objectProto = Object2.prototype;
       var coreJsData = context["__core-js_shared__"];
       var funcToString = funcProto.toString;
@@ -1063,8 +1063,8 @@ lodash.exports;
         } catch (e) {
         }
       }();
-      var ctxClearTimeout = context.clearTimeout !== root.clearTimeout && context.clearTimeout, ctxNow = Date2 && Date2.now !== root.Date.now && Date2.now, ctxSetTimeout = context.setTimeout !== root.setTimeout && context.setTimeout;
-      var nativeCeil = Math2.ceil, nativeFloor = Math2.floor, nativeGetSymbols = Object2.getOwnPropertySymbols, nativeIsBuffer = Buffer ? Buffer.isBuffer : undefined$1, nativeIsFinite = context.isFinite, nativeJoin = arrayProto.join, nativeKeys = overArg(Object2.keys, Object2), nativeMax = Math2.max, nativeMin = Math2.min, nativeNow = Date2.now, nativeParseInt = context.parseInt, nativeRandom = Math2.random, nativeReverse = arrayProto.reverse;
+      var ctxClearTimeout = context.clearTimeout !== root.clearTimeout && context.clearTimeout, ctxNow = Date && Date.now !== root.Date.now && Date.now, ctxSetTimeout = context.setTimeout !== root.setTimeout && context.setTimeout;
+      var nativeCeil = Math2.ceil, nativeFloor = Math2.floor, nativeGetSymbols = Object2.getOwnPropertySymbols, nativeIsBuffer = Buffer ? Buffer.isBuffer : undefined$1, nativeIsFinite = context.isFinite, nativeJoin = arrayProto.join, nativeKeys = overArg(Object2.keys, Object2), nativeMax = Math2.max, nativeMin = Math2.min, nativeNow = Date.now, nativeParseInt = context.parseInt, nativeRandom = Math2.random, nativeReverse = arrayProto.reverse;
       var DataView = getNative(context, "DataView"), Map2 = getNative(context, "Map"), Promise2 = getNative(context, "Promise"), Set2 = getNative(context, "Set"), WeakMap = getNative(context, "WeakMap"), nativeCreate = getNative(Object2, "create");
       var metaMap = WeakMap && new WeakMap();
       var realNames = {};
@@ -2236,7 +2236,7 @@ lodash.exports;
           return symbolToString ? symbolToString.call(value) : "";
         }
         var result2 = value + "";
-        return result2 == "0" && 1 / value == -INFINITY ? "-0" : result2;
+        return result2 == "0" && 1 / value == -Infinity ? "-0" : result2;
       }
       function baseUniq(array, iteratee2, comparator) {
         var index2 = -1, includes2 = arrayIncludes, length = array.length, isCommon = true, result2 = [], seen = result2;
@@ -2788,7 +2788,7 @@ lodash.exports;
         bitmask |= isCurry ? WRAP_PARTIAL_FLAG : WRAP_PARTIAL_RIGHT_FLAG;
         bitmask &= ~(isCurry ? WRAP_PARTIAL_RIGHT_FLAG : WRAP_PARTIAL_FLAG);
         if (!(bitmask & WRAP_CURRY_BOUND_FLAG)) {
-          bitmask &= ~(WRAP_BIND_FLAG | WRAP_BIND_KEY_FLAG);
+          bitmask &= -4;
         }
         var newData = [
           func,
@@ -2844,7 +2844,7 @@ lodash.exports;
         }
         var length = partials ? partials.length : 0;
         if (!length) {
-          bitmask &= ~(WRAP_PARTIAL_FLAG | WRAP_PARTIAL_RIGHT_FLAG);
+          bitmask &= -97;
           partials = holders = undefined$1;
         }
         ary2 = ary2 === undefined$1 ? ary2 : nativeMax(toInteger(ary2), 0);
@@ -2877,7 +2877,7 @@ lodash.exports;
         holders = newData[4];
         arity = newData[9] = newData[9] === undefined$1 ? isBindKey ? 0 : func.length : nativeMax(newData[9] - length, 0);
         if (!arity && bitmask & (WRAP_CURRY_FLAG | WRAP_CURRY_RIGHT_FLAG)) {
-          bitmask &= ~(WRAP_CURRY_FLAG | WRAP_CURRY_RIGHT_FLAG);
+          bitmask &= -25;
         }
         if (!bitmask || bitmask == WRAP_BIND_FLAG) {
           var result2 = createBind(func, bitmask, thisArg);
@@ -3443,7 +3443,7 @@ lodash.exports;
           return value;
         }
         var result2 = value + "";
-        return result2 == "0" && 1 / value == -INFINITY ? "-0" : result2;
+        return result2 == "0" && 1 / value == -Infinity ? "-0" : result2;
       }
       function toSource(func) {
         if (func != null) {
@@ -4507,7 +4507,7 @@ lodash.exports;
       }
       var isRegExp = nodeIsRegExp ? baseUnary(nodeIsRegExp) : baseIsRegExp;
       function isSafeInteger(value) {
-        return isInteger(value) && value >= -MAX_SAFE_INTEGER && value <= MAX_SAFE_INTEGER;
+        return isInteger(value) && value >= -9007199254740991 && value <= MAX_SAFE_INTEGER;
       }
       var isSet = nodeIsSet ? baseUnary(nodeIsSet) : baseIsSet;
       function isString(value) {
@@ -4548,7 +4548,7 @@ lodash.exports;
           return value === 0 ? value : 0;
         }
         value = toNumber(value);
-        if (value === INFINITY || value === -INFINITY) {
+        if (value === INFINITY || value === -Infinity) {
           var sign = value < 0 ? -1 : 1;
           return sign * MAX_INTEGER;
         }
@@ -4583,7 +4583,7 @@ lodash.exports;
         return copyObject(value, keysIn(value));
       }
       function toSafeInteger(value) {
-        return value ? baseClamp(toInteger(value), -MAX_SAFE_INTEGER, MAX_SAFE_INTEGER) : value === 0 ? value : 0;
+        return value ? baseClamp(toInteger(value), -9007199254740991, MAX_SAFE_INTEGER) : value === 0 ? value : 0;
       }
       function toString(value) {
         return value == null ? "" : baseToString(value);
@@ -5821,29 +5821,6 @@ lodash.exports;
   }).call(commonjsGlobal);
 })(lodash, lodash.exports);
 var lodashExports = lodash.exports;
-let PluginError$1 = class PluginError extends Error {
-  constructor(status, message, payload = void 0) {
-    super();
-    this.name = "Strapi:Plugin:Comments";
-    this.status = status || 500;
-    this.message = message || "Internal error";
-    this.payload = payload;
-    Object.setPrototypeOf(this, PluginError.prototype);
-  }
-  toString(e = this) {
-    return `${e.name} - ${e.message}`;
-  }
-  toJSON() {
-    if (this.payload) {
-      return {
-        ...this.payload,
-        name: this.name,
-        message: this.message
-      };
-    }
-    return this;
-  }
-};
 const flatInput = (payload) => {
   const {
     sort,
@@ -5883,7 +5860,6 @@ const flatInput = (payload) => {
       }
     };
   }
-  ({ ...filters });
   return {
     ...payload,
     filters: {
@@ -6024,6 +6000,7 @@ const getComment = (nexus) => {
     name: "CommentSingle",
     definition(t) {
       t.id("id");
+      t.string("documentId");
       t.nonNull.string("content");
       t.boolean("blocked");
       t.boolean("blockedThread");
@@ -6059,6 +6036,7 @@ const getCommentNested = (nexus) => {
     name: "CommentNested",
     definition(t) {
       t.id("id");
+      t.string("documentId");
       t.nonNull.string("content");
       t.boolean("blocked");
       t.boolean("blockedThread");
@@ -8110,8 +8088,19 @@ const typesFactories = [
   getReport
 ];
 const getTypes = (config2, nexus) => typesFactories.map((factory) => factory(nexus, config2));
+const getExtensionService = (strapi2) => strapi2.plugin("graphql").service("extension");
+const disableDefaultGQL = (strapi2) => {
+  const extensionService = getExtensionService(strapi2);
+  extensionService.shadowCRUD(getModelUid(strapi2, "comment")).disable();
+  extensionService.shadowCRUD(getModelUid(strapi2, "comment")).disableQueries();
+  extensionService.shadowCRUD(getModelUid(strapi2, "comment")).disableMutations();
+  extensionService.shadowCRUD(getModelUid(strapi2, "comment-report")).disable();
+  extensionService.shadowCRUD(getModelUid(strapi2, "comment-report")).disableQueries();
+  extensionService.shadowCRUD(getModelUid(strapi2, "comment-report")).disableMutations();
+};
 const setupGQL = async ({ strapi: strapi2 }) => {
   if (strapi2.plugin("graphql")) {
+    disableDefaultGQL(strapi2);
     const enableCollections = await getPluginService(strapi2, "common").getConfig(CONFIG_PARAMS$1.ENABLED_COLLECTIONS, []);
     if (enableCollections.length) {
       await handleConfig(strapi2);
@@ -8119,13 +8108,7 @@ const setupGQL = async ({ strapi: strapi2 }) => {
   }
 };
 const handleConfig = async (strapi2) => {
-  const extensionService = strapi2.plugin("graphql").service("extension");
-  extensionService.shadowCRUD(getModelUid(strapi2, "comment")).disable();
-  extensionService.shadowCRUD(getModelUid(strapi2, "comment")).disableQueries();
-  extensionService.shadowCRUD(getModelUid(strapi2, "comment")).disableMutations();
-  extensionService.shadowCRUD(getModelUid(strapi2, "comment-report")).disable();
-  extensionService.shadowCRUD(getModelUid(strapi2, "comment-report")).disableQueries();
-  extensionService.shadowCRUD(getModelUid(strapi2, "comment-report")).disableMutations();
+  const extensionService = getExtensionService(strapi2);
   const config2 = await getPluginService(strapi2, "common").getConfig();
   extensionService.use(({ strapi: strapi22, nexus }) => {
     const types = getTypes(config2, nexus);
@@ -8234,7 +8217,11 @@ const schemaConfig = z.object({
   [CONFIG_PARAMS.AUTHOR_BLOCKED_PROPS]: z.array(z.string()),
   gql: z.object({
     auth: z.boolean().optional()
-  }).optional()
+  }).optional(),
+  client: z.object({
+    url: z.string().nullable(),
+    contactEmail: z.string().nullable()
+  }).default({ url: null, contactEmail: null })
 });
 const config = {
   default: schemaConfig.parse(defaultPluginConfig),
@@ -8271,14 +8258,14 @@ const isRight = (e) => {
 };
 const makeLeft = (value) => ({ left: value });
 const makeRight = (value) => ({ right: value });
-class PluginError2 extends Error {
+let PluginError$1 = class PluginError extends Error {
   constructor(status, message, payload = void 0) {
     super();
     this.name = "Strapi:Plugin:Comments";
     this.status = status || 500;
     this.message = message || "Internal error";
     this.payload = payload;
-    Object.setPrototypeOf(this, PluginError2.prototype);
+    Object.setPrototypeOf(this, PluginError.prototype);
   }
   toString(e = this) {
     return `${e.name} - ${e.message}`;
@@ -8293,9 +8280,9 @@ class PluginError2 extends Error {
     }
     return this;
   }
-}
+};
 const throwError = (ctx, e) => {
-  if (e instanceof PluginError2) {
+  if (e instanceof PluginError$1) {
     return ctx.throw(e.status, JSON.stringify(e));
   }
   return e;
@@ -8382,7 +8369,7 @@ const queryPaginationSchema = z.object({ pageSize: stringToNumberValidator.defau
 const validate = (result) => {
   if (!result.success) {
     const message = result.error.issues.map((i) => `Path: ${i.path.join(".")} Code: ${i.code} Message: ${i.message}`).join("\n");
-    return makeLeft(new PluginError2(400, message));
+    return makeLeft(new PluginError$1(400, message));
   }
   return makeRight(result.data);
 };
@@ -8450,7 +8437,7 @@ const getCommentSchema = (enabledCollections) => {
     relation: getRelationValidator(enabledCollections),
     content: z.string().min(1),
     author: externalAuthorSchema.optional(),
-    threadOf: z.number().optional(),
+    threadOf: z.string().optional(),
     approvalStatus: z.nativeEnum(APPROVAL_STATUS).optional(),
     locale: z.string().optional()
   });
@@ -8463,7 +8450,7 @@ const newCommentValidator = (enabledCollections, relation, payload) => {
 };
 const updateCommentValidator = (enabledCollections, payload) => {
   return validate(
-    getCommentSchema(enabledCollections).pick({ content: true, relation: true }).merge(getStringToNumberValidator({ commentId: AVAILABLE_OPERATORS.single })).safeParse(payload)
+    getCommentSchema(enabledCollections).pick({ content: true, relation: true, author: true }).merge(getStringToNumberValidator({ commentId: AVAILABLE_OPERATORS.single })).safeParse(payload)
   );
 };
 const getRelationSchema = (enabledCollections) => z.object({
@@ -8537,16 +8524,16 @@ const findAllPerAuthorValidator = (params, payload) => {
     ...params
   }));
 };
-const getReportAbuseSchema = (enabledCollections) => {
+const getReportAbuseSchema = (config2) => {
   return z.object({
-    relation: getRelationValidator(enabledCollections),
-    commentId: z.number(),
+    relation: getRelationValidator(config2[CONFIG_PARAMS.ENABLED_COLLECTIONS]),
+    commentId: stringToNumberValidator,
     content: z.string().min(1),
-    reason: z.string().min(1)
+    reason: z.nativeEnum(config2.reportReasons)
   });
 };
-const reportAbuseValidator = (enabledCollections, payload) => {
-  return validate(getReportAbuseSchema(enabledCollections).safeParse(payload));
+const reportAbuseValidator = (config2, payload) => {
+  return validate(getReportAbuseSchema(config2).safeParse(payload));
 };
 const getRemoveCommentSchema = (enabledCollections) => {
   return z.object({
@@ -8713,7 +8700,7 @@ const dbBaseCommentSchema = z.object({
   authorName: z.string().nullable(),
   authorEmail: z.string().email().nullable(),
   authorAvatar: z.string().nullable(),
-  authorUser: z.string().optional().nullable(),
+  authorUser: z.union([z.string(), z.object({ id: z.number(), email: z.string().email() })]).optional().nullable(),
   locale: z.string().nullable()
 });
 const paginationSchema = z.object({
@@ -8803,7 +8790,7 @@ const reportSchema = z.object({
   updatedAt: z.string(),
   publishedAt: z.string().nullable(),
   locale: z.string().nullable(),
-  related: relatedSchema.nullable()
+  related: relatedSchema.nullable().optional()
 });
 const findPageSchema = z.object({
   results: z.array(reportSchema),
@@ -8838,7 +8825,7 @@ const reportResultValidator = {
   update: updateResultSchema,
   create: reportSchema
 };
-const getReportCommentRepository = lodashExports.once((strapi2) => {
+const getReportCommentRepositorySource = (strapi2) => {
   const modelUid = getModelUid(strapi2, "comment-report");
   const repository = strapi2.query(modelUid);
   return {
@@ -8862,8 +8849,9 @@ const getReportCommentRepository = lodashExports.once((strapi2) => {
       return repository.create(params).then(shouldValidateObject(isValidationEnabled, reportResultValidator.create));
     }
   };
-});
-const getCommentRepository = lodashExports.once((strapi2) => {
+};
+const getReportCommentRepository = lodashExports.once(getReportCommentRepositorySource);
+const getCommentRepositorySource = (strapi2) => {
   const modelUid = getModelUid(strapi2, "comment");
   return {
     async findMany(params) {
@@ -8894,8 +8882,9 @@ const getCommentRepository = lodashExports.once((strapi2) => {
       return strapi2.query(modelUid).create(params).then(shouldValidateObject(isValidationEnabled, commentResultValidator.create));
     }
   };
-});
-const getStoreRepository = lodashExports.once((strapi2) => {
+};
+const getCommentRepository = lodashExports.once(getCommentRepositorySource);
+const getStoreRepositorySource = (strapi2) => {
   return {
     getLocalConfig(prop, defaultValue) {
       return strapi2.config.get([PLUGIN_SELECTOR, prop].filter(Boolean).join("."), defaultValue);
@@ -8972,7 +8961,8 @@ const getStoreRepository = lodashExports.once((strapi2) => {
       return this.get();
     }
   };
-});
+};
+const getStoreRepository = lodashExports.once(getStoreRepositorySource);
 const controllers$1 = ({ strapi: strapi2 }) => ({
   getService(name) {
     return getPluginService(strapi2, name);
@@ -8984,7 +8974,6 @@ const controllers$1 = ({ strapi: strapi2 }) => ({
     const configResult = await this.getStoreRepository().get(true);
     if (isRight(configResult)) {
       const config2 = unwrapEither(configResult);
-      console.log("config.enabledCollections", config2.enabledCollections);
       const result = newCommentValidator(config2.enabledCollections, ctx.params.relation, ctx.request.body);
       if (isRight(result)) {
         return this.getService("client").create(result.right, ctx.state.user);
@@ -9037,8 +9026,9 @@ const controllers$1 = ({ strapi: strapi2 }) => ({
     if (isRight(configResult)) {
       const config2 = unwrapEither(configResult);
       const result = updateCommentValidator(config2.enabledCollections, {
-        ...ctx.query,
-        ...ctx.params
+        ...ctx.params,
+        content: ctx.request.body.content,
+        author: ctx.request.body.author
       });
       if (isRight(result)) {
         return await this.getService("client").update(
@@ -9056,7 +9046,7 @@ const controllers$1 = ({ strapi: strapi2 }) => ({
     const configResult = await this.getStoreRepository().get(true);
     if (isRight(configResult)) {
       const config2 = unwrapEither(configResult);
-      const result = reportAbuseValidator(config2.enabledCollections, {
+      const result = reportAbuseValidator(config2, {
         ...ctx.request.body,
         ...ctx.params
       });
@@ -9327,7 +9317,6 @@ const routes$1 = [
     path: "/:relation",
     handler: "client.findAllInHierarchy",
     config: {
-      auth: false,
       policies: [],
       description: "Find all comments related to configured Collection / Single Type and return them in a nested structure",
       tag: {
@@ -9342,7 +9331,6 @@ const routes$1 = [
     path: "/:relation",
     handler: "client.post",
     config: {
-      auth: false,
       policies: [],
       description: "Post a comment against configured Collection / Single Type",
       tag: {
@@ -9357,7 +9345,6 @@ const routes$1 = [
     path: "/:relation/flat",
     handler: "client.findAllFlat",
     config: {
-      auth: false,
       policies: [],
       description: "Find all comments related to configured Collection / Single Type and return them in a flat structure for further processing",
       tag: {
@@ -9372,7 +9359,6 @@ const routes$1 = [
     path: "/:relation/comment/:commentId",
     handler: "client.put",
     config: {
-      auth: false,
       policies: [],
       description: "Update comment related to configured Collection / Single Type if user is the author",
       tag: {
@@ -9387,7 +9373,6 @@ const routes$1 = [
     path: "/:relation/comment/:commentId/report-abuse",
     handler: "client.reportAbuse",
     config: {
-      auth: false,
       policies: [],
       description: "Report an abuse against comment for configured Collection / Single Type",
       tag: {
@@ -9402,7 +9387,6 @@ const routes$1 = [
     path: "/:relation/comment/:commentId",
     handler: "client.removeComment",
     config: {
-      auth: false,
       policies: [],
       description: "Remove comment related to configured Collection / Single Type if user is the author",
       tag: {
@@ -9417,7 +9401,6 @@ const routes$1 = [
     path: "/author/:authorId",
     handler: "client.findAllPerAuthor",
     config: {
-      auth: false,
       policies: [],
       description: "Find all comments created by Strapi user",
       tag: {
@@ -9432,7 +9415,6 @@ const routes$1 = [
     path: "/author/:authorId/:type",
     handler: "client.findAllPerAuthor",
     config: {
-      auth: false,
       policies: [],
       description: "Find all comments created by specified type of user",
       tag: {
@@ -9453,6 +9435,29 @@ const routes = {
     routes: adminRoutes$1
   }
 };
+class PluginError2 extends Error {
+  constructor(status, message, payload = void 0) {
+    super();
+    this.name = "Strapi:Plugin:Comments";
+    this.status = status || 500;
+    this.message = message || "Internal error";
+    this.payload = payload;
+    Object.setPrototypeOf(this, PluginError2.prototype);
+  }
+  toString(e = this) {
+    return `${e.name} - ${e.message}`;
+  }
+  toJSON() {
+    if (this.payload) {
+      return {
+        ...this.payload,
+        name: this.name,
+        message: this.message
+      };
+    }
+    return this;
+  }
+}
 const buildNestedStructure = (entities, id = null, field = "threadOf", dropBlockedThreads = false, blockNestedThreads = false) => entities.filter((entity) => {
   const entityField = lodashExports.get(entity, field);
   if (entityField === null && id === null) {
@@ -9518,14 +9523,14 @@ const buildAuthorModel = (item, blockedAuthorProps, fieldsToPopulate = []) => {
   );
   return {
     ...rest,
-    author
+    author: lodashExports.isEmpty(author) ? item.author || {} : author
   };
 };
 const resolveUserContextError = (user) => {
   if (user) {
-    throw new PluginError$1(401, "Not authenticated");
+    throw new PluginError2(401, "Not authenticated");
   } else {
-    throw new PluginError$1(403, "Not authorized");
+    throw new PluginError2(403, "Not authorized");
   }
 };
 const getAuthorName = (author) => {
@@ -9716,16 +9721,16 @@ const adminServices = ({ strapi: strapi2 }) => {
         where: { id }
       });
       if (!entity) {
-        throw new PluginError2(404, "Not found");
+        throw new PluginError$1(404, "Not found");
       }
       const { relatedId, uid } = this.getCommonService().parseRelationString(entity.related);
-      const relatedEntity = await strapi2.entityService.findOne(uid, relatedId).then((_2) => {
+      const relatedEntity = await strapi2.documents(uid).findOne({ documentId: relatedId }).then((_2) => {
         if (!_2) {
-          throw new PluginError2(404, "Relation not found");
+          throw new PluginError$1(404, "Relation not found");
         }
         return { ..._2, uid };
       });
-      const levelThreadId = entity.threadOf && typeof entity.threadOf === "object" ? entity.threadOf.id : null;
+      const levelThreadId = entity.threadOf && typeof entity.threadOf === "object" ? entity.threadOf.documentId : null;
       const entitiesOnSameLevel = await this.getCommonService().findAllInHierarchy(
         {
           query: {
@@ -9782,7 +9787,7 @@ const adminServices = ({ strapi: strapi2 }) => {
         data: { approvalStatus: APPROVAL_STATUS.APPROVED }
       });
       if (!entity) {
-        throw new PluginError2(404, "Not found");
+        throw new PluginError$1(404, "Not found");
       }
       return this.getCommonService().sanitizeCommentEntity(entity, []);
     },
@@ -9792,7 +9797,7 @@ const adminServices = ({ strapi: strapi2 }) => {
         data: { approvalStatus: APPROVAL_STATUS.REJECTED }
       });
       if (!entity) {
-        throw new PluginError2(404, "Not found");
+        throw new PluginError$1(404, "Not found");
       }
       return this.getCommonService().sanitizeCommentEntity(entity, []);
     },
@@ -9838,14 +9843,14 @@ const adminServices = ({ strapi: strapi2 }) => {
           }
         });
       }
-      throw new PluginError2(
+      throw new PluginError$1(
         400,
         "At least one of selected reports got invalid comment entity relation. Try again."
       );
     },
     async resolveAllAbuseReportsForComment(id) {
       if (!id) {
-        throw new PluginError2(
+        throw new PluginError$1(
           400,
           "There is something wrong with comment Id. Try again."
         );
@@ -9862,7 +9867,7 @@ const adminServices = ({ strapi: strapi2 }) => {
     },
     async resolveAllAbuseReportsForThread(commentId) {
       if (!commentId) {
-        throw new PluginError2(
+        throw new PluginError$1(
           400,
           "There is something wrong with comment Id. Try again."
         );
@@ -9900,7 +9905,7 @@ const adminServices = ({ strapi: strapi2 }) => {
         where: { id }
       });
       if (!entity) {
-        throw new PluginError2(404, "Not found");
+        throw new PluginError$1(404, "Not found");
       }
       return getCommentRepository(strapi2).create({
         data: {
@@ -9920,7 +9925,7 @@ const adminServices = ({ strapi: strapi2 }) => {
         data: { content }
       });
       if (!entity) {
-        throw new PluginError2(404, "Not found");
+        throw new PluginError$1(404, "Not found");
       }
       return this.getCommonService().sanitizeCommentEntity(entity, []);
     }
@@ -9934,8 +9939,8 @@ const tryCatch = async (callback, throwError2) => {
   }
 };
 const clientService = ({ strapi: strapi2 }) => {
-  const createAuthor = (isValidContent, author, user) => {
-    if (isValidContent && user) {
+  const createAuthor = (author, user) => {
+    if (user) {
       return {
         authorUser: user.id
       };
@@ -9957,7 +9962,7 @@ const clientService = ({ strapi: strapi2 }) => {
       const { uid, relatedId } = this.getCommonService().parseRelationString(relation);
       const relatedEntity = await strapi2.documents(uid).findOne({ documentId: relatedId, locale });
       if (!relatedEntity) {
-        throw new PluginError$1(
+        throw new PluginError2(
           400,
           `Relation for field "related" does not exist. Check your payload please.`
         );
@@ -9972,21 +9977,23 @@ const clientService = ({ strapi: strapi2 }) => {
         async () => {
           return threadOf ? await this.getCommonService().findOne({ id: threadOf, related: relation, locale }) : null;
         },
-        new PluginError$1(400, "Thread does not exist")
+        new PluginError2(400, "Thread does not exist")
       );
       if (isLeft(threadData)) {
         throw unwrapEither(threadData);
       }
       const linkToThread = unwrapEither(threadData);
-      this.getCommonService().isValidUserContext(user);
+      if (!author && !this.getCommonService().isValidUserContext(user)) {
+        throw resolveUserContextError(user);
+      }
       const clearContent = await this.getCommonService().checkBadWords(content);
-      const authorData = createAuthor(isApprovalFlowEnabled, author, user);
+      const authorData = createAuthor(author, user);
       const authorNotProperlyProvided = !lodashExports.isEmpty(authorData) && !(authorData.authorId || authorData.authorUser);
       if (lodashExports.isEmpty(authorData) || authorNotProperlyProvided) {
-        throw new PluginError$1(400, `Not able to recognise author of a comment. Make sure you've provided "author" property in a payload or authenticated your request properly.`);
+        throw new PluginError2(400, `Not able to recognise author of a comment. Make sure you've provided "author" property in a payload or authenticated your request properly.`);
       }
       if (isApprovalFlowEnabled && approvalStatus && approvalStatus !== APPROVAL_STATUS.PENDING) {
-        throw new PluginError$1(400, "Invalid approval status");
+        throw new PluginError2(400, "Invalid approval status");
       }
       const comment2 = await getCommentRepository(strapi2).create({
         data: {
@@ -10013,19 +10020,22 @@ const clientService = ({ strapi: strapi2 }) => {
       return sanitizedEntity;
     },
     // Update a comment
-    async update({ commentId, content }, user) {
-      const validContext = this.getCommonService().isValidUserContext(user);
-      if (!validContext) {
+    async update({ commentId, content, author, relation }, user) {
+      if (!author && !this.getCommonService().isValidUserContext(user)) {
         throw resolveUserContextError(user);
       }
+      const authorId = user?.id || author?.id;
       if (await this.getCommonService().checkBadWords(content)) {
         const blockedAuthorProps = await this.getCommonService().getConfig(CONFIG_PARAMS$1.AUTHOR_BLOCKED_PROPS, []);
-        const entity = await getCommentRepository(strapi2).update({
-          where: { id: commentId },
-          data: { content },
-          populate: { threadOf: true, authorUser: true }
-        });
-        return this.getCommonService().sanitizeCommentEntity(entity, blockedAuthorProps);
+        const existingComment = await this.getCommonService().findOne({ id: commentId, related: relation });
+        if (existingComment && existingComment.author?.id?.toString() === authorId?.toString()) {
+          const entity = await getCommentRepository(strapi2).update({
+            where: { id: commentId },
+            data: { content },
+            populate: { threadOf: true, authorUser: true }
+          });
+          return this.getCommonService().sanitizeCommentEntity(entity, blockedAuthorProps);
+        }
       }
     },
     // Report abuse in comment
@@ -10039,7 +10049,7 @@ const clientService = ({ strapi: strapi2 }) => {
           related: relation
         });
         if (reportAgainstEntity.isAdminComment) {
-          throw new PluginError$1(
+          throw new PluginError2(
             403,
             `You're not allowed to take an action on that entity. This in a admin comment.`
           );
@@ -10064,10 +10074,10 @@ const clientService = ({ strapi: strapi2 }) => {
               return response;
             }
           } else {
-            throw new PluginError$1(500, "Report cannot be created");
+            throw new PluginError2(500, "Report cannot be created");
           }
         }
-        throw new PluginError$1(
+        throw new PluginError2(
           403,
           `You're not allowed to take an action on that entity. Make sure that comment exist or you've authenticated your request properly.`
         );
@@ -10076,12 +10086,12 @@ const clientService = ({ strapi: strapi2 }) => {
       }
     },
     async markAsRemoved({ commentId, relation, authorId }, user) {
-      if (!this.getCommonService().isValidUserContext(user)) {
+      if (!authorId && !this.getCommonService().isValidUserContext(user)) {
         throw resolveUserContextError(user);
       }
       const author = user?.id || authorId;
       if (!author) {
-        throw new PluginError$1(
+        throw new PluginError2(
           403,
           `You're not allowed to take an action on that entity. Make sure that you've provided proper "authorId" or authenticated your request properly.`
         );
@@ -10110,23 +10120,88 @@ const clientService = ({ strapi: strapi2 }) => {
           const doNotPopulateAuthor = await this.getCommonService().getConfig(CONFIG_PARAMS$1.AUTHOR_BLOCKED_PROPS, []);
           return this.getCommonService().sanitizeCommentEntity(removedEntity, doNotPopulateAuthor);
         } else {
-          throw new PluginError$1(
+          throw new PluginError2(
             404,
             `Entity does not exist or you're not allowed to take an action on it`
           );
         }
       } catch (e) {
-        throw new PluginError$1(
+        throw new PluginError2(
           404,
           `Entity does not exist or you're not allowed to take an action on it`
         );
       }
     },
     async sendAbuseReportEmail(reason, content) {
+      const SUPER_ADMIN_ROLE = "strapi-super-admin";
+      const rolesToNotify = await this.getCommonService().getConfig(CONFIG_PARAMS$1.MODERATOR_ROLES, [SUPER_ADMIN_ROLE]);
+      if (rolesToNotify.length > 0) {
+        const emails = await strapi2.query("admin::user").findMany({ where: { roles: { code: rolesToNotify } } }).then((users) => users.map((user) => user.email));
+        if (emails.length > 0) {
+          const from = await strapi2.query("admin::user").findOne({ where: { roles: { code: SUPER_ADMIN_ROLE } } });
+          if (strapi2.plugin("email")) {
+            await strapi2.plugin("email").service("email").send({
+              to: emails,
+              from: from.email,
+              subject: "New abuse report on comment",
+              text: `
+                        There was a new abuse report on your app. 
+                        Reason: ${reason}
+                        Message: ${content}
+                    `
+            });
+          }
+        }
+      }
     },
     async markAsRemovedNested(commentId, status) {
+      return this.getCommonService().modifiedNestedNestedComments(
+        commentId,
+        "removed",
+        status
+      );
     },
-    async sendResponseNotification(_entry) {
+    async sendResponseNotification(entity) {
+      if (entity.threadOf) {
+        const thread = typeof entity.threadOf === "object" ? entity.threadOf : await this.getCommonService().findOne({ id: entity.threadOf });
+        let emailRecipient = thread?.author?.email;
+        if (thread.authorUser && !emailRecipient) {
+          const strapiUser = typeof thread.authorUser === "object" ? thread.authorUser : await strapi2.query("plugin::users-permissions.user").findOne({
+            where: { id: thread.authorUser }
+          });
+          emailRecipient = strapiUser?.email;
+        }
+        if (emailRecipient) {
+          const superAdmin = await strapi2.query("admin::user").findOne({
+            where: {
+              roles: { code: "strapi-super-admin" }
+            }
+          });
+          const emailSender = await this.getCommonService().getConfig("client.contactEmail", superAdmin.email);
+          const clientAppUrl = await this.getCommonService().getConfig("client.url", "our site");
+          try {
+            await strapi2.plugin("email").service("email").send({
+              to: [emailRecipient],
+              from: emailSender,
+              subject: "You've got a new response to your comment",
+              text: `Hello ${thread?.author?.name || emailRecipient}!
+                You've got a new response to your comment by ${entity?.author?.name || entity?.author?.email}.
+                
+                ------
+
+                "${entity.content}"
+
+                ------
+                
+                Visit ${clientAppUrl} and continue the discussion.
+                `
+            });
+          } catch (err) {
+            strapi2.log.error(err);
+            throw err;
+          }
+        }
+      }
     }
   };
 };
@@ -10136,7 +10211,7 @@ const commonService = ({ strapi: strapi2 }) => ({
   async getConfig(prop, defaultValue, useLocal = false) {
     const storeRepository = getStoreRepository(strapi2);
     const config2 = await storeRepository.getConfig();
-    if (prop && config2 && !useLocal) {
+    if (prop && !useLocal) {
       return lodashExports.get(config2, prop, defaultValue);
     }
     if (useLocal) {
@@ -10187,7 +10262,7 @@ const commonService = ({ strapi: strapi2 }) => ({
     const [operator, direction] = getOrderBy(sort);
     const fieldsQuery = {
       sort: { [operator]: direction },
-      select: Array.isArray(fields) ? lodashExports.uniq([...fields, defaultSelect]) : fields
+      select: Array.isArray(fields) ? lodashExports.uniq([...fields, defaultSelect].flat()) : fields
     };
     const entries = await getCommentRepository(strapi2).findMany({
       where: {
@@ -10275,7 +10350,7 @@ const commonService = ({ strapi: strapi2 }) => ({
       }
     });
     if (!entity) {
-      throw new PluginError2(400, "Comment does not exist. Check your payload please.");
+      throw new PluginError$1(400, "Comment does not exist. Check your payload please.");
     }
     const doNotPopulateAuthor = await this.getConfig(CONFIG_PARAMS.AUTHOR_BLOCKED_PROPS, []);
     const item = this.sanitizeCommentEntity(entity, doNotPopulateAuthor);
@@ -10379,7 +10454,11 @@ const commonService = ({ strapi: strapi2 }) => ({
       )
     };
   },
-  async modifiedNestedNestedComments(id, fieldName, value) {
+  // TODO: we need to add deepLimit to the function to prevent infinite loops
+  async modifiedNestedNestedComments(id, fieldName, value, deepLimit = 10) {
+    if (deepLimit === 0) {
+      return true;
+    }
     try {
       const entities = await this.findMany({ where: { threadOf: id } });
       const changedEntries = await getCommentRepository(strapi2).updateMany({
@@ -10388,7 +10467,7 @@ const commonService = ({ strapi: strapi2 }) => ({
       });
       if (entities.length === changedEntries.count && changedEntries.count > 0) {
         const nestedTransactions = await Promise.all(
-          entities.map((item) => this.modifiedNestedNestedComments(item.id, fieldName, value))
+          entities.map((item) => this.modifiedNestedNestedComments(item.id, fieldName, value, deepLimit - 1))
         );
         return nestedTransactions.length === changedEntries.count;
       }
@@ -10401,7 +10480,7 @@ const commonService = ({ strapi: strapi2 }) => ({
     const config2 = await this.getConfig(CONFIG_PARAMS.BAD_WORDS, true);
     if (config2) {
       if (content && isProfane({ testString: content })) {
-        throw new PluginError2(
+        throw new PluginError$1(
           400,
           "Bad language used! Please polite your comment...",
           {
@@ -11501,7 +11580,7 @@ lodash_min.exports;
         if (bh(n2)) return c(n2, vu) + "";
         if (bc(n2)) return vs ? vs.call(n2) : "";
         var t2 = n2 + "";
-        return "0" == t2 && 1 / n2 == -Sn ? "-0" : t2;
+        return "0" == t2 && 1 / n2 == -Infinity ? "-0" : t2;
       }
       function gu(n2, t2, r2) {
         var e2 = -1, u2 = o, i2 = n2.length, c2 = true, a2 = [], l2 = a2;
@@ -11820,7 +11899,7 @@ lodash_min.exports;
       }
       function oi(n2, t2, r2, e2, u2, i2, o2, f2, c2, a2) {
         var l2 = t2 & yn, s2 = l2 ? o2 : X, h2 = l2 ? X : o2, p3 = l2 ? i2 : X, _3 = l2 ? X : i2;
-        t2 |= l2 ? bn : wn, t2 &= ~(l2 ? wn : bn), t2 & gn || (t2 &= ~(_n | vn));
+        t2 |= l2 ? bn : wn, t2 &= ~(l2 ? wn : bn), t2 & gn || (t2 &= -4);
         var v2 = [n2, t2, u2, p3, s2, _3, h2, f2, c2, a2], g2 = r2.apply(X, v2);
         return $i(n2) && Ss(g2, v2), g2.placeholder = e2, Yi(g2, n2, t2);
       }
@@ -11844,12 +11923,12 @@ lodash_min.exports;
         var c2 = t2 & vn;
         if (!c2 && "function" != typeof n2) throw new pl(en);
         var a2 = e2 ? e2.length : 0;
-        if (a2 || (t2 &= ~(bn | wn), e2 = u2 = X), o2 = o2 === X ? o2 : Gl(kc(o2), 0), f2 = f2 === X ? f2 : kc(f2), a2 -= u2 ? u2.length : 0, t2 & wn) {
+        if (a2 || (t2 &= -97, e2 = u2 = X), o2 = o2 === X ? o2 : Gl(kc(o2), 0), f2 = f2 === X ? f2 : kc(f2), a2 -= u2 ? u2.length : 0, t2 & wn) {
           var l2 = e2, s2 = u2;
           e2 = u2 = X;
         }
         var h2 = c2 ? X : Os(n2), p3 = [n2, t2, r2, e2, u2, l2, s2, i2, o2, f2];
-        if (h2 && qi(p3, h2), n2 = p3[0], t2 = p3[1], r2 = p3[2], e2 = p3[3], u2 = p3[4], f2 = p3[9] = p3[9] === X ? c2 ? 0 : n2.length : Gl(p3[9] - a2, 0), !f2 && t2 & (yn | dn) && (t2 &= ~(yn | dn)), t2 && t2 != _n) _3 = t2 == yn || t2 == dn ? Hu(n2, t2, f2) : t2 != bn && t2 != (_n | bn) || u2.length ? Qu.apply(X, p3) : ei(n2, t2, r2, e2);
+        if (h2 && qi(p3, h2), n2 = p3[0], t2 = p3[1], r2 = p3[2], e2 = p3[3], u2 = p3[4], f2 = p3[9] = p3[9] === X ? c2 ? 0 : n2.length : Gl(p3[9] - a2, 0), !f2 && t2 & (yn | dn) && (t2 &= -25), t2 && t2 != _n) _3 = t2 == yn || t2 == dn ? Hu(n2, t2, f2) : t2 != bn && t2 != (_n | bn) || u2.length ? Qu.apply(X, p3) : ei(n2, t2, r2, e2);
         else var _3 = Zu(n2, t2, r2);
         return Yi((h2 ? ms : Ss)(_3, p3), n2, t2);
       }
@@ -12188,7 +12267,7 @@ lodash_min.exports;
       function no(n2) {
         if ("string" == typeof n2 || bc(n2)) return n2;
         var t2 = n2 + "";
-        return "0" == t2 && 1 / n2 == -Sn ? "-0" : t2;
+        return "0" == t2 && 1 / n2 == -Infinity ? "-0" : t2;
       }
       function to(n2) {
         if (null != n2) {
@@ -12752,7 +12831,7 @@ lodash_min.exports;
         return "function" == typeof r2 && r2 instanceof r2 && dl.call(r2) == jl;
       }
       function yc(n2) {
-        return ic(n2) && n2 >= -Wn && n2 <= Wn;
+        return ic(n2) && n2 >= -9007199254740991 && n2 <= Wn;
       }
       function dc(n2) {
         return "string" == typeof n2 || !bh(n2) && cc(n2) && we(n2) == rt;
@@ -12778,7 +12857,7 @@ lodash_min.exports;
       }
       function Ac(n2) {
         if (!n2) return 0 === n2 ? n2 : 0;
-        if (n2 = Ic(n2), n2 === Sn || n2 === -Sn) {
+        if (n2 = Ic(n2), n2 === Sn || n2 === -Infinity) {
           return (n2 < 0 ? -1 : 1) * Ln;
         }
         return n2 === n2 ? n2 : 0;
@@ -12806,7 +12885,7 @@ lodash_min.exports;
         return $u(n2, qc(n2));
       }
       function zc(n2) {
-        return n2 ? Mr2(kc(n2), -Wn, Wn) : 0 === n2 ? n2 : 0;
+        return n2 ? Mr2(kc(n2), -9007199254740991, Wn) : 0 === n2 ? n2 : 0;
       }
       function Ec(n2) {
         return null == n2 ? "" : vu(n2);
@@ -14719,7 +14798,6 @@ class DynamicOutputPropertyDef {
 }
 withNexusSymbol(DynamicOutputPropertyDef, NexusTypes.DynamicOutputProperty);
 const virtualScalarAttributes = ["id"];
-const customFields = ["filterBy", "filterByValue"];
 const addScalarAttribute = (builder, attributeName, attribute) => {
   const { naming, mappers } = strapi.plugin("graphql").service("utils");
   const gqlType = mappers.strapiScalarToGraphQLScalar(attribute.type);
@@ -14768,19 +14846,16 @@ const gqlService = ({ strapi: strapi2 }) => {
     }
     if (Array.isArray(queryFilters)) {
       return queryFilters.reduce((acc, filtersItem) => {
-        if (!customFields.includes(filtersItem)) {
-          acc.push(graphQLFiltersToStrapiQuery(filtersItem, contentType));
-        }
+        acc.push(graphQLFiltersToStrapiQuery(filtersItem, contentType));
         return acc;
-      });
+      }, []);
     }
     const resultMap = {};
-    const { filterBy, filterByValue, ...filters } = queryFilters;
     const { attributes } = contentType;
     const isAttribute = (attributeName) => {
       return virtualScalarAttributes.includes(attributeName) || fp.has(attributeName, attributes);
     };
-    for (const [key, value] of Object.entries(filters)) {
+    for (const [key, value] of Object.entries(queryFilters)) {
       if (isAttribute(key)) {
         const attribute = attributes[key];
         if (virtualScalarAttributes.includes(key) || isStrapiScalar(attribute)) {
@@ -14802,23 +14877,6 @@ const gqlService = ({ strapi: strapi2 }) => {
         }
       }
     }
-    if (filterBy === "DATE_CREATED") {
-      const date = new Date(filterByValue);
-      if (!filterByValue || Number.isNaN(+date)) {
-        throw new Error('Invalid date specified in "filterByValue"');
-      }
-      const start = date.setHours(0, 0, 0, 0);
-      const end = date.setHours(23, 59, 59, 999);
-      resultMap.createdAt = {
-        $between: [start, end]
-      };
-    }
-    if (filterBy === "APPROVAL_STATUS") {
-      if (!filterByValue) {
-        throw new Error('Empty "filterByValue" parameter');
-      }
-      resultMap.approvalStatus = filterByValue;
-    }
     return resultMap;
   };
   return {
@@ -14850,9 +14908,6 @@ const gqlService = ({ strapi: strapi2 }) => {
           for (const operator of rootLevelOperators()) {
             operator.add(t, filtersTypeName);
           }
-          customFields.forEach((field) => {
-            t.field(field, { type: "String" });
-          });
         }
       });
     }