jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-21 20:27:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Processing of messages from channel by telegram_bot (#51274)

Browse Source 
* Processing of messages from channel by telegram_bot

* formatted using Black

* refactor

* check allowed chat
This commit is contained in:
Nikolai 2021-05-31 17:35:49 +03:00 committed by GitHub
parent c9178e58b5
commit 52e7d57533
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
homeassistant/components/telegram_bot/__init__.py
View File

@ -68,6 +68,7 @@ ATTR_USERNAME = "username"
ATTR_VERIFY_SSL = "verify_ssl" ATTR_VERIFY_SSL = "verify_ssl"
ATTR_TIMEOUT = "timeout" ATTR_TIMEOUT = "timeout"
ATTR_MESSAGE_TAG = "message_tag" ATTR_MESSAGE_TAG = "message_tag"
ATTR_CHANNEL_POST = "channel_post"
CONF_ALLOWED_CHAT_IDS = "allowed_chat_ids" CONF_ALLOWED_CHAT_IDS = "allowed_chat_ids"
CONF_PROXY_URL = "proxy_url" CONF_PROXY_URL = "proxy_url"
@ -866,6 +867,31 @@ class BaseTelegramBotEntity:
return True, data return True, data
def _get_channel_post_data(self, msg_data):
"""Return boolean msg_data_is_ok and dict msg_data."""
if not msg_data:
return False, None
if "sender_chat" in msg_data and "chat" in msg_data and "text" in msg_data:
if (
msg_data["sender_chat"].get("id") not in self.allowed_chat_ids
and msg_data["chat"].get("id") not in self.allowed_chat_ids
):
# Neither sender_chat id nor chat id was in allowed_chat_ids,
# origin is not allowed.
_LOGGER.error("Incoming message is not allowed (%s)", msg_data)
return True, None
data = {
ATTR_MSGID: msg_data["message_id"],
ATTR_CHAT_ID: msg_data["chat"]["id"],
ATTR_TEXT: msg_data["text"],
}
return True, data
_LOGGER.error("Incoming message does not have required data (%s)", msg_data)
return False, None
def process_message(self, data): def process_message(self, data):
"""Check for basic message rules and fire an event if message is ok.""" """Check for basic message rules and fire an event if message is ok."""
if ATTR_MSG in data or ATTR_EDITED_MSG in data: if ATTR_MSG in data or ATTR_EDITED_MSG in data:
@ -916,6 +942,15 @@ class BaseTelegramBotEntity:
self.hass.bus.async_fire(event, event_data) self.hass.bus.async_fire(event, event_data)
return True return True
if ATTR_CHANNEL_POST in data:
event = EVENT_TELEGRAM_TEXT
data = data.get(ATTR_CHANNEL_POST)
message_ok, event_data = self._get_channel_post_data(data)
if event_data is None:
return message_ok
self.hass.bus.async_fire(event, event_data)
return True
_LOGGER.warning("Message with unknown data received: %s", data) _LOGGER.warning("Message with unknown data received: %s", data)
return True return True