If we have guests, let there be light!

automation/good_night.yaml

@@ -15,13 +15,14 @@
       state: not_home 
 
   condition:
-    - condition: state
+    condition: and
-      entity_id: group.family
+    conditions:
-      state: not_home 
+      - condition: state
-    - condition:
+        entity_id: group.family
-      platform: state
+        state: not_home 
-      entity_id: input_boolean.guest_mode
+      - condition: state
-      state: 'off'
+        entity_id: input_boolean.guest_mode
+        state: 'off'
 
   action:
     - service: light.turn_off

automation/ifttt_logger.yaml

@@ -0,0 +1,42 @@
+###################################
+##  LOG IFTTT Stuff - Rachio
+###################################
+- alias: 'Log Sprinkler Activity'
+  hide_entity: True
+  trigger:
+    - platform: event
+      event_type: rachio_water_stops
+  
+  action:
+    service: logbook.log
+    data:
+      name: "Rachio Sprinkler:"
+      message: "The Lawn was watered just now."
+
+###################################
+##  LOG IFTTT Stuff - SkyBell
+###################################
+
+- alias: 'Log SkyBell Pressed Activity'
+  hide_entity: True
+  trigger:
+    - platform: event
+      event_type: skybell_pressed
+  
+  action:
+    service: logbook.log
+    data:
+      name: "SkyBell HD Doorbell:"
+      message: "Someone Pressed the Doorbell."
+
+- alias: 'Log SkyBell Motion detection'
+  hide_entity: True
+  trigger:
+    - platform: event
+      event_type: skybell_motion
+  
+  action:
+    service: logbook.log
+    data:
+      name: "SkyBell HD Doorbell:"
+      message: "Someone is by the door."

automation/late_night_helper.yaml

@@ -12,11 +12,13 @@
       state: home 
 
   condition:
-    - condition: state
+    condition: and
-      entity_id: sun.sun
+    conditions:
-      state: 'below_horizon'
+      - condition: state
-    - condition: time
+        entity_id: sun.sun
-      before: '23:45'
+        state: 'below_horizon'
+      - condition: time
+        before: '23:45'
 
   action:
     service: light.turn_on

automation/rachio.yaml

@@ -1,13 +0,0 @@
-# Here is a collection of automations for logging IFTTT supported devices in LogBook.
-
-- alias: 'Log Sprinkler Activity'
-  hide_entity: True
-  trigger:
-    - platform: event
-      event_type: rachio_water_stops
-  
-  action:
-    service: logbook.log
-    data:
-      name: "Rachio Sprinkler:"
-      message: "The Lawn was watered just now."

automation/skybell.yaml

@@ -1,25 +0,0 @@
-# Here is a collection of automations for logging IFTTT supported devices in LogBook.
-
-- alias: 'Log SkyBell Pressed Activity'
-  hide_entity: True
-  trigger:
-    - platform: event
-      event_type: skybell_pressed
-  
-  action:
-    service: logbook.log
-    data:
-      name: "SkyBell HD Doorbell:"
-      message: "Someone Pressed the Doorbell."
-
-- alias: 'Log SkyBell Motion detection'
-  hide_entity: True
-  trigger:
-    - platform: event
-      event_type: skybell_motion
-  
-  action:
-    service: logbook.log
-    data:
-      name: "SkyBell HD Doorbell:"
-      message: "Someone is by the door."

automation/tv_time.yaml

@@ -21,8 +21,7 @@
       - condition: state
         entity_id: sun.sun
         state: 'below_horizon'
-      - condition:
+      - condition: state
-        platform: state
         entity_id: input_boolean.guest_mode
         state: 'off'
         

automation/tv_time_off.yaml

@@ -10,8 +10,7 @@
       - condition: state
         entity_id: sun.sun
         state: 'below_horizon'
-      - condition:
+      - condition: state
-        platform: state
         entity_id: input_boolean.guest_mode
         state: 'off'