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

stream: Do not pass user group object when changing group setting.

Browse Source 
Passing the user group object in case of named user group is fine for
`do_change_stream_group_based_setting`. But for anonymous groups, if the
code path calling that function is not creating a new anonymous user
group, it has to modify the user group by itself before calling that
function. In that case, if `old_setting_api_value` is not provided,
`old_user_group` is calculated false, since the group id has not changed
for the stream, but the group membership has changed.
old_setting_api_value will be the same as new_setting_api_value in such
a case.
It is better to accept the new setting value as either an int or
UserGroupMembersDict, so that `do_change_stream_group_based_setting` can
decide what to do with that argument.
This commit is contained in:
Shubham Padia
2025-03-03 13:15:41 +00:00
committed by Tim Abbott
parent 0c57126104
commit 8481dcedc4
13 changed files with 318 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
zerver/tests/test_message_send.py
View File

@@ -59,6 +59,7 @@ from zerver.lib.test_helpers import (
reset_email_visibility_to_everyone_in_zulip_realm,
)
from zerver.lib.timestamp import datetime_to_timestamp
from zerver.lib.types import UserGroupMembersDict
from zerver.models import (
Message,
NamedUserGroup,
@@ -384,9 +385,11 @@ class MessagePOSTTest(ZulipTestCase):
)
self.assertEqual(self.get_last_message().content, "Test message by notification bot")
setting_group = self.create_or_update_anonymous_group_for_setting([othello], [owners_group])
setting_group_member_dict = UserGroupMembersDict(
direct_members=[othello.id], direct_subgroups=[owners_group.id]
)
do_change_stream_group_based_setting(
stream, "can_send_message_group", setting_group, acting_user=iago
stream, "can_send_message_group", setting_group_member_dict, acting_user=iago
)
self._send_and_verify_message(
@@ -450,9 +453,11 @@ class MessagePOSTTest(ZulipTestCase):
othello, stream_name, "Not authorized to send to channel 'private_stream"
)
othello_group = self.create_or_update_anonymous_group_for_setting([othello], [])
othello_group_member_dict = UserGroupMembersDict(
direct_members=[othello.id], direct_subgroups=[]
)
do_change_stream_group_based_setting(
stream, "can_send_message_group", othello_group, acting_user=othello
stream, "can_send_message_group", othello_group_member_dict, acting_user=othello
)
self.subscribe(othello, stream_name)
@@ -460,7 +465,7 @@ class MessagePOSTTest(ZulipTestCase):
self.unsubscribe(othello, stream_name)
do_change_stream_group_based_setting(
stream, "can_add_subscribers_group", othello_group, acting_user=othello
stream, "can_add_subscribers_group", othello_group_member_dict, acting_user=othello
)
self._send_and_verify_message(othello, stream_name, allow_unsubscribed_sender=True)
@@ -485,9 +490,11 @@ class MessagePOSTTest(ZulipTestCase):
# `history_public_to_subscribers` might be a relevant property
# for public channels
guest_user = self.example_user("polonius")
guest_user_group = self.create_or_update_anonymous_group_for_setting([guest_user], [])
guest_user_group_member_dict = UserGroupMembersDict(
direct_members=[guest_user.id], direct_subgroups=[]
)
do_change_stream_group_based_setting(
stream, "can_send_message_group", guest_user_group, acting_user=othello
stream, "can_send_message_group", guest_user_group_member_dict, acting_user=othello
)
do_change_stream_permission(
stream,
@@ -524,7 +531,7 @@ class MessagePOSTTest(ZulipTestCase):
#
# But can_add_subscribers_group has !allow_everyone_group.
do_change_stream_group_based_setting(
stream, "can_add_subscribers_group", guest_user_group, acting_user=othello
stream, "can_add_subscribers_group", guest_user_group_member_dict, acting_user=othello
)
self._send_and_verify_message(
guest_user,
@@ -1732,7 +1739,10 @@ class StreamMessagesTest(ZulipTestCase):
name=SystemGroups.MEMBERS, realm=realm, is_system_group=True
)
do_change_stream_group_based_setting(
stream, "can_send_message_group", members_group, acting_user=self.example_user("iago")
stream,
"can_send_message_group",
members_group,
acting_user=self.example_user("iago"),
)
flush_per_request_caches()