paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

get_recipient_info: Simplify user_ids_muting_topic handling.

Browse Source 
Rather than subtracting sets in multiple places, it's simpler/cleaner
to just check which users are in the set when processing them.

This refactoring be helpful when we extend the get_recipient_info
logic to handle wildcard mentions as well.
This commit is contained in:
Tim Abbott
2019-11-06 15:57:51 -08:00
parent 43a965ff19
commit 509da6c9a6
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
zerver/lib/actions.py
View File

@@ -1028,6 +1028,7 @@ def get_recipient_info(recipient: Recipient,
# stream_topic. We may eventually want to have different versions # stream_topic. We may eventually want to have different versions
# of this function for different message types. # of this function for different message types.
assert(stream_topic is not None) assert(stream_topic is not None)
user_ids_muting_topic = stream_topic.user_ids_muting_topic()
subscription_rows = stream_topic.get_active_subscriptions().annotate( subscription_rows = stream_topic.get_active_subscriptions().annotate(
user_profile_email_notifications=F('user_profile__enable_stream_email_notifications'), user_profile_email_notifications=F('user_profile__enable_stream_email_notifications'),
@@ -1052,25 +1053,25 @@ def get_recipient_info(recipient: Recipient,
# values are not null). # values are not null).
if row['is_muted']: if row['is_muted']:
return False return False
if row['user_profile_id'] in user_ids_muting_topic:
return False
if row[setting] is not None: if row[setting] is not None:
return row[setting] return row[setting]
return row['user_profile_' + setting] return row['user_profile_' + setting]
user_ids_muting_topic = stream_topic.user_ids_muting_topic()
stream_push_user_ids = { stream_push_user_ids = {
row['user_profile_id'] row['user_profile_id']
for row in subscription_rows for row in subscription_rows
# Note: muting a stream overrides stream_push_notify # Note: muting a stream overrides stream_push_notify
if should_send('push_notifications', row) if should_send('push_notifications', row)
} - user_ids_muting_topic }
stream_email_user_ids = { stream_email_user_ids = {
row['user_profile_id'] row['user_profile_id']
for row in subscription_rows for row in subscription_rows
# Note: muting a stream overrides stream_email_notify # Note: muting a stream overrides stream_email_notify
if should_send('email_notifications', row) if should_send('email_notifications', row)
} - user_ids_muting_topic }
elif recipient.type == Recipient.HUDDLE: elif recipient.type == Recipient.HUDDLE:
message_to_user_ids = get_huddle_user_ids(recipient) message_to_user_ids = get_huddle_user_ids(recipient)