fix(fix/buttons-deprecation): initial/final commit (#956)

This commit is contained in:
Rajeh Taher
2024-08-14 12:07:12 +03:00
committed by GitHub
parent e91501026c
commit 35f6d75cf8
3 changed files with 10 additions and 138 deletions

View File

@@ -8,7 +8,6 @@ import { aggregateMessageKeysNotFromMe, assertMediaContent, bindWaitForEvent, de
import { getUrlInfo } from '../Utils/link-preview'
import { areJidsSameUser, BinaryNode, BinaryNodeAttributes, getBinaryNodeChild, getBinaryNodeChildren, isJidGroup, isJidUser, jidDecode, jidEncode, jidNormalizedUser, JidWithDevice, S_WHATSAPP_NET } from '../WABinary'
import { makeGroupsSocket } from './groups'
import ListType = proto.Message.ListMessage.ListType;
export const makeMessagesSocket = (config: SocketConfig) => {
const {
@@ -306,7 +305,7 @@ export const makeMessagesSocket = (config: SocketConfig) => {
const relayMessage = async(
jid: string,
message: proto.IMessage,
{ messageId: msgId, participant, additionalAttributes, useUserDevicesCache, cachedGroupMetadata, statusJidList }: MessageRelayOptions
{ messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, statusJidList }: MessageRelayOptions
) => {
const meId = authState.creds.me!.id
@@ -519,20 +518,8 @@ export const makeMessagesSocket = (config: SocketConfig) => {
logger.debug({ jid }, 'adding device identity')
}
const buttonType = getButtonType(message)
if(buttonType) {
(stanza.content as BinaryNode[]).push({
tag: 'biz',
attrs: { },
content: [
{
tag: buttonType,
attrs: getButtonArgs(message),
}
]
})
logger.debug({ jid }, 'adding business node')
if(additionalNodes && additionalNodes.length > 0) {
(stanza.content as BinaryNode[]).push(...additionalNodes)
}
logger.debug({ msgId }, `sending message to ${participants.length} devices`)
@@ -576,36 +563,6 @@ export const makeMessagesSocket = (config: SocketConfig) => {
}
}
const getButtonType = (message: proto.IMessage) => {
if(message.buttonsMessage) {
return 'buttons'
} else if(message.buttonsResponseMessage) {
return 'buttons_response'
} else if(message.interactiveResponseMessage) {
return 'interactive_response'
} else if(message.listMessage) {
return 'list'
} else if(message.listResponseMessage) {
return 'list_response'
}
}
const getButtonArgs = (message: proto.IMessage): BinaryNode['attrs'] => {
if(message.templateMessage) {
// TODO: Add attributes
return {}
} else if(message.listMessage) {
const type = message.listMessage.listType
if(!type) {
throw new Boom('Expected list type inside message')
}
return { v: '2', type: ListType[type].toLowerCase() }
} else {
return {}
}
}
const getPrivacyTokens = async(jids: string[]) => {
const t = unixTimestampSeconds().toString()
const result = await query({
@@ -647,7 +604,6 @@ export const makeMessagesSocket = (config: SocketConfig) => {
relayMessage,
sendReceipt,
sendReceipts,
getButtonArgs,
readMessages,
refreshMediaConn,
waUploadToServer,