From 637fe07b31066087361f7ed305383021f581c647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= Date: Wed, 11 Dec 2024 12:36:42 +0900 Subject: [PATCH] Rename `Room{Status -> Mode}Filter` I need the "status" term free for an upcoming change. And web calls this parameter "mode" as well: https://github.com/ppy/osu-web/blob/642e973f916f315fb505aa79d4376675d0a2ec95/app/Models/Multiplayer/Room.php#L184-L199 so it works in my head. --- osu.Game/Online/Rooms/GetRoomsRequest.cs | 10 +++++----- .../OnlinePlay/Components/ListingPollingComponent.cs | 2 +- .../OnlinePlay/Lounge/Components/FilterCriteria.cs | 2 +- .../{RoomStatusFilter.cs => RoomModeFilter.cs} | 2 +- osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) rename osu.Game/Screens/OnlinePlay/Lounge/Components/{RoomStatusFilter.cs => RoomModeFilter.cs} (91%) diff --git a/osu.Game/Online/Rooms/GetRoomsRequest.cs b/osu.Game/Online/Rooms/GetRoomsRequest.cs index 7feb709acb..b36e6fc088 100644 --- a/osu.Game/Online/Rooms/GetRoomsRequest.cs +++ b/osu.Game/Online/Rooms/GetRoomsRequest.cs @@ -11,12 +11,12 @@ namespace osu.Game.Online.Rooms { public class GetRoomsRequest : APIRequest> { - private readonly RoomStatusFilter status; + private readonly RoomModeFilter mode; private readonly string category; - public GetRoomsRequest(RoomStatusFilter status, string category) + public GetRoomsRequest(RoomModeFilter mode, string category) { - this.status = status; + this.mode = mode; this.category = category; } @@ -24,8 +24,8 @@ namespace osu.Game.Online.Rooms { var req = base.CreateWebRequest(); - if (status != RoomStatusFilter.Open) - req.AddParameter("mode", status.ToString().ToSnakeCase().ToLowerInvariant()); + if (mode != RoomModeFilter.Open) + req.AddParameter("mode", mode.ToString().ToSnakeCase().ToLowerInvariant()); if (!string.IsNullOrEmpty(category)) req.AddParameter("category", category); diff --git a/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs index b213d424df..88bd595202 100644 --- a/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs +++ b/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs @@ -47,7 +47,7 @@ namespace osu.Game.Screens.OnlinePlay.Components lastPollRequest?.Cancel(); - var req = new GetRoomsRequest(Filter.Value.Status, Filter.Value.Category); + var req = new GetRoomsRequest(Filter.Value.Mode, Filter.Value.Category); req.Success += result => { diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs index 0f63718355..cc8b0247f6 100644 --- a/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs +++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs @@ -8,7 +8,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge.Components public class FilterCriteria { public string SearchString = string.Empty; - public RoomStatusFilter Status; + public RoomModeFilter Mode; public string Category = string.Empty; public RulesetInfo? Ruleset; public RoomPermissionsFilter Permissions; diff --git a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomModeFilter.cs similarity index 91% rename from osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs rename to osu.Game/Screens/OnlinePlay/Lounge/Components/RoomModeFilter.cs index 53fbf670e1..0c07233bff 100644 --- a/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs +++ b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomModeFilter.cs @@ -5,7 +5,7 @@ using System.ComponentModel; namespace osu.Game.Screens.OnlinePlay.Lounge.Components { - public enum RoomStatusFilter + public enum RoomModeFilter { Open, diff --git a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs index 5d0983f09c..9a02e4bec8 100644 --- a/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs +++ b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs @@ -83,7 +83,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge private LoadingLayer loadingLayer = null!; private RoomsContainer roomsContainer = null!; private SearchTextBox searchTextBox = null!; - private Dropdown statusDropdown = null!; + private Dropdown statusDropdown = null!; [BackgroundDependencyLoader(true)] private void load() @@ -223,12 +223,12 @@ namespace osu.Game.Screens.OnlinePlay.Lounge { SearchString = searchTextBox.Current.Value, Ruleset = ruleset.Value, - Status = statusDropdown.Current.Value + Mode = statusDropdown.Current.Value }; protected virtual IEnumerable CreateFilterControls() { - statusDropdown = new SlimEnumDropdown + statusDropdown = new SlimEnumDropdown { RelativeSizeAxes = Axes.None, Width = 160,