feat: improve telegram setup workflow (#6734)

monicahq · Jul 2, 2023 · 9ee07fb · 9ee07fb
1 parent f191eda
commit 9ee07fb
Show file tree

Hide file tree

Showing 30 changed files with 193 additions and 162 deletions.
diff --git a/...Domains/Settings/ManageNotificationChannels/Web/Controllers/TelegramWebhookController.php b/...Domains/Settings/ManageNotificationChannels/Web/Controllers/TelegramWebhookController.php
@@ -29,12 +29,13 @@ public function store(Request $request)
         // check if the message matches the expected pattern.
         // if the message does not match the pattern, then we return a 202 response
         // so telegram will stop trying to send the message.
-        if (! Str::of($messageText)->test('/^\/start\s[A-Za-z0-9-]{36}$/')) {
+        $message = Str::of($messageText);
+        if (! $message->test('/^\/start\s[A-Za-z0-9-]{36}$/')) {
             return response('Accepted', 202);
         }
 
         // Cleanup the string
-        $verificationKey = Str::of($messageText)->remove('/start ')->rtrim();
+        $verificationKey = $message->remove('/start ')->rtrim();
 
         // Get Telegram ID from the request.
         $chatId = $request->message['chat']['id'];

diff --git a/...ains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsIndexViewHelper.php b/...ains/Settings/ManageNotificationChannels/Web/ViewHelpers/NotificationsIndexViewHelper.php
@@ -28,7 +28,7 @@ public static function data(User $user): array
             'emails' => $emailsCollection,
             'telegram' => [
                 'data' => $telegram ? self::dtoTelegram($telegram) : null,
-                'telegram_env_variable_set' => config('services.telegram-bot-api.token'),
+                'telegram_env_variable_set' => config('services.telegram-bot-api.token') !== null,
             ],
             'url' => [
                 'settings' => route('settings.index'),

diff --git a/lang/bn.json b/lang/bn.json
@@ -826,6 +826,7 @@
     "Set as favorite": "প্রিয় হিসাবে সেট করুন",
     "Settings": "সেটিংস",
     "Settle": "মীমাংসা",
+    "Setup": "সেটআপ",
     "Setup Key": "সেটআপ কী",
     "Setup Key:": "সেটআপ কী:",
     "Setup Telegram": "টেলিগ্রাম সেটআপ করুন",

diff --git a/lang/ca.json b/lang/ca.json
@@ -826,6 +826,7 @@
     "Set as favorite": "Estableix com a favorit",
     "Settings": "Configuració",
     "Settle": "Resoldre",
+    "Setup": "Configuració",
     "Setup Key": "Clau de configuració",
     "Setup Key:": "Clau de configuració:",
     "Setup Telegram": "Configura Telegram",

diff --git a/lang/da.json b/lang/da.json
@@ -826,6 +826,7 @@
     "Set as favorite": "Indstil som favorit",
     "Settings": "Indstillinger",
     "Settle": "Afregne",
+    "Setup": "Opsætning",
     "Setup Key": "Opsætningsnøgle",
     "Setup Key:": "Opsætningsnøgle:",
     "Setup Telegram": "Opsætning af telegram",

diff --git a/lang/de.json b/lang/de.json
@@ -826,6 +826,7 @@
     "Set as favorite": "Als Favorit festlegen",
     "Settings": "Einstellungen",
     "Settle": "Abwickeln",
+    "Setup": "Aufstellen",
     "Setup Key": "Einrichtungsschlüssel",
     "Setup Key:": "Setup-Schlüssel:",
     "Setup Telegram": "Telegram einrichten",

diff --git a/lang/el.json b/lang/el.json
@@ -826,6 +826,7 @@
     "Set as favorite": "Ορίστε ως αγαπημένο",
     "Settings": "Ρυθμίσεις",
     "Settle": "Εγκαθίσταμαι",
+    "Setup": "Ρύθμιση",
     "Setup Key": "Κλειδί ρύθμισης",
     "Setup Key:": "Κλειδί ρύθμισης:",
     "Setup Telegram": "Ρύθμιση Telegram",

diff --git a/lang/es.json b/lang/es.json
@@ -826,6 +826,7 @@
     "Set as favorite": "Establecer como favorito",
     "Settings": "Configuraciones",
     "Settle": "Pagar",
+    "Setup": "Configuración",
     "Setup Key": "Clave de configuración",
     "Setup Key:": "Clave de configuración:",
     "Setup Telegram": "Configurar Telegram",

diff --git a/lang/fr.json b/lang/fr.json
@@ -826,6 +826,7 @@
     "Set as favorite": "Définir comme favori",
     "Settings": "Paramètres",
     "Settle": "Régler",
+    "Setup": "Configurer",
     "Setup Key": "Clé de configuration",
     "Setup Key:": "Clé de configuration :",
     "Setup Telegram": "Configurer Telegram",
@@ -1277,4 +1278,4 @@
     "😩 Awful": "😩 Horrible",
     "😶‍🌫️ Neutral": "😶‍🌫️ Neutre",
     "🥳 Awesome": "🥳 Génial"
-}
+}
diff --git a/lang/he.json b/lang/he.json
@@ -826,6 +826,7 @@
     "Set as favorite": "הגדר כמועדף",
     "Settings": "הגדרות",
     "Settle": "לִשְׁקוֹעַ",
+    "Setup": "להכין",
     "Setup Key": "מפתח הגדרה",
     "Setup Key:": "מפתח הגדרה:",
     "Setup Telegram": "הגדרת טלגרם",

diff --git a/lang/hi.json b/lang/hi.json
@@ -826,6 +826,7 @@
     "Set as favorite": "पसंदीदा के रूप में सेट करें",
     "Settings": "समायोजन",
     "Settle": "निपटारा करना",
+    "Setup": "स्थापित करना",
     "Setup Key": "सेटअप कुंजी",
     "Setup Key:": "सेटअप कुंजी:",
     "Setup Telegram": "सेटअप टेलीग्राम",

diff --git a/lang/it.json b/lang/it.json
@@ -826,6 +826,7 @@
     "Set as favorite": "Imposta come preferito",
     "Settings": "Impostazioni",
     "Settle": "Salda",
+    "Setup": "Impostare",
     "Setup Key": "Chiave di configurazione",
     "Setup Key:": "Chiave di configurazione:",
     "Setup Telegram": "Imposta Telegram",

diff --git a/lang/ja.json b/lang/ja.json
@@ -826,6 +826,7 @@
     "Set as favorite": "お気に入りに設定",
     "Settings": "設定",
     "Settle": "解決",
+    "Setup": "設定",
     "Setup Key": "セットアップキー",
     "Setup Key:": "セットアップ キー:",
     "Setup Telegram": "テレグラムの設定",

diff --git a/lang/ml.json b/lang/ml.json
@@ -826,6 +826,7 @@
     "Set as favorite": "പ്രിയപ്പെട്ടതായി സജ്ജമാക്കുക",
     "Settings": "ക്രമീകരണങ്ങൾ",
     "Settle": "സെറ്റിൽ ചെയ്യുക",
+    "Setup": "സജ്ജമാക്കുക",
     "Setup Key": "സജ്ജീകരണ കീ",
     "Setup Key:": "സജ്ജീകരണ കീ:",
     "Setup Telegram": "ടെലിഗ്രാം സജ്ജീകരിക്കുക",

diff --git a/lang/nl.json b/lang/nl.json
@@ -826,6 +826,7 @@
     "Set as favorite": "Instellen als favoriet",
     "Settings": "Instellingen",
     "Settle": "Schikken",
+    "Setup": "Opgericht",
     "Setup Key": "Instelsleutel",
     "Setup Key:": "Instelsleutel:",
     "Setup Telegram": "Telegram instellen",

diff --git a/lang/no.json b/lang/no.json
@@ -826,6 +826,7 @@
     "Set as favorite": "Sett som favoritt",
     "Settings": "Innstillinger",
     "Settle": "Avgjøre",
+    "Setup": "Oppsett",
     "Setup Key": "Oppsettnøkkel",
     "Setup Key:": "Oppsettnøkkel:",
     "Setup Telegram": "Sett opp telegram",

diff --git a/lang/pa.json b/lang/pa.json
@@ -826,6 +826,7 @@
     "Set as favorite": "ਮਨਪਸੰਦ ਵਜੋਂ ਸੈੱਟ ਕਰੋ",
     "Settings": "ਸੈਟਿੰਗਾਂ",
     "Settle": "ਸੈਟਲ",
+    "Setup": "ਸਥਾਪਨਾ ਕਰਨਾ",
     "Setup Key": "ਸੈੱਟਅੱਪ ਕੁੰਜੀ",
     "Setup Key:": "ਸੈੱਟਅੱਪ ਕੁੰਜੀ:",
     "Setup Telegram": "ਟੈਲੀਗ੍ਰਾਮ ਸੈੱਟਅੱਪ ਕਰੋ",

diff --git a/lang/pl.json b/lang/pl.json
@@ -826,6 +826,7 @@
     "Set as favorite": "Ustaw jako ulubione",
     "Settings": "Ustawienia",
     "Settle": "Rozstrzygnąć",
+    "Setup": "Organizować coś",
     "Setup Key": "Klucz konfiguracji",
     "Setup Key:": "Klucz konfiguracji:",
     "Setup Telegram": "Ustaw telegram",

diff --git a/lang/pt.json b/lang/pt.json
@@ -826,6 +826,7 @@
     "Set as favorite": "Definir como favorito",
     "Settings": "Configurações",
     "Settle": "Quitar",
+    "Setup": "Configurar",
     "Setup Key": "Chave de configuração",
     "Setup Key:": "Chave de configuração:",
     "Setup Telegram": "Configurar Telegram",

diff --git a/lang/ro.json b/lang/ro.json
@@ -826,6 +826,7 @@
     "Set as favorite": "Setați ca favorit",
     "Settings": "Setări",
     "Settle": "Așează-te",
+    "Setup": "Înființat",
     "Setup Key": "Cheie de configurare",
     "Setup Key:": "Cheie de configurare:",
     "Setup Telegram": "Configurați Telegram",

diff --git a/lang/ru.json b/lang/ru.json
@@ -826,6 +826,7 @@
     "Set as favorite": "Установить в избранное",
     "Settings": "Настройки",
     "Settle": "Расселиться",
+    "Setup": "Настраивать",
     "Setup Key": "Ключ настройки",
     "Setup Key:": "Установка ключа:",
     "Setup Telegram": "Настройка Telegram",

diff --git a/lang/sv.json b/lang/sv.json
@@ -826,6 +826,7 @@
     "Set as favorite": "Ställ in som favorit",
     "Settings": "inställningar",
     "Settle": "Bosätta sig",
+    "Setup": "Uppstart",
     "Setup Key": "Inställningsnyckel",
     "Setup Key:": "Inställningsnyckel:",
     "Setup Telegram": "Ställ in telegram",

diff --git a/lang/te.json b/lang/te.json
@@ -826,6 +826,7 @@
     "Set as favorite": "ఇష్టమైనదిగా సెట్ చేయండి",
     "Settings": "సెట్టింగ్‌లు",
     "Settle": "తేల్చుకో",
+    "Setup": "సెటప్",
     "Setup Key": "సెటప్ కీ",
     "Setup Key:": "సెటప్ కీ:",
     "Setup Telegram": "టెలిగ్రామ్‌ని సెటప్ చేయండి",

diff --git a/lang/tr.json b/lang/tr.json
@@ -826,6 +826,7 @@
     "Set as favorite": "Favori olarak ayarla",
     "Settings": "Ayarlar",
     "Settle": "Yerleşmek",
+    "Setup": "Kurmak",
     "Setup Key": "Kurulum Anahtarı",
     "Setup Key:": "Kurulum Anahtarı:",
     "Setup Telegram": "Telgrafı Kur",

diff --git a/lang/ur.json b/lang/ur.json
@@ -826,6 +826,7 @@
     "Set as favorite": "پسندیدہ کے طور پر سیٹ کریں۔",
     "Settings": "ترتیبات",
     "Settle": "آباد کرنا",
+    "Setup": "سیٹ اپ",
     "Setup Key": "سیٹ اپ کلید",
     "Setup Key:": "سیٹ اپ کلید:",
     "Setup Telegram": "ٹیلیگرام سیٹ اپ کریں۔",

diff --git a/lang/vi.json b/lang/vi.json
@@ -826,6 +826,7 @@
     "Set as favorite": "Đặt làm mục yêu thích",
     "Settings": "Cài đặt",
     "Settle": "Ổn định",
+    "Setup": "Cài đặt",
     "Setup Key": "Khóa cài đặt",
     "Setup Key:": "Khóa cài đặt:",
     "Setup Telegram": "Thiết lập Telegram",

diff --git a/lang/zh.json b/lang/zh.json
@@ -827,6 +827,7 @@
     "Set as favorite": "设为收藏夹",
     "Settings": "设置",
     "Settle": "定居",
+    "Setup": "设置",
     "Setup Key": "设置键",
     "Setup Key:": "设置键：",
     "Setup Telegram": "设置电报",