From 84ca2258be34b4a5196bf62ec875939345fd8ea5 Mon Sep 17 00:00:00 2001
From: Timothy Jaeryang Baek <tim@openwebui.com>
Date: Tue, 25 Nov 2025 04:45:52 -0500
Subject: [PATCH] refac

---
 backend/open_webui/models/users.py                        | 8 +++++++-
 backend/open_webui/routers/channels.py                    | 6 ++----
 .../components/channel/ChannelInfoModal/UserList.svelte   | 7 +++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/backend/open_webui/models/users.py b/backend/open_webui/models/users.py
index 7df3f588cf..a66a95a98c 100644
--- a/backend/open_webui/models/users.py
+++ b/backend/open_webui/models/users.py
@@ -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(
diff --git a/backend/open_webui/routers/channels.py b/backend/open_webui/routers/channels.py
index 37b6d23dfd..e47c98554e 100644
--- a/backend/open_webui/routers/channels.py
+++ b/backend/open_webui/routers/channels.py
@@ -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)
 
diff --git a/src/lib/components/channel/ChannelInfoModal/UserList.svelte b/src/lib/components/channel/ChannelInfoModal/UserList.svelte
index 1df7c3b30f..151def123c 100644
--- a/src/lib/components/channel/ChannelInfoModal/UserList.svelte
+++ b/src/lib/components/channel/ChannelInfoModal/UserList.svelte
@@ -93,7 +93,7 @@
 		<div class="my-10">
 			<Spinner className="size-5" />
 		</div>
-	{:else}
+	{:else if users.length > 0}
 		<div class="flex gap-1">
 			<div class=" flex w-full space-x-2">
 				<div class="flex flex-1">
@@ -119,7 +119,6 @@
 				</div>
 			</div>
 		</div>
-
 		<div class="scrollbar-hidden relative whitespace-nowrap w-full max-w-full">
 			<div class=" text-sm text-left text-gray-500 dark:text-gray-400 w-full max-w-full">
 				<div
@@ -226,5 +225,9 @@
 		{#if total > 30}
 			<Pagination bind:page count={total} perPage={30} />
 		{/if}
+	{:else}
+		<div class="text-gray-500 text-xs text-center py-5 px-10">
+			{$i18n.t('No users were found.')}
+		</div>
 	{/if}
 </div>