From 9dde37fe40b7a49e5743844de3bb42007d49ea9e Mon Sep 17 00:00:00 2001
From: smoogipoo <smoogipoo@smgi.me>
Date: Wed, 2 Sep 2020 20:25:36 +0900
Subject: [PATCH] Hook up collection filter

---
 osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs | 3 +++
 osu.Game/Screens/Select/FilterCriteria.cs           | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
index ed54c158db..8e5655e514 100644
--- a/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
+++ b/osu.Game/Screens/Select/Carousel/CarouselBeatmap.cs
@@ -60,6 +60,9 @@ namespace osu.Game.Screens.Select.Carousel
                     match &= terms.Any(term => term.IndexOf(criteriaTerm, StringComparison.InvariantCultureIgnoreCase) >= 0);
             }
 
+            if (match)
+                match &= criteria.Collection?.ContainsBeatmap(Beatmap) ?? true;
+
             Filtered.Value = !match;
         }
 
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 18be4fcac8..5a5c0e1b50 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -51,6 +51,8 @@ namespace osu.Game.Screens.Select
             }
         }
 
+        public FilterControl.CollectionFilter Collection;
+
         public struct OptionalRange<T> : IEquatable<OptionalRange<T>>
             where T : struct
         {