Merge remote-tracking branch 'origin/main'

src/device/device.service.ts

@@ -67,7 +67,7 @@ export class DeviceService implements OnModuleInit {
         })
     }
 
-    async deviceConnect(id: string, socketId: string, model: string, name: string, version?: string) {
+    async deviceConnect(id: string, socketId: string, model: string, name: string, version?: string, ip?: string) {
         let device = await this.deviceRepository.findOneBy({ id })
         if (!device) {
             device = new Device()
@@ -80,6 +80,7 @@ export class DeviceService implements OnModuleInit {
         device.canSend = false
         device.configOverrides = {}
         device.version = version
+        device.ip = ip
         await this.deviceRepository.save(device)
     }
 

src/device/entities/device.entity.ts

@@ -44,4 +44,7 @@ export class Device {
 
     @Column({ nullable: true })
     version: string
+
+    @Column({ nullable: true })
+    ip: string
 }

src/rcs-number/helpers.ts

@@ -18,7 +18,9 @@ export function checkAndFormatNumber(country: string, number: string, carrierNam
     }
     let regex = new RegExp(`^(\\+?)(${countryData.countryCode.replace('+', '')})`)
     number = number.replace(regex, '')
-
+    if (country.toLocaleLowerCase() === 'do') {
+        number = number.replace(/^809/, '')
+    }
     // switch (country.toLowerCase()) {
     //     case 'us':
     //         number = number.replace(/^\+1/, '').replace(/^1(\d{10})$/, '$1')