From 8785e5826e31f2d5d8ee70e2b10a5301c5ada5dd Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 10 Feb 2017 16:39:02 +0100 Subject: [PATCH] telegram small cleanup/style (#5852) --- homeassistant/components/telegram_webhooks.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/homeassistant/components/telegram_webhooks.py b/homeassistant/components/telegram_webhooks.py index 541b81a9567..30f7935d40b 100644 --- a/homeassistant/components/telegram_webhooks.py +++ b/homeassistant/components/telegram_webhooks.py @@ -106,19 +106,16 @@ class BotPushReceiver(HomeAssistantView): data = yield from request.json() data = data['message'] + if data['from']['id'] not in self.users: + _LOGGER.warning("User not allowed") + return self.json_message('Invalid user', HTTP_BAD_REQUEST) + if data['text'][0] != '/': _LOGGER.warning('no command') return self.json({}) - except (ValueError, IndexError): + except (KeyError, IndexError): return self.json_message('Invalid JSON', HTTP_BAD_REQUEST) - try: - if data['from']['id'] not in self.users: - raise ValueError() - except (ValueError, IndexError): - _LOGGER.warning("User not allowed") - return self.json_message('Invalid user', HTTP_BAD_REQUEST) - _LOGGER.debug("Received telegram data: %s", data) pieces = data['text'].split(' ')