From b188071931a15ec4db8eb96fe1e24d98f4e48068 Mon Sep 17 00:00:00 2001
From: Shadowghost <Shadowghost@users.noreply.github.com>
Date: Tue, 15 Sep 2026 11:15:53 -0400
Subject: Backport pull request #17898 from jellyfin/release-12.z

Populate missing tags array in Filters2

Original-merge: 3d52fbe84e78d6447465bb831039dabb6142ca67

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

Backported-by: Cody Robibero <cody@robibe.ro>
---
 Jellyfin.Api/Controllers/FilterController.cs | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'Jellyfin.Api/Controllers/FilterController.cs')

diff --git a/Jellyfin.Api/Controllers/FilterController.cs b/Jellyfin.Api/Controllers/FilterController.cs
index b458bd90f3..b9ca45cc1c 100644
--- a/Jellyfin.Api/Controllers/FilterController.cs
+++ b/Jellyfin.Api/Controllers/FilterController.cs
@@ -178,16 +178,35 @@ public class FilterController : BaseJellyfinApiController
             IsSeries = isSeries
         };
 
+        var tagQuery = new InternalItemsQuery(user)
+        {
+            IncludeItemTypes = includeItemTypes,
+            DtoOptions = new DtoOptions
+            {
+                Fields = Array.Empty<ItemFields>(),
+                EnableImages = false,
+                EnableUserData = false
+            },
+            IsAiring = isAiring,
+            IsMovie = isMovie,
+            IsSports = isSports,
+            IsKids = isKids,
+            IsNews = isNews,
+            IsSeries = isSeries
+        };
+
         if ((recursive ?? true) || parentItem is UserView || parentItem is ICollectionFolder)
         {
             var ancestorIds = parentItem is null ? Array.Empty<Guid>() : new[] { parentItem.Id };
             genreQuery.AncestorIds = ancestorIds;
             streamLanguageQuery.AncestorIds = ancestorIds;
+            tagQuery.AncestorIds = ancestorIds;
         }
         else
         {
             genreQuery.Parent = parentItem;
             streamLanguageQuery.Parent = parentItem;
+            tagQuery.Parent = parentItem;
         }
 
         if ((includeItemTypes.Contains(BaseItemKind.Series) || includeItemTypes.Contains(BaseItemKind.Season))
@@ -218,6 +237,8 @@ public class FilterController : BaseJellyfinApiController
             }).ToArray();
         }
 
+        filters.Tags = _libraryManager.GetTagNames(tagQuery);
+
         if (includeItemTypes.Contains(BaseItemKind.Movie)
             || includeItemTypes.Contains(BaseItemKind.Series)
             || includeItemTypes.Contains(BaseItemKind.Season)
-- 
cgit v1.2.3