From 1b2ce1e097fe48ea1d9076caf641d82eaea66836 Mon Sep 17 00:00:00 2001
From: Tony Stork <tm24fan8@gmail.com>
Date: Thu, 14 Nov 2024 16:40:46 -0500
Subject: [PATCH] Add individual allow switches for housewide briefings

---
 automations.yaml            | 51 ++++++++++++++++++++++---------------
 packages/announcements.yaml |  9 +++++++
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/automations.yaml b/automations.yaml
index bae2a45..cbe2d6f 100644
--- a/automations.yaml
+++ b/automations.yaml
@@ -2893,36 +2893,39 @@
 - id: '1696362054868'
   alias: House Briefings
   description: ''
-  trigger:
-  - platform: time
-    at: input_datetime.morning_briefing
+  triggers:
+  - at: input_datetime.morning_briefing
     id: house-morning
     alias: Morning Briefing Time
-  - platform: time
-    at: input_datetime.daily_briefing
+    trigger: time
+  - at: input_datetime.daily_briefing
     id: house-daily
     alias: Daily Briefing Time
-  - platform: time
-    at: input_datetime.nightly_briefing
+    trigger: time
+  - at: input_datetime.nightly_briefing
     id: house-nightly
     alias: Nightly Briefing Time
-  condition:
+    trigger: time
+  conditions:
   - condition: state
     entity_id: input_boolean.vacation_mode
     state: 'off'
     alias: We are not on vacation
-  action:
+  actions:
   - alias: Choose briefing
     choose:
     - conditions:
-      - condition: and
+      - alias: Morning Briefing
+        condition: and
         conditions:
         - condition: trigger
           id: house-morning
+        - condition: state
+          entity_id: input_boolean.morning_briefing_allowed
+          state: 'on'
         - condition: state
           entity_id: input_boolean.good_morning
           state: 'off'
-        alias: Morning Briefing
       sequence:
       - alias: Skip if Kallen has school but stayed overnight elsewhere
         if:
@@ -2932,47 +2935,53 @@
             %}\n  true\n{% endif %}\n"
           alias: If Kallen was not elsewhere overnight on a school morning
         then:
-        - service: script.morning_briefing
-          data:
+        - data:
             who: '{{ ''alexa_everywhere'' if is_state(''binary_sensor.master_bedroom_occupied'',''on'')
               else ''common'' }}
 
               '
           alias: Run morning briefing script
+          action: script.morning_briefing
     - conditions:
-      - condition: and
+      - alias: Daily Briefing
+        condition: and
         conditions:
         - condition: trigger
           id: house-daily
+        - condition: state
+          entity_id: input_boolean.daily_briefing_allowed
+          state: 'on'
         - condition: state
           entity_id: input_boolean.daily_briefing
           state: 'off'
-        alias: Daily Briefing
       sequence:
-      - service: script.daily_briefing
-        data:
+      - data:
           who: '{{ ''alexa_everywhere'' if is_state(''binary_sensor.master_bedroom_occupied'',''on'')
             else ''common'' }}
 
             '
         alias: Run daily briefing script
+        action: script.daily_briefing
     - conditions:
-      - condition: and
+      - alias: Nightly Briefing
+        condition: and
         conditions:
         - condition: trigger
           id: house-nightly
+        - condition: state
+          entity_id: input_boolean.nightly_briefing_allowed
+          state: 'on'
         - condition: state
           entity_id: input_boolean.nightly_briefing
           state: 'off'
-        alias: Nightly Briefing
       sequence:
-      - service: script.nightly_briefing
-        data:
+      - data:
           who: '{{ ''alexa_everywhere'' if is_state(''binary_sensor.master_bedroom_occupied'',''on'')
             else ''common'' }}
 
             '
         alias: Run nightly briefing script
+        action: script.nightly_briefing
   mode: single
 - id: '1696362140540'
   alias: Kallen Briefing Location Change
diff --git a/packages/announcements.yaml b/packages/announcements.yaml
index fb781d7..538938f 100644
--- a/packages/announcements.yaml
+++ b/packages/announcements.yaml
@@ -103,6 +103,15 @@ input_boolean:
   sun_reports:
     name: Sun Reports
     icon: mdi:weather-sunny-alert
+  morning_briefing_allowed:
+    name: Morning Briefing Allowed
+    icon: mdi:bullhorn
+  daily_briefing_allowed:
+    name: Daily Briefing Allowed
+    icon: mdi:bullhorn
+  nightly_briefing_allowed:
+    name: Nightly Briefing Allowed
+    icon: mdi:bullhorn
 
 intent_script:
   PlayAnnouncement: