Telegram fixy

This commit is contained in:
Martin Bauer 2019-07-15 22:02:40 +02:00
parent 5094864a4b
commit e4da3d56cb
7 changed files with 205 additions and 114 deletions

View File

@ -323,7 +323,7 @@
"created_at": "2019-06-30T21:14:18.415794+00:00", "created_at": "2019-06-30T21:14:18.415794+00:00",
"id": "4b042072829d416db7102e2ef1b627a8", "id": "4b042072829d416db7102e2ef1b627a8",
"jwt_key": "464a41849ee7ba9d19a300c1dd7133bdca85714cfbc6f5e119c1dea53209926c3de9f7afea8fa7d79341ef970f60200745a1895115ada894a12b47bd17639777", "jwt_key": "464a41849ee7ba9d19a300c1dd7133bdca85714cfbc6f5e119c1dea53209926c3de9f7afea8fa7d79341ef970f60200745a1895115ada894a12b47bd17639777",
"last_used_at": "2019-07-04T20:09:21.231573+00:00", "last_used_at": "2019-07-06T18:39:09.659149+00:00",
"last_used_ip": "127.0.0.1", "last_used_ip": "127.0.0.1",
"token": "7f78a2d69fa4c70576fde67253220e35541ff9644554ee933cc568e543e44debf1a8d990d19c5b13084a1ce0c0cb24c43828caa875c99021ea914c581d82c759", "token": "7f78a2d69fa4c70576fde67253220e35541ff9644554ee933cc568e543e44debf1a8d990d19c5b13084a1ce0c0cb24c43828caa875c99021ea914c581d82c759",
"token_type": "normal", "token_type": "normal",
@ -337,7 +337,7 @@
"created_at": "2019-06-30T21:40:45.236003+00:00", "created_at": "2019-06-30T21:40:45.236003+00:00",
"id": "c921f02f078744dcab3dcf0a56a2ff47", "id": "c921f02f078744dcab3dcf0a56a2ff47",
"jwt_key": "125edd9a21a6cfb26458a0a831215ca25390e7f0d590b22b6a77ecffcc86737528914e2722420d93cd103fbc66706a813799258c9203d25b48c9c52028d46a74", "jwt_key": "125edd9a21a6cfb26458a0a831215ca25390e7f0d590b22b6a77ecffcc86737528914e2722420d93cd103fbc66706a813799258c9203d25b48c9c52028d46a74",
"last_used_at": "2019-07-04T20:50:06.043318+00:00", "last_used_at": "2019-07-15T12:07:15.212157+00:00",
"last_used_ip": "127.0.0.1", "last_used_ip": "127.0.0.1",
"token": "5dcf0fd720f5f0a016325c55bc2744e8a4b913e3f863b30b1fc3eee72e7e52982b390b1551ba9e19c86cc756a080ea351e0906433c335a2fcea921349b1c675b", "token": "5dcf0fd720f5f0a016325c55bc2744e8a4b913e3f863b30b1fc3eee72e7e52982b390b1551ba9e19c86cc756a080ea351e0906433c335a2fcea921349b1c675b",
"token_type": "normal", "token_type": "normal",
@ -351,7 +351,7 @@
"created_at": "2019-06-30T21:51:24.978927+00:00", "created_at": "2019-06-30T21:51:24.978927+00:00",
"id": "9f205cb3449d432ca1e67fe9d36ef350", "id": "9f205cb3449d432ca1e67fe9d36ef350",
"jwt_key": "73e668fb953a71287fa6e0f95be8affdb9dfae7c305cc8d35bbfd568d3839ad491b9ff54cb7e11fe20dc702c3801b8ba7290631f8176dd0b76d56f4eba902eb4", "jwt_key": "73e668fb953a71287fa6e0f95be8affdb9dfae7c305cc8d35bbfd568d3839ad491b9ff54cb7e11fe20dc702c3801b8ba7290631f8176dd0b76d56f4eba902eb4",
"last_used_at": "2019-07-04T10:03:41.203106+00:00", "last_used_at": "2019-07-14T14:30:16.232723+00:00",
"last_used_ip": "127.0.0.1", "last_used_ip": "127.0.0.1",
"token": "a44aeb5f2c646edd8066866d9d42641d0b81ba21255be56ef42df68f3a9c4c9fc3af4ef001ea739fc7242a7d7bbd95f34b05df527b8723d820e02ca699a50171", "token": "a44aeb5f2c646edd8066866d9d42641d0b81ba21255be56ef42df68f3a9c4c9fc3af4ef001ea739fc7242a7d7bbd95f34b05df527b8723d820e02ca699a50171",
"token_type": "normal", "token_type": "normal",
@ -407,7 +407,7 @@
"created_at": "2019-07-03T18:56:36.256497+00:00", "created_at": "2019-07-03T18:56:36.256497+00:00",
"id": "9b09ea1fa45648a78d961760cba54323", "id": "9b09ea1fa45648a78d961760cba54323",
"jwt_key": "f2145230898b93021c4891501618bab9b029748c363c6ba3a05ee6e6d9b5024359b69e508c20c599347bb5d1c75240a5da7c5bbad6fd983a96ca4cdf1cf4e7aa", "jwt_key": "f2145230898b93021c4891501618bab9b029748c363c6ba3a05ee6e6d9b5024359b69e508c20c599347bb5d1c75240a5da7c5bbad6fd983a96ca4cdf1cf4e7aa",
"last_used_at": "2019-07-04T20:09:22.541614+00:00", "last_used_at": "2019-07-15T19:57:12.932165+00:00",
"last_used_ip": "127.0.0.1", "last_used_ip": "127.0.0.1",
"token": "fe348a5563316252b232d5f6ddb183ac4a150f56bdb8cee9790f798e36854bb947f542bb24ee19464ff9a299508a3cd352f776ad0e4581366ad16efa44238402", "token": "fe348a5563316252b232d5f6ddb183ac4a150f56bdb8cee9790f798e36854bb947f542bb24ee19464ff9a299508a3cd352f776ad0e4581366ad16efa44238402",
"token_type": "normal", "token_type": "normal",
@ -421,7 +421,7 @@
"created_at": "2019-07-03T20:37:40.792202+00:00", "created_at": "2019-07-03T20:37:40.792202+00:00",
"id": "52ff16c9ddc9494d89e33f2fb9eafafe", "id": "52ff16c9ddc9494d89e33f2fb9eafafe",
"jwt_key": "0b92a91132f799529d70b0e9f1ae975a6f55369ad682fceabe0daff710be9bb6b719159a17b10d67c6f6b60085c63547f225c5bc13cbcf31def368ae31ded52a", "jwt_key": "0b92a91132f799529d70b0e9f1ae975a6f55369ad682fceabe0daff710be9bb6b719159a17b10d67c6f6b60085c63547f225c5bc13cbcf31def368ae31ded52a",
"last_used_at": "2019-07-04T20:30:05.412962+00:00", "last_used_at": "2019-07-15T19:57:45.466402+00:00",
"last_used_ip": "127.0.0.1", "last_used_ip": "127.0.0.1",
"token": "f3b4115b2a302e0a7e2da65caeb8d859beed2023269f1d0a7524b1761efbd46cc40827b9c1be5b51e913f93cca87a696e7d7c2d6eab0e82705f9efe42edc8f0f", "token": "f3b4115b2a302e0a7e2da65caeb8d859beed2023269f1d0a7524b1761efbd46cc40827b9c1be5b51e913f93cca87a696e7d7c2d6eab0e82705f9efe42edc8f0f",
"token_type": "normal", "token_type": "normal",
@ -435,7 +435,7 @@
"created_at": "2019-07-04T10:04:27.305217+00:00", "created_at": "2019-07-04T10:04:27.305217+00:00",
"id": "44bd366a776a48df9be52aa13458108d", "id": "44bd366a776a48df9be52aa13458108d",
"jwt_key": "e28bc232bd652f7c102a362cf88061ceeb3a028e22583424ef32e1130d609ce5ce2532f7ac0aef8234fe2d3218a4c9b23aeb166ed5b56a29726350cf0f6707ff", "jwt_key": "e28bc232bd652f7c102a362cf88061ceeb3a028e22583424ef32e1130d609ce5ce2532f7ac0aef8234fe2d3218a4c9b23aeb166ed5b56a29726350cf0f6707ff",
"last_used_at": "2019-07-04T10:04:27.305491+00:00", "last_used_at": "2019-07-12T12:21:45.742529+00:00",
"last_used_ip": "127.0.0.1", "last_used_ip": "127.0.0.1",
"token": "5274e7443a3b0255afd864c85c09a06ec1df85780d9671cad9b91c1d29b4b6d91d9d64575137902c1cb8004b760a838322d859141be03e94cf34b08505fdd6ea", "token": "5274e7443a3b0255afd864c85c09a06ec1df85780d9671cad9b91c1d29b4b6d91d9d64575137902c1cb8004b760a838322d859141be03e94cf34b08505fdd6ea",
"token_type": "normal", "token_type": "normal",

View File

@ -67,6 +67,16 @@
"source": "registration", "source": "registration",
"title": "Martin_Handy", "title": "Martin_Handy",
"version": 1 "version": 1
},
{
"connection_class": "cloud_push",
"data": {},
"domain": "ios",
"entry_id": "e4728d23a5aa4c0dbc35a2d5036df7d1",
"options": {},
"source": "import",
"title": "Home Assistant iOS",
"version": 1
} }
] ]
}, },

View File

@ -559,13 +559,13 @@
"connections": [], "connections": [],
"id": "c9c5a90d2665455f9445254dc9f71495", "id": "c9c5a90d2665455f9445254dc9f71495",
"identifiers": [ "identifiers": [
[
"device_id",
"aba3eef2eb0d44eab143c525f5b0b190"
],
[ [
"webhook_id", "webhook_id",
"c4707baa6eef9f03781be57ea4a5a80c5634b41a17dcbb3699ab97d24ad0cd19" "c4707baa6eef9f03781be57ea4a5a80c5634b41a17dcbb3699ab97d24ad0cd19"
],
[
"device_id",
"aba3eef2eb0d44eab143c525f5b0b190"
] ]
], ],
"manufacturer": "HUAWEI", "manufacturer": "HUAWEI",
@ -654,6 +654,26 @@
"name_by_user": null, "name_by_user": null,
"sw_version": null, "sw_version": null,
"via_device_id": null "via_device_id": null
},
{
"area_id": null,
"config_entries": [
"e4728d23a5aa4c0dbc35a2d5036df7d1"
],
"connections": [],
"id": "8ac42fc9656e4882a022db8402456d25",
"identifiers": [
[
"ios",
"ACCCEFC0-AAF4-4BE3-8D98-721EDDAC52F1"
]
],
"manufacturer": "Apple",
"model": "iPad Pro (10.5-inch)",
"name": "Martin\u2019s iPad",
"name_by_user": null,
"sw_version": "12.3.1",
"via_device_id": null
} }
] ]
}, },

View File

@ -324,6 +324,24 @@
"name": null, "name": null,
"platform": "owntracks", "platform": "owntracks",
"unique_id": "beacon_Auto" "unique_id": "beacon_Auto"
},
{
"config_entry_id": "e4728d23a5aa4c0dbc35a2d5036df7d1",
"device_id": "8ac42fc9656e4882a022db8402456d25",
"disabled_by": null,
"entity_id": "sensor.martins_ipad_battery_level",
"name": null,
"platform": "ios",
"unique_id": "level_martins_ipad"
},
{
"config_entry_id": "e4728d23a5aa4c0dbc35a2d5036df7d1",
"device_id": "8ac42fc9656e4882a022db8402456d25",
"disabled_by": null,
"entity_id": "sensor.martins_ipad_battery_state",
"name": null,
"platform": "ios",
"unique_id": "state_martins_ipad"
} }
] ]
}, },

View File

@ -1,150 +1,164 @@
{ {
"data": [ "data": [
{ {
"last_seen": "2019-07-04T20:46:59.011760+00:00", "last_seen": "2019-07-15T20:01:30.624376+00:00",
"state": { "state": {
"attributes": { "attributes": {
"editable": true, "editable": true,
"friendly_name": "Martin Bauer", "friendly_name": "Martin Bauer",
"id": "d433f5e7758548dab8baa44b545a8668", "id": "d433f5e7758548dab8baa44b545a8668",
"source": "person.martin_bauer",
"user_id": "2ffcb10d3db745b396789364fdef72ec" "user_id": "2ffcb10d3db745b396789364fdef72ec"
}, },
"context": { "context": {
"id": "cdd37accd7c04cfe98fe3190940be388", "id": "c453892bfbc342499b782f87c5fefdea",
"parent_id": null, "parent_id": null,
"user_id": null "user_id": null
}, },
"entity_id": "person.martin_bauer", "entity_id": "person.martin_bauer",
"last_changed": "2019-07-03T20:30:33.131361+00:00", "last_changed": "2019-07-15T20:01:25.000202+00:00",
"last_updated": "2019-07-03T20:30:38.842384+00:00", "last_updated": "2019-07-15T20:01:25.000202+00:00",
"state": "unknown" "state": "unknown"
} }
}, },
{ {
"last_seen": "2019-07-04T20:46:59.011760+00:00", "last_seen": "2019-07-15T20:01:30.624376+00:00",
"state": {
"attributes": {
"friendly_name": "Martin\u2019s iPad",
"source_type": null
},
"context": {
"id": "b1981a04873f442184e446614d3163f1",
"parent_id": null,
"user_id": null
},
"entity_id": "device_tracker.martins_ipad",
"last_changed": "2019-07-15T20:01:28.618367+00:00",
"last_updated": "2019-07-15T20:01:28.618367+00:00",
"state": "not_home"
}
},
{
"last_seen": "2019-07-15T20:01:30.624376+00:00",
"state": { "state": {
"attributes": { "attributes": {
"friendly_name": "Martin_Handy", "friendly_name": "Martin_Handy",
"source_type": "gps" "source_type": "gps"
}, },
"context": { "context": {
"id": "3cd2a5b4becd4c7db4bcc686328f2499", "id": "b90bbc2e9114485086b5275da4f78a8e",
"parent_id": null, "parent_id": null,
"user_id": null "user_id": null
}, },
"entity_id": "device_tracker.martin_handy_2", "entity_id": "device_tracker.martin_handy_2",
"last_changed": "2019-07-03T20:30:36.845886+00:00", "last_changed": "2019-07-15T20:01:29.770913+00:00",
"last_updated": "2019-07-03T20:30:36.845886+00:00", "last_updated": "2019-07-15T20:01:29.770913+00:00",
"state": "unknown" "state": "unknown"
} }
}, },
{ {
"last_seen": "2019-07-04T20:46:59.011760+00:00", "last_seen": "2019-07-15T20:01:30.624376+00:00",
"state": {
"attributes": {
"friendly_name": "Auto",
"gps_accuracy": 100,
"latitude": 49.369477,
"longitude": 10.9831468,
"source_type": "bluetooth_le",
"tid": "50"
},
"context": {
"id": "b0b0afc662344a729da12f7bbea1b930",
"parent_id": null,
"user_id": null
},
"entity_id": "device_tracker.beacon_auto",
"last_changed": "2019-07-04T17:19:10.464005+00:00",
"last_updated": "2019-07-04T17:19:11.125187+00:00",
"state": "home"
}
},
{
"last_seen": "2019-07-04T20:46:59.011760+00:00",
"state": {
"attributes": {
"friendly_name": "martin",
"gps_accuracy": 100,
"latitude": 49.369477,
"longitude": 10.9831468,
"source_type": "gps",
"tid": "50"
},
"context": {
"id": "f5df946a88184d33bfd94d251fff43f9",
"parent_id": null,
"user_id": null
},
"entity_id": "device_tracker.martin_ipad",
"last_changed": "2019-07-04T17:19:10.459697+00:00",
"last_updated": "2019-07-04T17:19:10.707068+00:00",
"state": "home"
}
},
{
"last_seen": "2019-07-04T20:46:59.011760+00:00",
"state": {
"attributes": {
"friendly_name": "Arbeit",
"gps_accuracy": 30.0,
"latitude": 49.573626,
"longitude": 11.029467,
"source_type": "bluetooth_le",
"tid": "50"
},
"context": {
"id": "b004ab15b27c422ab8bc72f571db049e",
"parent_id": null,
"user_id": null
},
"entity_id": "device_tracker.beacon_arbeit",
"last_changed": "2019-07-04T07:48:52.444871+00:00",
"last_updated": "2019-07-04T13:32:59.858047+00:00",
"state": "Uni"
}
},
{
"last_seen": "2019-07-04T20:46:59.011760+00:00",
"state": {
"attributes": {
"battery_level": 32,
"friendly_name": "martin",
"gps_accuracy": 4,
"latitude": 49.3941723,
"longitude": 10.9965571,
"source_type": "gps"
},
"context": {
"id": "5eba7a954b7945a8b0ae85d1314e0926",
"parent_id": null,
"user_id": null
},
"entity_id": "device_tracker.martin_handy",
"last_changed": "2019-07-03T20:30:37.347521+00:00",
"last_updated": "2019-07-03T20:30:37.347521+00:00",
"state": "not_home"
}
},
{
"last_seen": "2019-07-04T20:46:59.011760+00:00",
"state": { "state": {
"attributes": { "attributes": {
"friendly_name": "Eingang", "friendly_name": "Eingang",
"gps_accuracy": 100, "gps_accuracy": 100,
"latitude": 49.369477, "latitude": 49.369477,
"longitude": 10.9831468, "longitude": 10.9831468,
"source_type": "bluetooth_le", "source_type": "bluetooth_le"
"tid": "50"
}, },
"context": { "context": {
"id": "1ef1e940b7544e9fb4fbdabc4e2a5b54", "id": "150a5eb4e4e34f2b9528946e15adea4c",
"parent_id": null, "parent_id": null,
"user_id": null "user_id": null
}, },
"entity_id": "device_tracker.beacon_eingang", "entity_id": "device_tracker.beacon_eingang",
"last_changed": "2019-07-03T20:30:37.349593+00:00", "last_changed": "2019-07-15T20:01:30.004025+00:00",
"last_updated": "2019-07-04T17:19:11.122393+00:00", "last_updated": "2019-07-15T20:01:30.004025+00:00",
"state": "home"
}
},
{
"last_seen": "2019-07-15T20:01:30.624376+00:00",
"state": {
"attributes": {
"friendly_name": "Arbeit",
"gps_accuracy": 30.0,
"latitude": 49.573626,
"longitude": 11.029467,
"source_type": "bluetooth_le"
},
"context": {
"id": "6eeb49a6ef24453fb803fa2b5dae5e2a",
"parent_id": null,
"user_id": null
},
"entity_id": "device_tracker.beacon_arbeit",
"last_changed": "2019-07-15T20:01:30.006352+00:00",
"last_updated": "2019-07-15T20:01:30.006352+00:00",
"state": "Uni"
}
},
{
"last_seen": "2019-07-15T20:01:30.624376+00:00",
"state": {
"attributes": {
"friendly_name": "martin",
"gps_accuracy": 100,
"latitude": 49.369477,
"longitude": 10.9831468,
"source_type": "bluetooth_le"
},
"context": {
"id": "f540bc71c2ad49b097f4023ddcdd6ea2",
"parent_id": null,
"user_id": null
},
"entity_id": "device_tracker.martin_ipad",
"last_changed": "2019-07-15T20:01:30.008537+00:00",
"last_updated": "2019-07-15T20:01:30.008537+00:00",
"state": "home"
}
},
{
"last_seen": "2019-07-15T20:01:30.624376+00:00",
"state": {
"attributes": {
"friendly_name": "martin",
"gps_accuracy": 30.0,
"latitude": 49.573626,
"longitude": 11.029467,
"source_type": "gps"
},
"context": {
"id": "1c6d7f6d113a47548cd2751ce3151031",
"parent_id": null,
"user_id": null
},
"entity_id": "device_tracker.martin_handy",
"last_changed": "2019-07-15T20:01:30.010768+00:00",
"last_updated": "2019-07-15T20:01:30.010768+00:00",
"state": "Uni"
}
},
{
"last_seen": "2019-07-15T20:01:30.624376+00:00",
"state": {
"attributes": {
"friendly_name": "Auto",
"gps_accuracy": 100,
"latitude": 49.369477,
"longitude": 10.9831468,
"source_type": "bluetooth_le"
},
"context": {
"id": "e167b7848df3480cb312bb6388cb6a0a",
"parent_id": null,
"user_id": null
},
"entity_id": "device_tracker.beacon_auto",
"last_changed": "2019-07-15T20:01:30.012894+00:00",
"last_updated": "2019-07-15T20:01:30.012894+00:00",
"state": "home" "state": "home"
} }
} }

View File

@ -447,6 +447,29 @@
{ {
"type": "custom:compact-custom-header" "type": "custom:compact-custom-header"
}, },
{
"entities": [
{
"entity": "switch.pool_pumpe",
"name": "Pool Pumpe"
},
{
"entity": "sensor.pool_pumpe_verbrauch",
"name": "Pool Pumpe Verbrauch"
},
{
"entity": "sensor.pool_pumpe_heute",
"name": "Pumpe an heute"
},
{
"entity": "sensor.pool_pumpe_gestern",
"name": "Pumpe an gestern"
}
],
"show_header_toggle": false,
"title": "Pool",
"type": "entities"
},
{ {
"entities": [ "entities": [
{ {

View File

@ -3,8 +3,8 @@
default_config: default_config:
# Uncomment this if you are using SSL/TLS, running in Docker container, etc. # Uncomment this if you are using SSL/TLS, running in Docker container, etc.
# http: http:
# base_url: example.duckdns.org:8123 base_url: https://ha.bauer.tech
# Discover some devices automatically # Discover some devices automatically
#discovery: #discovery:
@ -60,13 +60,19 @@ history:
ios: ios:
#http:
# - base_url: ha.bauer.tech
telegram_bot: telegram_bot:
- platform: webhooks - platform: webhooks
parse_mode: html parse_mode: html
url: https://ha.bauer.tech
api_key: !secret telegram_token api_key: !secret telegram_token
allowed_chat_ids: allowed_chat_ids:
- !secret telegram_chatid_martin - !secret telegram_chatid_martin
trusted_networks: trusted_networks:
- 127.0.0.1/32
- 192.168.178.80
- 149.154.167.197/32 - 149.154.167.197/32
- 149.154.167.198/31 - 149.154.167.198/31
- 149.154.167.200/29 - 149.154.167.200/29