fix: adjusts in env files

This commit is contained in:
Davidson Gomes 2023-07-16 18:26:53 -03:00
parent 66a8ceb27a
commit 2e91a2ecdb
3 changed files with 19 additions and 15 deletions

View File

@ -7,7 +7,7 @@ CORS_CREDENTIALS=true
# Determine the logs to be displayed # Determine the logs to be displayed
LOG_LEVEL='ERROR,WARN,DEBUG,INFO,LOG,VERBOSE,DARK,WEBHOOKS' LOG_LEVEL='ERROR,WARN,DEBUG,INFO,LOG,VERBOSE,DARK,WEBHOOKS'
LOG_COLOR=true 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. # Determine how long the instance should be deleted from memory in case of no connection.
# Default time: 5 minutes # Default time: 5 minutes

View File

@ -39,7 +39,7 @@ LOG:
- DARK - DARK
- WEBHOOKS - WEBHOOKS
COLOR: true 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. # Determine how long the instance should be deleted from memory in case of no connection.
# Default time: 5 minutes # Default time: 5 minutes

View File

@ -1339,27 +1339,31 @@ export class WAStartupService {
private createJid(number: string): string { private createJid(number: string): string {
this.logger.verbose('Creating jid with number: ' + number); 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'); 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'); this.logger.verbose('Number already contains @broadcast');
return number; return numberReplace;
} }
const formattedBRNumber = this.formatBRNumber(number); const formattedBRNumber = this.formatBRNumber(numberReplace);
if (formattedBRNumber !== number) { if (formattedBRNumber !== numberReplace) {
this.logger.verbose( this.logger.verbose(
'Jid created is whatsapp in format BR: ' + `${formattedBRNumber}@s.whatsapp.net`, 'Jid created is whatsapp in format BR: ' + `${formattedBRNumber}@s.whatsapp.net`,
); );
return `${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( this.logger.verbose(
'Jid created is whatsapp in format MXAR: ' + 'Jid created is whatsapp in format MXAR: ' +
`${formattedMXARNumber}@s.whatsapp.net`, `${formattedMXARNumber}@s.whatsapp.net`,
@ -1367,13 +1371,13 @@ export class WAStartupService {
return `${formattedMXARNumber}@s.whatsapp.net`; return `${formattedMXARNumber}@s.whatsapp.net`;
} }
if (number.includes('-')) { if (numberReplace.includes('-')) {
this.logger.verbose('Jid created is group: ' + `${number}@g.us`); this.logger.verbose('Jid created is group: ' + `${numberReplace}@g.us`);
return `${number}@g.us`; return `${numberReplace}@g.us`;
} }
this.logger.verbose('Jid created is whatsapp: ' + `${number}@s.whatsapp.net`); this.logger.verbose('Jid created is whatsapp: ' + `${numberReplace}@s.whatsapp.net`);
return `${number}@s.whatsapp.net`; return `${numberReplace}@s.whatsapp.net`;
} }
public async profilePicture(number: string) { public async profilePicture(number: string) {