wip

Author: moskoweb

src/validate/validate.schema.ts

@@ -445,7 +445,7 @@ export const whatsappNumberSchema: JSONSchema7 = {
       uniqueItems: true,
       items: {
         type: 'string',
-        pattern: '^\\d+',
+        // pattern: '^\\d+',
         description: '"numbers" must be an array of numeric strings',
       },
     },

src/whatsapp/services/whatsapp.service.ts

@@ -1392,21 +1392,27 @@ export class WAStartupService {
     }
 
     number = number
-      ?.split(":")[0]
-      ?.split("@")[0]
-      ?.replace(' ', '')
-      ?.replace('+', '')
-      ?.replace('(', '')
-      ?.replace(')', '');
+      ?.replace(/\s/g, '')
+      .replace(/\+/g, '')
+      .replace(/\(/g, '')
+      .replace(/\)/g, '')
+      .split(/\:/)[0]
+      .split('@')[0];
 
-    if (number.includes('-') && number.length >= 18) {
+    if(number.includes('-') && number.length >= 24){
       this.logger.verbose('Jid created is group: ' + `${number}@g.us`);
       number = number.replace(/[^\d-]/g, '');
       return `${number}@g.us`;
     }
 
     number = number.replace(/\D/g, '');
 
+    if (number.length >= 18) {
+      this.logger.verbose('Jid created is group: ' + `${number}@g.us`);
+      number = number.replace(/[^\d-]/g, '');
+      return `${number}@g.us`;
+    }
+    
     this.logger.verbose('Jid created is whatsapp: ' + `${number}@s.whatsapp.net`);
     return `${number}@s.whatsapp.net`;
   }