From aceeb896886565708095f307f2ed621148b58571 Mon Sep 17 00:00:00 2001
From: Edgard <edgardmessias@gmail.com>
Date: Mon, 17 Oct 2022 18:33:48 -0300
Subject: [PATCH] fix: Fixed generated message ID for groups

---
 src/chat/functions/generateMessageID.ts | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/chat/functions/generateMessageID.ts b/src/chat/functions/generateMessageID.ts
index 9c96175da5..eaa88c7b15 100644
--- a/src/chat/functions/generateMessageID.ts
+++ b/src/chat/functions/generateMessageID.ts
@@ -15,7 +15,7 @@
  */
 
 import { assertWid } from '../../assert';
-import { ChatModel, MsgKey, UserPrefs, Wid } from '../../whatsapp';
+import { ChatModel, MsgKey, UserPrefs, Wid, WidFactory } from '../../whatsapp';
 import { randomMessageId } from '../../whatsapp/functions';
 
 /**
@@ -24,6 +24,7 @@ import { randomMessageId } from '../../whatsapp/functions';
  * @category Message
  */
 export function generateMessageID(chat: string | ChatModel | Wid): MsgKey {
+  const from = UserPrefs.getMaybeMeUser();
   let to: Wid;
 
   if (chat instanceof Wid) {
@@ -34,10 +35,17 @@ export function generateMessageID(chat: string | ChatModel | Wid): MsgKey {
     to = assertWid(chat);
   }
 
+  let participant = undefined;
+
+  if (to.isGroup()) {
+    participant = WidFactory.toUserWid(from);
+  }
+
   return new MsgKey({
-    from: UserPrefs.getMaybeMeUser(),
-    to: to,
+    from,
+    to,
     id: randomMessageId(),
+    participant,
     selfDir: 'out',
   });
 }