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

Remove domain from list of pre-fetched fields for message recipients.

Browse Source
This commit is contained in:
Rishi Gupta
2017-03-13 15:17:41 -07:00
committed by Tim Abbott
parent 5bf01fb7d4
commit 88abb7871d
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/lib/actions.py
View File

@@ -703,9 +703,8 @@ def get_recipient_user_profiles(recipient, sender_id):
'user_profile__email',
'user_profile__enable_online_push_notifications',
'user_profile__is_active',
'user_profile__realm__domain'
]
query = Subscription.objects.select_related("user_profile", "user_profile__realm").only(*fields).filter(
query = Subscription.objects.select_related("user_profile").only(*fields).filter(
recipient=recipient, active=True)
recipients = [s.user_profile for s in query]
else:
@@ -2846,7 +2845,7 @@ def gather_subscriptions_helper(user_profile, include_subscribers=True):
stream_ids = set([sub["recipient__type_id"] for sub in sub_dicts])
all_streams = get_active_streams(user_profile.realm).select_related(
"realm").values("id", "name", "invite_only", "realm_id",
"realm__domain", "email_token", "description")
"email_token", "description")
stream_dicts = [stream for stream in all_streams if stream['id'] in stream_ids]
stream_hash = {}