From 7c3dc076d20b9ef6482c070d5789c7d239d4c16c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Wed, 19 Oct 2022 10:54:56 +0200 Subject: [PATCH 1/4] only convert and send JSON topics with type 'sendtext' --- src/mqtt/MQTT.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp index 095bcbf14..195db5efd 100644 --- a/src/mqtt/MQTT.cpp +++ b/src/mqtt/MQTT.cpp @@ -39,7 +39,7 @@ void MQTT::onPublish(char *topic, byte *payload, unsigned int length) if (err.empty()) { DEBUG_MSG("JSON Received on MQTT, parsing..\n"); // check if it is a valid envelope - if (json.object_items().count("sender") != 0 && json.object_items().count("payload") != 0) { + if (json.object_items().count("sender") != 0 && json.object_items().count("payload") != 0 && json["type"] == "sendtext") { // this is a valid envelope if (json["sender"].string_value().compare(owner.id) != 0) { std::string jsonPayloadStr = json["payload"].dump(); From c97831963bb344efe5df876e9789fce53edaa008 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Wed, 19 Oct 2022 10:58:46 +0200 Subject: [PATCH 2/4] just for good measure, correct json type field --- src/mqtt/MQTT.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp index 195db5efd..a44774379 100644 --- a/src/mqtt/MQTT.cpp +++ b/src/mqtt/MQTT.cpp @@ -42,6 +42,7 @@ void MQTT::onPublish(char *topic, byte *payload, unsigned int length) if (json.object_items().count("sender") != 0 && json.object_items().count("payload") != 0 && json["type"] == "sendtext") { // this is a valid envelope if (json["sender"].string_value().compare(owner.id) != 0) { + json["type"] = "text"; std::string jsonPayloadStr = json["payload"].dump(); DEBUG_MSG("JSON payload %s, length %u\n", jsonPayloadStr.c_str(), jsonPayloadStr.length()); From 18ccb388244aa39feab435cf6abc64a97b1ecab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Wed, 19 Oct 2022 11:01:23 +0200 Subject: [PATCH 3/4] Update MQTT.cpp --- src/mqtt/MQTT.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp index a44774379..195db5efd 100644 --- a/src/mqtt/MQTT.cpp +++ b/src/mqtt/MQTT.cpp @@ -42,7 +42,6 @@ void MQTT::onPublish(char *topic, byte *payload, unsigned int length) if (json.object_items().count("sender") != 0 && json.object_items().count("payload") != 0 && json["type"] == "sendtext") { // this is a valid envelope if (json["sender"].string_value().compare(owner.id) != 0) { - json["type"] = "text"; std::string jsonPayloadStr = json["payload"].dump(); DEBUG_MSG("JSON payload %s, length %u\n", jsonPayloadStr.c_str(), jsonPayloadStr.length()); From 075a53ced075fa38c7c2eef7ef31e5e5495460f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20G=C3=B6ttgens?= Date: Wed, 19 Oct 2022 11:04:13 +0200 Subject: [PATCH 4/4] Update MQTT.cpp --- src/mqtt/MQTT.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mqtt/MQTT.cpp b/src/mqtt/MQTT.cpp index 195db5efd..7deba4668 100644 --- a/src/mqtt/MQTT.cpp +++ b/src/mqtt/MQTT.cpp @@ -39,7 +39,7 @@ void MQTT::onPublish(char *topic, byte *payload, unsigned int length) if (err.empty()) { DEBUG_MSG("JSON Received on MQTT, parsing..\n"); // check if it is a valid envelope - if (json.object_items().count("sender") != 0 && json.object_items().count("payload") != 0 && json["type"] == "sendtext") { + if (json.object_items().count("sender") != 0 && json.object_items().count("payload") != 0 && json["type"].string_value().compare("sendtext") == 0) { // this is a valid envelope if (json["sender"].string_value().compare(owner.id) != 0) { std::string jsonPayloadStr = json["payload"].dump();