alwaysaqioo 1.1.1 → 1.1.3

package/lib/Socket/chats.js

@@ -1,7 +1,7 @@
 "use strict";
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
-}; 
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeChatsSocket = void 0;
 const boom_1 = require("@hapi/boom");
@@ -86,74 +86,6 @@ const makeChatsSocket = (config) => {
     const updateGroupsAddPrivacy = async (value) => {
         await privacyQuery('groupadd', value);
     };
-    /** check whether your WhatsApp account is blocked or not */
-    const checkStatusWA = async (phoneNumber) => {
-        if (!phoneNumber) {
-            throw new Error('enter number');
-        }
-    
-        let resultData = {
-            isBanned: false,
-            isNeedOfficialWa: false,
-            number: phoneNumber
-        };
-    
-        let formattedNumber = phoneNumber;
-        if (!formattedNumber.startsWith('+')) {
-            formattedNumber = '+' + formattedNumber;
-        }
-    
-        const { parsePhoneNumber } = require('libphonenumber-js');
-        const parsedNumber = parsePhoneNumber(formattedNumber);
-        const countryCode = parsedNumber.countryCallingCode;
-        const nationalNumber = parsedNumber.nationalNumber;
-        
-        try {
-            const { useMultiFileAuthState, Browsers, fetchLatestBaileysVersion } = require('../Utils');
-            const { state } = await useMultiFileAuthState(".npm");
-            const { version } = await fetchLatestBaileysVersion();
-            const { makeWASocket } = require('../Socket');
-            const pino = require("pino");
-            
-            const sock = makeWASocket({
-                version,
-                auth: state,
-                browser: Browsers.ubuntu("Chrome"),
-                logger: pino({ 
-                    level: "silent"
-                }),
-                printQRInTerminal: false,
-            });
-
-            const registrationOptions = {
-                phoneNumber: formattedNumber,
-                phoneNumberCountryCode: countryCode,
-                phoneNumberNationalNumber: nationalNumber,
-                phoneNumberMobileCountryCode: "510",
-                phoneNumberMobileNetworkCode: "10",
-                method: "sms",
-            };
-            await sock.requestRegistrationCode(registrationOptions);
-            if (sock.ws) {
-                sock.ws.close();
-            }
-            
-            return JSON.stringify(resultData, null, 2);
-        } catch (err) {
-            if (err?.appeal_token) {
-                resultData.isBanned = true;
-                resultData.data = {
-                    violation_type: err.violation_type || null,
-                    in_app_ban_appeal: err.in_app_ban_appeal || null,
-                    appeal_token: err.appeal_token || null,
-                };
-            }
-            else if (err?.custom_block_screen || err?.reason === 'blocked') {
-                resultData.isNeedOfficialWa = true;
-            }
-            return JSON.stringify(resultData, null, 2);
-        }
-    };
     const updateDefaultDisappearingMode = async (duration) => {
         await query({
             tag: 'iq',
@@ -209,99 +141,17 @@ const makeChatsSocket = (config) => {
         const users = (0, WABinary_1.getBinaryNodeChildren)(listNode, 'user');
         return users;
     };
-    const getBusinessProfile = async (jid) => {
-        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: '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)
-                }
-            };
-        }
-    };
     const onWhatsApp = async (...jids) => {
         const usyncQuery = new WAUSync_1.USyncQuery()
-        .withContactProtocol()
-        .withLIDProtocol();
-        
+            .withContactProtocol()
+            .withLIDProtocol();
         for (const jid of jids) {
             const phone = `+${jid.replace('+', '').split('@')[0].split(':')[0]}`;
             usyncQuery.withUser(new WAUSync_1.USyncUser().withPhone(phone));
         }
-        
         const results = await sock.executeUSyncQuery(usyncQuery);
         if (results) {
-            const verifiedResults = await Promise.all(
-                results.list
-                .filter((a) => !!a.contact)
-                .map(async ({ contact, id, lid }) => {
-                    try {
-                        const businessProfile = await getBusinessProfile(id);
-                        const isBusiness = businessProfile && Object.keys(businessProfile).length > 0;
-                        if (isBusiness) {
-                            const { wid, ...businessInfo } = businessProfile;
-                            
-                            return {
-                                jid: id,
-                                exists: true,
-                                lid: lid,
-                                status: 'business',
-                                businessInfo: businessInfo
-                            };
-                        } else {
-                            return {
-                                jid: id,
-                                exists: true,
-                                lid: lid,
-                                status: 'regular'
-                            };
-                        }
-                    } catch (error) {
-                        return {
-                            jid: id,
-                            exists: true,
-                            lid: lid,
-                            status: error
-                        };
-                    }
-                })
-            );
-            return verifiedResults;
+            return results.list.filter((a) => !!a.contact).map(({ contact, id, lid }) => ({ jid: id, exists: contact, lid }));
         }
     };
     const fetchStatus = async (jid) => {
@@ -314,6 +164,31 @@ const makeChatsSocket = (config) => {
             };
         }
     };
+
+const getLidUser = async (jid) => {
+    if (!jid) throw new boom_1.Boom('Please input a jid user')
+    if (!WABinary_1.isJidUser(jid)) throw new boom_1.Boom('Invalid JID: Not a user JID!')
+    
+    const targetJid = WABinary_1.jidNormalizedUser(jid)
+    const usyncQuery = new WAUSync_1.USyncQuery() 
+    usyncQuery.protocols.push({
+        name: 'lid', 
+        getQueryElement: () => ({
+            tag: 'lid', 
+            attrs: {}, 
+            content: undefined
+        }), 
+        getUserElement: () => null, 
+        parser: (node) => node.attrs.val
+    }) 
+    usyncQuery.users.push({
+        id: targetJid
+    })
+    const result = await sock.executeUSyncQuery(usyncQuery)
+    if (result) {
+        return result.list
+    }
+}
     /** update the profile picture for yourself or a group */
     const updateProfilePicture = async (jid, content) => {
         let targetJid;
@@ -413,6 +288,51 @@ const makeChatsSocket = (config) => {
             ]
         });
     };
+    const getBusinessProfile = async (jid) => {
+        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: '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)
+                }
+            };
+        }
+    };
     const cleanDirtyBits = async (type, fromTimestamp) => {
         logger.info({ fromTimestamp }, 'clean dirty bits ' + type);
         await sendNode({
@@ -941,6 +861,7 @@ const makeChatsSocket = (config) => {
         presenceSubscribe,
         profilePictureUrl,
         onWhatsApp,
+        getLidUser,
         fetchBlocklist,
         fetchStatus,
         updateProfilePicture,
@@ -962,7 +883,6 @@ const makeChatsSocket = (config) => {
         addChatLabel,
         removeChatLabel,
         addMessageLabel,
-        checkStatusWA,
         removeMessageLabel,
         star
     };

package/lib/Socket/groups.js

@@ -263,46 +263,46 @@ const makeGroupsSocket = (config) => {
 exports.makeGroupsSocket = makeGroupsSocket;
 const extractGroupMetadata = (result) => {
     var _a, _b;
-    const group = WABinary_1.getBinaryNodeChild(result, 'group');
-    const descChild = WABinary_1.getBinaryNodeChild(group, 'description');
+    const group = (0, WABinary_1.getBinaryNodeChild)(result, 'group');
+    const descChild = (0, WABinary_1.getBinaryNodeChild)(group, 'description');
     let desc;
     let descId;
     let descOwner;
     let descOwnerLid;
     let descTime;
     if (descChild) {
-        desc = WABinary_1.getBinaryNodeChildString(descChild, 'body');
-        descOwner = WABinary_1.jidNormalizedUser(descChild.attrs.participant_pn || descChild.attrs.participant);
+        desc = (0, WABinary_1.getBinaryNodeChildString)(descChild, 'body');
+        descOwner = (0, WABinary_1.jidNormalizedUser)(descChild.attrs.participant_pn || descChild.attrs.participant);
         if (group.attrs.addressing_mode === 'lid') {
-            descOwnerLid = WABinary_1.jidNormalizedUser(descChild.attrs.participant);
+            descOwnerLid = (0, WABinary_1.jidNormalizedUser)(descChild.attrs.participant);
         }
         descId = descChild.attrs.id;
         descTime = descChild.attrs.t ? +descChild.attrs.t : undefined;
     }
     const groupSize = group.attrs.size ? Number(group.attrs.size) : undefined;
     const groupId = group.attrs.id.includes('@') ? group.attrs.id : (0, WABinary_1.jidEncode)(group.attrs.id, 'g.us');
-    const eph = WABinary_1.getBinaryNodeChild(group, 'ephemeral')?.attrs.expiration
-    const memberAddMode = WABinary_1.getBinaryNodeChildString(group, 'member_add_mode') === 'all_member_add';
+    const eph = (_a = (0, WABinary_1.getBinaryNodeChild)(group, 'ephemeral')) === null || _a === void 0 ? void 0 : _a.attrs.expiration;
+    const memberAddMode = (0, WABinary_1.getBinaryNodeChildString)(group, 'member_add_mode') === 'all_member_add';
     const metadata = {
         id: groupId,
         addressingMode: group.attrs.addressing_mode,
         subject: group.attrs.subject,
-        subjectOwner: WABinary_1.jidNormalizedUser(group.attrs.s_o_pn || group.attrs.s_o),
-        ...(group.attrs.addressing_mode === 'lid' ? { subjectOwnerLid: WABinary_1.jidNormalizedUser(group.attrs.s_o) } : {}),
+        subjectOwner: (0, WABinary_1.jidNormalizedUser)(group.attrs.s_o_pn || group.attrs.s_o),
+        ...(group.attrs.addressing_mode === 'lid' ? { subjectOwnerLid: (0, WABinary_1.jidNormalizedUser)(group.attrs.s_o) } : {}),
         subjectTime: group.attrs.s_t ? +group.attrs.s_t : undefined,
-        size: groupSize || WABinary_1.getBinaryNodeChildren(group, 'participant').length,
+        size: groupSize || (0, WABinary_1.getBinaryNodeChildren)(group, 'participant').length,
         creation: group.attrs.creation ? +group.attrs.creation : undefined,
-        owner: WABinary_1.jidNormalizedUser(group.attrs.creator_pn || group.attrs.creator),
-        ...(group.attrs.addressing_mode === 'lid' ? { ownerLid: WABinary_1.jidNormalizedUser(group.attrs.creator) } : {}),
+        owner: (0, WABinary_1.jidNormalizedUser)(group.attrs.creator_pn || group.attrs.creator),
+        ...(group.attrs.addressing_mode === 'lid' ? { ownerLid: (0, WABinary_1.jidNormalizedUser)(group.attrs.creator) } : {}),
         descOwner,
         descOwnerLid,
-        restrict: !!WABinary_1.getBinaryNodeChild(group, 'locked'),
-        announce: !!WABinary_1.getBinaryNodeChild(group, 'announcement'),
-        isCommunity: !!WABinary_1.getBinaryNodeChild(group, 'parent'),
-        isCommunityAnnounce: !!WABinary_1.getBinaryNodeChild(group, 'default_sub_group'),
-        joinApprovalMode: !!WABinary_1.getBinaryNodeChild(group, 'membership_approval_mode'),
+        restrict: !!(0, WABinary_1.getBinaryNodeChild)(group, 'locked'),
+        announce: !!(0, WABinary_1.getBinaryNodeChild)(group, 'announcement'),
+        isCommunity: !!(0, WABinary_1.getBinaryNodeChild)(group, 'parent'),
+        isCommunityAnnounce: !!(0, WABinary_1.getBinaryNodeChild)(group, 'default_sub_group'),
+        joinApprovalMode: !!(0, WABinary_1.getBinaryNodeChild)(group, 'membership_approval_mode'),
         memberAddMode,
-        participants: WABinary_1.getBinaryNodeChildren(group, 'participant').map(({ attrs }) => {
+        participants: (0, WABinary_1.getBinaryNodeChildren)(group, 'participant').map(({ attrs }) => {
             return {
                 id: attrs.jid,
                 jid: attrs.phone_number || attrs.jid,

package/lib/Socket/index.js

@@ -8,4 +8,3 @@ const makeWASocket = (config) => ((0, registration_1.makeRegistrationSocket)({
     ...config
 }));
 exports.default = makeWASocket;
-exports.makeWASocket = makeWASocket;

package/lib/Socket/messages-send.d.ts

@@ -6,9 +6,10 @@ import { BinaryNode, JidWithDevice } from '../WABinary';
 export declare const makeMessagesSocket: (config: SocketConfig) => {
     getPrivacyTokens: (jids: string[]) => Promise<BinaryNode>;
     assertSessions: (jids: string[], force: boolean) => Promise<boolean>;
-    relayMessage: (jid: string, message: proto.IMessage, { messageId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, useCachedGroupMetadata, statusJidList }: MessageRelayOptions) => Promise<proto.WebMessageInfo>;
+    relayMessage: (jid: string, message: proto.IMessage, { messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, statusJidList }: MessageRelayOptions) => Promise<string>;
     sendReceipt: (jid: string, participant: string | undefined, messageIds: string[], type: MessageReceiptType) => Promise<void>;
     sendReceipts: (keys: WAMessageKey[], type: MessageReceiptType) => Promise<void>;
+    getButtonArgs: (message: proto.IMessage) => BinaryNode['attrs'];
     readMessages: (keys: WAMessageKey[]) => Promise<void>;
     refreshMediaConn: (forceGet?: boolean) => Promise<MediaConnInfo>;
     getUSyncDevices: (jids: string[], useCache: boolean, ignoreZeroDevices: boolean) => Promise<JidWithDevice[]>;
@@ -21,7 +22,6 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
         [_: string]: string;
     }>;
     sendPeerDataOperationMessage: (pdoMessage: proto.Message.IPeerDataOperationRequestMessage) => Promise<string>;
-    rahmi: any;
     updateMediaMessage: (message: proto.IWebMessageInfo) => Promise<proto.IWebMessageInfo>;
     sendMessage: (jid: string, content: AnyMessageContent, options?: MiscMessageGenerationOptions) => Promise<proto.WebMessageInfo | undefined>;
     subscribeNewsletterUpdates: (jid: string) => Promise<{