fix: OnParticipantsChanged (#1250)

wppconnect-team · Aug 4, 2022 · 76b179a · 76b179a
1 parent 34b7ba9
commit 76b179a
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 55 deletions.
diff --git a/src/api/layers/listener.layer.ts b/src/api/layers/listener.layer.ts
@@ -239,6 +239,16 @@ export class ListenerLayer extends ProfileLayer {
         } catch (error) {
           console.error(error);
         }
+        try {
+          if (!window['onParticipantsChanged'].exposed) {
+            WPP.on('group.participant_changed', (participantChangedEvent) => {
+              window['onParticipantsChanged'](participantChangedEvent);
+            });
+            window['onParticipantsChanged'].exposed = true;
+          }
+        } catch (error) {
+          console.error(error);
+        }
       })
       .catch(() => {});
   }
@@ -377,9 +387,9 @@ export class ListenerLayer extends ProfileLayer {
    * @param to callback
    * @returns Stream of ParticipantEvent
    */
-  public onParticipantsChanged(
-    callback: (participantChangedEvent: ParticipantEvent) => void
-  ): { dispose: () => void };
+  public onParticipantsChanged(callback: (evData: ParticipantEvent) => void): {
+    dispose: () => void;
+  };
   /**
    * @event Listens to participants changed
    * @param to group id: xxxxx-yyyy@us.c
@@ -388,40 +398,30 @@ export class ListenerLayer extends ProfileLayer {
    */
   public onParticipantsChanged(
     groupId: string,
-    callback: (participantChangedEvent: ParticipantEvent) => void
+    callback: (evData: ParticipantEvent) => void
   ): { dispose: () => void };
   public onParticipantsChanged(
     groupId: any,
-    callback?: (participantChangedEvent: ParticipantEvent) => void
+    callback?: (evData: 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,
-        });
+    return this.registerEvent(ExposedFn.onParticipantsChanged, (evData) => {
+      if (groupId && groupId !== evData.groupId) {
+        return;
       }
-    );
+      callback({
+        by: evData.author,
+        byPushName: evData.authorPushName,
+        groupId: evData.groupId,
+        action: evData.action,
+        operation: evData.operation,
+        who: evData.participants,
+      });
+    });
   }
 
   /**

diff --git a/src/api/model/enum/group-change-event.ts b/src/api/model/enum/group-change-event.ts
diff --git a/src/api/model/enum/index.ts b/src/api/model/enum/index.ts
@@ -17,7 +17,6 @@
 
 export { AckType } from './ack-type';
 export { ChatState } from './chat-state';
-export { GroupChangeEvent } from './group-change-event';
 export { GroupNotificationType } from './group-notification-type';
 export { SocketState, SocketStream } from './socket-state';
 export { MessageType, MediaType } from './message-type';

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 { GroupChangeEvent } from './enum';
-
 export interface ParticipantEvent {
-  by: string;
+  by?: string;
+  byPushName?: string;
   groupId: string;
-  action: GroupChangeEvent;
+  action: 'add' | 'remove' | 'demote' | 'promote' | 'leaver' | 'join';
+  operation: 'add' | 'remove' | 'demote' | 'promote';
   who: string[];
 }