From 9a15adbfffb4b4db274b71db5cc00b20694ccf32 Mon Sep 17 00:00:00 2001
From: Gabe Livengood <47010459+ggliv@users.noreply.github.com>
Date: Thu, 23 Jun 2022 11:24:28 -0400
Subject: [PATCH] add an all option to publicity filter

---
 .../Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs       | 4 ++++
 .../OnlinePlay/Lounge/Components/RoomPublicityFilter.cs       | 1 +
 .../Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs    | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
index 4ebd05d46a..e16e71ca70 100644
--- a/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
+++ b/osu.Game.Tests/Visual/Multiplayer/TestSceneLoungeRoomsContainer.cs
@@ -166,6 +166,10 @@ namespace osu.Game.Tests.Visual.Multiplayer
                 RoomManager.AddRooms(1, withPassword: false);
             });
 
+            AddStep("apply default filter", () => container.Filter.SetDefault());
+
+            AddUntilStep("both rooms visible", () => container.Rooms.Count(r => r.IsPresent) == 2);
+
             AddStep("filter public rooms", () => container.Filter.Value = new FilterCriteria { Publicity = RoomPublicityFilter.Public });
 
             AddUntilStep("private room hidden", () => container.Rooms.All(r => !r.Room.HasPassword.Value));
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomPublicityFilter.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomPublicityFilter.cs
index ffa527cb9c..53f85ba7c4 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomPublicityFilter.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomPublicityFilter.cs
@@ -7,6 +7,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
 {
     public enum RoomPublicityFilter
     {
+        All,
         Public,
         Private
     }
diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
index e5d7170f16..0e8918fa18 100644
--- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
+++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
@@ -87,7 +87,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components
                         matchingFilter &= r.FilterTerms.Any(term => term.ToString().Contains(criteria.SearchString, StringComparison.InvariantCultureIgnoreCase));
                     }
 
-                    matchingFilter &= (criteria.Publicity == RoomPublicityFilter.Public && !r.Room.HasPassword.Value) || (criteria.Publicity == RoomPublicityFilter.Private && r.Room.HasPassword.Value);
+                    matchingFilter &= criteria.Publicity == RoomPublicityFilter.All || (criteria.Publicity == RoomPublicityFilter.Public && !r.Room.HasPassword.Value) || (criteria.Publicity == RoomPublicityFilter.Private && r.Room.HasPassword.Value);
 
                     r.MatchingFilter = matchingFilter;
                 }