From 07e97c0ee9e740c97e2ef38c3f54af03d7c7b946 Mon Sep 17 00:00:00 2001
From: Shadowghost <Ghost_of_Stone@web.de>
Date: Sun, 30 Aug 2026 12:30:56 +0200
Subject: Filter search candidates by user access in a single query

---
 .../Library/Search/SearchManager.cs                        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'Emby.Server.Implementations/Library/Search')

diff --git a/Emby.Server.Implementations/Library/Search/SearchManager.cs b/Emby.Server.Implementations/Library/Search/SearchManager.cs
index 0e180753a6..306a8673d5 100644
--- a/Emby.Server.Implementations/Library/Search/SearchManager.cs
+++ b/Emby.Server.Implementations/Library/Search/SearchManager.cs
@@ -112,13 +112,12 @@ public class SearchManager : ISearchManager
             return externalResults;
         }
 
-        var internalResults = await internalTask.ConfigureAwait(false);
         if (_internalProviders.Length > 0)
         {
             _logger.LogDebug("No results from external providers, using internal provider results");
         }
 
-        return internalResults;
+        return await internalTask.ConfigureAwait(false);
     }
 
     private async Task<IReadOnlyList<SearchResult>> FilterByUserAccessAsync(
@@ -144,17 +143,16 @@ public class SearchManager : ISearchManager
 
             baseQuery = _queryHelpers.ApplyAccessFiltering(dbContext, baseQuery, accessFilter);
 
-            var allowedCount = await baseQuery.CountAsync(cancellationToken).ConfigureAwait(false);
-            if (allowedCount == candidates.Count)
-            {
-                return candidates;
-            }
-
             var allowedIds = await baseQuery
                 .Select(e => e.Id)
                 .ToHashSetAsync(cancellationToken)
                 .ConfigureAwait(false);
 
+            if (allowedIds.Count == candidates.Count)
+            {
+                return candidates;
+            }
+
             var filtered = candidates.Where(c => allowedIds.Contains(c.ItemId)).ToList();
             if (filtered.Count < candidates.Count)
             {
-- 
cgit v1.2.3