h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 09:47:52 +08:00
Code Issues Releases Wiki Activity

Remove APIFriend

Browse Source
This commit is contained in:
Andrei Zavatski 2020-03-17 08:51:54 +03:00
parent bf9c6f8a3b
commit 4ac740b12b
9 changed files with 25 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game.Tests/Visual/Online/TestSceneFriendsLayout.cs
View File

@ -10,7 +10,6 @@ using osu.Game.Users;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using NUnit.Framework; using NUnit.Framework;
using osu.Game.Online.API.Requests.Responses;
using System.Linq; using System.Linq;
using osu.Game.Online.API; using osu.Game.Online.API;
@ -58,9 +57,9 @@ namespace osu.Game.Tests.Visual.Online
AddStep("Populate", () => layout.Users = getUsers()); AddStep("Populate", () => layout.Users = getUsers());
} }
private List<APIFriend> getUsers() => new List<APIFriend> private List<User> getUsers() => new List<User>
{ {
new APIFriend new User
{ {
Username = "flyte", Username = "flyte",
Id = 3103765, Id = 3103765,
@ -69,7 +68,7 @@ namespace osu.Game.Tests.Visual.Online
Country = new Country { FlagName = "JP" }, Country = new Country { FlagName = "JP" },
CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c6.jpg" CoverUrl = "https://osu.ppy.sh/images/headers/profile-covers/c6.jpg"
}, },
new APIFriend new User
{ {
Username = "peppy", Username = "peppy",
Id = 2, Id = 2,
@ -80,7 +79,7 @@ namespace osu.Game.Tests.Visual.Online
IsSupporter = true, IsSupporter = true,
SupportLevel = 3, SupportLevel = 3,
}, },
new APIFriend new User
{ {
Username = "Evast", Username = "Evast",
Id = 8195163, Id = 8195163,

10
osu.Game.Tests/Visual/UserInterface/TestSceneFriendsOnlineStatusControl.cs
View File

@ -7,9 +7,9 @@ using System.Linq;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Overlays.Dashboard.Friends; using osu.Game.Overlays.Dashboard.Friends;
using osu.Game.Users;
namespace osu.Game.Tests.Visual.UserInterface namespace osu.Game.Tests.Visual.UserInterface
{ {
@ -39,17 +39,17 @@ namespace osu.Game.Tests.Visual.UserInterface
[Test] [Test]
public void Populate() public void Populate()
{ {
AddStep("Populate", () => control.Populate(new List<APIFriend> AddStep("Populate", () => control.Populate(new List<User>
{ {
new APIFriend new User
{ {
IsOnline = true IsOnline = true
}, },
new APIFriend new User
{ {
IsOnline = false IsOnline = false
}, },
new APIFriend new User
{ {
IsOnline = false IsOnline = false
} }

4
osu.Game/Online/API/Requests/GetFriendsRequest.cs
View File

@ -2,11 +2,11 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic; using System.Collections.Generic;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Users;
namespace osu.Game.Online.API.Requests namespace osu.Game.Online.API.Requests
{ {
public class GetFriendsRequest : APIRequest<List<APIFriend>> public class GetFriendsRequest : APIRequest<List<User>>
{ {
protected override string Target => @"friends"; protected override string Target => @"friends";
} }

14
osu.Game/Online/API/Requests/Responses/APIFriend.cs
View File

@ -1,14 +0,0 @@
// 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 Newtonsoft.Json;
using osu.Game.Users;
namespace osu.Game.Online.API.Requests.Responses
{
public class APIFriend : User
{
[JsonProperty(@"current_mode_rank")]
public int? CurrentModeRank;
}
}

6
osu.Game/Overlays/Dashboard/Friends/FriendsBundle.cs
View File

@ -2,7 +2,7 @@
// See the LICENCE file in the repository root for full licence text. // See the LICENCE file in the repository root for full licence text.
using System.Collections.Generic; using System.Collections.Generic;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Users;
namespace osu.Game.Overlays.Dashboard.Friends namespace osu.Game.Overlays.Dashboard.Friends
{ {
@ -12,9 +12,9 @@ namespace osu.Game.Overlays.Dashboard.Friends
public int Count => Users.Count; public int Count => Users.Count;
public List<APIFriend> Users { get; } public List<User> Users { get; }
public FriendsBundle(FriendsOnlineStatus status, List<APIFriend> users) public FriendsBundle(FriendsOnlineStatus status, List<User> users)
{ {
Status = status; Status = status;
Users = users; Users = users;

11
osu.Game/Overlays/Dashboard/Friends/FriendsLayout.cs
View File

@ -11,7 +11,6 @@ using osu.Framework.Graphics.Shapes;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Online.API.Requests; using osu.Game.Online.API.Requests;
using osu.Game.Online.API.Requests.Responses;
using osu.Game.Users; using osu.Game.Users;
using osuTK; using osuTK;
@ -19,9 +18,9 @@ namespace osu.Game.Overlays.Dashboard.Friends
{ {
public class FriendsLayout : CompositeDrawable public class FriendsLayout : CompositeDrawable
{ {
private List<APIFriend> users = new List<APIFriend>(); private List<User> users = new List<User>();
public List<APIFriend> Users public List<User> Users
{ {
get => users; get => users;
set set
@ -172,7 +171,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
if (itemsPlaceholder.Any()) if (itemsPlaceholder.Any())
loading.Show(); loading.Show();
var groupedUsers = OnlineStatusControl.Current.Value?.Users ?? new List<APIFriend>(); var groupedUsers = OnlineStatusControl.Current.Value?.Users ?? new List<User>();
var sortedUsers = sortUsers(groupedUsers); var sortedUsers = sortUsers(groupedUsers);
@ -195,7 +194,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
currentContent.FadeIn(200, Easing.OutQuint); currentContent.FadeIn(200, Easing.OutQuint);
} }
private FillFlowContainer createTable(List<APIFriend> users) private FillFlowContainer createTable(List<User> users)
{ {
var style = userListToolbar.DisplayStyle.Value; var style = userListToolbar.DisplayStyle.Value;
@ -226,7 +225,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
} }
} }
private List<APIFriend> sortUsers(List<APIFriend> unsorted) private List<User> sortUsers(List<User> unsorted)
{ {
switch (userListToolbar.SortCriteria.Value) switch (userListToolbar.SortCriteria.Value)
{ {

4
osu.Game/Overlays/Dashboard/Friends/FriendsOnlineStatusControl.cs
View File

@ -3,7 +3,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using osu.Game.Online.API.Requests.Responses; using osu.Game.Users;
namespace osu.Game.Overlays.Dashboard.Friends namespace osu.Game.Overlays.Dashboard.Friends
{ {
@ -11,7 +11,7 @@ namespace osu.Game.Overlays.Dashboard.Friends
{ {
protected override OverlayStreamItem<FriendsBundle> CreateStreamItem(FriendsBundle value) => new FriendsOnlineStatusItem(value); protected override OverlayStreamItem<FriendsBundle> CreateStreamItem(FriendsBundle value) => new FriendsOnlineStatusItem(value);
public void Populate(List<APIFriend> users) public void Populate(List<User> users)
{ {
Clear(); Clear();

2
osu.Game/Overlays/SocialOverlay.cs
View File

@ -120,7 +120,7 @@ namespace osu.Game.Overlays
{ {
case SocialTab.Friends: case SocialTab.Friends:
var friendRequest = new GetFriendsRequest(); // TODO filter arguments? var friendRequest = new GetFriendsRequest(); // TODO filter arguments?
friendRequest.Success += users => Users = users.Cast<User>().ToArray(); friendRequest.Success += users => Users = users.ToArray();
API.Queue(getUsersRequest = friendRequest); API.Queue(getUsersRequest = friendRequest);
break; break;

3
osu.Game/Users/User.cs
View File

@ -69,6 +69,9 @@ namespace osu.Game.Users
[JsonProperty(@"support_level")] [JsonProperty(@"support_level")]
public int SupportLevel; public int SupportLevel;
[JsonProperty(@"current_mode_rank")]
public int? CurrentModeRank;
[JsonProperty(@"is_gmt")] [JsonProperty(@"is_gmt")]
public bool IsGMT; public bool IsGMT;