The Free Software Media System - Server Backend & API
Backport pull request #16098 from jellyfin/release-10.11.z
theguymadmax815a153b940a
diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.csindex 338544ab96..5bb4494dd2 100644--- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs+++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.cs@@ -295,6 +295,25 @@ public sealed class BaseItemRepositorydbQuery = ApplyGroupingFilter(context, dbQuery, filter);dbQuery = ApplyQueryPaging(dbQuery, filter);++ var hasRandomSort = filter.OrderBy.Any(e => e.OrderBy == ItemSortBy.Random);+ if (hasRandomSort)+ {+ var orderedIds = dbQuery.Select(e => e.Id).ToList();+ if (orderedIds.Count == 0)+ {+ return Array.Empty<BaseItemDto>();+ }++ var itemsById = ApplyNavigations(context.BaseItems.Where(e => orderedIds.Contains(e.Id)), filter)+ .AsEnumerable()+ .Select(w => DeserializeBaseItem(w, filter.SkipDeserialization))+ .Where(dto => dto is not null)+ .ToDictionary(i => i!.Id);++ return orderedIds.Where(itemsById.ContainsKey).Select(id => itemsById[id]).ToArray()!;+ }+dbQuery = ApplyNavigations(dbQuery, filter);return dbQuery.AsEnumerable().Where(e => e is not null).Select(w => DeserializeBaseItem(w, filter.SkipDeserialization)).Where(dto => dto is not null).ToArray()!;