@badzz88/baileys 8.4.9 → 8.5.1

package/lib/Socket/mex.js

@@ -0,0 +1,60 @@
+'use strict'
+Object.defineProperty(exports, '__esModule', { value: true })
+exports.executeWMexQuery = void 0
+exports.wMexQuery = void 0
+const { Boom } = require('@hapi/boom')
+const WeaBineri = require('../WABinary')
+
+const wMexQuery = (variables, queryId, query, generateMessageTag) => {
+  return query({
+    tag: 'iq',
+    attrs: {
+      id: generateMessageTag(),
+      type: 'get',
+      to: WeaBineri.S_WHATSAPP_NET,
+      xmlns: 'w:mex'
+    },
+    content: [
+      {
+        tag: 'query',
+        attrs: { query_id: queryId },
+        content: Buffer.from(JSON.stringify({ variables }), 'utf-8')
+      }
+    ]
+  })
+}
+exports.wMexQuery = wMexQuery
+
+const executeWMexQuery = async (variables, queryId, dataPath, query, generateMessageTag) => {
+  const result = await wMexQuery(variables, queryId, query, generateMessageTag)
+  const child = WeaBineri.getBinaryNodeChild(result, 'result')
+  if (child?.content) {
+    const str = child.content.toString('utf-8').replace(/^\x00+/, '').trim()
+    let data
+    try {
+      data = JSON.parse(str)
+    } catch {
+      data = str
+    }
+    if (typeof data === 'string') {
+      return data
+    }
+    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 })
+}
+exports.executeWMexQuery = executeWMexQuery

package/{src → lib}/Socket/newsletter.js

@@ -7,117 +7,9 @@ const WABinary_1 = require('../WABinary')
 const groups_1 = require('./groups')
 const aigroups_1 = require('./aigroups')
 const mex_1 = require('./mex')
-
-/** Map a raw role string from the wire to the NewsletterRole enum. */
-const mapNewsletterRole = raw => {
-	if (!raw) return Types_1.NewsletterRole.GUEST
-	const upper = String(raw).toUpperCase()
-	switch (upper) {
-		case 'OWNER':
-			return Types_1.NewsletterRole.OWNER
-		case 'ADMIN':
-			return Types_1.NewsletterRole.ADMIN
-		case 'SUBSCRIBER':
-			return Types_1.NewsletterRole.SUBSCRIBER
-		default:
-			return Types_1.NewsletterRole.GUEST
-	}
-}
-
-/** Map a raw state string from the wire to the NewsletterState enum. */
-const mapNewsletterState = raw => {
-	if (!raw) return Types_1.NewsletterState.UNKNOWN
-	const upper = String(raw).toUpperCase()
-	switch (upper) {
-		case 'ACTIVE':
-			return Types_1.NewsletterState.ACTIVE
-		case 'SUSPENDED':
-			return Types_1.NewsletterState.SUSPENDED
-		case 'GEO_SUSPENDED':
-			return Types_1.NewsletterState.GEO_SUSPENDED
-		default:
-			return Types_1.NewsletterState.UNKNOWN
-	}
-}
-
-/** Map a raw reaction setting/codes value from the wire to the NewsletterReactionSetting enum. */
-const mapReactionSetting = raw => {
-	if (!raw) return Types_1.NewsletterReactionSetting.NONE
-	const upper = String(raw).toUpperCase()
-	switch (upper) {
-		case 'ALLOWLIST':
-			return Types_1.NewsletterReactionSetting.ALLOWLIST
-		case 'BLOCKLIST':
-			return Types_1.NewsletterReactionSetting.BLOCKLIST
-		default:
-			return Types_1.NewsletterReactionSetting.NONE
-	}
-}
-
-/**
- * Enrich a raw newsletter metadata object with normalised protocol fields.
- * Handles both flat objects (direct API result) and objects that nest additional
- * data under thread_metadata / viewer_metadata.
- */
-const mergeDsaCountries = (a, b) => {
-	if (!a && !b) return null
-	const merged = [...(Array.isArray(a) ? a : a ? [a] : []), ...(Array.isArray(b) ? b : b ? [b] : [])]
-	return merged.length ? [...new Set(merged)] : null
-}
-
-const enrichNewsletterMetadata = raw => {
-	if (!raw || typeof raw !== 'object') return raw
-	const thread = raw.thread_metadata || {}
-	const viewer = raw.viewer_metadata || {}
-	const dsaCountries = mergeDsaCountries(
-		thread.dsa_eligibility_countries ?? raw.dsa_eligibility_countries ?? null,
-		thread.dsa_eligible_countries ?? raw.dsa_eligible_countries ?? null
-	)
-	return {
-		...raw,
-		role: mapNewsletterRole(viewer.role ?? raw.role),
-		newsletterState: mapNewsletterState(raw.state ?? thread.state),
-		reactionSetting: mapReactionSetting(
-			thread.reaction_codes ?? thread.reaction_setting ?? raw.reaction_codes ?? raw.reaction_setting
-		),
-		dsaEligibilityCountries: dsaCountries,
-		dsaDecision: thread.dsa_decision ?? raw.dsa_decision ?? null,
-		pinnedMessage:
-			thread.pinned_message_server_id ??
-			thread.pinned_message_id ??
-			raw.pinned_message_server_id ??
-			raw.pinned_message_id ??
-			null,
-		hasQuestionsFeature: !!(thread.has_questions_feature ?? raw.has_questions_feature ?? false),
-		hasMusicFeature: !!(
-			thread.has_music_feature ??
-			thread.music_enabled ??
-			raw.has_music_feature ??
-			raw.music_enabled ??
-			false
-		),
-		viewsCount:
-			thread.views_count != null
-				? parseInt(thread.views_count, 10)
-				: raw.views_count != null
-					? parseInt(raw.views_count, 10)
-					: null,
-		subscriberCount:
-			thread.subscriber_count != null
-				? parseInt(thread.subscriber_count, 10)
-				: raw.subscriber_count != null
-					? parseInt(raw.subscriber_count, 10)
-					: null
-	}
-}
-
 const parseNewsletterCreateResponse = response => {
 	const { id, thread_metadata: thread, viewer_metadata: viewer } = response
-	const dsaCountries = mergeDsaCountries(
-		thread.dsa_eligibility_countries ?? null,
-		thread.dsa_eligible_countries ?? null
-	)
-	const base = {
+	return {
 		id: id,
 		owner: undefined,
 		name: thread.name.text,
@@ -130,37 +22,28 @@ const parseNewsletterCreateResponse = response => {
 			id: thread.picture.id,
 			directPath: thread.picture.direct_path
 		},
-		mute_state: viewer.mute,
-		role: mapNewsletterRole(viewer.role),
-		newsletterState: mapNewsletterState(thread.state),
-		reactionSetting: mapReactionSetting(thread.reaction_codes ?? thread.reaction_setting),
-		dsaEligibilityCountries: dsaCountries,
-		dsaDecision: thread.dsa_decision ?? null,
-		pinnedMessage: thread.pinned_message_server_id ?? thread.pinned_message_id ?? null,
-		hasQuestionsFeature: !!(thread.has_questions_feature ?? false),
-		hasMusicFeature: !!(thread.has_music_feature ?? thread.music_enabled ?? false)
+		mute_state: viewer.mute
 	}
-	return base
 }
 const parseNewsletterMetadata = result => {
 	if (typeof result !== 'object' || result === null) {
 		return null
 	}
 	if ('id' in result && typeof result.id === 'string') {
-		return enrichNewsletterMetadata(result)
+		return result
 	}
 	if ('result' in result && typeof result.result === 'object' && result.result !== null && 'id' in result.result) {
-		return enrichNewsletterMetadata(result.result)
+		return result.result
 	}
 	return null
 }
 const makeNewsletterSocket = config => {
 	const sock = (0, aigroups_1.makeAIGroupsSocket)(config)
-	const { query, generateMessageTag, sendNode } = sock
+	const encoder = new TextDecoder();
+	const { query, generateMessageTag } = sock
 	const executeWMexQuery = (variables, queryId, dataPath) => {
 		return (0, mex_1.executeWMexQuery)(variables, queryId, dataPath, query, generateMessageTag)
 	}
-	
 	const newsletterWMexQuery = async (jid, queryId, content) => (query({
         tag: 'iq',
         attrs: {
@@ -226,7 +109,7 @@ const makeNewsletterSocket = config => {
 			return executeWMexQuery(
 				{ newsletter_id: jid },
 				Types_1.QueryIds.SUBSCRIBERS,
-				Types_1.XWAPaths.xwa2_newsletter_followers
+				Types_1.XWAPaths.xwa2_newsletter_subscribers
 			)
 		},
 		newsletterMetadata: async (type, key) => {
@@ -247,13 +130,13 @@ const makeNewsletterSocket = config => {
 			return parseNewsletterMetadata(result)
 		},
 		newsletterFollow: jid => {
-			return executeWMexQuery({ newsletter_id: jid }, Types_1.QueryIds.FOLLOW, Types_1.XWAPaths.xwa2_newsletter_join_v2)
+			return executeWMexQuery({ newsletter_id: jid }, Types_1.QueryIds.FOLLOW, Types_1.XWAPaths.xwa2_newsletter_follow)
 		},
 		newsletterUnfollow: jid => {
 			return executeWMexQuery(
 				{ newsletter_id: jid },
 				Types_1.QueryIds.UNFOLLOW,
-				Types_1.XWAPaths.xwa2_newsletter_leave_v2
+				Types_1.XWAPaths.xwa2_newsletter_unfollow
 			)
 		},
 		newsletterMute: jid => {
@@ -324,48 +207,6 @@ const makeNewsletterSocket = config => {
 			})
 			return result
 		},
-		/**
-		 * Find the numeric server_id for a newsletter message by its WhatsApp message ID.
-		 * Fetches the last `limit` messages and scans attrs for a matching message_id.
-		 */
-		newsletterGetServerId: async (jid, messageId, limit = 50) => {
-			console.log('[newsletterGetServerId] called jid:', jid, 'messageId:', messageId)
-			let result
-			try {
-				result = await query(
-					{
-						tag: 'iq',
-						attrs: {
-							id: generateMessageTag(),
-							type: 'get',
-							xmlns: 'newsletter',
-							to: jid
-						},
-						content: [{ tag: 'message_updates', attrs: { count: String(limit) } }]
-					},
-					5000
-				)
-			} catch (e) {
-				console.log('[newsletterGetServerId] query error/timeout:', e?.message)
-				return null
-			}
-			console.log('[newsletterGetServerId] result tag:', result?.tag, 'attrs:', JSON.stringify(result?.attrs))
-			if (!result) return null
-			const updatesNode = (0, WABinary_1.getBinaryNodeChild)(result, 'message_updates')
-			const messages = (0, WABinary_1.getBinaryNodeChildren)(updatesNode ?? result, 'message')
-			console.log(
-				'[newsletterGetServerId] messages count:',
-				messages.length,
-				'first attrs:',
-				JSON.stringify(messages[0]?.attrs)
-			)
-			for (const msg of messages) {
-				if (msg.attrs.message_id === messageId || msg.attrs.id === messageId) {
-					return msg.attrs.server_id ? +msg.attrs.server_id : null
-				}
-			}
-			return null
-		},
 		subscribeNewsletterUpdates: async jid => {
 			const result = await query({
 				tag: 'iq',
@@ -400,7 +241,7 @@ const makeNewsletterSocket = config => {
 			await executeWMexQuery(
 				{ newsletter_id: jid, user_id: userJid },
 				Types_1.QueryIds.DEMOTE,
-				Types_1.XWAPaths.xwa2_newsletter_admin_demote
+				Types_1.XWAPaths.xwa2_newsletter_demote
 			)
 		},
 		newsletterDelete: async jid => {
@@ -487,24 +328,6 @@ const makeNewsletterSocket = config => {
 			})
 			return result
 		},
-		/**
-		 * Revoke (delete) a message posted to a newsletter.
-		 * @param {string} jid - Newsletter JID
-		 * @param {number|string} serverId - server_id of the message to revoke
-		 */
-		newsletterRevokeMessage: async (jid, serverId) => {
-			await sendNode({
-				tag: 'message',
-				attrs: {
-					to: jid,
-					type: 'text',
-					edit: '7',
-					server_id: String(serverId),
-					id: generateMessageTag()
-				},
-				content: []
-			})
-		},
 		/**
 		 * Pin a newsletter message
 		 */
@@ -646,11 +469,7 @@ const makeNewsletterSocket = config => {
 			const { limit = 20, interests = null, sortField = 'SUBSCRIBER_COUNT', sortOrder = 'DESC' } = options
 			const variables = { limit, sort_field: sortField, sort_order: sortOrder }
 			if (interests?.length) variables.interests = interests
-			return executeWMexQuery(
-				variables,
-				Types_1.QueryIds.DIRECTORY_LIST,
-				Types_1.XWAPaths.xwa2_newsletters_directory_list
-			)
+			return executeWMexQuery(variables, Types_1.QueryIds.DIRECTORY_LIST, Types_1.XWAPaths.xwa2_newsletters_directory_list)
 		},
 		/**
 		 * Search the newsletter directory.
@@ -795,11 +614,7 @@ const makeNewsletterSocket = config => {
 		 * @param {string} jid - Newsletter JID
 		 */
 		newsletterEnableWamo: async jid => {
-			return executeWMexQuery(
-				{ newsletter_id: jid },
-				Types_1.QueryIds.WAMO_ENABLE_SUB,
-				'xwa2_newsletter_wamo_enable_sub'
-			)
+			return executeWMexQuery({ newsletter_id: jid }, Types_1.QueryIds.WAMO_ENABLE_SUB, 'xwa2_newsletter_wamo_enable_sub')
 		},
 		/**
 		 * Disable Wamo (paid subscription) for a newsletter.
@@ -831,72 +646,44 @@ const makeNewsletterSocket = config => {
 		 * @param {string} jid - Newsletter JID
 		 */
 		wamoAfsAgeCollection: async jid =>
-			executeWMexQuery(
-				{ newsletter_id: jid },
-				Types_1.QueryIds.WAMO_AFS_AGE_COLLECTION,
-				Types_1.XWAPaths.xwa2_wamo_afs_age_collection
-			),
+			executeWMexQuery({ newsletter_id: jid }, Types_1.QueryIds.WAMO_AFS_AGE_COLLECTION, Types_1.XWAPaths.xwa2_wamo_afs_age_collection),
 		/**
 		 * Fetch Wamo asset collection (images/assets for Wamo UI).
 		 * @param {string} jid - Newsletter JID
 		 */
 		wamoAssetCollection: async jid =>
-			executeWMexQuery(
-				{ newsletter_id: jid },
-				Types_1.QueryIds.WAMO_ASSET_COLLECTION,
-				Types_1.XWAPaths.xwa2_wamo_asset_collection
-			),
+			executeWMexQuery({ newsletter_id: jid }, Types_1.QueryIds.WAMO_ASSET_COLLECTION, Types_1.XWAPaths.xwa2_wamo_asset_collection),
 		/**
 		 * Fetch a Wamo ad-hoc notice by ID.
 		 * @param {string} noticeId - Notice ID to fetch
 		 */
 		wamoFetchAdhocNotice: async noticeId =>
-			executeWMexQuery(
-				{ notice_id: noticeId },
-				Types_1.QueryIds.WAMO_FETCH_ADHOC_NOTICE,
-				Types_1.XWAPaths.xwa2_wamo_fetch_adhoc_notice_by_id
-			),
+			executeWMexQuery({ notice_id: noticeId }, Types_1.QueryIds.WAMO_FETCH_ADHOC_NOTICE, Types_1.XWAPaths.xwa2_wamo_fetch_adhoc_notice_by_id),
 		/**
 		 * Fetch the Wamo identity token for a newsletter.
 		 * @param {string} jid - Newsletter JID
 		 */
 		wamoFetchIdentityToken: async jid =>
-			executeWMexQuery(
-				{ newsletter_id: jid },
-				Types_1.QueryIds.WAMO_FETCH_IDENTITY_TOKEN,
-				Types_1.XWAPaths.xwa2_wamo_fetch_identity_token
-			),
+			executeWMexQuery({ newsletter_id: jid }, Types_1.QueryIds.WAMO_FETCH_IDENTITY_TOKEN, Types_1.XWAPaths.xwa2_wamo_fetch_identity_token),
 		/**
 		 * Get Wamo subscription compliance info.
 		 * @param {string} jid - Newsletter JID
 		 */
 		wamoSubComplianceInfo: async jid =>
-			executeWMexQuery(
-				{ newsletter_id: jid },
-				Types_1.QueryIds.WAMO_SUB_COMPLIANCE_INFO,
-				Types_1.XWAPaths.xwa2_wamo_sub_get_compliance_info
-			),
+			executeWMexQuery({ newsletter_id: jid }, Types_1.QueryIds.WAMO_SUB_COMPLIANCE_INFO, Types_1.XWAPaths.xwa2_wamo_sub_get_compliance_info),
 		/**
 		 * Get the Wamo user ID version for a newsletter.
 		 * @param {string} jid - Newsletter JID
 		 */
 		wamoUserIdVersion: async jid =>
-			executeWMexQuery(
-				{ newsletter_id: jid },
-				Types_1.QueryIds.WAMO_USER_ID_VERSION,
-				Types_1.XWAPaths.xwa2_wamo_user_id_version
-			),
+			executeWMexQuery({ newsletter_id: jid }, Types_1.QueryIds.WAMO_USER_ID_VERSION, Types_1.XWAPaths.xwa2_wamo_user_id_version),
 		/**
 		 * Set the Wamo user ID version for a newsletter.
 		 * @param {string} jid - Newsletter JID
 		 * @param {number} version - Version to set
 		 */
 		wamoSetUserIdVersion: async (jid, version) =>
-			executeWMexQuery(
-				{ newsletter_id: jid, version },
-				Types_1.QueryIds.WAMO_SET_USER_ID_VERSION,
-				Types_1.XWAPaths.xwa2_wamo_set_user_id_version
-			),
+			executeWMexQuery({ newsletter_id: jid, version }, Types_1.QueryIds.WAMO_SET_USER_ID_VERSION, Types_1.XWAPaths.xwa2_wamo_set_user_id_version),
 		/**
 		 * Leave a newsletter (unsubscribe).
 		 * @param {string} jid - Newsletter JID
@@ -919,11 +706,7 @@ const makeNewsletterSocket = config => {
 		 * @param {string} jid - Newsletter JID
 		 */
 		newsletterEnforcements: async jid =>
-			executeWMexQuery(
-				{ newsletter_id: jid },
-				Types_1.QueryIds.ENFORCEMENTS,
-				Types_1.XWAPaths.xwa2_newsletter_enforcements
-			),
+			executeWMexQuery({ newsletter_id: jid }, Types_1.QueryIds.ENFORCEMENTS, Types_1.XWAPaths.xwa2_newsletter_enforcements),
 		/**
 		 * Fetch user reports for a newsletter (admin action).
 		 * @param {string} jid - Newsletter JID
@@ -950,11 +733,7 @@ const makeNewsletterSocket = config => {
 		 * @param {string} url - URL to preview
 		 */
 		newsletterLinkPreviewCheck: async url =>
-			executeWMexQuery(
-				{ url },
-				Types_1.QueryIds.LINK_PREVIEW_CHECK,
-				Types_1.XWAPaths.xwa2_newsletter_link_preview_check
-			),
+			executeWMexQuery({ url }, Types_1.QueryIds.LINK_PREVIEW_CHECK, Types_1.XWAPaths.xwa2_newsletter_link_preview_check),
 		/**
 		 * Update newsletter verification status (admin/platform action).
 		 * @param {string} jid - Newsletter JID
@@ -972,9 +751,9 @@ const makeNewsletterSocket = config => {
 		 * @param {string} serverId - Server message ID
 		 * @param {boolean} isPaidPartnership
 		 */
-		newsletterLabelPaidPartnership: async (jid, serverId, messageType = 'MESSAGE') =>
+		newsletterLabelPaidPartnership: async (jid, serverId, isPaidPartnership) =>
 			executeWMexQuery(
-				{ newsletter_id: jid, server_id: String(serverId), message_type: messageType },
+				{ newsletter_id: jid, server_id: serverId, is_paid_partnership: isPaidPartnership },
 				Types_1.QueryIds.LABEL_PAID_PARTNERSHIP,
 				Types_1.XWAPaths.xwa2_newsletter_label_paid_partnership
 			),
@@ -1005,28 +784,6 @@ const makeNewsletterSocket = config => {
 				Types_1.QueryIds.RANKING_FEATURES,
 				Types_1.XWAPaths.xwa2_newsletter_ranking_features
 			),
-		/**
-		 * Fetch account reachout timelock (rate-limit state for outreach actions).
-		 */
-		fetchReachoutTimelock: async () =>
-			executeWMexQuery({}, Types_1.QueryIds.REACHOUT_TIMELOCK, Types_1.XWAPaths.xwa2_fetch_account_reachout_timelock),
-		/**
-		 * Fetch message capping info (daily/weekly send limit status).
-		 */
-		fetchMessageCappingInfo: async () =>
-			executeWMexQuery({}, Types_1.QueryIds.MESSAGE_CAPPING_INFO, Types_1.XWAPaths.xwa2_message_capping_info),
-		/**
-		 * Update the response state for a question in a newsletter message.
-		 * @param {string} jid - Newsletter JID
-		 * @param {string} serverId - Server message ID of the question
-		 * @param {string} state - New response state (e.g. 'OPEN', 'CLOSED')
-		 */
-		newsletterQuestionResponseStateUpdate: async (jid, serverId, state) =>
-			executeWMexQuery(
-				{ newsletter_id: jid, server_id: serverId, state },
-				Types_1.QueryIds.QUESTION_RESPONSE_STATE_UPDATE,
-				Types_1.XWAPaths.xwa2_newsletter_question_response_state_update
-			),
 		/**
 		 * Send view receipts for newsletter messages (marks them as seen).
 		 * serverMessageIds: array of numeric server-side message IDs.

package/{src → lib}/Socket/privacy.js

@@ -10,34 +10,34 @@ const { executeWMexQuery } = require('./mex')
  */
 const PRIVACY_MEX_IDS = {
 	// Privacy settings
-	GET_SETTINGS: '32774292262215379', // GetPrivacySettingsQuery
-	SET_SETTING: '26887749497493182', // SetPrivacySettingMutation
-	UPDATE_CONTACT_LIST: '26375158178762799', // UpdatePrivacyContactListMutation
-	GET_CONTACT_LIST: '25700444246275822', // GetPrivacyContactListQuery
+	GET_SETTINGS: '32774292262215380', // GetPrivacySettingsQuery
+	SET_SETTING: '26887749497493184', // SetPrivacySettingMutation
+	UPDATE_CONTACT_LIST: '26375158178762800', // UpdatePrivacyContactListMutation
+	GET_CONTACT_LIST: '25700444246275824', // GetPrivacyContactListQuery
 	// Status / profile
 	UPDATE_TEXT_STATUS: '25863197129975892', // UpdateTextStatus
-	GET_TEXT_STATUS_LIST: '25741205615468935', // GetTextStatusList
+	GET_TEXT_STATUS_LIST: '25741205615468936', // GetTextStatusList
 	UPDATE_USER_STATUS: '7452341274886724', // UpdateUserStatus
-	FETCH_USER_PICTURE: '24983561624604407', // FetchUserPictureInfo
+	FETCH_USER_PICTURE: '24983561624604410', // FetchUserPictureInfo
 	PROFILE_PICTURE_MUTATION: '24714239711610700', // ProfilePictureMutation
 	// Account / auth
-	ACCOUNT_LOGIN: '27298465499757127', // AccountLoginMutation
-	ACCOUNT_LOGOUT: '26863447609979194', // AccountLogoutMutation
-	MULTI_ACCOUNT_REVOKE: '25846242091639661', // MultiAccountRevokeAccount
-	ADD_MULTI_ACCOUNT_LINK: '25502812266025193', // AddMultiAccountLink
-	ADD_TRUSTED_DEVICE: '24522952587403287', // AddTrustedDeviceMutation
-	GET_TRUSTED_DEVICES: '27391232653862770', // GetTrustedDevicesQuery
+	ACCOUNT_LOGIN: '27298465499757130', // AccountLoginMutation
+	ACCOUNT_LOGOUT: '26863447609979190', // AccountLogoutMutation
+	MULTI_ACCOUNT_REVOKE: '25846242091639660', // MultiAccountRevokeAccount
+	ADD_MULTI_ACCOUNT_LINK: '25502812266025190', // AddMultiAccountLink
+	ADD_TRUSTED_DEVICE: '24522952587403290', // AddTrustedDeviceMutation
+	GET_TRUSTED_DEVICES: '25123358920671964', // GetTrustedDevicesQuery
 	UNTRUST_TRUSTED_DEVICE: '26574930682133620', // UntrustTrustedDeviceMutation
-	DELETE_TRUSTED_DEVICE: '33867503889559538', // DeleteTrustedDeviceMutation
+	DELETE_TRUSTED_DEVICE: '33867503889559536', // DeleteTrustedDeviceMutation
 	// Misc
-	MOBILE_CONFIG_FETCH: '25676911271914597', // MobileConfigFetchQuery
-	NOTIFY_PUSH_NAME: '25900490552974543', // NotifyPushName
-	CONTACT_INTEGRITY: '25924358997169495', // ContactIntegrityQuery
-	BIZ_INTEGRITY: '25975613018777537', // BizIntegrityQuery
+	MOBILE_CONFIG_FETCH: '25676911271914596', // MobileConfigFetchQuery
+	NOTIFY_PUSH_NAME: '25900490552974544', // NotifyPushName
+	CONTACT_INTEGRITY: '25924358997169496', // ContactIntegrityQuery
+	BIZ_INTEGRITY: '25975613018777536', // BizIntegrityQuery
 	LINKED_PROFILES_SET: '25013968611531010', // LinkedProfilesSet
-	LINKED_PROFILES_REMOVE: '24537675509265525', // LinkedProfilesRemove
-	LINKED_PROFILES_UPDATE: '24876967165297614', // LinkedProfilesUpdate
-	MIGRATE_BLOCKLIST_LID: '25028600226770432', // MigrateBlocklistLid
+	LINKED_PROFILES_REMOVE: '24537675509265524', // LinkedProfilesRemove
+	LINKED_PROFILES_UPDATE: '24876967165297616', // LinkedProfilesUpdate
+	MIGRATE_BLOCKLIST_LID: '25028600226770430', // MigrateBlocklistLid
 	QR_CODE_SCAN: '26287165600869744' // QRCodeScan
 }
 
@@ -67,18 +67,9 @@ const makePrivacySocket = sock => {
 	 * Confirmed from C24403Akb.java — variables: { feature, setting }
 	 * dataPath: xwa2_privacy_feature_update
 	 *
-	 * Values are lowercase and case-sensitive on the wire (confirmed 2026-07-19 against
-	 * WASmaxInPrivacyEnums / WAWebPrivacySettings) — NOT the uppercase values this doc used to list.
-	 *
-	 * Known features: "last" (last seen), "online", "profile" (photo), "status", "readreceipts",
-	 *                 "groupadd" (who can add you to groups), "groupcreation", "calladd",
-	 *                 "defense" (anti-scraping), "messages", "linked_profiles", "cover_photo",
-	 *                 "dependentaccountmessages", "pix", "stickers"
-	 *                 (the last 6 are business-account-only)
-	 * Known settings: "all", "contacts", "contact_blacklist", "none" — most features.
-	 *                 "online" only accepts "all" | "match_last_seen".
-	 *                 "calladd" only accepts "all" | "contacts" | "known".
-	 *                 "defense" only accepts "off" | "on_standard".
+	 * Known features: "LAST_SEEN", "ONLINE", "PROFILE_PHOTO", "STATUS", "READ_RECEIPTS",
+	 *                 "GROUPS", "CALLS", "SCREENSHOT", "LIVE_LOCATION"
+	 * Known settings: "ALL", "CONTACTS", "CONTACT_BLACKLIST", "NONE"
 	 *
 	 * @param {string} feature - Privacy feature name
 	 * @param {string} setting - New value
@@ -150,7 +141,8 @@ const makePrivacySocket = sock => {
 	 *
 	 * @param {string} status - New status string
 	 */
-	const updateUserStatus = status => mexQuery({ status }, PRIVACY_MEX_IDS.UPDATE_USER_STATUS, 'xwa2_update_user_status')
+	const updateUserStatus = status =>
+		mexQuery({ status }, PRIVACY_MEX_IDS.UPDATE_USER_STATUS, 'xwa2_update_user_status')
 
 	/**
 	 * Fetch picture info for a user via MEX.
@@ -229,11 +221,7 @@ const makePrivacySocket = sock => {
 	 * @param {string} deviceName - Human-readable device name
 	 */
 	const addTrustedDevice = (deviceId, deviceName) =>
-		mexQuery(
-			{ device_id: deviceId, device_name: deviceName },
-			PRIVACY_MEX_IDS.ADD_TRUSTED_DEVICE,
-			'xwa2_add_trusted_device'
-		)
+		mexQuery({ device_id: deviceId, device_name: deviceName }, PRIVACY_MEX_IDS.ADD_TRUSTED_DEVICE, 'xwa2_add_trusted_device')
 
 	/**
 	 * Fetch list of trusted devices for the account via MEX.
@@ -251,7 +239,11 @@ const makePrivacySocket = sock => {
 	 * @param {string} [reason='USER_INITIATED']
 	 */
 	const untrustTrustedDevice = (deviceId, reason = 'USER_INITIATED') =>
-		mexQuery({ device_id: deviceId, reason }, PRIVACY_MEX_IDS.UNTRUST_TRUSTED_DEVICE, 'xwa2_untrust_trusted_device')
+		mexQuery(
+			{ device_id: deviceId, reason },
+			PRIVACY_MEX_IDS.UNTRUST_TRUSTED_DEVICE,
+			'xwa2_untrust_trusted_device'
+		)
 
 	/**
 	 * Delete a trusted device entirely via MEX.
@@ -334,7 +326,11 @@ const makePrivacySocket = sock => {
 	 * @param {string[]} jids - Business JIDs to check
 	 */
 	const bizIntegrityQuery = jids =>
-		mexQuery({ users: jids.map(jid => ({ jid })) }, PRIVACY_MEX_IDS.BIZ_INTEGRITY, 'xwa2_fetch_wa_users')
+		mexQuery(
+			{ users: jids.map(jid => ({ jid })) },
+			PRIVACY_MEX_IDS.BIZ_INTEGRITY,
+			'xwa2_fetch_wa_users'
+		)
 
 	/**
 	 * Set linked social profiles (FB/IG) via MEX.
@@ -411,7 +407,8 @@ const makePrivacySocket = sock => {
 	 *
 	 * @param {string} qrData - Raw QR code data string
 	 */
-	const qrCodeScan = qrData => mexQuery({ qr_data: qrData }, PRIVACY_MEX_IDS.QR_CODE_SCAN, 'xwa2_qr_code_scan')
+	const qrCodeScan = qrData =>
+		mexQuery({ qr_data: qrData }, PRIVACY_MEX_IDS.QR_CODE_SCAN, 'xwa2_qr_code_scan')
 
 	return {
 		...sock,