From d77428db54b129b6cafef65e1e6691909d03c640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Szczodrzy=C5=84ski?= <kuba@szczodrzynski.pl>
Date: Sat, 10 Feb 2024 23:58:37 +0100
Subject: [PATCH] Allow publishing MQTT message even with action tag

---
 src/hasp/hasp_event.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/hasp/hasp_event.cpp b/src/hasp/hasp_event.cpp
index 9a5cc2bf..4f06e517 100644
--- a/src/hasp/hasp_event.cpp
+++ b/src/hasp/hasp_event.cpp
@@ -52,13 +52,14 @@ static bool script_event_handler(const char* eventname, const char* action, cons
     StaticJsonDocument<64> filter;
 
     filter[eventname]              = true;
+    filter["pub"]                  = true;
     DeserializationError jsonError = deserializeJson(doc, action, DeserializationOption::Filter(filter));
 
     if(!jsonError) {
         JsonVariant json = doc[eventname].as<JsonVariant>();
         if(json.isNull()) {
             LOG_DEBUG(TAG_EVENT, F("Skipping event: name=%s, data=%s"), eventname, data);
-            return true;
+            goto end;
         } else {
             LOG_DEBUG(TAG_EVENT, F("Handling event: name=%s, data=%s"), eventname, data);
         }
@@ -82,6 +83,9 @@ static bool script_event_handler(const char* eventname, const char* action, cons
     } else {
         dispatch_json_error(TAG_EVENT, jsonError);
     }
+
+end:
+    if(doc["pub"].is<bool>()) return !doc["pub"].as<bool>();
     return true;
 }