From 23f8ec93ab7fec0b69989b7af420499a8106fec6 Mon Sep 17 00:00:00 2001 From: Matt <101580360+matt-teahan@users.noreply.github.com> Date: Fri, 12 Jun 2026 21:31:38 +0100 Subject: [PATCH 1/2] Fix AlbumIds filtering by Name instead of by Id --- CONTRIBUTORS.md | 1 + .../Item/BaseItemRepository.TranslateQuery.cs | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index d70ffddfd7..4e323e332a 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -90,6 +90,7 @@ - [mark-monteiro](https://github.com/mark-monteiro) - [MarkCiliaVincenti](https://github.com/MarkCiliaVincenti) - [Martin Reuter](https://github.com/reuterma24) + - [Matt Teahan](https://github.com/matt-teahan) - [Matt07211](https://github.com/Matt07211) - [Matthew Jones](https://github.com/matthew-jones-uk) - [Maxr1998](https://github.com/Maxr1998) diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs index d905775aef..14ad4844ac 100644 --- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs +++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs @@ -586,8 +586,7 @@ public sealed partial class BaseItemRepository if (filter.AlbumIds.Length > 0) { - var subQuery = context.BaseItems.WhereOneOrMany(filter.AlbumIds, f => f.Id); - baseQuery = baseQuery.Where(e => subQuery.Any(f => f.Name == e.Album)); + baseQuery = baseQuery.Where(e => filter.AlbumIds.Contains((Guid)e.ParentId!)); } if (filter.ExcludeArtistIds.Length > 0) From 5df25cf688d98eeaee08857bda906ca1fa1abee2 Mon Sep 17 00:00:00 2001 From: Matt Teahan <101580360+matt-teahan@users.noreply.github.com> Date: Sat, 13 Jun 2026 21:04:33 +0100 Subject: [PATCH 2/2] Apply ParentId.Value suggestion Co-authored-by: Bond-009 --- .../Item/BaseItemRepository.TranslateQuery.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs b/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs index 14ad4844ac..3357f874d2 100644 --- a/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs +++ b/Jellyfin.Server.Implementations/Item/BaseItemRepository.TranslateQuery.cs @@ -586,7 +586,7 @@ public sealed partial class BaseItemRepository if (filter.AlbumIds.Length > 0) { - baseQuery = baseQuery.Where(e => filter.AlbumIds.Contains((Guid)e.ParentId!)); + baseQuery = baseQuery.Where(e => e.ParentId.HasValue && filter.AlbumIds.Contains(e.ParentId.Value)); } if (filter.ExcludeArtistIds.Length > 0)