h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 15:33:21 +08:00
Code Issues Releases Wiki Activity

Hook up participated filter

Browse Source 
Very early stages, implementation will change.
This commit is contained in:
smoogipoo 2018-12-19 18:02:05 +09:00
parent c86d9533bd
commit 36f6b4fc3f
3 changed files with 41 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
View File

@ -79,6 +79,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
r.MatchingFilter = matchingFilter;
}
});
currentFilter = criteria;
}

6
osu.Game/Screens/Multi/Lounge/LoungeScreen.cs
View File

@ -120,7 +120,11 @@ namespace osu.Game.Screens.Multi.Lounge
Filter.Search.HoldFocus = false;
}
private void filterRooms() => rooms.Filter(Filter.CreateCriteria());
private void filterRooms()
{
rooms.Filter(Filter.CreateCriteria());
manager.Filter(Filter.CreateCriteria());
}
public void Open(Room room)
{

36
osu.Game/Screens/Multi/RoomManager.cs
View File

@ -15,6 +15,7 @@ using osu.Game.Online;
using osu.Game.Online.API;
using osu.Game.Online.Multiplayer;
using osu.Game.Rulesets;
using osu.Game.Screens.Multi.Lounge.Components;
namespace osu.Game.Screens.Multi
{
@ -25,6 +26,8 @@ namespace osu.Game.Screens.Multi
public readonly Bindable<Room> Current = new Bindable<Room>();
private FilterCriteria currentFilter = new FilterCriteria();
[Resolved]
private APIAccess api { get; set; }
@ -50,6 +53,12 @@ namespace osu.Game.Screens.Multi
api.Queue(req);
}
public void Filter(FilterCriteria criteria)
{
currentFilter = criteria;
PollImmediately();
}
protected override Task Poll()
{
if (!api.IsLoggedIn)
@ -57,10 +66,18 @@ namespace osu.Game.Screens.Multi
var tcs = new TaskCompletionSource<bool>();
var pollReq = new GetRoomsRequest();
var pollReq = new GetRoomsRequest(currentFilter.PrimaryFilter);
pollReq.Success += result =>
{
// Remove past matches
foreach (var r in rooms.ToList())
{
if (result.All(e => e.RoomID.Value != r.RoomID.Value))
rooms.Remove(r);
}
// Add new matches, or update existing
foreach (var r in result)
{
processPlaylist(r);
@ -126,6 +143,23 @@ namespace osu.Game.Screens.Multi
private class GetRoomsRequest : APIRequest<List<Room>>
{
private readonly PrimaryFilter primaryFilter;
public GetRoomsRequest(PrimaryFilter primaryFilter)
{
this.primaryFilter = primaryFilter;
}
protected override WebRequest CreateWebRequest()
{
var req = base.CreateWebRequest();
if (primaryFilter == PrimaryFilter.Participated)
req.AddParameter("participated", "1");
return req;
}
protected override string Target => "rooms";
}
}