strapi-plugin-comments 2.2.1 → 2.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-comments",
-  "version": "2.2.1",
+  "version": "2.2.3",
   "description": "Strapi - Comments plugin",
   "strapi": {
     "name": "comments",
@@ -14,12 +14,14 @@
     "url": "https://github.com/VirtusLab-Open-Source/strapi-plugin-comments"
   },
   "dependencies": {
-    "@strapi/plugin-graphql": "^4.4.7",
-    "@strapi/utils": "^4.4.7",
+    "@strapi/plugin-graphql": "^4.5.4",
+    "@strapi/utils": "^4.5.4",
     "@types/axios": "^0.14.0",
     "@types/react-intl": "^3.0.0",
     "@types/react-query": "^1.2.9",
-    "bad-words": "^3.0.4"
+    "@types/styled-components": "^5.1.26",
+    "bad-words": "^3.0.4",
+    "styled-components": "^5.3.6"
   },
   "devDependencies": {},
   "peerDependencies": {

package/server/controllers/index.d.ts

@@ -1,4 +1,4 @@
-declare type PluginControllers = {
+type PluginControllers = {
     [key: string]: Function | Object;
 };
 declare const controllers: PluginControllers;

package/server/controllers/utils/functions.d.ts

@@ -1,6 +1,6 @@
 import { Id, StringMap, StrapiRequestContext } from "strapi-typed";
 import PluginError from "../../utils/error";
-declare type ParseResponse = StringMap<string | number | Id>;
+type ParseResponse = StringMap<string | number | Id>;
 export declare const parseParams: <T extends ParseResponse>(params: StringMap<string | number>) => T;
 export declare const throwError: <T extends {} = never>(ctx: StrapiRequestContext<T, StringMap<string | number>, StringMap<string | number>>, e: PluginError | Error | unknown) => PluginError | Error | unknown | never;
 export {};

package/server/graphql/mutations/createComment.d.ts

@@ -1,6 +1,6 @@
 import { StrapiRequestContext } from "strapi-typed";
 import { StrapiGraphQLContext, ToBeFixed } from "../../../types";
-declare type CreateCommentProps = {
+type CreateCommentProps = {
     input: ToBeFixed;
 };
 declare const _default: ({ nexus }: StrapiGraphQLContext) => {

package/server/graphql/queries/findAllFlat.d.ts

@@ -1,5 +1,5 @@
 import { Id, StrapiGraphQLContext, ToBeFixed } from "../../../types";
-declare type ResponseFindAllResolverProps = {
+type ResponseFindAllResolverProps = {
     relation: Id;
     filters: ToBeFixed;
     sort: ToBeFixed;

package/server/graphql/queries/findAllInHierarchy.d.ts

@@ -1,6 +1,6 @@
 import { Id } from "strapi-typed";
 import { StrapiGraphQLContext, ToBeFixed } from "../../../types";
-declare type findAllInHierarchyProps = {
+type findAllInHierarchyProps = {
     relation: Id;
     filters: ToBeFixed;
     sort: ToBeFixed;

package/server/routes/index.d.ts

@@ -1,8 +1,8 @@
 import { StrapiRoute } from "strapi-typed";
-declare type PluginRoutes = {
+type PluginRoutes = {
     [key: string]: PluginScopeRoutes;
 };
-declare type PluginScopeRoutes = {
+type PluginScopeRoutes = {
     type: string;
     routes: Array<StrapiRoute>;
 };

package/server/services/admin.js

@@ -94,19 +94,25 @@ module.exports = ({ strapi }) => ({
                 },
             };
         }
+        const basePopulate = {
+            threadOf: true,
+            reports: {
+                where: {
+                    resolved: false,
+                },
+            },
+        };
+        const populate = defaultAuthorUserPopulate
+            ? {
+                ...basePopulate,
+                authorUser: defaultAuthorUserPopulate,
+            }
+            : basePopulate;
         const entities = await strapi.db
             .query((0, functions_2.getModelUid)("comment"))
             .findMany({
             ...params,
-            populate: {
-                authorUser: defaultAuthorUserPopulate,
-                threadOf: true,
-                reports: {
-                    where: {
-                        resolved: false,
-                    },
-                },
-            },
+            populate,
         });
         const total = await strapi.db.query((0, functions_2.getModelUid)("comment")).count({
             where: params.where,
@@ -216,18 +222,30 @@ module.exports = ({ strapi }) => ({
                 },
             },
         };
-        const defaultPopulate = {
+        const basePopulate = {
             populate: {
-                authorUser: defaultAuthorUserPopulate,
                 threadOf: {
                     populate: {
-                        authorUser: defaultAuthorUserPopulate,
                         ...reportsPopulation,
                     },
                 },
                 ...reportsPopulation,
             },
         };
+        const defaultPopulate = defaultAuthorUserPopulate
+            ? {
+                populate: {
+                    ...basePopulate.populate,
+                    authorUser: defaultAuthorUserPopulate,
+                    threadOf: {
+                        populate: {
+                            ...basePopulate.populate.threadOf.populate,
+                            authorUser: defaultAuthorUserPopulate,
+                        },
+                    },
+                },
+            }
+            : basePopulate;
         const entity = await strapi.db
             .query((0, functions_2.getModelUid)("comment"))
             .findOne({
@@ -450,11 +468,12 @@ module.exports = ({ strapi }) => ({
             data: {
                 approvalStatus: "APPROVED",
                 authorId: author.id,
-                authorName: author.username,
+                authorName: (0, functions_2.getAuthorName)(author),
                 authorEmail: author.email,
                 content: body,
                 threadOf: threadId,
-                related: entity.related
+                related: entity.related,
+                isAdminComment: true,
             },
         });
     },

package/server/services/client.js

@@ -143,6 +143,9 @@ module.exports = ({ strapi }) => ({
                 id,
                 related: relation,
             });
+            if (reportAgainstEntity.isAdminComment) {
+                throw new error_1.default(403, `You're not allowed to take an action on that entity. This in a admin comment.`);
+            }
             if (reportAgainstEntity) {
                 const entity = await strapi.db
                     .query((0, functions_2.getModelUid)("comment-report"))
@@ -173,7 +176,7 @@ module.exports = ({ strapi }) => ({
             throw new error_1.default(403, `You're not allowed to take an action on that entity. Make sure that comment exist or you've authenticated your request properly.`);
         }
         catch (e) {
-            throw new error_1.default(403, `You're not allowed to take an action on that entity. Make sure that comment exist or you've authenticated your request properly.`);
+            throw e;
         }
     },
     async markAsRemoved(id, relation, authorId, user) {

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

@@ -1,4 +1,4 @@
-import { Id, StrapiUser } from "strapi-typed";
+import { Id, StrapiAdmin, StrapiUser } from "strapi-typed";
 import { Comment, ToBeFixed } from "../../../types";
 import PluginError from "./../../utils/error";
 export declare const buildNestedStructure: (entities: Array<Comment>, id?: Id | null, field?: string, dropBlockedThreads?: boolean, blockNestedThreads?: boolean) => Array<Comment>;
@@ -10,4 +10,5 @@ export declare const convertContentTypeNameToSlug: (str: string) => string;
 export declare const buildAuthorModel: (item: Comment, fieldsToPopulate?: Array<string>) => Comment;
 export declare const buildConfigQueryProp: (prop?: undefined | string | Array<string>) => string;
 export declare const resolveUserContextError: (user: StrapiUser) => PluginError;
+export declare const getAuthorName: (author: StrapiAdmin) => any;
 //# sourceMappingURL=functions.d.ts.map

package/server/services/utils/functions.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveUserContextError = exports.buildConfigQueryProp = exports.buildAuthorModel = exports.convertContentTypeNameToSlug = exports.filterOurResolvedReports = exports.getModelUid = exports.getRelatedGroups = exports.isEqualEntity = exports.buildNestedStructure = void 0;
+exports.getAuthorName = exports.resolveUserContextError = exports.buildConfigQueryProp = exports.buildAuthorModel = exports.convertContentTypeNameToSlug = exports.filterOurResolvedReports = exports.getModelUid = exports.getRelatedGroups = exports.isEqualEntity = exports.buildNestedStructure = void 0;
 const error_1 = __importDefault(require("./../../utils/error"));
 const constants_1 = require("./../../utils/constants");
 const lodash_1 = require("lodash");
@@ -105,4 +105,12 @@ const resolveUserContextError = (user) => {
     }
 };
 exports.resolveUserContextError = resolveUserContextError;
+const getAuthorName = (author) => {
+    const { lastname, username, firstname } = author;
+    if (lastname)
+        return `${firstname} ${lastname}`;
+    else
+        return username || firstname;
+};
+exports.getAuthorName = getAuthorName;
 //# sourceMappingURL=functions.js.map

package/server/utils/error.d.ts

@@ -1,4 +1,4 @@
-declare type ErrorPayload = {
+type ErrorPayload = {
     [key: string]: any;
 } | undefined;
 interface IPluginError extends Error {

package/strapi-server.d.ts

@@ -64,6 +64,10 @@ declare const _default: () => {
                         type: string;
                         configurable: boolean;
                     };
+                    isAdminComment: {
+                        type: string;
+                        configurable: boolean;
+                    };
                     removed: {
                         type: string;
                         configurable: boolean;