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

streams: Add can_add_subscribers_group as a setting.

Browse Source 
We're not using this setting to check the permissions yet.
This commit is contained in:
Shubham Padia
2025-01-15 07:08:46 +00:00
committed by Tim Abbott
parent b1a5755864
commit 97996b9929
13 changed files with 217 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/lib/streams.py
View File

@@ -78,6 +78,7 @@ class StreamDict(TypedDict, total=False):
stream_post_policy: int
history_public_to_subscribers: bool | None
message_retention_days: int | None
can_add_subscribers_group: UserGroup | None
can_administer_channel_group: UserGroup | None
can_send_message_group: UserGroup | None
can_remove_subscribers_group: UserGroup | None
@@ -186,6 +187,7 @@ def create_stream_if_needed(
history_public_to_subscribers: bool | None = None,
stream_description: str = "",
message_retention_days: int | None = None,
can_add_subscribers_group: UserGroup | None = None,
can_administer_channel_group: UserGroup | None = None,
can_send_message_group: UserGroup | None = None,
can_remove_subscribers_group: UserGroup | None = None,
@@ -288,6 +290,7 @@ def create_streams_if_needed(
history_public_to_subscribers=stream_dict.get("history_public_to_subscribers"),
stream_description=stream_dict.get("description", ""),
message_retention_days=stream_dict.get("message_retention_days", None),
can_add_subscribers_group=stream_dict.get("can_add_subscribers_group", None),
can_administer_channel_group=stream_dict.get("can_administer_channel_group", None),
can_send_message_group=stream_dict.get("can_send_message_group", None),
can_remove_subscribers_group=stream_dict.get("can_remove_subscribers_group", None),
@@ -1020,10 +1023,14 @@ def stream_to_dict(
stream_weekly_traffic = None
if setting_groups_dict is not None:
can_add_subscribers_group = setting_groups_dict[stream.can_add_subscribers_group_id]
can_administer_channel_group = setting_groups_dict[stream.can_administer_channel_group_id]
can_send_message_group = setting_groups_dict[stream.can_send_message_group_id]
can_remove_subscribers_group = setting_groups_dict[stream.can_remove_subscribers_group_id]
else:
can_add_subscribers_group = get_group_setting_value_for_api(
stream.can_add_subscribers_group
)
can_administer_channel_group = get_group_setting_value_for_api(
stream.can_administer_channel_group
)
@@ -1038,6 +1045,7 @@ def stream_to_dict(
return APIStreamDict(
is_archived=stream.deactivated,
can_add_subscribers_group=can_add_subscribers_group,
can_administer_channel_group=can_administer_channel_group,
can_send_message_group=can_send_message_group,
can_remove_subscribers_group=can_remove_subscribers_group,