fix: Fixed onParticipantsChanged function (fix #171)

wppconnect-team · May 8, 2021 · 08975a0 · 08975a0
1 parent 32c395b
commit 08975a0
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 23 deletions.
diff --git a/src/api/layers/listener.layer.ts b/src/api/layers/listener.layer.ts
@@ -20,7 +20,7 @@ import { Page } from 'puppeteer';
 import { CreateConfig } from '../../config/create-config';
 import { ExposedFn } from '../helpers/exposed.enum';
 import { Ack, Chat, LiveLocation, Message, ParticipantEvent } from '../model';
-import { SocketState, SocketStream } from '../model/enum';
+import { MessageType, SocketState, SocketStream } from '../model/enum';
 import { InterfaceMode } from '../model/enum/interface-mode';
 import { InterfaceState } from '../model/enum/interface-state';
 import { ProfileLayer } from './profile.layer';
@@ -227,31 +227,56 @@ export class ListenerLayer extends ProfileLayer {
       );
   }
 
+  /**
+   * @event Listens to participants changed
+   * @param to callback
+   * @returns Stream of ParticipantEvent
+   */
+  public onParticipantsChanged(
+    callback: (participantChangedEvent: ParticipantEvent) => void
+  ): { dispose: () => void };
   /**
    * @event Listens to participants changed
    * @param to group id: xxxxx-yyyy@us.c
    * @param to callback
    * @returns Stream of ParticipantEvent
    */
-  public async onParticipantsChanged(
+  public onParticipantsChanged(
     groupId: string,
-    fn: (participantChangedEvent: ParticipantEvent) => void
-  ) {
-    const method =
-      'onParticipantsChanged_' + groupId.replace('_', '').replace('_', '');
-    return this.page
-      .exposeFunction(method, (participantChangedEvent: ParticipantEvent) =>
-        fn(participantChangedEvent)
-      )
-      .then((_) =>
-        this.page.evaluate(
-          ({ groupId, method }) => {
-            //@ts-ignore
-            WAPI.onParticipantsChanged(groupId, window[method]);
-          },
-          { groupId, method }
-        )
-      );
+    callback: (participantChangedEvent: ParticipantEvent) => void
+  ): { dispose: () => void };
+  public onParticipantsChanged(
+    groupId: any,
+    callback?: (participantChangedEvent: ParticipantEvent) => void
+  ): { dispose: () => void } {
+    if (typeof groupId === 'function') {
+      callback = groupId;
+      groupId = null;
+    }
+
+    const subtypeEvents = ['invite', 'add', 'remove', 'leave'];
+
+    return this.registerEvent(
+      ExposedFn.onNotificationMessage,
+      (message: Message) => {
+        // Only group events
+        if (
+          message.type !== MessageType.GP2 ||
+          !subtypeEvents.includes(message.subtype)
+        ) {
+          return;
+        }
+        if (groupId && groupId !== message.id) {
+          return;
+        }
+        callback({
+          by: message.from,
+          groupId: message.chatId,
+          action: message.subtype as any,
+          who: message.recipients,
+        });
+      }
+    );
   }
 
   /**

diff --git a/src/api/model/enum/group-change-event.ts b/src/api/model/enum/group-change-event.ts
@@ -16,6 +16,8 @@
  */
 
 export enum GroupChangeEvent {
-  Remove = 'remove',
   Add = 'add',
+  Inivite = 'invite',
+  Leave = 'leave',
+  Remove = 'remove',
 }
diff --git a/src/api/model/message.ts b/src/api/model/message.ts
@@ -67,6 +67,7 @@ export interface Message {
   chatId: string;
   quotedMsgObj: null;
   mediaData: MediaData;
+  recipients?: string[];
 }
 
 export interface MediaData {

diff --git a/src/api/model/participant-event.ts b/src/api/model/participant-event.ts
@@ -15,11 +15,11 @@
  * along with WPPConnect.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { Id } from './id';
 import { GroupChangeEvent } from './enum';
 
 export interface ParticipantEvent {
-  by: Id;
+  by: string;
+  groupId: string;
   action: GroupChangeEvent;
-  who: [Id];
+  who: string[];
 }