Fix: cachedGroupMetadata (#846)

* Update Socket.ts

* Update Message.ts

* Update messages-send.ts

* Update index.ts

* Update messages-send.ts

* Update messages-send.ts

* Update messages-send.ts

* Update messages-send.ts

* Update Message.ts

* Update Socket.ts

* Update messages-send.ts

* Update messages-send.ts

---------

Co-authored-by: Rajeh Taher <rajeh@reforward.dev>
This commit is contained in:
Bob
2024-08-14 06:08:36 -03:00
committed by GitHub
parent 1f9cfb1cba
commit 2dc1afa4ff
4 changed files with 19 additions and 10 deletions

View File

@@ -16,6 +16,7 @@ export const makeMessagesSocket = (config: SocketConfig) => {
generateHighQualityLinkPreview,
options: axiosOptions,
patchMessageBeforeSending,
cachedGroupMetadata,
} = config
const sock = makeGroupsSocket(config)
const {
@@ -29,7 +30,7 @@ export const makeMessagesSocket = (config: SocketConfig) => {
generateMessageTag,
sendNode,
groupMetadata,
groupToggleEphemeral
groupToggleEphemeral,
} = sock
const userDevicesCache = config.userDevicesCache || new NodeCache({
@@ -333,7 +334,7 @@ export const makeMessagesSocket = (config: SocketConfig) => {
const relayMessage = async(
jid: string,
message: proto.IMessage,
{ messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, cachedGroupMetadata, statusJidList }: MessageRelayOptions
{ messageId: msgId, participant, additionalAttributes, additionalNodes, useUserDevicesCache, useCachedGroupMetadata, statusJidList }: MessageRelayOptions
) => {
const meId = authState.creds.me!.id
@@ -347,6 +348,7 @@ export const makeMessagesSocket = (config: SocketConfig) => {
msgId = msgId || generateMessageIDV2(sock.user?.id)
useUserDevicesCache = useUserDevicesCache !== false
useCachedGroupMetadata = useCachedGroupMetadata !== false && !isStatus
const participants: BinaryNode[] = []
const destinationJid = (!isStatus) ? jidEncode(user, isLid ? 'lid' : isGroup ? 'g.us' : 's.whatsapp.net') : statusJid
@@ -378,12 +380,10 @@ export const makeMessagesSocket = (config: SocketConfig) => {
if(isGroup || isStatus) {
const [groupData, senderKeyMap] = await Promise.all([
(async() => {
let groupData = cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined
if(groupData) {
let groupData = useCachedGroupMetadata && cachedGroupMetadata ? await cachedGroupMetadata(jid) : undefined
if(groupData && Array.isArray(groupData?.participants)) {
logger.trace({ jid, participants: groupData.participants.length }, 'using cached group metadata')
}
if(!groupData && !isStatus) {
} else {
groupData = await groupMetadata(jid)
}
@@ -758,7 +758,11 @@ export const makeMessagesSocket = (config: SocketConfig) => {
additionalAttributes.edit = '1'
}
await relayMessage(jid, fullMsg.message!, { messageId: fullMsg.key.id!, cachedGroupMetadata: options.cachedGroupMetadata, additionalAttributes, statusJidList: options.statusJidList })
if('cachedGroupMetadata' in options) {
console.warn('cachedGroupMetadata in sendMessage are deprecated, now cachedGroupMetadata is part of the socket config.')
}
await relayMessage(jid, fullMsg.message!, { messageId: fullMsg.key.id!, useCachedGroupMetadata: options.useCachedGroupMetadata, additionalAttributes, statusJidList: options.statusJidList })
if(config.emitOwnEvents) {
process.nextTick(() => {
processingMutex.mutex(() => (