This commit is contained in:
Alan Mosko 2023-07-24 11:57:15 -03:00
parent ffe1523170
commit 95df402c4c
2 changed files with 14 additions and 8 deletions

View File

@ -445,7 +445,7 @@ export const whatsappNumberSchema: JSONSchema7 = {
uniqueItems: true,
items: {
type: 'string',
pattern: '^\\d+',
// pattern: '^\\d+',
description: '"numbers" must be an array of numeric strings',
},
},

View File

@ -1392,14 +1392,14 @@ export class WAStartupService {
}
number = number
?.split(":")[0]
?.split("@")[0]
?.replace(' ', '')
?.replace('+', '')
?.replace('(', '')
?.replace(')', '');
?.replace(/\s/g, '')
.replace(/\+/g, '')
.replace(/\(/g, '')
.replace(/\)/g, '')
.split(/\:/)[0]
.split('@')[0];
if (number.includes('-') && number.length >= 18) {
if(number.includes('-') && number.length >= 24){
this.logger.verbose('Jid created is group: ' + `${number}@g.us`);
number = number.replace(/[^\d-]/g, '');
return `${number}@g.us`;
@ -1407,6 +1407,12 @@ export class WAStartupService {
number = number.replace(/\D/g, '');
if (number.length >= 18) {
this.logger.verbose('Jid created is group: ' + `${number}@g.us`);
number = number.replace(/[^\d-]/g, '');
return `${number}@g.us`;
}
this.logger.verbose('Jid created is whatsapp: ' + `${number}@s.whatsapp.net`);
return `${number}@s.whatsapp.net`;
}