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

Allow multiple recipients for XMPP (#45328) 

* recipient is a string list instead of a single string now
* this does NOT break existing automations/etc using this component
pull/46791/head
Andreas Oetken 2021-02-19 15:56:20 +01:00 committed by GitHub
parent 3e82509263
commit 250327fac4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
homeassistant/components/xmpp/notify.py
View File

@ -55,7 +55,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
{
vol.Required(CONF_SENDER): cv.string,
vol.Required(CONF_PASSWORD): cv.string,
vol.Required(CONF_RECIPIENT): cv.string,
vol.Required(CONF_RECIPIENT): vol.All(cv.ensure_list, [cv.string]),
vol.Optional(CONF_RESOURCE, default=DEFAULT_RESOURCE): cv.string,
vol.Optional(CONF_ROOM, default=""): cv.string,
vol.Optional(CONF_TLS, default=True): cv.boolean,
@ -87,7 +87,7 @@ class XmppNotificationService(BaseNotificationService):
self._sender = sender
self._resource = resource
self._password = password
self._recipient = recipient
self._recipients = recipient
self._tls = tls
self._verify = verify
self._room = room
@ -102,7 +102,7 @@ class XmppNotificationService(BaseNotificationService):
await async_send_message(
f"{self._sender}/{self._resource}",
self._password,
self._recipient,
self._recipients,
self._tls,
self._verify,
self._room,
@ -116,7 +116,7 @@ class XmppNotificationService(BaseNotificationService):
async def async_send_message(
sender,
password,
recipient,
recipients,
use_tls,
verify_certificate,
room,
@ -182,19 +182,21 @@ async def async_send_message(
url = await self.upload_file(timeout=timeout)
_LOGGER.info("Upload success")
if room:
_LOGGER.info("Sending file to %s", room)
message = self.Message(sto=room, stype="groupchat")
else:
_LOGGER.info("Sending file to %s", recipient)
message = self.Message(sto=recipient, stype="chat")
message["body"] = url
message["oob"]["url"] = url
try:
message.send()
except (IqError, IqTimeout, XMPPError) as ex:
_LOGGER.error("Could not send image message %s", ex)
for recipient in recipients:
if room:
_LOGGER.info("Sending file to %s", room)
message = self.Message(sto=room, stype="groupchat")
else:
_LOGGER.info("Sending file to %s", recipient)
message = self.Message(sto=recipient, stype="chat")
message["body"] = url
message["oob"]["url"] = url
try:
message.send()
except (IqError, IqTimeout, XMPPError) as ex:
_LOGGER.error("Could not send image message %s", ex)
if room:
break
except (IqError, IqTimeout, XMPPError) as ex:
_LOGGER.error("Upload error, could not send message %s", ex)
except NotConnectedError as ex:
@ -336,8 +338,9 @@ async def async_send_message(
self.plugin["xep_0045"].join_muc(room, sender, wait=True)
self.send_message(mto=room, mbody=message, mtype="groupchat")
else:
_LOGGER.debug("Sending message to %s", recipient)
self.send_message(mto=recipient, mbody=message, mtype="chat")
for recipient in recipients:
_LOGGER.debug("Sending message to %s", recipient)
self.send_message(mto=recipient, mbody=message, mtype="chat")
except (IqError, IqTimeout, XMPPError) as ex:
_LOGGER.error("Could not send text message %s", ex)
except NotConnectedError as ex: