From b9eb8d45b24b7efd15634edd5916b5a530b19f79 Mon Sep 17 00:00:00 2001 From: Davidson Gomes Date: Sun, 16 Jul 2023 17:57:37 -0300 Subject: [PATCH] fix: removed link preview endpoint, now it's done automatically from sending conventional text --- CHANGELOG.md | 1 + src/validate/validate.schema.ts | 18 ------------- .../controllers/sendMessage.controller.ts | 5 ---- src/whatsapp/dto/sendMessage.dto.ts | 8 ------ src/whatsapp/routers/sendMessage.router.ts | 19 -------------- src/whatsapp/services/whatsapp.service.ts | 25 ++++--------------- 6 files changed, 6 insertions(+), 70 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 007e3233..a044499c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * Docker files adjusted * Fixed in the postman collection the webhookByEvent parameter by webhook_by_events * Now it's getting the API URL directly in the request, no longer need the variable in the env file +* Removed link preview endpoint, now it's done automatically from sending conventional text # 1.2.2 (2023-07-15 09:36) diff --git a/src/validate/validate.schema.ts b/src/validate/validate.schema.ts index 1fbb331e..21d206d6 100644 --- a/src/validate/validate.schema.ts +++ b/src/validate/validate.schema.ts @@ -144,24 +144,6 @@ export const textMessageSchema: JSONSchema7 = { required: ['textMessage', 'number'], }; -export const linkPreviewSchema: JSONSchema7 = { - $id: v4(), - type: 'object', - properties: { - number: { ...numberDefinition }, - options: { ...optionsSchema }, - linkPreview: { - type: 'object', - properties: { - text: { type: 'string' }, - }, - required: ['text'], - ...isNotEmpty('text'), - }, - }, - required: ['linkPreview', 'number'], -}; - export const pollMessageSchema: JSONSchema7 = { $id: v4(), type: 'object', diff --git a/src/whatsapp/controllers/sendMessage.controller.ts b/src/whatsapp/controllers/sendMessage.controller.ts index c2d5298c..86dc6dca 100644 --- a/src/whatsapp/controllers/sendMessage.controller.ts +++ b/src/whatsapp/controllers/sendMessage.controller.ts @@ -119,9 +119,4 @@ export class SendMessageController { logger.verbose('requested sendStatus from ' + instanceName + ' instance'); return await this.waMonitor.waInstances[instanceName].statusMessage(data); } - - public async sendLinkPreview({ instanceName }: InstanceDto, data: SendLinkPreviewDto) { - logger.verbose('requested sendLinkPreview from ' + instanceName + ' instance'); - return await this.waMonitor.waInstances[instanceName].linkPreview(data); - } } diff --git a/src/whatsapp/dto/sendMessage.dto.ts b/src/whatsapp/dto/sendMessage.dto.ts index 4f1ff88b..51a55cec 100644 --- a/src/whatsapp/dto/sendMessage.dto.ts +++ b/src/whatsapp/dto/sendMessage.dto.ts @@ -28,10 +28,6 @@ class TextMessage { text: string; } -class linkPreviewMessage { - text: string; -} - export class StatusMessage { type: string; content: string; @@ -52,10 +48,6 @@ export class SendTextDto extends Metadata { textMessage: TextMessage; } -export class SendLinkPreviewDto extends Metadata { - linkPreview: linkPreviewMessage; -} - export class SendStatusDto extends Metadata { statusMessage: StatusMessage; } diff --git a/src/whatsapp/routers/sendMessage.router.ts b/src/whatsapp/routers/sendMessage.router.ts index d8d3acea..f6f9c3eb 100644 --- a/src/whatsapp/routers/sendMessage.router.ts +++ b/src/whatsapp/routers/sendMessage.router.ts @@ -3,7 +3,6 @@ import { audioMessageSchema, buttonMessageSchema, contactMessageSchema, - linkPreviewSchema, listMessageSchema, locationMessageSchema, mediaMessageSchema, @@ -17,7 +16,6 @@ import { SendAudioDto, SendButtonDto, SendContactDto, - SendLinkPreviewDto, SendListDto, SendLocationDto, SendMediaDto, @@ -199,23 +197,6 @@ export class MessageRouter extends RouterBroker { return res.status(HttpStatus.CREATED).json(response); }) - .post(this.routerPath('sendLinkPreview'), ...guards, async (req, res) => { - logger.verbose('request received in sendLinkPreview'); - logger.verbose('request body: '); - logger.verbose(req.body); - - logger.verbose('request query: '); - logger.verbose(req.query); - const response = await this.dataValidate({ - request: req, - schema: linkPreviewSchema, - ClassRef: SendLinkPreviewDto, - execute: (instance, data) => - sendMessageController.sendLinkPreview(instance, data), - }); - - return res.status(HttpStatus.CREATED).json(response); - }) .post(this.routerPath('sendSticker'), ...guards, async (req, res) => { logger.verbose('request received in sendSticker'); logger.verbose('request body: '); diff --git a/src/whatsapp/services/whatsapp.service.ts b/src/whatsapp/services/whatsapp.service.ts index 6d845dc9..f7f9d7f6 100644 --- a/src/whatsapp/services/whatsapp.service.ts +++ b/src/whatsapp/services/whatsapp.service.ts @@ -76,7 +76,6 @@ import { SendReactionDto, SendTextDto, SendPollDto, - SendLinkPreviewDto, SendStickerDto, SendStatusDto, StatusMessage, @@ -1476,8 +1475,8 @@ export class WAStartupService { if ( !message['audio'] && !message['poll'] && - !message['linkPreview'] && !message['sticker'] && + !message['conversation'] && !sender.includes('@broadcast') ) { if (!message['audio']) { @@ -1496,12 +1495,13 @@ export class WAStartupService { } } - if (message['linkPreview']) { + if (message['conversation']) { + console.log(message['conversation']); this.logger.verbose('Sending message'); return await this.client.sendMessage( sender, { - text: message['linkPreview'].text, + text: message['conversation'], } as unknown as AnyMessageContent, option as unknown as MiscMessageGenerationOptions, ); @@ -1583,19 +1583,6 @@ export class WAStartupService { ); } - public async linkPreview(data: SendLinkPreviewDto) { - this.logger.verbose('Sending link preview'); - return await this.sendMessageWithTyping( - data.number, - { - linkPreview: { - text: data.linkPreview.text, - }, - }, - data?.options, - ); - } - public async pollMessage(data: SendPollDto) { this.logger.verbose('Sending poll message'); return await this.sendMessageWithTyping( @@ -2646,9 +2633,7 @@ export class WAStartupService { const msg = `${description}\n\n${inviteUrl}`; const message = { - linkPreview: { - text: msg, - }, + conversation: msg, }; for await (const number of numbers) {