diff --git a/atom.xml b/atom.xml index f8e72a9608..9f2e228646 100644 --- a/atom.xml +++ b/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Home Assistant]]> - 2017-05-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/announcements/atom.xml b/blog/categories/announcements/atom.xml index c7a9c1eb33..29ad5d3796 100644 --- a/blog/categories/announcements/atom.xml +++ b/blog/categories/announcements/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Announcements | Home Assistant]]> - 2017-05-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/community/atom.xml b/blog/categories/community/atom.xml index 4fe5eb4ba1..c0f0f45278 100644 --- a/blog/categories/community/atom.xml +++ b/blog/categories/community/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Community | Home Assistant]]> - 2017-05-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/device-tracking/atom.xml b/blog/categories/device-tracking/atom.xml index 34df1c37c5..33757fc61b 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-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/esp8266/atom.xml b/blog/categories/esp8266/atom.xml index 5e69de3371..57d8a5f36c 100644 --- a/blog/categories/esp8266/atom.xml +++ b/blog/categories/esp8266/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: ESP8266 | Home Assistant]]> - 2017-05-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/how-to/atom.xml b/blog/categories/how-to/atom.xml index adf82e679a..05f96b43cc 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-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/ibeacons/atom.xml b/blog/categories/ibeacons/atom.xml index 2c7cba8a75..a0e81e3e8c 100644 --- a/blog/categories/ibeacons/atom.xml +++ b/blog/categories/ibeacons/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: iBeacons | Home Assistant]]> - 2017-05-22T07:03:19+00:00 + 2017-05-22T07:25:36+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 ea79e6bd9d..4a134a1cb3 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-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/iot-data/atom.xml b/blog/categories/iot-data/atom.xml index 31a716920f..3bc22b322f 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-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/merchandise/atom.xml b/blog/categories/merchandise/atom.xml index a27b7fe129..71e516f058 100644 --- a/blog/categories/merchandise/atom.xml +++ b/blog/categories/merchandise/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Merchandise | Home Assistant]]> - 2017-05-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/micropython/atom.xml b/blog/categories/micropython/atom.xml index aff0feef85..a2889ec38d 100644 --- a/blog/categories/micropython/atom.xml +++ b/blog/categories/micropython/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Micropython | Home Assistant]]> - 2017-05-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/mqtt/atom.xml b/blog/categories/mqtt/atom.xml index e1b5c444cf..ebd1e2f99f 100644 --- a/blog/categories/mqtt/atom.xml +++ b/blog/categories/mqtt/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: MQTT | Home Assistant]]> - 2017-05-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/organisation/atom.xml b/blog/categories/organisation/atom.xml index c67577046d..14751b1f71 100644 --- a/blog/categories/organisation/atom.xml +++ b/blog/categories/organisation/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Organisation | Home Assistant]]> - 2017-05-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/owntracks/atom.xml b/blog/categories/owntracks/atom.xml index 771188bbcb..c03b3bd2eb 100644 --- a/blog/categories/owntracks/atom.xml +++ b/blog/categories/owntracks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: OwnTracks | Home Assistant]]> - 2017-05-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/presence-detection/atom.xml b/blog/categories/presence-detection/atom.xml index 29607e27ef..f49ba4c081 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-22T07:03:19+00:00 + 2017-05-22T07:25:36+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 9527b88d78..2b548d7822 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-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/release-notes/atom.xml b/blog/categories/release-notes/atom.xml index c233e7d2a4..e7156b34c3 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-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/survey/atom.xml b/blog/categories/survey/atom.xml index 913b0b72bd..61b9fdc3b3 100644 --- a/blog/categories/survey/atom.xml +++ b/blog/categories/survey/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Survey | Home Assistant]]> - 2017-05-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/talks/atom.xml b/blog/categories/talks/atom.xml index 1647cea6ba..0869c21b3d 100644 --- a/blog/categories/talks/atom.xml +++ b/blog/categories/talks/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Talks | Home Assistant]]> - 2017-05-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/technology/atom.xml b/blog/categories/technology/atom.xml index 3f60d2e0b9..85db728dfa 100644 --- a/blog/categories/technology/atom.xml +++ b/blog/categories/technology/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Technology | Home Assistant]]> - 2017-05-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/user-stories/atom.xml b/blog/categories/user-stories/atom.xml index 911eff9b32..9974d7fd59 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-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/video/atom.xml b/blog/categories/video/atom.xml index 89f2ef8150..594f64b4b5 100644 --- a/blog/categories/video/atom.xml +++ b/blog/categories/video/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Video | Home Assistant]]> - 2017-05-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/blog/categories/website/atom.xml b/blog/categories/website/atom.xml index dc0dfb3073..799eccfaf8 100644 --- a/blog/categories/website/atom.xml +++ b/blog/categories/website/atom.xml @@ -4,7 +4,7 @@ <![CDATA[Category: Website | Home Assistant]]> - 2017-05-22T07:03:19+00:00 + 2017-05-22T07:25:36+00:00 https://home-assistant.io/ diff --git a/components/telegram_bot/index.html b/components/telegram_bot/index.html index cc8fadc8de..4b42c06d3b 100644 --- a/components/telegram_bot/index.html +++ b/components/telegram_bot/index.html @@ -542,8 +542,8 @@ - service: telegram_bot.send_message data_template: title: '*Dumb automation*' - target: '' - message: 'You said: ``` ```' + target: '{{ trigger.event.data.user_id }}' + message: 'You said: {{ trigger.event.data.text }}' disable_notification: true inline_keyboard: - '/edit,/NO' @@ -566,16 +566,16 @@ show_alert: true - service: telegram_bot.edit_message data_template: - message_id: '' - chat_id: '' + message_id: '{{ trigger.event.data.message.message_id }}' + chat_id: '{{ trigger.event.data.user_id }}' title: '*Message edit*' inline_keyboard: - '/edit,/NO' - '/remove button' message: > - Callback received from . - Message id: . - Data: ``` ``` + Callback received from {% raw %}{{ trigger.event.data.from_first }}. + Message id: {{ trigger.event.data.message.message_id }}. + Data: {{ trigger.event.data.data }}

Keyboard editor:

@@ -589,12 +589,12 @@ action: - service: telegram_bot.answer_callback_query data_template: - callback_query_id: '' + callback_query_id: '{{ trigger.event.data.id }}' message: 'Callback received for editing the inline keyboard!' - service: telegram_bot.edit_replymarkup data_template: message_id: 'last' - chat_id: '' + chat_id: '{{ trigger.event.data.user_id }}' inline_keyboard: - '/edit,/NO' @@ -610,7 +610,7 @@ action: - service: telegram_bot.answer_callback_query data_template: - callback_query_id: '' + callback_query_id: '{{ trigger.event.data.id }}' message: 'OK, you said no!' diff --git a/sitemap.xml b/sitemap.xml index 42c063d95d..a4afd139fc 100644 --- a/sitemap.xml +++ b/sitemap.xml @@ -3454,62 +3454,62 @@ https://home-assistant.io/demo/frontend.html -2017-05-22T07:01:49+00:00 +2017-05-22T07:24:32+00:00 https://home-assistant.io/demo/index.html -2017-05-22T07:01:49+00:00 +2017-05-22T07:24:32+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-event.html -2017-05-22T07:01:49+00:00 +2017-05-22T07:24:32+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-info.html -2017-05-22T07:01:49+00:00 +2017-05-22T07:24:32+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-service.html -2017-05-22T07:01:49+00:00 +2017-05-22T07:24:32+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-state.html -2017-05-22T07:01:49+00:00 +2017-05-22T07:24:32+00:00 https://home-assistant.io/demo/panels/ha-panel-dev-template.html -2017-05-22T07:01:49+00:00 +2017-05-22T07:24:32+00:00 https://home-assistant.io/demo/panels/ha-panel-history.html -2017-05-22T07:01:49+00:00 +2017-05-22T07:24:32+00:00 https://home-assistant.io/demo/panels/ha-panel-iframe.html -2017-05-22T07:01:49+00:00 +2017-05-22T07:24:32+00:00 https://home-assistant.io/demo/panels/ha-panel-logbook.html -2017-05-22T07:01:49+00:00 +2017-05-22T07:24:32+00:00 https://home-assistant.io/demo/panels/ha-panel-map.html -2017-05-22T07:01:49+00:00 +2017-05-22T07:24:32+00:00 https://home-assistant.io/googlef4f3693c209fe788.html -2017-05-22T07:01:49+00:00 +2017-05-22T07:24:32+00:00 https://home-assistant.io/static/fonts/roboto/DESCRIPTION.en_us.html -2017-05-22T07:01:49+00:00 +2017-05-22T07:24:33+00:00 https://home-assistant.io/static/fonts/robotomono/DESCRIPTION.en_us.html -2017-05-22T07:01:49+00:00 +2017-05-22T07:24:33+00:00 https://home-assistant.io/static/mdi-demo.html -2017-05-22T07:01:49+00:00 +2017-05-22T07:24:33+00:00