This commit is contained in:
Timothy Jaeryang Baek
2025-11-25 04:45:52 -05:00
parent e6d8f89850
commit 84ca2258be
3 changed files with 14 additions and 7 deletions

View File

@@ -249,10 +249,16 @@ class UsersTable:
)
user_ids = filter.get("user_ids")
group_ids = filter.get("group_ids")
if isinstance(user_ids, list) and isinstance(group_ids, list):
# If both are empty lists, return no users
if not user_ids and not group_ids:
return {"users": [], "total": 0}
if user_ids:
query = query.filter(User.id.in_(user_ids))
group_ids = filter.get("group_ids")
if group_ids:
query = query.filter(
exists(

View File

@@ -166,10 +166,8 @@ async def get_channel_users_by_id(
permitted_ids = get_permitted_group_and_user_ids("read", channel.access_control)
if permitted_ids:
if permitted_ids.get("user_ids"):
filter["user_ids"] = permitted_ids.get("user_ids")
if permitted_ids.get("group_ids"):
filter["group_ids"] = permitted_ids.get("group_ids")
filter["user_ids"] = permitted_ids.get("user_ids")
filter["group_ids"] = permitted_ids.get("group_ids")
result = Users.get_users(filter=filter, skip=skip, limit=limit)