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

user_groups: Rename get_user_group_members to get_user_group_direct_members.

Browse Source 
This is a prep commit for new permissions model in which a user group would
be able to have a subgroup.

This commit renames get_user_group_members to get_user_group_direct_members
to specify that the function is used only to fetch direct members of group
and excludes the subgroup's members.

Extracted this commit from #19866.

Co-authored-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Sahil Batra
2021-10-09 23:19:43 +05:30
committed by Tim Abbott
parent 44499fe22c
commit 82af2d3db5
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/lib/email_notifications.py
View File

@@ -31,7 +31,7 @@ from zerver.lib.url_encoding import (
stream_narrow_url,
topic_narrow_url,
)
from zerver.lib.user_groups import access_user_group_by_id, get_user_group_members
from zerver.lib.user_groups import access_user_group_by_id, get_user_group_direct_members
from zerver.models import (
Message,
Recipient,
@@ -368,7 +368,7 @@ def get_mentioned_user_group_name(
smallest_user_group_name = None
for user_group_id in mentioned_user_group_ids:
current_user_group = access_user_group_by_id(user_group_id, user_profile, for_mention=True)
current_user_group_size = len(get_user_group_members(current_user_group))
current_user_group_size = len(get_user_group_direct_members(current_user_group))
if current_user_group_size < smallest_user_group_size:
# If multiple user groups are mentioned, we prefer the

4
zerver/lib/user_groups.py
View File

@@ -14,7 +14,7 @@ def access_user_group_by_id(
user_group = UserGroup.objects.get(id=user_group_id, realm=user_profile.realm)
if not for_mention and user_group.is_system_group:
raise JsonableError(_("Insufficient permission"))
group_member_ids = get_user_group_members(user_group)
group_member_ids = get_user_group_direct_members(user_group)
if (
not user_profile.is_realm_admin
and not user_profile.is_moderator
@@ -83,7 +83,7 @@ def create_user_group(
return user_group
def get_user_group_members(user_group: UserGroup) -> List[UserProfile]:
def get_user_group_direct_members(user_group: UserGroup) -> List[UserProfile]:
members = UserGroupMembership.objects.filter(user_group=user_group)
return [member.user_profile.id for member in members]

4
zerver/views/user_groups.py
View File

@@ -18,7 +18,7 @@ from zerver.lib.response import json_success
from zerver.lib.user_groups import (
access_user_group_by_id,
get_memberships_of_users,
get_user_group_members,
get_user_group_direct_members,
user_groups_in_realm_serialized,
)
from zerver.lib.users import user_ids_to_users
@@ -136,7 +136,7 @@ def remove_members_from_group_backend(
user_profiles = user_ids_to_users(members, user_profile.realm)
user_group = access_user_group_by_id(user_group_id, user_profile)
group_member_ids = get_user_group_members(user_group)
group_member_ids = get_user_group_direct_members(user_group)
for member in members:
if member not in group_member_ids:
raise JsonableError(_("There is no member '{}' in this user group").format(member))