Allow edit message

.gitignore

@@ -2,3 +2,4 @@
 ssl/
 .env
 .wwebjs_auth
+.wwebjs_cache

backend/.gitignore

@@ -15,4 +15,5 @@ yarn-error.log
 /coverage.data
 /coverage/
 
-.wwebjs_auth/
+.wwebjs_auth/
+.wwebjs_cache/

backend/src/controllers/MessageController.ts

@@ -9,6 +9,7 @@ import ShowTicketService from "../services/TicketServices/ShowTicketService";
 import DeleteWhatsAppMessage from "../services/WbotServices/DeleteWhatsAppMessage";
 import SendWhatsAppMedia from "../services/WbotServices/SendWhatsAppMedia";
 import SendWhatsAppMessage from "../services/WbotServices/SendWhatsAppMessage";
+import EditWhatsAppMessage from "../services/WbotServices/EditWhatsAppMessage";
 
 type IndexQuery = {
   pageNumber: string;
@@ -57,6 +58,21 @@ export const store = async (req: Request, res: Response): Promise<Response> => {
   return res.send();
 };
 
+export const edit = async (req: Request, res: Response): Promise<Response> => {
+  const { messageId } = req.params;
+  const { body }: MessageData = req.body;
+
+  const message = await EditWhatsAppMessage(messageId, body);
+
+  const io = getIO();
+  io.to(message.ticketId.toString()).emit("appMessage", {
+    action: "update",
+    message
+  });
+
+  return res.send();
+}
+
 export const remove = async (
   req: Request,
   res: Response

backend/src/database/index.ts

@@ -10,6 +10,7 @@ import Queue from "../models/Queue";
 import WhatsappQueue from "../models/WhatsappQueue";
 import UserQueue from "../models/UserQueue";
 import QuickAnswer from "../models/QuickAnswer";
+import OldMessage from "../models/OldMessage";
 
 // eslint-disable-next-line
 const dbConfig = require("../config/database");
@@ -28,7 +29,8 @@ const models = [
   Queue,
   WhatsappQueue,
   UserQueue,
-  QuickAnswer
+  QuickAnswer,
+  OldMessage
 ];
 
 sequelize.addModels(models);

backend/src/database/migrations/20231114153108-add-isEdited-column-to-messages.ts

@@ -0,0 +1,15 @@
+import { QueryInterface, DataTypes } from "sequelize";
+
+module.exports = {
+  up: (queryInterface: QueryInterface) => {
+    return queryInterface.addColumn("Messages", "isEdited", {
+      type: DataTypes.BOOLEAN,
+      allowNull: false,
+      defaultValue: false
+    });
+  },
+
+  down: (queryInterface: QueryInterface) => {
+    return queryInterface.removeColumn("Messages", "isEdited");
+  }
+};

backend/src/database/migrations/20231117174628-create-oldMessages.ts

@@ -0,0 +1,37 @@
+import { QueryInterface, DataTypes } from "sequelize";
+
+module.exports = {
+  up: (queryInterface: QueryInterface) => {
+    return queryInterface.createTable("OldMessages", {
+      id: {
+        type: DataTypes.INTEGER,
+        autoIncrement: true,
+        primaryKey: true,
+        allowNull: false
+      },
+      messageId: {
+        type: DataTypes.STRING,
+        references: { model: "Messages", key: "id"},
+        onUpdate: "CASCADE",
+        onDelete: "CASCADE",
+        allowNull: false
+      },
+      body: {
+        type: DataTypes.TEXT,
+        allowNull: false
+      },
+      createdAt: {
+        type: DataTypes.DATE(6),
+        allowNull: false
+      },
+      updatedAt: {
+        type: DataTypes.DATE(6),
+        allowNull: false
+      }
+    });
+  },
+
+  down: (queryInterface: QueryInterface) => {
+    return queryInterface.dropTable("OldMessages");
+  }
+};

backend/src/models/Message.ts

@@ -8,10 +8,12 @@ import {
   PrimaryKey,
   Default,
   BelongsTo,
-  ForeignKey
+  ForeignKey,
+  HasMany
 } from "sequelize-typescript";
 import Contact from "./Contact";
 import Ticket from "./Ticket";
+import OldMessage from "./OldMessage";
 
 @Table
 class Message extends Model<Message> {
@@ -51,6 +53,10 @@ class Message extends Model<Message> {
   @Column
   isDeleted: boolean;
 
+  @Default(false)
+  @Column
+  isEdited: boolean;
+
   @CreatedAt
   @Column(DataType.DATE(6))
   createdAt: Date;
@@ -79,6 +85,9 @@ class Message extends Model<Message> {
 
   @BelongsTo(() => Contact, "contactId")
   contact: Contact;
+
+  @HasMany(() => OldMessage)
+  oldMessages: OldMessage[];
 }
 
 export default Message;

backend/src/models/OldMessage.ts

@@ -0,0 +1,42 @@
+import {
+    Table,
+    Column,
+    CreatedAt,
+    UpdatedAt,
+    Model,
+    PrimaryKey,
+    ForeignKey,
+    BelongsTo,
+    DataType,
+    AutoIncrement   
+  } from "sequelize-typescript";
+
+import Message from "./Message";
+
+@Table
+class OldMessage extends Model<OldMessage> {
+  @PrimaryKey
+  @AutoIncrement
+  @Column
+  id: number;
+
+  @Column(DataType.TEXT)
+  body: string;
+
+  @CreatedAt
+  @Column(DataType.DATE(6))
+  createdAt: Date;
+
+  @UpdatedAt
+  @Column(DataType.DATE(6))
+  updatedAt: Date;
+
+  @ForeignKey(() => Message)
+  @Column
+  messageId: string;
+
+  @BelongsTo(() => Message)
+  message: Message;
+}
+
+export default OldMessage;

backend/src/routes/messageRoutes.ts

@@ -18,6 +18,8 @@ messageRoutes.post(
   MessageController.store
 );
 
+messageRoutes.post("/messages/edit/:messageId", isAuth, MessageController.edit);
+
 messageRoutes.delete("/messages/:messageId", isAuth, MessageController.remove);
 
 export default messageRoutes;

backend/src/services/MessageServices/CreateMessageService.ts

@@ -1,5 +1,6 @@
 import { getIO } from "../../libs/socket";
 import Message from "../../models/Message";
+import OldMessage from "../../models/OldMessage";
 import Ticket from "../../models/Ticket";
 import Whatsapp from "../../models/Whatsapp";
 
@@ -41,6 +42,10 @@ const CreateMessageService = async ({
         model: Message,
         as: "quotedMsg",
         include: ["contact"]
+      },
+      {
+        model: OldMessage,
+        as: "oldMessages"
       }
     ]
   });

backend/src/services/MessageServices/ListMessagesService.ts

@@ -1,6 +1,7 @@
 import AppError from "../../errors/AppError";
 import Message from "../../models/Message";
 import Ticket from "../../models/Ticket";
+import OldMessage from "../../models/OldMessage";
 import ShowTicketService from "../TicketServices/ShowTicketService";
 
 interface Request {
@@ -38,6 +39,10 @@ const ListMessagesService = async ({
         model: Message,
         as: "quotedMsg",
         include: ["contact"]
+      },
+      {
+        model: OldMessage,
+        as: "oldMessages"
       }
     ],
     offset,

backend/src/services/WbotServices/EditWhatsAppMessage.ts

@@ -0,0 +1,36 @@
+import AppError from "../../errors/AppError";
+import GetWbotMessage from "../../helpers/GetWbotMessage";
+import Message from "../../models/Message";
+import Ticket from "../../models/Ticket";
+
+const EditWhatsAppMessage = async (messageId: string, newBody: string): Promise<Message> => {
+  const message = await Message.findByPk(messageId, {
+    include: [
+      {
+        model: Ticket,
+        as: "ticket",
+        include: ["contact"]
+      }
+    ]
+  });
+
+  if (!message) {
+    throw new AppError("No message found with this ID.");
+  }
+
+  const { ticket } = message;
+
+  const messageToEdit = await GetWbotMessage(ticket, messageId);
+
+  try {
+    const res = await messageToEdit.edit(newBody);
+    if (res === null)
+      throw new Error("Can't edit");
+  } catch (err) {
+    throw new AppError("ERR_EDITING_WAPP_MSG");
+  }
+
+  return message;
+};
+
+export default EditWhatsAppMessage;

backend/src/services/WbotServices/wbotMessageListener.ts

@@ -25,6 +25,7 @@ import UpdateTicketService from "../TicketServices/UpdateTicketService";
 import CreateContactService from "../ContactServices/CreateContactService";
 import GetContactService from "../ContactServices/GetContactService";
 import formatBody from "../../helpers/Mustache";
+import OldMessage from "../../models/OldMessage";
 
 interface Session extends Client {
   id?: number;
@@ -424,6 +425,10 @@ const handleMsgAck = async (msg: WbotMessage, ack: MessageAck) => {
           model: Message,
           as: "quotedMsg",
           include: ["contact"]
+        },
+        {
+          model: OldMessage,
+          as: "oldMessages"
         }
       ]
     });
@@ -442,11 +447,54 @@ const handleMsgAck = async (msg: WbotMessage, ack: MessageAck) => {
   }
 };
 
+const handleMsgEdit = async (
+  msg: WbotMessage,
+  newBody: string,
+  oldBody: string
+): Promise<void> => {
+  let editedMsg = await Message.findByPk(msg.id.id, {
+    include: [
+      {
+        model: OldMessage,
+        as: "oldMessages"
+      }
+    ]
+  });
+
+  if (!editedMsg) return;
+
+  const io = getIO();
+
+  try {
+    const messageData = {
+      messageId: msg.id.id,
+      body: oldBody
+    }
+
+    await OldMessage.upsert(messageData);
+    await editedMsg.update({ body: newBody, isEdited: true});
+
+    await editedMsg.reload();
+
+    io.to(editedMsg.ticketId.toString()).emit("appMessage", {
+      action: "update",
+      message: editedMsg
+    });
+  } catch (err) {
+    Sentry.captureException(err);
+    logger.error(`Error handling message edit. Err: ${err}`);
+  }
+}
+
 const wbotMessageListener = (wbot: Session): void => {
   wbot.on("message_create", async msg => {
     handleMessage(msg, wbot);
   });
 
+  wbot.on("message_edit", async (msg, newBody, oldBody) => {
+    handleMsgEdit(msg, newBody as string, oldBody as string);
+  });
+
   wbot.on("media_uploaded", async msg => {
     handleMessage(msg, wbot);
   });

frontend/package.json

@@ -17,6 +17,7 @@
     "i18next-browser-languagedetector": "^6.0.1",
     "markdown-to-jsx": "^7.1.0",
     "mic-recorder-to-mp3": "^2.2.2",
+    "prop-types": "^15.8.1",
     "qrcode.react": "^1.0.0",
     "react": "^16.13.1",
     "react-color": "^2.19.3",
@@ -50,6 +51,5 @@
       "last 1 firefox version",
       "last 1 safari version"
     ]
-  },
-  "devDependencies": {}
+  }
 }