strapi-plugin-comments 3.0.2 → 3.0.4

package/dist/admin/src/components/UserAvatar/index.d.ts

@@ -1,7 +1,7 @@
 import { FC } from 'react';
 import { Author } from '../../api/schemas';
 type Props = Readonly<Pick<Author, 'avatar'> & {
-    readonly name?: string;
+    readonly name?: string | null;
     readonly isAdminComment: boolean | null;
 }>;
 export declare const UserAvatar: FC<Props>;

package/dist/admin/src/hooks/useAPI.d.ts

@@ -149,8 +149,8 @@ export declare const useAPI: () => {
                     author: {
                         email: string;
                         id: string | number;
-                        name?: string | undefined;
-                        avatar?: {
+                        name?: string | null | undefined;
+                        avatar?: string | {
                             url: string;
                         } | {
                             url: string;
@@ -187,8 +187,8 @@ export declare const useAPI: () => {
                         author: {
                             email: string;
                             id: string | number;
-                            name?: string | undefined;
-                            avatar?: {
+                            name?: string | null | undefined;
+                            avatar?: string | {
                                 url: string;
                             } | {
                                 url: string;
@@ -224,8 +224,8 @@ export declare const useAPI: () => {
                             author: {
                                 email: string;
                                 id: string | number;
-                                name?: string | undefined;
-                                avatar?: {
+                                name?: string | null | undefined;
+                                avatar?: string | {
                                     url: string;
                                 } | {
                                     url: string;
@@ -267,8 +267,8 @@ export declare const useAPI: () => {
                     author: {
                         email: string;
                         id: string | number;
-                        name?: string | undefined;
-                        avatar?: {
+                        name?: string | null | undefined;
+                        avatar?: string | {
                             url: string;
                         } | {
                             url: string;
@@ -360,8 +360,8 @@ export declare const useAPI: () => {
                         author: {
                             email: string;
                             id: string | number;
-                            name?: string | undefined;
-                            avatar?: {
+                            name?: string | null | undefined;
+                            avatar?: string | {
                                 url: string;
                             } | {
                                 url: string;

package/dist/admin/src/hooks/useCommentsAll.d.ts

@@ -21,8 +21,8 @@ export declare const useCommentsAll: (queryParams: Record<string, string>) => im
         author: {
             email: string;
             id: string | number;
-            name?: string | undefined;
-            avatar?: {
+            name?: string | null | undefined;
+            avatar?: string | {
                 url: string;
             } | {
                 url: string;

package/dist/admin/src/hooks/useReports.d.ts

@@ -26,8 +26,8 @@ export declare const useReports: (queryParams?: Record<string, string>) => impor
             author: {
                 email: string;
                 id: string | number;
-                name?: string | undefined;
-                avatar?: {
+                name?: string | null | undefined;
+                avatar?: string | {
                     url: string;
                 } | {
                     url: string;

package/dist/server/index.js

@@ -8438,7 +8438,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 +8469,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 +8550,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()])
   });
 };
@@ -9565,7 +9576,11 @@ const getAdminServiceUtils = lodashExports.once((strapi2) => {
       getPopulate() {
         return {
           authorUser: getDefaultAuthorPopulate(strapi2),
-          threadOf: true,
+          threadOf: {
+            populate: {
+              authorUser: getDefaultAuthorPopulate(strapi2)
+            }
+          },
           reports: {
             where: {
               resolved: false
@@ -9742,7 +9757,8 @@ const adminServices = ({ strapi: strapi2 }) => {
           },
           ...defaultPopulate,
           startingFromId: levelThreadId,
-          isAdmin: true
+          isAdmin: true,
+          limit: Number.MAX_SAFE_INTEGER
         },
         false
       );
@@ -9999,10 +10015,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 +10242,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 +10282,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 +10331,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 +10344,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,

package/dist/server/index.mjs

@@ -8437,7 +8437,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 +8468,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 +8549,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()])
   });
 };
@@ -9564,7 +9575,11 @@ const getAdminServiceUtils = lodashExports.once((strapi2) => {
       getPopulate() {
         return {
           authorUser: getDefaultAuthorPopulate(strapi2),
-          threadOf: true,
+          threadOf: {
+            populate: {
+              authorUser: getDefaultAuthorPopulate(strapi2)
+            }
+          },
           reports: {
             where: {
               resolved: false
@@ -9741,7 +9756,8 @@ const adminServices = ({ strapi: strapi2 }) => {
           },
           ...defaultPopulate,
           startingFromId: levelThreadId,
-          isAdmin: true
+          isAdmin: true,
+          limit: Number.MAX_SAFE_INTEGER
         },
         false
       );
@@ -9998,10 +10014,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 +10241,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 +10281,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 +10330,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 +10343,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,