Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow members of allowed groups to talk to telegram_bot (#43241)

pull/43866/head
Wictor 2020-12-02 19:25:35 +01:00 committed by GitHub
parent 519ec64522
commit 5fa00244da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -744,11 +744,12 @@ class BaseTelegramBotEntity:
_LOGGER.error("Incoming message does not have required data (%s)", msg_data) _LOGGER.error("Incoming message does not have required data (%s)", msg_data)
return False, None return False, None
if msg_data["from"].get("id") not in self.allowed_chat_ids or ( if (
"chat" in msg_data msg_data["from"].get("id") not in self.allowed_chat_ids
and msg_data["chat"].get("id") not in self.allowed_chat_ids and msg_data["chat"].get("id") not in self.allowed_chat_ids
): ):
# Origin is not allowed. # Neither from id nor chat id was in allowed_chat_ids,
# origin is not allowed.
_LOGGER.error("Incoming message is not allowed (%s)", msg_data) _LOGGER.error("Incoming message is not allowed (%s)", msg_data)
return True, None return True, None