strapi-plugin-comments 3.0.3 → 3.0.5

package/dist/server/index.js

@@ -8185,6 +8185,19 @@ const bootstrap = async ({ strapi: strapi2 }) => {
     }
   ];
   await strapi2.admin.services.permission.actionProvider.registerMany(actions);
+  const commonService2 = getPluginService(strapi2, "common");
+  const enabledCollections = await commonService2.getConfig(CONFIG_PARAMS.ENABLED_COLLECTIONS, []);
+  if (enabledCollections.length) {
+    strapi2.db.lifecycles.subscribe({
+      models: enabledCollections,
+      afterDelete: async (event) => {
+        const uid = event.model.uid;
+        const { documentId, locale } = event.result;
+        const relation = [uid, documentId].join(":");
+        await commonService2.perRemove(relation, locale);
+      }
+    });
+  }
 };
 const defaultPluginConfig = {
   isValidationEnabled: true,
@@ -8438,7 +8451,7 @@ const getCommentSchema = (enabledCollections) => {
     relation: getRelationValidator(enabledCollections),
     content: zod.z.string().min(1),
     author: externalAuthorSchema.optional(),
-    threadOf: zod.z.string().optional(),
+    threadOf: zod.z.union([zod.z.string(), zod.z.number()]).optional(),
     approvalStatus: zod.z.nativeEnum(APPROVAL_STATUS).optional(),
     locale: zod.z.string().optional()
   });
@@ -8469,7 +8482,18 @@ const getBaseFindSchema = (enabledCollections) => {
     sort: orderByValidator.optional().nullable().default("createdAt:desc"),
     fields: zod.z.string().array().optional(),
     omit: zod.z.string().array().optional(),
-    filters: getFiltersOperators({ content: true, authorName: true, createdAt: true, updatedAt: true, id: true }).optional(),
+    filters: getFiltersOperators({
+      id: true,
+      content: true,
+      authorId: true,
+      authorName: true,
+      authorEmail: true,
+      createdAt: true,
+      updatedAt: true,
+      removed: true,
+      blocked: true,
+      blockedThread: true
+    }).optional(),
     isAdmin: zod.z.boolean().optional().default(false),
     populate: zod.z.record(zod.z.union([zod.z.boolean(), zod.z.object({ populate: zod.z.boolean() })])).optional(),
     limit: stringToNumberValidator.optional(),
@@ -8539,7 +8563,7 @@ const reportAbuseValidator = (config2, payload) => {
 const getRemoveCommentSchema = (enabledCollections) => {
   return zod.z.object({
     relation: getRelationValidator(enabledCollections),
-    commentId: zod.z.number(),
+    commentId: zod.z.union([zod.z.string(), zod.z.number()]),
     authorId: zod.z.union([zod.z.string(), zod.z.number()])
   });
 };
@@ -8875,6 +8899,9 @@ const getCommentRepositorySource = (strapi2) => {
       const isValidationEnabled = await getConfig(strapi2, "isValidationEnabled", false);
       return strapi2.query(modelUid).delete(params).then((result) => result ? shouldValidateObject(isValidationEnabled, commentResultValidator.findOne)(result) : null);
     },
+    async deleteMany(params) {
+      return strapi2.query(modelUid).deleteMany(params);
+    },
     updateMany(params) {
       return strapi2.query(modelUid).updateMany(params);
     },
@@ -9565,7 +9592,11 @@ const getAdminServiceUtils = lodashExports.once((strapi2) => {
       getPopulate() {
         return {
           authorUser: getDefaultAuthorPopulate(strapi2),
-          threadOf: true,
+          threadOf: {
+            populate: {
+              authorUser: getDefaultAuthorPopulate(strapi2)
+            }
+          },
           reports: {
             where: {
               resolved: false
@@ -9742,7 +9773,8 @@ const adminServices = ({ strapi: strapi2 }) => {
           },
           ...defaultPopulate,
           startingFromId: levelThreadId,
-          isAdmin: true
+          isAdmin: true,
+          limit: Number.MAX_SAFE_INTEGER
         },
         false
       );
@@ -9976,7 +10008,7 @@ const clientService = ({ strapi: strapi2 }) => {
       );
       const threadData = await tryCatch(
         async () => {
-          return threadOf ? await this.getCommonService().findOne({ id: threadOf, related: relation, locale }) : null;
+          return threadOf ? await this.getCommonService().findOne({ id: threadOf, related: relation, locale: locale || null }) : null;
         },
         new PluginError2(400, "Thread does not exist")
       );
@@ -9999,10 +10031,11 @@ const clientService = ({ strapi: strapi2 }) => {
       const comment2 = await getCommentRepository(strapi2).create({
         data: {
           ...authorData,
+          threadOf,
+          locale,
           content: clearContent,
           related: relation,
-          approvalStatus: isApprovalFlowEnabled ? APPROVAL_STATUS.PENDING : null,
-          locale
+          approvalStatus: isApprovalFlowEnabled ? APPROVAL_STATUS.PENDING : null
         },
         populate: {
           authorUser: true
@@ -10225,7 +10258,7 @@ const commonService = ({ strapi: strapi2 }) => ({
     return { uid, relatedId: relatedStringId };
   },
   isValidUserContext(user) {
-    return !!user?.id;
+    return user ? user.id != void 0 : true;
   },
   sanitizeCommentEntity(entity, blockedAuthors, omitProps = [], populate = {}) {
     const fieldsToPopulate = Array.isArray(populate) ? populate : Object.keys(populate || {});
@@ -10265,20 +10298,17 @@ const commonService = ({ strapi: strapi2 }) => ({
       sort: { [operator]: direction },
       select: Array.isArray(fields) ? lodashExports.uniq([...fields, defaultSelect].flat()) : fields
     };
-    const entries = await getCommentRepository(strapi2).findMany({
+    const params = {
       where: {
         ...filters,
         ...locale ? { locale } : {}
       },
       populate: populateClause,
       ...fieldsQuery,
-      limit: limit || PAGE_SIZE,
-      offset: skip || 0
-    });
-    let paginationData = void 0;
-    if (pagination?.withCount) {
-      paginationData = await getCommentRepository(strapi2).findWithCount({ where: { ...filters, ...locale ? { locale } : {} } }).then((result2) => result2.pagination);
-    }
+      pageSize: pagination?.pageSize || limit || PAGE_SIZE,
+      page: pagination?.page || (skip ? Math.floor(skip / limit) : 1) || 1
+    };
+    const { results: entries, pagination: resultPaginationData } = await getCommentRepository(strapi2).findWithCount(params);
     const entriesWithThreads = await Promise.all(
       entries.map(async (_2) => {
         const { results, pagination: { total } } = await getCommentRepository(strapi2).findWithCount({
@@ -10317,7 +10347,7 @@ const commonService = ({ strapi: strapi2 }) => ({
     });
     return {
       data: hasRelatedEntitiesToMap ? result.map((_2) => this.mergeRelatedEntityTo(_2, relatedEntities)) : result,
-      pagination: paginationData
+      pagination: resultPaginationData
     };
   },
   // Find comments and create relations tree structure
@@ -10330,9 +10360,10 @@ const commonService = ({ strapi: strapi2 }) => ({
     dropBlockedThreads,
     isAdmin = false,
     omit = [],
-    locale
+    locale,
+    limit
   }, relatedEntity) {
-    const entities = await this.findAllFlat({ filters, populate, sort, fields, isAdmin, omit, locale }, relatedEntity);
+    const entities = await this.findAllFlat({ filters, populate, sort, fields, isAdmin, omit, locale, limit }, relatedEntity);
     return buildNestedStructure(
       entities?.data,
       startingFromId,
@@ -10494,6 +10525,15 @@ const commonService = ({ strapi: strapi2 }) => ({
     }
     return content;
   },
+  async perRemove(related, locale) {
+    const defaultLocale = await strapi2.plugin("i18n")?.service("locales").getDefaultLocale() || null;
+    return getCommentRepository(strapi2).deleteMany({
+      where: {
+        related,
+        $or: [{ locale }, defaultLocale === locale ? { locale: { $eq: null } } : null].filter(Boolean)
+      }
+    });
+  },
   registerLifecycleHook() {
   },
   async runLifecycleHook() {

package/dist/server/index.mjs

@@ -8184,6 +8184,19 @@ const bootstrap = async ({ strapi: strapi2 }) => {
     }
   ];
   await strapi2.admin.services.permission.actionProvider.registerMany(actions);
+  const commonService2 = getPluginService(strapi2, "common");
+  const enabledCollections = await commonService2.getConfig(CONFIG_PARAMS.ENABLED_COLLECTIONS, []);
+  if (enabledCollections.length) {
+    strapi2.db.lifecycles.subscribe({
+      models: enabledCollections,
+      afterDelete: async (event) => {
+        const uid = event.model.uid;
+        const { documentId, locale } = event.result;
+        const relation = [uid, documentId].join(":");
+        await commonService2.perRemove(relation, locale);
+      }
+    });
+  }
 };
 const defaultPluginConfig = {
   isValidationEnabled: true,
@@ -8437,7 +8450,7 @@ const getCommentSchema = (enabledCollections) => {
     relation: getRelationValidator(enabledCollections),
     content: z.string().min(1),
     author: externalAuthorSchema.optional(),
-    threadOf: z.string().optional(),
+    threadOf: z.union([z.string(), z.number()]).optional(),
     approvalStatus: z.nativeEnum(APPROVAL_STATUS).optional(),
     locale: z.string().optional()
   });
@@ -8468,7 +8481,18 @@ const getBaseFindSchema = (enabledCollections) => {
     sort: orderByValidator.optional().nullable().default("createdAt:desc"),
     fields: z.string().array().optional(),
     omit: z.string().array().optional(),
-    filters: getFiltersOperators({ content: true, authorName: true, createdAt: true, updatedAt: true, id: true }).optional(),
+    filters: getFiltersOperators({
+      id: true,
+      content: true,
+      authorId: true,
+      authorName: true,
+      authorEmail: true,
+      createdAt: true,
+      updatedAt: true,
+      removed: true,
+      blocked: true,
+      blockedThread: true
+    }).optional(),
     isAdmin: z.boolean().optional().default(false),
     populate: z.record(z.union([z.boolean(), z.object({ populate: z.boolean() })])).optional(),
     limit: stringToNumberValidator.optional(),
@@ -8538,7 +8562,7 @@ const reportAbuseValidator = (config2, payload) => {
 const getRemoveCommentSchema = (enabledCollections) => {
   return z.object({
     relation: getRelationValidator(enabledCollections),
-    commentId: z.number(),
+    commentId: z.union([z.string(), z.number()]),
     authorId: z.union([z.string(), z.number()])
   });
 };
@@ -8874,6 +8898,9 @@ const getCommentRepositorySource = (strapi2) => {
       const isValidationEnabled = await getConfig(strapi2, "isValidationEnabled", false);
       return strapi2.query(modelUid).delete(params).then((result) => result ? shouldValidateObject(isValidationEnabled, commentResultValidator.findOne)(result) : null);
     },
+    async deleteMany(params) {
+      return strapi2.query(modelUid).deleteMany(params);
+    },
     updateMany(params) {
       return strapi2.query(modelUid).updateMany(params);
     },
@@ -9564,7 +9591,11 @@ const getAdminServiceUtils = lodashExports.once((strapi2) => {
       getPopulate() {
         return {
           authorUser: getDefaultAuthorPopulate(strapi2),
-          threadOf: true,
+          threadOf: {
+            populate: {
+              authorUser: getDefaultAuthorPopulate(strapi2)
+            }
+          },
           reports: {
             where: {
               resolved: false
@@ -9741,7 +9772,8 @@ const adminServices = ({ strapi: strapi2 }) => {
           },
           ...defaultPopulate,
           startingFromId: levelThreadId,
-          isAdmin: true
+          isAdmin: true,
+          limit: Number.MAX_SAFE_INTEGER
         },
         false
       );
@@ -9975,7 +10007,7 @@ const clientService = ({ strapi: strapi2 }) => {
       );
       const threadData = await tryCatch(
         async () => {
-          return threadOf ? await this.getCommonService().findOne({ id: threadOf, related: relation, locale }) : null;
+          return threadOf ? await this.getCommonService().findOne({ id: threadOf, related: relation, locale: locale || null }) : null;
         },
         new PluginError2(400, "Thread does not exist")
       );
@@ -9998,10 +10030,11 @@ const clientService = ({ strapi: strapi2 }) => {
       const comment2 = await getCommentRepository(strapi2).create({
         data: {
           ...authorData,
+          threadOf,
+          locale,
           content: clearContent,
           related: relation,
-          approvalStatus: isApprovalFlowEnabled ? APPROVAL_STATUS.PENDING : null,
-          locale
+          approvalStatus: isApprovalFlowEnabled ? APPROVAL_STATUS.PENDING : null
         },
         populate: {
           authorUser: true
@@ -10224,7 +10257,7 @@ const commonService = ({ strapi: strapi2 }) => ({
     return { uid, relatedId: relatedStringId };
   },
   isValidUserContext(user) {
-    return !!user?.id;
+    return user ? user.id != void 0 : true;
   },
   sanitizeCommentEntity(entity, blockedAuthors, omitProps = [], populate = {}) {
     const fieldsToPopulate = Array.isArray(populate) ? populate : Object.keys(populate || {});
@@ -10264,20 +10297,17 @@ const commonService = ({ strapi: strapi2 }) => ({
       sort: { [operator]: direction },
       select: Array.isArray(fields) ? lodashExports.uniq([...fields, defaultSelect].flat()) : fields
     };
-    const entries = await getCommentRepository(strapi2).findMany({
+    const params = {
       where: {
         ...filters,
         ...locale ? { locale } : {}
       },
       populate: populateClause,
       ...fieldsQuery,
-      limit: limit || PAGE_SIZE,
-      offset: skip || 0
-    });
-    let paginationData = void 0;
-    if (pagination?.withCount) {
-      paginationData = await getCommentRepository(strapi2).findWithCount({ where: { ...filters, ...locale ? { locale } : {} } }).then((result2) => result2.pagination);
-    }
+      pageSize: pagination?.pageSize || limit || PAGE_SIZE,
+      page: pagination?.page || (skip ? Math.floor(skip / limit) : 1) || 1
+    };
+    const { results: entries, pagination: resultPaginationData } = await getCommentRepository(strapi2).findWithCount(params);
     const entriesWithThreads = await Promise.all(
       entries.map(async (_2) => {
         const { results, pagination: { total } } = await getCommentRepository(strapi2).findWithCount({
@@ -10316,7 +10346,7 @@ const commonService = ({ strapi: strapi2 }) => ({
     });
     return {
       data: hasRelatedEntitiesToMap ? result.map((_2) => this.mergeRelatedEntityTo(_2, relatedEntities)) : result,
-      pagination: paginationData
+      pagination: resultPaginationData
     };
   },
   // Find comments and create relations tree structure
@@ -10329,9 +10359,10 @@ const commonService = ({ strapi: strapi2 }) => ({
     dropBlockedThreads,
     isAdmin = false,
     omit = [],
-    locale
+    locale,
+    limit
   }, relatedEntity) {
-    const entities = await this.findAllFlat({ filters, populate, sort, fields, isAdmin, omit, locale }, relatedEntity);
+    const entities = await this.findAllFlat({ filters, populate, sort, fields, isAdmin, omit, locale, limit }, relatedEntity);
     return buildNestedStructure(
       entities?.data,
       startingFromId,
@@ -10493,6 +10524,15 @@ const commonService = ({ strapi: strapi2 }) => ({
     }
     return content;
   },
+  async perRemove(related, locale) {
+    const defaultLocale = await strapi2.plugin("i18n")?.service("locales").getDefaultLocale() || null;
+    return getCommentRepository(strapi2).deleteMany({
+      where: {
+        related,
+        $or: [{ locale }, defaultLocale === locale ? { locale: { $eq: null } } : null].filter(Boolean)
+      }
+    });
+  },
   registerLifecycleHook() {
   },
   async runLifecycleHook() {