From 51657cadf0148aacc5615d05cc6592628069dce1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20H=C3=B6nig?= Date: Mon, 25 Sep 2017 13:03:10 +0200 Subject: [PATCH] outgoing_webhook: De-bug send_response_message(). This removes the unnecessary forwarder_user_profile argument and adds an error message in case the recipient type is invalid. --- zerver/lib/outgoing_webhook.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/zerver/lib/outgoing_webhook.py b/zerver/lib/outgoing_webhook.py index e5851cfe47..35ec3637ca 100644 --- a/zerver/lib/outgoing_webhook.py +++ b/zerver/lib/outgoing_webhook.py @@ -140,13 +140,13 @@ def send_response_message(bot_id, message, response_message_content): if recipient_type_name == 'stream': recipients = [message['display_recipient']] check_send_message(bot_user, get_client("OutgoingWebhookResponse"), recipient_type_name, recipients, - message['subject'], response_message_content, realm, forwarder_user_profile=bot_user) - else: - # Private message; only send if the bot is there in the recipients + message['subject'], response_message_content, realm) + elif recipient_type_name == 'private': recipients = [recipient['email'] for recipient in message['display_recipient']] - if bot_user.email in recipients: - check_send_message(bot_user, get_client("OutgoingWebhookResponse"), recipient_type_name, recipients, - message['subject'], response_message_content, realm, forwarder_user_profile=bot_user) + check_send_message(bot_user, get_client("OutgoingWebhookResponse"), recipient_type_name, recipients, + None, response_message_content, realm) + else: + raise JsonableError(_("Invalid message type")) def succeed_with_message(event, success_message): # type: (Dict[str, Any], Text) -> None