diff --git a/Docker/.env.example b/Docker/.env.example index 3c0bfb9e..392c6f3e 100644 --- a/Docker/.env.example +++ b/Docker/.env.example @@ -7,7 +7,7 @@ CORS_CREDENTIALS=true # Determine the logs to be displayed LOG_LEVEL='ERROR,WARN,DEBUG,INFO,LOG,VERBOSE,DARK,WEBHOOKS' LOG_COLOR=true -LOG_BAILEYS=error # "fatal" | "error" | "warn" | "info" | "debug" | "trace" +LOG_BAILEYS=error # fatal | error | warn | info | debug | trace # Determine how long the instance should be deleted from memory in case of no connection. # Default time: 5 minutes diff --git a/src/dev-env.yml b/src/dev-env.yml index 1f43c2ad..c0f907fc 100644 --- a/src/dev-env.yml +++ b/src/dev-env.yml @@ -39,7 +39,7 @@ LOG: - DARK - WEBHOOKS COLOR: true - BAILEYS: error # "fatal" | "error" | "warn" | "info" | "debug" | "trace" + BAILEYS: error # fatal | error | warn | info | debug | trace # Determine how long the instance should be deleted from memory in case of no connection. # Default time: 5 minutes diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts index 01d0323e..bd694790 100644 --- a/src/whatsapp/services/whatsapp.service.ts +++ b/src/whatsapp/services/whatsapp.service.ts @@ -1339,27 +1339,31 @@ export class WAStartupService { private createJid(number: string): string { this.logger.verbose('Creating jid with number: ' + number); - if (number.includes('@g.us') || number.includes('@s.whatsapp.net')) { + + const numberReplace = number.replace(/[^0-9]/g, ''); + + console.log('number', numberReplace); + if (numberReplace.includes('@g.us') || numberReplace.includes('@s.whatsapp.net')) { this.logger.verbose('Number already contains @g.us or @s.whatsapp.net'); - return number; + return numberReplace; } - if (number.includes('@broadcast')) { + if (numberReplace.includes('@broadcast')) { this.logger.verbose('Number already contains @broadcast'); - return number; + return numberReplace; } - const formattedBRNumber = this.formatBRNumber(number); - if (formattedBRNumber !== number) { + const formattedBRNumber = this.formatBRNumber(numberReplace); + if (formattedBRNumber !== numberReplace) { this.logger.verbose( 'Jid created is whatsapp in format BR: ' + `${formattedBRNumber}@s.whatsapp.net`, ); return `${formattedBRNumber}@s.whatsapp.net`; } - const formattedMXARNumber = this.formatMXOrARNumber(number); + const formattedMXARNumber = this.formatMXOrARNumber(numberReplace); - if (formattedMXARNumber !== number) { + if (formattedMXARNumber !== numberReplace) { this.logger.verbose( 'Jid created is whatsapp in format MXAR: ' + `${formattedMXARNumber}@s.whatsapp.net`, @@ -1367,13 +1371,13 @@ export class WAStartupService { return `${formattedMXARNumber}@s.whatsapp.net`; } - if (number.includes('-')) { - this.logger.verbose('Jid created is group: ' + `${number}@g.us`); - return `${number}@g.us`; + if (numberReplace.includes('-')) { + this.logger.verbose('Jid created is group: ' + `${numberReplace}@g.us`); + return `${numberReplace}@g.us`; } - this.logger.verbose('Jid created is whatsapp: ' + `${number}@s.whatsapp.net`); - return `${number}@s.whatsapp.net`; + this.logger.verbose('Jid created is whatsapp: ' + `${numberReplace}@s.whatsapp.net`); + return `${numberReplace}@s.whatsapp.net`; } public async profilePicture(number: string) {