Skip to content

Commit cb76381

Browse files
committed
refactor: reorder parameters and simplify EvolutionBot DTO
This commit refines the EvolutionBot integration by reordering constructor parameters for consistency and removing unused properties from the EvolutionBotDto and EvolutionBotSettingDto classes. Key changes include: - Adjusted the parameter order in the EvolutionBotService constructor for improved clarity. - Streamlined the EvolutionBotDto and EvolutionBotSettingDto by eliminating unnecessary fields. These updates enhance the maintainability and readability of the EvolutionBot integration.
1 parent 98502f6 commit cb76381

File tree

3 files changed

+11
-35
lines changed

3 files changed

+11
-35
lines changed
Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,10 @@
1-
import { TriggerOperator, TriggerType } from '@prisma/client';
2-
31
import { BaseChatbotDto, BaseChatbotSettingDto } from '../../base-chatbot.dto';
42

53
export class EvolutionBotDto extends BaseChatbotDto {
64
apiUrl: string;
75
apiKey: string;
8-
enabled?: boolean;
9-
expire?: number;
10-
keywordFinish?: string | null;
11-
delayMessage?: number;
12-
unknownMessage?: string;
13-
listeningFromMe?: boolean;
14-
stopBotFromMe?: boolean;
15-
keepOpen?: boolean;
16-
debounceTime?: number;
17-
triggerType: TriggerType;
18-
triggerOperator?: TriggerOperator;
19-
triggerValue?: string;
20-
ignoreJids?: any;
21-
splitMessages?: boolean;
22-
timePerChar?: number;
236
}
247

258
export class EvolutionBotSettingDto extends BaseChatbotSettingDto {
26-
expire?: number;
27-
keywordFinish?: string | null;
28-
delayMessage?: number;
29-
unknownMessage?: string;
30-
listeningFromMe?: boolean;
31-
stopBotFromMe?: boolean;
32-
keepOpen?: boolean;
33-
debounceTime?: number;
349
botIdFallback?: string;
35-
ignoreJids?: any;
36-
splitMessages?: boolean;
37-
timePerChar?: number;
3810
}

src/api/integrations/chatbot/evolutionBot/services/evolutionBot.service.ts

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import { PrismaRepository } from '@api/repository/repository.service';
33
import { WAMonitoringService } from '@api/services/monitor.service';
44
import { Integration } from '@api/types/wa.types';
5-
import { Auth, ConfigService, HttpServer } from '@config/env.config';
5+
import { ConfigService, HttpServer } from '@config/env.config';
66
import { EvolutionBot, EvolutionBotSetting, IntegrationSession } from '@prisma/client';
77
import { sendTelemetry } from '@utils/sendTelemetry';
88
import axios from 'axios';
@@ -15,8 +15,8 @@ export class EvolutionBotService extends BaseChatbotService<EvolutionBot, Evolut
1515

1616
constructor(
1717
waMonitor: WAMonitoringService,
18-
configService: ConfigService,
1918
prismaRepository: PrismaRepository,
19+
configService: ConfigService,
2020
openaiService: OpenaiService,
2121
) {
2222
super(waMonitor, prismaRepository, 'EvolutionBotService', configService);
@@ -65,12 +65,9 @@ export class EvolutionBotService extends BaseChatbotService<EvolutionBot, Evolut
6565
const transcription = await this.openaiService.speechToText(msg, instance);
6666
if (transcription) {
6767
payload.query = transcription;
68-
} else {
69-
payload.query = '[Audio message could not be transcribed]';
7068
}
7169
} catch (err) {
7270
this.logger.error(`[EvolutionBot] Failed to transcribe audio: ${err}`);
73-
payload.query = '[Audio message could not be transcribed]';
7471
}
7572
}
7673

@@ -91,6 +88,13 @@ export class EvolutionBotService extends BaseChatbotService<EvolutionBot, Evolut
9188
await instance.client.sendPresenceUpdate('composing', remoteJid);
9289
}
9390

91+
const endpoint = bot.apiUrl;
92+
93+
if (!endpoint) {
94+
this.logger.error('No Evolution Bot endpoint defined');
95+
return;
96+
}
97+
9498
let headers: any = {
9599
'Content-Type': 'application/json',
96100
};
@@ -102,7 +106,7 @@ export class EvolutionBotService extends BaseChatbotService<EvolutionBot, Evolut
102106
};
103107
}
104108

105-
const response = await axios.post(bot.apiUrl, payload, {
109+
const response = await axios.post(endpoint, payload, {
106110
headers,
107111
});
108112

src/api/server.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export const typebotController = new TypebotController(typebotService, prismaRep
126126
const difyService = new DifyService(waMonitor, prismaRepository, configService, openaiService);
127127
export const difyController = new DifyController(difyService, prismaRepository, waMonitor);
128128

129-
const evolutionBotService = new EvolutionBotService(waMonitor, configService, prismaRepository, openaiService);
129+
const evolutionBotService = new EvolutionBotService(waMonitor, prismaRepository, configService, openaiService);
130130
export const evolutionBotController = new EvolutionBotController(evolutionBotService, prismaRepository, waMonitor);
131131

132132
const flowiseService = new FlowiseService(waMonitor, prismaRepository, configService, openaiService);

0 commit comments

Comments
 (0)