strapi-plugin-comments 2.1.7 → 2.2.0-beta.0

package/admin/src/utils/index.d.ts

@@ -1,12 +1,17 @@
-export { default as axiosInstance } from "./axiosInstance";
-export { default as getApiURL } from "./getApiUrl";
-export { default as getUrl } from "./getUrl";
-export { default as getMessage } from "./getMessage";
-export { default as handleAPIError } from "./handleAPIError";
-export { default as getRelatedGroups } from "./getRelatedGroups";
-export { default as renderEntryTitle } from "./renderEntryTitle";
-export { default as renderInitials } from "./renderInitials";
-export { default as resolveCommentStatus } from "./resolveCommentStatus";
-export { default as resolveCommentStatusColor } from "./resolveCommentStatusColor";
-export { default as parseRegExp } from "./parseRegExp";
+export { default as axiosInstance } from './axiosInstance';
+export { default as getApiURL } from './getApiUrl';
+export { default as getUrl } from './getUrl';
+export { default as getMessage } from './getMessage';
+export { default as handleAPIError } from './handleAPIError';
+export { default as getRelatedGroups } from './getRelatedGroups';
+export { default as renderEntryTitle } from './renderEntryTitle';
+export { default as renderInitials } from './renderInitials';
+export { default as resolveCommentStatus } from './resolveCommentStatus';
+export { default as resolveCommentStatusColor } from './resolveCommentStatusColor';
+export { default as resolveReportStatus } from './resolveReportStatus';
+export { default as resolveReportStatusColor } from './resolveReportStatusColor';
+export { default as parseRegExp } from './parseRegExp';
+export { APPROVAL_STATUS } from './constants';
+export { UIError, ValidationError } from './errors';
+export { assertString } from './functions';
 //# sourceMappingURL=index.d.ts.map

package/admin/src/utils/index.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.parseRegExp = exports.resolveCommentStatusColor = exports.resolveCommentStatus = exports.renderInitials = exports.renderEntryTitle = exports.getRelatedGroups = exports.handleAPIError = exports.getMessage = exports.getUrl = exports.getApiURL = exports.axiosInstance = void 0;
+exports.assertString = exports.ValidationError = exports.UIError = exports.APPROVAL_STATUS = exports.parseRegExp = exports.resolveReportStatusColor = exports.resolveReportStatus = exports.resolveCommentStatusColor = exports.resolveCommentStatus = exports.renderInitials = exports.renderEntryTitle = exports.getRelatedGroups = exports.handleAPIError = exports.getMessage = exports.getUrl = exports.getApiURL = exports.axiosInstance = void 0;
 var axiosInstance_1 = require("./axiosInstance");
 Object.defineProperty(exports, "axiosInstance", { enumerable: true, get: function () { return __importDefault(axiosInstance_1).default; } });
 var getApiUrl_1 = require("./getApiUrl");
@@ -24,6 +24,17 @@ var resolveCommentStatus_1 = require("./resolveCommentStatus");
 Object.defineProperty(exports, "resolveCommentStatus", { enumerable: true, get: function () { return __importDefault(resolveCommentStatus_1).default; } });
 var resolveCommentStatusColor_1 = require("./resolveCommentStatusColor");
 Object.defineProperty(exports, "resolveCommentStatusColor", { enumerable: true, get: function () { return __importDefault(resolveCommentStatusColor_1).default; } });
+var resolveReportStatus_1 = require("./resolveReportStatus");
+Object.defineProperty(exports, "resolveReportStatus", { enumerable: true, get: function () { return __importDefault(resolveReportStatus_1).default; } });
+var resolveReportStatusColor_1 = require("./resolveReportStatusColor");
+Object.defineProperty(exports, "resolveReportStatusColor", { enumerable: true, get: function () { return __importDefault(resolveReportStatusColor_1).default; } });
 var parseRegExp_1 = require("./parseRegExp");
 Object.defineProperty(exports, "parseRegExp", { enumerable: true, get: function () { return __importDefault(parseRegExp_1).default; } });
+var constants_1 = require("./constants");
+Object.defineProperty(exports, "APPROVAL_STATUS", { enumerable: true, get: function () { return constants_1.APPROVAL_STATUS; } });
+var errors_1 = require("./errors");
+Object.defineProperty(exports, "UIError", { enumerable: true, get: function () { return errors_1.UIError; } });
+Object.defineProperty(exports, "ValidationError", { enumerable: true, get: function () { return errors_1.ValidationError; } });
+var functions_1 = require("./functions");
+Object.defineProperty(exports, "assertString", { enumerable: true, get: function () { return functions_1.assertString; } });
 //# sourceMappingURL=index.js.map

package/admin/src/utils/renderInitials.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const lodash_1 = require("lodash");
-const renderInitials = (value = "") => value
-    .split(" ")
-    .map((_) => (0, lodash_1.first)(_))
-    .join("")
-    .toUpperCase();
+const renderInitials = (value = "") => (0, lodash_1.isString)(value) ?
+    value
+        .split(" ")
+        .map((_) => (0, lodash_1.first)(_))
+        .join("")
+        .toUpperCase() : "";
 exports.default = renderInitials;
 //# sourceMappingURL=renderInitials.js.map

package/admin/src/utils/resolveCommentStatus.d.ts

@@ -1,4 +1,10 @@
-import { ToBeFixed } from "../../../types";
-declare const resolveCommentStatus: ({ removed, blocked, blockedThread, approvalStatus, reviewFlowEnabled, }: ToBeFixed) => any;
+declare type Config = {
+    removed?: boolean;
+    blocked?: boolean;
+    blockedThread?: boolean;
+    approvalStatus?: string;
+    reviewFlowEnabled?: boolean;
+};
+declare const resolveCommentStatus: ({ removed, blocked, blockedThread, approvalStatus, reviewFlowEnabled, }: Config) => string;
 export default resolveCommentStatus;
 //# sourceMappingURL=resolveCommentStatus.d.ts.map

package/admin/src/utils/resolveReportStatus.d.ts

@@ -0,0 +1,4 @@
+import { ToBeFixed } from '../../../types';
+declare const resolveReportStatus: ({ resolved, related: { blocked, blockedThread }, approvalStatus, }: ToBeFixed) => any;
+export default resolveReportStatus;
+//# sourceMappingURL=resolveReportStatus.d.ts.map

package/admin/src/utils/resolveReportStatus.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const lodash_1 = require("lodash");
+const constants_1 = require("./constants");
+const resolveReportStatus = ({ resolved, related: { blocked, blockedThread }, approvalStatus, }) => {
+    const gotApprovalFlow = !(0, lodash_1.isNil)(approvalStatus);
+    if (blocked || blockedThread) {
+        return constants_1.REPORT_STATUS.BLOCKED;
+    }
+    if (resolved) {
+        return constants_1.REPORT_STATUS.RESOLVED;
+    }
+    if (gotApprovalFlow) {
+        const status = approvalStatus.toUpperCase();
+        if (Object.keys(constants_1.REPORT_STATUS).includes(status)) {
+            return status;
+        }
+        return constants_1.REPORT_STATUS.PENDING;
+    }
+    return constants_1.REPORT_STATUS.PENDING;
+};
+exports.default = resolveReportStatus;
+//# sourceMappingURL=resolveReportStatus.js.map

package/admin/src/utils/resolveReportStatusColor.d.ts

@@ -0,0 +1,4 @@
+import { REPORT_STATUS } from "./constants";
+declare const resolveReportStatusColor: (status: keyof typeof REPORT_STATUS) => "danger" | "success" | "primary";
+export default resolveReportStatusColor;
+//# sourceMappingURL=resolveReportStatusColor.d.ts.map

package/admin/src/utils/resolveReportStatusColor.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const constants_1 = require("./constants");
+const resolveReportStatusColor = (status) => {
+    switch (status) {
+        case constants_1.REPORT_STATUS.PENDING:
+            return "primary";
+        case constants_1.REPORT_STATUS.RESOLVED:
+            return "success";
+        case constants_1.REPORT_STATUS.BLOCKED:
+            return "danger";
+        default:
+            return "primary";
+    }
+};
+exports.default = resolveReportStatusColor;
+//# sourceMappingURL=resolveReportStatusColor.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-comments",
-  "version": "2.1.7",
+  "version": "2.2.0-beta.0",
   "description": "Strapi - Comments plugin",
   "strapi": {
     "name": "comments",
@@ -14,8 +14,11 @@
     "url": "https://github.com/VirtusLab-Open-Source/strapi-plugin-comments"
   },
   "dependencies": {
-    "@strapi/utils": "^4.1.12",
-    "@strapi/plugin-graphql": "^4.1.12",
+    "@strapi/plugin-graphql": "^4.3.8",
+    "@strapi/utils": "^4.3.8",
+    "@types/axios": "^0.14.0",
+    "@types/react-intl": "^3.0.0",
+    "@types/react-query": "^1.2.9",
     "bad-words": "^3.0.4"
   },
   "devDependencies": {},
@@ -53,7 +56,7 @@
     }
   ],
   "engines": {
-    "node": ">=14.x.x <=17.x.x",
+    "node": ">=14.19.1 <=17.x.x",
     "npm": ">=7.x.x"
   },
   "keywords": [

package/server/controllers/admin.js

@@ -52,6 +52,9 @@ const controllers = {
     async findAll(ctx) {
         return this.getService().findAll(ctx.query);
     },
+    async findReports(ctx) {
+        return this.getService().findReports(ctx.query);
+    },
     async findOne(ctx) {
         const { params = {}, query } = ctx;
         const { id } = (0, functions_2.parseParams)(params);
@@ -82,6 +85,16 @@ const controllers = {
             throw (0, functions_2.throwError)(ctx, e);
         }
     },
+    async deleteComment(ctx) {
+        const { params = {} } = ctx;
+        const { id } = (0, functions_2.parseParams)(params);
+        try {
+            return await this.getService().deleteComment(id);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
     async blockCommentThread(ctx) {
         const { params = {} } = ctx;
         const { id } = (0, functions_2.parseParams)(params);
@@ -112,13 +125,65 @@ const controllers = {
             throw (0, functions_2.throwError)(ctx, e);
         }
     },
-    async resolveMultipleAbuseReports(ctx) {
+    async resolveCommentMultipleAbuseReports(ctx) {
         const { params = {}, request } = ctx;
         const { body } = request;
         const { id: commentId } = (0, functions_2.parseParams)(params);
         (0, functions_1.assertNotEmpty)(body);
         try {
-            return await this.getService().resolveMultipleAbuseReports(body, commentId);
+            return await this.getService().resolveCommentMultipleAbuseReports(body, commentId);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async resolveAllAbuseReportsForComment(ctx) {
+        const { params } = ctx;
+        const { id: commentId } = (0, functions_2.parseParams)(params);
+        try {
+            return await this.getService().resolveAllAbuseReportsForComment(commentId);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async resolveAllAbuseReportsForThread(ctx) {
+        const { params } = ctx;
+        const { id: commentId } = (0, functions_2.parseParams)(params);
+        try {
+            return await this.getService().resolveAllAbuseReportsForThread(commentId);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async resolveMultipleAbuseReports(ctx) {
+        const { request: { body }, } = ctx;
+        (0, functions_1.assertNotEmpty)(body);
+        try {
+            return await this.getService().resolveMultipleAbuseReports(body);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async postComment(ctx) {
+        const { params = {}, request } = ctx;
+        const { body } = request;
+        const { id: threadId } = (0, functions_2.parseParams)(params);
+        try {
+            return await this.getService().postComment(threadId, body.content, body.author);
+        }
+        catch (e) {
+            throw (0, functions_2.throwError)(ctx, e);
+        }
+    },
+    async updateComment(ctx) {
+        const { params = {}, request } = ctx;
+        const { body } = request;
+        const { id } = (0, functions_2.parseParams)(params);
+        try {
+            return await this.getService().updateComment(id, body.content);
         }
         catch (e) {
             throw (0, functions_2.throwError)(ctx, e);

package/server/index.d.ts

@@ -1,5 +1,5 @@
 declare const _default: {
-    register: () => void;
+    register: (context: import("strapi-typed").StrapiContext) => void;
     bootstrap: ({ strapi }: import("strapi-typed").StrapiContext) => Promise<void>;
     destroy: () => void;
     config: import("../types").StrapiConfig;

package/server/register/custom-fields/comments.d.ts

@@ -0,0 +1,6 @@
+export declare const commentsCustomField: {
+    readonly name: "comments";
+    readonly plugin: "comments";
+    readonly type: "json";
+};
+//# sourceMappingURL=comments.d.ts.map

package/server/register/custom-fields/comments.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.commentsCustomField = void 0;
+exports.commentsCustomField = {
+    name: "comments",
+    plugin: "comments",
+    type: "json",
+};
+//# sourceMappingURL=comments.js.map

package/server/register/custom-fields/index.d.ts

@@ -0,0 +1,3 @@
+import { StrapiContext } from "strapi-typed";
+export declare const registerCustomFields: ({ strapi }: StrapiContext) => void;
+//# sourceMappingURL=index.d.ts.map

package/server/register/custom-fields/index.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerCustomFields = void 0;
+const comments_1 = require("./comments");
+const registerCustomFields = ({ strapi }) => {
+    if (!canRegister({ strapi })) {
+        strapi.log.warn("[Comments Plugin] Custom fields disabled. Upgrade Strapi to use custom fields.");
+        return;
+    }
+    strapi.customFields.register(comments_1.commentsCustomField);
+};
+exports.registerCustomFields = registerCustomFields;
+const canRegister = ({ strapi }) => !!strapi.customFields;
+//# sourceMappingURL=index.js.map

package/server/register/index.d.ts

@@ -0,0 +1,4 @@
+import { StrapiContext } from "strapi-typed";
+declare const register: (context: StrapiContext) => void;
+export default register;
+//# sourceMappingURL=index.d.ts.map

package/server/register/index.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const custom_fields_1 = require("./custom-fields");
+const register = (context) => {
+    (0, custom_fields_1.registerCustomFields)(context);
+};
+exports.default = register;
+//# sourceMappingURL=index.js.map

package/server/routes/admin.js

@@ -17,6 +17,14 @@ const routes = [
             policies: [],
         },
     },
+    {
+        method: "GET",
+        path: "/moderate/reports",
+        handler: "admin.findReports",
+        config: {
+            policies: [],
+        },
+    },
     {
         method: "GET",
         path: "/moderate/single/:id",
@@ -57,6 +65,14 @@ const routes = [
             policies: [],
         },
     },
+    {
+        method: "DELETE",
+        path: "/moderate/single/:id/delete",
+        handler: "admin.deleteComment",
+        config: {
+            policies: [],
+        },
+    },
     {
         method: "PATCH",
         path: "/moderate/single/:id/report/:reportId/resolve",
@@ -68,11 +84,43 @@ const routes = [
     {
         method: "PUT",
         path: "/moderate/single/:id/report/resolve",
+        handler: "admin.resolveCommentMultipleAbuseReports",
+        config: {
+            policies: [],
+        },
+    },
+    {
+        method: "PUT",
+        path: "/moderate/all/:id/report/resolve",
+        handler: "admin.resolveAllAbuseReportsForComment",
+        config: {
+            policies: [],
+        },
+    },
+    {
+        method: "PUT",
+        path: "/moderate/all/:id/report/resolve-thread",
+        handler: "admin.resolveAllAbuseReportsForThread",
+        config: {
+            policies: [],
+        },
+    },
+    {
+        method: "PUT",
+        path: "/moderate/multiple/report/resolve",
         handler: "admin.resolveMultipleAbuseReports",
         config: {
             policies: [],
         },
     },
+    {
+        method: "PUT",
+        path: "/moderate/single/:id/update",
+        handler: "admin.updateComment",
+        config: {
+            policies: [],
+        },
+    },
     {
         method: "PATCH",
         path: "/moderate/thread/:id/block",
@@ -89,6 +137,14 @@ const routes = [
             policies: [],
         },
     },
+    {
+        method: "POST",
+        path: "/moderate/thread/:id/postComment",
+        handler: "admin.postComment",
+        config: {
+            policies: [],
+        },
+    },
     {
         method: "GET",
         path: "/settings/config",

package/server/services/admin.d.ts

@@ -1,4 +1,4 @@
-import { StrapiContext } from "strapi-typed";
+import { StrapiContext } from 'strapi-typed';
 import { IServiceAdmin } from "../../types";
 declare const _default: ({ strapi }: StrapiContext) => IServiceAdmin;
 export = _default;