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

actions: Simplify logic of get_recipient_from_user_profiles.

Browse Source 
This just uses the early return pattern and a local variable to
produce somewhat more readable code.
This commit is contained in:
Tim Abbott
2019-12-12 11:59:27 -08:00
parent 9995dab095
commit 63fd7bdf57
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
zerver/lib/actions.py
View File

@@ -1932,13 +1932,16 @@ def get_recipient_from_user_profiles(recipient_profiles: Sequence[UserProfile],
if (len(recipient_profiles_map) == 2 and sender.id in recipient_profiles_map):
del recipient_profiles_map[sender.id]
if len(recipient_profiles_map) > 1:
# Make sure the sender is included in huddle messages
recipient_profiles_map[sender.id] = sender
user_ids = set([user_id for user_id in recipient_profiles_map]) # type: Set[int]
return get_huddle_recipient(user_ids)
else:
return list(recipient_profiles_map.values())[0].recipient
assert len(recipient_profiles_map) != 0
if len(recipient_profiles_map) == 1:
user_profile = list(recipient_profiles_map.values())[0]
return user_profile.recipient
# Otherwise, we need a huddle. Make sure the sender is included in huddle messages
recipient_profiles_map[sender.id] = sender
user_ids = set([user_id for user_id in recipient_profiles_map]) # type: Set[int]
return get_huddle_recipient(user_ids)
def validate_recipient_user_profiles(user_profiles: Sequence[UserProfile],
sender: UserProfile,