From 50c4e34c92091616053871ae652e11f10a7800e5 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 6 Feb 2020 11:56:09 +0900
Subject: [PATCH] Add ruleset to multiplayer filter criteria

---
 osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs | 8 +++++++-
 .../Screens/Multi/Lounge/Components/FilterCriteria.cs     | 3 +++
 .../Screens/Multi/Lounge/Components/RoomsContainer.cs     | 3 +++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
index 29d41132a7..9f93afec9d 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
@@ -7,6 +7,7 @@ using osu.Framework.Bindables;
 using osu.Framework.Threading;
 using osu.Game.Graphics;
 using osu.Game.Overlays.SearchableList;
+using osu.Game.Rulesets;
 using osuTK.Graphics;
 
 namespace osu.Game.Screens.Multi.Lounge.Components
@@ -22,6 +23,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         [Resolved(CanBeNull = true)]
         private Bindable<FilterCriteria> filter { get; set; }
 
+        [Resolved]
+        private IBindable<RulesetInfo> ruleset { get; set; }
+
         public FilterControl()
         {
             DisplayStyleControl.Hide();
@@ -38,6 +42,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         {
             base.LoadComplete();
 
+            ruleset.BindValueChanged(_ => updateFilter());
             Search.Current.BindValueChanged(_ => scheduleUpdateFilter());
             Tabs.Current.BindValueChanged(_ => updateFilter(), true);
         }
@@ -58,7 +63,8 @@ namespace osu.Game.Screens.Multi.Lounge.Components
             {
                 SearchString = Search.Current.Value ?? string.Empty,
                 PrimaryFilter = Tabs.Current.Value,
-                SecondaryFilter = DisplayStyleControl.Dropdown.Current.Value
+                SecondaryFilter = DisplayStyleControl.Dropdown.Current.Value,
+                Ruleset = ruleset.Value
             };
         }
     }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs b/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs
index 666bc44a8d..26d445e151 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs
@@ -1,6 +1,8 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using osu.Game.Rulesets;
+
 namespace osu.Game.Screens.Multi.Lounge.Components
 {
     public class FilterCriteria
@@ -8,5 +10,6 @@ namespace osu.Game.Screens.Multi.Lounge.Components
         public string SearchString;
         public PrimaryFilter PrimaryFilter;
         public SecondaryFilter SecondaryFilter;
+        public RulesetInfo Ruleset;
     }
 }
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
index 6ef0f6b6db..f5e0e2bbee 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
@@ -65,6 +65,9 @@ namespace osu.Game.Screens.Multi.Lounge.Components
                 else
                 {
                     bool matchingFilter = true;
+
+                    matchingFilter &= r.Room.Playlist.Any(i => i.Ruleset.Equals(criteria.Ruleset));
+
                     matchingFilter &= r.FilterTerms.Any(term => term.IndexOf(criteria.SearchString, StringComparison.InvariantCultureIgnoreCase) >= 0);
 
                     switch (criteria.SecondaryFilter)