change sendPresence from sendMessage to chat

Author: gabrielpastori1

.vscode/settings.json

@@ -5,8 +5,8 @@
   "editor.smoothScrolling": true,
   "editor.tabSize": 2,
   "editor.codeActionsOnSave": {
-     "source.fixAll.eslint": true,
-     "source.fixAll": true
+    "source.fixAll.eslint": "explicit",
+    "source.fixAll": "explicit"
   },
   "prisma-smart-formatter.typescript.defaultFormatter": "esbenp.prettier-vscode",
   "prisma-smart-formatter.prisma.defaultFormatter": "Prisma.prisma"

src/whatsapp/controllers/chat.controller.ts

@@ -9,6 +9,7 @@ import {
   ProfilePictureDto,
   ProfileStatusDto,
   ReadMessageDto,
+  SendPresenceDto,
   WhatsAppNumberDto,
 } from '../dto/chat.dto';
 import { InstanceDto } from '../dto/instance.dto';
@@ -77,6 +78,11 @@ export class ChatController {
     return await this.waMonitor.waInstances[instanceName].fetchChats();
   }
 
+  public async sendPresence({ instanceName }: InstanceDto, data: SendPresenceDto) {
+    logger.verbose('requested sendPresence from ' + instanceName + ' instance');
+    return await this.waMonitor.waInstances[instanceName].sendPresence(data);
+  }
+
   public async fetchPrivacySettings({ instanceName }: InstanceDto) {
     logger.verbose('requested fetchPrivacySettings from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].fetchPrivacySettings();

src/whatsapp/controllers/sendMessage.controller.ts

@@ -11,7 +11,6 @@ import {
   SendLocationDto,
   SendMediaDto,
   SendPollDto,
-  SendPresenceDto,
   SendReactionDto,
   SendStatusDto,
   SendStickerDto,
@@ -24,11 +23,6 @@ const logger = new Logger('MessageRouter');
 export class SendMessageController {
   constructor(private readonly waMonitor: WAMonitoringService) {}
 
-  public async sendPresence({ instanceName }: InstanceDto, data: SendPresenceDto) {
-    logger.verbose('requested sendPresence from ' + instanceName + ' instance');
-    return await this.waMonitor.waInstances[instanceName].sendPresence(data);
-  }
-
   public async sendText({ instanceName }: InstanceDto, data: SendTextDto) {
     logger.verbose('requested sendText from ' + instanceName + ' instance');
     return await this.waMonitor.waInstances[instanceName].textMessage(data);

src/whatsapp/dto/chat.dto.ts

@@ -1,4 +1,4 @@
-import { proto, WAPrivacyOnlineValue, WAPrivacyValue, WAReadReceiptsValue } from '@whiskeysockets/baileys';
+import { proto, WAPresence, WAPrivacyOnlineValue, WAPrivacyValue, WAReadReceiptsValue } from '@whiskeysockets/baileys';
 
 export class OnWhatsAppDto {
   constructor(public readonly jid: string, public readonly exists: boolean, public readonly name?: string) {}
@@ -83,3 +83,20 @@ export class DeleteMessage {
   remoteJid: string;
   participant?: string;
 }
+export class Options {
+  delay?: number;
+  presence?: WAPresence;
+}
+class OptionsMessage {
+  options: Options;
+}
+export class Metadata extends OptionsMessage {
+  number: string;
+}
+
+export class SendPresenceDto extends Metadata {
+  options: {
+    presence: WAPresence;
+    delay: number;
+  };
+}

src/whatsapp/dto/sendMessage.dto.ts

@@ -46,12 +46,7 @@ class PollMessage {
   values: string[];
   messageSecret?: Uint8Array;
 }
-export class SendPresenceDto extends Metadata {
-  options: {
-    presence: WAPresence;
-    delay: number;
-  };
-}
+
 export class SendTextDto extends Metadata {
   textMessage: TextMessage;
 }

src/whatsapp/routers/chat.router.ts

@@ -7,6 +7,7 @@ import {
   deleteMessageSchema,
   messageUpSchema,
   messageValidateSchema,
+  presenceSchema,
   privacySettingsSchema,
   profileNameSchema,
   profilePictureSchema,
@@ -26,6 +27,7 @@ import {
   ProfilePictureDto,
   ProfileStatusDto,
   ReadMessageDto,
+  SendPresenceDto,
   WhatsAppNumberDto,
 } from '../dto/chat.dto';
 import { InstanceDto } from '../dto/instance.dto';
@@ -228,6 +230,22 @@ export class ChatRouter extends RouterBroker {
 
         return res.status(HttpStatus.OK).json(response);
       })
+      .post(this.routerPath('sendPresence'), ...guards, async (req, res) => {
+        logger.verbose('request received in sendPresence');
+        logger.verbose('request body: ');
+        logger.verbose(req.body);
+
+        logger.verbose('request query: ');
+        logger.verbose(req.query);
+        const response = await this.dataValidate<null>({
+          request: req,
+          schema: presenceSchema,
+          ClassRef: SendPresenceDto,
+          execute: (instance, data) => chatController.sendPresence(instance, data),
+        });
+
+        return res.status(HttpStatus.CREATED).json(response);
+      })
       // Profile routes
       .get(this.routerPath('fetchPrivacySettings'), ...guards, async (req, res) => {
         logger.verbose('request received in fetchPrivacySettings');

src/whatsapp/routers/sendMessage.router.ts

@@ -9,7 +9,6 @@ import {
   locationMessageSchema,
   mediaMessageSchema,
   pollMessageSchema,
-  presenceSchema,
   reactionMessageSchema,
   statusMessageSchema,
   stickerMessageSchema,
@@ -24,7 +23,6 @@ import {
   SendLocationDto,
   SendMediaDto,
   SendPollDto,
-  SendPresenceDto,
   SendReactionDto,
   SendStatusDto,
   SendStickerDto,
@@ -39,22 +37,6 @@ export class MessageRouter extends RouterBroker {
   constructor(...guards: RequestHandler[]) {
     super();
     this.router
-      .post(this.routerPath('sendPresence'), ...guards, async (req, res) => {
-        logger.verbose('request received in sendPresence');
-        logger.verbose('request body: ');
-        logger.verbose(req.body);
-
-        logger.verbose('request query: ');
-        logger.verbose(req.query);
-        const response = await this.dataValidate<null>({
-          request: req,
-          schema: presenceSchema,
-          ClassRef: SendPresenceDto,
-          execute: (instance, data) => sendMessageController.sendPresence(instance, data),
-        });
-
-        return res.status(HttpStatus.CREATED).json(response);
-      })
       .post(this.routerPath('sendText'), ...guards, async (req, res) => {
         logger.verbose('request received in sendText');
         logger.verbose('request body: ');

src/whatsapp/services/whatsapp.service.ts

@@ -83,6 +83,7 @@ import {
   OnWhatsAppDto,
   PrivacySettingDto,
   ReadMessageDto,
+  SendPresenceDto,
   WhatsAppNumberDto,
 } from '../dto/chat.dto';
 import {
@@ -109,7 +110,6 @@ import {
   SendLocationDto,
   SendMediaDto,
   SendPollDto,
-  SendPresenceDto,
   SendReactionDto,
   SendStatusDto,
   SendStickerDto,