From 68d577851370ed672dbea3d5fdd21481e4ca46c8 Mon Sep 17 00:00:00 2001
From: Jeffrey Stone <thejeffreystone@gmail.com>
Date: Thu, 3 Dec 2020 00:11:42 -0500
Subject: [PATCH] Fixing some typos....

---
 config/packages/announcements.yaml | 41 +++++++++++-------------------
 config/packages/appliances.yaml    |  4 +--
 config/packages/jarvis.yaml        | 19 +++-----------
 3 files changed, 20 insertions(+), 44 deletions(-)

diff --git a/config/packages/announcements.yaml b/config/packages/announcements.yaml
index a262f2c..17be174 100755
--- a/config/packages/announcements.yaml
+++ b/config/packages/announcements.yaml
@@ -163,20 +163,12 @@ automation:
     action:
     - service: scene.turn_on
       entity_id: scene.skylar_room_morning
-    - service: script.skylar_morning_briefing
-    # - service: notify.alexa_media_skylar_s_bedroom
-    #   data:
-    #     message: Good Morning Skylar. Time to Rise and Shine. 
-    #     data:
-    #       type: tts
-    # - delay:
-    #     seconds: 30
-    # - service: notify.alexa_media_skylar_s_bedroom
-    #   data:
-    #     message: Good Morning Skylar. You have school today. Time to get up. 
-    #     data:
-    #       type: tts
-
+    - service: >
+        {%- if is_state('binary_sensor.theater_occupancy', 'on') and is_state('media_player.theater_tv', 'on') %}
+          script.skylar_morning_briefing_jarvis
+        {% else %}
+          script.skylar_morning_briefing_alexa
+        {%- endif %}
   
   - id: set_skylar_morning_report_time
     alias: set skylar morning report time
@@ -232,23 +224,20 @@ script:
         who: kitchen
         message: !include ../templates/speech/event_briefing.yaml
 
-  skylar_morning_briefing:
+  skylar_morning_briefing_jarvis:
     sequence:
-    - service: >
-        {%- if is_state('binary_sensor.theater_occupancy', 'on') and is_state('media_player.theater_tv', 'on') %}
-          script.jarvis_voice
-        {% else %}
-          notify.alexa_media_skylar_s_bedroom
-        {%- endif %}
-      data: >
-        {%- if is_state('binary_sensor.theater_occupancy', 'on') and is_state('media_player.theater_tv', 'on') %}
+    - service: script.jarvis_voice
+      data: 
           who: main
           message: !include ../templates/speech/skylar_morning_briefing.yaml
-        {% else %}
-          message: !include ../templates/speech/skylar_morning_briefing.yaml 
+
+  skylar_morning_briefing_alexa:
+    sequence:
+    - service: notify.alexa_media_skylar_s_bedroom
+      data: 
+          message: !include ../templates/speech/skylar_morning_briefing.yaml
           data:
             type: tts
-        {%- endif %}
 
   skylar_nightly_briefing:
     sequence:
diff --git a/config/packages/appliances.yaml b/config/packages/appliances.yaml
index c5e75a5..89b7a01 100755
--- a/config/packages/appliances.yaml
+++ b/config/packages/appliances.yaml
@@ -159,8 +159,8 @@ script:
             'I am sure you have more inportant things to do, but do not forget to empty the washer.',
             'Looks like the washing machine has completed it is cycle. You know what to do. <break time="1s"/> I hope.',
             'Do not forget to move the clothes to the dryer.',
-            "Someone forgot to move the clothes to the dryer. I am not going to name any names. But there is a camera in there. ",
-            "Do you like when your clothes smell like mildew? Because that is what is happeneing. <break time="1s"/> Right now. "
+            'Someone forgot to move the clothes to the dryer. I am not going to name any names. But there is a camera in there. ',
+            'Do you like when your clothes smell like mildew? Because that is what is happeneing. <break time="1s"/> Right now. '
             ] | random }}
           </p>
     
diff --git a/config/packages/jarvis.yaml b/config/packages/jarvis.yaml
index eae3aa6..ff816f3 100755
--- a/config/packages/jarvis.yaml
+++ b/config/packages/jarvis.yaml
@@ -23,14 +23,7 @@ automation:
     - service: script.jarvis_voice
       data_template:
         who: '{{ states.sensor.room_audio.state }}'
-        message: >
-        <p>
-          {{ [
-            'Anchorage House has been configured for a House Party.',
-            'Incense has been turned on.',
-            'I have enabled house party protocol.'
-            ] | random }}
-        </p>
+        message: Incense has been turned on.
   
   - id: house_party_protocol_off
     alias: Turn Off House Party Protocol
@@ -45,11 +38,5 @@ automation:
     - service: script.jarvis_voice
       data_template:
         who: '{{ states.sensor.room_audio.state }}'
-        message: >
-        <p>
-          {{ [
-            'The House Party has been canceled.',
-            'Incense has been turned off.',
-            'I have disabled house party protocol.'
-            ] | random }}
-        </p>
+        message: Incense has been turned off.
+