From f10256169beb893495238a2b6abf2cffccaa21a2 Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Wed, 21 Jun 2023 23:28:43 +0200 Subject: [PATCH] Teach homekit about entity registry ids in device triggers (#95009) --- homeassistant/components/homekit/type_triggers.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/homeassistant/components/homekit/type_triggers.py b/homeassistant/components/homekit/type_triggers.py index eb2cd5d34ad..ee737e01ff4 100644 --- a/homeassistant/components/homekit/type_triggers.py +++ b/homeassistant/components/homekit/type_triggers.py @@ -47,10 +47,12 @@ class DeviceTriggerAccessory(HomeAccessory): type_: str = trigger["type"] subtype: str | None = trigger.get("subtype") unique_id = f'{type_}-{subtype or ""}' - if (entity_id := trigger.get("entity_id")) and ( - entry := ent_reg.async_get(entity_id) + entity_id: str | None = None + if (entity_id_or_uuid := trigger.get("entity_id")) and ( + entry := ent_reg.async_get(entity_id_or_uuid) ): unique_id += f"-entity_unique_id:{get_system_unique_id(entry)}" + entity_id = entry.entity_id trigger_name_parts = [] if entity_id and (state := self.hass.states.get(entity_id)): trigger_name_parts.append(state.name)