strapi-plugin-comments 2.1.5 → 2.1.8

package/server/services/admin.js

@@ -7,7 +7,6 @@ const lodash_1 = require("lodash");
 const error_1 = __importDefault(require("./../utils/error"));
 const functions_2 = require("./utils/functions");
 const constants_1 = require("./../utils/constants");
-const DEFAULT_AUTHOR_POPULATE = { avatar: true };
 module.exports = ({ strapi }) => ({
     getCommonService() {
         return (0, functions_1.getPluginService)("common");
@@ -66,11 +65,12 @@ module.exports = ({ strapi }) => ({
     async restart() {
         setImmediate(() => strapi.reload());
     },
-    async findAll({ related, entity, ...query }) {
+    async findAll({ ...query }) {
         const { _q, orderBy, pageSize = 10, page = 1, filters, } = (0, functions_1.parseParams)(query);
         const defaultWhere = {
             $or: [{ removed: false }, { removed: null }],
         };
+        const defaultAuthorUserPopulate = this.getDefaultAuthorPopulate();
         let params = {
             where: !(0, lodash_1.isEmpty)(filters)
                 ? {
@@ -98,7 +98,7 @@ module.exports = ({ strapi }) => ({
             .findMany({
             ...params,
             populate: {
-                authorUser: { populate: DEFAULT_AUTHOR_POPULATE },
+                authorUser: defaultAuthorUserPopulate,
                 threadOf: true,
                 reports: {
                     where: {
@@ -112,7 +112,7 @@ module.exports = ({ strapi }) => ({
         });
         const relatedEntities = await this.getCommonService().findRelatedEntitiesFor(entities);
         const result = entities
-            .map((_) => (0, functions_2.filterOurResolvedReports)(this.getCommonService().sanitizeCommentEntity(_, DEFAULT_AUTHOR_POPULATE)))
+            .map((_) => (0, functions_2.filterOurResolvedReports)(this.getCommonService().sanitizeCommentEntity(_, defaultAuthorUserPopulate?.populate)))
             .map((_) => this.getCommonService().mergeRelatedEntityTo(_, relatedEntities));
         const pageCount = Math.floor(total / pageSize);
         return {
@@ -126,6 +126,7 @@ module.exports = ({ strapi }) => ({
         };
     },
     async findOneAndThread(id, { removed, ...query }) {
+        const defaultAuthorUserPopulate = this.getDefaultAuthorPopulate();
         const defaultWhere = !removed
             ? {
                 $or: [{ removed: false }, { removed: null }],
@@ -140,14 +141,10 @@ module.exports = ({ strapi }) => ({
         };
         const defaultPopulate = {
             populate: {
-                authorUser: {
-                    populate: DEFAULT_AUTHOR_POPULATE,
-                },
+                authorUser: defaultAuthorUserPopulate,
                 threadOf: {
                     populate: {
-                        authorUser: {
-                            populate: DEFAULT_AUTHOR_POPULATE,
-                        },
+                        authorUser: defaultAuthorUserPopulate,
                         ...reportsPopulation,
                     },
                 },
@@ -197,7 +194,7 @@ module.exports = ({ strapi }) => ({
         const selectedEntity = this.getCommonService().sanitizeCommentEntity({
             ...entity,
             threadOf: entity.threadOf || null,
-        }, DEFAULT_AUTHOR_POPULATE);
+        }, defaultAuthorUserPopulate?.populate);
         return {
             entity: relatedEntity,
             selected: selectedEntity,
@@ -265,5 +262,38 @@ module.exports = ({ strapi }) => ({
             data: { resolved: true },
         });
     },
+    async resolveMultipleAbuseReports(ids, commentId) {
+        const reportsToResolve = await strapi.db
+            .query((0, functions_2.getModelUid)("comment-report"))
+            .findMany({
+            where: {
+                id: ids,
+                related: commentId,
+            },
+            populate: ['related']
+        });
+        if (reportsToResolve.length === ids.length) {
+            return strapi.db
+                .query((0, functions_2.getModelUid)("comment-report"))
+                .updateMany({
+                where: { id: ids },
+                data: { resolved: true },
+            });
+        }
+        throw new error_1.default(400, 'At least one of selected reports got invalid comment entity relation. Try again.');
+    },
+    getDefaultAuthorPopulate() {
+        const strapiUserTypeUid = 'plugin::users-permissions.user';
+        const allowedTypes = ['media', 'relation'];
+        const { attributes } = strapi.contentTypes[strapiUserTypeUid] || {};
+        const relationTypes = Object.keys(attributes)
+            ?.filter((key) => allowedTypes.includes(attributes[key]?.type));
+        if (relationTypes.includes('avatar')) {
+            return {
+                populate: { avatar: true },
+            };
+        }
+        return undefined;
+    }
 });
 //# sourceMappingURL=admin.js.map

package/server/services/client.js

@@ -24,7 +24,7 @@ module.exports = ({ strapi }) => ({
         }
         const relatedEntity = await strapi.db
             .query(uid)
-            .findOne(relatedId);
+            .findOne({ where: { id: relatedId } });
         if (!relatedEntity) {
             throw new error_1.default(400, `Relation for field "related" does not exist. Check your payload please.`);
         }
@@ -90,10 +90,17 @@ module.exports = ({ strapi }) => ({
                     authorUser: true,
                 },
             });
-            return this.getCommonService().sanitizeCommentEntity({
+            const sanitizedEntity = this.getCommonService().sanitizeCommentEntity({
                 ...entity,
                 threadOf: linkToThread,
             });
+            try {
+                await this.sendResponseNotification(sanitizedEntity);
+            }
+            catch (e) {
+                console.error(e);
+            }
+            return sanitizedEntity;
         }
         throw new error_1.default(400, "No content received");
     },
@@ -255,5 +262,53 @@ module.exports = ({ strapi }) => ({
     async markAsRemovedNested(id, status) {
         return this.getCommonService().modifiedNestedNestedComments(id, "removed", status);
     },
+    async sendResponseNotification(entity) {
+        if (entity.threadOf) {
+            const thread = (0, lodash_1.isObject)(entity.threadOf) ? entity.threadOf : await this.getCommonService().findOne({ id: entity.threadOf });
+            let emailRecipient = thread?.author?.email;
+            if (thread.authorUser && !emailRecipient) {
+                const strapiUser = (0, lodash_1.isObject)(thread.authorUser) ? thread.authorUser : await strapi.db.query("api::user").findOne({
+                    where: { id: thread.authorUser }
+                });
+                emailRecipient = strapiUser?.email;
+            }
+            if (emailRecipient) {
+                const superAdmin = await strapi.db
+                    .query("admin::user")
+                    .findOne({
+                    where: {
+                        roles: { code: "strapi-super-admin" },
+                    },
+                });
+                const emailSender = await this.getCommonService().getConfig('client.contactEmail', superAdmin.email);
+                const clientAppUrl = await this.getCommonService().getConfig('client.url', 'our site');
+                try {
+                    await strapi
+                        .plugin("email")
+                        .service("email")
+                        .send({
+                        to: [emailRecipient],
+                        from: emailSender,
+                        subject: "You've got a new response to your comment",
+                        text: `Hello ${thread?.author?.name || emailRecipient}!
+                You've got a new response to your comment by ${entity?.author?.name || entity?.author?.email}.
+                
+                ------
+
+                "${entity.content}"
+
+                ------
+                
+                Visit ${clientAppUrl} and continue the discussion.
+                `,
+                    });
+                }
+                catch (err) {
+                    strapi.log.error(err);
+                    throw err;
+                }
+            }
+        }
+    },
 });
 //# sourceMappingURL=client.js.map

package/server/services/common.js

@@ -224,10 +224,10 @@ module.exports = ({ strapi }) => ({
                 where: { id: entitiesToChange.map((_) => _.id) },
                 data: { [fieldName]: value },
             });
-            if (entitiesToChange.length === changedEntities.length &&
-                changedEntities.length > 0) {
-                const nestedTransactions = await Promise.all(changedEntities.map((item) => this.modifiedNestedNestedComments(item.id, fieldName, value)));
-                return nestedTransactions.length === changedEntities.length;
+            if (entitiesToChange.length === changedEntities.count &&
+                changedEntities.count > 0) {
+                const nestedTransactions = await Promise.all(entitiesToChange.map((item) => this.modifiedNestedNestedComments(item.id, fieldName, value)));
+                return nestedTransactions.length === changedEntities.count;
             }
             return true;
         }

package/strapi-server.d.ts

@@ -149,6 +149,8 @@ declare const _default: () => {
             entryLabel: PluginConfigEntryLabels;
             reportReasons: PluginConfigReportReasons;
             badWords?: boolean | undefined;
+            client?: import("./types").PluginConfigClientService | undefined;
+            gql?: import("./types").PluginConfigGraphQL | undefined;
         };
         validator: (config: CommentsPluginConfig) => void;
     };