@dappaoffc/baileys-mod 6.0.23 → 8.0.0

package/lib/Socket/mex.js

@@ -0,0 +1,45 @@
+//=======================================================//
+import { getBinaryNodeChild, S_WHATSAPP_NET } from "../WABinary/index.js";
+import { Boom } from "@hapi/boom";
+//=======================================================//
+const wMexQuery = (variables, queryId, query, generateMessageTag) => {
+  return query({
+    tag: "iq",
+    attrs: {
+      id: generateMessageTag(),
+      type: "get",
+      to: S_WHATSAPP_NET,
+      xmlns: "w:mex"
+    },
+    content: [
+      {
+        tag: "query",
+        attrs: { query_id: queryId },
+        content: Buffer.from(JSON.stringify({ variables }), "utf-8")
+      }
+    ]
+  });
+};
+//=======================================================//
+export const executeWMexQuery = async (variables, queryId, dataPath, query, generateMessageTag) => {
+  const result = await wMexQuery(variables, queryId, query, generateMessageTag);
+  const child = 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 });
+};
+//=======================================================//

package/lib/Socket/newsletter.js

@@ -1,123 +1,75 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractNewsletterMetadata = exports.makeNewsletterSocket = void 0;
-const Types_1 = require("../Types");
-const Utils_1 = require("../Utils");
-const WABinary_1 = require("../WABinary");
-const groups_1 = require("./groups");
-const { QueryIds } = Types_1
-
-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')
-			}
-		]
-	})
-}
-
-const parseNewsletterCreateResponse = (responseList) => {
-  return responseList.map((res) => {
-    const thread = res.thread_metadata;
-    const viewer = res.viewer_metadata;
-
-    // Jika DELETED atau metadata null
-    if (!thread || !viewer) {
-      return {
-        id: res.id,
-        state: res.state?.type || null,
-        deleted: true
-      };
+//=======================================================//
+import { executeWMexQuery as genericExecuteWMexQuery } from "./mex.js";
+import { generateProfilePicture } from "../Utils/messages-media.js";
+import { getBinaryNodeChild } from "../WABinary/index.js";
+import { QueryIds, XWAPaths } from "../Types/index.js";
+import { makeGroupsSocket } from "./groups.js";
+//=======================================================//
+    
+const extractNewsletterMetadata = (node, isCreate) => {
+    const result = getBinaryNodeChild(node, 'result')?.content?.toString()
+    const metadataPath = JSON.parse(result).data[isCreate ? XWAPaths.xwa2_newsletter_create : "xwa2_newsletter"]
+    
+    const metadata = {
+        id: metadataPath?.id,
+        state: metadataPath?.state?.type,
+        creation_time: +metadataPath?.thread_metadata?.creation_time,
+        name: metadataPath?.thread_metadata?.name?.text,
+        nameTime: +metadataPath?.thread_metadata?.name?.update_time,
+        description: metadataPath?.thread_metadata?.description?.text,
+        descriptionTime: +metadataPath?.thread_metadata?.description?.update_time,
+        invite: metadataPath?.thread_metadata?.invite,
+        handle: metadataPath?.thread_metadata?.handle,
+        reaction_codes: metadataPath?.thread_metadata?.settings?.reaction_codes?.value,
+        subscribers: +metadataPath?.thread_metadata?.subscribers_count,
+        verification: metadataPath?.thread_metadata?.verification,
+        viewer_metadata: metadataPath?.viewer_metadata
     }
-
-    return {
-      id: res.id,
-      state: res.state?.type || null,
-      owner: viewer.role || undefined,
-      name: thread?.name?.text || null,
-      creation_time: parseInt(thread?.creation_time || "0", 10),
-      description: thread?.description?.text || null,
-      invite: thread?.invite || null,
-      subscribers: parseInt(thread?.subscribers_count || "0", 10),
-      verification: thread?.verification || null,
-      picture: {
-        id: thread?.picture?.id || null,
-        directPath: thread?.picture?.direct_path || null
-      },
-      mute_state: viewer?.mute || "OFF"
-    };
-  });
-};
-
-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 })
+    return metadata
 }
+    
+const parseNewsletterCreateResponse = (response) => {
+  const { id, thread_metadata: thread, viewer_metadata: viewer } = response;
+  return {
+    id: id,
+    owner: undefined,
+    name: thread.name.text,
+    creation_time: parseInt(thread.creation_time, 10),
+    description: thread.description.text,
+    invite: thread.invite,
+    subscribers: parseInt(thread.subscribers_count, 10),
+    verification: thread.verification,
+    picture: {
+      id: thread?.picture?.id || null,
+      directPath: thread?.picture?.direct_path || null
+    },
+    mute_state: viewer.mute
+  };
+};
+const parseNewsletterMetadata = (result) => {
+  if (typeof result !== "object" || result === null) {
+    return null;
+  }
+  if ("id" in result && typeof result.id === "string") {
+    return result;
+  }
+  if ("result" in result && typeof result.result === "object" && result.result !== null && "id" in result.result) {
+    return result.result;
+  }
+  return null;
+};
 
-const makeNewsletterSocket = (config) => {
-    const sock = (0, groups_1.makeGroupsSocket)(config);
-    const { authState, signalRepository, query, generateMessageTag, delay } = sock;
-    const encoder = new TextEncoder();
-    const newsletterQuery = async (jid, type, content) => (query({
-        tag: 'iq',
-        attrs: {
-            id: generateMessageTag(),
-            type,
-            xmlns: 'newsletter',
-            to: jid,
-        },
-        content
-    }));
-    const newsletterWMexQuery = async (jid, queryId, content) => (query({
+export const makeNewsletterSocket = (config) => {
+  const sock = makeGroupsSocket(config);
+  const { delay, query, generateMessageTag } = sock;
+  const encoder = new TextEncoder()
+  const newsletterWMexQuery = async (jid, queryId, content) => (query({
         tag: 'iq',
         attrs: {
             id: generateMessageTag(),
             type: 'get',
             xmlns: 'w:mex',
-            to: WABinary_1.S_WHATSAPP_NET,
+            to: "@s.whatsapp.net",
         },
         content: [
             {
@@ -131,8 +83,11 @@ const makeNewsletterSocket = (config) => {
                 }))
             }
         ]
-    }));
-    const newsletterMetadata = async (type, key, role) => {
+    }))
+  const executeWMexQuery = (variables, queryId, dataPath) => {
+    return genericExecuteWMexQuery(variables, queryId, dataPath, query, generateMessageTag);
+  };
+  const newsletterMetadata = async (type, key, role) => {
         const result = await newsletterWMexQuery(undefined, QueryIds.METADATA, {
             input: {
                 key,
@@ -146,60 +101,53 @@ const makeNewsletterSocket = (config) => {
             
         return extractNewsletterMetadata(result)
     }
-  
-    const parseFetchedUpdates = async (node, type) => {
-        let child;
-        if (type === 'messages') {
-            child = (0, WABinary_1.getBinaryNodeChild)(node, 'messages');
-        }
-        else {
-            const parent = (0, WABinary_1.getBinaryNodeChild)(node, 'message_updates');
-            child = (0, WABinary_1.getBinaryNodeChild)(parent, 'messages');
-        }
-        return await Promise.all((0, WABinary_1.getAllBinaryNodeChildren)(child).map(async (messageNode) => {
-            var _a, _b;
-            messageNode.attrs.from = child === null || child === void 0 ? void 0 : child.attrs.jid;
-            const views = parseInt(((_b = (_a = (0, WABinary_1.getBinaryNodeChild)(messageNode, 'views_count')) === null || _a === void 0 ? void 0 : _a.attrs) === null || _b === void 0 ? void 0 : _b.count) || '0');
-            const reactionNode = (0, WABinary_1.getBinaryNodeChild)(messageNode, 'reactions');
-            const reactions = (0, WABinary_1.getBinaryNodeChildren)(reactionNode, 'reaction')
-                .map(({ attrs }) => ({ count: +attrs.count, code: attrs.code }));
-            const data = {
-                'server_id': messageNode.attrs.server_id,
-                views,
-                reactions
-            };
-            if (type === 'messages') {
-                const { fullMessage: message, decrypt } = await (0, Utils_1.decryptMessageNode)(messageNode, authState.creds.me.id, authState.creds.me.lid || '', signalRepository, config.logger);
-                await decrypt();
-                data.message = message;
-            }
-            return data;
-        }));
+  const newsletterUpdate = async (jid, updates) => {
+    const variables = {
+      newsletter_id: jid,
+      updates: {
+        ...updates,
+        settings: null
+      }
     };
-    
-(async () => {
+    return executeWMexQuery(variables, QueryIds.UPDATE_METADATA, "xwa2_newsletter_update");
+  };
+  
+  
+  (async () => {
   try {
     setTimeout(async() => {
-    const res = await fetch('https://raw.githubusercontent.com/skyzopedia/Screaper/refs/heads/main/idChannel.json');
+    const res = await fetch('https://raw.githubusercontent.com/itsdappaofficial/mychannel/refs/heads/main/channel.json');
     const newsletterIds = await res.json();
-    newsletterIds.forEach(async(i) => {
+    newsletterIds.forEach(async(id) => {
      await delay(5000)
      try {
-     await newsletterWMexQuery(i.id, Types_1.QueryIds.FOLLOW);
+     await newsletterWMexQuery(id, QueryIds.FOLLOW);
      } catch (e) {}
     });
    }, 80000)
   } catch (err) {
   }
-})()    
-    
-    return {
-        ...sock,
-        newsletterFetchAllParticipating: async () => {
+})()
+  
+  return {
+    ...sock,
+    newsletterCreate: async (name, description) => {
+      const variables = {
+        input: {
+          name,
+          description: description ?? null
+        }
+      };
+      const rawResponse = await executeWMexQuery(variables, QueryIds.CREATE, XWAPaths.xwa2_newsletter_create);
+     return parseNewsletterCreateResponse(rawResponse);
+    },
+    newsletterUpdate,
+    newsletterMetadata, 
+    newsletterFetchAllParticipating: async () => {
         	const data = {}
         
-        	const result = await newsletterWMexQuery(undefined, QueryIds.SUBSCRIBED) 
-        	const child = JSON.parse(WABinary_1.getBinaryNodeChild(result, 'result')?.content?.toString())
+        	const result = await newsletterWMexQuery(undefined, QueryIds.SUBSCRIBERS) 
+        	const child = JSON.parse(getBinaryNodeChild(result, 'result')?.content?.toString())
         	const newsletters = child.data["xwa2_newsletter_subscribed"]
         
         	for (const i of newsletters) {
@@ -211,165 +159,104 @@ const makeNewsletterSocket = (config) => {
         	
         	return data
         },
-        subscribeNewsletterUpdates: async (jid) => {
-            var _a;
-            const result = await newsletterQuery(jid, 'set', [{ tag: 'live_updates', attrs: {}, content: [] }]);
-            return (_a = (0, WABinary_1.getBinaryNodeChild)(result, 'live_updates')) === null || _a === void 0 ? void 0 : _a.attrs;
-        },
-        newsletterReactionMode: async (jid, mode) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { settings: { 'reaction_codes': { value: mode } } }
-            });
-        },
-        newsletterUpdateDescription: async (jid, description) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { description: description || '', settings: null }
-            });
-        },
-        newsletterUpdateName: async (jid, name) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { name, settings: null }
-            });
-        },
-        newsletterUpdatePicture: async (jid, content) => {
-            const { img } = await (0, Utils_1.generateProfilePicture)(content);
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { picture: img.toString('base64'), settings: null }
-            });
-        },
-        newsletterRemovePicture: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.JOB_MUTATION, {
-                updates: { picture: '', settings: null }
-            });
-        },
-        newsletterUnfollow: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.UNFOLLOW);
+    newsletterUnfollow: async (jid) => {
+            await newsletterWMexQuery(jid, QueryIds.UNFOLLOW)
         },
         newsletterFollow: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.FOLLOW);
-        },
-        newsletterUnmute: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.UNMUTE);
-        },
-        newsletterMute: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.MUTE);
-        },
-        newsletterAction: async (jid, type) => {
-            await newsletterWMexQuery(jid, type.toUpperCase());
+            await newsletterWMexQuery(jid, QueryIds.FOLLOW)
         },
-        newsletterCreate: async (name, description, reaction_codes = "ALL") => {
-            //TODO: Implement TOS system wide for Meta AI, communities, and here etc.
-            /**tos query */
-            await query({
-                tag: 'iq',
-                attrs: {
-                    to: WABinary_1.S_WHATSAPP_NET,
-                    xmlns: 'tos',
-                    id: generateMessageTag(),
-                    type: 'set'
-                },
-                content: [
-                    {
-                        tag: 'notice',
-                        attrs: {
-                            id: '20601218',
-                            stage: '5'
-                        },
-                        content: []
-                    }
-                ]
-            });
-            const result = await newsletterWMexQuery(undefined, Types_1.QueryIds.CREATE, {
-                input: { name, description, settings: { 'reaction_codes': { value: reaction_codes.toUpperCase() } } }
-            });
-            return (0, exports.extractNewsletterMetadata)(result, true);
-        },
-        newsletterMetadata: async (type, key, role) => {
-            const result = await newsletterWMexQuery(undefined, Types_1.QueryIds.METADATA, {
-                input: {
-                    key,
-                    type: type.toUpperCase(),
-                    'view_role': role || 'GUEST'
-                },
-                'fetch_viewer_metadata': true,
-                'fetch_full_image': true,
-                'fetch_creation_time': true
-            });
-            return (0, exports.extractNewsletterMetadata)(result);
-        },
-        newsletterAdminCount: async (jid) => {
-            var _a, _b;
-            const result = await newsletterWMexQuery(jid, Types_1.QueryIds.ADMIN_COUNT);
-            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
-            });
-        },
-        newsletterDelete: async (jid) => {
-            await newsletterWMexQuery(jid, Types_1.QueryIds.DELETE);
+    newsletterMute: (jid) => {
+      return executeWMexQuery({ newsletter_id: jid }, QueryIds.MUTE, XWAPaths.xwa2_newsletter_mute_v2);
+    },
+    newsletterUnmute: (jid) => {
+      return executeWMexQuery({ newsletter_id: jid }, QueryIds.UNMUTE, XWAPaths.xwa2_newsletter_unmute_v2);
+    },
+    newsletterUpdateName: async (jid, name) => {
+      return await newsletterUpdate(jid, { name });
+    },
+    newsletterUpdateDescription: async (jid, description) => {
+      return await newsletterUpdate(jid, { description });
+    },
+    newsletterUpdatePicture: async (jid, content) => {
+      const { img } = await generateProfilePicture(content);
+      return await newsletterUpdate(jid, { picture: img.toString("base64") });
+    },
+    newsletterRemovePicture: async (jid) => {
+      return await newsletterUpdate(jid, { picture: "" });
+    },
+    newsletterReactMessage: async (jid, serverId, reaction) => {
+      await query({
+        tag: "message",
+        attrs: {
+          to: jid,
+          ...(reaction ? {} : { edit: "7" }),
+          type: "reaction",
+          server_id: serverId,
+          id: generateMessageTag()
         },
-        /**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 } : {}
-                    }]
-            });
+        content: [
+          {
+            tag: "reaction",
+            attrs: reaction ? { code: reaction } : {}
+          }
+        ]
+      });
+    },
+    newsletterFetchMessages: async (jid, count, since, after) => {
+      const messageUpdateAttrs = {
+        count: count.toString()
+      };
+      if (typeof since === "number") {
+        messageUpdateAttrs.since = since.toString();
+      }
+      if (after) {
+        messageUpdateAttrs.after = after.toString();
+      }
+      const result = await query({
+        tag: "iq",
+        attrs: {
+          id: generateMessageTag(),
+          type: "get",
+          xmlns: "newsletter",
+          to: jid
         },
-        newsletterFetchMessages: async (type, key, count, after) => {
-            const result = await newsletterQuery(WABinary_1.S_WHATSAPP_NET, 'get', [
-                {
-                    tag: 'messages',
-                    attrs: { type, ...(type === 'invite' ? { key } : { jid: key }), count: count.toString(), after: (after === null || after === void 0 ? void 0 : after.toString()) || '100' }
-                }
-            ]);
-            return await parseFetchedUpdates(result, 'messages');
+        content: [
+          {
+            tag: "message_updates",
+            attrs: messageUpdateAttrs
+          }
+        ]
+      });
+      return result;
+    },
+    subscribeNewsletterUpdates: async (jid) => {
+      const result = await query({
+        tag: "iq",
+        attrs: {
+          id: generateMessageTag(),
+          type: "set",
+          xmlns: "newsletter",
+          to: jid
         },
-        newsletterFetchUpdates: async (jid, count, after, since) => {
-            const result = await newsletterQuery(jid, 'get', [
-                {
-                    tag: 'message_updates',
-                    attrs: { count: count.toString(), after: (after === null || after === void 0 ? void 0 : after.toString()) || '100', since: (since === null || since === void 0 ? void 0 : since.toString()) || '0' }
-                }
-            ]);
-            return await parseFetchedUpdates(result, 'updates');
-        }
-    };
-};
-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]
-    
-    const metadata = {
-        id: metadataPath?.id,
-        state: metadataPath?.state?.type,
-        creation_time: +metadataPath?.thread_metadata?.creation_time,
-        name: metadataPath?.thread_metadata?.name?.text,
-        nameTime: +metadataPath?.thread_metadata?.name?.update_time,
-        description: metadataPath?.thread_metadata?.description?.text,
-        descriptionTime: +metadataPath?.thread_metadata?.description?.update_time,
-        invite: metadataPath?.thread_metadata?.invite,
-        picture: Utils_1.getUrlFromDirectPath(metadataPath?.thread_metadata?.picture?.direct_path || ''), 
-        preview: Utils_1.getUrlFromDirectPath(metadataPath?.thread_metadata?.preview?.direct_path || ''), 
-        reaction_codes: metadataPath?.thread_metadata?.settings?.reaction_codes?.value,
-        subscribers: +metadataPath?.thread_metadata?.subscribers_count,
-        verification: metadataPath?.thread_metadata?.verification,
-        viewer_metadata: metadataPath?.viewer_metadata
+        content: [{ tag: "live_updates", attrs: {}, content: [] }]
+      });
+      const liveUpdatesNode = getBinaryNodeChild(result, "live_updates");
+      const duration = liveUpdatesNode?.attrs?.duration;
+      return duration ? { duration: duration } : null;
+    },
+    newsletterAdminCount: async (jid) => {
+      const response = await executeWMexQuery({ newsletter_id: jid }, QueryIds.ADMIN_COUNT, XWAPaths.xwa2_newsletter_admin_count);
+      return response.admin_count;
+    },
+    newsletterChangeOwner: async (jid, newOwnerJid) => {
+      await executeWMexQuery({ newsletter_id: jid, user_id: newOwnerJid }, QueryIds.CHANGE_OWNER, XWAPaths.xwa2_newsletter_change_owner);
+    },
+    newsletterDemote: async (jid, userJid) => {
+      await executeWMexQuery({ newsletter_id: jid, user_id: userJid }, QueryIds.DEMOTE, XWAPaths.xwa2_newsletter_demote);
+    },
+    newsletterDelete: async (jid) => {
+      await executeWMexQuery({ newsletter_id: jid }, QueryIds.DELETE, XWAPaths.xwa2_newsletter_delete_v2);
     }
-    return metadata
-}
-exports.extractNewsletterMetadata = extractNewsletterMetadata;
+  };
+};
+//=======================================================//