diff --git a/atom.xml b/atom.xml index d92a8cc17d..24aaf6e1b0 100644 --- a/atom.xml +++ b/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/announcements/atom.xml b/blog/categories/announcements/atom.xml index 7e18d08ec2..c915c12989 100644 --- a/blog/categories/announcements/atom.xml +++ b/blog/categories/announcements/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Announcements | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml index f8b0482235..f3209077b0 100644 --- a/blog/categories/community/atom.xml +++ b/blog/categories/community/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Community | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml index 74397f8d31..7795ef3c3a 100644 --- a/blog/categories/device-tracking/atom.xml +++ b/blog/categories/device-tracking/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Device-Tracking | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml index 21184aa65f..13b76675e6 100644 --- a/blog/categories/esp8266/atom.xml +++ b/blog/categories/esp8266/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: ESP8266 | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml index 1f0da7031c..64d27b2389 100644 --- a/blog/categories/how-to/atom.xml +++ b/blog/categories/how-to/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: How-To | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml index 9883b88cbd..7f44e667d6 100644 --- a/blog/categories/ibeacons/atom.xml +++ b/blog/categories/ibeacons/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: iBeacons | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/internet-of-things/atom.xml b/blog/categories/internet-of-things/atom.xml index 0f67b2d928..a9f1ab3836 100644 --- a/blog/categories/internet-of-things/atom.xml +++ b/blog/categories/internet-of-things/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Internet-of-Things | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml index 7da016d551..3e168a2ede 100644 --- a/blog/categories/iot-data/atom.xml +++ b/blog/categories/iot-data/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: IoT-Data | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/merchandise/atom.xml b/blog/categories/merchandise/atom.xml index 8c53ca8470..003ae11f97 100644 --- a/blog/categories/merchandise/atom.xml +++ b/blog/categories/merchandise/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Merchandise | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml index ea0c65a88f..761a6aa380 100644 --- a/blog/categories/micropython/atom.xml +++ b/blog/categories/micropython/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Micropython | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml index 3b43f346b2..6b65d1257b 100644 --- a/blog/categories/mqtt/atom.xml +++ b/blog/categories/mqtt/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: MQTT | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml index fe11e46069..352aced237 100644 --- a/blog/categories/organisation/atom.xml +++ b/blog/categories/organisation/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Organisation | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml index 3f07064251..9b461b80a1 100644 --- a/blog/categories/owntracks/atom.xml +++ b/blog/categories/owntracks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: OwnTracks | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml index 4f7e3be3be..da42b74755 100644 --- a/blog/categories/presence-detection/atom.xml +++ b/blog/categories/presence-detection/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Presence-Detection | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/public-service-announcement/atom.xml b/blog/categories/public-service-announcement/atom.xml index cf0a8051f0..74f4ee5ae4 100644 --- a/blog/categories/public-service-announcement/atom.xml +++ b/blog/categories/public-service-announcement/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Public-Service-Announcement | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml index 64b6f2e834..88d6deea2c 100644 --- a/blog/categories/release-notes/atom.xml +++ b/blog/categories/release-notes/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Release-Notes | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml index 5982aa41f5..8ee3ffa698 100644 --- a/blog/categories/survey/atom.xml +++ b/blog/categories/survey/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Survey | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml index 1adc593fe6..be33ca8f3a 100644 --- a/blog/categories/talks/atom.xml +++ b/blog/categories/talks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Talks | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml index 83e6f328bf..9bd7cc028d 100644 --- a/blog/categories/technology/atom.xml +++ b/blog/categories/technology/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Technology | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml index 867613f0b8..1f37ceb03f 100644 --- a/blog/categories/user-stories/atom.xml +++ b/blog/categories/user-stories/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: User-Stories | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml index c81f72f922..281014f0f4 100644 --- a/blog/categories/video/atom.xml +++ b/blog/categories/video/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Video | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml index 28c80e94f5..62e096e62e 100644 --- a/blog/categories/website/atom.xml +++ b/blog/categories/website/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Website | Home Assistant]]> - 2017-05-23T15:38:07+00:00 + 2017-05-23T16:26:52+00:00 https://home-assistant.io/ diff --git a/components/notify.telegram/index.html b/components/notify.telegram/index.html index 6011aca095..948d3416d7 100644 --- a/components/notify.telegram/index.html +++ b/components/notify.telegram/index.html @@ -92,7 +92,7 @@

To enable Telegram notifications in your installation, add the following to your configuration.yaml file:

# Example configuration.yaml entry for the Telegram Bot
 telegram_bot:
-  platform: webhooks
+  platform: polling
   api_key: ABCDEFGHJKLMNOPQRSTUVXYZ
   allowed_chat_ids:
     - CHAT_ID_1
diff --git a/components/telegram_bot/index.html b/components/telegram_bot/index.html
index 4b42c06d3b..cbb915ce54 100644
--- a/components/telegram_bot/index.html
+++ b/components/telegram_bot/index.html
@@ -67,7 +67,7 @@
   
   

Use Telegram on your mobile or desktop device to send and receive messages or commands to/from your Home Assistant.

-

This component creates notification services to send, or edit previously sent, messages from a Telegram Bot account configured either with the polling method or with the webhooks one, and trigger events when receiving messages.

+

This component creates notification services to send, or edit previously sent, messages from a Telegram Bot account configured either with the polling method or with the webhooks one, and trigger events when receiving messages.

Notification services

Available services: send_message, send_photo, send_document, send_location, edit_message, edit_replymarkup, edit_caption, answer_callback_query.

Service telegram_bot/send_message

@@ -430,7 +430,7 @@

Telegram notification platform

-

The Telegram notification platform requires the telegram_bot component to work with, and it’s designed to generate a customised shortcut (notify.USERNAME) to send notifications (messages, photos, documents and locations) to a particular chat_id with the old syntax, allowing backward compatibility.

+

The Telegram notification platform requires the telegram_bot component to work with, and it’s designed to generate a customised shortcut (notify.USERNAME) to send notifications (messages, photos, documents and locations) to a particular chat_id with the old syntax, allowing backward compatibility.

The required yaml configuration now reduces to:

notify:
   - name: NOTIFIER_NAME
@@ -446,6 +446,7 @@
 from_first: "<first name of the sender>"
 from_last: "<last name of the sender>"
 user_id: "<id of the sender>"
+chat_id: "<origin chat id>"
 

Any other message not starting with / will be processed as simple text, firing a telegram_text event on the event bus with the following event_data:

@@ -453,6 +454,7 @@ from_first: "<first name of the sender>" from_last: "<last name of the sender>" user_id: "<id of the sender>" +chat_id: "<origin chat id>"

if the message is sent from a press from an inline button, for example, a callback query is received, and Home Assistant will fire a telegram_callback event with:

@@ -463,6 +465,7 @@ user_id: "<id of the sender>" id: "<unique id of the callback>" chat_instance: "<chat instance>" +chat_id: "<origin chat id>"

Configuration samples

@@ -505,7 +508,7 @@ action: - service: homeassistant.turn_on entity_id: switch.vision_zm1601eu5_battery_operated_siren_switch_9_0 - - delay: + - delay: seconds: 10 - service: homeassistant.turn_off entity_id: switch.vision_zm1601eu5_battery_operated_siren_switch_9_0 @@ -614,7 +617,7 @@ message: 'OK, you said no!' -

For a more complex usage of the telegram_bot capabilities, using AppDaemon is advised.

+

For a more complex usage of the telegram_bot capabilities, using AppDaemon is advised.

This is how the previous 4 automations would be through a simple AppDaemon app:

import appdaemon.appapi as appapi
 
diff --git a/index.html b/index.html
index 08ab0dacac..c56606f51e 100644
--- a/index.html
+++ b/index.html
@@ -86,8 +86,8 @@ Home Assistant is an open-source home automation platform running on Python 3. T