Home Assistant: separate discovered name by space instead of _ when friendly_name has no _. #5226

lib/extension/homeassistant.js

@@ -662,12 +662,12 @@ class HomeAssistant extends Extension {
             payload.json_attributes_topic = stateTopic;
 
             // Set (unique) name, separate by space if friendlyName contains space.
-            const nameSeparator = friendlyName.includes(' ') ? ' ' : '_';
+            const nameSeparator = friendlyName.includes('_') ? '_' : ' ';
             payload.name = friendlyName;
             if (config.object_id.startsWith(config.type) && config.object_id.includes('_')) {
                 payload.name += `${nameSeparator}${config.object_id.split(/_(.+)/)[1]}`;
             } else if (!config.object_id.startsWith(config.type)) {
-                payload.name += `${nameSeparator}${config.object_id}`;
+                payload.name += `${nameSeparator}${config.object_id.replace(/_/g, nameSeparator)}`;
             }
 
             // Set unique_id

test/homeassistant.test.js

@@ -1063,7 +1063,7 @@ describe('HomeAssistant extension', () => {
             "value_template":"{{ value_json.update_available}}",
             "state_topic":"zigbee2mqtt/bulb",
             "json_attributes_topic":"zigbee2mqtt/bulb",
-            "name":"bulb_update_available",
+            "name":"bulb update available",
             "unique_id":"0x000b57fffec6a5b2_update_available_zigbee2mqtt",
             "device":{
                 "identifiers":[