fix(home-assistant): use correct instance status topic for local enti…

…ties
legovaer · May 30, 2021 · 9199fcd · 9199fcd
1 parent b5a7de3
commit 9199fcd
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/integrations/home-assistant/home-assistant.service.ts b/src/integrations/home-assistant/home-assistant.service.ts
@@ -367,12 +367,12 @@ export class HomeAssistantService
 
     config.distributed = entity.distributed;
     config.stateLocked = entity.stateLocked;
-    config.setInstanceStatusTopic(
-      `${INSTANCE_STATUS_BASE_TOPIC}/${
-        this.clusterService.leader()?.id ||
-        this.configService.get('global').instanceName
-      }`
-    );
+
+    const instanceId = makeId(this.configService.get('global').instanceName);
+    const leaderId = entity.distributed
+      ? this.clusterService.leader()?.id
+      : instanceId;
+    config.setInstanceStatusTopic(`${INSTANCE_STATUS_BASE_TOPIC}/${leaderId}`);
 
     return config;
   }