NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-07-19 05:21:56 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #906 from fmedeiros95/v2.0.0

Browse Source 
feat: adiciona o status da mensagem no retorno da função "prepareMessage"
This commit is contained in:
Davidson Gomes 2024-09-27 14:00:20 -03:00 committed by GitHub
commit d535bc4ea2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/api/integrations/channel/whatsapp/whatsapp.baileys.service.ts
View File

@ -439,7 +439,6 @@ export class BaileysStartupService extends ChannelStartupService {
return webMessageInfo[0].message; return webMessageInfo[0].message;
} catch (error) { } catch (error) {
this.logger.error('line 508');
return { conversation: '' }; return { conversation: '' };
} }
} }
@ -594,7 +593,6 @@ export class BaileysStartupService extends ChannelStartupService {
return await this.createClient(number); return await this.createClient(number);
} catch (error) { } catch (error) {
this.logger.error('line 667');
this.logger.error(error); this.logger.error(error);
throw new InternalServerErrorException(error?.toString()); throw new InternalServerErrorException(error?.toString());
} }
@ -604,7 +602,6 @@ export class BaileysStartupService extends ChannelStartupService {
try { try {
return await this.createClient(this.phoneNumber); return await this.createClient(this.phoneNumber);
} catch (error) { } catch (error) {
this.logger.error('line 677');
this.logger.error(error); this.logger.error(error);
throw new InternalServerErrorException(error?.toString()); throw new InternalServerErrorException(error?.toString());
} }
@ -763,7 +760,6 @@ export class BaileysStartupService extends ChannelStartupService {
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
this.logger.error('line 817');
this.logger.error(`Error: ${error.message}`); this.logger.error(`Error: ${error.message}`);
} }
}, },
@ -953,7 +949,6 @@ export class BaileysStartupService extends ChannelStartupService {
messages = undefined; messages = undefined;
chats = undefined; chats = undefined;
} catch (error) { } catch (error) {
this.logger.error('line 1011');
this.logger.error(error); this.logger.error(error);
} }
}, },
@ -1141,7 +1136,6 @@ export class BaileysStartupService extends ChannelStartupService {
data: messageRaw, data: messageRaw,
}); });
} catch (error) { } catch (error) {
this.logger.error('line 1181');
this.logger.error(['Error on upload file to minio', error?.message, error?.stack]); this.logger.error(['Error on upload file to minio', error?.message, error?.stack]);
} }
} }
@ -1232,7 +1226,6 @@ export class BaileysStartupService extends ChannelStartupService {
} }
} }
} catch (error) { } catch (error) {
this.logger.error('line 1318');
this.logger.error(error); this.logger.error(error);
} }
}, },
@ -2020,7 +2013,6 @@ export class BaileysStartupService extends ChannelStartupService {
data: messageRaw, data: messageRaw,
}); });
} catch (error) { } catch (error) {
this.logger.error('line 1181');
this.logger.error(['Error on upload file to minio', error?.message, error?.stack]); this.logger.error(['Error on upload file to minio', error?.message, error?.stack]);
} }
} }
@ -2056,7 +2048,6 @@ export class BaileysStartupService extends ChannelStartupService {
return messageRaw; return messageRaw;
} catch (error) { } catch (error) {
this.logger.error('line 2097');
this.logger.error(error); this.logger.error(error);
throw new BadRequestException(error.toString()); throw new BadRequestException(error.toString());
} }
@ -2109,7 +2100,6 @@ export class BaileysStartupService extends ChannelStartupService {
return { presence: data.presence }; return { presence: data.presence };
} catch (error) { } catch (error) {
this.logger.error('line 2134');
this.logger.error(error); this.logger.error(error);
throw new BadRequestException(error.toString()); throw new BadRequestException(error.toString());
} }
@ -2122,7 +2112,6 @@ export class BaileysStartupService extends ChannelStartupService {
return { presence: data.presence }; return { presence: data.presence };
} catch (error) { } catch (error) {
this.logger.error('line 2147');
this.logger.error(error); this.logger.error(error);
throw new BadRequestException(error.toString()); throw new BadRequestException(error.toString());
} }
@ -2353,7 +2342,6 @@ export class BaileysStartupService extends ChannelStartupService {
{ userJid: this.instance.wuid }, { userJid: this.instance.wuid },
); );
} catch (error) { } catch (error) {
this.logger.error('line 2378');
this.logger.error(error); this.logger.error(error);
throw new InternalServerErrorException(error?.toString() || error); throw new InternalServerErrorException(error?.toString() || error);
} }
@ -2395,7 +2383,6 @@ export class BaileysStartupService extends ChannelStartupService {
return webpBuffer; return webpBuffer;
} catch (error) { } catch (error) {
this.logger.error('line 2420');
console.error('Erro ao converter a imagem para WebP:', error); console.error('Erro ao converter a imagem para WebP:', error);
throw error; throw error;
} }
@ -2812,7 +2799,6 @@ export class BaileysStartupService extends ChannelStartupService {
await this.client.readMessages(keys); await this.client.readMessages(keys);
return { message: 'Read messages', read: 'success' }; return { message: 'Read messages', read: 'success' };
} catch (error) { } catch (error) {
this.logger.error('line 2818');
throw new InternalServerErrorException('Read messages fail', error.toString()); throw new InternalServerErrorException('Read messages fail', error.toString());
} }
} }
@ -2878,7 +2864,6 @@ export class BaileysStartupService extends ChannelStartupService {
archived: true, archived: true,
}; };
} catch (error) { } catch (error) {
this.logger.error('line 2884');
throw new InternalServerErrorException({ throw new InternalServerErrorException({
archived: false, archived: false,
message: ['An error occurred while archiving the chat. Open a calling.', error.toString()], message: ['An error occurred while archiving the chat. Open a calling.', error.toString()],
@ -2916,7 +2901,6 @@ export class BaileysStartupService extends ChannelStartupService {
markedChatUnread: true, markedChatUnread: true,
}; };
} catch (error) { } catch (error) {
this.logger.error('line 2922');
throw new InternalServerErrorException({ throw new InternalServerErrorException({
markedChatUnread: false, markedChatUnread: false,
message: ['An error occurred while marked unread the chat. Open a calling.', error.toString()], message: ['An error occurred while marked unread the chat. Open a calling.', error.toString()],
@ -2928,7 +2912,6 @@ export class BaileysStartupService extends ChannelStartupService {
try { try {
return await this.client.sendMessage(del.remoteJid, { delete: del }); return await this.client.sendMessage(del.remoteJid, { delete: del });
} catch (error) { } catch (error) {
this.logger.error('line 2934');
throw new InternalServerErrorException('Error while deleting message for everyone', error?.toString()); throw new InternalServerErrorException('Error while deleting message for everyone', error?.toString());
} }
} }
@ -3020,7 +3003,6 @@ export class BaileysStartupService extends ChannelStartupService {
buffer: getBuffer ? buffer : null, buffer: getBuffer ? buffer : null,
}; };
} catch (error) { } catch (error) {
this.logger.error('line 3026');
this.logger.error(error); this.logger.error(error);
throw new BadRequestException(error.toString()); throw new BadRequestException(error.toString());
} }
@ -3062,7 +3044,6 @@ export class BaileysStartupService extends ChannelStartupService {
}, },
}; };
} catch (error) { } catch (error) {
this.logger.error('line 3068');
throw new InternalServerErrorException('Error updating privacy settings', error.toString()); throw new InternalServerErrorException('Error updating privacy settings', error.toString());
} }
} }
@ -3088,7 +3069,6 @@ export class BaileysStartupService extends ChannelStartupService {
...profile, ...profile,
}; };
} catch (error) { } catch (error) {
this.logger.error('line 3094');
throw new InternalServerErrorException('Error updating profile name', error.toString()); throw new InternalServerErrorException('Error updating profile name', error.toString());
} }
} }
@ -3099,7 +3079,6 @@ export class BaileysStartupService extends ChannelStartupService {
return { update: 'success' }; return { update: 'success' };
} catch (error) { } catch (error) {
this.logger.error('line 3105');
throw new InternalServerErrorException('Error updating profile name', error.toString()); throw new InternalServerErrorException('Error updating profile name', error.toString());
} }
} }
@ -3110,7 +3089,6 @@ export class BaileysStartupService extends ChannelStartupService {
return { update: 'success' }; return { update: 'success' };
} catch (error) { } catch (error) {
this.logger.error('line 3116');
throw new InternalServerErrorException('Error updating profile status', error.toString()); throw new InternalServerErrorException('Error updating profile status', error.toString());
} }
} }
@ -3152,7 +3130,6 @@ export class BaileysStartupService extends ChannelStartupService {
return { update: 'success' }; return { update: 'success' };
} catch (error) { } catch (error) {
this.logger.error('line 3158');
throw new InternalServerErrorException('Error updating profile picture', error.toString()); throw new InternalServerErrorException('Error updating profile picture', error.toString());
} }
} }
@ -3165,7 +3142,6 @@ export class BaileysStartupService extends ChannelStartupService {
return { update: 'success' }; return { update: 'success' };
} catch (error) { } catch (error) {
this.logger.error('line 3171');
throw new InternalServerErrorException('Error removing profile picture', error.toString()); throw new InternalServerErrorException('Error removing profile picture', error.toString());
} }
} }
@ -3186,7 +3162,6 @@ export class BaileysStartupService extends ChannelStartupService {
return { block: 'success' }; return { block: 'success' };
} catch (error) { } catch (error) {
this.logger.error('line 3192');
throw new InternalServerErrorException('Error blocking user', error.toString()); throw new InternalServerErrorException('Error blocking user', error.toString());
} }
} }
@ -3217,7 +3192,6 @@ export class BaileysStartupService extends ChannelStartupService {
return null; return null;
} catch (error) { } catch (error) {
this.logger.error('line 3223');
this.logger.error(error); this.logger.error(error);
throw new BadRequestException(error.toString()); throw new BadRequestException(error.toString());
} }
@ -3239,7 +3213,6 @@ export class BaileysStartupService extends ChannelStartupService {
edit: data.key, edit: data.key,
}); });
} catch (error) { } catch (error) {
this.logger.error('line 3245');
this.logger.error(error); this.logger.error(error);
throw new BadRequestException(error.toString()); throw new BadRequestException(error.toString());
} }
@ -3282,7 +3255,6 @@ export class BaileysStartupService extends ChannelStartupService {
return { numberJid: contact.jid, labelId: data.labelId, remove: true }; return { numberJid: contact.jid, labelId: data.labelId, remove: true };
} }
} catch (error) { } catch (error) {
this.logger.error('line 3288');
throw new BadRequestException(`Unable to ${data.action} label to chat`, error.toString()); throw new BadRequestException(`Unable to ${data.action} label to chat`, error.toString());
} }
} }
@ -3304,7 +3276,6 @@ export class BaileysStartupService extends ChannelStartupService {
return meta; return meta;
} catch (error) { } catch (error) {
this.logger.error('line 3310');
this.logger.error(error); this.logger.error(error);
return null; return null;
} }
@ -3357,7 +3328,6 @@ export class BaileysStartupService extends ChannelStartupService {
return group; return group;
} catch (error) { } catch (error) {
this.logger.error('line 3363');
this.logger.error(error); this.logger.error(error);
throw new InternalServerErrorException('Error creating group', error.toString()); throw new InternalServerErrorException('Error creating group', error.toString());
} }
@ -3397,7 +3367,6 @@ export class BaileysStartupService extends ChannelStartupService {
return { update: 'success' }; return { update: 'success' };
} catch (error) { } catch (error) {
this.logger.error('line 3403');
throw new InternalServerErrorException('Error update group picture', error.toString()); throw new InternalServerErrorException('Error update group picture', error.toString());
} }
} }
@ -3408,7 +3377,6 @@ export class BaileysStartupService extends ChannelStartupService {
return { update: 'success' }; return { update: 'success' };
} catch (error) { } catch (error) {
this.logger.error('line 3414');
throw new InternalServerErrorException('Error updating group subject', error.toString()); throw new InternalServerErrorException('Error updating group subject', error.toString());
} }
} }
@ -3419,7 +3387,6 @@ export class BaileysStartupService extends ChannelStartupService {
return { update: 'success' }; return { update: 'success' };
} catch (error) { } catch (error) {
this.logger.error('line 3425');
throw new InternalServerErrorException('Error updating group description', error.toString()); throw new InternalServerErrorException('Error updating group description', error.toString());
} }
} }
@ -3454,7 +3421,6 @@ export class BaileysStartupService extends ChannelStartupService {
if (reply === 'inner') { if (reply === 'inner') {
return; return;
} }
this.logger.error('line 3460');
throw new NotFoundException('Error fetching group', error.toString()); throw new NotFoundException('Error fetching group', error.toString());
} }
} }
@ -3496,7 +3462,6 @@ export class BaileysStartupService extends ChannelStartupService {
const code = await this.client.groupInviteCode(id.groupJid); const code = await this.client.groupInviteCode(id.groupJid);
return { inviteUrl: `https://chat.whatsapp.com/${code}`, inviteCode: code }; return { inviteUrl: `https://chat.whatsapp.com/${code}`, inviteCode: code };
} catch (error) { } catch (error) {
this.logger.error('line 3502');
throw new NotFoundException('No invite code', error.toString()); throw new NotFoundException('No invite code', error.toString());
} }
} }
@ -3505,7 +3470,6 @@ export class BaileysStartupService extends ChannelStartupService {
try { try {
return await this.client.groupGetInviteInfo(id.inviteCode); return await this.client.groupGetInviteInfo(id.inviteCode);
} catch (error) { } catch (error) {
this.logger.error('line 3511');
throw new NotFoundException('No invite info', id.inviteCode); throw new NotFoundException('No invite info', id.inviteCode);
} }
} }
@ -3531,7 +3495,6 @@ export class BaileysStartupService extends ChannelStartupService {
return { send: true, inviteUrl }; return { send: true, inviteUrl };
} catch (error) { } catch (error) {
this.logger.error('line 3537');
throw new NotFoundException('No send invite'); throw new NotFoundException('No send invite');
} }
} }
@ -3541,7 +3504,6 @@ export class BaileysStartupService extends ChannelStartupService {
const groupJid = await this.client.groupAcceptInvite(id.inviteCode); const groupJid = await this.client.groupAcceptInvite(id.inviteCode);
return { accepted: true, groupJid: groupJid }; return { accepted: true, groupJid: groupJid };
} catch (error) { } catch (error) {
this.logger.error('line 3547');
throw new NotFoundException('Accept invite error', error.toString()); throw new NotFoundException('Accept invite error', error.toString());
} }
} }
@ -3551,7 +3513,6 @@ export class BaileysStartupService extends ChannelStartupService {
const inviteCode = await this.client.groupRevokeInvite(id.groupJid); const inviteCode = await this.client.groupRevokeInvite(id.groupJid);
return { revoked: true, inviteCode }; return { revoked: true, inviteCode };
} catch (error) { } catch (error) {
this.logger.error('line 3557');
throw new NotFoundException('Revoke error', error.toString()); throw new NotFoundException('Revoke error', error.toString());
} }
} }
@ -3584,7 +3545,6 @@ export class BaileysStartupService extends ChannelStartupService {
return { participants: parsedParticipants }; return { participants: parsedParticipants };
} catch (error) { } catch (error) {
console.error(error); console.error(error);
this.logger.error('line 3583');
throw new NotFoundException('No participants', error.toString()); throw new NotFoundException('No participants', error.toString());
} }
} }
@ -3599,7 +3559,6 @@ export class BaileysStartupService extends ChannelStartupService {
); );
return { updateParticipants: updateParticipants }; return { updateParticipants: updateParticipants };
} catch (error) { } catch (error) {
this.logger.error('line 3598');
throw new BadRequestException('Error updating participants', error.toString()); throw new BadRequestException('Error updating participants', error.toString());
} }
} }
@ -3609,7 +3568,6 @@ export class BaileysStartupService extends ChannelStartupService {
const updateSetting = await this.client.groupSettingUpdate(update.groupJid, update.action); const updateSetting = await this.client.groupSettingUpdate(update.groupJid, update.action);
return { updateSetting: updateSetting }; return { updateSetting: updateSetting };
} catch (error) { } catch (error) {
this.logger.error('line 3608');
throw new BadRequestException('Error updating setting', error.toString()); throw new BadRequestException('Error updating setting', error.toString());
} }
} }
@ -3619,7 +3577,6 @@ export class BaileysStartupService extends ChannelStartupService {
await this.client.groupToggleEphemeral(update.groupJid, update.expiration); await this.client.groupToggleEphemeral(update.groupJid, update.expiration);
return { success: true }; return { success: true };
} catch (error) { } catch (error) {
this.logger.error('line 3618');
throw new BadRequestException('Error updating setting', error.toString()); throw new BadRequestException('Error updating setting', error.toString());
} }
} }
@ -3629,7 +3586,6 @@ export class BaileysStartupService extends ChannelStartupService {
await this.client.groupLeave(id.groupJid); await this.client.groupLeave(id.groupJid);
return { groupJid: id.groupJid, leave: true }; return { groupJid: id.groupJid, leave: true };
} catch (error) { } catch (error) {
this.logger.error('line 3628');
throw new BadRequestException('Unable to leave the group', error.toString()); throw new BadRequestException('Unable to leave the group', error.toString());
} }
} }
@ -3643,6 +3599,7 @@ export class BaileysStartupService extends ChannelStartupService {
const messageRaw = { const messageRaw = {
key: message.key, key: message.key,
pushName: message.pushName, pushName: message.pushName,
status: message.status,
message: { ...message.message }, message: { ...message.message },
contextInfo: contentMsg?.contextInfo, contextInfo: contentMsg?.contextInfo,
messageType: getContentType(message.message) || 'unknown', messageType: getContentType(message.message) || 'unknown',
@ -3657,6 +3614,12 @@ export class BaileysStartupService extends ChannelStartupService {
delete messageRaw.message.extendedTextMessage; delete messageRaw.message.extendedTextMessage;
} }
if (messageRaw.message.documentWithCaptionMessage) {
messageRaw.messageType = 'documentMessage';
messageRaw.message.documentMessage = messageRaw.message.documentWithCaptionMessage.message.documentMessage;
delete messageRaw.message.documentWithCaptionMessage;
}
return messageRaw; return messageRaw;
} }
} }