From bf9acf4c63bae1e91a2ca2f0a0d13010cda231be Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Tue, 11 Jan 2022 12:30:13 +0100
Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?=
 =?UTF-8?q?=D0=B8=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D1=8C=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=D0=B0=20=D0=BB?=
 =?UTF-8?q?=D1=8E=D0=B1=D0=BE=D0=B9=20=D0=B2=D0=B5=D0=BB=D0=B8=D1=87=D0=B8?=
 =?UTF-8?q?=D0=BD=D1=8B=20=D0=B2=20=D1=82=D0=B5=D0=BB=D0=B5=D0=B3=D1=80?=
 =?UTF-8?q?=D0=B0=D0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Telegram.cpp | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/Telegram.cpp b/src/Telegram.cpp
index 6c37177c..a9935c7c 100644
--- a/src/Telegram.cpp
+++ b/src/Telegram.cpp
@@ -59,7 +59,7 @@ void telegramMsgParse(String msg) {
         SerialPrint("<-", F("Telegram"), "chat ID: " + String(jsonReadInt(configSetupJson, "chatId")) + ", msg: " + String(msg));
     } else if (msg.indexOf("get") != -1) {
         msg = deleteBeforeDelimiter(msg, "_");
-        myBot->sendMessage(jsonReadInt(configSetupJson, "chatId"), getValue(msg));  //jsonReadStr(configLiveJson , msg));
+        myBot->sendMessage(jsonReadInt(configSetupJson, "chatId"), getValue(msg));  // jsonReadStr(configLiveJson , msg));
         SerialPrint("<-", F("Telegram"), "chat ID: " + String(jsonReadInt(configSetupJson, "chatId")) + ", msg: " + String(msg));
     } else if (msg.indexOf("all") != -1) {
         String list = returnListOfParams();
@@ -74,13 +74,21 @@ void telegramMsgParse(String msg) {
 void sendTelegramMsg() {
     String sabject = sCmd.next();
     String msg = sCmd.next();
+    String ID_name = "";
+    String ID_value = "";
     if (sabject == "often") {
         msg.replace("#", " ");
-            msg.replace("%date%", timeNow->getDateTimeDotFormated());
-            msg.replace("%weekday%", timeNow->getWeekday());
-            msg.replace("%IP%", jsonReadStr(configSetupJson, F("ip")));
-            msg.replace("%name%", jsonReadStr(configSetupJson, F("name")));
-
+        msg.replace("%date%", timeNow->getDateTimeDotFormated());
+        msg.replace("%weekday%", timeNow->getWeekday());
+        msg.replace("%IP%", jsonReadStr(configSetupJson, F("ip")));
+        msg.replace("%name%", jsonReadStr(configSetupJson, F("name")));
+        if (msg.indexOf("_") != -1) {
+            ID_name = deleteBeforeDelimiter(msg, "_");
+            ID_name = deleteAfterDelimiter(ID_name, "_");
+            ID_value = getValue(ID_name);
+            msg.replace(ID_name, ID_value);
+        }
+        msg.replace("_", " ");
         myBot->sendMessage(jsonReadInt(configSetupJson, "chatId"), msg);
         SerialPrint("<-", F("Telegram"), "chat ID: " + String(jsonReadInt(configSetupJson, "chatId")) + ", msg: " + msg);
     } else {
@@ -93,6 +101,13 @@ void sendTelegramMsg() {
             msg.replace("%weekday%", timeNow->getWeekday());
             msg.replace("%IP%", jsonReadStr(configSetupJson, F("ip")));
             msg.replace("%name%", jsonReadStr(configSetupJson, F("name")));
+            if (msg.indexOf("_") != -1) {
+                ID_name = deleteBeforeDelimiter(msg, "_");
+                ID_name = deleteAfterDelimiter(ID_name, "_");
+                ID_value = getValue(ID_name);
+                msg.replace(ID_name, ID_value);
+            }
+            msg.replace("_", " ");
 
             myBot->sendMessage(jsonReadInt(configSetupJson, "chatId"), msg);
             SerialPrint("<-", F("Telegram"), "chat ID: " + String(jsonReadInt(configSetupJson, "chatId")) + ", msg: " + msg);
@@ -120,7 +135,7 @@ String returnListOfParams() {
         count++;
         if (count > 1) {
             String id = selectFromMarkerToMarker(buf, ";", 2);
-            String value = getValue(id);  //jsonReadStr(configLiveJson , id);
+            String value = getValue(id);  // jsonReadStr(configLiveJson , id);
             String page = selectFromMarkerToMarker(buf, ";", 4);
             page.replace("#", " ");
             String name = selectFromMarkerToMarker(buf, ";", 5);