Backport pull request #17881 from jellyfin/release-12.z

Fix /UserViews exhausting memory and reporting random child counts

Original-merge: a838a06aa51eac388a76e9e6421f1a80873c417b

Merged-by: crobibero <cody@robibe.ro>

Backported-by: Cody Robibero <cody@robibe.ro>

3 files changed, 56 insertions, 29 deletions

diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.cs
index 8ac6722eef..92f3a4fceb 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.cs
@@ -652,24 +652,26 @@ public sealed partial class BaseItemRepository
     {
         var maxScore = maxRating.Score;
         var maxSubScore = maxRating.SubScore ?? 0;
-        var linkedChildren = context.LinkedChildren;
+
+        // Only a manual link makes an item a container of other items.
+        var members = context.LinkedChildren
+            .Where(lc => lc.ChildType == Database.Implementations.Entities.LinkedChildType.Manual);
 
         return e =>
-            // Item has a rating: check against limit
-            (e.InheritedParentalRatingValue != null
-                && (e.InheritedParentalRatingValue < maxScore
-                    || (e.InheritedParentalRatingValue == maxScore && (e.InheritedParentalRatingSubValue ?? 0) <= maxSubScore)))
-            // Item has no rating
-            || (e.InheritedParentalRatingValue == null
-                && (
-                    // No linked children (not a BoxSet/Playlist): pass as unrated
-                    !linkedChildren.Any(lc => lc.ParentId == e.Id)
-                    // Has linked children: at least one child must be within limits
-                    || linkedChildren.Any(lc => lc.ParentId == e.Id
-                        && (lc.Child!.InheritedParentalRatingValue == null
-                            || lc.Child.InheritedParentalRatingValue < maxScore
-                            || (lc.Child.InheritedParentalRatingValue == maxScore
-                                && (lc.Child.InheritedParentalRatingSubValue ?? 0) <= maxSubScore)))));
+            // The item's own rating, where it has one, has to be within the limit. An unrated item
+            // passes here; blocking those is what BlockUnratedItems does.
+            (e.InheritedParentalRatingValue == null
+                || e.InheritedParentalRatingValue < maxScore
+                || (e.InheritedParentalRatingValue == maxScore && (e.InheritedParentalRatingSubValue ?? 0) <= maxSubScore))
+            // A container is only as visible as its members: a BoxSet or Playlist with nothing left
+            // in it for this user is hidden whatever rating it carries itself. BoxSet.IsVisible
+            // applies the same rule in memory, and a count has to agree with the listing it counts.
+            && (!members.Any(lc => lc.ParentId == e.Id)
+                || members.Any(lc => lc.ParentId == e.Id
+                    && (lc.Child!.InheritedParentalRatingValue == null
+                        || lc.Child.InheritedParentalRatingValue < maxScore
+                        || (lc.Child.InheritedParentalRatingValue == maxScore
+                            && (lc.Child.InheritedParentalRatingSubValue ?? 0) <= maxSubScore))));
     }
 
     /// <inheritdoc />
diff --git a/Jellyfin.Server.Implementations/Item/ItemCountService.cs b/Jellyfin.Server.Implementations/Item/ItemCountService.cs
index 57705cdf11..f8903127b9 100644
--- a/Jellyfin.Server.Implementations/Item/ItemCountService.cs
+++ b/Jellyfin.Server.Implementations/Item/ItemCountService.cs
@@ -483,7 +483,19 @@ public class ItemCountService : IItemCountService
 
         var includeVirtual = user is null || user.DisplayMissingEpisodes;
 
-        var hierarchicalCounts = dbContext.BaseItems
+        var accessibleItems = dbContext.BaseItems.AsNoTracking();
+        if (user is null)
+        {
+            // Access filtering is what would otherwise drop an alternate version, and a child count
+            // must not report a title twice just because no user was passed in.
+            accessibleItems = accessibleItems.Where(DescendantQueryHelper.IsDistinctLibraryItem);
+        }
+        else
+        {
+            accessibleItems = _queryHelpers.ApplyAccessFiltering(dbContext, accessibleItems, new InternalItemsQuery(user));
+        }
+
+        var hierarchicalCounts = accessibleItems
             .Where(b => b.ParentId.HasValue && !b.SeasonId.HasValue && (includeVirtual || !b.IsVirtualItem))
             .WhereOneOrMany(parentIdsArray, b => b.ParentId!.Value)
             .GroupBy(b => b.ParentId!.Value)
@@ -493,20 +505,22 @@ public class ItemCountService : IItemCountService
         // An episode is a child of its season even when it is not stored under one: with a flat
         // structure ParentId points at the series, so counting by ParentId alone leaves the season
         // empty and counts its episodes towards the series instead.
-        var seasonCounts = dbContext.BaseItems
+        var seasonCounts = accessibleItems
             .Where(b => b.SeasonId.HasValue && (includeVirtual || !b.IsVirtualItem))
             .WhereOneOrMany(parentIdsArray, b => b.SeasonId!.Value)
             .GroupBy(b => b.SeasonId!.Value)
             .Select(g => new { SeasonId = g.Key, Count = g.Count() })
             .ToDictionary(x => x.SeasonId, x => x.Count);
 
+        // A linked child counts only when the item it points at is one the user may open.
         var linkedCounts = dbContext.LinkedChildren
             .WhereOneOrMany(parentIdsArray, lc => lc.ParentId)
-            .GroupBy(lc => lc.ParentId)
+            .Join(accessibleItems, lc => lc.ChildId, b => b.Id, (lc, b) => lc.ParentId)
+            .GroupBy(parentId => parentId)
             .Select(g => new { ParentId = g.Key, Count = g.Count() })
             .ToDictionary(x => x.ParentId, x => x.Count);
 
-        var mergedChildCounts = GetMergedChildCounts(dbContext, parentIdsArray, includeVirtual);
+        var mergedChildCounts = GetMergedChildCounts(dbContext, accessibleItems, parentIdsArray, includeVirtual);
 
         var result = new Dictionary<Guid, int>();
         foreach (var parentId in parentIds)
@@ -527,7 +541,11 @@ public class ItemCountService : IItemCountService
         return result;
     }
 
-    private static Dictionary<Guid, int> GetMergedChildCounts(JellyfinDbContext dbContext, IReadOnlyList<Guid> parentIds, bool includeVirtual)
+    private static Dictionary<Guid, int> GetMergedChildCounts(
+        JellyfinDbContext dbContext,
+        IQueryable<BaseItemEntity> accessibleItems,
+        IReadOnlyList<Guid> parentIds,
+        bool includeVirtual)
     {
         var mergedGroups = GetPresentationKeyGroups(dbContext, parentIds)
             .Where(group => group.Value.Count > 1)
@@ -540,14 +558,12 @@ public class ItemCountService : IItemCountService
 
         // Only merged folders.
         var memberIds = mergedGroups.SelectMany(group => group.Value).Distinct().ToArray();
-        var children = dbContext.BaseItems
-            .AsNoTracking()
+        var children = accessibleItems
             .Where(b => b.ParentId.HasValue && !b.SeasonId.HasValue && (includeVirtual || !b.IsVirtualItem))
             .WhereOneOrMany(memberIds, b => b.ParentId!.Value)
             .Select(b => new { ParentId = b.ParentId!.Value, b.Id, b.PresentationUniqueKey })
             .ToArray()
-            .Concat(dbContext.BaseItems
-                .AsNoTracking()
+            .Concat(accessibleItems
                 .Where(b => b.SeasonId.HasValue && (includeVirtual || !b.IsVirtualItem))
                 .WhereOneOrMany(memberIds, b => b.SeasonId!.Value)
                 .Select(b => new { ParentId = b.SeasonId!.Value, b.Id, b.PresentationUniqueKey })
diff --git a/Jellyfin.Server.Implementations/Item/NextUpService.cs b/Jellyfin.Server.Implementations/Item/NextUpService.cs
index f478daef23..d3c7ecb0ad 100644
--- a/Jellyfin.Server.Implementations/Item/NextUpService.cs
+++ b/Jellyfin.Server.Implementations/Item/NextUpService.cs
@@ -129,12 +129,21 @@ public class NextUpService : INextUpService
             // Use an explicit Join (INNER JOIN) instead of SelectMany on a collection navigation.
             // SelectMany on UserData with a correlated Where would translate to APPLY,
             // which SQLite does not support.
+            // Access filtering leaves only primaries in the base query, but a play can be recorded
+            // against any version, so each row is attributed to its group's primary before the join.
+            var playedByGroupPrimary = context.UserData
+                .AsNoTracking()
+                .Where(ud => ud.ItemId != EF.Constant(BaseItemRepository.PlaceholderId))
+                .Where(ud => ud.Played)
+                .Join(
+                    context.BaseItems.AsNoTracking(),
+                    ud => ud.ItemId,
+                    bi => bi.Id,
+                    (ud, bi) => new { ud.UserId, ItemId = bi.PrimaryVersionId ?? bi.Id, ud.LastPlayedDate });
+
             var playedWithDates = lastWatchedByDateBase
                 .Join(
-                    context.UserData
-                        .AsNoTracking()
-                        .Where(ud => ud.ItemId != EF.Constant(BaseItemRepository.PlaceholderId))
-                        .Where(ud => ud.Played),
+                    playedByGroupPrimary,
                     e => new { UserId = userId, ItemId = e.Id },
                     ud => new { ud.UserId, ud.ItemId },
                     (e, ud) => new { EpisodeId = e.Id, e.SeriesPresentationUniqueKey, ud.LastPlayedDate })