@badzz88/baileys 8.4.9 → 8.5.0

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

@@ -46,32 +46,12 @@ const makeGroupsSocket = config => {
 			},
 			content
 		})
-	// Group metadata carries authoritative LID<->PN pairs for free (per-participant
-	// jid + phone_number/lid attrs). Persist them so the rest of the app can resolve
-	// PN<->LID without a separate usync round trip.
-	const persistParticipantLidMappings = async participantLists => {
-		const pairs = []
-		for (const participants of participantLists) {
-			for (const p of participants || []) {
-				if (p.phoneNumber) pairs.push({ lid: p.id, pn: p.phoneNumber })
-				else if (p.lid) pairs.push({ lid: p.lid, pn: p.id })
-			}
-		}
-		if (!pairs.length) return
-		try {
-			await sock.signalRepository.lidMapping.storeLIDPNMappings(pairs)
-		} catch (error) {
-			sock.logger?.warn?.({ error }, 'failed to store LID/PN mappings from group metadata')
-		}
-	}
 
 	const mexQuery = (variables, queryId, dataPath) =>
 		(0, mex_1.executeWMexQuery)(variables, queryId, dataPath, query, generateMessageTag)
 	const groupMetadata = async jid => {
 		const result = await groupQuery(jid, 'get', [{ tag: 'query', attrs: { request: 'interactive' } }])
-		const metadata = (0, exports.extractGroupMetadata)(result)
-		persistParticipantLidMappings([metadata.participants]).catch(() => {})
-		return metadata
+		return (0, exports.extractGroupMetadata)(result)
 	}
 	/**
 	 * Acknowledge a group. Ported from WhatsApp Web's WASmaxGroupsAcknowledgeGroupRPC
@@ -139,29 +119,21 @@ const makeGroupsSocket = config => {
 		await groupQuery(parentJid, 'set', [{ tag: 'sub_group_suggestion', attrs: {}, content: suggestion }])
 	}
 	/**
-	 * Approve, reject, or cancel sub-group suggestions for a community. Ported from
-	 * WhatsApp Web's WASmaxGroupsSubGroupSuggestionsActionRPC.
-	 * approve/reject address suggestions by creator jid; cancel addresses them by
-	 * the suggested group's jid (WASmaxOutGroupsSubGroupSuggestionsActionRequest).
+	 * Approve or reject sub-group suggestions for a community. Ported from WhatsApp
+	 * Web's WASmaxGroupsSubGroupSuggestionsActionRPC. NOTE: untested against live WhatsApp.
 	 * @param {string} parentJid community/parent group to address
-	 * @param {'approve' | 'reject' | 'cancel'} action
-	 * @param {Array<{ creator?: string, jid?: string }>} suggestions
+	 * @param {'approve' | 'reject'} action
+	 * @param {Array<{ creator: string, jid?: string }>} suggestions
 	 */
 	const groupSubGroupSuggestionsAction = async (parentJid, action, suggestions) => {
 		await groupQuery(parentJid, 'set', [
 			{
-				tag: 'sub_group_suggestions_action',
+				tag: action,
 				attrs: {},
-				content: [
-					{
-						tag: action,
-						attrs: {},
-						content: suggestions.map(s => ({
-							tag: 'sub_group_suggestion',
-							attrs: action === 'cancel' ? { jid: s.jid } : { creator: s.creator }
-						}))
-					}
-				]
+				content: suggestions.map(s => ({
+					tag: 'sub_group_suggestion',
+					attrs: { creator: s.creator, ...(s.jid ? { jid: s.jid } : {}) }
+				}))
 			}
 		])
 	}
@@ -197,9 +169,8 @@ const makeGroupsSocket = config => {
 				data[meta.id] = meta
 			}
 		}
-		const allGroups = Object.values(data)
-		persistParticipantLidMappings(allGroups.map(g => g.participants)).catch(() => {})
-		sock.ev.emit('groups.update', allGroups)
+		// TODO: properly parse LID / PN DATA
+		sock.ev.emit('groups.update', Object.values(data))
 		return data
 	}
 	sock.ws.on('CB:ib,,dirty', async node => {
@@ -443,11 +414,8 @@ const makeGroupsSocket = config => {
 			const result = await groupQuery('@g.us', 'set', [
 				{
 					tag: 'create',
-					attrs: { subject, key },
-					content: [
-						...participants.map(jid => ({ tag: 'participant', attrs: { jid } })),
-						{ tag: 'linked_parent', attrs: { jid: communityJid } }
-					]
+					attrs: { subject, key, parent_group_id: communityJid },
+					content: participants.map(jid => ({ tag: 'participant', attrs: { jid } }))
 				}
 			])
 			return (0, exports.extractGroupMetadata)(result)
@@ -522,18 +490,15 @@ const makeGroupsSocket = config => {
 		 * Fetch group info via MEX (richer than IQ — includes invite link, LID addressing, etc.)
 		 * @param {string} jid - Group JID
 		 */
-		groupQueryInfo: jid => mexQuery({ group_id: jid }, GROUP_MEX_QUERY_IDS.QUERY_INFO, 'xwa2_group_query_by_id'),
+		groupQueryInfo: jid =>
+			mexQuery({ group_id: jid }, GROUP_MEX_QUERY_IDS.QUERY_INFO, 'xwa2_group_query_by_id'),
 
 		/**
 		 * Fetch group info by invite code via MEX.
 		 * @param {string} code - Group invite code (without the link prefix)
 		 */
 		groupQueryInfoByCode: code =>
-			mexQuery(
-				{ group_input: { invite_code: code } },
-				GROUP_MEX_QUERY_IDS.QUERY_INFO_BY_CODE,
-				'xwa2_group_query_by_id'
-			),
+			mexQuery({ group_input: { invite_code: code } }, GROUP_MEX_QUERY_IDS.QUERY_INFO_BY_CODE, 'xwa2_group_query_by_id'),
 
 		/**
 		 * Fetch multiple groups at once via MEX.
@@ -610,7 +575,7 @@ const makeGroupsSocket = config => {
 		 * @param {*} value - Property value
 		 */
 		groupSetProperty: (jid, property, value) =>
-			mexQuery({ group_id: jid, [property]: value }, GROUP_MEX_QUERY_IDS.SET_PROPERTY, 'xwa2_group_update_property'),
+			mexQuery({ group_id: jid, [property]: value }, GROUP_MEX_QUERY_IDS.SET_PROPERTY, 'xwa2_group_set_property'),
 
 		/**
 		 * Reset a group's invite link via MEX (generates new code, invalidates old one).
@@ -693,7 +658,8 @@ const makeGroupsSocket = config => {
 		 * Query online status of users from PDP.
 		 * @param {string[]} jids - User JIDs
 		 */
-		queryOnlineStatus: jids => mexQuery({ jids }, GROUP_MEX_QUERY_IDS.QUERY_ONLINE_STATUS, 'xwa2_query_online_status'),
+		queryOnlineStatus: jids =>
+			mexQuery({ jids }, GROUP_MEX_QUERY_IDS.QUERY_ONLINE_STATUS, 'xwa2_query_online_status'),
 
 		/**
 		 * Query online status and last seen of users from PDP.
@@ -732,11 +698,6 @@ const extractGroupMetadata = result => {
 	const communityMemberAddGroupNode = (0, WABinary_1.getBinaryNodeChild)(group, 'allow_non_admin_sub_group_creation')
 	const subGroupVisibilityNode = (0, WABinary_1.getBinaryNodeChild)(group, 'sub_groups_list')
 	const membershipApprovalNode = (0, WABinary_1.getBinaryNodeChild)(group, 'membership_approval_mode')
-	const capiNode = (0, WABinary_1.getBinaryNodeChild)(group, 'capi')
-	const appealStatusNode = (0, WABinary_1.getBinaryNodeChild)(group, 'appeal_status')
-	const defaultSubGroupNode = (0, WABinary_1.getBinaryNodeChild)(group, 'default_sub_group')
-	const generalChatNode = (0, WABinary_1.getBinaryNodeChild)(group, 'general_chat')
-	const hiddenGroupNode = (0, WABinary_1.getBinaryNodeChild)(group, 'hidden_group')
 	const metadata = {
 		id: groupId,
 		notify: group.attrs.notify,
@@ -766,23 +727,15 @@ const extractGroupMetadata = result => {
 		isCommunityAnnounce: !!(0, WABinary_1.getBinaryNodeChild)(group, 'default_sub_group'),
 		joinApprovalMode: !!membershipApprovalNode,
 		memberAddMode,
-		memberShareHistoryMode:
-			(0, WABinary_1.getBinaryNodeChildString)(group, 'member_share_group_history_mode') || undefined,
-		memberLinkMode: (0, WABinary_1.getBinaryNodeChildString)(group, 'member_link_mode') || undefined,
-		limitSharing: !!(0, WABinary_1.getBinaryNodeChild)(group, 'limit_sharing_enabled'),
-		communityMemberAddGroupMode: communityMemberAddGroupNode?.attrs.state || undefined,
-		capiCreatedGroup: !!capiNode || undefined,
-		appealStatus: appealStatusNode?.attrs.type || undefined,
+		memberShareHistoryMode: (0, WABinary_1.getBinaryNodeChildString)(group, 'member_share_group_history_mode') || undefined,
+			memberLinkMode: (0, WABinary_1.getBinaryNodeChildString)(group, 'member_link_mode') || undefined,
+			limitSharing: !!(0, WABinary_1.getBinaryNodeChild)(group, 'limit_sharing_enabled'),
+			communityMemberAddGroupMode: communityMemberAddGroupNode?.attrs.state || undefined,
+		capiCreatedGroup: group.attrs.capi_created === 'true' || undefined,
+		appealStatus: group.attrs.appeal_status || undefined,
 		isSubGroupHidden: group.attrs.sub_group_visibility === 'hidden' || undefined,
-		membershipApprovalMode: group.attrs.membership_approval_mode || undefined,
-		joinPermissions: group.attrs.join_permissions || undefined,
-		isDefaultSubgroup: !!defaultSubGroupNode || undefined,
-		isGeneralSubgroup: !!generalChatNode || undefined,
-		isHiddenSubgroup: !!hiddenGroupNode || undefined,
 		participants: (0, WABinary_1.getBinaryNodeChildren)(group, 'participant').map(({ attrs }) => {
-			// extractGroupMetadata is sync and has no socket in scope to persist with;
-			// callers (groupMetadata, groupFetchAllParticipating) persist the LID/PN
-			// pairs surfaced here via persistParticipantLidMappings.
+			// TODO: Store LID MAPPINGS
 			return {
 				id: attrs.jid,
 				phoneNumber:
@@ -794,12 +747,11 @@ const extractGroupMetadata = result => {
 				admin: attrs.type || null,
 				memberLabel: attrs.label || undefined,
 				memberLabelTimestamp: attrs.label_ts ? +attrs.label_ts : undefined,
-				isBanned: attrs.error === '402' || attrs.ban === 'true' || undefined,
-				uuid: attrs.uuid || attrs.participant_uuid || undefined
+				isBanned: attrs.error === '403' || attrs.ban === 'true' || undefined
 			}
 		}),
 		bannedParticipants: (0, WABinary_1.getBinaryNodeChildren)(group, 'participant')
-			.filter(({ attrs }) => attrs.error === '402' || attrs.ban === 'true')
+			.filter(({ attrs }) => attrs.error === '403' || attrs.ban === 'true')
 			.map(({ attrs }) => ({
 				id: attrs.jid,
 				phoneNumber: attrs.phone_number || undefined,

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

@@ -7,9 +7,11 @@ const { makePrivacySocket } = require('./privacy')
 const { makeRegistrationSocket } = require('./registration')
 const { makeManagedAccountSocket } = require('./managed-account')
 const { makeGraphQLSocket } = require('./graphql')
-const { attachTextRouter } = require('./text-router')
+// Antiban protection — bundled directly into this package
 const { wrapSocket: _wrapSocket } = require('../antiban')
+const { attachTextRouter } = require('./text-router')
 
+// export the last socket layer
 const makeWASocket = config => {
 	const userExplicitSyncFlag = typeof config?.syncFullHistory === 'boolean'
 	const initialFullSyncDone = !!config?.auth?.creds?.initialFullSyncDone
@@ -29,9 +31,9 @@ const makeWASocket = config => {
 	const registrationSock = makeRegistrationSocket(privacySock)
 	const managedSock = makeManagedAccountSocket(registrationSock)
 	const sock = makeGraphQLSocket(managedSock)
+	// Auto-wrap with antiban if available (config.antiban = false to opt-out)
 	const finalSock =
 		_wrapSocket && config?.antiban !== false ? _wrapSocket(sock, config?.antiban || 'aggressive') : sock
-
 	return attachTextRouter(finalSock)
 }
-exports.default = makeWASocket
+exports.default = makeWASocket

package/{src → lib}/Socket/interactive-handler.js

@@ -14,7 +14,7 @@ const {
 } = require('../Utils/index.js')
 const { isJidGroup, isPnUser, jidNormalizedUser, STORIES_JID } = require('../WABinary/index.js')
 
-class Badzz88Handler {
+class InteractiveMessageHandler {
 	constructor(waUploadToServer, relayMessageFn, config, sock) {
 		this.relayMessage = relayMessageFn
 		this.waUploadToServer = waUploadToServer
@@ -24,12 +24,13 @@ class Badzz88Handler {
 	detectType(content) {
 		if (content.requestPaymentMessage) return 'PAYMENT'
 		if (content.productMessage) return 'PRODUCT'
-		if (content.interactiveButtons) return 'INTERACTIVE_BUTTONS'
 		if (content.interactiveMessage) return 'INTERACTIVE'
 		if (content.albumMessage || content.album) return 'ALBUM'
 		if (content.eventMessage) return 'EVENT'
 		if (content.pollResultMessage) return 'POLL_RESULT'
 		if (content.groupStatusMessage) return 'GROUP_STORY'
+		if (content.orderMessage) return 'ORDER'
+		if (content.groupLabel) return 'GROUP_LABEL'
 		return null
 	}
 	async handlePayment(content, quoted) {
@@ -222,114 +223,6 @@ class Badzz88Handler {
 		}
 		return { interactiveMessage }
 	}
-	async handleInteractiveButtons(content, _jid, _quoted) {
-		const {
-			text,
-			caption,
-			title,
-			subtitle,
-			footer,
-			interactiveButtons,
-			hasMediaAttachment,
-			image,
-			video,
-			document,
-			mimetype,
-			jpegThumbnail,
-			location,
-			product,
-			businessOwnerJid
-		} = content
-		const bodyText = text || caption || ''
-		const buttons = interactiveButtons.map(btn => ({
-			name: btn.name,
-			buttonParamsJson:
-				typeof btn.buttonParamsJson === 'string' ? btn.buttonParamsJson : JSON.stringify(btn.buttonParamsJson)
-		}))
-		let headerContent = {}
-		let mediaAttached = typeof hasMediaAttachment === 'boolean' ? hasMediaAttachment : false
-		if (image) {
-			const src = typeof image === 'object' && image.url ? { image: { url: image.url } } : { image }
-			const uploaded = await prepareWAMessageMedia(src, { upload: this.waUploadToServer })
-			headerContent = { ...uploaded }
-			mediaAttached = typeof hasMediaAttachment === 'boolean' ? hasMediaAttachment : true
-		} else if (video) {
-			const src = typeof video === 'object' && video.url ? { video: { url: video.url } } : { video }
-			const uploaded = await prepareWAMessageMedia(src, { upload: this.waUploadToServer })
-			headerContent = { ...uploaded }
-			mediaAttached = typeof hasMediaAttachment === 'boolean' ? hasMediaAttachment : true
-		} else if (document) {
-			const docPayload =
-				typeof document === 'object' && document.url ? { document: { url: document.url } } : { document }
-			if (mimetype) docPayload.mimetype = mimetype
-			const uploaded = await prepareWAMessageMedia(docPayload, { upload: this.waUploadToServer })
-			if (jpegThumbnail) {
-				uploaded.documentMessage.jpegThumbnail =
-					typeof jpegThumbnail === 'string' ? Buffer.from(jpegThumbnail, 'base64') : jpegThumbnail
-			}
-			headerContent = { ...uploaded }
-			mediaAttached = typeof hasMediaAttachment === 'boolean' ? hasMediaAttachment : true
-		} else if (location) {
-			headerContent = {
-				locationMessage: {
-					degreesLatitude: location.degressLatitude || location.degreesLatitude || 0,
-					degreesLongitude: location.degressLongitude || location.degreesLongitude || 0,
-					name: location.name || ''
-				}
-			}
-			mediaAttached = typeof hasMediaAttachment === 'boolean' ? hasMediaAttachment : true
-		} else if (product) {
-			let productImage
-			if (product.productImage) {
-				const imgSrc =
-					typeof product.productImage === 'object' && product.productImage.url
-						? { image: { url: product.productImage.url } }
-						: { image: product.productImage }
-				const uploaded = await prepareWAMessageMedia(imgSrc, { upload: this.waUploadToServer })
-				productImage = uploaded.imageMessage
-			}
-			headerContent = {
-				productMessage: {
-					product: {
-						productImage,
-						productId: product.productId,
-						title: product.title,
-						description: product.description,
-						currencyCode: product.currencyCode || 'IDR',
-						priceAmount1000: product.priceAmount1000,
-						retailerId: product.retailerId,
-						url: product.url,
-						productImageCount: product.productImageCount || 1
-					},
-					businessOwnerJid: businessOwnerJid || '0@s.whatsapp.net'
-				}
-			}
-			mediaAttached = typeof hasMediaAttachment === 'boolean' ? hasMediaAttachment : true
-		}
-		const interactiveMessage = {
-			body: { text: bodyText },
-			footer: { text: footer || '' },
-			header: {
-				title: title || '',
-				subtitle: subtitle || '',
-				hasMediaAttachment: mediaAttached,
-				...headerContent
-			},
-			nativeFlowMessage: { buttons }
-		}
-		return {
-			viewOnceMessage: {
-				message: {
-					messageContextInfo: {
-						deviceListMetadata: {},
-						deviceListMetadataVersion: 2,
-						messageSecret: crypto.randomBytes(32)
-					},
-					interactiveMessage
-				}
-			}
-		}
-	}
 	async handleAlbum(content, jid, quoted) {
 		const array = content.albumMessage || content.album
 		const ctxInfo = content.contextInfo || {}
@@ -344,7 +237,7 @@ class Badzz88Handler {
 					expectedVideoCount: array.filter(a => 'video' in a).length
 				}
 			},
-			{ userJid: jidNormalizedUser(this.sock.authState?.creds?.me?.id || '') }
+			{ userJid: jidNormalizedUser(this.sock.authState?.creds?.me?.id || ''), browser: this.config?.browser }
 		)
 		await this.relayMessage(jid, album.message, {
 			messageId: album.key.id
@@ -394,18 +287,18 @@ class Badzz88Handler {
 							joinLink: eventData.joinLink || '',
 							startTime:
 								typeof eventData.startTime === 'string'
-									? parseInt(eventData.startTime, 10)
+									? parseInt(eventData.startTime)
 									: eventData.startTime || Date.now(),
 							endTime:
 								typeof eventData.endTime === 'string'
-									? parseInt(eventData.endTime, 10)
+									? parseInt(eventData.endTime)
 									: eventData.endTime || Date.now() + 3600000,
 							extraGuestsAllowed: eventData.extraGuestsAllowed !== false
 						}
 					}
 				}
 			},
-			{ quoted, userJid: jidNormalizedUser(this.sock.authState?.creds?.me?.id || '') }
+			{ quoted, userJid: jidNormalizedUser(this.sock.authState?.creds?.me?.id || ''), browser: this.config?.browser }
 		)
 		await this.relayMessage(jid, msg.message, {
 			messageId: msg.key.id
@@ -426,7 +319,7 @@ class Badzz88Handler {
 					}))
 				}
 			},
-			{ quoted, userJid: jidNormalizedUser(this.sock.authState?.creds?.me?.id || '') }
+			{ quoted, userJid: jidNormalizedUser(this.sock.authState?.creds?.me?.id || ''), browser: this.config?.browser }
 		)
 		await this.relayMessage(jid, msg.message, {
 			messageId: msg.key.id
@@ -454,6 +347,55 @@ class Badzz88Handler {
 			messageId: generateMessageID()
 		})
 	}
+	async handleOrderMessage(content, jid, quoted) {
+		const orderData = content.orderMessage
+		const orderMsg = await generateWAMessageFromContent(jid, {
+			orderMessage: {
+				orderId: orderData.orderId || 'ORDER' + generateMessageID(),
+				thumbnail: orderData.thumbnail || null,
+				itemCount: orderData.itemCount || 0,
+				status: orderData.status || 'ACCEPTED',
+				surface: orderData.surface || 'CATALOG',
+				message: orderData.message,
+				orderTitle: orderData.orderTitle,
+				sellerJid: orderData.sellerJid || jid,
+				token: orderData.token || generateMessageID(),
+				totalAmount1000: orderData.totalAmount1000 || 0,
+				totalCurrencyCode: orderData.totalCurrencyCode || 'IDR',
+				messageVersion: 2
+			}
+		}, { quoted, browser: this.config?.browser })
+		await this.relayMessage(jid, orderMsg.message, {
+			messageId: orderMsg.key.id
+		})
+		return orderMsg
+	}
+	async handleGbLabel(content, jid) {
+		const labelData = content.groupLabel
+		if (!isJidGroup(jid)) {
+			throw new Error('handleGbLabel requires a group jid')
+		}
+		const msg = await generateWAMessageFromContent(jid, {
+			protocolMessage: {
+				type: 'GROUP_MEMBER_LABEL_CHANGE',
+				memberLabel: {
+					label: labelData.labelText.slice(0, 30)
+				}
+			}
+		}, { browser: this.config?.browser })
+		return await this.relayMessage(jid, msg.message, {
+			additionalNodes: [
+				{
+					tag: 'meta',
+					attrs: {
+						tag_reason: 'user_update',
+						appdata: 'member_tag'
+					},
+					content: undefined
+				}
+			]
+		})
+	}
 	async sendStatusWhatsApp(content, jids = []) {
 		const userJid = jidNormalizedUser(this.sock.authState.creds.me.id)
 		const allUsers = new Set()
@@ -557,7 +499,8 @@ class Badzz88Handler {
 					}
 				}
 				const statusMsg = await generateWAMessageFromContent(normalizedId, protocolMessage, {
-					userJid: jidNormalizedUser(this.sock.authState?.creds?.me?.id || '')
+					userJid: jidNormalizedUser(this.sock.authState?.creds?.me?.id || ''),
+					browser: this.config?.browser
 				})
 				await this.relayMessage(normalizedId, statusMsg.message, {
 					additionalNodes: [
@@ -576,4 +519,4 @@ class Badzz88Handler {
 	}
 }
 
-module.exports = { Badzz88Handler }
+module.exports = { InteractiveMessageHandler }

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

@@ -5,19 +5,14 @@ exports.makeInteropSocket = void 0
 const { getBinaryNodeChild, getBinaryNodeChildren, S_WHATSAPP_NET } = require('../WABinary')
 const { executeWMexQuery } = require('./mex')
 
-/**
- * w:mex query IDs for interop group and privacy operations.
- *
- * Source: whatsapp-android-mex_client_persist_ids.json (WA 2.26.26.4 APK assets)
- */
 const INTEROP_MEX_QUERY_IDS = {
-	CREATE_GROUP: '25726817620301611', // GroupsCreateInteropGroup
-	LEAVE_GROUP: '25346167795013271', // LeaveInteropGroup
-	ADD_PARTICIPANTS: '25732168276369451', // AddParticipantsToInteropGroup
-	QUERY_GROUP_INFO: '32734144032867938', // QueryInteropGroupInfo
-	PRIVACY_SETTINGS_QUERY: '24849123668112654', // InteropPrivacySettingsQuery
-	PRIVACY_SETTINGS_UPDATE: '25421856497452763', // InteropPrivacySettingsUpdate
-	PRIVACY_SETTINGS_WITH_CONTACT_LIST: '24913399124998598' // InteropPrivacySettingWithContactListUpdate
+	CREATE_GROUP: '25726817620301612', // GroupsCreateInteropGroup
+	LEAVE_GROUP: '25346167795013270', // LeaveInteropGroup
+	ADD_PARTICIPANTS: '25732168276369452', // AddParticipantsToInteropGroup
+	QUERY_GROUP_INFO: '32734144032867936', // QueryInteropGroupInfo
+	PRIVACY_SETTINGS_QUERY: '24849123668112656', // InteropPrivacySettingsQuery
+	PRIVACY_SETTINGS_UPDATE: '25421856497452764', // InteropPrivacySettingsUpdate
+	PRIVACY_SETTINGS_WITH_CONTACT_LIST: '24913399124998600' // InteropPrivacySettingWithContactListUpdate
 }
 
 /**
@@ -40,7 +35,7 @@ const TOS_RESULT_ACCEPTED = '160'
 const INTEROP_BATCH_MAX = 256
 
 const makeInteropSocket = sock => {
-	const { query, generateMessageTag, logger, signalRepository, masqueradeAsPrimary } = sock
+	const { query, generateMessageTag, logger, signalRepository } = sock
 
 	const mexQuery = (variables, queryId, dataPath) =>
 		executeWMexQuery(variables, queryId, dataPath, query, generateMessageTag)
@@ -67,7 +62,7 @@ const makeInteropSocket = sock => {
 		return getBinaryNodeChildren(listNode, 'integrator').map(node => {
 			const featuresNode = getBinaryNodeChild(node, 'features')
 			return {
-				id: parseInt(node.attrs.id, 10),
+				id: parseInt(node.attrs.id),
 				name: node.attrs.name,
 				// "active" | "onboarding" | "removed"
 				status: node.attrs.status,
@@ -197,9 +192,9 @@ const makeInteropSocket = sock => {
 			if (errorNode) {
 				return {
 					externalId: userNode.attrs.external_id,
-					integratorId: parseInt(userNode.attrs.integrator_id, 10),
+					integratorId: parseInt(userNode.attrs.integrator_id),
 					error: {
-						code: parseInt(errorNode.attrs.code, 10),
+						code: parseInt(errorNode.attrs.code),
 						text: errorNode.attrs.text
 					}
 				}
@@ -208,7 +203,7 @@ const makeInteropSocket = sock => {
 				jid: userNode.attrs.jid,
 				externalId: userNode.attrs.external_id,
 				normalizedExternalId: userNode.attrs.normalized_external_id,
-				integratorId: parseInt(userNode.attrs.integrator_id, 10)
+				integratorId: parseInt(userNode.attrs.integrator_id)
 			}
 		})
 	}
@@ -239,7 +234,7 @@ const makeInteropSocket = sock => {
 			enabled: settingsNode.attrs?.enabled,
 			users: getBinaryNodeChildren(settingsNode, 'user').map(n => ({
 				externalId: n.attrs.external_id,
-				integratorId: parseInt(n.attrs.integrator_id, 10),
+				integratorId: parseInt(n.attrs.integrator_id),
 				jid: n.attrs.jid
 			}))
 		}
@@ -351,13 +346,7 @@ const makeInteropSocket = sock => {
 		} catch (err) {
 			logger.warn({ err }, 'interop: failed to opt-in integrators')
 		}
-		logger.info({ integrators: toOptIn.map(i => i.name) }, 'interop: opted in')
-		logger.warn(
-			{ integrators: toOptIn.map(i => i.name) },
-			'interop: receiving messages from interop contacts (BirdyChat/Haiket) is NOT YET SUPPORTED. ' +
-			'The interop bridge only delivers to device 0 (primary phone) via a single Signal session — ' +
-			'no fan-out to companion devices. Opt-in and sending may work, but inbound messages will not arrive.'
-		)
+		logger.info({ integrators: toOptIn.map(i => i.name) }, 'interop: initialized')
 		return integrators
 	}
 
@@ -439,7 +428,11 @@ const makeInteropSocket = sock => {
 	 */
 	const queryInteropGroupInfo = async groupJid => {
 		const gid = groupJid.split('@')[0]
-		return mexQuery({ group_input: { gid } }, INTEROP_MEX_QUERY_IDS.QUERY_GROUP_INFO, 'xwa2_interop_group_query_by_id')
+		return mexQuery(
+			{ group_input: { gid } },
+			INTEROP_MEX_QUERY_IDS.QUERY_GROUP_INFO,
+			'xwa2_interop_group_query_by_id'
+		)
 	}
 
 	/**
@@ -490,15 +483,6 @@ const makeInteropSocket = sock => {
 		)
 	}
 
-	/**
-	 * Query all interop privacy settings via MEX.
-	 * Uses InteropPrivacySettingsQuery (doc_id: 24849123668112654).
-	 * Returns the current value for each privacy feature (e.g. GROUPADD).
-	 * dataPath: xwa2_interop_privacy_settings
-	 */
-	const queryInteropPrivacySettings = () =>
-		mexQuery({}, INTEROP_MEX_QUERY_IDS.PRIVACY_SETTINGS_QUERY, 'xwa2_interop_privacy_settings')
-
 	/**
 	 * Check whether an interop user allows being added to groups (GROUPADD privacy).
 	 * Returns true if the user can be added, false if blocked by their privacy settings.
@@ -553,7 +537,6 @@ const makeInteropSocket = sock => {
 		leaveInteropGroup,
 		addParticipantsToInteropGroup,
 		queryInteropGroupInfo,
-		queryInteropPrivacySettings,
 		updateInteropPrivacySetting,
 		updateInteropPrivacySettingWithContactList,
 		getInteropGroupAddPrivacy,