Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 42 additions & 2 deletions src/shared/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { ConnectionStatus, InstanceData, ProxyAgent, WebhookPayload } from './ty
import path from "path";
import UserConfig from "../infra/config/env"
import { Worker } from 'worker_threads';
import { jidNormalizedUser } from "@whiskeysockets/baileys";
import { getContentType, jidNormalizedUser } from "@whiskeysockets/baileys";


export async function removeInstancePath(instancePath: string){
Expand Down Expand Up @@ -59,6 +59,9 @@ function serializeData(data: any): any {
}

export async function trySendWebhook(event: string, instance: InstanceData, data: any[]) {

const enrichedData = enrichMessagesWithType(data);

const payload = {
event,
instance: {
Expand All @@ -68,7 +71,7 @@ export async function trySendWebhook(event: string, instance: InstanceData, data
profilePictureUrl: instance.profilePictureUrl,
instanceJid: jidNormalizedUser(instance.socket?.user?.id) || null
},
data: serializeData(data),
data: serializeData(enrichedData),
targetUrl: UserConfig.webhookUrl
};

Expand All @@ -89,7 +92,44 @@ export async function trySendWebhook(event: string, instance: InstanceData, data
await saveWebhookEvent(payload);
worker.terminate();
});
}

function enrichMessagesWithType(data: any) {

// Caso seja um objeto com `.messages`
if (data && Array.isArray(data.messages)) {
data.messages = data.messages.map((m: any) => ({
...m,
messageType: getSafeMessageType(m)
}));
return data;
}

// Caso seja um array contendo objetos, algum deles podendo ter `.messages`
if (Array.isArray(data)) {
return data.map(item => {
if (item && Array.isArray(item.messages)) {
return {
...item,
messages: item.messages.map((m: any) => ({
...m,
messageType: getSafeMessageType(m)
}))
};
}
return item;
});
}

return data;
}

function getSafeMessageType(message: any): string | null {
try {
return getContentType(message?.message) || null;
} catch {
return null;
}
}

async function ensureDir() {
Expand Down