From f154422b4d765964602d5b39a5f33a39feaf092a Mon Sep 17 00:00:00 2001 From: Georgi Gardev Date: Wed, 13 May 2020 00:51:58 +0300 Subject: [PATCH] Remove carbon notifications. Streamline telegram messages --- config/packages/devices/titanium.yaml | 10 ++-------- config/packages/modes/guest_mode.yaml | 4 ++-- config/packages/modules/climate/purifier.yaml | 16 ++++++++-------- config/packages/modules/lighting/state.yaml | 6 +++--- config/packages/modules/media/sonos.yaml | 8 ++++---- config/packages/modules/media/tv.yaml | 4 ++-- config/packages/modules/media/youtube.yaml | 7 ------- config/packages/modules/notification.yaml | 17 +++-------------- config/packages/modules/presence.yaml | 4 ++-- config/packages/modules/security.yaml | 2 +- config/packages/modules/system.yaml | 2 +- 11 files changed, 28 insertions(+), 52 deletions(-) diff --git a/config/packages/devices/titanium.yaml b/config/packages/devices/titanium.yaml index 240453c..bab7b3d 100644 --- a/config/packages/devices/titanium.yaml +++ b/config/packages/devices/titanium.yaml @@ -243,13 +243,7 @@ automation: above: 180 action: - service: script.titanium_shutdown - - service: script.say + - service: notify.telegram data: + title: "🖥 *Devices · Titanium*" message: "Hey, I'm turning Titanium off. It's been idling for 3 hours." - - service: notify.mobile_app_carbon - data: - title: "Automation" - message: "Turning titanium off - idle for 3 hours" - data: - push: - thread-id: "titanium" diff --git a/config/packages/modes/guest_mode.yaml b/config/packages/modes/guest_mode.yaml index fdf5965..147b4a4 100644 --- a/config/packages/modes/guest_mode.yaml +++ b/config/packages/modes/guest_mode.yaml @@ -44,7 +44,7 @@ automation: entity_id: input_boolean.guest_mode - service: notify.telegram data: - title: "⚙️ *System Module*" + title: "⚙️ *System Module · Telegram*" message: "Okay, turning Guest mode on!" - alias: Guest mode · Disable · From Telegram @@ -58,5 +58,5 @@ automation: entity_id: input_boolean.guest_mode - service: notify.telegram data: - title: "⚙️ *System Module*" + title: "⚙️ *System Module · Telegram*" message: "Okay, turning Guest mode off!" diff --git a/config/packages/modules/climate/purifier.yaml b/config/packages/modules/climate/purifier.yaml index 81faf8c..a5b2ed5 100644 --- a/config/packages/modules/climate/purifier.yaml +++ b/config/packages/modules/climate/purifier.yaml @@ -265,9 +265,9 @@ automation: - service: script.say data: message: "Hey, I'm turning on the purifier, because humidity is low and there is water in the tank" - - service: notify.mobile_app_carbon + - service: notify.carbon data: - title: "💨 Climate" + title: "💨 *Climate module · Purifier On*" message: "Turning purifier on - humidity is low" data: push: @@ -289,9 +289,9 @@ automation: - service: script.say data: message: "Hey, I'm turning on the purifier, because air quality is low" - - service: notify.mobile_app_carbon + - service: notify.telegram data: - title: "💨 Climate" + title: "💨 *Climate Module · Purifier On" message: "Turning purifier on - air quality is low" data: push: @@ -307,9 +307,9 @@ automation: - service: script.say data: message: "Also, switching to humidification, because there is water in the tank" - - service: notify.mobile_app_carbon + - service: notify.telegram data: - title: "💨 Climate" + title: "💨 *Climate Module · Purifier Function" message: "Switching purifier to humidification - there is water in the tank" data: push: @@ -336,9 +336,9 @@ automation: - service: script.say data: message: "Hey, I'm turning the purifier off, because humidity is okay" - - service: notify.mobile_app_carbon + - service: notify.telegram data: - title: "💨 Climate" + title: "💨 *Climate Module · Purifier Off" message: "Turning purifier off - humidity is okay" data: push: diff --git a/config/packages/modules/lighting/state.yaml b/config/packages/modules/lighting/state.yaml index cb921c3..08b56be 100644 --- a/config/packages/modules/lighting/state.yaml +++ b/config/packages/modules/lighting/state.yaml @@ -13,10 +13,10 @@ automation: entity_id: light.on_after_dark data: brightness_pct: 100 - - service: notify.mobile_app_carbon + - service: notify.telegram data: - title: "💡 Lights" - message: "Turning lights on - 30 mins before sunset" + title: "💡 *Lighting Module · Lights On" + message: "Turning lights on - it's 30 mins to sunset" data: push: thread-id: "lights" diff --git a/config/packages/modules/media/sonos.yaml b/config/packages/modules/media/sonos.yaml index c68cf5f..3b475a6 100644 --- a/config/packages/modules/media/sonos.yaml +++ b/config/packages/modules/media/sonos.yaml @@ -77,9 +77,9 @@ automation: entity_id: media_player.living_room data: night_sound: true - - service: notify.mobile_app_carbon + - service: notify.telegram data: - title: "🔊 Sonos" + title: "🔊 *Media Module · Sonos Mode" message: "Putting Beam in night mode" data: push: @@ -94,9 +94,9 @@ automation: entity_id: media_player.living_room data: night_sound: false - - service: notify.mobile_app_carbon + - service: notify.telegram data: - title: "🔊 Sonos" + title: "🔊 *Media Module · Sonos Mode" message: "Putting Beam in day mode" data: push: diff --git a/config/packages/modules/media/tv.yaml b/config/packages/modules/media/tv.yaml index 356c1ed..385a739 100644 --- a/config/packages/modules/media/tv.yaml +++ b/config/packages/modules/media/tv.yaml @@ -96,9 +96,9 @@ automation: data: master: media_player.master_bedroom entity_id: media_player.living_room - - service: notify.mobile_app_carbon + - service: notify.telegram data: - title: "📺 Sonos" + title: "📺 *Media Module · Sonos Group" message: "TV off - joining Beam to Sonos Group" data: push: diff --git a/config/packages/modules/media/youtube.yaml b/config/packages/modules/media/youtube.yaml index f90ca57..56710cb 100644 --- a/config/packages/modules/media/youtube.yaml +++ b/config/packages/modules/media/youtube.yaml @@ -91,10 +91,3 @@ automation: - service: script.say data: message: "Just wanted to let you know - a new PDS is available!" - - service: notify.mobile_app_carbon - data: - title: "📺 Media" - message: "A new PDS is available" - data: - push: - thread-id: "pds" diff --git a/config/packages/modules/notification.yaml b/config/packages/modules/notification.yaml index 21695f2..dc493d0 100644 --- a/config/packages/modules/notification.yaml +++ b/config/packages/modules/notification.yaml @@ -26,9 +26,9 @@ automation: "Hey, your phone is running low on battery, put it on the charger!" ] | random }} - - service: notify.mobile_app_carbon + - service: notify.telegram data_template: - title: "⚠️ Battery" + title: "⚠️ *Notification module · Low Battery" message: >- {{ @@ -49,18 +49,7 @@ automation: action: - service: script.say data_template: - title: "❕*Notification Module*" - message: >- - - {{ - [ - "Hey, the front door is opened. Are you home?!", - "Hey, the front door has been opened for 2 minutes!" - ] | random - }} - - service: notify.mobile_app_carbon - data_template: - title: "⚠️ Warning" + title: "⚠️ *Notification Module · Front Door*" message: >- {{ diff --git a/config/packages/modules/presence.yaml b/config/packages/modules/presence.yaml index 25f9405..e73bd80 100644 --- a/config/packages/modules/presence.yaml +++ b/config/packages/modules/presence.yaml @@ -97,7 +97,7 @@ automation: action: - service: notify.telegram data: - title: "🏠 *Presence Module · Arrival detection*" + title: "🏠 *Presence Module · Arrival Detection*" message: "Device marked as home. Waiting for door to open!" - wait_template: "{{ is_state('binary_sensor.front_door_on_off', 'on') }}" continue_on_timeout: false @@ -106,7 +106,7 @@ automation: entity_id: input_boolean.georgi_home - service: notify.telegram data: - title: "🏠 *Presence Module · Arrival detection*" + title: "🏠 *Presence Module · Arrival Detection*" message: "✅ Hey, I've marked you as home now!" - alias: Presence · Leaving home diff --git a/config/packages/modules/security.yaml b/config/packages/modules/security.yaml index 4eb0548..a8061e6 100644 --- a/config/packages/modules/security.yaml +++ b/config/packages/modules/security.yaml @@ -118,5 +118,5 @@ automation: action: - service: notify.telegram data: - title: "🛡 *Security Module · Door opened while away*" + title: "🛡 *Security Module · Front Door*" message: "It seems like the front door was opened while you are away! Check the camera!" diff --git a/config/packages/modules/system.yaml b/config/packages/modules/system.yaml index d583a97..686438e 100644 --- a/config/packages/modules/system.yaml +++ b/config/packages/modules/system.yaml @@ -74,7 +74,7 @@ automation: action: - service: notify.telegram data_template: - title: "⚙️ *System Module*" + title: "⚙️ *System Module · Status*" message: >- Guest mode: {{ states('input_boolean.guest_mode') }}