NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-07-16 04:02:54 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'release/1.4.6'

Browse Source
This commit is contained in:
Davidson Gomes 2023-07-26 18:41:39 -03:00
commit 49376ddf6e
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/whatsapp/abstract/abstract.router.ts
View File

@ -104,16 +104,24 @@ export abstract class RouterBroker {
const instance = request.params as unknown as InstanceDto; const instance = request.params as unknown as InstanceDto;
const body = request.body; const body = request.body;
if (!body?.groupJid) { let groupJid = body?.groupJid;
if (request.query.groupJid) {
Object.assign(body, { if (!groupJid) {
groupJid: request.query.groupJid, if (request.query?.groupJid) {
}); groupJid = request.query.groupJid;
} else { } else {
throw new BadRequestException('The group id needs to be informed in the query', 'ex: "groupJid=120362@g.us"'); throw new BadRequestException('The group id needs to be informed in the query', 'ex: "groupJid=120362@g.us"');
} }
} }
if (!groupJid.endsWith('@g.us')) {
groupJid = groupJid + '@g.us';
}
Object.assign(body, {
groupJid: groupJid
});
const ref = new ClassRef(); const ref = new ClassRef();
Object.assign(ref, body); Object.assign(ref, body);

9
src/whatsapp/controllers/instance.controller.ts
View File

@ -55,19 +55,12 @@ export class InstanceController {
try { try {
this.logger.verbose('requested createInstance from ' + instanceName + ' instance'); this.logger.verbose('requested createInstance from ' + instanceName + ' instance');
if (instanceName !== instanceName.toLowerCase().replace(/[^a-z0-9]/g, '')) {
throw new BadRequestException('The instance name must be lowercase and without special characters');
}
this.logger.verbose('checking duplicate token'); this.logger.verbose('checking duplicate token');
await this.authService.checkDuplicateToken(token); await this.authService.checkDuplicateToken(token);
this.logger.verbose('creating instance'); this.logger.verbose('creating instance');
const instance = new WAStartupService(this.configService, this.eventEmitter, this.repository, this.cache); const instance = new WAStartupService(this.configService, this.eventEmitter, this.repository, this.cache);
instance.instanceName = instanceName instance.instanceName = instanceName;
.toLowerCase()
.replace(/[^a-z0-9]/g, '')
.replace(' ', '');
this.logger.verbose('instance: ' + instance.instanceName + ' created'); this.logger.verbose('instance: ' + instance.instanceName + ' created');