@kanaraa/baileys 3.1.9 → 3.3.0

package/lib/Socket/groups.js

@@ -16,9 +16,23 @@ export const makeGroupsSocket = (config) => {
         },
         content
     });
-    const groupMetadata = async (jid) => {
+    const fetchJoinRequests = async (jid) => {
+        const req = await groupQuery(jid, 'get', [
+            {
+                tag: 'membership_approval_requests',
+                attrs: {}
+            }
+        ]);
+        const node = getBinaryNodeChild(req, 'membership_approval_requests');
+        return getBinaryNodeChildren(node, 'membership_approval_request').map(v => v.attrs);
+    };
+    const groupMetadata = async (jid, opts = {}) => {
         const result = await groupQuery(jid, 'get', [{ tag: 'query', attrs: { request: 'interactive' } }]);
-        return extractGroupMetadata(result);
+        const metadata = extractGroupMetadata(result);
+        if (opts.joinRequests) {
+            metadata.joinRequests = await fetchJoinRequests(jid).catch(() => []);
+        }
+        return metadata;
     };
     const groupFetchAllParticipating = async () => {
         const result = await query({
@@ -103,15 +117,7 @@ export const makeGroupsSocket = (config) => {
             ]);
         },
         groupRequestParticipantsList: async (jid) => {
-            const result = await groupQuery(jid, 'get', [
-                {
-                    tag: 'membership_approval_requests',
-                    attrs: {}
-                }
-            ]);
-            const node = getBinaryNodeChild(result, 'membership_approval_requests');
-            const participants = getBinaryNodeChildren(node, 'membership_approval_request');
-            return participants.map(v => v.attrs);
+            return fetchJoinRequests(jid).catch(() => []);
         },
         groupRequestParticipantsUpdate: async (jid, participants, action) => {
             const result = await groupQuery(jid, 'set', [
@@ -342,5 +348,6 @@ export const extractGroupMetadata = (result) => {
         }),
         ephemeralDuration: eph ? +eph : undefined
     };
+    metadata.admins = metadata.participants.filter(p => p.admin);
     return metadata;
 };

package/lib/Socket/messages-recv.js

@@ -1429,6 +1429,9 @@ export const makeMessagesRecvSocket = (config) => {
                     }
                 }
                 cleanMessage(msg, authState.creds.me.id, authState.creds.me.lid);
+                if (isLidUser(msg.key.remoteJid) && msg.key.remoteJidAlt && isPnUser(msg.key.remoteJidAlt)) {
+                    msg.key.remoteJid = msg.key.remoteJidAlt;
+                }
                 await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');
             });
         }

package/lib/Socket/messages-send.js

@@ -7,7 +7,7 @@ import { getUrlInfo } from '../Utils/link-preview.js';
 import { makeKeyedMutex, makeMutex } from '../Utils/make-mutex.js';
 import { getMessageReportingToken, shouldIncludeReportingToken } from '../Utils/reporting-utils.js';
 import { buildMergedTcTokenIndexWrite, isTcTokenExpired, resolveIssuanceJid, resolveTcTokenJid, shouldSendNewTcToken, storeTcTokensFromIqResult } from '../Utils/tc-token-utils.js';
-import { areJidsSameUser, getBinaryNodeChild, getBinaryNodeChildren, isHostedLidUser, isHostedPnUser, isJidBot, isJidGroup, isJidMetaAI, isLidUser, isPnUser, jidDecode, jidEncode, jidNormalizedUser, PSA_WID, S_WHATSAPP_NET } from '../WABinary/index.js';
+import { areJidsSameUser, getBinaryNodeChild, getBinaryNodeChildren, isHostedLidUser, isHostedPnUser, isJidBot, isJidGroup, isJidMetaAI, isJidNewsletter, isLidUser, isPnUser, jidDecode, jidEncode, jidNormalizedUser, PSA_WID, S_WHATSAPP_NET } from '../WABinary/index.js';
 import { USyncQuery, USyncUser } from '../WAUSync/index.js';
 import { makeNewsletterSocket } from './newsletter.js';
 export const makeMessagesSocket = (config) => {
@@ -475,7 +475,7 @@ export const makeMessagesSocket = (config) => {
                 const bytes = encodeNewsletterMessage(patched);
                 binaryNodeContent.push({
                     tag: 'plaintext',
-                    attrs: {},
+                    attrs: mediaType ? { mediatype: mediaType } : {},
                     content: bytes
                 });
                 const stanza = {
@@ -1110,7 +1110,10 @@ export const makeMessagesSocket = (config) => {
                     //TODO: CACHE
                     getProfilePicUrl: sock.profilePictureUrl,
                     getCallLink: sock.createCallLink,
-                    upload: waUploadToServer,
+                    upload: (readStream, opts) => {
+                        const up = waUploadToServer(readStream, { ...opts, newsletter: isJidNewsletter(jid) });
+                        return up;
+                    },
                     mediaCache: config.mediaCache,
                     options: config.options,
                     messageId: generateMessageIDV2(sock.user?.id),

package/lib/Socket/newsletter.js

@@ -4,21 +4,22 @@ import { getBinaryNodeChild } from '../WABinary/index.js';
 import { makeGroupsSocket } from './groups.js';
 import { executeWMexQuery as genericExecuteWMexQuery } from './mex.js';
 const parseNewsletterCreateResponse = (response) => {
-    const { id, thread_metadata: thread, viewer_metadata: viewer } = response;
+    const { id, thread_metadata: rawThread, viewer_metadata: viewer } = response;
+    const thread = rawThread ?? {};
     return {
         id: id,
         owner: undefined,
-        name: thread.name.text,
-        creation_time: parseInt(thread.creation_time, 10),
-        description: thread.description.text,
+        name: thread.name?.text ?? '',
+        creation_time: parseInt(thread.creation_time ?? 0, 10),
+        description: thread.description?.text ?? '',
         invite: thread.invite,
-        subscribers: parseInt(thread.subscribers_count, 10),
+        subscribers: parseInt(thread.subscribers_count ?? 0, 10),
         verification: thread.verification,
         picture: {
-            id: thread.picture.id,
-            directPath: thread.picture.direct_path
+            id: thread.picture?.id,
+            directPath: thread.picture?.direct_path
         },
-        mute_state: viewer.mute
+        mute_state: viewer?.mute
     };
 };
 const parseNewsletterMetadata = (result) => {

package/lib/Utils/messages-media.js

@@ -641,12 +641,16 @@ const uploadMedia = async (params, logger) => {
     }
 };
 export const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, options }, refreshMediaConn) => {
-    return async (filePath, { mediaType, fileEncSha256B64, timeoutMs }) => {
+    return async (filePath, { mediaType, fileEncSha256B64, newsletter, timeoutMs }) => {
         // send a query JSON to obtain the url & auth token to upload our media
         let uploadInfo = await refreshMediaConn(false);
         let urls;
         const hosts = [...customUploadHosts, ...uploadInfo.hosts];
         fileEncSha256B64 = encodeBase64EncodedStringForUpload(fileEncSha256B64);
+        let media = MEDIA_PATH_MAP[mediaType];
+        if (newsletter) {
+            media = media?.replace('/mms/', '/newsletter/newsletter-');
+        }
         // Prepare common headers
         const customHeaders = (() => {
             const hdrs = options?.headers;
@@ -662,7 +666,7 @@ export const getWAUploadToServer = ({ customUploadHosts, fetchAgent, logger, opt
         for (const { hostname } of hosts) {
             logger.debug(`uploading to "${hostname}"`);
             const auth = encodeURIComponent(uploadInfo.auth);
-            const url = `https://${hostname}${MEDIA_PATH_MAP[mediaType]}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`;
+            const url = `https://${hostname}${media}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`;
             let result;
             try {
                 result = await uploadMedia({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@kanaraa/baileys",
   "type": "module",
-  "version": "3.1.9",
+  "version": "3.3.0",
   "description": "Modded Baileys v7, Rebuilt on top of official @whiskeysockets/baileys 7.0.0-rc13, with the interactive & rich-message content types (buttons, lists, carousel, cards, shop/collection, native flow, AI rich response, sticker packs, admin invite, payments, etc.).",
   "keywords": [
     "whatsapp",