From 2134966f6e4a01dcb45039c1cdbbcd0c8df6cf35 Mon Sep 17 00:00:00 2001 From: Koen Kanters Date: Tue, 8 Dec 2020 19:41:34 +0100 Subject: [PATCH] Home Assistant: separate discovered name by space instead of _ when friendly_name has no _. #5226 --- lib/extension/homeassistant.js | 4 ++-- test/homeassistant.test.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js index d52613cc5..feafc1458 100644 --- a/lib/extension/homeassistant.js +++ b/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 diff --git a/test/homeassistant.test.js b/test/homeassistant.test.js index 3e90c7902..709af87c7 100644 --- a/test/homeassistant.test.js +++ b/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":[