Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor: Dedup check_send_message() call.

This commit is contained in:
Steve Howell 2018-10-09 11:45:39 +00:00 committed by Tim Abbott
parent e641036911
commit 3bb8cbe0c7
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zerver/lib/outgoing_webhook.py
View File

@ -138,15 +138,23 @@ def send_response_message(bot_id: str, message: Dict[str, Any], response_message
if message_type == 'stream':
recipients = [message['display_recipient']]
check_send_message(bot_user, client, message_type, recipients,
message['subject'], response_message_content, realm)
topic_name = message['subject']
elif message_type == 'private':
recipients = [recipient['email'] for recipient in message['display_recipient']]
check_send_message(bot_user, client, message_type, recipients,
None, response_message_content, realm)
topic_name = None
else:
raise JsonableError(_("Invalid message type"))
check_send_message(
sender=bot_user,
client=client,
message_type_name=message_type,
message_to=recipients,
topic_name=topic_name,
message_content=response_message_content,
realm=realm,
)
def succeed_with_message(event: Dict[str, Any], success_message: str) -> None:
success_message = "Success! " + success_message
send_response_message(event['user_profile_id'], event['message'], success_message)