From 697c0bdb9b3404039170fa2354dcc8b942dbf980 Mon Sep 17 00:00:00 2001
From: Sergey Yarkov <serzh.yarkov@gmail.com>
Date: Wed, 1 Sep 2021 22:31:38 +0300
Subject: [PATCH] refactor: upd contact

---
 app/Repositories/ContactRepository.ts              | 4 ++--
 app/Validators/Contacts/UpdateContactsValidator.ts | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Repositories/ContactRepository.ts b/app/Repositories/ContactRepository.ts
index 7162360..5656d07 100644
--- a/app/Repositories/ContactRepository.ts
+++ b/app/Repositories/ContactRepository.ts
@@ -64,8 +64,8 @@ export default class ContactRepository {
 
     if (contacts) {
       contacts.phone_number = data.phone_number ?? null;
-      contacts.telegram_id = data.telegram_id ?? null;
-      contacts.twitter_id = data.twitter_id ?? null;
+      contacts.telegram_id = data.telegram_id?.substring(1) ?? null;
+      contacts.twitter_id = data.twitter_id?.substring(1) ?? null;
       contacts.vk_id = data.vk_id ?? null;
 
       await contacts.save();
diff --git a/app/Validators/Contacts/UpdateContactsValidator.ts b/app/Validators/Contacts/UpdateContactsValidator.ts
index 8f600c0..d2bd234 100644
--- a/app/Validators/Contacts/UpdateContactsValidator.ts
+++ b/app/Validators/Contacts/UpdateContactsValidator.ts
@@ -11,9 +11,9 @@ export default class UpdateContactsValidator {
         strict: true,
       }),
     ]),
-    vk_id: schema.string.optional({}, [rules.regex(/^[a-zA-Z0-9_]+$/)]),
-    twitter_id: schema.string.optional({}, [rules.regex(/^[a-zA-Z0-9_]+$/)]),
-    telegram_id: schema.string.optional({}, [rules.regex(/^[a-zA-Z0-9_]+$/)]),
+    vk_id: schema.string.optional({}, [rules.regex(/^([a-zA-Z0-9_]){1,64}$/)]),
+    twitter_id: schema.string.optional({}, [rules.regex(/(^|[^@\w])@(\w{1,15})\b/)]),
+    telegram_id: schema.string.optional({}, [rules.regex(/(^|[^@\w])@(\w{1,64})\b/)]),
   });
 
   public messages = {};