strapi-plugin-comments 2.2.0 → 2.2.2-beta.1

package/README.md

@@ -127,14 +127,14 @@ Complete installation requirements are exact same as for Strapi itself and can b
 
 **Minimum environment requirements**
 
-- Node.js `>=14.x.x`
+- Node.js `>=14.19.1 <=18.x.x`
 - NPM `>=7.x.x`
 
 In our minimum support we're following [official Node.js releases timelines](https://nodejs.org/en/about/releases/).
 
 **Supported Strapi versions**:
 
-- Strapi v4.4.3 (recently tested)
+- Strapi v4.5.2 (recently tested)
 - Strapi v4.x
 
 > This plugin is designed for **Strapi v4** and is not working with v3.x. To get version for **Strapi v3** install version [v1.x](https://github.com/VirtusLab-Open-Source/strapi-plugin-comments/tree/strapi-v3).

package/admin/src/components/ActionButton/styles.d.ts

@@ -1,2 +1,2 @@
-export declare const ActionButton: any;
+export declare const ActionButton: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
 //# sourceMappingURL=styles.d.ts.map

package/admin/src/components/AdminAvatar/index.d.ts

@@ -0,0 +1,4 @@
+import React from "react";
+declare const AdminAvatar: React.FC<React.PropsWithChildren<{}>>;
+export default AdminAvatar;
+//# sourceMappingURL=index.d.ts.map

package/admin/src/components/AdminAvatar/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_1 = __importDefault(require("react"));
+const styles_1 = require("./styles");
+const icons_1 = require("@strapi/icons");
+const Icon_1 = require("@strapi/design-system/Icon");
+const AdminAvatar = ({ children }) => {
+    return (react_1.default.createElement(styles_1.AdminAvatarWrapper, null,
+        react_1.default.createElement(styles_1.AdminShield, null,
+            react_1.default.createElement(Icon_1.Icon, { as: icons_1.Shield, color: "neutral800" })),
+        children));
+};
+exports.default = AdminAvatar;
+//# sourceMappingURL=index.js.map

package/admin/src/components/AdminAvatar/styles.d.ts

@@ -0,0 +1,3 @@
+export declare const AdminAvatarWrapper: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
+export declare const AdminShield: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
+//# sourceMappingURL=styles.d.ts.map

package/admin/src/components/AdminAvatar/styles.js

@@ -0,0 +1,17 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AdminShield = exports.AdminAvatarWrapper = void 0;
+const styled_components_1 = __importDefault(require("styled-components"));
+const Box_1 = require("@strapi/design-system/Box");
+exports.AdminAvatarWrapper = (0, styled_components_1.default)(Box_1.Box) `
+    position: relative;
+`;
+exports.AdminShield = (0, styled_components_1.default)(Box_1.Box) `
+    position: absolute;
+    right: -30%;
+    top: -30%;
+`;
+//# sourceMappingURL=styles.js.map

package/admin/src/components/Avatar/index.d.ts

@@ -1,13 +1,10 @@
-import PropTypes from "prop-types";
-declare const UserAvatar: {
-    ({ avatar, name }: {
-        avatar: any;
-        name: any;
-    }): any;
-    propTypes: {
-        avatar: PropTypes.Validator<any>;
-        name: PropTypes.Requireable<string>;
-    };
-};
+import React from "react";
+import { ToBeFixed } from "../../../../types";
+interface IProps {
+    avatar: string | ToBeFixed;
+    name: string;
+    isAdminComment?: boolean;
+}
+declare const UserAvatar: React.FC<IProps>;
 export default UserAvatar;
 //# sourceMappingURL=index.d.ts.map

package/admin/src/components/Avatar/index.js

@@ -4,23 +4,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
-const prop_types_1 = __importDefault(require("prop-types"));
 const lodash_1 = require("lodash");
 const Avatar_1 = require("@strapi/design-system/Avatar");
 const utils_1 = require("../../utils");
-const UserAvatar = ({ avatar, name }) => {
+const AdminAvatar_1 = __importDefault(require("../AdminAvatar"));
+;
+const UserAvatar = ({ avatar, name, isAdminComment = false }) => {
     if (avatar) {
         let image = avatar;
         if ((0, lodash_1.isObject)(avatar)) {
             image = avatar?.formats?.thumbnail.url || avatar.url;
         }
-        return image && (react_1.default.createElement(Avatar_1.Avatar, { src: image, alt: name }));
+        return (isAdminComment ? react_1.default.createElement(AdminAvatar_1.default, null, image && (react_1.default.createElement(Avatar_1.Avatar, { src: image, alt: name })))
+            : image && (react_1.default.createElement(Avatar_1.Avatar, { src: image, alt: name })));
     }
-    return name && (react_1.default.createElement(Avatar_1.Initials, null, (0, utils_1.renderInitials)(name)));
-};
-UserAvatar.propTypes = {
-    avatar: prop_types_1.default.oneOfType(prop_types_1.default.string, prop_types_1.default.object).isRequired,
-    name: prop_types_1.default.string,
+    return (isAdminComment ? react_1.default.createElement(AdminAvatar_1.default, null, name && (react_1.default.createElement(Avatar_1.Initials, null, (0, utils_1.renderInitials)(name))))
+        : name && (react_1.default.createElement(Avatar_1.Initials, null, (0, utils_1.renderInitials)(name))));
 };
 exports.default = UserAvatar;
 //# sourceMappingURL=index.js.map

package/admin/src/components/DiscussionThreadItem/styles.d.ts

@@ -1,4 +1,4 @@
-export declare const DiscussionThreadFullsize: any;
-export declare const DiscussionThreadItemContent: any;
-export declare const DiscussionThreadItemContainer: any;
+export declare const DiscussionThreadFullsize: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
+export declare const DiscussionThreadItemContent: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
+export declare const DiscussionThreadItemContainer: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
 //# sourceMappingURL=styles.d.ts.map

package/admin/src/components/DiscussionThreadItemActions/styles.d.ts

@@ -1,2 +1,2 @@
-export declare const DiscussionThreadItemActionsWrapper: any;
+export declare const DiscussionThreadItemActionsWrapper: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
 //# sourceMappingURL=styles.d.ts.map

package/admin/src/components/DiscussionThreadItemApprovalFlowActions/styles.d.ts

@@ -1,2 +1,2 @@
-export declare const DiscussionThreadItemActionsGroupWrapper: any;
+export declare const DiscussionThreadItemActionsGroupWrapper: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
 //# sourceMappingURL=styles.d.ts.map

package/admin/src/components/DiscussionThreadItemFooter/styles.d.ts

@@ -1,3 +1,3 @@
-export declare const DiscussionThreadItemFooterStyled: any;
-export declare const DiscussionThreadItemFooterMeta: any;
+export declare const DiscussionThreadItemFooterStyled: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
+export declare const DiscussionThreadItemFooterMeta: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
 //# sourceMappingURL=styles.d.ts.map

package/admin/src/components/FormSwitch/styles.d.ts

@@ -1,2 +1,2 @@
-export declare const StyledSwitch: any;
+export declare const StyledSwitch: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
 //# sourceMappingURL=styles.d.ts.map

package/admin/src/components/IconButton/styles.d.ts

@@ -1,2 +1,2 @@
-export declare const IconButtonGroupStyled: any;
+export declare const IconButtonGroupStyled: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
 //# sourceMappingURL=styles.d.ts.map

package/admin/src/components/LoadingIndicatorOverlay/styles.d.ts

@@ -1,3 +1,3 @@
-export declare const LoadingIndicatorOverlayWrapper: any;
-export declare const LoadingIndicatorContainer: any;
+export declare const LoadingIndicatorOverlayWrapper: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
+export declare const LoadingIndicatorContainer: import("styled-components").StyledComponent<(props: any) => any, any, {}, never>;
 //# sourceMappingURL=styles.d.ts.map

package/admin/src/components/ModeratorResponse/styles.d.ts

@@ -1,2 +1,2 @@
-export declare const ModeratorResponseStyled: any;
+export declare const ModeratorResponseStyled: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
 //# sourceMappingURL=styles.d.ts.map

package/admin/src/components/PreviewWysiwyg/Wrapper.d.ts

@@ -1,3 +1,3 @@
-declare const Wrapper: any;
+declare const Wrapper: import("styled-components").StyledComponent<"div", any, {}, never>;
 export default Wrapper;
 //# sourceMappingURL=Wrapper.d.ts.map

package/admin/src/components/StatusBadge/styles.d.ts

@@ -1,2 +1,2 @@
-export declare const StatusBadge: any;
+export declare const StatusBadge: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
 //# sourceMappingURL=styles.d.ts.map

package/admin/src/components/Wysiwyg/EditorLayout.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-export declare const ExpandButton: any;
+export declare const ExpandButton: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
 declare type EditorLayoutProps = {
     children: React.ReactNode;
     error: string | undefined;

package/admin/src/components/Wysiwyg/EditorStylesContainer.d.ts

@@ -1,2 +1,2 @@
-export declare const EditorStylesContainer: any;
+export declare const EditorStylesContainer: import("styled-components").StyledComponent<"div", any, {}, never>;
 //# sourceMappingURL=EditorStylesContainer.d.ts.map

package/admin/src/components/Wysiwyg/WysiwygStyles.d.ts

@@ -1,8 +1,8 @@
-export declare const CustomIconButton: any;
-export declare const CustomLinkIconButton: any;
-export declare const MainButtons: any;
-export declare const MoreButton: any;
-export declare const IconButtonGroupMargin: any;
-export declare const EditorAndPreviewWrapper: any;
-export declare const ExpandButton: any;
+export declare const CustomIconButton: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
+export declare const CustomLinkIconButton: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
+export declare const MainButtons: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
+export declare const MoreButton: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
+export declare const IconButtonGroupMargin: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
+export declare const EditorAndPreviewWrapper: import("styled-components").StyledComponent<"div", any, {}, never>;
+export declare const ExpandButton: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
 //# sourceMappingURL=WysiwygStyles.d.ts.map

package/admin/src/components/icons/strapiIcons.d.ts

@@ -21,4 +21,5 @@ export declare const comments: JSX.Element;
 export declare const trash: JSX.Element;
 export declare const pencil: JSX.Element;
 export declare const plus: JSX.Element;
+export declare const shield: JSX.Element;
 //# sourceMappingURL=strapiIcons.d.ts.map

package/admin/src/components/icons/strapiIcons.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.plus = exports.pencil = exports.trash = exports.comments = exports.unlock = exports.lock = exports.review = exports.refresh = exports.play = exports.information = exports.illo = exports.filter = exports.eye = exports.exclamationMarkCircle = exports.emptyPictures = exports.cross = exports.check = exports.carretDown = exports.arrowUp = exports.arrowRight = exports.arrowLeft = exports.apps = void 0;
+exports.shield = exports.plus = exports.pencil = exports.trash = exports.comments = exports.unlock = exports.lock = exports.review = exports.refresh = exports.play = exports.information = exports.illo = exports.filter = exports.eye = exports.exclamationMarkCircle = exports.emptyPictures = exports.cross = exports.check = exports.carretDown = exports.arrowUp = exports.arrowRight = exports.arrowLeft = exports.apps = void 0;
 const react_1 = __importDefault(require("react"));
 const icons_1 = require("@strapi/icons");
 const review_1 = __importDefault(require("./review"));
@@ -32,4 +32,5 @@ exports.comments = react_1.default.createElement(comments_1.default, null);
 exports.trash = react_1.default.createElement(icons_1.Trash, null);
 exports.pencil = react_1.default.createElement(icons_1.Pencil, null);
 exports.plus = react_1.default.createElement(icons_1.Plus, null);
+exports.shield = react_1.default.createElement(icons_1.Shield, null);
 //# sourceMappingURL=strapiIcons.js.map

package/admin/src/pages/Details/components/DetailsFilters/styles.d.ts

@@ -1,2 +1,2 @@
-export declare const TableLink: any;
+export declare const TableLink: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
 //# sourceMappingURL=styles.d.ts.map

package/admin/src/pages/Discover/components/DiscoverTableRow/index.js

@@ -47,24 +47,25 @@ const DiscoverTableRow = ({ config, item, allowedActions: { canModerate, canAcce
     if (reviewFlowEnabled || needsApproval) {
         actionItemsCount = 2;
     }
-    return (react_1.default.createElement(Table_1.Tr, { key: item.id },
+    const { author, isAdminComment, id, content, threadOf, related, createdAt, updatedAt } = item;
+    return (react_1.default.createElement(Table_1.Tr, { key: id },
         react_1.default.createElement(Table_1.Td, null,
             react_1.default.createElement(Typography_1.Typography, { textColor: "neutral800", fontWeight: "bold" },
                 "#",
-                item.id)),
+                id)),
         react_1.default.createElement(Table_1.Td, null,
             react_1.default.createElement(Stack_1.Stack, { size: 2, horizontal: true },
-                item.author && (react_1.default.createElement(Avatar_1.default, { avatar: item?.author?.avatar, name: item?.author?.name })),
-                react_1.default.createElement(Typography_1.Typography, { textColor: "neutral800", variant: "pi" }, item?.author?.name || (0, utils_1.getMessage)('compontents.author.unknown')))),
+                author && (react_1.default.createElement(Avatar_1.default, { avatar: author.avatar, name: author.name, isAdminComment: isAdminComment })),
+                react_1.default.createElement(Typography_1.Typography, { textColor: "neutral800", variant: "pi" }, author?.name || (0, utils_1.getMessage)('compontents.author.unknown')))),
         react_1.default.createElement(Table_1.Td, { style: { maxWidth: "30vw" } },
-            react_1.default.createElement(Typography_1.Typography, { textColor: "neutral800", ellipsis: true }, item.content)),
-        react_1.default.createElement(Table_1.Td, null, item.threadOf?.id ? (react_1.default.createElement(Link_1.Link, { to: renderDetailsUrl(item.threadOf) }, (0, utils_1.getMessage)({
+            react_1.default.createElement(Typography_1.Typography, { textColor: "neutral800", ellipsis: true }, content)),
+        react_1.default.createElement(Table_1.Td, null, threadOf?.id ? (react_1.default.createElement(Link_1.Link, { to: renderDetailsUrl(threadOf) }, (0, utils_1.getMessage)({
             id: "page.discover.table.cell.thread",
-            props: { id: item.threadOf.id },
-        }, "#" + item.threadOf.id))) : ("-")),
-        react_1.default.createElement(Table_1.Td, { style: { maxWidth: "15vw" } }, item.related ? (react_1.default.createElement(styles_1.TableLink, { to: renderEntryUrl(item.related) }, (0, renderEntryTitle_1.default)(item.related, config))) : ("-")),
+            props: { id: threadOf.id },
+        }, "#" + threadOf.id))) : ("-")),
+        react_1.default.createElement(Table_1.Td, { style: { maxWidth: "15vw" } }, related ? (react_1.default.createElement(styles_1.TableLink, { to: renderEntryUrl(related) }, (0, renderEntryTitle_1.default)(related, config))) : ("-")),
         react_1.default.createElement(Table_1.Td, null,
-            react_1.default.createElement(Typography_1.Typography, { textColor: "neutral800" }, formatDate(item.updatedAt || item.createdAt, {
+            react_1.default.createElement(Typography_1.Typography, { textColor: "neutral800" }, formatDate(updatedAt || createdAt, {
                 dateStyle: "long",
                 timeStyle: "short",
             }))),
@@ -73,7 +74,7 @@ const DiscoverTableRow = ({ config, item, allowedActions: { canModerate, canAcce
         react_1.default.createElement(Table_1.Td, null,
             react_1.default.createElement(Flex_1.Flex, { direction: "column", alignItems: "flex-end" },
                 react_1.default.createElement(styles_2.IconButtonGroupStyled, { isSingle: !(reviewFlowEnabled || (canModerate && needsApproval)) },
-                    canModerate && needsApproval && (react_1.default.createElement(DiscussionThreadItemApprovalFlowActions_1.default, { id: item.id, allowedActions: { canModerate } })),
+                    canModerate && needsApproval && (react_1.default.createElement(DiscussionThreadItemApprovalFlowActions_1.default, { id: id, allowedActions: { canModerate } })),
                     react_1.default.createElement(DiscussionThreadItemReviewAction_1.default, { item: item, queryToInvalidate: "get-data", allowedActions: {
                             canModerate,
                             canAccessReports,

package/admin/src/pages/Discover/components/DiscoverTableRow/styles.d.ts

@@ -1,2 +1,2 @@
-export declare const TableLink: any;
+export declare const TableLink: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
 //# sourceMappingURL=styles.d.ts.map

package/admin/src/pages/Discover/utils/filtersSchema.d.ts

@@ -1,11 +1,26 @@
-declare const filtersSchema: {
+declare const filtersSchema: ({
     name: string;
     metadatas: {
         label: string;
     };
     fieldSchema: {
         type: string;
+        mainField?: undefined;
     };
-}[];
+} | {
+    name: string;
+    metadatas: {
+        label: string;
+    };
+    fieldSchema: {
+        type: string;
+        mainField: {
+            name: string;
+            schema: {
+                type: string;
+            };
+        };
+    };
+})[];
 export default filtersSchema;
 //# sourceMappingURL=filtersSchema.d.ts.map

package/admin/src/pages/Discover/utils/filtersSchema.js

@@ -6,6 +6,34 @@ const filtersSchema = [
         metadatas: { label: "Message" },
         fieldSchema: { type: "string" },
     },
+    {
+        name: "createdAt",
+        metadatas: { label: "CreatedAt" },
+        fieldSchema: { type: "datetime" },
+    },
+    {
+        name: "updatedAt",
+        metadatas: { label: "UpdatedAt" },
+        fieldSchema: { type: "datetime" },
+    },
+    {
+        name: "authorName",
+        metadatas: { label: "Author" },
+        fieldSchema: { type: "string" },
+    },
+    {
+        name: "threadOf",
+        metadatas: { label: "threadOf" },
+        fieldSchema: {
+            type: "relation",
+            mainField: {
+                name: "id",
+                schema: {
+                    type: "number"
+                }
+            }
+        }
+    }
 ];
 exports.default = filtersSchema;
 //# sourceMappingURL=filtersSchema.js.map

package/admin/src/pages/Reports/components/ReportsTableRow/styles.d.ts

@@ -1,2 +1,2 @@
-export declare const TableLink: any;
+export declare const TableLink: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
 //# sourceMappingURL=styles.d.ts.map

package/admin/src/pages/Reports/utils/filtersSchema.d.ts

@@ -1,11 +1,26 @@
-declare const filtersSchema: {
+declare const filtersSchema: ({
     name: string;
     metadatas: {
         label: string;
     };
     fieldSchema: {
         type: string;
+        mainField?: undefined;
     };
-}[];
+} | {
+    name: string;
+    metadatas: {
+        label: string;
+    };
+    fieldSchema: {
+        type: string;
+        mainField: {
+            name: string;
+            schema: {
+                type: string;
+            };
+        };
+    };
+})[];
 export default filtersSchema;
 //# sourceMappingURL=filtersSchema.d.ts.map

package/admin/src/pages/Reports/utils/filtersSchema.js

@@ -6,6 +6,27 @@ const filtersSchema = [
         metadatas: { label: 'Message' },
         fieldSchema: { type: 'string' },
     },
+    {
+        name: 'reason',
+        metadatas: { label: 'Reason' },
+        fieldSchema: { type: 'enum' },
+    }, {
+        name: 'resolved',
+        metadatas: { label: 'Resolved' },
+        fieldSchema: { type: 'boolean' },
+    }, {
+        name: 'related',
+        metadatas: { label: 'Comment author' },
+        fieldSchema: {
+            type: "relation",
+            mainField: {
+                name: "authorName",
+                schema: {
+                    type: "string"
+                }
+            }
+        }
+    },
 ];
 exports.default = filtersSchema;
 //# sourceMappingURL=filtersSchema.js.map

package/admin/src/pages/Settings/components/RestartAlert/styles.d.ts

@@ -1,2 +1,2 @@
-export declare const RestartAlert: any;
+export declare const RestartAlert: import("styled-components").StyledComponent<any, any, object, string | number | symbol>;
 //# sourceMappingURL=styles.d.ts.map

package/content-types/comment.d.ts

@@ -60,6 +60,10 @@ declare const _default: {
             type: string;
             configurable: boolean;
         };
+        isAdminComment: {
+            type: string;
+            configurable: boolean;
+        };
         removed: {
             type: string;
             configurable: boolean;

package/content-types/comment.js

@@ -62,6 +62,10 @@ exports.default = {
             type: "string",
             configurable: false,
         },
+        isAdminComment: {
+            type: "boolean",
+            configurable: false,
+        },
         removed: {
             type: "boolean",
             configurable: false,

package/content-types/index.d.ts

@@ -62,6 +62,10 @@ declare const _default: {
                     type: string;
                     configurable: boolean;
                 };
+                isAdminComment: {
+                    type: string;
+                    configurable: boolean;
+                };
                 removed: {
                     type: string;
                     configurable: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-comments",
-  "version": "2.2.0",
+  "version": "2.2.2-beta.1",
   "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.3",
-    "@strapi/utils": "^4.4.3",
+    "@strapi/plugin-graphql": "^4.5.2",
+    "@strapi/utils": "^4.5.2",
     "@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": {
@@ -56,7 +58,7 @@
     }
   ],
   "engines": {
-    "node": ">=14.19.1 <=17.x.x",
+    "node": ">=14.19.1 <=18.x.x",
     "npm": ">=7.x.x"
   },
   "keywords": [

package/server/controllers/utils/parsers.js

@@ -1,9 +1,14 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.flatInput = void 0;
+const error_1 = __importDefault(require("../../utils/error"));
+const functions_1 = require("../../utils/functions");
 const flatInput = (payload) => {
     const { relation, query, sort, pagination, fields } = payload;
-    const { populate = {}, ...restQuery } = query;
+    const { populate = {}, filterBy, filterByValue, ...restQuery } = query;
     const filters = restQuery?.filters || restQuery;
     const orOperator = (filters?.$or || []).filter((_) => !Object.keys(_).includes("removed"));
     let basePopulate = {
@@ -32,6 +37,21 @@ const flatInput = (payload) => {
             },
         };
     }
+    if (filterBy === "DATE_CREATED") {
+        const date = new Date(filterByValue);
+        if (!filterByValue || Number.isNaN(+date)) {
+            throw new error_1.default(400, 'Invalid date specified in "filterByValue"');
+        }
+        const start = date.setHours(0, 0, 0, 0);
+        const end = date.setHours(23, 59, 59, 999);
+        filters.createdAt = {
+            $between: [start, end],
+        };
+    }
+    if (filterBy === "APPROVAL_STATUS") {
+        (0, functions_1.assertNotEmpty)(filterByValue, new error_1.default(400, 'Empty "filterByValue" parameter'));
+        filters.approvalStatus = filterByValue;
+    }
     return {
         query: {
             ...filters,

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

@@ -10,6 +10,7 @@ declare const _default: ({ strapi, nexus }: StrapiGraphQLContext) => {
     args: {
         relation: any;
         sort: any;
+        filters: any;
     };
     resolve(obj: Object, args: findAllInHierarchyProps): Promise<import("../../../types").Comment<import("../../../types").CommentAuthor>[]>;
 };

package/server/graphql/queries/findAllInHierarchy.js

@@ -9,11 +9,13 @@ module.exports = ({ strapi, nexus }) => {
     const { nonNull, list, stringArg } = nexus;
     const { service: getService } = strapi.plugin("graphql");
     const { args } = getService("internals");
+    const { naming: { getFiltersInputTypeName }, } = getService("utils");
     return {
         type: nonNull(list("CommentNested")),
         args: {
             relation: nonNull(stringArg()),
             sort: args.SortArg,
+            filters: getFiltersInputTypeName(comment_1.default),
         },
         async resolve(obj, args) {
             const { relation, filters, sort } = args;

package/server/services/admin.js

@@ -450,11 +450,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) {