Merge remote-tracking branch 'upstream/master' into search-rebased

1 files changed, 9 insertions, 0 deletions

diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs
index bee1bf3f9d..d905775aef 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs
@@ -1020,6 +1020,15 @@ public sealed partial class BaseItemRepository
             baseQuery = baseQuery.Where(e => e.Parents!.AsQueryable().Any(ancestorFilter));
         }
 
+        if (filter.LinkedChildAncestorIds.Length > 0)
+        {
+            // Keep folder-like items (BoxSets, Playlists) whose linked children descend from any of the requested ancestor ids.
+            var linkedChildAncestorIds = filter.LinkedChildAncestorIds;
+            baseQuery = baseQuery.Where(e => context.LinkedChildren.Any(lc =>
+                lc.ParentId == e.Id
+                && lc.Child!.Parents!.Any(a => linkedChildAncestorIds.Contains(a.ParentItemId))));
+        }
+
         if (!string.IsNullOrWhiteSpace(filter.AncestorWithPresentationUniqueKey))
         {
             baseQuery = baseQuery