Simplified normal text notifications further

Additionally made the script capable of clearing notifications. Should be almost no need to call notify services directly at all anymore.

automations.yaml

@@ -459,8 +459,10 @@
     entity_id: input_boolean.vacation_mode
     state: 'off'
   action:
-  - service: notify.all_ios
+  - service: script.text_notify
     data:
+      type: alert
+      who: all
       message: clear_notification
       data:
         tag: tornado-warning

packages/notify.yaml

@@ -692,7 +692,7 @@ script:
         name: 'Title'
         description: 'The title of the notification'
         example: 'Greetings'
-        required: true
+        required: false
         selector:
           text:
       message:
@@ -778,101 +778,29 @@ script:
           state: 'on'
         - if:
           - condition: template
-            value_template: '{{ who == "tony"}}'
+            value_template: >
-          then:
+              {% if who == 'tony' %}
-            - if:
+                {{ is_state('input_boolean.text_notify_tony','on') }}
-              - condition: state
+              {% elif who == 'tina' %}
-                entity_id: input_boolean.text_notify_tony
+                {{ is_state('input_boolean.text_notify_tina','on') }}
-                state: 'on'
+              {% elif who == 'kallen' %}
-              then:
+                {{ is_state('input_boolean.text_notify_kallen','on') }}
-              - service: notify.ios_tony
+              {% elif who == 'parents' %}
-                data:
+                {{ is_state('input_boolean.text_notify_parents','on') }}
-                  title: '{{ title }}'
+              {% elif who == 'nerds' %}
-                  message: '{{ message }}'
+                {{ is_state('input_boolean.text_notify_nerds','on') }}
-                  data:
+              {% elif who == 'all' %}
-                    tag: >
+                {{ is_state('input_boolean.text_notify_all','on') }}
-                      {% if tag is defined %}
-                        {{ tag }}
-                      {% else %}
-                        {}
               {% endif %}
-        - if:
-          - condition: template
-            value_template: '{{ who == "tina"}}'
-          then:
-            - if:
-              - condition: state
-                entity_id: input_boolean.text_notify_tina
-                state: 'on'
-              then:
-              - service: notify.ios_tina
-                data:
-                  title: '{{ title }}'
-                  message: '{{ message }}'
-                  data:
-                    tag: >
-                      {% if tag is defined %}
-                        {{ tag }}
-                      {% else %}
-                        {}
-                      {% endif %}
-        - if:
-          - condition: template
-            value_template: '{{ who == "kallen"}}'
-          then:
-            - if:
-              - condition: state
-                entity_id: input_boolean.text_notify_kallen
-                state: 'on'
-              then:
-              - service: notify.ios_kallen
-                data:
-                  title: '{{ title }}'
-                  message: '{{ message }}'
-                  data:
-                    tag: >
-                      {% if tag is defined %}
-                        {{ tag }}
-                      {% else %}
-                        {}
-                      {% endif %}
-        - if:
-          - condition: template
-            value_template: '{{ who == "parents"}}'
-          then:
-            - if:
-              - condition: state
-                entity_id: input_boolean.text_notify_parents
-                state: 'on'
           then:
           - service: >
-                  {% if is_state('input_boolean.text_notify_tina','off') and is_state('input_boolean.text_notify_tony','on') %}
+              {% if who == 'tony' %}
                 notify.ios_tony
-                  {% elif is_state('input_boolean.text_notify_tina','on') and is_state('input_boolean.text_notify_tony','off') %}
+              {% elif who == 'tina' %}
                 notify.ios_tina
-                  {% else %}
+              {% elif who == 'kallen' %}
-                    notify.ios_parents
+                notify.ios_kallen
-                  {% endif %}
+              {% elif who == 'nerds' %}
-                data:
-                  title: '{{ title }}'
-                  message: '{{ message }}'
-                  data:
-                    tag: >
-                      {% if tag is defined %}
-                        {{ tag }}
-                      {% else %}
-                        {}
-                      {% endif %}
-        - if:
-          - condition: template
-            value_template: '{{ who == "nerds"}}'
-          then:
-            - if:
-              - condition: state
-                entity_id: input_boolean.text_notify_nerds
-                state: 'on'
-              then:
-              - service: >
                 {% if is_state('input_boolean.text_notify_tony','on') and is_state('input_boolean.text_notify_kallen','off') %}
                   notify.ios_tony
                 {% elif is_state('input_boolean.text_notify_tony','off') and is_state('input_boolean.text_notify_kallen','on') %}
@@ -880,26 +808,17 @@ script:
                 {% else %}
                   notify.ios_nerds
                 {% endif %}
-                data:
+              {% elif who == 'parents' %}
-                  title: '{{ title }}'
+                {% if is_state('input_boolean.text_notify_tina','off') and is_state('input_boolean.text_notify_tony','on') %}
-                  message: '{{ message }}'
+                  notify.ios_tony
-                  data:
+                {% elif is_state('input_boolean.text_notify_tina','on') and is_state('input_boolean.text_notify_tony','off') %}
-                    tag: >
+                  notify.ios_tina
-                      {% if tag is defined %}
-                        {{ tag }}
                 {% else %}
-                        {}
+                  notify.ios_parents
+                {% endif %}
+              {% elif who == 'all' %}
+                notify.all_ios
               {% endif %}
-        - if:
-          - condition: template
-            value_template: '{{ who == "all"}}'
-          then:
-            - if:
-              - condition: state
-                entity_id: input_boolean.text_notify_all
-                state: 'on'
-              then:
-              - service: notify.all_ios
             data:
               title: '{{ title }}'
               message: '{{ message }}'

packages/presence.yaml

@@ -487,8 +487,10 @@ script:
       continue_on_timeout: true
       timeout:
         minutes: 1
-    - service: notify.all_ios
+    - service: script.text_notify
       data:
+        type: alert
+        who: all
         message: "clear_notification"
         data:
           tag: skip-away

packages/security.yaml

@@ -320,6 +320,8 @@ automation:
         then:
         - service: notify.all_ios
           data:
+            type: alert
+            who: all
             message: clear_notification
             data:
               tag: lockdown-issue

packages/weatheralerts.yaml

@@ -1560,8 +1560,10 @@ automation:
           - condition: template
             value_template: "{{ is_state('binary_sensor.windows','off') and is_state('binary_sensor.precipitation','on') }}"
           sequence:
-          - service: notify.all_ios
+          - service: script.text_notify
             data:
+              type: alert
+              who: all
               message: clear_notification
               data:
                 tag: rain-window-warning
@@ -1573,8 +1575,10 @@ automation:
           - condition: template
             value_template: "{{ is_state('binary_sensor.precipitation','off') }}"
           sequence:
-          - service: notify.all_ios
+          - service: script.text_notify
             data:
+              type: alert
+              who: all
               message: clear_notification
               data:
                 tag: rain-window-warning
@@ -1658,8 +1662,10 @@ script:
   lightning_clear:
     alias: 'Lightning Clear'
     sequence: 
-      - service: notify.all_ios
+      - service: script.text_notify
         data:
+          type: alert
+          who: all
           message: clear_notification
           data:
             tag: lightning-warning