fix(messages): resolve sendMessage conflict merge

Author: yarninz

src/api/dto/sendMessage.dto.ts

@@ -174,7 +174,6 @@ export class SendReactionDto {
   reaction: string;
 }
 
-<<<<<<< HEAD
 export class CarouselCard {
   title?: string;
   body: string;
@@ -186,7 +185,8 @@ export class CarouselCard {
 export class SendCarouselDto extends Metadata {
   body: string;
   cards: CarouselCard[];
-=======
+}
+
 export class SendProductDto extends Metadata {
   /** WhatsApp internal product id (from /business/getCatalog `id`) */
   productId: string;
@@ -210,5 +210,4 @@ export class SendProductDto extends Metadata {
   productImageCount?: number;
   /** Optional caption sent alongside the product card. */
   caption?: string;
->>>>>>> 97a314b9 (feat(messages): add sendProduct endpoint for WhatsApp Business catalog cards)
 }

src/validate/message.schema.ts

@@ -457,16 +457,11 @@ export const buttonsMessageSchema: JSONSchema7 = {
   required: ['number'],
 };
 
-<<<<<<< HEAD
 export const carouselMessageSchema: JSONSchema7 = {
-=======
-export const productMessageSchema: JSONSchema7 = {
->>>>>>> 97a314b9 (feat(messages): add sendProduct endpoint for WhatsApp Business catalog cards)
   $id: v4(),
   type: 'object',
   properties: {
     number: { ...numberDefinition },
-<<<<<<< HEAD
     body: { type: 'string', minLength: 1 },
     cards: {
       type: 'array',
@@ -486,7 +481,7 @@ export const productMessageSchema: JSONSchema7 = {
             items: {
               type: 'object',
               properties: {
-                type: { type: 'string', enum: ['reply', 'copy', 'url', 'call'] },
+                type: { type: 'string', enum: ['reply', 'copy', 'url', 'call', 'pix'] },
                 displayText: { type: 'string' },
                 id: { type: 'string' },
                 url: { type: 'string' },
@@ -506,7 +501,7 @@ export const productMessageSchema: JSONSchema7 = {
       description: 'Enter a value in milliseconds',
     },
     quoted: { ...quotedOptionsSchema },
-    everyOne: { type: 'boolean', enum: [true, false] },
+    mentionsEveryOne: { type: 'boolean', enum: [true, false] },
     mentioned: {
       type: 'array',
       minItems: 1,
@@ -521,27 +516,11 @@ export const productMessageSchema: JSONSchema7 = {
   required: ['number', 'body', 'cards'],
 };
 
-export const decryptPollVoteSchema: JSONSchema7 = {
+export const productMessageSchema: JSONSchema7 = {
   $id: v4(),
   type: 'object',
   properties: {
-    message: {
-      type: 'object',
-      properties: {
-        key: {
-          type: 'object',
-          properties: {
-            id: { type: 'string' },
-          },
-          required: ['id'],
-        },
-      },
-      required: ['key'],
-    },
-    remoteJid: { type: 'string' },
-  },
-  required: ['message', 'remoteJid'],
-=======
+    number: { ...numberDefinition },
     productId: { type: 'string', minLength: 1 },
     businessOwnerJid: {
       type: 'string',
@@ -559,8 +538,40 @@ export const decryptPollVoteSchema: JSONSchema7 = {
     caption: { type: 'string' },
     delay: { type: 'integer', description: 'Enter a value in milliseconds' },
     quoted: { ...quotedOptionsSchema },
+    mentionsEveryOne: { type: 'boolean', enum: [true, false] },
+    mentioned: {
+      type: 'array',
+      minItems: 1,
+      uniqueItems: true,
+      items: {
+        type: 'string',
+        pattern: '^\\d+',
+        description: '"mentioned" must be an array of numeric strings',
+      },
+    },
   },
   required: ['number', 'productId', 'businessOwnerJid', 'productImage'],
   ...isNotEmpty('number', 'productId', 'businessOwnerJid', 'productImage'),
->>>>>>> 97a314b9 (feat(messages): add sendProduct endpoint for WhatsApp Business catalog cards)
+};
+
+export const decryptPollVoteSchema: JSONSchema7 = {
+  $id: v4(),
+  type: 'object',
+  properties: {
+    message: {
+      type: 'object',
+      properties: {
+        key: {
+          type: 'object',
+          properties: {
+            id: { type: 'string' },
+          },
+          required: ['id'],
+        },
+      },
+      required: ['key'],
+    },
+    remoteJid: { type: 'string' },
+  },
+  required: ['message', 'remoteJid'],
 };