Fix Custom Directory Filters in V2

ShokoAnime · Jul 7, 2024 · 57fdbfb · 57fdbfb
1 parent 3d56bf2
commit 57fdbfb
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Shoko.Server/API/v2/Modules/Common.cs b/Shoko.Server/API/v2/Modules/Common.cs
@@ -2738,7 +2738,7 @@ internal object GetAllFilters(int uid, bool nocast, bool notag, int level, bool
         var evaluator = HttpContext.RequestServices.GetRequiredService<FilterEvaluator>();
         var user = HttpContext.GetUser();
         var hideCategories = user.GetHideCategories();
-        var allFPs = level > 1
+        var allFPs = level > 0
             ? RepoFactory.FilterPreset.GetAllFiltersForLegacy().Where(a => !a.Hidden && ((a.FilterType & GroupFilterType.Tag) == 0 || !hideCategories.Contains(a.Name))).ToList()
             : RepoFactory.FilterPreset.GetAllFiltersForLegacy(true).Where(a => !a.Hidden).ToList();
         var result = evaluator.BatchEvaluateFilters(allFPs, user.JMMUserID, true);

diff --git a/Shoko.Server/Repositories/Cached/AnimeSeriesRepository.cs b/Shoko.Server/Repositories/Cached/AnimeSeriesRepository.cs
@@ -342,6 +342,7 @@ public List<SVR_AnimeSeries> GetWithMultipleReleases(bool ignoreVariations)
     public IEnumerable<int> GetAllYears()
     {
         var anime = RepoFactory.AnimeSeries.GetAll().Select(a => RepoFactory.AniDB_Anime.GetByAnimeID(a.AniDB_ID)).Where(a => a?.AirDate != null).ToList();
+        if (anime.Count == 0) yield break;
         var minDate = anime.Min(a => a.AirDate!.Value);
         var maxDate = anime.Max(o => o.EndDate ?? DateTime.Today);
 

diff --git a/Shoko.Server/Repositories/Cached/FilterPresetRepository.cs b/Shoko.Server/Repositories/Cached/FilterPresetRepository.cs
@@ -331,7 +331,7 @@ public static IReadOnlyList<FilterPreset> GetAllTagFilters(int offset = 0)
     public IReadOnlyList<FilterPreset> GetAllFiltersForLegacy(bool topLevel = false)
     {
         if (topLevel)
-            return GetTopLevel().Where(a => !a.IsDirectory()).Concat(DirectoryFilters).ToList();
+            return GetTopLevel().Concat(DirectoryFilters).ToList();
 
         var filters = GetAll().ToList();
         filters.AddRange(DirectoryFilters);