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

stream: Refactor to use functions for administer and add subscribers.

Browse Source
This commit is contained in:
Shubham Padia
2025-02-04 10:31:34 +00:00
committed by Tim Abbott
parent 6abc61f91a
commit 98c5243c9b
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
zerver/lib/streams.py
View File

@@ -317,6 +317,22 @@ def subscribed_to_stream(user_profile: UserProfile, stream_id: int) -> bool:
).exists()
def is_user_in_can_administer_channel_group(
stream: Stream, user_recursive_group_ids: set[int]
) -> bool:
group_allowed_to_administer_channel_id = stream.can_administer_channel_group_id
assert group_allowed_to_administer_channel_id is not None
return group_allowed_to_administer_channel_id in user_recursive_group_ids
def is_user_in_can_add_subscribers_group(
stream: Stream, user_recursive_group_ids: set[int]
) -> bool:
group_allowed_to_add_subscribers_id = stream.can_add_subscribers_group_id
assert group_allowed_to_add_subscribers_id is not None
return group_allowed_to_add_subscribers_id in user_recursive_group_ids
def check_stream_access_based_on_can_send_message_group(
sender: UserProfile, stream: Stream
) -> None:
@@ -815,15 +831,10 @@ def get_streams_to_which_user_cannot_add_subscribers(
if allow_default_streams and stream.id in default_stream_ids:
continue
group_allowed_to_administer_channel_id = stream.can_administer_channel_group_id
assert group_allowed_to_administer_channel_id is not None
if group_allowed_to_administer_channel_id in user_recursive_group_ids:
if is_user_in_can_administer_channel_group(stream, user_recursive_group_ids):
continue
group_allowed_to_add_subscribers_id = stream.can_add_subscribers_group_id
assert group_allowed_to_add_subscribers_id is not None
if group_allowed_to_add_subscribers_id not in user_recursive_group_ids:
if not is_user_in_can_add_subscribers_group(stream, user_recursive_group_ids):
result.append(stream)
return result