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

streams: Refactor code to handle group setting values.

Browse Source 
This commit updates the code which computes the dict for
setting groups mapping named user groups to ID and anonymous
groups to UserGroupMembersDict. After the changes, the dict
contains only anonymous groups values and the setting values
for group IDs not present in dict will be computed based on
the fact that those are named user groups.

This is a preparatory refactor for optimizing computing group
setting values for register response by fetching all anonymous
groups membership data just once.
This commit is contained in:
Sahil Batra
2025-03-13 21:13:17 +05:30
committed by Tim Abbott
parent 512613ead4
commit bc2afd45b3
5 changed files with 141 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
zerver/views/streams.py
View File

@@ -70,7 +70,7 @@ from zerver.lib.streams import (
check_stream_name_available,
do_get_streams,
filter_stream_authorization_for_adding_subscribers,
get_group_setting_value_dict_for_streams,
get_anonymous_group_membership_dict_for_streams,
get_stream_permission_default_group,
get_stream_permission_policy_name,
list_to_streams,
@@ -619,7 +619,7 @@ def add_subscriptions_backend(
if principals is None:
principals = []
setting_groups_dict = {}
anonymous_group_membership = {}
group_settings_map = {}
request_settings_dict = locals()
# We don't want to calculate this value if no default values are
@@ -640,7 +640,8 @@ def add_subscriptions_backend(
setting_name=setting_name,
permission_configuration=permission_configuration,
)
setting_groups_dict[group_settings_map[setting_name].id] = setting_value
if not isinstance(setting_value, int):
anonymous_group_membership[group_settings_map[setting_name].id] = setting_value
else:
if system_groups_name_dict is None:
system_groups_name_dict = get_role_based_system_groups_dict(realm)
@@ -650,13 +651,9 @@ def add_subscriptions_backend(
if permission_configuration.default_group_name == "stream_creator_or_nobody":
# Default for some settings like "can_administer_channel_group"
# is anonymous group with stream creator.
setting_groups_dict[group_settings_map[setting_name].id] = UserGroupMembersDict(
direct_subgroups=[], direct_members=[user_profile.id]
anonymous_group_membership[group_settings_map[setting_name].id] = (
UserGroupMembersDict(direct_subgroups=[], direct_members=[user_profile.id])
)
else:
setting_groups_dict[group_settings_map[setting_name].id] = group_settings_map[
setting_name
].id
for stream_obj in streams_raw:
# 'color' field is optional
@@ -703,7 +700,7 @@ def add_subscriptions_backend(
user_profile,
autocreate=True,
is_default_stream=is_default_stream,
setting_groups_dict=setting_groups_dict,
anonymous_group_membership=anonymous_group_membership,
)
streams_categorized_by_permissions = filter_stream_authorization_for_adding_subscribers(
@@ -964,10 +961,10 @@ def get_stream_backend(
(stream, sub) = access_stream_by_id(user_profile, stream_id, require_content_access=False)
recent_traffic = get_streams_traffic({stream.id}, user_profile.realm)
setting_groups_dict = get_group_setting_value_dict_for_streams([stream])
anonymous_group_membership = get_anonymous_group_membership_dict_for_streams([stream])
return json_success(
request, data={"stream": stream_to_dict(stream, recent_traffic, setting_groups_dict)}
request, data={"stream": stream_to_dict(stream, recent_traffic, anonymous_group_membership)}
)