From 28a7d9c62b90eeac30143a03ac077e246478ba71 Mon Sep 17 00:00:00 2001
From: Davidson Gomes <davidsongviolao@gmail.com>
Date: Wed, 26 Jul 2023 18:02:45 -0300
Subject: [PATCH 1/2] fix: Adjusts in instance name

---
 src/whatsapp/controllers/instance.controller.ts | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/whatsapp/controllers/instance.controller.ts b/src/whatsapp/controllers/instance.controller.ts
index e45644fe..64867a2d 100644
--- a/src/whatsapp/controllers/instance.controller.ts
+++ b/src/whatsapp/controllers/instance.controller.ts
@@ -55,19 +55,12 @@ export class InstanceController {
     try {
       this.logger.verbose('requested createInstance from ' + instanceName + ' instance');
 
-      if (instanceName !== instanceName.toLowerCase().replace(/[^a-z0-9]/g, '')) {
-        throw new BadRequestException('The instance name must be lowercase and without special characters');
-      }
-
       this.logger.verbose('checking duplicate token');
       await this.authService.checkDuplicateToken(token);
 
       this.logger.verbose('creating instance');
       const instance = new WAStartupService(this.configService, this.eventEmitter, this.repository, this.cache);
-      instance.instanceName = instanceName
-        .toLowerCase()
-        .replace(/[^a-z0-9]/g, '')
-        .replace(' ', '');
+      instance.instanceName = instanceName;
 
       this.logger.verbose('instance: ' + instance.instanceName + ' created');
 

From 9bdbfc6f4f403cf6c5deffcb02f2872bb4f55968 Mon Sep 17 00:00:00 2001
From: Alan Mosko <moskoweb@gmail.com>
Date: Wed, 26 Jul 2023 18:28:18 -0300
Subject: [PATCH 2/2] wip

---
 src/whatsapp/abstract/abstract.router.ts | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/whatsapp/abstract/abstract.router.ts b/src/whatsapp/abstract/abstract.router.ts
index d18cf36d..230c49af 100644
--- a/src/whatsapp/abstract/abstract.router.ts
+++ b/src/whatsapp/abstract/abstract.router.ts
@@ -104,11 +104,11 @@ export abstract class RouterBroker {
     const instance = request.params as unknown as InstanceDto;
     const body = request.body;
 
-    if (!body?.groupJid) {
-      if (request.query.groupJid) {
-        Object.assign(body, {
-          groupJid: request.query.groupJid
-        });
+    let groupJid = body?.groupJid;
+    
+    if (!groupJid) {
+      if (request.query?.groupJid) {
+        groupJid = request.query.groupJid;
       } else {
         throw new BadRequestException(
           'The group id needs to be informed in the query',
@@ -117,6 +117,14 @@ export abstract class RouterBroker {
       }
     }
     
+    if (!groupJid.endsWith('@g.us')) {
+      groupJid = groupJid + '@g.us';
+    }
+    
+    Object.assign(body, {
+      groupJid: groupJid
+    });
+    
     const ref = new ClassRef();
 
     Object.assign(ref, body);