Skip to content

Commit 854c7ed

Browse files
committed
fix: Improvement for Validation of Numbers and Groups
2 parents 1aa837d + c005495 commit 854c7ed

1 file changed

Lines changed: 10 additions & 9 deletions

File tree

src/whatsapp/services/whatsapp.service.ts

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1486,14 +1486,14 @@ export class WAStartupService {
14861486
}
14871487

14881488
number = number
1489-
?.split(':')[0]
1490-
?.split('@')[0]
1491-
?.replace(' ', '')
1492-
?.replace('+', '')
1493-
?.replace('(', '')
1494-
?.replace(')', '');
1495-
1496-
if (number.includes('-') && number.length >= 18) {
1489+
?.replace(/\s/g, '')
1490+
.replace(/\+/g, '')
1491+
.replace(/\(/g, '')
1492+
.replace(/\)/g, '')
1493+
.split(/\:/)[0]
1494+
.split('@')[0];
1495+
1496+
if (number.includes('-') && number.length >= 24) {
14971497
this.logger.verbose('Jid created is group: ' + `${number}@g.us`);
14981498
number = number.replace(/[^\d-]/g, '');
14991499
return `${number}@g.us`;
@@ -2332,7 +2332,7 @@ export class WAStartupService {
23322332

23332333
const onWhatsapp: OnWhatsAppDto[] = [];
23342334
for await (const number of data.numbers) {
2335-
const jid = this.createJid(number);
2335+
let jid = this.createJid(number);
23362336

23372337
if (isJidGroup(jid)) {
23382338
const group = await this.findGroup({ groupJid: jid }, 'inner');
@@ -2341,6 +2341,7 @@ export class WAStartupService {
23412341

23422342
onWhatsapp.push(new OnWhatsAppDto(group.id, !!group?.id, group?.subject));
23432343
} else {
2344+
jid = !jid.startsWith('+') ? `+${jid}` : jid;
23442345
const verify = await this.client.onWhatsApp(jid);
23452346

23462347
const result = verify[0];

0 commit comments

Comments
 (0)