fix: Fixed isStatusV3 error (close #2054)

wppconnect-team · Jul 1, 2024 · dfae74d · dfae74d · ariona · Jul 2, 2024
1 parent 97c2e3e
commit dfae74d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/src/chat/functions/getMessageById.ts b/src/chat/functions/getMessageById.ts
@@ -59,7 +59,10 @@ export async function getMessageById(
     let msg = MsgStore.get(msgKey);
 
     if (!msg) {
-      if (msgKey.remote.isStatusV3()) {
+      if (
+        msgKey.remote?.toString()?.includes('status@broadcast') ||
+        msgKey.remote?.isStatusV3()
+      ) {
         msg = StatusV3Store.getMyStatus().msgs.get(msgKey);
       } else {
         const chat = assertGetChat(msgKey.remote);

diff --git a/src/chat/functions/getQuotedMsgKey.ts b/src/chat/functions/getQuotedMsgKey.ts
@@ -37,12 +37,17 @@ export function getQuotedMsgKey(msg: MsgModel): MsgKey {
   const remote = msg.quotedRemoteJid ? msg.quotedRemoteJid : msg.id.remote;
   const fromMe = getMyUserId()?.equals(msg.quotedParticipant) || false;
 
+  const isStatus =
+    typeof Wid.isStatusV3 === 'function'
+      ? Wid.isStatusV3(remote)
+      : Wid.isStatus(remote);
+
   const quotedMsgId = new MsgKey({
     id: msg.quotedStanzaID,
     fromMe: fromMe,
     remote: remote,
     participant:
-      Wid.isGroup(msg.from!) || Wid.isGroup(msg.to!) || Wid.isStatusV3(remote)
+      Wid.isGroup(msg.from!) || Wid.isGroup(msg.to!) || isStatus
         ? msg.quotedParticipant
         : undefined,
   });

diff --git a/src/whatsapp/misc/Wid.ts b/src/whatsapp/misc/Wid.ts
@@ -59,6 +59,8 @@ export declare class Wid {
 
   isStatusV3(): boolean;
 
+  isStatus(): boolean;
+
   isUser(): boolean;
 
   isLid(): boolean;
@@ -97,6 +99,8 @@ export declare class Wid {
 
   static isStatusV3(wid: string | Wid): boolean;
 
+  static isStatus(wid: string | Wid): boolean;
+
   static isUser(wid: string | Wid): boolean;
 
   static isLid(wid: string | Wid): boolean;