From 9cbaac063350f18402b56e5ab38cc05a0ca03617 Mon Sep 17 00:00:00 2001
From: martino <32328813+f3rs3n@users.noreply.github.com>
Date: Wed, 15 Jul 2026 22:18:43 +0200
Subject: [PATCH] fix: resolve timer targets for service events

---
 .../blueprint-alarmsreminderstimers.yaml      | 19 +++++++++++++++----
 .../sentences/alarms-reminders-timers.md      |  1 +
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/View_Assist_custom_sentences/Alarms_Reminders_Timers/blueprint-alarmsreminderstimers.yaml b/View_Assist_custom_sentences/Alarms_Reminders_Timers/blueprint-alarmsreminderstimers.yaml
index ed7ae52d..6104e16a 100644
--- a/View_Assist_custom_sentences/Alarms_Reminders_Timers/blueprint-alarmsreminderstimers.yaml
+++ b/View_Assist_custom_sentences/Alarms_Reminders_Timers/blueprint-alarmsreminderstimers.yaml
@@ -2,7 +2,7 @@ blueprint:
   name: View Assist - Alarms Reminders Timers
   description:
     Ask Assist to set an alarm, reminder, or timer  (View Assist alarmsreminderstimers
-    v 1.3.2)
+    v 1.3.3)
   domain: automation
   input:
     spokenlanguage:
@@ -207,9 +207,20 @@ trigger:
 condition: []
 action:
   - variables:
-      target_satellite_device:
-        "{{ view_assist_entity(trigger.device_id) if trigger.platform
-        == 'conversation' else trigger.event.data.entity_id }}"
+      target_satellite_device: >-
+        {% if trigger.platform == 'conversation' %}
+          {{ view_assist_entity(trigger.device_id) }}
+        {% else %}
+          {% set event_data = trigger.event.data if trigger.event is defined else {} %}
+          {% set service_data = event_data.get('service_data', {}) %}
+          {% if service_data.get('device_id') %}
+            {{ view_assist_entity(service_data.get('device_id')) }}
+          {% elif event_data.get('entity_id') %}
+            {{ event_data.get('entity_id') }}
+          {% else %}
+            {{ '' }}
+          {% endif %}
+        {% endif %}
       target_mediaplayer_device: "{{ state_attr(target_satellite_device, 'mediaplayer_device')}}"
       target_satellite_device_type: "{{ state_attr(target_satellite_device, 'type')}}"
       spokenlanguage: !input spokenlanguage
diff --git a/wiki/docs/extend-functionality/sentences/alarms-reminders-timers.md b/wiki/docs/extend-functionality/sentences/alarms-reminders-timers.md
index 4eadc090..61f6f29a 100644
--- a/wiki/docs/extend-functionality/sentences/alarms-reminders-timers.md
+++ b/wiki/docs/extend-functionality/sentences/alarms-reminders-timers.md
@@ -40,6 +40,7 @@ Use your wakeword and say things like:
 
 | Version | Description                        |
 | ------- | ---------------------------------- |
+| v 1.3.3 | Fix target resolution for service events |
 | v 1.3.2 | Add Italian translation            |
 | v 1.3.1 | Add lots of translations           |
 | v 1.3.0 | Major update to most functions     |