paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-13 18:36:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

outgoing_webhook: De-bug send_response_message().

Browse Source 
This removes the unnecessary forwarder_user_profile argument
and adds an error message in case the recipient type is invalid.
This commit is contained in:
Robert Hönig
2017-09-25 13:03:10 +02:00
committed by Tim Abbott
parent 15a1bf2b58
commit 51657cadf0
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zerver/lib/outgoing_webhook.py
View File

@@ -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