fix: Improved onMessage event to re-trigger message after ciphertext (f…

…ix #1065)
wppconnect-team · Jul 11, 2022 · b9ff808 · b9ff808
1 parent 8ecaa6b
commit b9ff808
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/api/layers/listener.layer.ts b/src/api/layers/listener.layer.ts
@@ -102,11 +102,14 @@ export class ListenerLayer extends ProfileLayer {
       .evaluate(() => {
         try {
           if (!window['onMessage'].exposed) {
-            window.WAPI.waitNewMessages(false, (data) => {
-              data.forEach((message) => {
-                window['onMessage'](message);
-              });
+            WPP.on('chat.new_message', (msg) => {
+              if (msg.isSentByMe || msg.isStatusV3) {
+                return;
+              }
+              const serialized = WAPI.processMessageObj(msg, false, false);
+              window['onMessage'](serialized);
             });
+
             window['onMessage'].exposed = true;
           }
         } catch (error) {

diff --git a/src/types/WAPI.d.ts b/src/types/WAPI.d.ts
@@ -202,6 +202,11 @@ interface WAPI {
   waitNewMessages: (rmCallback: boolean, callback: Function) => void;
   _profilePicfunc: (contactId: string) => Promise<ProfilePicThumbObj>;
   _serializeChatObj: (chat: any) => any;
+  processMessageObj: (
+    messageObj: any,
+    includeMe: boolean,
+    includeNotifications: boolean
+  ) => any;
 }
 
 declare global {