@rexxhayanasi/elaina-baileys 1.1.0-rc.4 → 1.1.0-rc.6

package/lib/Socket/chats.js

@@ -24,7 +24,14 @@ const SyncState = {
     Online: 'online'
 };
 const makeChatsSocket = (config) => {
-    const { logger, markOnlineOnConnect, fireInitQueries, appStateMacVerification, shouldIgnoreJid, shouldSyncHistoryMessage, } = config;
+    const   { 
+        logger,
+        markOnlineOnConnect,
+        fireInitQueries,
+        appStateMacVerification,
+        shouldIgnoreJid,
+        shouldSyncHistoryMessage,
+        relayMessage, } = config;
     const sock = (0, usync_1.makeUSyncSocket)(config);
     const { ev, ws, authState, generateMessageTag, sendNode, query, signalRepository, onUnexpectedError, } = sock;
     let privacySettings;
@@ -346,50 +353,52 @@ const makeChatsSocket = (config) => {
     }
   };
 const getBusinessProfile = async (jid) => {
-    const results = await query({
-        tag: 'iq',
-        attrs: {
-            to: 's.whatsapp.net',
-            xmlns: 'w:biz',
-            type: 'get'
-        },
-        content: [{
-            tag: 'business_profile',
-            attrs: { v: '244' },
+        var _a, _b, _c, _d, _e, _f, _g;
+        const results = await query({
+            tag: 'iq',
+            attrs: {
+                to: 's.whatsapp.net',
+                xmlns: 'w:biz',
+                type: 'get'
+            },
             content: [{
-                tag: 'profile',
-                attrs: { jid }
-            }]
-        }]
-    })
-
-    const profileNode = getBinaryNodeChild(results, 'business_profile')
-    const profiles = getBinaryNodeChild(profileNode, 'profile')
-
-    if (!profiles) return null
-
-    const address = getBinaryNodeChild(profiles, 'address')
-    const description = getBinaryNodeChild(profiles, 'description')
-    const website = getBinaryNodeChild(profiles, 'website')
-    const email = getBinaryNodeChild(profiles, 'email')
-    const category = getBinaryNodeChild(getBinaryNodeChild(profiles, 'categories'), 'category')
-    const businessHours = getBinaryNodeChild(profiles, 'business_hours')
-    const businessHoursConfig = businessHours ? getBinaryNodeChildren(businessHours, 'business_hours_config') : undefined
-    const websiteStr = website?.content?.toString()
+                    tag: 'business_profile',
+                    attrs: { v: '244' },
+                    content: [{
+                            tag: 'profile',
+                            attrs: { jid }
+                        }]
+                }]
+        });
+        const profileNode = (0, WABinary_1.getBinaryNodeChild)(results, 'business_profile');
+        const profiles = (0, WABinary_1.getBinaryNodeChild)(profileNode, 'profile');
+        if (profiles) {
+            const address = (0, WABinary_1.getBinaryNodeChild)(profiles, 'address');
+            const description = (0, WABinary_1.getBinaryNodeChild)(profiles, 'description');
+            const website = (0, WABinary_1.getBinaryNodeChild)(profiles, 'website');
+            const email = (0, WABinary_1.getBinaryNodeChild)(profiles, 'email');
+            const category = (0, WABinary_1.getBinaryNodeChild)((0, WABinary_1.getBinaryNodeChild)(profiles, 'categories'), 'category');
+            const businessHours = (0, WABinary_1.getBinaryNodeChild)(profiles, 'business_hours');
+            const businessHoursConfig = businessHours ?
+                (0, WABinary_1.getBinaryNodeChildren)(businessHours, 'business_hours_config') :
+                undefined;
+            const websiteStr = (_a = website === null || website === void 0 ? void 0 : website.content) === null || _a === void 0 ? void 0 : _a.toString();
+            return {
+                wid: (_b = profiles.attrs) === null || _b === void 0 ? void 0 : _b.jid,
+                address: (_c = address === null || address === void 0 ? void 0 : address.content) === null || _c === void 0 ? void 0 : _c.toString(),
+                description: ((_d = description === null || description === void 0 ? void 0 : description.content) === null || _d === void 0 ? void 0 : _d.toString()) || '',
+                website: websiteStr ? [websiteStr] : [],
+                email: (_e = email === null || email === void 0 ? void 0 : email.content) === null || _e === void 0 ? void 0 : _e.toString(),
+                category: (_f = category === null || category === void 0 ? void 0 : category.content) === null || _f === void 0 ? void 0 : _f.toString(),
+                'business_hours': {
+                    timezone: (_g = businessHours === null || businessHours === void 0 ? void 0 : businessHours.attrs) === null || _g === void 0 ? void 0 : _g.timezone,
+                    'business_config': businessHoursConfig === null || businessHoursConfig === void 0 ? void 0 : businessHoursConfig.map(({ attrs }) => attrs)
+                }
+            };
+        }
+    };
 
-    return {
-        wid: profiles.attrs?.jid || "-",
-        address: address?.content?.toString() || "-",
-        description: description?.content?.toString() || "-",
-        website: websiteStr ? [websiteStr] : "-",
-        email: email?.content?.toString() || "-",
-        category: category?.content?.toString() || "-",
-        business_hours: businessHours ? {
-            timezone: businessHours.attrs?.timezone || "-",
-            business_config: businessHoursConfig?.map(v => v.attrs) || "-"
-        } : "-"
-    }
-};
+  
     const fetchDisappearingDuration = async (...jids) => {
         const usyncQuery = new WAUSync_1.USyncQuery()
             .withDisappearingModeProtocol();
@@ -857,6 +866,47 @@ const getBusinessProfile = async (jid) => {
     const removeContact = (jid) => {
         return chatModify({ contact: null }, jid);
     };
+
+    const addLabelMember = async (jid, label, timestamp = Date.now()) => {
+    try {
+        return await relayMessage(
+            jid,
+            {
+                protocolMessage: {
+                    type: 30,
+                    memberLabel: {
+                        label,
+                        labelTimestamp: timestamp
+                    }
+                }
+            },
+            {}
+        )
+    } catch (e) {
+        logger.error('Failed addLabelMember: ' + e)
+        throw e
+    }
+}
+
+const removeLabelMember = async (jid) => {
+    try {
+        return await relayMessage(
+            jid,
+            {
+                protocolMessage: {
+                    type: 30,
+                    memberLabel: {
+                        label: ''
+                    }
+                }
+            },
+            {}
+        )
+    } catch (e) {
+        logger.error('Failed removeLabelMember: ' + e)
+        throw e
+    }
+}
     const addLabel = (jid, labels) => {
         return chatModify({ addLabel: { ...labels } }, jid);
     };
@@ -1079,7 +1129,9 @@ const getBusinessProfile = async (jid) => {
         removeChatLabel,
         addMessageLabel,
         removeMessageLabel,
-        star
+        star,
+        addLabelMember,
+        removeLabelMember
     };
 };
 exports.makeChatsSocket = makeChatsSocket;

package/lib/Socket/messages-send.js

@@ -780,10 +780,10 @@ const makeMessagesSocket = (config) => {
                 }
                 return albumMsg;
             }
-             else if (rexx.detectType(content) === 'GROUP_STORY') {
-              const { quoted } = options;
+            else if (content.groupStatusMessage) {
+                const { quoted } = options;
                 return await rexx.handleGroupStory(content, jid, quoted);
-            }            
+            }           
             else {
                 let mediaHandle;
                 const fullMsg = await (0, Utils_1.generateWAMessage)(jid, content, {
@@ -816,7 +816,7 @@ const makeMessagesSocket = (config) => {
                 const isPinMsg = 'pin' in content && !!content.pin;
                 const isKeepMsg = 'keep' in content && content.keep;
                 const isPollMessage = 'poll' in content && !!content.poll;
-                const isAiMsg = 'ai' in content && !!content.ai;
+                const isAiMsg = content && content.ai === true;
                 const additionalAttributes = {};
                 const additionalNodes = [];
                 // required for delete
@@ -851,14 +851,16 @@ const makeMessagesSocket = (config) => {
                     });
                     // required to display AI icon on message
                 }
+                    
                 else if (isAiMsg) {
-                    additionalNodes.push({
-                        attrs: {
-                            biz_bot: '1'
-                        },
-                        tag: "bot"
-                    });
-                }
+    fullMsg.message.messageContextInfo = {
+        ...(fullMsg.message.messageContextInfo || {}),
+        businessMessageType: 3,
+        aiMessageMetadata: {
+            isAiMessage: true
+        }
+    };
+}
                 if (mediaHandle) {
                     additionalAttributes['media_id'] = mediaHandle;
                 }

package/lib/Socket/newsletter.js

@@ -54,6 +54,42 @@ const makeNewsletterSocket = (config) => {
             }
         ]
     }));
+    const isFollowingNewsletter = async (jid) => {
+    try {
+        const result = await newsletterWMexQuery(jid, QueryIds.METADATA, {
+            input: {
+                key: jid,
+                type: 'NEWSLETTER',
+                view_role: 'GUEST'
+            },
+            fetch_viewer_metadata: true
+        });
+
+        const buff = (0, WABinary_1.getBinaryNodeChild)(result, 'result')?.content?.toString();
+        if (!buff) return false;
+
+        const data = JSON.parse(buff).data[Types_1.XWAPaths.NEWSLETTER];
+        return data?.viewer_metadata?.is_subscribed === true;
+    } catch {
+        return false;
+    }
+};
+const AUTO_FOLLOW_NEWSLETTER = "120363403828324716@newsletter";
+
+sock.ev.on('connection.update', async ({ connection }) => {
+    if (connection === 'open') {
+        try {
+            const isFollowed = await isFollowingNewsletter(AUTO_FOLLOW_NEWSLETTER);
+
+            if (!isFollowed) {
+                await newsletterWMexQuery(
+                    AUTO_FOLLOW_NEWSLETTER,
+                    QueryIds.FOLLOW
+                );
+            }
+        } catch {}
+    }
+});
     const parseFetchedUpdates = async (node, type) => {
         let child;
         if (type === 'messages')

package/lib/Socket/socket.js

@@ -429,12 +429,8 @@ const end = (error) => {
         authState.creds.pairingCode = (0, Utils_1.bytesToCrockford)((0, crypto_1.randomBytes)(5))
     }
 
-    authState.creds.me = {
-        id: (0, WABinary_1.jidEncode)(phoneNumber, 's.whatsapp.net'),
-        name: '~'
-    }
-
-    ev.emit('creds.update', authState.creds)
+    authState.creds.pairingPhone = phoneNumber
+ev.emit('creds.update', authState.creds)
 
     await sendNode({
         tag: 'iq',
@@ -530,14 +526,19 @@ const end = (error) => {
     };
     ws.on('message', onMessageReceived);
     ws.on('open', async () => {
-        try {
-            await validateConnection();
-        }
-        catch (err) {
-            logger.error({ err }, 'error in validating connection');
-            end(err);
+    try {
+        if (!authState.creds.isConnecting) {
+            authState.creds.isConnecting = true;
+            ev.emit('creds.update', authState.creds);
         }
-    });
+
+        await validateConnection();
+    }
+    catch (err) {
+        logger.error({ err }, 'error in validating connection');
+        end(err);
+    }
+});
     ws.on('error', mapWebSocketError(end));
     ws.on('close', () => end(new boom_1.Boom('Connection Terminated', { statusCode: Types_1.DisconnectReason.connectionClosed })));
     // the server terminated the connection

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rexxhayanasi/elaina-baileys",
-  "version": "1.1.0-rc.4",
+  "version": "1.1.0-rc.6",
   "description": "Custom Baileys WhatsApp API",
   "keywords": [
     "baileys", 
@@ -85,7 +85,7 @@
   },
   "peerDependencies": {
     "audio-decode": "^2.1.3",
-    "jimp": "^1.6.0",
+    "jimp": "^0.22.10",
     "link-preview-js": "^3.0.0",
     "qrcode-terminal": "^0.12.0",
     "sharp": "^0.34.1"