From 11a81daf49eeae54a7c202104681f8a65c4086e2 Mon Sep 17 00:00:00 2001 From: Jeffrey Stone Date: Mon, 11 Nov 2019 22:10:04 -0500 Subject: [PATCH] Ok, now added words, school holiday, and some weekly events --- config/packages/notify.yaml | 56 ++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 23 deletions(-) diff --git a/config/packages/notify.yaml b/config/packages/notify.yaml index 1007191..385542a 100755 --- a/config/packages/notify.yaml +++ b/config/packages/notify.yaml @@ -197,7 +197,6 @@ script: {% endif %} message: >- - {{ message }} cache: true @@ -347,6 +346,8 @@ script: ] | random }} {% endmacro %} + + {% macro morning_greeting() %} {{ [ "Time to Rise and Shine. ", "Let's do this thing.", @@ -411,7 +412,7 @@ script: {% if is_state("sensor.halloween_countdown","0") %} Happy Halloween! {% endif %} - {% if is_state("sensor.holiday_christmas","0") %} + {% if is_state("sensor.christmas_down","0") %} Merry Christmas Everyone! {% endif %} {% if is_state("sensor.anniversary_our_wedding","0") %} @@ -488,13 +489,13 @@ script: {% endmacro %} {% macro upcoming_holidays() %} - {% if states.sensor.holiday_halloween.state | int == 1 %} + {% if states.sensor.halloween_countdown.state | int == 1 %} Tomorrow is Halloween. I hope you have picked out a costume. {{ [ "I will be going as a dumb home. ", "I have prepped the scary music. Just in case.", "I will be going as HAL 9000. The Pod Bay Doors are being installed today." ] | random }} - {% elif states.sensor.holiday_halloween.state | int < 30 %} + {% elif states.sensor.halloween_countdown.state | int < 30 %} There are only {{states.sensor.holiday_halloween.state}} days {{ [ "until Halloween.", "until Halloween. It might not be enough time. ", @@ -505,10 +506,15 @@ script: {% else %} {% endif %} - {% if states.sensor.holiday_christmas.state | int == 1 %} + {% if states.sensor.christmas_countdown.state | int == 1 %} Tomorrow is Christmas. It's practically here! Santa is coming tonight! Don't forget the cookies! - {% elif states.sensor.holiday_christmas.state | int < 25 %} - There are only {{states.sensor.holiday_christmas.state}} days until christmas. + {% elif states.sensor.christmas_countdown.state | int < 31 %} + There are only {{states.sensor.holiday_christmas.state}} days until christmas. + {{ [ "All I want is a hippopatamus.", + "Hey Skylar, I know what you are getting. But I am not telling.", + "Don't forget to get something for your favorite smarthome.", + "It is starting to smell like Christmas." + ] | random }} {% else %} {% endif %} {% endmacro %} @@ -530,11 +536,8 @@ script: Skylar, {{ [ "It is time to get in the bath. ", "You only have thirty minutes until bedtime. That means you should be heading for the bathtub.", - "I cannot communicate with the bathtub, otherwise, I would have started the water for you already. So you will have to start the bath yourself. ", + "I cannot comminicate with the bathtub, otherwise, I would have started the water for you already. So you will have to start the bath yourself. ", "My sensors are detecting a strange smell. I am running diagnostics, but in the mean time why don't you start a bath.", - "It is time to start the pre bed routine.", - "It is bathtime.", - "Even Jedi have to take a bath." ] | random }} If you go now there may be time for stories. Don't forget to brush your teeth. {% if is_state("sensor.weekday", "fri") %} @@ -545,6 +548,7 @@ script: {% endif %} {% endmacro %} + {% macro school_today() %} {% if states.calendar.skylar_school.attributes.offset_reached == True %} Because you have school today! @@ -552,16 +556,16 @@ script: And guess what? It is early release! {% endif %} {% if states.calendar.skylar_school.attributes.description == "start_thanksgiving_break" %} - Also, tomorrow is the first day of Thanksgiving Break! + And One More Thing. Tomorrow is the first day of Thanksgiving Break. {% endif %} {% if states.calendar.skylar_school.attributes.description == "start_winter_break" %} - Also, tomorrow is the first day of Winter Break! + And One More Thing. Tomorrow is the first day of Winter Break. {% endif %} {% if states.calendar.skylar_school.attributes.description == "start_spring_break" %} - Also, tomorrow is the first day of Spring Break! + And One More Thing. Tomorrow is the first day of Spring Break. {% endif %} {% if states.calendar.skylar_school.attributes.description == "start_fall_break" %} - Also, tomorrow is the first day of Fall Break! + And One More Thing. Tomorrow is the first day of Fall Break. {% endif %} {% endif %} {% endmacro %} @@ -572,10 +576,10 @@ script: You have {{ states.calendar.skylar_events.attributes.message }} today as well! {% endif %} {% if is_state("sensor.weekday", "mon") %} - And you also have The Little Gym today. + And you have The Little Gym today. {% endif %} {% if is_state("sensor.weekday", "wed") %} - And you also have Game Time today. + And you have Game Time today. {% endif %} {% endmacro %} @@ -583,13 +587,13 @@ script: {% if is_state("sensor.clothing_forecast", "Freezing") %} It is going to be freezing today so I suggest wearing long pants, and a heavy coat. {% elif is_state("sensor.clothing_forecast","Cold") %} - It is going to be cold today so I suggest wearing long pants and a jacket. + It is going to be cold today so I suggest wearing long pants and a light jacket. {% elif is_state("sensor.clothing_forecast", "Chilly") %} It is going to be chilly today so I suggest wearing at least long pants. {% elif is_state("sensor.clothing_forecast", "Nice") %} It is going to be {{ [ "nice outside", - "pretty nice outside " + "pretty nice outside ", "a good day to be outside ", "rather enjoyable outside ", ] | random }} @@ -605,7 +609,7 @@ script: {% elif is_state("sensor.clothing_forecast", "Hot") %} It is going to be {{ [ "hot", - "hotter than the sun " + "hotter than the sun ", "hotter than hot, but in a lot of bad ways ", "hotter than the sun outside ", "super hot ", @@ -617,9 +621,15 @@ script: {% endif %} {% endmacro %} - {% macro school_holiday() %} + {% macro school_holiday() %} {% if states.calendar.school_holiday.attributes.offset_reached == True %} - Oh, and if you did not know. There is no School today. + And look at that. You do not have school today. + {{ [ "Guess today would be a good day to clean your room.", + "You could always do some chores.", + "Lets try to keep the TV off today.", + "Want to play a nice game of chess?", + "I hope you enjoy your day off. You deserve it." + ] | random }} {% endif %} {% endmacro %} @@ -954,7 +964,7 @@ script: {% if call_school_holiday == 1 %} {{ school_holiday() }} - {% endif %} + {% endif %} {% if call_reminders == 1 %} {{ reminders() }}