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

package/dist/server/src/services/settings.service.d.ts

@@ -1,5 +1,5 @@
 import { StrapiContext } from '../@types-v5';
-import { CommentsPluginConfig } from '../validators/api/controllers/settings.controller.validator';
+import { CommentsPluginConfig } from '../config';
 declare const _default: ({ strapi }: StrapiContext) => {
     getConfig: (viaSettingsPage?: boolean) => Promise<{
         enabledCollections?: string[];
@@ -15,6 +15,9 @@ declare const _default: ({ strapi }: StrapiContext) => {
             OTHER?: import("../const").REPORT_REASON.OTHER;
         };
         isGQLPluginEnabled?: boolean;
+        gql?: {
+            auth?: boolean;
+        };
     } | Omit<{
         enabledCollections?: string[];
         approvalFlow?: string[];
@@ -29,6 +32,9 @@ declare const _default: ({ strapi }: StrapiContext) => {
             OTHER?: import("../const").REPORT_REASON.OTHER;
         };
         isGQLPluginEnabled?: boolean;
+        gql?: {
+            auth?: boolean;
+        };
     }, "enabledCollections" | "moderatorRoles" | "isGQLPluginEnabled">>;
     update: (config: CommentsPluginConfig) => Promise<{
         enabledCollections?: string[];
@@ -44,6 +50,9 @@ declare const _default: ({ strapi }: StrapiContext) => {
             OTHER?: import("../const").REPORT_REASON.OTHER;
         };
         isGQLPluginEnabled?: boolean;
+        gql?: {
+            auth?: boolean;
+        };
     } | Omit<{
         enabledCollections?: string[];
         approvalFlow?: string[];
@@ -58,6 +67,9 @@ declare const _default: ({ strapi }: StrapiContext) => {
             OTHER?: import("../const").REPORT_REASON.OTHER;
         };
         isGQLPluginEnabled?: boolean;
+        gql?: {
+            auth?: boolean;
+        };
     }, "enabledCollections" | "moderatorRoles" | "isGQLPluginEnabled">>;
     restore: () => Promise<{
         enabledCollections?: string[];
@@ -73,6 +85,9 @@ declare const _default: ({ strapi }: StrapiContext) => {
             OTHER?: import("../const").REPORT_REASON.OTHER;
         };
         isGQLPluginEnabled?: boolean;
+        gql?: {
+            auth?: boolean;
+        };
     } | Omit<{
         enabledCollections?: string[];
         approvalFlow?: string[];
@@ -87,6 +102,9 @@ declare const _default: ({ strapi }: StrapiContext) => {
             OTHER?: import("../const").REPORT_REASON.OTHER;
         };
         isGQLPluginEnabled?: boolean;
+        gql?: {
+            auth?: boolean;
+        };
     }, "enabledCollections" | "moderatorRoles" | "isGQLPluginEnabled">>;
     restart: () => void;
 };

package/dist/server/src/services/utils/functions.d.ts

@@ -1,4 +1,4 @@
-import { StrapiAdmin, StrapiUser } from '@sensinum/strapi-utils';
+import { StrapiUser } from '@sensinum/strapi-utils';
 import { AdminUser, Id } from '../../@types-v5';
 import PluginError from '../../utils/error';
 import { Comment, CommentWithRelated } from '../../validators/repositories';
@@ -6,7 +6,13 @@ export declare const buildNestedStructure: (entities: Array<Comment | CommentWit
 export declare const getRelatedGroups: (related: string) => Array<string>;
 export declare const getModelUid: (name: string) => string;
 export declare const filterOurResolvedReports: (item: Comment) => Comment;
-export declare const buildAuthorModel: (item: any, blockedAuthorProps: Array<string>, fieldsToPopulate?: Array<string>) => Comment;
+export declare const buildAuthorModel: (item: Comment | CommentWithRelated, blockedAuthorProps: Array<string>, fieldsToPopulate?: Array<string>) => Comment;
 export declare const buildConfigQueryProp: (prop?: undefined | string | Array<string>) => string;
 export declare const resolveUserContextError: (user?: AdminUser | StrapiUser) => PluginError;
-export declare const getAuthorName: (author: StrapiAdmin) => string;
+type AuthorNameProps = {
+    lastname?: string;
+    firstname?: string;
+    username?: string;
+};
+export declare const getAuthorName: (author: AuthorNameProps) => string;
+export {};

package/dist/server/src/utils/getConfig.d.ts

@@ -1,3 +1,3 @@
 import { StrapiContext } from '../@types-v5';
 import { CommentsPluginConfig } from '../config';
-export declare const getConfig: <T extends "enabledCollections" | "approvalFlow" | "entryLabel" | "moderatorRoles" | "badWords" | "blockedAuthorProps" | "isValidationEnabled" | "reportReasons" | "isGQLPluginEnabled">(strapi: StrapiContext['strapi'], path: T, defaultValue: CommentsPluginConfig[T]) => Promise<CommentsPluginConfig[T]>;
+export declare const getConfig: <T extends "enabledCollections" | "approvalFlow" | "entryLabel" | "moderatorRoles" | "badWords" | "blockedAuthorProps" | "isValidationEnabled" | "reportReasons" | "isGQLPluginEnabled" | "gql">(strapi: StrapiContext['strapi'], path: T, defaultValue: CommentsPluginConfig[T]) => Promise<CommentsPluginConfig[T]>;

package/dist/server/src/utils/getPluginService.d.ts

@@ -1,3 +1,3 @@
 import { CoreStrapi } from '../@types-v5';
 import { PluginServices } from '../services';
-export declare const getPluginService: <T extends "admin" | "client" | "common" | "settings">(strapi: CoreStrapi, serviceName: T) => PluginServices[T];
+export declare const getPluginService: <T extends "gql" | "admin" | "client" | "common" | "settings">(strapi: CoreStrapi, serviceName: T) => PluginServices[T];

package/dist/server/src/validators/api/controllers/client.controller.validator.d.ts

@@ -3,6 +3,7 @@ import { ExtractRightEither } from '../../../utils/Either';
 export declare const newCommentValidator: (enabledCollections: string[], relation: string, payload: object) => import("../../../utils/Either").Left<import("../../../utils/PluginError").default> | import("../../../utils/Either").Right<{
     content?: string;
     approvalStatus?: APPROVAL_STATUS;
+    locale?: string;
     author?: {
         name?: string;
         id?: number;
@@ -10,18 +11,29 @@ export declare const newCommentValidator: (enabledCollections: string[], relatio
         avatar?: string;
     };
     threadOf?: number;
-    relation?: `{${string}::${string}.${number}}`;
+    relation?: `{${string}::${string}.${string}}`;
 }>;
 export type NewCommentValidatorSchema = ExtractRightEither<ReturnType<typeof newCommentValidator>>;
 export declare const updateCommentValidator: (enabledCollections: string[], payload: object) => import("../../../utils/Either").Left<import("../../../utils/PluginError").default> | import("../../../utils/Either").Right<{
     content?: string;
-    relation?: `{${string}::${string}.${number}}`;
+    relation?: `{${string}::${string}.${string}}`;
     commentId?: number;
 }>;
 export type UpdateCommentValidatorSchema = ExtractRightEither<ReturnType<typeof updateCommentValidator>>;
 export declare const findAllFlatValidator: (enabledCollections: string[], relation: string, payload: object) => import("../../../utils/Either").Left<import("../../../utils/PluginError").default> | import("../../../utils/Either").Right<{
-    query?: {
-        $and?: Record<string, string | number | {
+    sort?: string;
+    locale?: string;
+    pagination?: {
+        page?: number;
+        pageSize?: number;
+        withCount?: boolean;
+    };
+    relation?: `{${string}::${string}.${string}}`;
+    populate?: Record<string, boolean | {
+        populate?: boolean;
+    }>;
+    filters?: {
+        id?: string | number | {
             $eq?: string;
         } | {
             $eqi?: string;
@@ -55,8 +67,8 @@ export declare const findAllFlatValidator: (enabledCollections: string[], relati
             $notContainsi?: string;
         } | {
             $notNull?: boolean;
-        }>[];
-        $or?: Record<string, string | number | {
+        };
+        content?: string | number | {
             $eq?: string;
         } | {
             $eqi?: string;
@@ -90,11 +102,8 @@ export declare const findAllFlatValidator: (enabledCollections: string[], relati
             $notContainsi?: string;
         } | {
             $notNull?: boolean;
-        }>[];
-    } | Record<string, string | number | boolean | Record<string, string | number | boolean>>;
-    sort?: string;
-    filter?: {
-        content?: string | number | {
+        };
+        createdAt?: string | number | {
             $eq?: string;
         } | {
             $eqi?: string;
@@ -129,7 +138,7 @@ export declare const findAllFlatValidator: (enabledCollections: string[], relati
         } | {
             $notNull?: boolean;
         };
-        createdAt?: string | number | {
+        updatedAt?: string | number | {
             $eq?: string;
         } | {
             $eqi?: string;
@@ -164,7 +173,7 @@ export declare const findAllFlatValidator: (enabledCollections: string[], relati
         } | {
             $notNull?: boolean;
         };
-        updatedAt?: string | number | {
+        authorName?: string | number | {
             $eq?: string;
         } | {
             $eqi?: string;
@@ -199,7 +208,23 @@ export declare const findAllFlatValidator: (enabledCollections: string[], relati
         } | {
             $notNull?: boolean;
         };
-        authorName?: string | number | {
+    };
+    limit?: number;
+    fields?: string[];
+    omit?: string[];
+    isAdmin?: boolean;
+    skip?: number;
+}>;
+export type FindAllFlatSchema = ExtractRightEither<ReturnType<typeof findAllFlatValidator>>;
+export declare const findAllInHierarchyValidator: (enabledCollections: string[], relation: string, payload: object) => import("../../../utils/Either").Left<import("../../../utils/PluginError").default> | import("../../../utils/Either").Right<{
+    sort?: string;
+    locale?: string;
+    relation?: `{${string}::${string}.${string}}`;
+    populate?: Record<string, boolean | {
+        populate?: boolean;
+    }>;
+    filters?: {
+        id?: string | number | {
             $eq?: string;
         } | {
             $eqi?: string;
@@ -234,26 +259,7 @@ export declare const findAllFlatValidator: (enabledCollections: string[], relati
         } | {
             $notNull?: boolean;
         };
-    };
-    pagination?: {
-        page?: number;
-        pageSize?: number;
-        withCount?: boolean;
-    };
-    relation?: `{${string}::${string}.${number}}`;
-    populate?: Record<string, boolean | {
-        populate?: boolean;
-    }>;
-    limit?: number;
-    fields?: string[];
-    omit?: string[];
-    isAdmin?: boolean;
-    skip?: number;
-}>;
-export type FindAllFlatSchema = ExtractRightEither<ReturnType<typeof findAllFlatValidator>>;
-export declare const findAllInHierarchyValidator: (enabledCollections: string[], relation: string, payload: object) => import("../../../utils/Either").Left<import("../../../utils/PluginError").default> | import("../../../utils/Either").Right<{
-    query?: {
-        $and?: Record<string, string | number | {
+        content?: string | number | {
             $eq?: string;
         } | {
             $eqi?: string;
@@ -287,8 +293,8 @@ export declare const findAllInHierarchyValidator: (enabledCollections: string[],
             $notContainsi?: string;
         } | {
             $notNull?: boolean;
-        }>[];
-        $or?: Record<string, string | number | {
+        };
+        createdAt?: string | number | {
             $eq?: string;
         } | {
             $eqi?: string;
@@ -322,11 +328,8 @@ export declare const findAllInHierarchyValidator: (enabledCollections: string[],
             $notContainsi?: string;
         } | {
             $notNull?: boolean;
-        }>[];
-    } | Record<string, string | number | boolean | Record<string, string | number | boolean>>;
-    sort?: string;
-    filter?: {
-        content?: string | number | {
+        };
+        updatedAt?: string | number | {
             $eq?: string;
         } | {
             $eqi?: string;
@@ -361,7 +364,7 @@ export declare const findAllInHierarchyValidator: (enabledCollections: string[],
         } | {
             $notNull?: boolean;
         };
-        createdAt?: string | number | {
+        authorName?: string | number | {
             $eq?: string;
         } | {
             $eqi?: string;
@@ -396,7 +399,31 @@ export declare const findAllInHierarchyValidator: (enabledCollections: string[],
         } | {
             $notNull?: boolean;
         };
-        updatedAt?: string | number | {
+    };
+    limit?: number;
+    fields?: string[];
+    omit?: string[];
+    isAdmin?: boolean;
+    skip?: number;
+    startingFromId?: number;
+    dropBlockedThreads?: boolean;
+}>;
+export type FindAllInHierarchyValidatorSchema = ExtractRightEither<ReturnType<typeof findAllInHierarchyValidator>>;
+export declare const findAllPerAuthorValidator: (params: object, payload: object) => import("../../../utils/Either").Left<import("../../../utils/PluginError").default> | import("../../../utils/Either").Right<{
+    type?: string;
+    sort?: string;
+    authorId?: string | number;
+    locale?: string;
+    pagination?: {
+        page?: number;
+        pageSize?: number;
+        withCount?: boolean;
+    };
+    populate?: Record<string, boolean | {
+        populate?: boolean;
+    }>;
+    filters?: {
+        id?: string | number | {
             $eq?: string;
         } | {
             $eqi?: string;
@@ -431,7 +458,7 @@ export declare const findAllInHierarchyValidator: (enabledCollections: string[],
         } | {
             $notNull?: boolean;
         };
-        authorName?: string | number | {
+        content?: string | number | {
             $eq?: string;
         } | {
             $eqi?: string;
@@ -466,23 +493,7 @@ export declare const findAllInHierarchyValidator: (enabledCollections: string[],
         } | {
             $notNull?: boolean;
         };
-    };
-    relation?: `{${string}::${string}.${number}}`;
-    populate?: Record<string, boolean | {
-        populate?: boolean;
-    }>;
-    limit?: number;
-    fields?: string[];
-    omit?: string[];
-    isAdmin?: boolean;
-    skip?: number;
-    startingFromId?: number;
-    dropBlockedThreads?: boolean;
-}>;
-export type FindAllInHierarchyValidatorSchema = ExtractRightEither<ReturnType<typeof findAllInHierarchyValidator>>;
-export declare const findAllPerAuthorValidator: (params: object, payload: object) => import("../../../utils/Either").Left<import("../../../utils/PluginError").default> | import("../../../utils/Either").Right<{
-    query?: {
-        $and?: Record<string, string | number | {
+        createdAt?: string | number | {
             $eq?: string;
         } | {
             $eqi?: string;
@@ -516,8 +527,8 @@ export declare const findAllPerAuthorValidator: (params: object, payload: object
             $notContainsi?: string;
         } | {
             $notNull?: boolean;
-        }>[];
-        $or?: Record<string, string | number | {
+        };
+        updatedAt?: string | number | {
             $eq?: string;
         } | {
             $eqi?: string;
@@ -551,19 +562,43 @@ export declare const findAllPerAuthorValidator: (params: object, payload: object
             $notContainsi?: string;
         } | {
             $notNull?: boolean;
-        }>[];
-    } | Record<string, string | number | boolean | Record<string, string | number | boolean>>;
-    type?: string;
-    sort?: string;
-    authorId?: string | number;
-    pagination?: {
-        page?: number;
-        pageSize?: number;
-        withCount?: boolean;
+        };
+        authorName?: string | number | {
+            $eq?: string;
+        } | {
+            $eqi?: string;
+        } | {
+            $ne?: string;
+        } | {
+            $nei?: string;
+        } | {
+            $gt?: string;
+        } | {
+            $gte?: string;
+        } | {
+            $lt?: string;
+        } | {
+            $lte?: string;
+        } | {
+            $startsWith?: string;
+        } | {
+            $startsWithi?: string;
+        } | {
+            $endsWith?: string;
+        } | {
+            $endsWithi?: string;
+        } | {
+            $contains?: string;
+        } | {
+            $containsi?: string;
+        } | {
+            $notContains?: string;
+        } | {
+            $notContainsi?: string;
+        } | {
+            $notNull?: boolean;
+        };
     };
-    populate?: Record<string, boolean | {
-        populate?: boolean;
-    }>;
     limit?: number;
     fields?: string[];
     omit?: string[];
@@ -574,13 +609,13 @@ export type FindAllPerAuthorValidatorSchema = ExtractRightEither<ReturnType<type
 export declare const reportAbuseValidator: (enabledCollections: string[], payload: object) => import("../../../utils/Either").Left<import("../../../utils/PluginError").default> | import("../../../utils/Either").Right<{
     content?: string;
     reason?: string;
-    relation?: `{${string}::${string}.${number}}`;
+    relation?: `{${string}::${string}.${string}}`;
     commentId?: number;
 }>;
 export type ReportAbuseValidatorSchema = ExtractRightEither<ReturnType<typeof reportAbuseValidator>>;
 export declare const removeCommentValidator: (enabledCollections: string[], payload: object) => import("../../../utils/Either").Left<import("../../../utils/PluginError").default> | import("../../../utils/Either").Right<{
     authorId?: string | number;
-    relation?: `{${string}::${string}.${number}}`;
+    relation?: `{${string}::${string}.${string}}`;
     commentId?: number;
 }>;
 export type RemoveCommentValidatorSchema = ExtractRightEither<ReturnType<typeof removeCommentValidator>>;

package/dist/server/src/validators/api/controllers/settings.controller.validator.d.ts

@@ -1,5 +1,3 @@
-import { z } from "zod";
-import { schemaConfig } from "../../../config";
 export declare const validateConfig: (config: unknown) => import("../../../utils/Either").Left<import("../../../utils/PluginError").default> | import("../../../utils/Either").Right<{
     enabledCollections?: string[];
     approvalFlow?: string[];
@@ -14,5 +12,7 @@ export declare const validateConfig: (config: unknown) => import("../../../utils
         OTHER?: import("../../../const").REPORT_REASON.OTHER;
     };
     isGQLPluginEnabled?: boolean;
+    gql?: {
+        auth?: boolean;
+    };
 }>;
-export type CommentsPluginConfig = z.infer<typeof schemaConfig>;

package/dist/server/src/validators/repositories/comment.validator.d.ts

@@ -321,13 +321,19 @@ declare const commentSchema: z.ZodObject<z.objectUtil.extendShape<z.objectUtil.e
 declare const commentRelatedSchema: z.ZodObject<{
     id: z.ZodNumber;
     uid: z.ZodString;
+    documentId: z.ZodString;
     requireCommentsApproval: z.ZodOptional<z.ZodNullable<z.ZodBoolean>>;
+    locale: z.ZodOptional<z.ZodNullable<z.ZodString>>;
 }, "strip", z.ZodTypeAny, {
     id?: number;
+    documentId?: string;
+    locale?: string;
     uid?: string;
     requireCommentsApproval?: boolean;
 }, {
     id?: number;
+    documentId?: string;
+    locale?: string;
     uid?: string;
     requireCommentsApproval?: boolean;
 }>;
@@ -516,13 +522,19 @@ declare const commentWithRelatedSchema: z.ZodObject<z.objectUtil.extendShape<Omi
     related: z.ZodOptional<z.ZodNullable<z.ZodObject<{
         id: z.ZodNumber;
         uid: z.ZodString;
+        documentId: z.ZodString;
         requireCommentsApproval: z.ZodOptional<z.ZodNullable<z.ZodBoolean>>;
+        locale: z.ZodOptional<z.ZodNullable<z.ZodString>>;
     }, "strip", z.ZodTypeAny, {
         id?: number;
+        documentId?: string;
+        locale?: string;
         uid?: string;
         requireCommentsApproval?: boolean;
     }, {
         id?: number;
+        documentId?: string;
+        locale?: string;
         uid?: string;
         requireCommentsApproval?: boolean;
     }>>>;
@@ -538,6 +550,8 @@ declare const commentWithRelatedSchema: z.ZodObject<z.objectUtil.extendShape<Omi
     approvalStatus?: string;
     related?: {
         id?: number;
+        documentId?: string;
+        locale?: string;
         uid?: string;
         requireCommentsApproval?: boolean;
     };
@@ -611,6 +625,8 @@ declare const commentWithRelatedSchema: z.ZodObject<z.objectUtil.extendShape<Omi
     approvalStatus?: string;
     related?: {
         id?: number;
+        documentId?: string;
+        locale?: string;
         uid?: string;
         requireCommentsApproval?: boolean;
     };

package/dist/server/src/validators/utils.d.ts

@@ -755,7 +755,7 @@ export declare const queryPaginationSchema: z.ZodObject<z.objectUtil.extendShape
     orderBy?: string;
 }>;
 export declare const validate: <I, O>(result: z.SafeParseReturnType<I, O>) => import("../utils/Either").Left<PluginError> | import("../utils/Either").Right<O>;
-export declare const getRelationValidator: (enabledCollections: string[]) => z.ZodEffects<z.ZodString, `{${string}::${string}.${number}}`, string>;
+export declare const getRelationValidator: (enabledCollections: string[]) => z.ZodEffects<z.ZodString, `{${string}::${string}.${string}}`, string>;
 export declare const externalAuthorSchema: z.ZodObject<{
     id: z.ZodNumber;
     name: z.ZodOptional<z.ZodString>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-comments",
-  "version": "3.0.0-beta.0",
+  "version": "3.0.0-beta.1",
   "description": "Strapi - Comments plugin",
   "strapi": {
     "name": "comments",
@@ -67,11 +67,12 @@
   "devDependencies": {
     "@jest/types": "29.5.x",
     "@sensinum/strapi-utils": "^1.0.2",
-    "@strapi/plugin-cloud": "^5.3.0",
-    "@strapi/plugin-users-permissions": "^5.3.0",
+    "@strapi/plugin-cloud": "^5.4.1",
+    "@strapi/plugin-graphql": "5.4.1",
+    "@strapi/plugin-users-permissions": "^5.4.1",
     "@strapi/sdk-plugin": "^5.2.6",
-    "@strapi/strapi": "^5.3.0",
-    "@strapi/types": "^5.3.0",
+    "@strapi/strapi": "^5.4.1",
+    "@strapi/types": "^5.4.1",
     "@types/jest": "^29.5.12",
     "@types/koa": "^2.15.0",
     "@types/react": "^18.3.8",
@@ -89,7 +90,7 @@
   },
   "peerDependencies": {
     "@strapi/sdk-plugin": "^5.2.7",
-    "@strapi/strapi": "^5.3.0",
+    "@strapi/strapi": "^5.4.1",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^6.26.2",