fix(conversation): cleaning content

close #641

Author: BatAmar Battulga

src/data/utils.ts

@@ -6,6 +6,7 @@ import * as fs from 'fs';
 import * as Handlebars from 'handlebars';
 import * as nodemailer from 'nodemailer';
 import * as requestify from 'requestify';
+import * as strip from 'strip';
 import * as xlsxPopulate from 'xlsx-populate';
 import { Customers, Notifications, Users } from '../db/models';
 import { IUser, IUserDocument } from '../db/models/definitions/users';
@@ -814,6 +815,8 @@ export default {
   createTransporter,
 };
 
+export const cleanHtml = (content?: string) => strip(content || '').substring(0, 100);
+
 export const validSearchText = (values: string[]) => {
   const value = values.join(' ');
 

src/db/models/ConversationMessages.ts

@@ -27,17 +27,11 @@ export const loadClass = () => {
         conversationId: message.conversationId,
       }).countDocuments();
 
-      await Conversations.updateOne(
-        { _id: message.conversationId },
-        {
-          $set: {
-            messageCount,
-
-            // updating updatedAt
-            updatedAt: new Date(),
-          },
-        },
-      );
+      await Conversations.updateConversation(message.conversationId, {
+        messageCount,
+        // updating updatedAt
+        updatedAt: new Date(),
+      });
 
       if (message.userId) {
         // add created user to participators
@@ -92,7 +86,7 @@ export const loadClass = () => {
         modifier.firstRespondedDate = new Date();
       }
 
-      await Conversations.updateOne({ _id: doc.conversationId }, { $set: modifier });
+      await Conversations.updateConversation(doc.conversationId, modifier);
 
       return this.createMessage({ ...doc, userId });
     }

src/db/models/Conversations.ts

@@ -1,5 +1,6 @@
 import { Model, model } from 'mongoose';
 import { ConversationMessages, Users } from '.';
+import { cleanHtml } from '../../data/utils';
 import { CONVERSATION_STATUSES } from './definitions/constants';
 import { IMessageDocument } from './definitions/conversationMessages';
 import { conversationSchema, IConversation, IConversationDocument } from './definitions/conversations';
@@ -14,6 +15,7 @@ interface ISTATUSES {
 export interface IConversationModel extends Model<IConversationDocument> {
   getConversationStatuses(): ISTATUSES;
   createConversation(doc: IConversation): Promise<IConversationDocument>;
+  updateConversation(_id: string, doc): Promise<IConversationDocument>;
   checkExistanceConversations(ids: string[]): any;
   reopen(_id: string): Promise<IConversationDocument>;
 
@@ -66,32 +68,39 @@ export const loadClass = () => {
       return Conversations.create({
         status: this.getConversationStatuses().NEW,
         ...doc,
+        content: cleanHtml(doc.content),
         createdAt: doc.createdAt || now,
         updatedAt: doc.createdAt || now,
         number: (await Conversations.find().countDocuments()) + 1,
         messageCount: 0,
       });
     }
 
+    /**
+     * Update a conversation
+     */
+    public static async updateConversation(_id, doc) {
+      if (doc.content) {
+        doc.content = cleanHtml(doc.content);
+      }
+
+      return Conversations.updateOne({ _id }, { $set: doc });
+    }
+
     /*
      * Reopens conversation
      */
     public static async reopen(_id: string) {
-      await Conversations.updateOne(
-        { _id },
-        {
-          $set: {
-            // reset read state
-            readUserIds: [],
-
-            // if closed, reopen
-            status: this.getConversationStatuses().OPEN,
-
-            closedAt: null,
-            closedUserId: null,
-          },
-        },
-      );
+      await Conversations.updateConversation(_id, {
+        // reset read state
+        readUserIds: [],
+
+        // if closed, reopen
+        status: this.getConversationStatuses().OPEN,
+
+        closedAt: null,
+        closedUserId: null,
+      });
 
       return Conversations.findOne({ _id });
     }
@@ -185,12 +194,12 @@ export const loadClass = () => {
 
       // if current user is first one
       if (!readUserIds || readUserIds.length === 0) {
-        await Conversations.updateOne({ _id }, { $set: { readUserIds: [userId] } });
+        await Conversations.updateConversation(_id, { readUserIds: [userId] });
       }
 
       // if current user is not in read users list then add it
       if (!readUserIds.includes(userId)) {
-        await Conversations.updateOne({ _id }, { $push: { readUserIds: userId } });
+        await Conversations.updateConversation(_id, { readUserIds: userId });
       }
 
       return Conversations.findOne({ _id });

src/db/models/definitions/conversations.ts

@@ -12,6 +12,7 @@ export interface IConversation {
   readUserIds?: string[];
 
   createdAt?: Date;
+  updatedAt?: Date;
   closedAt?: Date;
   closedUserId?: string;
 

src/middlewares/integrationsApiMiddleware.ts

@@ -2,14 +2,6 @@ import { ActivityLogs, ConversationMessages, Conversations, Customers, Integrati
 import { CONVERSATION_STATUSES } from '../db/models/definitions/constants';
 import { graphqlPubsub } from '../pubsub';
 
-interface IMessage {
-  status: string;
-  attachments: string[];
-  readUserIds: string[];
-  content?: string;
-  updatedAt?: Date;
-}
-
 /*
  * Handle requests from integrations api
  */
@@ -59,7 +51,7 @@ const integrationsApiMiddleware = async (req, res) => {
     if (doc.conversationId) {
       const { conversationId, content } = doc;
 
-      await Conversations.updateOne({ _id: conversationId }, { $set: { content } });
+      await Conversations.updateConversation(conversationId, { content });
 
       return res.json({ _id: conversationId });
     }
@@ -74,25 +66,23 @@ const integrationsApiMiddleware = async (req, res) => {
   if (action === 'create-conversation-message') {
     const message = await ConversationMessages.createMessage(doc);
 
-    const messageDoc: IMessage = {
+    const conversationDoc: { status: string; readUserIds: string[]; content?: string; updatedAt?: Date } = {
       // Reopen its conversation if it's closed
       status: doc.unread || doc.unread === undefined ? CONVERSATION_STATUSES.OPEN : CONVERSATION_STATUSES.CLOSED,
 
-      attachments: message.attachments,
-
       // Mark as unread
       readUserIds: [],
     };
 
     if (message.content && metaInfo === 'replaceContent') {
-      messageDoc.content = message.content;
+      conversationDoc.content = message.content;
     }
 
     if (doc.createdAt) {
-      messageDoc.updatedAt = doc.createdAt;
+      conversationDoc.updatedAt = doc.createdAt;
     }
 
-    await Conversations.updateOne({ _id: message.conversationId }, { $set: messageDoc });
+    await Conversations.updateConversation(message.conversationId, conversationDoc);
 
     graphqlPubsub.publish('conversationClientMessageInserted', {
       conversationClientMessageInserted: message,

src/migrations/17737260261250-clean-conversation-content.ts

@@ -0,0 +1,13 @@
+import { cleanHtml } from '../data/utils';
+import { connect } from '../db/connection';
+import { Conversations } from '../db/models';
+
+module.exports.up = async () => {
+  await connect();
+
+  const conversations = await Conversations.find({}, { _id: 1, content: 1 });
+
+  for (const conversation of conversations) {
+    await Conversations.updateOne({ _id: conversation._id }, { $set: { content: cleanHtml(conversation.content) } });
+  }
+};