Free, Open Source, Self-Hosted WhatsApp API Gateway
TypeScript apibotgatewayself-hostedwhatsappwhatsapp-apiwhatsapp-automationwhatsapp-botwhatsapp-gatewaywhatsapp-gateway-apiwhatsapp-webwhatsapp-web-api
fix(engine): find the account's group row within one identity kind
Yudhi Armyndharis42e105c77a72
diff --git a/src/engine/adapters/baileys-group-mapper.spec.ts b/src/engine/adapters/baileys-group-mapper.spec.tsindex 9d60de432..6896da57b 100644--- a/src/engine/adapters/baileys-group-mapper.spec.ts+++ b/src/engine/adapters/baileys-group-mapper.spec.ts@@ -1,5 +1,5 @@import type { GroupMetadata } from '@whiskeysockets/baileys';-import { mapBaileysGroup, mapBaileysGroupInfo } from './baileys-group-mapper';+import { findSelfParticipant, mapBaileysGroup, mapBaileysGroupInfo } from './baileys-group-mapper';const identity = (jid: string): string => jid;const meta = (over: Partial<GroupMetadata> = {}): GroupMetadata => ({@@ -120,3 +120,29 @@ describe('mapBaileysGroupInfo', () => {expect(mapBaileysGroup(m, '[email protected]', normalize).isAdmin).toBe(true);});});++describe('findSelfParticipant across identity kinds', () => {+ const phone = '628111';++ it('does not take a lid member for the account because its digits match the phone number', () => {+ const participants = [+ { id: `${phone}@lid`, admin: 'admin' as const },+ { id: `${phone}@s.whatsapp.net`, admin: null },+ ];+ const metadata = meta({ participants, announce: true });++ expect(findSelfParticipant(metadata, `${phone}@s.whatsapp.net`, identity)).toBe(participants[1]);+ expect(mapBaileysGroup(metadata, `${phone}@s.whatsapp.net`, identity).isAdmin).toBe(false);+ expect(mapBaileysGroupInfo(metadata, identity, `${phone}@s.whatsapp.net`).isReadOnly).toBe(true);+ });++ it('does not take a phone member for the account when only its lid is known', () => {+ const metadata = meta({ participants: [{ id: `${phone}@s.whatsapp.net`, admin: 'admin' }] });++ expect(findSelfParticipant(metadata, `${phone}@lid`, identity)).toBeUndefined();+ });++ it('finds nothing for an account whose id is not known', () => {+ expect(findSelfParticipant(meta({ participants: [{ id: '', admin: 'admin' }] }), '', identity)).toBeUndefined();+ });+});diff --git a/src/engine/adapters/baileys-group-mapper.ts b/src/engine/adapters/baileys-group-mapper.tsindex 78a1b036b..fbb67a75c 100644--- a/src/engine/adapters/baileys-group-mapper.ts+++ b/src/engine/adapters/baileys-group-mapper.ts@@ -1,6 +1,6 @@import type { GroupMetadata } from '@whiskeysockets/baileys';import { Group, GroupInfo, GroupParticipant } from '../interfaces/whatsapp-engine.interface';-import { userPart } from '../identity/wa-id';+import { parseWaId, userPart } from '../identity/wa-id';/*** Canonicalizes participant/owner JIDs to the neutral dialect (see wa-id.ts). Defaults to identity so@@ -31,8 +31,13 @@ export function findSelfParticipant(selfJid: string,normalizeJid: NormalizeJid,): GroupMetadata['participants'][number] | undefined {- const self = userPart(normalizeJid(selfJid));- return metadata.participants.find(p => userPart(preferPhoneDialect(p.id, p.phoneNumber, normalizeJid)) === self);+ // Digits only identify a member within one kind: a lid and a phone number can read the same.+ const self = parseWaId(normalizeJid(selfJid));+ if (!self.userPart || (self.kind !== 'user' && self.kind !== 'lid')) return undefined;+ return metadata.participants.find(p => {+ const participant = parseWaId(preferPhoneDialect(p.id, p.phoneNumber, normalizeJid));+ return participant.kind === self.kind && participant.userPart === self.userPart;+ });}function isSelfAdmin(metadata: GroupMetadata, selfJid: string, normalizeJid: NormalizeJid): boolean {