From 49014ac13f87de5b3fcf491db651bef991414a85 Mon Sep 17 00:00:00 2001 From: Anders Melchiorsen Date: Mon, 11 Mar 2019 12:31:36 +0100 Subject: [PATCH] Remove confusing warning for TTS without entity_id (#21927) --- homeassistant/components/tts/__init__.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/homeassistant/components/tts/__init__.py b/homeassistant/components/tts/__init__.py index 475ed2c6892..0cd4a1bb6c6 100644 --- a/homeassistant/components/tts/__init__.py +++ b/homeassistant/components/tts/__init__.py @@ -22,7 +22,7 @@ from homeassistant.components.media_player.const import ( ATTR_MEDIA_CONTENT_ID, ATTR_MEDIA_CONTENT_TYPE, MEDIA_TYPE_MUSIC, SERVICE_PLAY_MEDIA) from homeassistant.components.media_player.const import DOMAIN as DOMAIN_MP -from homeassistant.const import ATTR_ENTITY_ID +from homeassistant.const import ATTR_ENTITY_ID, ENTITY_MATCH_ALL from homeassistant.core import callback from homeassistant.exceptions import HomeAssistantError from homeassistant.helpers import config_per_platform @@ -126,7 +126,7 @@ async def async_setup(hass, config): async def async_say_handle(service): """Service handle for say.""" - entity_ids = service.data.get(ATTR_ENTITY_ID) + entity_ids = service.data.get(ATTR_ENTITY_ID, ENTITY_MATCH_ALL) message = service.data.get(ATTR_MESSAGE) cache = service.data.get(ATTR_CACHE) language = service.data.get(ATTR_LANGUAGE) @@ -144,11 +144,9 @@ async def async_setup(hass, config): data = { ATTR_MEDIA_CONTENT_ID: url, ATTR_MEDIA_CONTENT_TYPE: MEDIA_TYPE_MUSIC, + ATTR_ENTITY_ID: entity_ids, } - if entity_ids: - data[ATTR_ENTITY_ID] = entity_ids - await hass.services.async_call( DOMAIN_MP, SERVICE_PLAY_MEDIA, data, blocking=True)