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

event_queue: Make path forward for push/email notifications clearer. 

This is a nonfunctional refactor, designed primarily to make it
simpler to extend this code path when we later add support for
controlling whether email notifications go out on stream messages.
This commit is contained in:
Tim Abbott 2017-09-15 00:43:42 -07:00
parent d0e8163f13
commit d06cb4e4fd
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/tornado/event_queue.py
View File

@ -693,12 +693,14 @@ def process_message_event(event_template, users):
mentioned = 'mentioned' in flags mentioned = 'mentioned' in flags
stream_push_notify = user_data.get('stream_push_notify', False) stream_push_notify = user_data.get('stream_push_notify', False)
# We first check if a message is potentially mentionable,
# since receiver_is_off_zulip is somewhat expensive.
if private_message or mentioned or stream_push_notify: if private_message or mentioned or stream_push_notify:
idle = receiver_is_off_zulip(user_profile_id) or (user_profile_id in missed_message_userids) idle = receiver_is_off_zulip(user_profile_id) or (user_profile_id in missed_message_userids)
always_push_notify = user_data.get('always_push_notify', False) always_push_notify = user_data.get('always_push_notify', False)
notified = dict() # type: Dict[str, bool] notified = dict() # type: Dict[str, bool]
if idle or always_push_notify: if (idle or always_push_notify) and (private_message or mentioned or stream_push_notify):
notice = build_offline_notification(user_profile_id, message_id) notice = build_offline_notification(user_profile_id, message_id)
notice['triggers'] = { notice['triggers'] = {
'private_message': private_message, 'private_message': private_message,
@ -709,7 +711,10 @@ def process_message_event(event_template, users):
queue_json_publish("missedmessage_mobile_notifications", notice, lambda notice: None) queue_json_publish("missedmessage_mobile_notifications", notice, lambda notice: None)
notified['push_notified'] = True notified['push_notified'] = True
# Send missed_message emails if a private message or a mention # Send missed_message emails if a private message or a
# mention. Eventually, we'll add settings to allow email
# notifications to match the model of push notifications
# above.
if idle and (private_message or mentioned): if idle and (private_message or mentioned):
# We require RabbitMQ to do this, as we can't call the email handler # We require RabbitMQ to do this, as we can't call the email handler
# from the Tornado process. So if there's no rabbitmq support do nothing # from the Tornado process. So if there's no rabbitmq support do nothing