Replace {identifier} with {hostname}

mcspr · May 27, 2018 · 65481c2 · 65481c2
1 parent f37b15c
commit 65481c2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/code/espurna/migrate.ino b/code/espurna/migrate.ino
@@ -1001,6 +1001,15 @@ void migrate() {
 
     }
 
+    #if MQTT_SUPPORT
+        // Deprecated MQTT substitution
+        String mqttTopic = getSetting("mqttTopic", MQTT_TOPIC);
+        if (mqttTopic.indexOf("{identifier}") > 0) {
+            mqttTopic.replace("{identifier}", "{hostname}");
+            setSetting("mqttTopic", mqttTopic);
+        }
+    #endif
+
     saveSettings();
 
 }
diff --git a/code/espurna/mqtt.ino b/code/espurna/mqtt.ino
@@ -218,7 +218,6 @@ void _mqttConfigure() {
     if (_mqtt_topic.endsWith("/")) _mqtt_topic.remove(_mqtt_topic.length()-1);
 
     // Placeholders
-    _mqtt_topic.replace("{identifier}", getSetting("hostname"));
     _mqtt_topic.replace("{hostname}", getSetting("hostname"));
     _mqtt_topic.replace("{magnitude}", "#");
     if (_mqtt_topic.indexOf("#") == -1) _mqtt_topic = _mqtt_topic + "/#";