NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-07-14 09:51:24 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:EvolutionAPI/evolution-api into develop

Browse Source
This commit is contained in:
Davidson Gomes 2023-07-24 20:12:51 -03:00
commit 757a578c6e
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/validate/validate.schema.ts
View File

@ -667,6 +667,7 @@ export const createGroupSchema: JSONSchema7 = {
subject: { type: 'string' }, subject: { type: 'string' },
description: { type: 'string' }, description: { type: 'string' },
profilePicture: { type: 'string' }, profilePicture: { type: 'string' },
promoteParticipants: { type: 'boolean', enum: [true, false] },
participants: { participants: {
type: 'array', type: 'array',
minItems: 1, minItems: 1,

3
src/whatsapp/dto/group.dto.ts
View File

@ -1,7 +1,8 @@
export class CreateGroupDto { export class CreateGroupDto {
subject: string; subject: string;
description?: string;
participants: string[]; participants: string[];
description?: string;
promoteParticipants?: boolean;
} }
export class GroupPictureDto { export class GroupPictureDto {

21
src/whatsapp/services/whatsapp.service.ts
View File

@ -1517,7 +1517,8 @@ export class WAStartupService {
.split(/\:/)[0] .split(/\:/)[0]
.split('@')[0]; .split('@')[0];
if (number.length >= 18) { // Verificação de Grupos Antigos
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`;
@ -1525,6 +1526,13 @@ export class WAStartupService {
number = number.replace(/\D/g, ''); number = number.replace(/\D/g, '');
// Verificação de Grupos Novos
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`); this.logger.verbose('Jid created is whatsapp: ' + `${number}@s.whatsapp.net`);
return `${number}@s.whatsapp.net`; return `${number}@s.whatsapp.net`;
} }
@ -2775,10 +2783,19 @@ export class WAStartupService {
await this.client.groupUpdateDescription(id, create.description); await this.client.groupUpdateDescription(id, create.description);
} }
if (create?.promoteParticipants) {
this.logger.verbose('Prometing group participants: ' + create.description);
await this.updateGParticipant({
groupJid: id,
action: "promote",
participants: participants
});
}
const group = await this.client.groupMetadata(id); const group = await this.client.groupMetadata(id);
this.logger.verbose('Getting group metadata'); this.logger.verbose('Getting group metadata');
return { groupMetadata: group }; return group;
} catch (error) { } catch (error) {
this.logger.error(error); this.logger.error(error);
throw new InternalServerErrorException('Error creating group', error.toString()); throw new InternalServerErrorException('Error creating group', error.toString());