Merge remote-tracking branch 'upstream/main' into main-rebased

Author: Alexey Poliakov

index.d.ts

@@ -210,6 +210,12 @@ declare namespace WAWebJS {
             options?: MessageSendOptions,
         ): Promise<Message>;
 
+        /** Send a reaction to a specific messageId */
+        sendReaction(
+            messageId: string,
+            reaction: string,
+        ): Promise<void>;
+
         /** Sends a channel admin invitation to a user, allowing them to become an admin of the channel */
         sendChannelAdminInvite(
             chatId: string,

src/Client.js

@@ -1647,6 +1647,33 @@ class Client extends EventEmitter {
         return sentMsg ? new Message(this, sentMsg) : undefined;
     }
 
+    /**
+     * Send an emoji reaction to a specific message
+     * @param {string} messageId - Id of the message to add the reaction.
+     * @param {string} reaction  - Emoji to react with. Send an empty string to remove the reaction.
+     * @return {Promise}
+     */
+    async sendReaction(messageId, reaction) {
+        await this.pupPage.evaluate(
+            async (messageId, reaction) => {
+                if (!messageId) return null;
+                const msg =
+                    window.require('WAWebCollections').Msg.get(messageId) ||
+                    (
+                        await window
+                            .require('WAWebCollections')
+                            .Msg.getMessagesById([messageId])
+                    )?.messages?.[0];
+                if (!msg) return null;
+                await window
+                    .require('WAWebSendReactionMsgAction')
+                    .sendReactionToMsg(msg, reaction);
+            },
+            messageId,
+            reaction,
+        );
+    }
+
     /**
      * @typedef {Object} SendChannelAdminInviteOptions
      * @property {?string} comment The comment to be added to an invitation

src/structures/Message.js

@@ -103,7 +103,7 @@ class Message extends Base {
          * @type {string}
          */
         this.deviceType =
-            typeof data.id.id === 'string' && data.id.id.length > 21
+            typeof data.id.id === 'string' && data.id.id.length > 25
                 ? 'android'
                 : typeof data.id.id === 'string' &&
                     data.id.id.substring(0, 2) === '3A'
@@ -477,24 +477,7 @@ class Message extends Base {
      * @return {Promise}
      */
     async react(reaction) {
-        await this.client.pupPage.evaluate(
-            async (messageId, reaction) => {
-                if (!messageId) return null;
-                const msg =
-                    window.require('WAWebCollections').Msg.get(messageId) ||
-                    (
-                        await window
-                            .require('WAWebCollections')
-                            .Msg.getMessagesById([messageId])
-                    )?.messages?.[0];
-                if (!msg) return null;
-                await window
-                    .require('WAWebSendReactionMsgAction')
-                    .sendReactionToMsg(msg, reaction);
-            },
-            this.id._serialized,
-            reaction,
-        );
+        return this.client.sendReaction(this.id._serialized, reaction);
     }
 
     /**