Merge pull request #4850 from coralproject/develop

v9.11.1

Author: kabeaty

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "9.11.0",
+  "version": "9.11.1",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [

common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "9.11.0",
+  "version": "9.11.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "9.11.0",
+  "version": "9.11.1",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "9.11.0",
+  "version": "9.11.1",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [

server/src/core/server/services/notifications/externalService.ts

@@ -116,6 +116,13 @@ const CreateNotificationsMutation = `
   }
 `;
 
+export const automatedModerator = {
+  id: "00000000-0000-0000-0000-000000000002",
+  email: "automated-moderator",
+  username: "<automated-moderator>",
+  type: ProfileType,
+};
+
 export class ExternalNotificationsService {
   private _active: boolean;
   private url?: string | null;
@@ -289,6 +296,7 @@ export class ExternalNotificationsService {
       const data = {
         source: NotificationSource,
         type: NotificationType.CoralCommentApproved,
+        from: automatedModerator,
         to: this.userToExternalProfile(input.to),
         story: this.storyToInput(input.story),
         site: this.siteToInput(input.site),
@@ -315,6 +323,7 @@ export class ExternalNotificationsService {
       const data = {
         source: NotificationSource,
         type: NotificationType.CoralCommentRejected,
+        from: automatedModerator,
         to: this.userToExternalProfile(input.to),
         story: this.storyToInput(input.story),
         site: this.siteToInput(input.site),
@@ -341,6 +350,7 @@ export class ExternalNotificationsService {
       const data = {
         source: NotificationSource,
         type: NotificationType.CoralCommentFeatured,
+        from: automatedModerator,
         to: this.userToExternalProfile(input.to),
         story: this.storyToInput(input.story),
         site: this.siteToInput(input.site),

server/src/core/server/stacks/rejectComment.ts

@@ -213,16 +213,17 @@ const rejectComment = async (
 
   if (
     sendNotification &&
-    !(reason?.code === GQLREJECTION_REASON_CODE.BANNED_WORD) &&
-    tenant.dsa?.enabled
+    !(reason?.code === GQLREJECTION_REASON_CODE.BANNED_WORD)
   ) {
-    await notifications.create(tenant.id, tenant.locale, {
-      targetUserID: result.after.authorID!,
-      comment: result.after,
-      rejectionReason: reason,
-      type: GQLNOTIFICATION_TYPE.COMMENT_REJECTED,
-      previousStatus: result.before.status,
-    });
+    if (tenant.dsa?.enabled) {
+      await notifications.create(tenant.id, tenant.locale, {
+        targetUserID: result.after.authorID!,
+        comment: result.after,
+        rejectionReason: reason,
+        type: GQLNOTIFICATION_TYPE.COMMENT_REJECTED,
+        previousStatus: result.before.status,
+      });
+    }
 
     await sendExternalRejectNotification(
       mongo,