fix: Improvement for Validation of Numbers and Groups

This commit is contained in:
Davidson Gomes 2023-07-24 12:02:38 -03:00
commit 854c7ed04d

View File

@ -1486,14 +1486,14 @@ export class WAStartupService {
} }
number = number number = number
?.split(':')[0] ?.replace(/\s/g, '')
?.split('@')[0] .replace(/\+/g, '')
?.replace(' ', '') .replace(/\(/g, '')
?.replace('+', '') .replace(/\)/g, '')
?.replace('(', '') .split(/\:/)[0]
?.replace(')', ''); .split('@')[0];
if (number.includes('-') && number.length >= 18) { if (number.includes('-') && number.length >= 24) {
this.logger.verbose('Jid created is group: ' + `${number}@g.us`); this.logger.verbose('Jid created is group: ' + `${number}@g.us`);
number = number.replace(/[^\d-]/g, ''); number = number.replace(/[^\d-]/g, '');
return `${number}@g.us`; return `${number}@g.us`;
@ -2332,7 +2332,7 @@ export class WAStartupService {
const onWhatsapp: OnWhatsAppDto[] = []; const onWhatsapp: OnWhatsAppDto[] = [];
for await (const number of data.numbers) { for await (const number of data.numbers) {
const jid = this.createJid(number); let jid = this.createJid(number);
if (isJidGroup(jid)) { if (isJidGroup(jid)) {
const group = await this.findGroup({ groupJid: jid }, 'inner'); const group = await this.findGroup({ groupJid: jid }, 'inner');
@ -2341,6 +2341,7 @@ export class WAStartupService {
onWhatsapp.push(new OnWhatsAppDto(group.id, !!group?.id, group?.subject)); onWhatsapp.push(new OnWhatsAppDto(group.id, !!group?.id, group?.subject));
} else { } else {
jid = !jid.startsWith('+') ? `+${jid}` : jid;
const verify = await this.client.onWhatsApp(jid); const verify = await this.client.onWhatsApp(jid);
const result = verify[0]; const result = verify[0];