NeoAnd/evolution-api
1
0
Fork 0
mirror of https://github.com/EvolutionAPI/evolution-api.git synced 2025-12-19 03:42:23 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'EvolutionAPI:v2.0.0' into v2.0.0

Browse Source
This commit is contained in:
Ismael Ash
2024-10-03 15:09:53 -03:00
committed by GitHub
parent 49327593a9 567152184c
commit acad895c9d
9 changed files with 209 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1074,7 +1074,7 @@ export class BaileysStartupService extends ChannelStartupService {
}
}
if (this.configService.get<Openai>('OPENAI').ENABLED) {
if (this.configService.get<Openai>('OPENAI').ENABLED && received?.message?.audioMessage) {
const openAiDefaultSettings = await this.prismaRepository.openaiSetting.findFirst({
where: {
instanceId: this.instanceId,
@@ -1084,12 +1084,7 @@ export class BaileysStartupService extends ChannelStartupService {
},
});
if (
openAiDefaultSettings &&
openAiDefaultSettings.openaiCredsId &&
openAiDefaultSettings.speechToText &&
received?.message?.audioMessage
) {
if (openAiDefaultSettings && openAiDefaultSettings.openaiCredsId && openAiDefaultSettings.speechToText) {
messageRaw.message.speechToText = await this.openaiService.speechToText(
openAiDefaultSettings.OpenaiCreds,
received,
@@ -1180,7 +1175,7 @@ export class BaileysStartupService extends ChannelStartupService {
const contactRaw: { remoteJid: string; pushName: string; profilePicUrl?: string; instanceId: string } = {
remoteJid: received.key.remoteJid,
pushName: received.key.fromMe ? '' : (received.key.fromMe == null ? '' : received.pushName),
pushName: received.key.fromMe ? '' : received.key.fromMe == null ? '' : received.pushName,
profilePicUrl: (await this.profilePicture(received.key.remoteJid)).profilePictureUrl,
instanceId: this.instanceId,
};
@@ -1945,7 +1940,7 @@ export class BaileysStartupService extends ChannelStartupService {
);
}
if (this.configService.get<Openai>('OPENAI').ENABLED) {
if (this.configService.get<Openai>('OPENAI').ENABLED && messageRaw?.message?.audioMessage) {
const openAiDefaultSettings = await this.prismaRepository.openaiSetting.findFirst({
where: {
instanceId: this.instanceId,
@@ -1955,12 +1950,7 @@ export class BaileysStartupService extends ChannelStartupService {
},
});
if (
openAiDefaultSettings &&
openAiDefaultSettings.openaiCredsId &&
openAiDefaultSettings.speechToText &&
messageRaw?.message?.audioMessage
) {
if (openAiDefaultSettings && openAiDefaultSettings.openaiCredsId && openAiDefaultSettings.speechToText) {
messageRaw.message.speechToText = await this.openaiService.speechToText(
openAiDefaultSettings.OpenaiCreds,
messageRaw,

2
src/api/services/channel.service.ts
View File

@@ -600,7 +600,7 @@ export class ChannelStartupService {
where: {
instanceId: this.instanceId,
remoteJid: query.where?.remoteJid,
messageId: query.where?.id,
keyId: query.where?.id,
},
skip: query.offset * (query?.page === 1 ? 0 : (query?.page as number) - 1),
take: query.offset,