From 0e6a83089d64e7962ebf33aca517d73917bbab69 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Sun, 26 Mar 2023 21:27:40 +0300
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=BD=D0=BE=D1=81=D0=B8=D0=BC=20?=
 =?UTF-8?q?=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=20=D1=85=D1=83=D0=BA=D0=B0=20onR?=
 =?UTF-8?q?egEvent=20=D0=B2=20=D0=BE=D0=B1=D1=89=D1=83=D1=8E=20=D0=BE?=
 =?UTF-8?q?=D1=87=D0=B5=D1=80=D0=B5=D0=B4=D1=8C=20=D1=80=D0=B0=D0=B7=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=80=D0=BA=D0=B8=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82=D0=B8?=
 =?UTF-8?q?=D0=B9=20=D0=9D=D0=B0=D1=85=D0=BE=D0=B4=D0=B8=D0=BB=D1=81=D1=8F?=
 =?UTF-8?q?=20=D1=80=D0=B0=D0=BD=D0=B5=D0=B5=20=D0=B2=20=D0=BF=D1=80=D1=8F?=
 =?UTF-8?q?=D0=BC=D0=BE=D0=BC=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=D0=B5=20?=
 =?UTF-8?q?=D0=B2=D0=BE=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F=20=D1=80=D0=B5?=
 =?UTF-8?q?=D0=B3=D0=B8=D1=81=D1=82=D1=80=D0=B0=D1=86=D0=B8=D0=B8=20=D1=81?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=8B=D1=82=D0=B8=D1=8F,=20=D1=87=D1=82=D0=BE=20?=
 =?UTF-8?q?=D0=BD=D0=B5=20=D0=B2=D0=B5=D1=80=D0=BD=D0=BE=20=D1=81=20=D1=82?=
 =?UTF-8?q?=D0=BE=D1=87=D0=BA=D0=B8=20=D0=B7=D1=80=D0=B5=D0=BD=D0=B8=D1=8F?=
 =?UTF-8?q?=20=D1=80=D0=B0=D1=81=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=B0=D0=B3=D1=80=D1=83=D0=B7=D0=BA?=
 =?UTF-8?q?=D0=B8=20=D0=B8=20=D0=BD=D0=B5=20=D0=B7=D0=B0=D1=85=D0=B2=D0=B0?=
 =?UTF-8?q?=D1=82=D1=8B=D0=B2=D0=B0=D0=BB=D0=BE=20=D1=81=D0=BE=D0=B1=D1=8B?=
 =?UTF-8?q?=D1=82=D0=B8=D1=8F=20=D0=B8=D0=B7=20=D0=B4=D1=80=D1=83=D0=B3?=
 =?UTF-8?q?=D0=B8=D1=85=20=D0=B8=D1=81=D1=82=D0=BE=D1=87=D0=BD=D0=B8=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=B2,=20=D0=BD=D0=B0=D0=BF=D1=80=D0=B8=D0=BC=D0=B5?=
 =?UTF-8?q?=D1=80,=20MQTT.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/EventsAndOrders.cpp | 8 +++++++-
 src/classes/IoTItem.cpp | 5 -----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/EventsAndOrders.cpp b/src/EventsAndOrders.cpp
index 2af00a66..20416471 100644
--- a/src/EventsAndOrders.cpp
+++ b/src/EventsAndOrders.cpp
@@ -51,10 +51,16 @@ void handleEvent() {
     if (eventBuf.length()) {
         String event = selectToMarker(eventBuf, ",");
         SerialPrint("i", F("EVENT"), event);
+        String enentIdName = selectToMarker(event, " ");
+
+        // распространяем событие через хуки
+        for (std::list<IoTItem*>::iterator it = IoTItems.begin(); it != IoTItems.end(); ++it) {
+            (*it)->onRegEvent(findIoTItem(enentIdName));
+        }
 
         //здесь нужно пропускать данное событие через условия сценариев
         //и если оно есть в условии сценария и совподает
-        iotScen.exec(selectToMarker(event, " "));
+        iotScen.exec(enentIdName);
 
         eventBuf = deleteBeforeDelimiter(eventBuf, ",");
     }
diff --git a/src/classes/IoTItem.cpp b/src/classes/IoTItem.cpp
index bb79c6b5..73918f46 100644
--- a/src/classes/IoTItem.cpp
+++ b/src/classes/IoTItem.cpp
@@ -101,11 +101,6 @@ void IoTItem::regEvent(const String& value, const String& consoleInfo, bool erro
     if (genEvent) {
         generateEvent(_id, value);
 
-        // распространяем событие через хуки
-        for (std::list<IoTItem*>::iterator it = IoTItems.begin(); it != IoTItems.end(); ++it) {
-            (*it)->onRegEvent(this);
-        }
-
         // отправка события другим устройствам в сети если не было ошибки
         if (_global && !error) {
             String json = "{}";