@badzz88/baileys 8.4.9 → 8.5.1

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

@@ -91,8 +91,6 @@ const makeChatsSocket = config => {
 	// Collections blocked on missing app state sync keys (mirrors WA Web's "Blocked" state).
 	// When a key arrives via APP_STATE_SYNC_KEY_SHARE, these are re-synced.
 	const blockedCollections = new Set()
-	/** messageId → numeric server_id for newsletter messages (persists within session) */
-	const _nlServerIdCache = new Map()
 	const placeholderResendCache =
 		config.placeholderResendCache ||
 		new node_cache_1.default({
@@ -118,63 +116,7 @@ const makeChatsSocket = config => {
 				},
 				content: [{ tag: 'privacy', attrs: {} }]
 			})
-			const privacyNode = content?.[0]
-			privacySettings = (0, WABinary_1.reduceBinaryNodeToDictionary)(privacyNode, 'category')
-
-			// A. Online Privacy Mode — may arrive as <category name="online" value="..."/> or
-			//    as a dedicated <online_privacy_setting value="..."/> child node.
-			const onlinePrivacy =
-				privacySettings['online'] ||
-				(0, WABinary_1.getBinaryNodeChild)(privacyNode, 'online_privacy_setting')?.attrs?.value ||
-				'all'
-
-			// C. Enhanced Block — root attrs or dedicated child node.
-			const enhancedBlockEnabled =
-				privacyNode?.attrs?.enhanced_block_enabled === 'true' ||
-				(0, WABinary_1.getBinaryNodeChild)(privacyNode, 'enhanced_block')?.attrs?.enabled === 'true'
-
-			// E. MD Privacy V2 flag.
-			const mdPrivacyV2 =
-				privacyNode?.attrs?.md_privacy_v2 === 'true' ||
-				(0, WABinary_1.getBinaryNodeChild)(privacyNode, 'md_privacy_v2')?.attrs?.value === 'true'
-
-			// F. Syncd clear-chat / delete-chat flag.
-			const syncdClearChatDeleteChatEnabled =
-				privacyNode?.attrs?.syncd_clear_chat_delete_chat_enabled === 'true' ||
-				(0, WABinary_1.getBinaryNodeChild)(privacyNode, 'syncd_clear_chat')?.attrs?.delete_chat_enabled === 'true'
-
-			// A. Syncd anti-tampering fatal-exception gate.
-			const syncdAntiTamperingEnabled =
-				privacyNode?.attrs?.syncd_anti_tampering_fatal_exception_enabled === 'true' ||
-				(0, WABinary_1.getBinaryNodeChild)(privacyNode, 'syncd_anti_tampering')?.attrs?.fatal_exception_enabled ===
-					'true'
-
-			// B. Syncd key-index rotation gate.
-			const keyRotationEnabled =
-				privacyNode?.attrs?.syncd_key_rotation_enabled === 'true' ||
-				(0, WABinary_1.getBinaryNodeChild)(privacyNode, 'syncd_key_rotation')?.attrs?.enabled === 'true'
-
-			// Emit combined settings update so consumers can react without parsing raw creds.
-			ev.emit('settings.update', {
-				onlinePrivacy,
-				enhancedBlockEnabled,
-				mdPrivacyV2,
-				syncdClearChatDeleteChatEnabled,
-				...(syncdAntiTamperingEnabled ? { syncdAntiTamperingEnabled: true } : {}),
-				keyRotationEnabled
-			})
-
-			// Persist extended privacy flags in credentials.
-			ev.emit('creds.update', {
-				privacySettings: {
-					onlinePrivacy,
-					enhancedBlockEnabled,
-					mdPrivacyV2,
-					syncdClearChatDeleteChatEnabled,
-					syncdAntiTamperingEnabled,
-					keyRotationEnabled
-				}
-			})
+			privacySettings = (0, WABinary_1.reduceBinaryNodeToDictionary)(content?.[0], 'category')
 		}
 		return privacySettings
 	}
@@ -237,7 +179,7 @@ const makeChatsSocket = config => {
 		const privacyNode = result?.content?.[0]
 		if (!privacyNode) return null
 		const lists = []
-		for (const listNode of privacyNode.content || []) {
+		for (const listNode of (privacyNode.content || [])) {
 			const { type, id, listname, emoji, selected, deleted } = listNode.attrs || {}
 			const members = (listNode.content || []).map(u => u.attrs?.jid).filter(Boolean)
 			lists.push({ type, id, listname, emoji, selected: selected === 'true', deleted: deleted === 'true', members })
@@ -330,35 +272,12 @@ const makeChatsSocket = config => {
 		const timeframeNode = (0, WABinary_1.getBinaryNodeChild)(result, 'timeframe')
 		if (!limitsNode) return null
 		return {
-			messagesLeft: parseInt(
-				limitsNode.attrs?.messages_left ??
-					(0, WABinary_1.getBinaryNodeChild)(limitsNode, 'messages_left')?.content ??
-					'0',
-				10
-			),
-			totalLimit: parseInt(
-				limitsNode.attrs?.total_limit ?? (0, WABinary_1.getBinaryNodeChild)(limitsNode, 'total_limit')?.content ?? '0',
-				10
-			),
-			isHeavySender:
-				(limitsNode.attrs?.is_heavy_sender ??
-					(0, WABinary_1.getBinaryNodeChild)(limitsNode, 'is_heavy_sender')?.content) === 'true',
-			startTs: parseInt(
-				timeframeNode?.attrs?.start_ts_s ??
-					(0, WABinary_1.getBinaryNodeChild)(timeframeNode, 'start_ts_s')?.content ??
-					'0',
-				10
-			),
-			endTs: parseInt(
-				timeframeNode?.attrs?.end_ts_s ?? (0, WABinary_1.getBinaryNodeChild)(timeframeNode, 'end_ts_s')?.content ?? '0',
-				10
-			),
-			resetTs: parseInt(
-				timeframeNode?.attrs?.reset_ts_s ??
-					(0, WABinary_1.getBinaryNodeChild)(timeframeNode, 'reset_ts_s')?.content ??
-					'0',
-				10
-			)
+			messagesLeft: parseInt(limitsNode.attrs?.messages_left ?? (0, WABinary_1.getBinaryNodeChild)(limitsNode, 'messages_left')?.content ?? '0'),
+			totalLimit: parseInt(limitsNode.attrs?.total_limit ?? (0, WABinary_1.getBinaryNodeChild)(limitsNode, 'total_limit')?.content ?? '0'),
+			isHeavySender: (limitsNode.attrs?.is_heavy_sender ?? (0, WABinary_1.getBinaryNodeChild)(limitsNode, 'is_heavy_sender')?.content) === 'true',
+			startTs: parseInt(timeframeNode?.attrs?.start_ts_s ?? (0, WABinary_1.getBinaryNodeChild)(timeframeNode, 'start_ts_s')?.content ?? '0'),
+			endTs: parseInt(timeframeNode?.attrs?.end_ts_s ?? (0, WABinary_1.getBinaryNodeChild)(timeframeNode, 'end_ts_s')?.content ?? '0'),
+			resetTs: parseInt(timeframeNode?.attrs?.reset_ts_s ?? (0, WABinary_1.getBinaryNodeChild)(timeframeNode, 'reset_ts_s')?.content ?? '0')
 		}
 	}
 
@@ -446,52 +365,6 @@ const makeChatsSocket = config => {
 		})
 		return (0, WABinary_1.getBinaryNodeChildren)(result, 'notice').map(n => ({ ...n.attrs }))
 	}
-	/**
-	 * Accept a TOS/disclosure notice (`xmlns="tos"` set with `<trackable>`).
-	 * Mirrors WASmaxUserNoticeTrackDisclosureRPC from WA Web.
-	 * @param {string} noticeId the notice id (e.g. "20250211")
-	 * @param {string|number} result the result code (e.g. "105")
-	 */
-	const acceptTosNotice = async (noticeId, result = '105') => {
-		await query({
-			tag: 'iq',
-			attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'tos', type: 'set' },
-			content: [{ tag: 'trackable', attrs: { id: String(noticeId), result: String(result) } }]
-		})
-	}
-	/**
-	 * Report spam for a chat/group with sample messages.
-	 * Mirrors WASmaxReportSpamRPC (xmlns="spam", type="set").
-	 * @param {string} jid the JID of the chat or group being reported
-	 * @param {Array<{id:string, from:string, t:number}>} messages up to ~5 recent messages as evidence
-	 * @param {string} [spamFlow] e.g. "group_info_report" or "contact_info_report"
-	 * @param {string} [subject] human-readable subject string (group name or contact name)
-	 */
-	const reportSpam = async (jid, messages, spamFlow = 'contact_info_report', subject) => {
-		const msgNodes = (messages || []).map(m => ({
-			tag: 'message',
-			attrs: {
-				from: String(jid),
-				t: String(m.t),
-				id: String(m.id)
-			}
-		}))
-		await query({
-			tag: 'iq',
-			attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'spam', type: 'set' },
-			content: [
-				{
-					tag: 'spam_list',
-					attrs: {
-						jid: String(jid),
-						spam_flow: String(spamFlow),
-						...(subject ? { subject: String(subject) } : {})
-					},
-					content: msgNodes
-				}
-			]
-		})
-	}
 	/**
 	 * Get the account opt-out list (`optoutlist` IQ). Returns the raw result node.
 	 */
@@ -501,28 +374,6 @@ const makeChatsSocket = config => {
 			attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'optoutlist', type: 'get' }
 		})
 	}
-	/**
-	 * Sign a blinded credential for privacy-preserving anonymous stats.
-	 * Mirrors WASmaxPrivateStatsSignCredentialRPC (xmlns `privatestats`).
-	 * @param {Buffer} blindedCredential 32-byte blinded credential
-	 * @returns {Promise<Buffer|undefined>} signed credential bytes from server
-	 */
-	const signPrivateCredential = async blindedCredential => {
-		const result = await query({
-			tag: 'iq',
-			attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'privatestats', type: 'get' },
-			content: [
-				{
-					tag: 'sign_credential',
-					attrs: { version: '1' },
-					content: [{ tag: 'blinded_credential', attrs: {}, content: blindedCredential }]
-				}
-			]
-		})
-		const signedNode = (0, WABinary_1.getBinaryNodeChild)(result, 'sign_credential')
-		const signedBytes = (0, WABinary_1.getBinaryNodeChild)(signedNode, 'signed_credential')
-		return signedBytes?.content instanceof Uint8Array ? Buffer.from(signedBytes.content) : undefined
-	}
 	/**
 	 * Get push-notification settings (`urn:xmpp:whatsapp:push`).
 	 */
@@ -551,7 +402,7 @@ const makeChatsSocket = config => {
 		for (const jid of jids) {
 			usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid))
 		}
-		const result = await executeUSyncQuery(usyncQuery)
+		const result = await sock.executeUSyncQuery(usyncQuery)
 		if (result) {
 			return result.list
 		}
@@ -561,7 +412,7 @@ const makeChatsSocket = config => {
 		for (const jid of jids) {
 			usyncQuery.withUser(new WAUSync_1.USyncUser().withId(jid))
 		}
-		const result = await executeUSyncQuery(usyncQuery)
+		const result = await sock.executeUSyncQuery(usyncQuery)
 		if (result) {
 			return result.list
 		}
@@ -641,24 +492,17 @@ const makeChatsSocket = config => {
 	const updateProfileName = async name => {
 		await chatModify({ pushNameSetting: name }, '')
 	}
-	// dhash: previously-seen blocklist delta-hash, for incremental sync — server returns
-	// the current dhash unconditionally, and a fresh list only when it doesn't match.
-	// Confirmed from live capture: content is null for a full fetch, or a single
-	// <item dhash="..."/> child for the incremental check — never a <blocklist/> child.
-	const fetchBlocklist = async (dhash = null) => {
+	const fetchBlocklist = async () => {
 		const result = await query({
 			tag: 'iq',
 			attrs: {
 				xmlns: 'blocklist',
 				to: WABinary_1.S_WHATSAPP_NET,
 				type: 'get'
-			},
-			content: dhash ? [{ tag: 'item', attrs: { dhash } }] : null
+			}
 		})
 		const listNode = (0, WABinary_1.getBinaryNodeChild)(result, 'list')
-		const jids = (0, WABinary_1.getBinaryNodeChildren)(listNode, 'item').map(n => n.attrs.jid)
-		ev.emit('blocklist.set', { blocklist: jids })
-		return jids
+		return (0, WABinary_1.getBinaryNodeChildren)(listNode, 'item').map(n => n.attrs.jid)
 	}
 	const updateBlockStatus = async (jid, action) => {
 		await query({
@@ -680,67 +524,26 @@ const makeChatsSocket = config => {
 		})
 	}
 	const getBusinessProfile = async jid => {
-		// Confirmed from live capture: business_profile uses v="116" (not "244"), and
-		// verified_name is always its own separate w:biz iq — { jid } attr, no xmlns
-		// child attr — never bundled into the business_profile request.
-		const [results, verifiedNameResult] = await Promise.all([
-			query({
-				tag: 'iq',
-				attrs: {
-					to: 's.whatsapp.net',
-					xmlns: 'w:biz',
-					type: 'get'
-				},
-				content: [
-					{
-						tag: 'business_profile',
-						attrs: { v: '116' },
-						content: [
-							{
-								tag: 'profile',
-								attrs: { jid }
-							}
-						]
-					}
-				]
-			}),
-			query({
-				tag: 'iq',
-				attrs: {
-					to: 's.whatsapp.net',
-					xmlns: 'w:biz',
-					type: 'get'
-				},
-				content: [
-					{
-						tag: 'verified_name',
-						attrs: { jid }
-					}
-				]
-			})
-		])
-		// Parse verified_name certificate if present in the response
-		const verifiedNameNode = (0, WABinary_1.getBinaryNodeChild)(verifiedNameResult, 'verified_name')
-		let verifiedNameCert
-		if (verifiedNameNode) {
-			const certNode = (0, WABinary_1.getBinaryNodeChild)(verifiedNameNode, 'certificate')
-			if (certNode) {
-				const detailsNode = (0, WABinary_1.getBinaryNodeChild)(certNode, 'details')
-				const localizedNames = (0, WABinary_1.getBinaryNodeChildren)(certNode, 'localized_name').map(n => ({
-					lg: n.attrs?.lg,
-					lc: n.attrs?.lc,
-					verifiedName: n.attrs?.verified_name || n.content?.toString()
-				}))
-				verifiedNameCert = {
-					certSerial: certNode.attrs?.serial ? +certNode.attrs.serial : undefined,
-					issuer: certNode.attrs?.issuer,
-					details: {
-						verifiedName: detailsNode?.attrs?.verified_name || detailsNode?.content?.toString(),
-						localizedNames
-					}
+		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) {
@@ -757,31 +560,9 @@ const makeChatsSocket = config => {
 				? (0, WABinary_1.getBinaryNodeChildren)(businessHours, 'business_hours_config')
 				: undefined
 			const websiteStr = website?.content?.toString()
-
-			// Catalog status from profile attrs
-			const catalogStatus = {
-				exists: profiles.attrs?.catalog_exists === 'true' || profiles.attrs?.catalog_exists === true || false,
-				sendAll: profiles.attrs?.catalog_send_all === 'true' || profiles.attrs?.catalog_send_all === true || false
-			}
-
-			// Cart flags from profile attrs
-			const cartEnabled =
-				profiles.attrs?.cart_enabled !== undefined
-					? profiles.attrs.cart_enabled === 'true' || profiles.attrs.cart_enabled === true
-					: undefined
-			const webCartEnabled =
-				profiles.attrs?.web_cart_enabled !== undefined
-					? profiles.attrs.web_cart_enabled === 'true' || profiles.attrs.web_cart_enabled === true
-					: undefined
-			const webCartOnOff = profiles.attrs?.web_cart_on_off
-
-			// Commerce experience from profile attrs
-			const commerceExperience = profiles.attrs?.commerce_experience
-
 			return {
 				wid: profiles.attrs?.jid,
 				address: address?.content?.toString(),
-				businessAddress: address?.content?.toString(),
 				description: description?.content?.toString() || '',
 				website: websiteStr ? [websiteStr] : [],
 				email: email?.content?.toString(),
@@ -789,24 +570,7 @@ const makeChatsSocket = config => {
 				business_hours: {
 					timezone: businessHours?.attrs?.timezone,
 					business_config: businessHoursConfig?.map(({ attrs }) => attrs)
-				},
-				businessHours: businessHoursConfig
-					? {
-							timezone: businessHours?.attrs?.timezone ?? null,
-							config: businessHoursConfig.map(({ attrs }) => ({
-								dayOfWeek: attrs?.day_of_week ?? null,
-								openTime: attrs?.open_time ?? null,
-								closeTime: attrs?.close_time ?? null,
-								mode: attrs?.mode ?? null
-							}))
-						}
-					: null,
-				catalogStatus,
-				cartEnabled,
-				webCartEnabled,
-				webCartOnOff,
-				commerceExperience,
-				verifiedNameCert
+				}
 			}
 		}
 	}
@@ -841,13 +605,6 @@ const makeChatsSocket = config => {
 					isInitialSync ? { accountSettings: authState.creds.accountSettings } : undefined,
 					logger
 				)
-				// Persist NCT salt received via App-State-Sync (SyncActionValue field 80)
-				const _nctSalt = mutation?.syncAction?.value?.nctSaltSyncAction?.salt
-				if (_nctSalt?.length) {
-					authState.keys
-						.set({ 'nct-salt': { default: Buffer.from(_nctSalt) } })
-						.catch(err => logger.debug({ err: err?.message }, 'nct: failed to persist salt'))
-				}
 			}
 		}
 	}
@@ -855,7 +612,7 @@ const makeChatsSocket = config => {
 		const appStateSyncKeyCache = new Map()
 		const getCachedAppStateSyncKey = async keyId => {
 			if (appStateSyncKeyCache.has(keyId)) {
-				return appStateSyncKeyCache.get(keyId)
+				return appStateSyncKeyCache.get(keyId) ?? undefined
 			}
 			const key = await getAppStateSyncKey(keyId)
 			appStateSyncKeyCache.set(keyId, key ?? null)
@@ -880,7 +637,7 @@ const makeChatsSocket = config => {
 					const result = await authState.keys.get('app-state-sync-version', [name])
 					let state = result[name]
 					if (state) {
-						if (initialVersionMap[name] === undefined) {
+						if (typeof initialVersionMap[name] === 'undefined') {
 							initialVersionMap[name] = state.version
 						}
 					} else {
@@ -1005,9 +762,7 @@ const makeChatsSocket = config => {
 	 * type = "avatar"  for the avatar variant (no query attr, confirmed from interop logs)
 	 */
 	const profilePictureUrl = async (jid, type = 'preview', timeoutMs) => {
-		// Confirmed from live capture: query="url" is always present, for both
-		// "preview" and "image" — not image-only as previously assumed.
-		const picAttrs = { type, query: 'url' }
+		const picAttrs = type === 'image' ? { type, query: 'url' } : { type }
 		const baseContent = [{ tag: 'picture', attrs: picAttrs }]
 		// WA Web only includes tctoken for user JIDs (not groups/newsletters)
 		// and never for own profile pic (Chat model for self has no tcToken).
@@ -1124,136 +879,25 @@ const makeChatsSocket = config => {
 			})
 		}
 	}
-	/**
-	 * Store privacy tokens received from a usync response per-contact.
-	 * Called externally when a USyncQuery result includes privacy_token data.
-	 *
-	 * @param {Array<{jid: string, privacyToken: Buffer, privacyModeTs: number|string}>} entries
-	 */
-	const storePrivacyTokens = async entries => {
-		if (!entries?.length) return
-		const write = {}
-		for (const { jid, privacyToken, privacyModeTs } of entries) {
-			if (!jid || !privacyToken?.length) continue
-			write[jid] = {
-				token: Buffer.isBuffer(privacyToken) ? privacyToken : Buffer.from(privacyToken),
-				ts: String(privacyModeTs || '')
-			}
-		}
-		if (Object.keys(write).length) {
-			await authState.keys.set({ 'privacy-token': write })
-		}
-	}
-
-	/**
-	 * Wrapper around sock.executeUSyncQuery that automatically persists any per-contact
-	 * privacy tokens (privacy_mode_ts + privacy_token) present in the usync result list,
-	 * and emits contacts.update for any entries flagged isBlockedByContact.
-	 *
-	 * @param {import('../WAUSync/USyncQuery').USyncQuery} usyncQuery
-	 */
-	const executeUSyncQuery = async usyncQuery => {
-		const result = await sock.executeUSyncQuery(usyncQuery)
-		if (!result) return result
-
-		// B. Auto-persist privacy tokens found in any usync response.
-		const privacyEntries = []
-		const blockedContacts = []
-		for (const entry of [...(result.list || []), ...(result.sideList || [])]) {
-			if (entry.privacy?.token) {
-				privacyEntries.push({
-					jid: entry.id,
-					privacyToken: entry.privacy.token,
-					privacyModeTs: entry.privacy.modeTs
-				})
-			}
-			// G. Emit contacts.update for contacts that blocked us.
-			if (entry.isBlockedByContact) {
-				blockedContacts.push({ id: entry.id, isBlockedByContact: true })
-			}
-		}
-		if (privacyEntries.length) {
-			storePrivacyTokens(privacyEntries).catch(err => logger.warn({ err }, 'failed to store privacy tokens from usync'))
-		}
-		if (blockedContacts.length) {
-			ev.emit('contacts.update', blockedContacts)
-		}
-		return result
-	}
-
 	/**
 	 * @param toJid the jid to subscribe to
-	 * @param options.presenceType optional presenceType attribute stored for the contact
-	 * @param options.presenceName optional presenceName attribute for the subscribe stanza
-	 * @param options.groupJid optional group JID — when set adds context="group" attribute
+	 * @param tcToken token for subscription, use if present
 	 */
-	const presenceSubscribe = async (toJid, { presenceType, presenceName, groupJid } = {}) => {
+	const presenceSubscribe = async toJid => {
 		// Only include tctoken for user JIDs — groups/newsletters don't use tctokens
 		const normalizedToJid = (0, WABinary_1.jidNormalizedUser)(toJid)
 		const isUserJid = (0, WABinary_1.isPnUser)(normalizedToJid) || (0, WABinary_1.isLidUser)(normalizedToJid)
-
-		// Build presence attributes
-		const presenceAttrs = {
-			to: toJid,
-			id: generateMessageTag(),
-			type: 'subscribe'
-		}
-
-		// Accumulate child nodes for the presence stanza
-		const presenceContent = []
-
-		// A. TC Token as attribute: fetch stored token and attach as base64 tc_token attr
-		if (isUserJid) {
-			try {
-				const storageJid = await (0, tc_token_utils_1.resolveTcTokenJid)(normalizedToJid, getLIDForPN)
-				const tcTokenData = await authState.keys.get('tctoken', [storageJid])
-				const entry = tcTokenData?.[storageJid]
-				const tcTokenBuffer = entry?.token
-				if (tcTokenBuffer?.length && !(0, tc_token_utils_1.isTcTokenExpired)(entry?.timestamp)) {
-					presenceAttrs.tc_token = tcTokenBuffer.toString('base64')
-				}
-			} catch (e) {
-				// best-effort — proceed without tc_token if lookup fails
-			}
-
-			// B. Privacy Token — include per-contact privacy token when available.
-			// This token is issued by the contact's device via usync and gates presence
-			// visibility when their online privacy is set to "contacts" or "contact_blacklist".
-			try {
-				const privTokenData = await authState.keys.get('privacy-token', [normalizedToJid])
-				const privEntry = privTokenData?.[normalizedToJid]
-				if (privEntry?.token?.length) {
-					const privTokenAttrs = {}
-					if (privEntry.ts) privTokenAttrs.t = privEntry.ts
-					presenceContent.push({
-						tag: 'privacy_token',
-						attrs: privTokenAttrs,
-						content: privEntry.token
-					})
-				}
-			} catch (e) {
-				// best-effort — proceed without privacy_token if lookup fails
-			}
-		}
-
-		// C. presenceType and presenceName attributes
-		if (presenceType) {
-			presenceAttrs.presenceType = presenceType
-		}
-		if (presenceName) {
-			presenceAttrs.presenceName = presenceName
-		}
-
-		// D. Group presence context
-		if (groupJid) {
-			presenceAttrs.context = 'group'
-			presenceAttrs.group_jid = (0, WABinary_1.jidNormalizedUser)(groupJid)
-		}
-
+		const tcTokenContent = isUserJid
+			? await (0, tc_token_utils_1.buildTcTokenFromJid)({ authState, jid: normalizedToJid, getLIDForPN })
+			: undefined
 		return sendNode({
 			tag: 'presence',
-			attrs: presenceAttrs,
-			content: presenceContent.length ? presenceContent : undefined
+			attrs: {
+				to: toJid,
+				id: generateMessageTag(),
+				type: 'subscribe'
+			},
+			content: tcTokenContent
 		})
 	}
 	const handlePresenceUpdate = ({ tag, attrs, content }) => {
@@ -1561,36 +1205,6 @@ const makeChatsSocket = config => {
 	const updatePrivateProcessingSetting = enabled => {
 		return chatModify({ privateProcessingSetting: enabled ? 'enabled' : 'disabled' }, '')
 	}
-	/**
-	 * Update Meta AI features control
-	 * @param status 'enabled' | 'enabled_has_learning' | 'disabled'
-	 * @param replyMode 'muted' | 'ai_agent' | 'suggestions'
-	 */
-	const updateAIFeatures = (status = 'enabled', replyMode = 'suggestions') => {
-		const statusEnum =
-			require('../../WAProto/index.js').proto.SyncActionValue.MaibaAIFeaturesControlAction.MaibaAIFeatureStatus
-		const replyModeEnum =
-			require('../../WAProto/index.js').proto.SyncActionValue.MaibaAIFeaturesControlAction.MaibaAIReplyMode
-		const statusMap = {
-			enabled: statusEnum.ENABLED,
-			enabled_has_learning: statusEnum.ENABLED_HAS_LEARNING,
-			disabled: statusEnum.DISABLED
-		}
-		const replyModeMap = {
-			muted: replyModeEnum.MUTED,
-			ai_agent: replyModeEnum.AI_AGENT,
-			suggestions: replyModeEnum.SUGGESTIONS
-		}
-		return chatModify(
-			{
-				maibaAIFeatures: {
-					status: statusMap[status] ?? statusEnum.ENABLED,
-					replyMode: replyModeMap[replyMode] ?? replyModeEnum.SUGGESTIONS
-				}
-			},
-			''
-		)
-	}
 	/**
 	 * Update bio/about privacy (who can see your About text)
 	 * @param value 'all' | 'contacts' | 'contact_blacklist' | 'none'
@@ -1679,30 +1293,6 @@ const makeChatsSocket = config => {
 	const silenceChat = (jid, silent = true, until = null) => {
 		return chatModify({ silenceChat: { silent, until } }, jid)
 	}
-	/**
-	 * Clear all messages in a chat
-	 */
-	const clearChat = (jid, lastMessages) => {
-		return chatModify({ clear: true, lastMessages }, jid)
-	}
-	/**
-	 * Pin or unpin a chat to the top
-	 */
-	const pinChat = (jid, pinned = true) => {
-		return chatModify({ pin: { pinned } }, jid)
-	}
-	/**
-	 * Star or unstar messages
-	 */
-	const starMessages = (jid, messageIds, starred = true) => {
-		return chatModify({ star: { messages: messageIds, star: starred } }, jid)
-	}
-	/**
-	 * Set up a quick reply
-	 */
-	const setQuickReply = (text, shortcut) => {
-		return chatModify({ quickReply: { text, shortcut } }, '')
-	}
 	/**
 	 * Fetch bot profiles for a list of JIDs using USyncBotProfileProtocol
 	 */
@@ -1713,7 +1303,7 @@ const makeChatsSocket = config => {
 		for (const jid of jids) {
 			q.withUser(new USyncUser().withId(jid))
 		}
-		const result = await executeUSyncQuery(q)
+		const result = await sock.executeUSyncQuery(q)
 		return result?.list || []
 	}
 	/**
@@ -1771,18 +1361,12 @@ const makeChatsSocket = config => {
 	/**
 	 * Fetch AB-test (abt) props from server.
 	 * Mirrors ABPropsProtocolHelper — protocol 1 or 2, optional hash/refresh_id/group.
-	 * Confirmed from live capture: group-scoped queries send only { group }, never combined
-	 * with protocol/hash/refresh_id; the account-level default protocol is "1", not "2".
 	 */
-	const fetchABProps = async (protocol = '1', hash = '', refreshId = null, group = null) => {
-		const propAttrs =
-			group != null
-				? { group: String(group) }
-				: {
-						protocol,
-						...(hash ? { hash } : {}),
-						...(refreshId != null ? { refresh_id: String(refreshId) } : {})
-					}
+	const fetchABProps = async (protocol = '2', hash = '', refreshId = null, group = null) => {
+		const propAttrs = { protocol }
+		if (hash) propAttrs.hash = hash
+		if (refreshId != null) propAttrs.refresh_id = String(refreshId)
+		if (group != null) propAttrs.group = String(group)
 		const result = await query({
 			tag: 'iq',
 			attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'abt', type: 'get' },
@@ -1795,19 +1379,16 @@ const makeChatsSocket = config => {
 	/**
 	 * Remove a companion (linked) device from the account.
 	 * Mirrors CompanionDeviceRemovalJob — xmlns="md", child tag "remove-companion-device".
-	 * jid: full device JID of the companion to remove (e.g. "1234567890:5@s.whatsapp.net").
-	 * reason: "user_initiated" | "unknown_companion" | any WA-defined reason string.
-	 * Confirmed from live capture — the previous { platform, id: keyIndex } attrs never
-	 * identified a device at all; the server needs the companion's full jid.
+	 * reason: "user_initiated" | "server_initiated" | any WA-defined reason string.
 	 */
-	const removeCompanionDevice = async (jid, reason = 'user_initiated') => {
+	const removeCompanionDevice = async (keyIndex, reason = 'user_initiated') => {
 		await query({
 			tag: 'iq',
 			attrs: { to: WABinary_1.S_WHATSAPP_NET, xmlns: 'md', type: 'set' },
 			content: [
 				{
 					tag: 'remove-companion-device',
-					attrs: { jid, reason }
+					attrs: { platform: 'true', reason, id: String(keyIndex) }
 				}
 			]
 		})
@@ -1831,51 +1412,6 @@ const makeChatsSocket = config => {
 			]
 		})
 	}
-	/**
-	 * Build and push the companion's signed key-index-list on (re)connect.
-	 *
-	 * The official client sends this within ~0.8s of every session start (xmlns="md").
-	 * A companion that never re-asserts its ADV key index is treated as unverified and
-	 * gets <conflict type="device_removed"/>.
-	 *
-	 * Payload construction mirrors CompanionDeviceAdvUtil.A02 (C19350ud) from the APK:
-	 *   details            = proto ADVKeyIndexList { rawId, timestamp, currentIndex, validIndexes, accountType }
-	 *   accountSignature   = Curve.sign(signedIdentityKey.private, [6,2] || details)
-	 *   accountSignatureKey = only attached for HOSTED accounts (skipped for consumer E2EE)
-	 * The signature uses our own device identity key (the same key that produces the ADV
-	 * deviceSignature during pairing) — a companion cannot re-sign with the account key.
-	 */
-	const sendKeyIndexList = async () => {
-		const account = authState.creds.account
-		const signedIdentityKey = authState.creds.signedIdentityKey
-		if (!account?.details || !signedIdentityKey?.private) {
-			logger.debug('no ADV account / signed identity key, skipping key-index-list')
-			return
-		}
-		const deviceIdentity = index_js_1.proto.ADVDeviceIdentity.decode(account.details)
-		const keyIndex = deviceIdentity.keyIndex || 0
-		const accountType = deviceIdentity.accountType ?? index_js_1.proto.ADVEncryptionType.E2EE
-		const isHosted = accountType === index_js_1.proto.ADVEncryptionType.HOSTED
-		const ts = Math.floor(Date.now() / 1000)
-		const details = index_js_1.proto.ADVKeyIndexList.encode({
-			rawId: deviceIdentity.rawId || 0,
-			timestamp: ts,
-			currentIndex: keyIndex,
-			validIndexes: [keyIndex],
-			accountType
-		}).finish()
-		const sigPrefix = isHosted
-			? Defaults_1.WA_ADV_HOSTED_KEY_INDEX_LIST_SIG_PREFIX
-			: Defaults_1.WA_ADV_KEY_INDEX_LIST_SIG_PREFIX
-		const accountSignature = Utils_1.Curve.sign(signedIdentityKey.private, Buffer.concat([sigPrefix, details]))
-		const signedKeyIndexList = { details, accountSignature }
-		if (isHosted && account.accountSignatureKey?.length) {
-			signedKeyIndexList.accountSignatureKey = account.accountSignatureKey
-		}
-		const content = index_js_1.proto.ADVSignedKeyIndexList.encode(signedKeyIndexList).finish()
-		await updateKeyIndexList(ts, Buffer.from(content))
-		logger.info({ ts, keyIndex }, 'sent key-index-list')
-	}
 	/**
 	 * Request a media upload connection token from the server.
 	 * Mirrors MediaConnFetcher — xmlns="w:m", type="set", optional last_id.
@@ -1932,8 +1468,6 @@ const makeChatsSocket = config => {
 		await query({
 			tag: 'iq',
 			attrs: {
-				// reuse the challenge id at the iq level too, matching AccountDefenceDeviceLogoutJob
-				id: String(id),
 				to: WABinary_1.S_WHATSAPP_NET,
 				xmlns: 'w:account_defence',
 				type: 'set',
@@ -1952,71 +1486,9 @@ const makeChatsSocket = config => {
 	 * help ensure parity with WA Web
 	 * */
 	const executeInitQueries = async () => {
-		// Gate initInterop on previously-persisted flag: undefined = first connection (always run);
-		// false = account has interop disabled, skip the TOS/opt-in flow on reconnect.
-		const shouldInitInterop = authState.creds.interopEnabled !== false
-		const [, , , abProps] = await Promise.all([
-			fetchProps(),
-			fetchBlocklist(),
-			fetchPrivacySettings(),
-			fetchABProps(),
-			...(shouldInitInterop ? [initInterop()] : [])
-		])
-		const INTEROP_FLAGS = ['stella_interop_enabled', 'stella_ios_enabled']
-		for (const flag of INTEROP_FLAGS) {
-			if (flag in abProps) {
-				const enabled = abProps[flag] === 'true' || abProps[flag] === '1'
-				ev.emit('interop.feature-update', { feature: flag, enabled })
-			}
-		}
-		// Persist AB prop feature flags into connection credentials so they survive reconnect.
-		const abCredsUpdate = {}
-		if ('stella_interop_enabled' in abProps) {
-			abCredsUpdate.interopEnabled =
-				abProps['stella_interop_enabled'] === 'true' || abProps['stella_interop_enabled'] === '1'
-		}
-		if ('stella_ios_enabled' in abProps) {
-			abCredsUpdate.interopIosEnabled =
-				abProps['stella_ios_enabled'] === 'true' || abProps['stella_ios_enabled'] === '1'
-		}
-		if ('md_privacy_v2' in abProps) {
-			abCredsUpdate.mdPrivacyV2 = abProps['md_privacy_v2'] === 'true' || abProps['md_privacy_v2'] === '1'
-		}
-		// Persist media feature-flag AB props so upload/download paths can gate on them.
-		const MEDIA_AB_PROPS = [
-			'hd_image_dual_upload',
-			'hd_video_dual_upload',
-			'hevc_video_dual_upload',
-			'partial_pjpeg_enabled',
-			'multi_scan_pjpeg',
-			'media_poll'
-		]
-		const mediaAbProps = {}
-		for (const prop of MEDIA_AB_PROPS) {
-			if (prop in abProps) {
-				mediaAbProps[prop] = abProps[prop] === 'true' || abProps[prop] === '1'
-			}
-		}
-		if (Object.keys(mediaAbProps).length) {
-			abCredsUpdate.mediaAbProps = { ...(authState.creds.mediaAbProps || {}), ...mediaAbProps }
-		}
-		if (Object.keys(abCredsUpdate).length) {
-			ev.emit('creds.update', abCredsUpdate)
-		}
+		await Promise.all([fetchProps(), fetchBlocklist(), fetchPrivacySettings(), initInterop()])
 	}
 	const upsertMessage = ev.createBufferedFunction(async (msg, type) => {
-		// Cache newsletter server_id for use when this message is later quoted
-		if (msg.newsletter && msg.newsletter_server_id && msg.key?.id) {
-			_nlServerIdCache.set(msg.key.id, msg.newsletter_server_id)
-		}
-		// If this message quotes a newsletter post, enrich it with the cached server_id
-		if (msg.message) {
-			const ci = Object.values(msg.message).find(v => v?.contextInfo)?.contextInfo
-			if (ci?.stanzaId && (0, WABinary_1.isJidNewsletter)(ci.remoteJid)) {
-				const sid = _nlServerIdCache.get(ci.stanzaId)
-				if (sid != null) msg.quotedNewsletterServerId = sid
-			}
-		}
 		ev.emit('messages.upsert', { messages: [msg], type })
 		if (!!msg.pushName) {
 			let jid = msg.key.fromMe ? authState.creds.me.id : msg.key.participant || msg.key.remoteJid
@@ -2134,20 +1606,6 @@ const makeChatsSocket = config => {
 	})
 	ws.on('CB:presence', handlePresenceUpdate)
 	ws.on('CB:chatstate', handlePresenceUpdate)
-	// Server device-legitimacy challenge (w:account_defence). Fires a few seconds after the
-	// companion sends its first message; if we don't approve within ~20s the device is removed
-	// with <conflict type="device_removed"/>. Wire the inbound challenge to confirmDeviceLogout.
-	ws.on('CB:iq,xmlns:w:account_defence', async node => {
-		const deviceLogout = (0, WABinary_1.getBinaryNodeChild)(node, 'device_logout')
-		if (!deviceLogout) return
-		const id = node.attrs.id
-		logger.info({ id }, 'received account_defence device_logout challenge, approving')
-		try {
-			await confirmDeviceLogout(id, true)
-		} catch (error) {
-			onUnexpectedError(error, 'account_defence device_logout approve')
-		}
-	})
 	ws.on('CB:ib,,dirty', async node => {
 		const { attrs } = (0, WABinary_1.getBinaryNodeChild)(node, 'dirty')
 		const type = attrs.type
@@ -2183,9 +1641,6 @@ const makeChatsSocket = config => {
 			sendPresenceUpdate(markOnlineOnConnect ? 'available' : 'unavailable').catch(error =>
 				onUnexpectedError(error, 'presence update requests')
 			)
-			// Re-assert our ADV key index to the server on every (re)connect, or the companion
-			// is treated as unverified and removed. Best-effort: never block the open flow.
-			sendKeyIndexList().catch(error => onUnexpectedError(error, 'send key-index-list'))
 		}
 		if (!receivedPendingNotifications || syncState !== State_1.SyncState.Connecting) {
 			return
@@ -2263,12 +1718,9 @@ const makeChatsSocket = config => {
 		getChatBlockingStatus,
 		updateChatBlockingStatus,
 		getUserDisclosures,
-		acceptTosNotice,
-		reportSpam,
 		getOptOutList,
 		getPushConfig,
 		setPushConfig,
-		signPrivateCredential,
 		messageMutex,
 		receiptMutex,
 		appStatePatchMutex,
@@ -2317,7 +1769,6 @@ const makeChatsSocket = config => {
 		renameAIThread,
 		pinThreadMessage,
 		updatePrivateProcessingSetting,
-		updateAIFeatures,
 		updateBioPrivacy,
 		blockBot,
 		unblockBot,
@@ -2331,10 +1782,6 @@ const makeChatsSocket = config => {
 		markChatAsUnread,
 		setChatEphemeral,
 		silenceChat,
-		clearChat,
-		pinChat,
-		starMessages,
-		setQuickReply,
 		fetchBotProfiles,
 		updateChatLock,
 		updateChatWallpaper,
@@ -2363,12 +1810,7 @@ const makeChatsSocket = config => {
 		fetchMediaConn,
 		deleteBroadcastList,
 		fetchQRCode,
-		confirmDeviceLogout,
-		updateKeyIndexList,
-		sendKeyIndexList,
-		storePrivacyTokens,
-		executeUSyncQuery,
-		newsletterServerIdCache: _nlServerIdCache
+		confirmDeviceLogout
 	}
 }
 exports.makeChatsSocket = makeChatsSocket