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 pull request #1484 from oriondesign2015/develop

Browse Source 
fix: melhora consistência e formatação dos chatbots (N8N e Evolution Bot)
This commit is contained in:
Davidson Gomes 2025-05-22 06:58:21 -03:00 committed by GitHub
commit edde059fa1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/integrations/chatbot/base-chatbot.controller.ts
View File

@ -876,7 +876,7 @@ export abstract class BaseChatbotController<BotType = any, BotData extends BaseC
} }
// Skip if session exists but not awaiting user input // Skip if session exists but not awaiting user input
if (session && !session.awaitUser) { if (session && session.status === 'closed') {
return; return;
} }

7
src/api/integrations/chatbot/base-chatbot.service.ts
View File

@ -126,11 +126,16 @@ export abstract class BaseChatbotService<BotType = any, SettingsType = any> {
): Promise<void> { ): Promise<void> {
try { try {
// For new sessions or sessions awaiting initialization // For new sessions or sessions awaiting initialization
if (!session || session.status === 'paused') { if (!session) {
await this.initNewSession(instance, remoteJid, bot, settings, session, content, pushName, msg); await this.initNewSession(instance, remoteJid, bot, settings, session, content, pushName, msg);
return; return;
} }
// If session is paused, ignore the message
if (session.status === 'paused') {
return;
}
// For existing sessions, keywords might indicate the conversation should end // For existing sessions, keywords might indicate the conversation should end
const keywordFinish = (settings as any)?.keywordFinish || ''; const keywordFinish = (settings as any)?.keywordFinish || '';
const normalizedContent = content.toLowerCase().trim(); const normalizedContent = content.toLowerCase().trim();

2
src/api/integrations/chatbot/chatbot.controller.ts
View File

@ -179,7 +179,7 @@ export class ChatbotController {
if (session) { if (session) {
if (session.status !== 'closed' && !session.botId) { if (session.status !== 'closed' && !session.botId) {
this.logger.warn('Session is already opened in another integration'); this.logger.warn('Session is already opened in another integration');
return; return null;
} else if (!session.botId) { } else if (!session.botId) {
session = null; session = null;
} }

3
src/api/integrations/chatbot/evolutionBot/controllers/evolutionBot.controller.ts
View File

@ -89,7 +89,8 @@ export class EvolutionBotController extends BaseChatbotController<EvolutionBot,
settings: any, settings: any,
content: string, content: string,
pushName?: string, pushName?: string,
msg?: any,
) { ) {
await this.evolutionBotService.process(instance, remoteJid, bot, session, settings, content, pushName); await this.evolutionBotService.process(instance, remoteJid, bot, session, settings, content, pushName, msg);
} }
} }

14
src/api/integrations/chatbot/n8n/services/n8n.service.ts
View File

@ -186,7 +186,7 @@ export class N8nService extends BaseChatbotService<N8n, N8nSetting> {
while ((match = linkRegex.exec(message)) !== null) { while ((match = linkRegex.exec(message)) !== null) {
const [fullMatch, exclamation, altText, url] = match; const [fullMatch, exclamation, altText, url] = match;
const mediaType = this.getMediaType(url); const mediaType = this.getMediaType(url);
const beforeText = message.slice(lastIndex, match.index); const beforeText = message.slice(lastIndex, match.index).trim();
if (beforeText) { if (beforeText) {
textBuffer += beforeText; textBuffer += beforeText;
@ -298,7 +298,7 @@ export class N8nService extends BaseChatbotService<N8n, N8nSetting> {
lastIndex = match.index + fullMatch.length; lastIndex = match.index + fullMatch.length;
} }
const remainingText = message.slice(lastIndex); const remainingText = message.slice(lastIndex).trim();
if (remainingText) { if (remainingText) {
textBuffer += remainingText; textBuffer += remainingText;
} }
@ -439,16 +439,6 @@ export class N8nService extends BaseChatbotService<N8n, N8nSetting> {
// If session exists but is paused // If session exists but is paused
if (session.status === 'paused') { if (session.status === 'paused') {
await this.prismaRepository.integrationSession.update({
where: {
id: session.id,
},
data: {
status: 'opened',
awaitUser: true,
},
});
return; return;
} }