tRYING TO RESOLVE AND UPDATE AND REFACTOR THE NOTIFICTIONS TO ADHERE TO ios Closes #303

config/.HA_VERSION

@@ -1 +1 @@
-2023.10.5
+2023.11.2

config/automation/Speech/High_Wind_Speed_Check.yaml

@@ -30,7 +30,7 @@
              HURRICANE WINDS. FIND SHELTER, AND STAY INDOORS!
           {% endif %}
         who: 'family'
-        apns_id: 'Alert'
+        group: 'Alert'
 
     - service: input_boolean.turn_on
       entity_id: input_boolean.alert_mode

config/automation/Speech/door_opened.yaml

@@ -26,7 +26,7 @@
       data:
         who: 'parents'
         value1: "The {{ trigger.to_state.attributes.friendly_name }} has been {{ (trigger.to_state.state)|replace('_', ' ') }}."
-        apns_id: 'information'
+        group: 'information'
 
     - service: input_boolean.turn_on
       entity_id: input_boolean.alert_mode

config/automation/System/bad_logins.yaml

@@ -15,5 +15,5 @@
         value2: 'There was a Hack attempt!'
         value3: 'Go Check the GUI for details.'
         who: 'carlo'
-        apns_id: 'information'
+        group: 'information'
 

config/automation/System/ip_change.yaml

@@ -19,6 +19,6 @@
         value2: "New IP: {{ states('sensor.exteral_ip') }}"
         value3: ' - Be sure to Change DNS!'
         who: 'carlo'
-        apns_id: 'ip-change'
+        group: 'ip-change'
 
 ##############################################################################

config/automation/System/trigger_dump.yaml

@@ -13,7 +13,7 @@
           value1: 'Check the MQTT Dump'
           value2: '/dump/{{ trigger.platform }}'
           who: 'carlo'
-          apns_id: 'information'
+          group: 'information'
       - service: mqtt.publish
         data:
           topic: '/dump/{{ trigger.platform }}'

config/automation/Timed_Triggers/startup_notification.yaml

@@ -14,7 +14,7 @@
         title: 'Home Assistant StartUp'
         value1: 'Home Assistant is Up and Running!'
         who: 'carlo'
-        apns_id: 'information'
+        group: 'information'
 
     - service: homeassistant.turn_off
       entity_id:
@@ -32,7 +32,7 @@
 
     - service: notify.alexa_media_office
       data:
-        title: "Home Assistant Restarted"
+        message: "Home Assistant has been restarted."
         data:
           type: announce
-        message: "Home Assistant has been restarted."
+

config/automation/medicine_logger.yaml

@@ -32,6 +32,6 @@
         title: 'Medicine Reminder Completed'
         value1: 'Carlo Took his Medicine today.'
         who: 'parents'
-        apns_id: 'Medicine'
+        group: 'Medicine'
     - delay:
         minutes: 1

config/packages/alarm.yaml

@@ -375,4 +375,4 @@ automation:
         data:
           value1: 'Someone has opened up the Alarm Panel Door!'
           who: 'carlo'
-          apns_id: 'information'
+          group: 'information'

config/packages/august.yaml

@@ -64,4 +64,4 @@ automation:
         data:
           title: 'Low Battery'
           value1: 'The August Door lock is at {{ states("sensor.front_door_battery") }}% '
-          apns_id: 'Battery_Alert'
+          group: 'Battery_Alert'

config/packages/blink.yaml

@@ -34,7 +34,7 @@ automation:
           title: 'Check Fridge'
           value1: "Please check the fridge, the temperature has been {{ states('sensor.blink_blink1_temperature') }} degrees for at least 20 minutes."
           who: 'family'
-          apns_id: 'information'
+          group: 'information'
 
       - wait_template: "{{ states.group.family.state == 'home' }}"
 

config/packages/garadget.yaml

@@ -102,7 +102,7 @@ automation:
           icon2: 'sfsymbols:house.circle'
           destructive2: 'true'
           who: "{{ person_triggered }}"
-          apns_id: 'Welcome_Home'
+          group: 'Welcome_Home'
 
   - alias: 'Open Large Garage Door Action'
     id: 85e02a74-2ecc-4815-95a6-db864a6dffd7
@@ -190,8 +190,8 @@ automation:
     id: 2819207a-1716-4552-be34-a8e0f7af004e
     trigger:
       - platform: numeric_state
-        entity_id: sensor.dark_sky_wind_speed
+        entity_id: ssensor.pirateweather_wind_speed
-        above: 20
+        above: 30
 
     condition:
       - condition: or
@@ -212,13 +212,13 @@ automation:
           title: 'Check/Close Garage Doors - High Speed Wind Alert:'
           value1: "Small: {{ states('cover.small_garage_door')}}"
           value2: "Large: {{ states('cover.large_garage_door')}}"
-          apns_id: 'information'
+          group: 'information'
           who: 'parents'
 
       - service: script.speech_engine
         data:
           value1: >
-            "The winds are picking up outside.  The wind speed is {{ states('sensor.dark_sky_wind_speed')|round}} miles per hour.  For safety, please close the garage doors.
+            "The winds are picking up outside.  The wind speed is {{ states('sensor.pirateweather_wind_speed')|round}} miles per hour.  For safety, please close the garage doors.
             {% if is_state('cover.large_garage_door', 'open') -%}
               The Large Garage Door is open
             {% endif -%}
@@ -231,8 +231,8 @@ automation:
         data:
           tweet: >
             {{ [
-            "Wind speed is {{ states('sensor.dark_sky_wind_speed')|round}} miles per hour.  For safety, I'm going to close the @garadget doors.",
+            "Wind speed is {{ states('sensor.pirateweather_wind_speed')|round}} miles per hour.  For safety, I'm going to close the @garadget doors.",
-            "Getting pretty windy! {{ states('sensor.dark_sky_wind_speed')|round}}MPH. Time to ask @Garadget to close the garage doors."
+            "Getting pretty windy! {{ states('sensor.pirateweather_wind_speed')|round}}MPH. Time to ask @Garadget to close the garage doors."
             ] | random + "(https://amzn.to/2jQLpVQ)"}}
           image: >-
             {{ [
@@ -292,7 +292,7 @@ automation:
           value2: "Large: {{ states('cover.large_garage_door')}}"
           who: "family"
           camera_entity: "camera.camera2"
-          apns_id: 'information'
+          group: 'information'
 
       - service: script.speech_engine
         data:

config/packages/github.yaml

@@ -41,7 +41,7 @@ automation:
           title: 'Home Assistant {{ states.binary_sensor.updater.attributes.newest_version }} '
           value1: "Home Assistant {{ states.binary_sensor.updater.attributes.newest_version }} is now available."
           who: 'carlo'
-          apns_id: 'information'
+          group: 'information'
 
       - service: rest_command.new_version_github_issue
         data_template:

config/packages/ios.yaml

@@ -77,7 +77,7 @@ automation:
           value1: 'Please take your Medicine!'
           ios_category: "tablet"
           who: "carlo"
-          apns_id: 'Medicine'
+          group: 'Medicine'
 
   - alias: Remind Me Later
     id: 79b49c85-f832-47d7-b02d-bff099ef6fbc
@@ -92,7 +92,7 @@ automation:
           title: 'Medicine Reminder'
           value1: 'Ok. I will remind you when you get home.'
           who: 'carlo'
-          apns_id: 'Medicine'
+          group: 'Medicine'
       - wait_template: >-
           {{ states.person.carlo.state == 'home' }}
       - service: script.notify_engine
@@ -100,7 +100,7 @@ automation:
           title: 'Medicine Reminder'
           value1: 'Now that your home, please take your medicine!'
           who: 'carlo'
-          apns_id: 'Medicine'
+          group: 'Medicine'
 
   - alias: Tablet Already taken
     id: 1f295bb8-8925-4b22-8f75-9fe079b295a8

config/packages/juicenet.yaml

@@ -30,7 +30,7 @@ automation:
         data:
           value1: "The Garage charger is now in {{ states('sensor.carlojuice_charging_status') }} mode."
           who: 'parents'
-          apns_id: 'information'
+          group: 'information'
 
   - alias: 'Juicebox Self-Heal'
     id: e693f117-c75d-4bb9-a8f3-c104b226d0c5
@@ -89,7 +89,7 @@ automation:
         data:
           value1: "The Juice Box Charger is pulling {{ states('sensor.carlojuice_amps') }} AMPs.  This is above the safety mark of 30.  Please unplug charger immediately."
           who: 'parents'
-          apns_id: 'JuiceBox'
+          group: 'JuiceBox'
 
       - service: script.speech_engine
         data:
@@ -123,7 +123,7 @@ automation:
         data:
           value1: "The Juice Box Charger is running very Hot.  Temperature is around {{ states('sensor.carlojuice_temperature') }} degrees.  This is above the safety mark of 140.  Please unplug the car immediately."
           who: 'parents'
-          apns_id: 'JuiceBox'
+          group: 'JuiceBox'
 
       - service: script.speech_engine
         data:

config/packages/lightning.yaml

@@ -63,7 +63,7 @@ automation:
           value1: "Lightning has been detected within {{(states('sensor.blitzortung_lightning_distance') | int / 1.69) | round (1, 'floor')}} Miles of our home.  Be careful if outdoors."
           ios_category: "LIGHTNING"
           who: 'family'
-          apns_id: 'Alert'
+          group: 'Alert'
 
       - service: script.speech_engine
         data:

config/packages/neato.yaml

@@ -61,7 +61,7 @@ automation:
           ios_category: 'camera'
           camera_entity: 'camera.neato_vac_cleaning_map'
           content_type: 'jpeg'
-          apns_id: 'information'
+          group: 'information'
 
       - delay: 00:20:00
       - event: event_did_someone_help_neato_loop

config/packages/nest_protects.yaml

@@ -61,7 +61,7 @@ automation:
         data:
           value1: "An emergency has been detected on {{ trigger.to_state.attributes.friendly_name }} Please investigate IMMEDIATELY."
           who: "family"
-          apns_id: '{{ trigger.to_state.attributes.friendly_name }}'
+          group: '{{ trigger.to_state.attributes.friendly_name }}'
 
       - service: script.emergency
         data:
@@ -92,5 +92,5 @@ automation:
         data:
           value1: "The {{ trigger.to_state.attributes.friendly_name }} is now {{ (trigger.to_state.state)|replace('_', ' ') }}.  Please check immediately."
           who: "family"
-          apns_id: '{{ trigger.to_state.attributes.friendly_name }}'
+          group: '{{ trigger.to_state.attributes.friendly_name }}'
 

config/packages/phynplus.yaml

@@ -47,7 +47,7 @@ automation:
           value1: 'Phyn is sensing {{ trigger.event.data.alert_type }} and turned off the water.  Please verify {{ trigger.event.data.where }}.'
           who: 'parents'
           ios_category: "phyn"
-          apns_id: 'IFTTT_Phyn'
+          group: 'IFTTT_Phyn'
 
   - alias: Turn Phyn Water On
     id: 1f295bb8-8925-4b22-PHYN-9fe079b295a8
@@ -65,7 +65,7 @@ automation:
           title: 'Phyn Leak Detection'
           value1: 'Request Recieved. Attempting to Turn the Water back on.'
           who: 'parents'
-          apns_id: 'IFTTT_Phyn'
+          group: 'IFTTT_Phyn'
 
       - service: script.speech_engine
         data:

config/packages/powerwall.yaml

@@ -28,7 +28,7 @@ automation:
           title: "Electrical Grid Status {{ (trigger.to_state.state)|replace('on', 'up')|replace('off', 'down') }}."
           value1: "Please verify with the Tesla App."
           who: 'parents'
-          apns_id: 'information'
+          group: 'information'
 
 # https://github.com/CCOSTAN/Home-AssistantConfig/issues/779
   - alias: Shut Things down if running on PowerWall
@@ -50,7 +50,7 @@ automation:
          title: "Electrical Grid Status {{ (trigger.to_state.state)|replace('True', 'up')|replace('False', 'down') }}."
          value1: "Taking actions to turning off the House Lights to preserve Battery Power."
          who: 'family'
-         apns_id: 'information'
+         group: 'information'
 
       - delay:
          minutes: 1
@@ -102,7 +102,7 @@ automation:
           title: "Electrical Grid Status {{ (trigger.to_state.state)|replace('True', 'up')|replace('False', 'down') }}."
           value1: "Taking actions to turning off the AC units to preserve Battery Power."
           who: 'family'
-          apns_id: 'information'
+          group: 'information'
 
   - alias: Turn back on the Nest Thermostats after a Power Outage
     id: 14faf84b-cb24-4391-a97f-b83479a67fc7
@@ -146,4 +146,4 @@ automation:
           title: "Electrical Grid Status {{ (trigger.to_state.state)|replace('True', 'up')|replace('False', 'down') }}."
           value1: "All AC systems are set back to normal operations."
           who: 'family'
-          apns_id: 'information'
+          group: 'information'

config/packages/rheem_econet.yaml

@@ -30,7 +30,7 @@ automation:
                   title: "Maintenance Alert"
                   value1: "Rheem Water Tank Compressor Health below recommended level."
                   who: 'carlo'
-                  apns_id: 'information'
+                  group: 'information'
           - conditions:
               - condition: trigger
                 id: sensor.rheem_wh_tank_health
@@ -40,7 +40,7 @@ automation:
                   title: "Maintenance Alert"
                   value1: "Rheem Water Tank Health below recommended level."
                   who: 'carlo'
-                  apns_id: 'information'
+                  group: 'information'
 
   - alias: "Rheem Water Heater Hot Water Availability Alert"
     trigger:
@@ -53,7 +53,7 @@ automation:
           title: "Hot Water Alert"
           value1: "Available hot water is below 30%."
           who: 'carlo'
-          apns_id: 'information'
+          group: 'information'
       - service: script.speech_engine
         data:
           value1: "Please be aware that the hot water has dropped below 30% availability.  Please consider taking a shower at another time."

config/packages/roku.yaml

@@ -70,4 +70,4 @@ automation:
           title: 'Living Room Remote'
           value1: 'Remote has been found.'
           who: "family"
-          apns_id: 'RemoteLR'
+          group: 'RemoteLR'

config/packages/space.yaml

@@ -42,6 +42,6 @@ automation:
       - service: script.notify_engine
         data:
           value1: 'Go Outside!  There is a Rocket Launch very soon! {{states.sensor.next_launch.attributes.stream }}'
-          apns_id: 'information'
+          group: 'information'
 
 

config/recorder.yaml

@@ -17,6 +17,7 @@ exclude:
     - binary_sensor.camera1_motion_sensor
     - binary_sensor.camera2_motion_sensor
     - binary_sensor.camera3_motion_sensor
+    - binary_sensor.powerwall_charging
     - media_player.carlo_s_4th_fire
     - media_player.alarm_panel_2
     - media_player.tap
@@ -44,7 +45,10 @@ exclude:
     - sensor.pi_hole_ads_percentage_blocked_today
     - sensor.pi_hole_dns_queries_today
     - sensor.small_garage_door_since
+    - sensor.large_garage_door_since
+    - sensor.stacey_iphone11_activity
     - sensor.time
     - sensor.rachio_watering_time
+    - binary_sensor.rheem_wh_running
     - sun.sun
     - zone.home

config/script/notify_engine.yaml

@@ -10,7 +10,7 @@
       # who: "stacey | carlo | paige | family | parents"
       # camera_entity: 'Camera.Camera'
       # content-type: "jpeg"
-      # apns_id: "Something_Unique" if important or information
+      # group: "Something_Unique" if important or information
 
     # @CCOSTAN
     # Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
@@ -42,10 +42,9 @@ notify_engine:
         title: "{{ title }}"
         message: "{{ value1 }} {{ value2 }} {{ value3 }}"
         data:
-          apns_headers:
+          group: "{{ group|default('information'),true }}"
-            'apns-collapse-id': "{{ apns_id }}"
           push:
-            category: "{{ ios_category }}"
+            interuption_level: "{{ level|default('active'),true }}"
           entity_id: "{{ camera_entity }}"
 
 notify_engine_two_button:
@@ -81,4 +80,4 @@ notify_engine_two_button:
               action: "{{ action2 }}"
               icon: "{{ icon2|default ('sfsymbols:house.circle', true) }}"
               destructive: "{{ destructive2|default('false', true) }}"         
-          apns_id: "{{ apns_id }}"
+          group: "{{ group|default('information'),true }}"