From ca4382fb9abecf8c9d2332cf6d679e98b66c9bb6 Mon Sep 17 00:00:00 2001 From: icleitoncosta Date: Wed, 10 Apr 2024 21:10:42 -0300 Subject: [PATCH] fix: Improovment newsletter to send poll --- src/chat/functions/sendRawMessage.ts | 14 ++++++++++---- src/whatsapp/functions/sendNewsletterMessageJob.ts | 4 +++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/chat/functions/sendRawMessage.ts b/src/chat/functions/sendRawMessage.ts index b789219307..22e882358c 100644 --- a/src/chat/functions/sendRawMessage.ts +++ b/src/chat/functions/sendRawMessage.ts @@ -67,18 +67,24 @@ export async function sendRawMessage( debug(`sending message (${rawMessage.type}) with id ${rawMessage.id}`); let result = null as any; - if (chat?.isNewsletter) { - if (rawMessage.type !== ('chat' || 'image' || 'video')) + if (chat?.isNewsletter && rawMessage.type) { + const validTypes = ['chat', 'image', 'video', 'poll_creation']; + if (!validTypes.includes(rawMessage.type)) throw new WPPError( 'type_not_valid_for_newsletter', - 'Please, send a valid type for send message to newsletter. Valid types: "chat", "image", "video"' + 'Please, send a valid type for send message to newsletter. Valid types: "chat", "image", "video", "poll_creation"' ); const msg = new MsgModel(rawMessage as any); await addNewsletterMsgsRecords([await msgDataFromMsgModel(msg)]); const resultNewsletter = await sendNewsletterMessageJob({ + type: + rawMessage.type == 'chat' && !rawMessage.editMsgType + ? 'text' + : rawMessage.type == 'poll_creation' + ? 'pollCreation' + : 'media', msgData: rawMessage, msg: new MsgModel(rawMessage as any), - type: rawMessage.type == 'chat' ? 'text' : 'media', newsletterJid: chat.id.toString(), }); chat.msgs.add(msg); diff --git a/src/whatsapp/functions/sendNewsletterMessageJob.ts b/src/whatsapp/functions/sendNewsletterMessageJob.ts index 40a2b1df27..0909033920 100644 --- a/src/whatsapp/functions/sendNewsletterMessageJob.ts +++ b/src/whatsapp/functions/sendNewsletterMessageJob.ts @@ -15,14 +15,16 @@ */ import { exportModule } from '../exportModule'; +import { MsgModel } from '../models'; /** @whatsapp 397995 */ export declare function sendNewsletterMessageJob(data: { msgData?: any; - msg?: any; + msg?: MsgModel; newsletterJid: string; type: string; + editType?: 'media' | 'text'; }): Promise<{ ack: { t: number }; serverId: number; success: boolean }>; exportModule(