From bc7a4362410a48c4a96b39a333a16cb90bf7aff8 Mon Sep 17 00:00:00 2001
From: Marco Massarotto <massa84@gmail.com>
Date: Thu, 8 Oct 2020 18:38:25 +0100
Subject: [PATCH] allow to redefine homeassistant autodiscovery entity "type"
 and "object_id" (#4593)

* Add link for creating frontend issues. #4568

* allow to redefine entity type and object_id in homeassistant autodiscovery

Co-authored-by: Koen Kanters <koenkanters94@gmail.com>
---
 lib/extension/homeassistant.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index c608d764b..95b5d91af 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -1675,7 +1675,6 @@ class HomeAssistant extends Extension {
 
         const friendlyName = resolvedEntity.settings.friendlyName;
         this.getConfigs(resolvedEntity).forEach((config) => {
-            const topic = this.getDiscoveryTopic(config, device);
             const payload = {...config.discovery_payload};
             let stateTopic = `${settings.get().mqtt.base_topic}/${friendlyName}`;
             if (payload.state_topic_postfix) {
@@ -1842,6 +1841,7 @@ class HomeAssistant extends Extension {
                 }
             }
 
+            const topic = this.getDiscoveryTopic(config, device);
             this.mqtt.publish(topic, stringify(payload), {retain: true, qos: 0}, this.discoveryTopic);
         });