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

event_queue: Refactor code for checking if a message was mentioned. 

Now, the two code paths do the same thing for this check.

It seems like there may be more work to do here, in that
wildcard_mentioned messages seem to not be eligible for sending
email/push notifications.  We probably want to add some logic there
for the user doing the mention to control whether or not it does.
This commit is contained in:
Tim Abbott 2017-09-21 04:56:57 -07:00
parent f68089fbe1
commit 9749826e9c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/tornado/event_queue.py
View File

@ -625,10 +625,13 @@ def missedmessage_hook(user_profile_id, queue, last_for_client):
message_ids_to_notify = [] # type: List[Dict[str, Any]] message_ids_to_notify = [] # type: List[Dict[str, Any]]
for event in queue.event_queue.contents(): for event in queue.event_queue.contents():
if not event['type'] == 'message' or not event['flags']: if event['type'] != 'message':
continue continue
assert 'flags' in event
if 'mentioned' in event['flags'] and 'read' not in event['flags']: flags = event['flags']
mentioned = 'mentioned' in flags and 'read' not in flags
if mentioned:
notify_info = dict(message_id=event['message']['id']) notify_info = dict(message_id=event['message']['id'])
if not event.get('push_notified', False): if not event.get('push_notified', False):
@ -720,7 +723,7 @@ def process_message_event(event_template, users):
# If the recipient was offline and the message was a single or group PM to them # If the recipient was offline and the message was a single or group PM to them
# or they were @-notified potentially notify more immediately # or they were @-notified potentially notify more immediately
private_message = message_type == "private" and user_profile_id != sender_id private_message = message_type == "private" and user_profile_id != sender_id
mentioned = 'mentioned' in flags mentioned = 'mentioned' in flags and 'read' not 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, # We first check if a message is potentially mentionable,