Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion packages/provider-sherpa/src/sherpa.ts
Original file line number Diff line number Diff line change
Expand Up @@ -560,13 +560,24 @@ class SherpaProvider extends ProviderClass<WASocket> {
// Buscar siempre el que tenga formato @s.whatsapp.net (puede estar en remoteJid o remoteJidAlt)
const remoteJid = (messageCtx?.key as any)?.remoteJid
const remoteJidAlt = (messageCtx?.key as any)?.remoteJidAlt
const senderPhoneNumber = messageCtx?.key?.senderPn
const senderLid = messageCtx?.key?.senderLid
const fromParse = remoteJid?.includes('@lid') ? remoteJidAlt : remoteJid
const from = senderPhoneNumber ? senderPhoneNumber : senderLid ? senderLid : fromParse

console.log('from', from)
console.log('senderPhoneNumber', senderPhoneNumber)
console.log('senderLid', senderLid)
console.log('fromParse', fromParse)
console.log('remoteJid', remoteJid)
console.log('remoteJidAlt', remoteJidAlt)
console.log('messageCtx', messageCtx)

let payload = {
...messageCtx,
body: textToBody,
name: messageCtx?.pushName,
from: baileyCleanNumber(fromParse),
from: baileyCleanNumber(from),
}

if (messageCtx.message?.locationMessage) {
Expand Down
3 changes: 3 additions & 0 deletions packages/provider-sherpa/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ const emptyDirSessions = async (pathBase: string) =>
* @returns The cleaned number.
*/
const baileyCleanNumber = (number: string, full: boolean = false): string => {
if (!number || typeof number !== 'string') {
return ''
}
const regexGroup: RegExp = /\@g.us\b/gm
const exist = number.match(regexGroup)
if (exist) return number
Expand Down
Loading