Merge pull request #20066 from peppy/fix-filtering-with-date-modes

Fix "date submitted" and "date ranked" filtering not working as intended

osu.Game.Tests/Visual/SongSelect/TestSceneBeatmapCarousel.cs

@@ -494,6 +494,43 @@ public void TestSelectionEnteringFromEmptyRuleset()
             AddAssert("Something is selected", () => carousel.SelectedBeatmapInfo != null);
         }
 
+        [Test]
+        public void TestSortingDateSubmitted()
+        {
+            var sets = new List<BeatmapSetInfo>();
+            const string zzz_string = "zzzzz";
+
+            AddStep("Populuate beatmap sets", () =>
+            {
+                sets.Clear();
+
+                for (int i = 0; i < 20; i++)
+                {
+                    var set = TestResources.CreateTestBeatmapSetInfo(5);
+
+                    if (i >= 2 && i < 10)
+                        set.DateSubmitted = DateTimeOffset.Now.AddMinutes(i);
+                    if (i < 5)
+                        set.Beatmaps.ForEach(b => b.Metadata.Artist = zzz_string);
+
+                    sets.Add(set);
+                }
+            });
+
+            loadBeatmaps(sets);
+
+            AddStep("Sort by date submitted", () => carousel.Filter(new FilterCriteria { Sort = SortMode.DateSubmitted }, false));
+            checkVisibleItemCount(diff: false, count: 8);
+            checkVisibleItemCount(diff: true, count: 5);
+            AddStep("Sort by date submitted and string", () => carousel.Filter(new FilterCriteria
+            {
+                Sort = SortMode.DateSubmitted,
+                SearchText = zzz_string
+            }, false));
+            checkVisibleItemCount(diff: false, count: 3);
+            checkVisibleItemCount(diff: true, count: 5);
+        }
+
         [Test]
         public void TestSorting()
         {

osu.Game/Screens/Select/Carousel/CarouselBeatmapSet.cs

@@ -129,12 +129,13 @@ private int compareUsingAggregateMax(CarouselBeatmapSet other, Func<BeatmapInfo,
         public override void Filter(FilterCriteria criteria)
         {
             base.Filter(criteria);
-            bool match = Items.All(i => i.Filtered.Value);
 
-            match &= criteria.Sort != SortMode.DateRanked || BeatmapSet?.DateRanked != null;
-            match &= criteria.Sort != SortMode.DateSubmitted || BeatmapSet?.DateSubmitted != null;
+            bool filtered = Items.All(i => i.Filtered.Value);
 
-            Filtered.Value = match;
+            filtered |= criteria.Sort == SortMode.DateRanked && BeatmapSet?.DateRanked == null;
+            filtered |= criteria.Sort == SortMode.DateSubmitted && BeatmapSet?.DateSubmitted == null;
+
+            Filtered.Value = filtered;
         }
 
         public override string ToString() => BeatmapSet.ToString();