Apply review suggestions

1 files changed, 41 insertions, 11 deletions

diff --git a/Emby.Server.Implementations/Library/Search/SqlSearchProvider.cs b/Emby.Server.Implementations/Library/Search/SqlSearchProvider.cs
index 53c1cbbb79..bc766f1c8c 100644
--- a/Emby.Server.Implementations/Library/Search/SqlSearchProvider.cs
+++ b/Emby.Server.Implementations/Library/Search/SqlSearchProvider.cs
@@ -10,6 +10,7 @@ using Jellyfin.Data.Enums;
 using Jellyfin.Database.Implementations;
 using Jellyfin.Database.Implementations.Entities;
 using Jellyfin.Extensions;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Persistence;
 using MediaBrowser.Model.Configuration;
@@ -32,16 +33,30 @@ public class SqlSearchProvider : IInternalSearchProvider
 
     private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
     private readonly IItemTypeLookup _itemTypeLookup;
+    private readonly ILibraryManager _libraryManager;
+    private readonly IUserManager _userManager;
+    private readonly IItemQueryHelpers _queryHelpers;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="SqlSearchProvider"/> class.
     /// </summary>
     /// <param name="dbProvider">The database context factory.</param>
     /// <param name="itemTypeLookup">The item type lookup.</param>
-    public SqlSearchProvider(IDbContextFactory<JellyfinDbContext> dbProvider, IItemTypeLookup itemTypeLookup)
+    /// <param name="libraryManager">The library manager.</param>
+    /// <param name="userManager">The user manager.</param>
+    /// <param name="queryHelpers">The shared item query helpers.</param>
+    public SqlSearchProvider(
+        IDbContextFactory<JellyfinDbContext> dbProvider,
+        IItemTypeLookup itemTypeLookup,
+        ILibraryManager libraryManager,
+        IUserManager userManager,
+        IItemQueryHelpers queryHelpers)
     {
         _dbProvider = dbProvider;
         _itemTypeLookup = itemTypeLookup;
+        _libraryManager = libraryManager;
+        _userManager = userManager;
+        _queryHelpers = queryHelpers;
     }
 
     /// <inheritdoc/>
@@ -99,6 +114,7 @@ public class SqlSearchProvider : IInternalSearchProvider
             dbQuery = ApplyTypeFilter(dbQuery, query.IncludeItemTypes, query.ExcludeItemTypes);
             dbQuery = ApplyMediaTypeFilter(dbQuery, query.MediaTypes);
             dbQuery = ApplyParentFilter(dbQuery, query.ParentId);
+            dbQuery = ApplyUserAccessFilter(dbContext, dbQuery, query.UserId);
 
             // Compute the score in SQL: the ternary translates to a CASE WHEN. CleanName is
             // the pre-normalized (lowercase, diacritic-stripped) form, so we score against it
@@ -116,20 +132,13 @@ public class SqlSearchProvider : IInternalSearchProvider
                     : ContainsMatchScore
             });
 
-            var top = await scored
+            return await scored
                 .OrderByDescending(x => x.Score)
                 .ThenBy(x => x.Id)
                 .Take(limit)
-                .ToListAsync(cancellationToken)
+                .Select(x => new SearchResult(x.Id, x.Score))
+                .ToArrayAsync(cancellationToken)
                 .ConfigureAwait(false);
-
-            var results = new List<SearchResult>(top.Count);
-            foreach (var row in top)
-            {
-                results.Add(new SearchResult(row.Id, row.Score));
-            }
-
-            return results;
         }
     }
 
@@ -184,6 +193,27 @@ public class SqlSearchProvider : IInternalSearchProvider
         return query.Where(e => e.ParentId == pid || e.Parents!.Any(p => p.ParentItemId == pid));
     }
 
+    private IQueryable<BaseItemEntity> ApplyUserAccessFilter(
+        JellyfinDbContext dbContext,
+        IQueryable<BaseItemEntity> query,
+        Guid? userId)
+    {
+        if (!userId.HasValue || userId.Value.IsEmpty())
+        {
+            return query;
+        }
+
+        var user = _userManager.GetUserById(userId.Value);
+        if (user is null)
+        {
+            return query;
+        }
+
+        var accessFilter = new InternalItemsQuery(user);
+        _libraryManager.ConfigureUserAccess(accessFilter, user);
+        return _queryHelpers.ApplyAccessFiltering(dbContext, query, accessFilter);
+    }
+
     private List<string> MapKindsToTypeNames(BaseItemKind[] kinds)
     {
         var list = new List<string>(kinds.Length);