From 6ae001232d979dfcf6a8723d5e7a82ffd4811d62 Mon Sep 17 00:00:00 2001
From: Dmitry Borisenko <49808844+DmitryBorisenko33@users.noreply.github.com>
Date: Sun, 3 Jan 2021 02:14:12 +0100
Subject: [PATCH] telegram

---
 data/config.json              |   1 +
 data/set.telegram.json.gz     | Bin 857 -> 907 bytes
 data_ungzip/set.telegram.json |  10 ++++++++++
 src/FileSystem.cpp            |   2 +-
 src/Telegram.cpp              |   7 +++++--
 src/Web.cpp                   |   6 ++++++
 src/items/vLogging.cpp        |   6 +++---
 7 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/data/config.json b/data/config.json
index 1e32fc2a..139fc773 100644
--- a/data/config.json
+++ b/data/config.json
@@ -21,6 +21,7 @@
     "telegramApi": "1416711569:AAEI0j83GmXqwzb_gnK1B0Am0gDwZoJt5xo",
     "telegonof": "0",
     "teleginput": "0",
+    "autos": "1",
     "weblogin": "admin",
     "webpass": "admin",
     "MqttIn": "0",
diff --git a/data/set.telegram.json.gz b/data/set.telegram.json.gz
index 8386cf0920a5893d9689e849e263f2c930853178..e8810e9b6b47105c6d1a6e5b6fae0e90e9459881 100644
GIT binary patch
literal 907
zcmV;619bc!iwFpg5Ak0F0CQz@E_7vVWoL3>Z7ynaZ*Bm!R_{*RFcAMfiFdF-8(#?j
znWh$)*w7?COhVhfRsG;LZt69)v&3OVs1i^iG!2buFTg7lwu%B>_X_qK?d&v7Cnamq
zn4&cHoqcz|-<{7rn0kcJbeXdXb%N;}D(E>#79!DnKt$-xzYjQ@o{Lp3W{&xp_rpk~
zHO0Bel#2r}q;0xZP`7xc0yeBAG?*_fno-@3HOuk*nHjiFtXPTXPr>ydN<o-NqBOyq
zn8dzEwA1PutQ`ueaE<iffZ;l6HWOVECU%K0ESpqt=!)q`-<->`?^0Gv_wXVVuQ6r2
z*!j~DE(^+;UbB$qz9ble*DATZT+^e8L#g^>mz1ldTr2U$h+`nas049|!x^unp^@L@
zt-MoT)T!*MV|9kqvFyk@c)zPd*_OR@e2}!~L%SP=!f;$Hj%)}776Z<P3!2TbSRMc_
zWnL&I!Yh9P&Mx5XA$g@vWMBSJ=jsz^Pmns2eRwWm+L1qD)lD`ViCdr}nPl;itoZMQ
z;85@&m5Z-{_!t28WE;L+;G_ePZ)F$BOPzf~P`Qc)+Sx_`|N7r3GJya)=9@)~Q9cYO
z)zviA?=<s1uE)T}n#ruC6t1<+9oxdbla4OZPXh1nv2X3}Ai-;djWu+i=*7VNmPfN8
zj4YY}M=2D7v&=sF7Vl;CP;;mfU-79*!YdY^M0A2G8bs3j_1;m8`%z>csV%CxrNza^
zd7B2Fi}!Ps!F52!qMe{91!<(FW8J2E$b_&lTL&DJS%P~Ih1bXr<|PhX)+5pE=6VJ0
zNPTZ|e`B`f;&KgSUTmVoeVh0>wB$8Vz+GyineCVQ$)iYR`PimmkV7k817xt>@p;H>
zOIw7EGq2Y4lSdx5ZOR-l75SAHvagQx6@lQux787Ji9=`sH>PpKIfA|_J0S1KYuVO!
ziE6<JS}tr;tz?rP$t&4M>QuKP-FQBmRwH}5q39QOokQa>ds<+&3%<J`fZn6Ws<po0
zZLTk9I^Y8|ZjMdD1bM2iq#O{RKvhOXlvX$%52!BRT!l7>o!9wWgCcTCMVLWUSgVU8
zIW;<K*@$#$SlFcw%asZI|MBx_rCg=9J;AxpK6vsXJu~VoH8a`$+$SI2XhMc73_%`e
hf$>u)jL<dlv4sDcWSAZODNa3V{sxaf)!MrX001u7!iN9=

literal 857
zcmV-f1E%~RiwFo7Zqr``0CQz@E_7vVWoL3>Z7ynaZ*BmsR^4jbFciKY^c_UX)|<LX
z`ZGq7c62L)UJS~%yO0YdR%|Vf<k@nUQUYy5DPv`Yy+B`~>lT)-UG@sn8|}!B;|%P@
zg<>2ZopW^l^(lu7j}R)fIBQeOFH}%nuYpsHSSvmefxGhF=d7?CiyX|X@MpyfB9WFf
zmLpRR_Q8<0=@@?3;O#cpFv@7ME|)^8YsQk*c>OFS94i*A#p|cwdJ?4|Oe9f;!G|%4
z1D9y0_6F!qnN&C-_wbP6F6s9ZSrR68h$jq_v~l2wLL~1mXW4fs>!f>l5s25AvOR45
z>j<|5<xJ}o)7&=&L+~0+hqpSK${mXB%~fgHq}6Hi-i%`?L?{x(Ar@!6otBOKDu2ma
z^+lb@kvdW5NS(-`yoL9>I+9oNE<HbJ+ViR1&3b)GHySe=e1XNJW>bZJe{L=hkS=9z
zAadm^|3IE2$oCG(YjrBe@`t)mpFnzw)Uh1H^9`0m`5Uxuva6A}g>oc|ta>CG4^t3(
zJuTaJ+KY#~sAXe;c6a8Q$*fySp|#Cj)4-mUo?;}=livSh-`?9rf_Dg;Yv?}Fi;4Md
zmu9Chqm(0$W*`J-nV9hw?`PpfI6#T7c!HAf8jUAWIYAT=5%+#LGn?Z<6xl~=3cFG+
zl^$13>bnj;s89ybN9JamV<-jbrM9DH(tQ+$u({NQJSZ~+cOeS5SDmbz9BSE(SW8>A
zHrxmLj^N(rQq#e$4)EOAM3Z|a@hYh7_K?pVYNExRm-?xqNMv}}q=8>SYi<vCu-)=_
zz)VA1gpG@@HuO_PE;dcdEHD-Mm6vj?jx`)2IR97b7$D;a5a9+uWQ5`#0fxvS@Q3oJ
zywbR-20#J4z&15VHfc&;%P~@C>I6OjET54af$p8g7yZJn3&5dp&j8Gh!1o9k07aTs
zgIdwusuguP-~(mcn%jgNeX`e54v0r!Dx)Dv8yuJWRF7|^O?$+w>i%uO5ILkRLLwTh
z_0mjFLz%G}vh-*e*r67yv<TewUNvo$ZEBi1&VBa5lb7k8QRk_h$%c22e0ZY^GSvtR
j<Z|YRe(Lp^a^*gj@V|;oyQ4pig-89rG`u5OrwIT6+3KQV

diff --git a/data_ungzip/set.telegram.json b/data_ungzip/set.telegram.json
index a0857838..7b07378c 100644
--- a/data_ungzip/set.telegram.json
+++ b/data_ungzip/set.telegram.json
@@ -39,6 +39,16 @@
     {
       "type": "hr"
     },
+    {
+      "type": "checkbox",
+      "name": "autos",
+      "title": "Автоматически брать chat ID из входящих сообщений",
+      "action": "/set?autos=[[autos]]",
+      "state": "{{autos}}"
+    },
+    {
+      "type": "hr"
+    },
     {
       "type": "h4",
       "title": "Telegram chat ID"
diff --git a/src/FileSystem.cpp b/src/FileSystem.cpp
index a73e6657..4db0d187 100644
--- a/src/FileSystem.cpp
+++ b/src/FileSystem.cpp
@@ -10,7 +10,7 @@ bool getInfo(FSInfo& info) {
 void getFSInfo() {
     FSInfo buf;
     if (getInfo(buf)) {
-        SerialPrint("I", F("FS"), F("Get FS info completed"));
+        //SerialPrint("I", F("FS"), F("Get FS info completed"));
 
         size_t totalBytes = buf.totalBytes;      // всего
         size_t usedBytes = buf.usedBytes;        // использовано
diff --git a/src/Telegram.cpp b/src/Telegram.cpp
index 49b45e7d..3e069988 100644
--- a/src/Telegram.cpp
+++ b/src/Telegram.cpp
@@ -35,8 +35,10 @@ void handleTelegram() {
                     prevMillis = millis();
                     if (myBot->getNewMessage(msg)) {
                         SerialPrint("->", "Telegram", "chat ID: " + String(msg.sender.id) + ", msg: " + String(msg.text));
-                        jsonWriteInt(configSetupJson, "chatId", msg.sender.id);
-                        saveConfig();
+                        if (jsonReadBool(configSetupJson, "autos")) {
+                            jsonWriteInt(configSetupJson, "chatId", msg.sender.id);
+                            saveConfig();
+                        }
                         telegramMsgParse(String(msg.text));
                     }
                 }
@@ -61,6 +63,7 @@ void telegramMsgParse(String msg) {
         myBot->sendMessage(jsonReadInt(configSetupJson, "chatId"), list);
         SerialPrint("<-", "Telegram", "chat ID: " + String(jsonReadInt(configSetupJson, "chatId")) + "\n" + list);
     } else {
+        myBot->sendMessage(jsonReadInt(configSetupJson, "chatId"), "ID: " + chipId + ", Name: " + jsonReadStr(configSetupJson, F("name")));
         myBot->sendMessage(jsonReadInt(configSetupJson, "chatId"), F("Wrong order, use /all to get all values, /get_id to get value, or /set_id_value to set value"));
     }
 }
diff --git a/src/Web.cpp b/src/Web.cpp
index a1ed35ea..50343648 100644
--- a/src/Web.cpp
+++ b/src/Web.cpp
@@ -255,6 +255,12 @@ void web_init() {
             saveConfig();
             request->send(200);
         }
+        if (request->hasArg("autos")) {
+            bool value = request->getParam("autos")->value().toInt();
+            jsonWriteBool(configSetupJson, "autos", value);
+            saveConfig();
+            request->send(200);
+        }
         if (request->hasArg("chatId")) {
             jsonWriteStr(configSetupJson, "chatId", request->getParam("chatId")->value());
             saveConfig();
diff --git a/src/items/vLogging.cpp b/src/items/vLogging.cpp
index 51f8a3f7..9edf1710 100644
--- a/src/items/vLogging.cpp
+++ b/src/items/vLogging.cpp
@@ -62,15 +62,15 @@ void LoggingClass::execute(String keyOrValue) {
     }
 
     if (loggingValue != "") {
-        if (cnt >= _maxPoints) {                          //удаляем старую строку и добавляем новую
+        if (cnt >= _maxPoints) {                         //удаляем старую строку и добавляем новую
             String logData = readFile(filename, 20480);  //10240
             SerialPrint("I", "Logging", "Free heap " + String(ESP.getFreeHeap()));
             if (logData == "large") {
                 SerialPrint("E", "Logging", "File is very large");
             }
-            //for (int i = 0; i < 5; i++) {
+
             logData = deleteBeforeDelimiter(logData, "\r\n");
-            //}
+
             if (timeNow->hasTimeSynced()) {
                 logData += timeNow->getTimeUnix() + " " + loggingValue + "\r\n";