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

fix: add/remove saving on db and improve add query for startup case

Browse Source
This commit is contained in:
Pedro Ivo 2024-11-19 10:15:08 -03:00
parent ecbbc5b090
commit a42bc988ec
No known key found for this signature in database
GPG Key ID: BC120FACE48D28A0
2 changed files with 56 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -59,6 +59,7 @@
"class-validator": "^0.14.1", "class-validator": "^0.14.1",
"compression": "^1.7.4", "compression": "^1.7.4",
"cors": "^2.8.5", "cors": "^2.8.5",
"cuid": "^3.0.0",
"dayjs": "^1.11.7", "dayjs": "^1.11.7",
"dotenv": "^16.4.5", "dotenv": "^16.4.5",
"eventemitter2": "^6.4.9", "eventemitter2": "^6.4.9",

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

@ -125,6 +125,7 @@ import { LabelAssociation } from 'baileys/lib/Types/LabelAssociation';
import { spawn } from 'child_process'; import { spawn } from 'child_process';
import { isArray, isBase64, isURL } from 'class-validator'; import { isArray, isBase64, isURL } from 'class-validator';
import { randomBytes } from 'crypto'; import { randomBytes } from 'crypto';
import cuid from 'cuid';
import EventEmitter2 from 'eventemitter2'; import EventEmitter2 from 'eventemitter2';
import ffmpeg from 'fluent-ffmpeg'; import ffmpeg from 'fluent-ffmpeg';
import FormData from 'form-data'; import FormData from 'form-data';
@ -1573,7 +1574,7 @@ export class BaileysStartupService extends ChannelStartupService {
database: Database, database: Database,
) => { ) => {
this.logger.info( this.logger.info(
`labels as sociation - ${data?.association?.chatId} (${data.type}): ${data?.association?.labelId}`, `labels association - ${data?.association?.chatId} (${data.type}-${data?.association?.type}): ${data?.association?.labelId}`,
); );
if (database.SAVE_DATA.CHATS) { if (database.SAVE_DATA.CHATS) {
const instanceId = this.instanceId; const instanceId = this.instanceId;
@ -1581,35 +1582,9 @@ export class BaileysStartupService extends ChannelStartupService {
const labelId = data.association.labelId; const labelId = data.association.labelId;
if (data.type === 'add') { if (data.type === 'add') {
// Adicionar o label ao array JSONB await this.addLabel(labelId, instanceId, chatId);
await this.prismaRepository.$executeRawUnsafe(
`UPDATE "Chat"
SET "labels" = (SELECT to_jsonb(array_agg(DISTINCT elem))
FROM (SELECT jsonb_array_elements_text("labels") AS elem
UNION
SELECT $1::text AS elem) sub)
WHERE "instanceId" = $2
AND "remoteJid" = $3`,
labelId,
instanceId,
chatId,
);
} else if (data.type === 'remove') { } else if (data.type === 'remove') {
// Usar consulta SQL bruta para remover o label await this.removeLabel(labelId, instanceId, chatId);
await this.prismaRepository.$executeRawUnsafe(
`UPDATE "Chat"
SET "labels" = COALESCE(
(SELECT jsonb_agg(elem)
FROM jsonb_array_elements_text("labels") AS elem
WHERE elem <> $1),
'[]' ::jsonb
)
WHERE "instanceId" = $2
AND "remoteJid" = $3;`,
labelId,
instanceId,
chatId,
);
} }
} }
@ -3886,7 +3861,7 @@ export class BaileysStartupService extends ChannelStartupService {
})); }));
} }
public async handleLabel(data: HandleLabelDto) { public async handleLabel(data: HandleLabelDto, instanceId: string) {
const whatsappContact = await this.whatsappNumber({ numbers: [data.number] }); const whatsappContact = await this.whatsappNumber({ numbers: [data.number] });
if (whatsappContact.length === 0) { if (whatsappContact.length === 0) {
throw new NotFoundException('Number not found'); throw new NotFoundException('Number not found');
@ -3899,11 +3874,13 @@ export class BaileysStartupService extends ChannelStartupService {
try { try {
if (data.action === 'add') { if (data.action === 'add') {
await this.client.addChatLabel(contact.jid, data.labelId); await this.client.addChatLabel(contact.jid, data.labelId);
await this.addLabel(data.labelId, instanceId, contact.jid);
return { numberJid: contact.jid, labelId: data.labelId, add: true }; return { numberJid: contact.jid, labelId: data.labelId, add: true };
} }
if (data.action === 'remove') { if (data.action === 'remove') {
await this.client.removeChatLabel(contact.jid, data.labelId); await this.client.removeChatLabel(contact.jid, data.labelId);
await this.removeLabel(data.labelId, instanceId, contact.jid);
return { numberJid: contact.jid, labelId: data.labelId, remove: true }; return { numberJid: contact.jid, labelId: data.labelId, remove: true };
} }
@ -4352,4 +4329,52 @@ export class BaileysStartupService extends ChannelStartupService {
return unreadMessages; return unreadMessages;
} }
private async addLabel(labelId: string, instanceId: string, chatId: string) {
const id = cuid();
await this.prismaRepository.$executeRawUnsafe(
`INSERT INTO "Chat" ("id", "instanceId", "remoteJid", "labels", "createdAt", "updatedAt")
VALUES ($4, $2, $3, to_jsonb(ARRAY[$1]::text[]), NOW(), NOW()) ON CONFLICT ("instanceId", "remoteJid")
DO
UPDATE
SET "labels" = (
SELECT to_jsonb(array_agg(DISTINCT elem))
FROM (
SELECT jsonb_array_elements_text("Chat"."labels") AS elem
UNION
SELECT $1::text AS elem
) sub
),
"updatedAt" = NOW();`,
labelId,
instanceId,
chatId,
id,
);
}
private async removeLabel(labelId: string, instanceId: string, chatId: string) {
const id = cuid();
await this.prismaRepository.$executeRawUnsafe(
`INSERT INTO "Chat" ("id", "instanceId", "remoteJid", "labels", "createdAt", "updatedAt")
VALUES ($4, $2, $3, '[]'::jsonb, NOW(), NOW()) ON CONFLICT ("instanceId", "remoteJid")
DO
UPDATE
SET "labels" = COALESCE (
(
SELECT jsonb_agg(elem)
FROM jsonb_array_elements_text("Chat"."labels") AS elem
WHERE elem <> $1
),
'[]'::jsonb
),
"updatedAt" = NOW();`,
labelId,
instanceId,
chatId,
id,
);
}
} }