Fix IsPlayed filter and setting BoxSet played/unplayed

1 files changed, 27 insertions, 0 deletions

diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
index 2c0ec69941..c0476b00e7 100644
--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs
@@ -3323,6 +3323,33 @@ public sealed class BaseItemRepository
                     baseQuery = baseQuery.Where(s => !playedSeriesIdList.Contains(s.Id));
                 }
             }
+            else if (filter.IncludeItemTypes.Length == 1 && filter.IncludeItemTypes[0] == BaseItemKind.BoxSet)
+            {
+                var boxSetIds = baseQuery.Select(e => e.Id).ToList();
+                var userId = filter.User!.Id;
+                var playedBoxSetIds = new List<Guid>(boxSetIds.Count);
+                foreach (var boxSetId in boxSetIds)
+                {
+                    var descendantIds = DescendantQueryHelper.GetAllDescendantIds(context, boxSetId);
+                    var leafItems = context.BaseItems
+                        .Where(e => descendantIds.Contains(e.Id) && !e.IsFolder && !e.IsVirtualItem);
+
+                    if (leafItems.Any()
+                        && leafItems.All(f => f.UserData!.Any(ud => ud.UserId == userId && ud.Played)))
+                    {
+                        playedBoxSetIds.Add(boxSetId);
+                    }
+                }
+
+                if (filter.IsPlayed.Value)
+                {
+                    baseQuery = baseQuery.Where(s => playedBoxSetIds.Contains(s.Id));
+                }
+                else
+                {
+                    baseQuery = baseQuery.Where(s => !playedBoxSetIds.Contains(s.Id));
+                }
+            }
             else
             {
                 var playedItemIds = context.UserData